Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken
2019-09-04 23:16:33 -04:00

View File

@@ -1407,12 +1407,12 @@ public class Blocks implements ContentList{
arc = new PowerTurret("arc"){{ arc = new PowerTurret("arc"){{
requirements(Category.turret, ItemStack.with(Items.copper, 35, Items.lead, 50)); requirements(Category.turret, ItemStack.with(Items.copper, 35, Items.lead, 50));
shootType = Bullets.arc; shootType = Bullets.arc;
reload = 24f; reload = 30f;
shootCone = 40f; shootCone = 40f;
rotatespeed = 8f; rotatespeed = 8f;
powerUse = 0.9f; powerUse = 1.5f;
targetAir = false; targetAir = false;
range = 95f; range = 90f;
shootEffect = Fx.lightningShoot; shootEffect = Fx.lightningShoot;
heatColor = Color.RED; heatColor = Color.RED;
recoil = 1f; recoil = 1f;
@@ -1775,4 +1775,4 @@ public class Blocks implements ContentList{
//endregion //endregion
} }
} }