Skip to content

Commit

Permalink
Deadeye Implementation 5 - heat sprite
Browse files Browse the repository at this point in the history
  • Loading branch information
Eschatologue committed Dec 10, 2021
1 parent 1238f7e commit 0aa6207
Show file tree
Hide file tree
Showing 6 changed files with 42 additions and 5 deletions.
4 changes: 2 additions & 2 deletions assets/bundles/bundle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ block.uaw-zounderkite.description = Launches mine canisters which bursts in mid-
block.uaw-zounderkite.details = The Tactical Mine Deployment System, commonly known as the T.M.D.S 'Zounderkite'. Capable of turning an empty battlefield into a highly saturated mine field in few short moments.

block.uaw-deadeye.name = Deadeye
block.uaw-deadeye.description = The pinnacle of Anti-Material Railgun. Capable of deleting most target with a single precise shot.
block.uaw-deadeye.details = Sometimes, all you need is a single precise shot to solve your problems.
block.uaw-deadeye.description = Ferociously accurate long range turret that fires projectiles at extreme velocity. \nCapable of destroying most ground target in a precise single shot.
block.uaw-deadeye.details = Deliberation and precision, the two core values to solve all your problems.
block.uaw-skyhammer.name = Skyhammer
block.uaw-skyhammer.description = Fires a huge and very heavy artillery shell at targets over vast distance. \n\n[accent]Causes multiple repeating aftershocks in affected area.[]
block.uaw-skyhammer.details = You heard a roaring thunder from the distance, you looked up expecting a storm, but are met with a clear sky. \nSlowly a howling whistle gets louder, you are greeted by death himself.
Expand Down
Binary file added assets/sprites/blocks/turrets/RG/deadeye-heat.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion src/UAW/content/UAWBlock.java
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,7 @@ Items.thorium, new ArtilleryBulletType(2f, 4250) {{
Items.pyratite, buckshotIncend,
UAWItems.cryogel, buckshotCryo
);
limitRange();
}};
tempest = new UAWItemTurret("tempest") {{
requirements(Category.turret, with(
Expand All @@ -537,7 +538,7 @@ Items.thorium, new ArtilleryBulletType(2f, 4250) {{
shootCone = 2.3f;
velocityInaccuracy = 0.2f;
ammoUseEffect = Fx.casing3;
shootSound = UAWSfx.shotgun_shoot_1;
shootSound = UAWSfx.shotgunShoot1;
inaccuracy = 6f;
rotateSpeed = 4f;
maxAmmo = 60;
Expand Down
35 changes: 35 additions & 0 deletions src/UAW/content/UAWBullets.java
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,41 @@ public void load() {
pierce = true;
}};

buckshotLead = new BuckshotBulletType(4.5f, 10f) {{
pierceCap = 3;
lifetime = 30f;
knockback = 6f;
despawnHit = true;
hitEffect = Fx.flakExplosion;
shootEffect = UAWFxD.instShoot(32, Pal.bulletYellowBack);
smokeEffect = Fx.shootSmallSmoke;
ammoMultiplier = 3;
}};
buckshotIncend = new BuckshotBulletType(4.5f, 8f) {{
height = width = 12f;
pierceCap = 3;
lifetime = 30f;
knockback = 4f;
shootEffect = UAWFxD.instShoot(32, Pal.lightishOrange);
smokeEffect = Fx.shootSmallSmoke;
hitEffect = new MultiEffect(Fx.hitBulletSmall, Fx.fireHit, Fx.fireSmoke);
frontColor = Pal.lightishOrange;
backColor = Pal.lightOrange;
status = StatusEffects.burning;
}};
buckshotCryo = new BuckshotBulletType(4.5f, 8f) {{
height = width = 12f;
pierceCap = 3;
lifetime = 30f;
knockback = 4f;
shootEffect = UAWFxD.instShoot(32, Color.valueOf("87CEEB"));
smokeEffect = Fx.shootSmallSmoke;
hitEffect = new MultiEffect(Fx.hitBulletSmall, UAWFxS.cryoHit, Fx.fireSmoke);
frontColor = UAWPal.cryoFront;
backColor = UAWPal.cryoBack;
status = StatusEffects.freezing;
}};

mineBasic = new MineBulletType(100, 90, 9) {{
frontColor = Pal.bulletYellow;
backColor = Pal.bulletYellowBack;
Expand Down
4 changes: 2 additions & 2 deletions src/UAW/content/UAWSfx.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class UAWSfx {
cannonShoot2 = new Sound(),
cruiseMissileShoot1 = new Sound(),
launcherShoot1 = new Sound(),
shotgun_shoot_1 = new Sound(),
shotgunShoot1 = new Sound(),
suppressedShoot1 = new Sound(),
torpedoShoot1 = new Sound();

Expand All @@ -40,7 +40,7 @@ public static void load() {
cannonShoot2 = loadSound("cannon_shoot_2");
cruiseMissileShoot1 = loadSound("cruisemissile_shoot_1");
launcherShoot1 = loadSound("launcher_shoot_1");
shotgun_shoot_1 = loadSound("shotgun_shoot_1");
shotgunShoot1 = loadSound("shotgunShoot1");
suppressedShoot1 = loadSound("supressed_shoot_1");
torpedoShoot1 = loadSound("torpedo_shoot_1");
}
Expand Down
1 change: 1 addition & 0 deletions src/UAW/entities/bullet/BuckshotBulletType.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ public BuckshotBulletType(float speed, float damage) {
super(speed, damage);
height = width = 15;
shrinkX = shrinkY = 0.5f;
despawnHit = true;
splashDamageRadius = 1.6f * tilesize;
splashDamage = damage / 1.8f;
pierceCap = 2;
Expand Down

0 comments on commit 0aa6207

Please sign in to comment.