Got some more of the missing backgrounds and platforms

chudooder · Feb 10, 2014 · 5cc4cdf · 5cc4cdf
1 parent cdd7b51
commit 5cc4cdf
Show file tree

Hide file tree

Showing 18 changed files with 36 additions and 30 deletions.
diff --git a/levels/decay.lvl b/levels/decay.lvl
diff --git a/res/battle_anim/static/cliff_bg.png b/res/battle_anim/static/cliff_bg.png
diff --git a/res/battle_anim/static/hill_bg.png b/res/battle_anim/static/hill_bg.png
diff --git a/res/battle_anim/static/house_bg.png b/res/battle_anim/static/house_bg.png
diff --git a/res/battle_anim/static/platform_cliff.png b/res/battle_anim/static/platform_cliff.png
diff --git a/res/battle_anim/static/platform_cliff_far.png b/res/battle_anim/static/platform_cliff_far.png
diff --git a/res/battle_anim/static/platform_hill.png b/res/battle_anim/static/platform_hill.png
diff --git a/res/battle_anim/static/platform_hill_far.png b/res/battle_anim/static/platform_hill_far.png
diff --git a/res/battle_anim/static/platform_house.png b/res/battle_anim/static/platform_house.png
diff --git a/res/battle_anim/static/platform_house_far.png b/res/battle_anim/static/platform_house_far.png
diff --git a/res/battle_anim/static/platform_throne.png b/res/battle_anim/static/platform_throne.png
diff --git a/res/battle_anim/static/platform_throne_far.png b/res/battle_anim/static/platform_throne_far.png
diff --git a/res/battle_anim/static/platform_village.png b/res/battle_anim/static/platform_village.png
diff --git a/res/battle_anim/static/platform_village_far.png b/res/battle_anim/static/platform_village_far.png
diff --git a/res/battle_anim/static/village_bg.png b/res/battle_anim/static/village_bg.png
diff --git a/src/net/fe/overworldStage/OverworldStage.java b/src/net/fe/overworldStage/OverworldStage.java
@@ -203,10 +203,7 @@ else if(message instanceof QuitMessage) {
 				}
 				session.removePlayer(leaver);
 				System.out.println(leaver.getName()+" LEFT THE GAME");
-				if(FEServer.getServer() != null) {
-					System.out.println("asdfasdfasdf");
-					checkEndGame();
-				}
+				checkEndGame();
 			}
 		}
 	}

diff --git a/src/net/fe/overworldStage/Terrain.java b/src/net/fe/overworldStage/Terrain.java
@@ -24,7 +24,10 @@ public enum Terrain {
 	WALL(127,0,0,0), 
 	FENCE(127,0,0,0),
 	NONE(127,0,0,0), 
-	THRONE(1,3,30,10);
+	CLIFF(127,0,0,0),
+	THRONE(1,3,30,10), 
+	HILL(4,2,30,0),
+	HOUSE(127,0,10,0);
 
 	private int baseMoveCost;
 	private final int avoidBonus;
@@ -76,7 +79,7 @@ else if (name.equals("Paladin")) {
 			}
 		}
 
