Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cyclone hits ground targets again

Browse Source
This commit is contained in:
Anuken
2020-07-02 23:35:36 -04:00
parent efa8d8a0d7
commit fb7633cb07
3 changed files with 46 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/units/weapons/heal-weapon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 353 B

After

Width:  |  Height:  |  Size: 357 B

9
core/src/mindustry/content/Blocks.java
View File

@@ -1578,10 +1578,10 @@ public class Blocks implements ContentList{
cyclone = new ItemTurret("cyclone"){{ cyclone = new ItemTurret("cyclone"){{
requirements(Category.turret, with(Items.copper, 200, Items.titanium, 125, Items.plastanium, 80)); requirements(Category.turret, with(Items.copper, 200, Items.titanium, 125, Items.plastanium, 80));
ammo( ammo(
Items.metaglass, Bullets.flakGlass, Items.metaglass, Bullets.fragGlass,
Items.blastCompound, Bullets.flakExplosive, Items.blastCompound, Bullets.fragExplosive,
Items.plastanium, Bullets.flakPlastic, Items.plastanium, Bullets.fragPlastic,
Items.surgealloy, Bullets.flakSurge Items.surgealloy, Bullets.fragSurge
); );
xRand = 4f; xRand = 4f;
reloadTime = 6f; reloadTime = 6f;
@@ -1592,7 +1592,6 @@ public class Blocks implements ContentList{
inaccuracy = 10f; inaccuracy = 10f;
shootCone = 30f; shootCone = 30f;
shootSound = Sounds.shootSnap; shootSound = Sounds.shootSnap;
targetGround = false;
health = 145 * size * size; health = 145 * size * size;
}}; }};

51
core/src/mindustry/content/Bullets.java
View File

@@ -20,7 +20,10 @@ public class Bullets implements ContentList{
artilleryDense, artilleryPlastic, artilleryPlasticFrag, artilleryHoming, artilleryIncendiary, artilleryExplosive, artilleryDense, artilleryPlastic, artilleryPlasticFrag, artilleryHoming, artilleryIncendiary, artilleryExplosive,
//flak //flak
flakScrap, flakLead, flakPlastic, flakExplosive, flakSurge, flakGlass, flakGlassFrag, flakPlasticFrag, flakScrap, flakLead, flakGlass, flakGlassFrag,
//frag (flak-like but hits ground)
fragGlass, fragExplosive, fragPlastic, fragSurge, fragGlassFrag, fragPlasticFrag,
//missiles //missiles
missileExplosive, missileIncendiary, missileSurge, missileJavelin, missileSwarm, missileExplosive, missileIncendiary, missileSurge, missileJavelin, missileSwarm,
@@ -171,7 +174,17 @@ public class Bullets implements ContentList{
fragBullets = 5; fragBullets = 5;
}}; }};
flakPlasticFrag = new BasicBulletType(2.5f, 10, "bullet"){{ fragGlassFrag = new BasicBulletType(3f, 5, "bullet"){{
width = 5f;
height = 12f;
shrinkY = 1f;
lifetime = 20f;
backColor = Pal.gray;
frontColor = Color.white;
despawnEffect = Fx.none;
}};
fragPlasticFrag = new BasicBulletType(2.5f, 10, "bullet"){{
width = 10f; width = 10f;
height = 12f; height = 12f;
shrinkY = 1f; shrinkY = 1f;
@@ -179,36 +192,56 @@ public class Bullets implements ContentList{
backColor = Pal.plastaniumBack; backColor = Pal.plastaniumBack;
frontColor = Pal.plastaniumFront; frontColor = Pal.plastaniumFront;
despawnEffect = Fx.none; despawnEffect = Fx.none;
collidesGround = false;
}}; }};
flakPlastic = new FlakBulletType(4f, 6){{ fragGlass = new FlakBulletType(4f, 3){{
splashDamageRadius = 50f; lifetime = 70f;
ammoMultiplier = 5f;
shootEffect = Fx.shootSmall;
reloadMultiplier = 0.8f;
width = 6f;
height = 8f;
hitEffect = Fx.flakExplosion;
splashDamage = 18f;
splashDamageRadius = 16f;
fragBullet = flakGlassFrag;
fragBullets = 3;
explodeRange = 20f;
collidesGround = true;
}};
fragPlastic = new FlakBulletType(4f, 6){{
splashDamageRadius = 40f;
splashDamage = 25f; splashDamage = 25f;
fragBullet = flakPlasticFrag; fragBullet = fragPlasticFrag;
fragBullets = 6; fragBullets = 5;
hitEffect = Fx.plasticExplosion; hitEffect = Fx.plasticExplosion;
frontColor = Pal.plastaniumFront; frontColor = Pal.plastaniumFront;
backColor = Pal.plastaniumBack; backColor = Pal.plastaniumBack;
shootEffect = Fx.shootBig; shootEffect = Fx.shootBig;
collidesGround = true;
explodeRange = 20f;
}}; }};
flakExplosive = new FlakBulletType(4f, 5){{ fragExplosive = new FlakBulletType(4f, 5){{
shootEffect = Fx.shootBig; shootEffect = Fx.shootBig;
ammoMultiplier = 4f; ammoMultiplier = 4f;
splashDamage = 15f; splashDamage = 15f;
splashDamageRadius = 34f; splashDamageRadius = 34f;
collidesGround = true;
status = StatusEffects.blasted; status = StatusEffects.blasted;
statusDuration = 60f; statusDuration = 60f;
}}; }};
flakSurge = new FlakBulletType(4.5f, 13){{ fragSurge = new FlakBulletType(4.5f, 13){{
splashDamage = 45f; splashDamage = 45f;
splashDamageRadius = 40f; splashDamageRadius = 40f;
lightning = 2; lightning = 2;
lightningLength = 7; lightningLength = 7;
shootEffect = Fx.shootBig; shootEffect = Fx.shootBig;
collidesGround = true;
explodeRange = 20f;
}}; }};
missileExplosive = new MissileBulletType(2.7f, 10, "missile"){{ missileExplosive = new MissileBulletType(2.7f, 10, "missile"){{