From 1879d00efbaea901a98a03059e5d812efc6b506b Mon Sep 17 00:00:00 2001 From: ItzAlen Date: Fri, 10 Dec 2021 20:49:14 +0700 Subject: [PATCH] Deadeye Implementation 6 --- src/UAW/content/UAWBlock.java | 1 + .../bullet/AntiBuildingBulletType.java | 50 ------------------- .../entities/bullet/UAWRailBulletType.java | 2 +- 3 files changed, 2 insertions(+), 51 deletions(-) delete mode 100644 src/UAW/entities/bullet/AntiBuildingBulletType.java diff --git a/src/UAW/content/UAWBlock.java b/src/UAW/content/UAWBlock.java index 5f9c1657..f0dab83f 100644 --- a/src/UAW/content/UAWBlock.java +++ b/src/UAW/content/UAWBlock.java @@ -222,6 +222,7 @@ UAWItems.titaniumCarbide, new UAWRailBulletType() {{ shootCone = 1f; shootSound = UAWSfx.bigGunShoot1; unitSort = UnitSorts.strongest; + cooldown = 1.5f; ammo( UAWItems.titaniumCarbide, new UAWRailBulletType() {{ damage = 12500; diff --git a/src/UAW/entities/bullet/AntiBuildingBulletType.java b/src/UAW/entities/bullet/AntiBuildingBulletType.java deleted file mode 100644 index 12e5555d..00000000 --- a/src/UAW/entities/bullet/AntiBuildingBulletType.java +++ /dev/null @@ -1,50 +0,0 @@ -package UAW.entities.bullet; - -import UAW.graphics.UAWFxS; -import arc.math.Mathf; -import mindustry.content.*; -import mindustry.entities.bullet.ArtilleryBulletType; -import mindustry.entities.effect.MultiEffect; -import mindustry.gen.Sounds; -import mindustry.graphics.Pal; - -import static mindustry.Vars.tilesize; - -/** - * Artillery Bullet but with different trail, building damage multiplier, and etc - */ -public class AntiBuildingBulletType extends ArtilleryBulletType { - public float size = 32; - - public AntiBuildingBulletType(float speed, float damage, float damageMult, String bulletSprite) { - super(speed, damage, bulletSprite); - this.buildingDamageMultiplier = damageMult; - splashDamage = damage; - splashDamageRadius = 10 * tilesize; - height = size; - width = size / 2.1f; - hitSound = Sounds.explosionbig; - hitSoundVolume = 3f; - hitShake = 16; - knockback = 8; - frontColor = Pal.sapBullet; - backColor = Pal.sapBulletBack; - shootEffect = new MultiEffect(Fx.shootBig2, UAWFxS.shootSporeFlame); - smokeEffect = new MultiEffect(Fx.shootBigSmoke2, Fx.shootLiquid); - trailLength = Mathf.round(height) + 8; - trailWidth = width / 4f; - trailColor = backColor; - trailMult = 0f; - pierceBuilding = true; - status = StatusEffects.melting; - makeFire = true; - } - - public AntiBuildingBulletType(float speed, float damage, float damageMult) { - this(speed, damage, damageMult, "shell"); - } - - public AntiBuildingBulletType() { - this(1f, 1f, 2.5f, "shell"); - } -} diff --git a/src/UAW/entities/bullet/UAWRailBulletType.java b/src/UAW/entities/bullet/UAWRailBulletType.java index fd2ac82d..7e10eb8c 100644 --- a/src/UAW/entities/bullet/UAWRailBulletType.java +++ b/src/UAW/entities/bullet/UAWRailBulletType.java @@ -46,8 +46,8 @@ void handle(Bullet b, Posc pos, float initialHealth) { if (b.damage > 0) { pierceEffect.at(pos.getX(), pos.getY(), b.rotation()); - hitEffect.at(pos.getX(), pos.getY()); + Effect.shake(hitShake, hitShake, b); } //subtract health from each consecutive pierce