From 4d360bfb7351043300edcf4e9191924ad35c923c Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 18 Oct 2018 09:19:29 -0400 Subject: [PATCH] Bugfixes --- core/assets/bundles/bundle.properties | 6 +++--- core/src/io/anuke/mindustry/core/Renderer.java | 2 +- core/src/io/anuke/mindustry/entities/Player.java | 4 ++++ core/src/io/anuke/mindustry/type/Mech.java | 7 ------- .../anuke/mindustry/world/blocks/storage/CoreBlock.java | 9 +++++---- .../io/anuke/mindustry/world/blocks/units/MechPad.java | 1 + 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index bec750319b..e972b6fc81 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -667,15 +667,15 @@ team.purple.name=purple unit.alpha-drone.name=Alpha Drone unit.spirit.name=Spirit Drone -unit.spirit.description=The starter drone unit. Spawns in the core by default. Automatically mines ores, collects items and repairs blocks. +unit.spirit.description=The starter drone unit. Spawns in the core by default. Automatically mines ores and repairs blocks. unit.phantom.name=Phantom Drone -unit.phantom.description=An advanced drone unit. Automatically mines ores, collects items and repairs blocks. Significantly more effective than a drone. +unit.phantom.description=An advanced drone unit. Automatically mines ores and repairs blocks. Significantly more effective than a spirit drone. unit.dagger.name=Dagger unit.dagger.description=A basic ground unit. Useful in swarms. unit.titan.name=Titan unit.titan.description=An advanced, armored ground unit. Attacks both ground and air targets. unit.ghoul.name=Ghoul Bomber -unit.ghoul.description=A heavy carpet bomber. Uses blast compound or pyratite as ammo. +unit.ghoul.description=A heavy carpet bomber. unit.wraith.name=Wraith Fighter unit.wraith.description=A fast, hit-and-run interceptor unit. unit.fortress.name=Fortress diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java index 9caba8c546..b9e9ea9567 100644 --- a/core/src/io/anuke/mindustry/core/Renderer.java +++ b/core/src/io/anuke/mindustry/core/Renderer.java @@ -145,7 +145,7 @@ public class Renderer extends RendererModule{ if(players[0].isDead()){ TileEntity core = players[0].getClosestCore(); - if(core != null){ + if(core != null && players[0].spawner == -1){ smoothCamera(core.x, core.y, 0.08f); }else{ smoothCamera(position.x + 0.0001f, position.y + 0.0001f, 0.08f); diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java index 179e9856e5..82292dd224 100644 --- a/core/src/io/anuke/mindustry/entities/Player.java +++ b/core/src/io/anuke/mindustry/entities/Player.java @@ -789,6 +789,10 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra this.dead = true; } + public void endRespawning(){ + spawner = -1; + } + //endregion //region read and write methods diff --git a/core/src/io/anuke/mindustry/type/Mech.java b/core/src/io/anuke/mindustry/type/Mech.java index 92c11cfdf4..007435cde1 100644 --- a/core/src/io/anuke/mindustry/type/Mech.java +++ b/core/src/io/anuke/mindustry/type/Mech.java @@ -11,8 +11,6 @@ import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.scene.ui.layout.Table; import io.anuke.ucore.util.Bundles; -import static io.anuke.mindustry.Vars.mobile; - //TODO merge unit type with mech public class Mech extends UnlockableContent{ public final String name; @@ -73,11 +71,6 @@ public class Mech extends UnlockableContent{ public void onLand(Player player){} - @Override - public boolean isHidden() { - return !flying && mobile; - } - @Override public void displayInfo(Table table){ ContentDisplay.displayMech(table, this); diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java index 87ea6f3b20..967fb61ab7 100644 --- a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java @@ -29,16 +29,13 @@ import io.anuke.ucore.core.Timers; import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.graphics.Lines; import io.anuke.ucore.util.EnumSet; -import io.anuke.ucore.util.Log; import io.anuke.ucore.util.Mathf; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import static io.anuke.mindustry.Vars.netServer; -import static io.anuke.mindustry.Vars.state; -import static io.anuke.mindustry.Vars.unitGroups; +import static io.anuke.mindustry.Vars.*; public class CoreBlock extends StorageBlock{ protected float droneRespawnDuration = 60 * 6; @@ -74,6 +71,10 @@ public class CoreBlock extends StorageBlock{ entity.currentUnit.setNet(tile.drawx(), tile.drawy()); entity.currentUnit.add(); entity.currentUnit = null; + + if(player instanceof Player){ + ((Player) player).endRespawning(); + } } @Remote(called = Loc.server) diff --git a/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java b/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java index ab05631341..2370dbe295 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java @@ -93,6 +93,7 @@ public class MechPad extends Block{ entity.progress = 0; entity.player.heal(); + entity.player.endRespawning(); entity.open = true; entity.player.setDead(false); entity.player.inventory.clear();