Fixed turrets saving ammo / Duo buff / Ammo display / Map saves break

This commit is contained in:
Anuken
2019-02-07 10:11:16 -05:00
parent cee9d86835
commit c2919f7e7a
5 changed files with 28 additions and 6 deletions
@@ -1041,7 +1041,7 @@ public class Blocks implements ContentList{
//region turrets
duo = new DoubleTurret("duo"){{
requirements(Category.turret, ItemStack.with(Items.copper, 60), true);
requirements(Category.turret, ItemStack.with(Items.copper, 70), true);
ammo(
Items.copper, Bullets.standardCopper,
Items.graphite, Bullets.standardDense,
@@ -1050,10 +1050,10 @@ public class Blocks implements ContentList{
);
reload = 20f;
restitution = 0.03f;
range = 90f;
range = 95f;
shootCone = 15f;
ammoUseEffect = Fx.shellEjectSmall;
health = 150;
health = 210;
inaccuracy = 2f;
rotatespeed = 10f;
}};
@@ -260,12 +260,12 @@ public class Bullets implements ContentList{
weaveMag = 1f;
}};
standardCopper = new BasicBulletType(2.5f, 7, "bullet"){{
standardCopper = new BasicBulletType(2.5f, 9, "bullet"){{
bulletWidth = 7f;
bulletHeight = 9f;
shootEffect = Fx.shootSmall;
smokeEffect = Fx.shootSmallSmoke;
ammoMultiplier = 2;
ammoMultiplier = 1;
}};
standardDense = new BasicBulletType(3.5f, 18, "bullet"){{