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

Merge remote-tracking branch 'origin/7.0-features' into 7.0-features

Browse Source
This commit is contained in:
Epowerj
2022-05-01 20:19:29 -04:00
parent b982f987c8 5e7428f034
commit 0cb6f00ed2
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
core/src/mindustry/content/UnitTypes.java
View File

@@ -625,9 +625,9 @@ public class UnitTypes{
collides = false; collides = false;
hitSound = Sounds.explosion; hitSound = Sounds.explosion;
rangeOverride = 30f;
hitEffect = Fx.pulverize; hitEffect = Fx.pulverize;
lifetime = 10f; speed = 0f;
speed = 1f;
splashDamageRadius = 55f; splashDamageRadius = 55f;
instantDisappear = true; instantDisappear = true;
splashDamage = 90f; splashDamage = 90f;
@@ -3399,9 +3399,12 @@ public class UnitTypes{
itemCapacity = 0; itemCapacity = 0;
useEngineElevation = false; useEngineElevation = false;
engineColor = Pal.sapBullet; //does this look better?
//engineColor = Pal.sapBullet;
abilities.add(new MoveEffectAbility(0f, -7f, Pal.sapBulletBack, Fx.missileTrailShort, 4f)); abilities.add(new MoveEffectAbility(0f, -7f, Pal.sapBulletBack, Fx.missileTrailShort, 4f){{
teamColor = true;
}});
for(float f : new float[]{-3f, 3f}){ for(float f : new float[]{-3f, 3f}){
parts.add(new HoverPart(){{ parts.add(new HoverPart(){{
@@ -3430,12 +3433,12 @@ public class UnitTypes{
spread = 11f; spread = 11f;
}}; }};
bullet = new BasicBulletType(5f, 20){{ bullet = new BasicBulletType(5f, 18){{
homingPower = 0.2f; homingPower = 0.19f;
homingDelay = 4f; homingDelay = 4f;
width = 7f; width = 7f;
height = 12f; height = 12f;
lifetime = 50f; lifetime = 30f;
shootEffect = Fx.sparkShoot; shootEffect = Fx.sparkShoot;
smokeEffect = Fx.shootBigSmoke; smokeEffect = Fx.shootBigSmoke;
hitColor = backColor = trailColor = Pal.suppress; hitColor = backColor = trailColor = Pal.suppress;
@@ -3501,7 +3504,7 @@ public class UnitTypes{
rotateSpeed = 2.5f; rotateSpeed = 2.5f;
accel = 0.09f; accel = 0.09f;
health = 2300f; health = 2300f;
armor = 3f; armor = 6f;
hitSize = 18f; hitSize = 18f;
engineSize = 4.3f; engineSize = 4.3f;
engineOffset = 54f / 4f; engineOffset = 54f / 4f;
@@ -3562,7 +3565,7 @@ public class UnitTypes{
trailParam = 4f; trailParam = 4f;
speed = 3f; speed = 3f;
damage = 80f; damage = 80f;
lifetime = 70f; lifetime = 75f;
width = height = 15f; width = height = 15f;
backColor = Pal.sapBulletBack; backColor = Pal.sapBulletBack;
frontColor = Pal.sapBullet; frontColor = Pal.sapBullet;
@@ -3575,15 +3578,15 @@ public class UnitTypes{
smokeColor = Color.gray; smokeColor = Color.gray;
sparkColor = Pal.sap; sparkColor = Pal.sap;
waveStroke = 4f; waveStroke = 4f;
waveRad = 20f; waveRad = 40f;
}}; }};
intervalBullet = new LightningBulletType(){{ intervalBullet = new LightningBulletType(){{
damage = 15; damage = 18;
collidesAir = false; collidesAir = false;
ammoMultiplier = 1f; ammoMultiplier = 1f;
lightningColor = Pal.sapBullet; lightningColor = Pal.sapBullet;
lightningLength = 2; lightningLength = 3;
lightningLengthRand = 6; lightningLengthRand = 6;
//for visual stats only. //for visual stats only.
@@ -3604,7 +3607,7 @@ public class UnitTypes{
bulletInterval = 4f; bulletInterval = 4f;
lightningColor = Pal.sapBullet; lightningColor = Pal.sapBullet;
lightningDamage = 19; lightningDamage = 21;
lightning = 8; lightning = 8;
lightningLength = 2; lightningLength = 2;
lightningLengthRand = 8; lightningLengthRand = 8;