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

Unused bullet cleanup

Browse Source
This commit is contained in:
Anuken
2020-10-25 20:04:14 -04:00
parent 514aa26054
commit 526b1add26
2 changed files with 5 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,14 +30,14 @@ public class Bullets implements ContentList{
missileExplosive, missileIncendiary, missileSurge, missileExplosive, missileIncendiary, missileSurge,
//standard //standard
standardCopper, standardDense, standardThorium, standardHoming, standardIncendiary, standardMechSmall, standardCopper, standardDense, standardThorium, standardHoming, standardIncendiary,
standardGlaive, standardDenseBig, standardThoriumBig, standardIncendiaryBig, standardDenseBig, standardThoriumBig, standardIncendiaryBig,
//liquid //liquid
waterShot, cryoShot, slagShot, oilShot, heavyWaterShot, heavyCryoShot, heavySlagShot, heavyOilShot, waterShot, cryoShot, slagShot, oilShot, heavyWaterShot, heavyCryoShot, heavySlagShot, heavyOilShot,
//environment, misc. //environment, misc.
damageLightning, damageLightningGround, fireball, basicFlame, pyraFlame, driverBolt, healBullet, healBulletBig, frag; damageLightning, damageLightningGround, fireball, basicFlame, pyraFlame, driverBolt, healBullet, healBulletBig;
@Override @Override
public void load(){ public void load(){
@@ -327,23 +327,6 @@ public class Bullets implements ContentList{
lifetime = 60f; lifetime = 60f;
}}; }};
standardGlaive = new BasicBulletType(4f, 7.5f, "bullet"){{
width = 10f;
height = 12f;
frontColor = Color.valueOf("feb380");
backColor = Color.valueOf("ea8878");
status = StatusEffects.burning;
lifetime = 60f;
}};
standardMechSmall = new BasicBulletType(4f, 9, "bullet"){{
width = 11f;
height = 14f;
lifetime = 40f;
inaccuracy = 5f;
despawnEffect = Fx.hitBulletSmall;
}};
standardDenseBig = new BasicBulletType(7f, 55, "bullet"){{ standardDenseBig = new BasicBulletType(7f, 55, "bullet"){{
width = 15f; width = 15f;
height = 21f; height = 21f;
@@ -528,13 +511,5 @@ public class Bullets implements ContentList{
}}; }};
driverBolt = new MassDriverBolt(); driverBolt = new MassDriverBolt();
frag = new BasicBulletType(5f, 8, "bullet"){{
width = 8f;
height = 9f;
shrinkY = 0.5f;
lifetime = 50f;
drag = 0.04f;
}};
} }
} }

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

@@ -1127,11 +1127,11 @@ public class UnitTypes implements ContentList{
flying = true; flying = true;
drag = 0.06f; drag = 0.06f;
accel = 0.12f; accel = 0.12f;
speed = 1.1f; speed = 2f;
health = 100; health = 100;
engineSize = 1.8f; engineSize = 1.8f;
engineOffset = 5.7f; engineOffset = 5.7f;
range = 50f; range = 56f;
isCounted = false; isCounted = false;
ammoType = AmmoTypes.powerLow; ammoType = AmmoTypes.powerLow;