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

"artlleryIncendiary" -> "artilleryIncendiary" (#1196)

Browse Source 
* Gracious error with missing link description keys.

* Fix typo. "artlleryIncendiary" -> "artilleryIncendiary"

* Revert "Gracious error with missing link description keys."

This reverts commit ff5a470560.
This commit is contained in:
TsjipTsjip
2019-12-11 16:17:28 +01:00
committed by Anuken
parent aeb6e6498e
commit 324f6351ea
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/io/anuke/mindustry/content/Blocks.java
View File

@@ -1360,7 +1360,7 @@ public class Blocks implements ContentList{
ammo( ammo(
Items.graphite, Bullets.artilleryDense, Items.graphite, Bullets.artilleryDense,
Items.silicon, Bullets.artilleryHoming, Items.silicon, Bullets.artilleryHoming,
Items.pyratite, Bullets.artlleryIncendiary Items.pyratite, Bullets.artilleryIncendiary
); );
reload = 60f; reload = 60f;
recoil = 2f; recoil = 2f;
@@ -1540,7 +1540,7 @@ public class Blocks implements ContentList{
ammo( ammo(
Items.graphite, Bullets.artilleryDense, Items.graphite, Bullets.artilleryDense,
Items.silicon, Bullets.artilleryHoming, Items.silicon, Bullets.artilleryHoming,
Items.pyratite, Bullets.artlleryIncendiary, Items.pyratite, Bullets.artilleryIncendiary,
Items.blastCompound, Bullets.artilleryExplosive, Items.blastCompound, Bullets.artilleryExplosive,
Items.plastanium, Bullets.arilleryPlastic Items.plastanium, Bullets.arilleryPlastic
); );

4
core/src/io/anuke/mindustry/content/Bullets.java
View File

@@ -18,7 +18,7 @@ public class Bullets implements ContentList{
public static BulletType public static BulletType
//artillery //artillery
artilleryDense, arilleryPlastic, artilleryPlasticFrag, artilleryHoming, artlleryIncendiary, artilleryExplosive, artilleryUnit, artilleryDense, arilleryPlastic, artilleryPlasticFrag, artilleryHoming, artilleryIncendiary, artilleryExplosive, artilleryUnit,
//flak //flak
flakScrap, flakLead, flakPlastic, flakExplosive, flakSurge, flakGlass, glassFrag, flakScrap, flakLead, flakPlastic, flakExplosive, flakSurge, flakGlass, glassFrag,
@@ -91,7 +91,7 @@ public class Bullets implements ContentList{
homingRange = 50f; homingRange = 50f;
}}; }};
artlleryIncendiary = new ArtilleryBulletType(3f, 0, "shell"){{ artilleryIncendiary = new ArtilleryBulletType(3f, 0, "shell"){{
hitEffect = Fx.blastExplosion; hitEffect = Fx.blastExplosion;
knockback = 0.8f; knockback = 0.8f;
lifetime = 60f; lifetime = 60f;