Fix game-over bypass bug, de-blur icons
Before Width: | Height: | Size: 5.6 KiB After Width: | Height: | Size: 2.1 KiB |
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 9.6 KiB After Width: | Height: | Size: 2.3 KiB |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 3.0 KiB |
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 3.8 KiB |
@ -22,7 +22,7 @@ public class Vars{
|
|||||||
//respawn time in frames
|
//respawn time in frames
|
||||||
public static final float respawnduration = 60*4;
|
public static final float respawnduration = 60*4;
|
||||||
//time between waves in frames (on normal mode)
|
//time between waves in frames (on normal mode)
|
||||||
public static final float wavespace = 50*60*(android ? 1 : 1);
|
public static final float wavespace = 60*60*(android ? 1 : 1);
|
||||||
//waves can last no longer than 5 minutes, otherwise the next one spawns
|
//waves can last no longer than 5 minutes, otherwise the next one spawns
|
||||||
public static final float maxwavespace = 60*60*5;
|
public static final float maxwavespace = 60*60*5;
|
||||||
//advance time the pathfinding starts at
|
//advance time the pathfinding starts at
|
||||||
|
@ -458,7 +458,7 @@ public class Control extends Module{
|
|||||||
|
|
||||||
if(!GameState.is(State.menu)){
|
if(!GameState.is(State.menu)){
|
||||||
|
|
||||||
if(Inputs.keyUp("pause") && (GameState.is(State.paused) || GameState.is(State.playing))){
|
if(Inputs.keyUp("pause") && !ui.isGameOver() && (GameState.is(State.paused) || GameState.is(State.playing))){
|
||||||
GameState.set(GameState.is(State.playing) ? State.paused : State.playing);
|
GameState.set(GameState.is(State.playing) ? State.paused : State.playing);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -466,7 +466,7 @@ public class Control extends Module{
|
|||||||
if(GameState.is(State.paused)){
|
if(GameState.is(State.paused)){
|
||||||
ui.hideMenu();
|
ui.hideMenu();
|
||||||
GameState.set(State.playing);
|
GameState.set(State.playing);
|
||||||
}else{
|
}else if (!ui.isGameOver()){
|
||||||
ui.showMenu();
|
ui.showMenu();
|
||||||
GameState.set(State.paused);
|
GameState.set(State.paused);
|
||||||
}
|
}
|
||||||
|
@ -405,6 +405,10 @@ public class UI extends SceneModule{
|
|||||||
return scene.getKeyboardFocus() instanceof Dialog;
|
return scene.getKeyboardFocus() instanceof Dialog;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean isGameOver(){
|
||||||
|
return restart.getScene() != null;
|
||||||
|
}
|
||||||
|
|
||||||
public void showUpgrades(){
|
public void showUpgrades(){
|
||||||
upgrades.show();
|
upgrades.show();
|
||||||
}
|
}
|
||||||
|
@ -46,7 +46,7 @@ public class Block{
|
|||||||
/**whether you can break this with rightblick*/
|
/**whether you can break this with rightblick*/
|
||||||
public boolean breakable;
|
public boolean breakable;
|
||||||
/**time it takes to break*/
|
/**time it takes to break*/
|
||||||
public float breaktime = 30;
|
public float breaktime = 18;
|
||||||
/**tile entity health*/
|
/**tile entity health*/
|
||||||
public int health = 40;
|
public int health = 40;
|
||||||
/**the shadow drawn under the block*/
|
/**the shadow drawn under the block*/
|
||||||
|
@ -15,7 +15,7 @@ public class ProductionBlocks{
|
|||||||
|
|
||||||
core = new Block("core"){
|
core = new Block("core"){
|
||||||
{
|
{
|
||||||
health = 600;
|
health = 800;
|
||||||
solid = true;
|
solid = true;
|
||||||
destructible = true;
|
destructible = true;
|
||||||
width = 3;
|
width = 3;
|
||||||
@ -24,7 +24,7 @@ public class ProductionBlocks{
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int handleDamage(Tile tile, int amount){
|
public int handleDamage(Tile tile, int amount){
|
||||||
return Vars.debug ? 0 : amount;
|
return Vars.debug ? amount : amount;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|