Re-implement E/R controls, add toggle UI button for debugging

This commit is contained in:
Anuken
2017-12-12 14:28:51 -05:00
parent c7c7021699
commit de6ccbbc88
11 changed files with 42 additions and 16 deletions
@@ -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);
@@ -98,7 +98,7 @@ public class WaveCreator{
new EnemySpawn(TitanEnemy.class){{
after = 16;
amount = 2;
amount = 1;
spacing = 5;
scaling = 3;
tierscaleback = 0;
@@ -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();
}
}
}
@@ -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;
}