This commit is contained in:
Anuken
2022-08-19 20:08:08 -04:00
parent 34674f2297
commit a8900d28f9
2 changed files with 7 additions and 5 deletions
+6 -4
View File
@@ -4091,6 +4091,7 @@ public class Blocks{
rotateSpeed = 1.4f; rotateSpeed = 1.4f;
minWarmup = 0.85f; minWarmup = 0.85f;
shootWarmupSpeed = 0.07f; shootWarmupSpeed = 0.07f;
shootSound = Sounds.artillery;
coolant = consume(new ConsumeLiquid(Liquids.water, 30f / 60f)); coolant = consume(new ConsumeLiquid(Liquids.water, 30f / 60f));
coolantMultiplier = 1.5f; coolantMultiplier = 1.5f;
@@ -4159,6 +4160,7 @@ public class Blocks{
rotateSpeed = 5f; rotateSpeed = 5f;
shootCone = 30f; shootCone = 30f;
consumeAmmoOnce = true; consumeAmmoOnce = true;
shootSound = Sounds.shootBig;
drawer = new DrawTurret("reinforced-"){{ drawer = new DrawTurret("reinforced-"){{
parts.add(new RegionPart("-side"){{ parts.add(new RegionPart("-side"){{
@@ -4166,15 +4168,15 @@ public class Blocks{
under = true; under = true;
moveX = 1.75f; moveX = 1.75f;
moveY = -0.5f; moveY = -0.5f;
}}); }},
parts.add(new RegionPart("-mid"){{ new RegionPart("-mid"){{
under = true; under = true;
moveY = -1.5f; moveY = -1.5f;
progress = PartProgress.recoil; progress = PartProgress.recoil;
heatProgress = PartProgress.recoil.add(0.25f).min(PartProgress.warmup); heatProgress = PartProgress.recoil.add(0.25f).min(PartProgress.warmup);
heatColor = Color.sky.cpy().a(0.9f); heatColor = Color.sky.cpy().a(0.9f);
}}); }},
parts.add(new RegionPart("-blade"){{ new RegionPart("-blade"){{
heatProgress = PartProgress.warmup; heatProgress = PartProgress.warmup;
heatColor = Color.sky.cpy().a(0.9f); heatColor = Color.sky.cpy().a(0.9f);
mirror = true; mirror = true;
+1 -1
View File
@@ -450,7 +450,7 @@ public class World{
public void checkMapArea(){ public void checkMapArea(){
for(var build : Groups.build){ for(var build : Groups.build){
//reset map-area-based disabled blocks. //reset map-area-based disabled blocks.
if(build.allowUpdate() && !build.enabled){ if(build.allowUpdate() && !build.enabled && build.block.autoResetEnabled){
build.enabled = true; build.enabled = true;
} }
} }