From de6ccbbc8838c20097559f9b8f5b9f5d58c5648d Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 12 Dec 2017 14:28:51 -0500
Subject: [PATCH] Re-implement E/R controls, add toggle UI button for debugging

---
 core/assets/maps/out-1512092193155.png         | Bin 1855 -> 0 bytes
 core/src/io/anuke/mindustry/Vars.java          |   7 ++++++-
 core/src/io/anuke/mindustry/core/Control.java  |   8 +++++++-
 core/src/io/anuke/mindustry/core/Renderer.java |  17 ++++++++++-------
 core/src/io/anuke/mindustry/core/UI.java       |   2 ++
 .../io/anuke/mindustry/entities/Player.java    |   2 +-
 .../anuke/mindustry/entities/WaveCreator.java  |   2 +-
 .../mindustry/entities/enemies/Enemy.java      |   4 +++-
 .../entities/enemies/FortressEnemy.java        |   6 +++---
 core/src/io/anuke/mindustry/input/Input.java   |   8 ++++++++
 .../mindustry/ui/fragments/BlocksFragment.java |   2 +-
 11 files changed, 42 insertions(+), 16 deletions(-)
 delete mode 100644 core/assets/maps/out-1512092193155.png

diff --git a/core/assets/maps/out-1512092193155.png b/core/assets/maps/out-1512092193155.png
deleted file mode 100644
index fcfcaced42ae1da256722bbabe39dcaaae95ffed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1855
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
LS3j3^P6<r_;zjK*

diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java
index b8cafc3abc..e2cedc2425 100644
--- a/core/src/io/anuke/mindustry/Vars.java
+++ b/core/src/io/anuke/mindustry/Vars.java
@@ -2,6 +2,7 @@ package io.anuke.mindustry;
 
 import com.badlogic.gdx.Application.ApplicationType;
 import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.utils.I18NBundle;
 
 import io.anuke.mindustry.core.Control;
 import io.anuke.mindustry.core.Renderer;
