Fixed save crash, nerfed junction speed

This commit is contained in:
Anuken
2018-01-20 10:35:53 -05:00
parent 726b62a395
commit f14ec2e87a
4 changed files with 4 additions and 4 deletions

View File

@@ -471,7 +471,7 @@ block.flameturret.fulldescription=Advanced close-range turret. Uses coal for amm
block.sniperturret.name=railgun turret block.sniperturret.name=railgun turret
block.sniperturret.fulldescription=Advanced long-range turret. Uses steel for ammo. Very high damage, but low fire rate. Expensive to use, but can be placed far away from enemy lines due to its range. block.sniperturret.fulldescription=Advanced long-range turret. Uses steel for ammo. Very high damage, but low fire rate. Expensive to use, but can be placed far away from enemy lines due to its range.
block.mortarturret.name=flak turret block.mortarturret.name=flak turret
block.mortarturret.fulldescription=Advanced splash-damage turret. Uses coal for ammo. Very slow fire rate and bullets, but very high single-target and splash damage. Useful for large crowds of enemies. block.mortarturret.fulldescription=Advanced low-accuracy splash-damage turret. Uses coal for ammo. Shoots a barrage of bullets that explode into shrapnel. Useful for large crowds of enemies.
block.laserturret.name=laser turret block.laserturret.name=laser turret
block.laserturret.fulldescription=Advanced single-target turret. Uses power. Good medium-range all-around turret. Single-target only. Never misses. block.laserturret.fulldescription=Advanced single-target turret. Uses power. Good medium-range all-around turret. Single-target only. Never misses.
block.waveturret.name=tesla turret block.waveturret.name=tesla turret

View File

@@ -61,7 +61,7 @@ public class Vars{
public static float baseControllerSpeed = 11f; public static float baseControllerSpeed = 11f;
public static final int saveSlots = 16; public static final int saveSlots = 64;
//amount of drops that are left when breaking a block //amount of drops that are left when breaking a block
public static final float breakDropAmount = 0.5f; public static final float breakDropAmount = 0.5f;

View File

@@ -82,7 +82,7 @@ public class Saves {
} }
public boolean canAddSave(){ public boolean canAddSave(){
return nextSlot <= Vars.saveSlots; return nextSlot < Vars.saveSlots;
} }
public void addSave(String name){ public void addSave(String name){

View File

@@ -23,7 +23,7 @@ public class Junction extends Block{
int dir = source.relativeTo(tile.x, tile.y); int dir = source.relativeTo(tile.x, tile.y);
Tile to = tile.getNearby()[dir]; Tile to = tile.getNearby()[dir];
Timers.run(15, ()->{ Timers.run(30, ()->{
if(to == null) return; if(to == null) return;
to.block().handleItem(item, to, tile); to.block().handleItem(item, to, tile);
}); });