From 5a594f7d9a9a4769093d3dc3e4501d3efb5de17c Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 22 Jul 2019 18:47:23 -0400 Subject: [PATCH] Bugfixes / unfinished new zones --- core/assets/bundles/bundle.properties | 2 ++ core/src/io/anuke/mindustry/content/Bullets.java | 3 +++ core/src/io/anuke/mindustry/content/Zones.java | 2 +- core/src/io/anuke/mindustry/core/Control.java | 2 +- core/src/io/anuke/mindustry/editor/EditorTool.java | 2 +- .../io/anuke/mindustry/world/blocks/power/ImpactReactor.java | 2 +- .../io/anuke/mindustry/world/blocks/power/NuclearReactor.java | 2 +- 7 files changed, 10 insertions(+), 5 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 0214cb7001..2cc7c9616b 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -350,6 +350,8 @@ zone.nuclearComplex.name = Nuclear Production Complex zone.overgrowth.name = Overgrowth zone.tarFields.name = Tar Fields zone.saltFlats.name = Salt Flats [scarlet][[WIP] +zone.impact0078.name = Impact 0078 +zone.crags.name = Crags settings.language = Language settings.reset = Reset to Defaults diff --git a/core/src/io/anuke/mindustry/content/Bullets.java b/core/src/io/anuke/mindustry/content/Bullets.java index ae7ad0a305..13d4496693 100644 --- a/core/src/io/anuke/mindustry/content/Bullets.java +++ b/core/src/io/anuke/mindustry/content/Bullets.java @@ -115,6 +115,7 @@ public class Bullets implements ContentList{ lifetime = 70f; bulletWidth = bulletHeight = 14f; collidesTiles = false; + ammoMultiplier = 2f; splashDamageRadius = 45f; splashDamage = 50f; backColor = Pal.missileYellowBack; @@ -170,6 +171,7 @@ public class Bullets implements ContentList{ flakExplosive = new FlakBulletType(4f, 5){{ //default bullet type, no changes shootEffect = Fx.shootBig; + ammoMultiplier = 2f; }}; flakSurge = new FlakBulletType(4f, 7){{ @@ -186,6 +188,7 @@ public class Bullets implements ContentList{ drag = -0.01f; splashDamageRadius = 30f; splashDamage = 30f; + ammoMultiplier = 2f; lifetime = 150f; hitEffect = Fx.blastExplosion; despawnEffect = Fx.blastExplosion; diff --git a/core/src/io/anuke/mindustry/content/Zones.java b/core/src/io/anuke/mindustry/content/Zones.java index 2f5b01f698..9314188487 100644 --- a/core/src/io/anuke/mindustry/content/Zones.java +++ b/core/src/io/anuke/mindustry/content/Zones.java @@ -168,7 +168,7 @@ public class Zones implements ContentList{ startingItems = ItemStack.list(Items.copper, 2000, Items.lead, 2000, Items.graphite, 500, Items.titanium, 500, Items.silicon, 500); conditionWave = 3; launchPeriod = 2; - zoneRequirements = ZoneRequirement.with(frozenForest, 40); + zoneRequirements = ZoneRequirement.with(nuclearComplex, 40); blockRequirements = new Block[]{Blocks.thermalGenerator}; resources = new Item[]{Items.copper, Items.scrap, Items.lead, Items.coal, Items.titanium, Items.sand, Items.thorium}; }}; diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java index d5e5f5e111..baa5204a34 100644 --- a/core/src/io/anuke/mindustry/core/Control.java +++ b/core/src/io/anuke/mindustry/core/Control.java @@ -116,7 +116,7 @@ public class Control implements ApplicationListener{ Effects.shake(5, 6, Core.camera.position.x, Core.camera.position.y); //the restart dialog can show info for any number of scenarios Call.onGameOver(event.winner); - if(state.rules.zone != null){ + if(state.rules.zone != null && !Net.client()){ //remove zone save on game over if(saves.getZoneSlot() != null){ saves.getZoneSlot().delete(); diff --git a/core/src/io/anuke/mindustry/editor/EditorTool.java b/core/src/io/anuke/mindustry/editor/EditorTool.java index abc89b19df..9da41ad7f2 100644 --- a/core/src/io/anuke/mindustry/editor/EditorTool.java +++ b/core/src/io/anuke/mindustry/editor/EditorTool.java @@ -130,7 +130,7 @@ public enum EditorTool{ Block dest = tile.block(); if(dest == editor.drawBlock) return; tester = t -> t.block() == dest; - setter = t -> t.setBlock(editor.drawBlock); + setter = t -> t.setBlock(editor.drawBlock, editor.drawTeam); } //replace only when the mode is 0 using the specified functions diff --git a/core/src/io/anuke/mindustry/world/blocks/power/ImpactReactor.java b/core/src/io/anuke/mindustry/world/blocks/power/ImpactReactor.java index 541643c2d7..95881ec265 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/ImpactReactor.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/ImpactReactor.java @@ -79,7 +79,7 @@ public class ImpactReactor extends PowerGenerator{ entity.warmup = 1f; } - if(entity.timer.get(timerUse, itemDuration)){ + if(entity.timer.get(timerUse, itemDuration / entity.timeScale)){ entity.cons.trigger(); } }else{ diff --git a/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java b/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java index 469c2c1240..4938d96e3c 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java @@ -85,7 +85,7 @@ public class NuclearReactor extends PowerGenerator{ if(fuel > 0){ entity.heat += fullness * heating * Math.min(entity.delta(), 4f); - if(entity.timer.get(timerFuel, itemDuration)){ + if(entity.timer.get(timerFuel, itemDuration / entity.timeScale)){ entity.cons.trigger(); } }