Added weapon upgrades, bugfixes

2017-05-05 15:19:19 -04:00
parent be0276bb2a
commit c9019dd2eb
25 changed files with 470 additions and 133 deletions
--- a/core/src/io/anuke/mindustry/GameState.java
+++ b/core/src/io/anuke/mindustry/GameState.java
@@ -15,6 +15,12 @@ import io.anuke.ucore.util.Timers;
 public class GameState{
 	
 	public static void reset(){
+		for(Weapon weapon : Weapon.values()){
+			weapons.put(weapon, weapon.unlocked);
+		}
+		
+		currentWeapon = Weapon.blaster;
+		
 		wave = 1;
 		wavetime = waveSpacing();
 		Entities.clear();
@@ -25,6 +31,7 @@ public class GameState{
 		spawnpoints.clear();
 		
 		ui.updateItems();
+		ui.updateWeapons();
 	}
 	
 	public static void play(){