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

Fixed #2895

Browse Source
This commit is contained in:
Anuken
2020-10-10 13:15:59 -04:00
parent 837a8cecb3
commit d61ad8d2ef
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -355,6 +355,7 @@ public class Bullets implements ContentList{
height = 23f;
shootEffect = Fx.shootBig;
pierceCap = 2;
pierceBuilding = true;
}};
standardIncendiaryBig = new BasicBulletType(7f, 60, "bullet"){{
@@ -365,6 +366,7 @@ public class Bullets implements ContentList{
status = StatusEffects.burning;
shootEffect = Fx.shootBig;
pierceCap = 2;
pierceBuilding = true;
}};
damageLightning = new BulletType(0.0001f, 0f){{

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

@@ -164,7 +164,7 @@ public class UnitTypes implements ContentList{
y = 1f;
x = 16f;
shootY = 8f;
reload = 50f;
reload = 45f;
recoil = 5f;
shake = 2f;
ejectEffect = Fx.shellEjectBig;
@@ -173,7 +173,7 @@ public class UnitTypes implements ContentList{
inaccuracy = 3f;
shotDelay = 4f;
bullet = new BasicBulletType(7f, 45){{
bullet = new BasicBulletType(7f, 50){{
width = 11f;
height = 20f;
lifetime = 25f;
@@ -182,7 +182,7 @@ public class UnitTypes implements ContentList{
lightningLength = 6;
lightningColor = Pal.surge;
//standard bullet damage is far too much for lightning
lightningDamage = 25;
lightningDamage = 30;
}};
}},
@@ -230,8 +230,9 @@ public class UnitTypes implements ContentList{
ejectEffect = Fx.shellEjectBig;
shootSound = Sounds.artillery;
bullet = new BasicBulletType(13f, 55){{
bullet = new BasicBulletType(13f, 60){{
pierce = true;
pierceCap = 10;
width = 14f;
height = 33f;
lifetime = 15f;
@@ -250,6 +251,8 @@ public class UnitTypes implements ContentList{
width = 10f;
height = 10f;
pierce = true;
pierceBuilding = true;
pierceCap = 3;
lifetime = 20f;
hitEffect = Fx.flakExplosion;