fixed factory

src/ei/game/gamestate/LoadingState.java

@@ -32,6 +32,15 @@ public class LoadingState extends GameState{
 		"data/map/sand.jpg",
 		"data/map/factory/factory_1.png",
 		"data/map/factory/factory_2.png",
+		"data/map/parking/parking_01.png",
+		"data/map/parking/parking_04.png",
+		"data/map/parking/parking_07.png",
+		"data/map/parking/parking_02.png",
+		"data/map/parking/parking_05.png",
+		"data/map/parking/parking_08.png",
+		"data/map/parking/parking_03.png",
+		"data/map/parking/parking_06.png",
+		"data/map/parking/parking_09.png",
 		"data/map/redstone/redstone0000.png",
 		"data/map/redstone/redstone0001.png",
 		"data/map/redstone/redstone0002.png",

src/ei/game/player/PlayerHandler.java

@@ -119,6 +119,10 @@ public class PlayerHandler {
 	}
 		
 	public void setGaiaPlayer(Player p){
+		if(gaia != null && playerNode.contains(gaia.getNode())){
+			playerNode.remove(gaia.getNode());
+		}
 		gaia = p;
+		playerNode.add(gaia.getNode());
 	}
 }

src/ei/game/scene/buildings/Building.java

@@ -180,7 +180,7 @@ public abstract class Building extends GameEntity{
 					buildQueue.peek().getNode().setLocation(moveFrom);
 				}
 				Vector2i temp = Map.getPosByPixel(moveTo.getX()+unitNode.getLocation().getX(), moveTo.getY()+unitNode.getLocation().getY());
-				System.out.println("lol "+temp+" "+moveTo.getX());
+
 				if(!InGameState.getMap().isPosEmpty(temp.getX(),temp.getY())){
 					InGameState.getMap().getPos(temp.getX(),temp.getY()).move(false, oldPos.getX()+(size/2), oldPos.getY()-(size/2));
 				}

src/ei/game/scene/map/Factory.java

@@ -5,24 +5,26 @@ import ei.engine.math.Vector2i;
 import ei.engine.scene.Entity;
 import ei.engine.scene.Sprite;
 import ei.game.player.Player;
+import ei.game.scene.SelectBox;
+import ei.game.scene.buildings.Building;
+import ei.game.scene.weapons.Explotion;
+import ei.game.scene.weapons.WeaponHandler;
 
-public class Factory extends MapEntity{
+public class Factory extends Building{
 	private static final String[] img = {
 		"data/map/factory/factory_1.png",
 		"data/map/factory/factory_2.png"
 	};
-	
+	private SelectBox selectionBox;
 	private Sprite factory;
 
 	public Factory(Vector2i pos, Player p) {
-		super(500, pos, p);
-	}
-	
-	@Override
-	public void init() {
+		super(500, pos, p, 4);
 		factory = new Sprite("Factory",img[(int)(Math.random()*img.length)]);
-		factory.setSize(new Vector2f(50,50));
+		factory.setSize(new Vector2f(200,200));
 		getNode().add(factory);
+		
+		selectionBox = new SelectBox(0,200,200,getMaxLife());
 	}
 
 	@Override
@@ -35,4 +37,24 @@ public class Factory extends MapEntity{
 		return 0;
 	}
 
+	@Override
+	public Entity getGroundSprite() {
+		return null;
+	}
+
+	@Override
+	public void attack(Vector2i target, boolean play) {
+		
+	}
+
+	@Override
+	public void destroyed() {
+		WeaponHandler.getInstance().addWeapon(new Explotion(new Vector2f(getNode().getLocation().getX(), getNode().getLocation().getY())));	
+	}
+
+	@Override
+	protected SelectBox getSelection() {
+		return selectionBox;
+	}	
+	
 }