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

Merge pull request #3083 from genNAowl/titanium-ammo-fuse

Browse Source 
Switch places of titanium and thorium ammo in `Blocks.java`
This commit is contained in:
Anuken
2020-10-24 09:47:21 -04:00
committed by GitHub
parent 48f5007306 f2a984f3e7
commit 4e6faf3bac
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1651,19 +1651,19 @@ public class Blocks implements ContentList{
float brange = range + 10f; float brange = range + 10f;
ammo( ammo(
Items.thorium, new ShrapnelBulletType(){{
length = brange;
damage = 105f;
ammoMultiplier = 5f;
toColor = Pal.thoriumPink;
shootEffect = smokeEffect = Fx.thoriumShoot;
}},
Items.titanium, new ShrapnelBulletType(){{ Items.titanium, new ShrapnelBulletType(){{
length = brange; length = brange;
damage = 66f; damage = 66f;
ammoMultiplier = 4f; ammoMultiplier = 4f;
width = 17f; width = 17f;
reloadMultiplier = 1.3f; reloadMultiplier = 1.3f;
}},
Items.thorium, new ShrapnelBulletType(){{
length = brange;
damage = 105f;
ammoMultiplier = 5f;
toColor = Pal.thoriumPink;
shootEffect = smokeEffect = Fx.thoriumShoot;
}} }}
); );
}}; }};