@@ -50,8 +51,10 @@ public class Vars{
 	public static boolean showPaths = false;
 	//if false, player is always hidden
 	public static boolean showPlayer = true;
+	//whether to hide ui, only on debug
+	public static boolean showUI = true;
 	//number of save slots-- increasing may lead to layout issues
-	//TODO named save slots, possibly with a scroll dialog
+	//TODO named save slots
 	public static final int saveSlots = 8;
 	//amount of drops that are left when breaking a block
 	public static final float breakDropAmount = 0.5f;
@@ -64,6 +67,8 @@ public class Vars{
 	
 	public static final int tilesize = 8;
 	
+	public static I18NBundle bundle;
+	
 	public static Control control;
 	public static Renderer renderer;
 	public static UI ui;
diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java
index 22c46924ea..3fef00d29a 100644
--- a/core/src/io/anuke/mindustry/core/Control.java
+++ b/core/src/io/anuke/mindustry/core/Control.java
@@ -106,7 +106,9 @@ public class Control extends Module{
 			"zoom_hold", Keys.CONTROL_LEFT,
 			"menu", Gdx.app.getType() == ApplicationType.Android ? Keys.BACK : Keys.ESCAPE,
 			"pause", Keys.SPACE,
-			"dash", Keys.SHIFT_LEFT
+			"dash", Keys.SHIFT_LEFT,
+			"rotate_right", Keys.R,
+			"rotate_left", Keys.E
 		);
 		
 		for(int i = 0; i < Vars.saveSlots; i ++){
@@ -419,6 +421,10 @@ public class Control extends Module{
 				wavetime = 0f;
 			}
 			
+			if(Inputs.keyUp(Keys.U)){
+				Vars.showUI = !Vars.showUI;
+			}
+			
 			if(Inputs.keyUp(Keys.O)){
 				Vars.noclip = !Vars.noclip;
 			}
diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java
index 333a0ce0cd..73aaf8d443 100644
--- a/core/src/io/anuke/mindustry/core/Renderer.java
+++ b/core/src/io/anuke/mindustry/core/Renderer.java
@@ -191,7 +191,7 @@ public class Renderer extends RendererModule{
 
 		drawOverlay();
 
-		if(Settings.getBool("indicators")){
+		if(Settings.getBool("indicators") && Vars.showUI){
 			drawEnemyMarkers();
 		}
 	}
@@ -561,14 +561,17 @@ public class Renderer extends RendererModule{
 				target.block().drawSelect(target);
 			}
 		}
+		
+		if(!Vars.debug || Vars.showUI){
 
-		//draw entity health bars
-		for(Enemy entity : control.enemyGroup.all()){
-			drawHealth(entity);
+			//draw entity health bars
+			for(Enemy entity : control.enemyGroup.all()){
+				drawHealth(entity);
+			}
+
+			if(!Vars.android && Vars.showPlayer)
+				drawHealth(player);
 		}
-
-		if(!Vars.android && Vars.showPlayer)
-			drawHealth(player);
 	}
 
 	void drawHealth(DestructibleEntity dest){
diff --git a/core/src/io/anuke/mindustry/core/UI.java b/core/src/io/anuke/mindustry/core/UI.java
index feb8f1ad39..9eb6418e86 100644
--- a/core/src/io/anuke/mindustry/core/UI.java
+++ b/core/src/io/anuke/mindustry/core/UI.java
@@ -131,6 +131,8 @@ public class UI extends SceneModule{
 
 	@Override
 	public void update(){
+		if(Vars.debug && !Vars.showUI) return;
+		
 		Profiler.begin("ui");
 		
 		if(nplay.visible()){
diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java
index fb393c8680..5418e662b2 100644
--- a/core/src/io/anuke/mindustry/entities/Player.java
+++ b/core/src/io/anuke/mindustry/entities/Player.java
@@ -56,7 +56,7 @@ public class Player extends DestructibleEntity{
 	
 	@Override
 	public void draw(){
-		if(!Vars.showPlayer) return;
+		if(Vars.debug && (!Vars.showPlayer || !Vars.showUI)) return;
 		
 		if(Vars.snapCamera && Settings.getBool("smoothcam") && Settings.getBool("pixelate")){
 			Draw.rect("mech-"+mech.name(), (int)x, (int)y, direction.angle()-90);
diff --git a/core/src/io/anuke/mindustry/entities/WaveCreator.java b/core/src/io/anuke/mindustry/entities/WaveCreator.java
index b4c32d801b..a725011bcc 100644
--- a/core/src/io/anuke/mindustry/entities/WaveCreator.java
+++ b/core/src/io/anuke/mindustry/entities/WaveCreator.java
@@ -98,7 +98,7 @@ public class WaveCreator{
 			
 			new EnemySpawn(TitanEnemy.class){{
 				after = 16;
-				amount = 2;
+				amount = 1;
 				spacing = 5;
 				scaling = 3;
 				tierscaleback = 0;
diff --git a/core/src/io/anuke/mindustry/entities/enemies/Enemy.java b/core/src/io/anuke/mindustry/entities/enemies/Enemy.java
index 079484fa88..1bbc597980 100644
--- a/core/src/io/anuke/mindustry/entities/enemies/Enemy.java
+++ b/core/src/io/anuke/mindustry/entities/enemies/Enemy.java
@@ -219,9 +219,11 @@ public class Enemy extends DestructibleEntity{
 	@Override
 	public void removed(){
 		if(!dead){
-			Vars.control.enemyDeath();
+			
 			if(spawner != null){
 				spawner.spawned --;
+			}else{
+				Vars.control.enemyDeath();
 			}
 		}
 	}
diff --git a/core/src/io/anuke/mindustry/entities/enemies/FortressEnemy.java b/core/src/io/anuke/mindustry/entities/enemies/FortressEnemy.java
index e87a602ade..503868d794 100644
--- a/core/src/io/anuke/mindustry/entities/enemies/FortressEnemy.java
+++ b/core/src/io/anuke/mindustry/entities/enemies/FortressEnemy.java
@@ -10,14 +10,14 @@ import io.anuke.ucore.util.Angles;
 public class FortressEnemy extends Enemy{
 	static int maxSpawn = 6;
 	
-	float spawnTime = 240;
+	float spawnTime = 190;
 	boolean deployed;
 
 	public FortressEnemy() {
 		
 		speed = 0.25f;
 		reload = 90;
-		maxhealth = 800;
+		maxhealth = 700;
 		range = 70f;
 		bullet = BulletType.yellowshell;
 		hitbox.setSize(10f);
@@ -47,7 +47,7 @@ public class FortressEnemy extends Enemy{
 				spawned ++;
 			}
 		}else if(distanceTo(Vars.control.getCore().worldx(), 
-				Vars.control.getCore().worldy()) <= 120f){
+				Vars.control.getCore().worldy()) <= 90f){
 			deployed = true;
 			speed = 0.001f;
 		}
diff --git a/core/src/io/anuke/mindustry/input/Input.java b/core/src/io/anuke/mindustry/input/Input.java
index 5f6ae171ac..b970beb563 100644
--- a/core/src/io/anuke/mindustry/input/Input.java
+++ b/core/src/io/anuke/mindustry/input/Input.java
@@ -33,6 +33,14 @@ public class Input{
 			player.rotation += Inputs.scroll();
 		}
 		
+		if(Inputs.keyUp("rotate_right")){
+			player.rotation --;
+		}
+		
+		if(Inputs.keyUp("rotate_left")){
+			player.rotation ++;
+		}
+		
 		player.rotation = Mathf.mod(player.rotation, 4);
 		
 		for(int i = 0; i < 9; i ++){
diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java
index e6a6153477..65f1e4ae57 100644
--- a/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java
@@ -157,7 +157,7 @@ public class BlocksFragment implements Fragment{
 		header.addImage(region).size(8*5).padTop(4).units(Unit.dp);
 		Label nameLabel = new Label(recipe.result.formalName);
 		nameLabel.setWrap(true);
-		header.add(nameLabel).padLeft(4).width(135f).units(Unit.dp);
+		header.add(nameLabel).padLeft(2).width(135f).units(Unit.dp);
 		
 		//extra info
 		if(recipe.result.fullDescription != null){