Merge remote-tracking branch 'origin/master'

2020-10-24 10:22:04 -04:00
parent 646b022d38 4e6faf3bac
commit ddbca62f92
2 changed files with 58 additions and 58 deletions
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -1651,19 +1651,19 @@ public class Blocks implements ContentList{
            float brange = range + 10f;

            ammo(
-            Items.thorium, new ShrapnelBulletType(){{
-                length = brange;
-                damage = 105f;
-                ammoMultiplier = 5f;
-                toColor = Pal.thoriumPink;
-                shootEffect = smokeEffect = Fx.thoriumShoot;
-            }},
            Items.titanium, new ShrapnelBulletType(){{
                length = brange;
                damage = 66f;
                ammoMultiplier = 4f;
                width = 17f;
                reloadMultiplier = 1.3f;
+            }},
+            Items.thorium, new ShrapnelBulletType(){{
+                length = brange;
+                damage = 105f;
+                ammoMultiplier = 5f;
+                toColor = Pal.thoriumPink;
+                shootEffect = smokeEffect = Fx.thoriumShoot;
            }}
            );
        }};