-		else if (this == MOUNTAIN) {
+		else if (this == MOUNTAIN || this == HILL) {
 			if (name.equals("Berserker")
 					|| name.equals("Hero")
 					|| name.equals("Sniper")

diff --git a/src/net/fe/overworldStage/Tile.java b/src/net/fe/overworldStage/Tile.java
@@ -13,39 +13,42 @@ public class Tile extends GriddedEntity implements DoNotDestroy{
 	 * P - Plain
 	 * A - pAth
 	 * M - Mountain
-	 * F - Forest
-	 * W - Wall
+	 * ^ - Forest
+	 * = - Wall
 	 * S - Sea
 	 * L - fLoor
 	 * T - forT
 	 * K - peaK
 	 * I - pIllar
 	 * D - Desert
-	 * C - fenCe
+	 * - - fence
 	 * N - None
 	 * V - Village
-	 * H - tHrone (or castle entrance)
+	 * O - thrOne (or castle entrance)
+	 * C - Cliff
+	 * ~ - Hill
+	 * H - House
 	 */
 	private static String terrainMap =
-			"PPPPAAAAAAACCCCSSSS      " +
-			"PPPPAAAAAAACCCCSSSS      " +
-			"PPPKKPAAAFFWWWWSSSS      " +
-			"MKKKAAAANNNWWWWSSSS      " +
-			"CCCCAAAANVNWWLSSS        " +
-			"NNNNNNNNFNFSLLSSS        " +
-			"NVNNNNVNFVFSLLSSS        " +
+			"PPPPAAAAAAA----SSSS      " +
+			"PPPPAAAAAAA----SSSS      " +
+			"PPPKKPAAA^^====SSSS      " +
+			"MKKKAAAANNN====SSSS      " +
+			"----AAAANVN==LSSS        " +
+			"NNNNNNNN^N^SLLSSS        " +
+			"NVNNNNVN^V^SLLSSS        " +
 			"KPKKKPPPAAAANNNNNNNNN    " +
 			"KPPPKPPPAAAANNNNNNNNN    " +
-			"KKKKKPPPAAAANVNNHNNHN    " +
-			"KKKKKAAAPPAAAAAVTSSSS    " +
-			"KKKKKAAAAAAAAPTTTSSSS    " +
+			"KKKKKPPPAAAANVNNONNON    " +
+			"KKKKKAAAPPAAAAAHHSSSS    " +
+			"KKKKKAAAAAAAAPTHTSSSS    " +
 			"KKKKKAAAAAAAANSSSSS      " +
-			"KKKKKKKMMMMNNNSSSNNN     " +
-			"KKKKKPKFFFFNPNSSSNVN     " +
-			"KKKKKPKKKKKKKNNN PA      " +
-			"WWWWWWWLLWPWLLSSSWWWW    " +
-			"WWWWWWWLLWPWLLSSWWWWWW   " +
-			"LLLWWWWLLLPHLLSSWLWIHI   " +
+			"KKKKKKKMMMMCCCSSSNNN     " +
+			"KKKKKPK^^^^CPCSSSNVN     " +
+			"KKKKKPKKKKKKKCCC PA      " +
+			"=======LL=P=LLSSS====    " +
+			"=======LL=P=LLSS======   " +
+			"LLL====LLLPOLLSS=L=IOI   " +
 			"LLLLLILLIILLLLSSSLLLLL   " +
 			"LLLLLILLILLLLLSSSLLL     " +
 			"                         " +
@@ -80,20 +83,23 @@ public static Terrain getTerrainFromID(int id) {
 		char ch = terrainMap.charAt(id);
 		Terrain t;
 		if(ch == 'P') t = Terrain.PLAIN;
-		else if(ch == 'W') t = Terrain.WALL;
+		else if(ch == '=') t = Terrain.WALL;
 		else if(ch == 'A') t = Terrain.PATH;
 		else if(ch == 'S') t = Terrain.SEA;
-		else if(ch == 'F') t = Terrain.FOREST;
+		else if(ch == '^') t = Terrain.FOREST;
 		else if(ch == 'L') t = Terrain.FLOOR;
 		else if(ch == 'K') t = Terrain.PEAK;
 		else if(ch == 'M') t = Terrain.MOUNTAIN;
 		else if(ch == 'T') t = Terrain.FORT;
 		else if(ch == 'V') t = Terrain.VILLAGE;
 		else if(ch == 'N') t = Terrain.NONE;
-		else if(ch == 'C') t = Terrain.FENCE;
+		else if(ch == '-') t = Terrain.FENCE;
 		else if(ch == 'D') t = Terrain.DESERT;
 		else if(ch == 'I') t = Terrain.PILLAR;
-		else if(ch == 'H') t = Terrain.THRONE;
+		else if(ch == 'O') t = Terrain.THRONE;
+		else if(ch == 'H') t = Terrain.HOUSE;
+		else if(ch == '~') t = Terrain.HILL;
+
 		else t = Terrain.NONE;
 		return t;
 	}