reordered monsters to match the monster info list and added some mons…

…ter icons
mikejsavage · Mar 23, 2011 · 76181d8 · 76181d8
1 parent e32e2b9
commit 76181d8
Show file tree

Hide file tree

Showing 67 changed files with 47 additions and 47 deletions.
diff --git a/data/img/icons/monsters/Akantor.png b/data/img/icons/monsters/Akantor.png
diff --git a/data/img/icons/monsters/Alatreon.png b/data/img/icons/monsters/Alatreon.png
diff --git a/data/img/icons/monsters/Altaroth.png b/data/img/icons/monsters/Altaroth.png
diff --git a/data/img/icons/monsters/Amatsumagatsuchi.png b/data/img/icons/monsters/Amatsumagatsuchi.png
diff --git a/data/img/icons/monsters/Aoashira.png b/data/img/icons/monsters/Aoashira.png
diff --git a/data/img/icons/monsters/Baggi.png b/data/img/icons/monsters/Baggi.png
diff --git a/data/img/icons/monsters/Barroth.png b/data/img/icons/monsters/Barroth.png
diff --git a/data/img/icons/monsters/Black_Diablos.png b/data/img/icons/monsters/Black_Diablos.png
diff --git a/data/img/icons/monsters/Black_Tigrex.png b/data/img/icons/monsters/Black_Tigrex.png
diff --git a/data/img/icons/monsters/Bnahabra.png b/data/img/icons/monsters/Bnahabra.png
diff --git a/data/img/icons/monsters/Bulldrome.png b/data/img/icons/monsters/Bulldrome.png
diff --git a/data/img/icons/monsters/Bullfango.png b/data/img/icons/monsters/Bullfango.png
diff --git a/data/img/icons/monsters/Delex.png b/data/img/icons/monsters/Delex.png
diff --git a/data/img/icons/monsters/Diablos.png b/data/img/icons/monsters/Diablos.png
diff --git a/data/img/icons/monsters/Froggi.png b/data/img/icons/monsters/Froggi.png
diff --git a/data/img/icons/monsters/Gagua.png b/data/img/icons/monsters/Gagua.png
diff --git a/data/img/icons/monsters/Great_Baggi.png b/data/img/icons/monsters/Great_Baggi.png
diff --git a/data/img/icons/monsters/Great_Froggi.png b/data/img/icons/monsters/Great_Froggi.png
diff --git a/data/img/icons/monsters/Great_Jaggi.png b/data/img/icons/monsters/Great_Jaggi.png
diff --git a/data/img/icons/monsters/Green_Nargacuga.png b/data/img/icons/monsters/Green_Nargacuga.png
diff --git a/data/img/icons/monsters/Jaggi.png b/data/img/icons/monsters/Jaggi.png
diff --git a/data/img/icons/monsters/Jaggia.png b/data/img/icons/monsters/Jaggia.png
diff --git a/data/img/icons/monsters/Jhen_Mohran.png b/data/img/icons/monsters/Jhen_Mohran.png
diff --git a/data/img/icons/monsters/Jinouga.png b/data/img/icons/monsters/Jinouga.png
diff --git a/data/img/icons/monsters/Kelbi.png b/data/img/icons/monsters/Kelbi.png
diff --git a/data/img/icons/monsters/Melynx.png b/data/img/icons/monsters/Melynx.png
diff --git a/data/img/icons/monsters/Nargacuga.png b/data/img/icons/monsters/Nargacuga.png
diff --git a/data/img/icons/monsters/Qurupeco.png b/data/img/icons/monsters/Qurupeco.png
diff --git a/data/img/icons/monsters/Rangurotora.png b/data/img/icons/monsters/Rangurotora.png
diff --git a/data/img/icons/monsters/Red_Qurupeco.png b/data/img/icons/monsters/Red_Qurupeco.png
diff --git a/data/img/icons/monsters/Rhenoplos.png b/data/img/icons/monsters/Rhenoplos.png
diff --git a/data/img/icons/monsters/Tigrex.png b/data/img/icons/monsters/Tigrex.png
diff --git a/data/img/icons/monsters/Ukanlos.png b/data/img/icons/monsters/Ukanlos.png
diff --git a/data/img/icons/monsters/Uragaan.png b/data/img/icons/monsters/Uragaan.png
diff --git a/data/img/icons/monsters/Urukusu.png b/data/img/icons/monsters/Urukusu.png
diff --git a/data/monsters.json b/data/monsters.json
diff --git a/data/temp/genCarveInfo.lua b/data/temp/genCarveInfo.lua
@@ -1495,66 +1495,66 @@ local Schema =
 
 local MonsterNames =
 {
-	"Rathian",
-	"Rathalos",
-	"Qurupeco",
-	"Gigginox",
-	"Barioth",
-	"Diablos",
-	"Deviljho",
-	"Barroth",
-	"Uragaan",
+	"Felyne",
+	"Melynx",
+	"Altaroth",
+	"Bnahabra",
+	"Delex",
+	"Kelbi",
+	"Aptanoth",
+	"Rhenoplos",
+	"Zuwaroposu",
+	"Anteka",
+	"Popo",
+	"Gagua",
 	"Jaggi",
 	"Jaggia",
 	"Great Jaggi",
 	"Baggi",
 	"Great Baggi",
-	"Gold Rathian",
-	"Royal Ludroth",
-	"Ludroth",
-	"Silver Rathalos",
-	"Agnaktor",
-	"Black Diablos",
-	"Uroktor",
-	"Delex",
-	"Black Tigrex",
-	"Alatreon",
-	"Jhen Mohran",
-	"Giggi",
-	"Aptanoth",
-	"Popo",
-	"Rhenoplos",
-	"Felyne",
-	"Melynx",
-	"Green Nargacuga",
-	"Altaroth",
-	"Kelbi",
-	"Bnahabra",
-	"Jinouga",
-	"Amatsumagatsuchi",
+	"Froggi",
+	"Great Froggi",
+	"Qurupeco",
+	"Red Qurupeco",
+	"Bullfango",
+	"Bulldrome",
 	"Aoashira",
 	"Urukusu",
 	"Rangurotora",
-	"Great Froggi",
-	"Doboruberuku",
-	"Hapurubokka",
-	"Froggi",
-	"Zuwaroposu",
-	"Gagua",
-	"Red Qurupeco",
-	"Thunder Gigginox",
-	"Sand Barioth",
+	"Barroth",
 	"Ice Barroth",
+	"Uragaan",
 	"Steel Uragaan",
+	"Doboruberuku",
+	"Deviljho",
+	"Ludroth",
+	"Royal Ludroth",
 	"Purple Royal Ludroth",
+	"Hapurubokka",
+	"Uroktor",
+	"Agnaktor",
 	"Ice Agnaktor",
-	"Tigrex",
+	"Rathian",
+	"Gold Rathian",
+	"Rathalos",
+	"Silver Rathalos",
+	"Giggi",
+	"Gigginox",
+	"Thunder Gigginox",
+	"Barioth",
+	"Sand Barioth",
 	"Nargacuga",
+	"Green Nargacuga",
+	"Diablos",
+	"Black Diablos",
+	"Tigrex",
+	"Black Tigrex",
 	"Akantor",
 	"Ukanlos",
-	"Bulldrome",
-	"Bullfango",
-	"Anteka",
+	"Jinouga",
+	"Jhen Mohran",
+	"Amatsumagatsuchi",
+	"Alatreon",
 }
 
 local function itemIdxFromId( id )

diff --git a/data/temp/genMonsterIcons.lua b/data/temp/genMonsterIcons.lua
@@ -63,7 +63,7 @@ for file in lfs.dir( Dir ) do
 			end
 		end
 
-		outImg:save( OutputDir .. "/" .. file )
+		outImg:save( OutputDir .. "/" .. file:gsub( " ", "_" ) )
 
 		outImg:free()
 		inImg:free()

diff --git a/data/temp/monsters/icons/Akantor.png b/data/temp/monsters/icons/Akantor.png
diff --git a/data/temp/monsters/icons/Alatreon.png b/data/temp/monsters/icons/Alatreon.png
diff --git a/data/temp/monsters/icons/Amatsumagatsuchi.png b/data/temp/monsters/icons/Amatsumagatsuchi.png
diff --git a/data/temp/monsters/icons/Aoashira.png b/data/temp/monsters/icons/Aoashira.png
diff --git a/data/temp/monsters/icons/Baggi.png b/data/temp/monsters/icons/Baggi.png
diff --git a/data/temp/monsters/icons/Barroth.png b/data/temp/monsters/icons/Barroth.png
diff --git a/data/temp/monsters/icons/Black Diablos.png b/data/temp/monsters/icons/Black Diablos.png
diff --git a/data/temp/monsters/icons/Black Tigrex.png b/data/temp/monsters/icons/Black Tigrex.png
diff --git a/data/temp/monsters/icons/Bulldrome.png b/data/temp/monsters/icons/Bulldrome.png
diff --git a/data/temp/monsters/icons/Bullfango.png b/data/temp/monsters/icons/Bullfango.png
diff --git a/data/temp/monsters/icons/Diablos.png b/data/temp/monsters/icons/Diablos.png
diff --git a/data/temp/monsters/icons/Froggi.png b/data/temp/monsters/icons/Froggi.png
diff --git a/data/temp/monsters/icons/Gagua.png b/data/temp/monsters/icons/Gagua.png
diff --git a/data/temp/monsters/icons/Great Baggi.png b/data/temp/monsters/icons/Great Baggi.png
diff --git a/data/temp/monsters/icons/Great Froggi.png b/data/temp/monsters/icons/Great Froggi.png
diff --git a/data/temp/monsters/icons/Great Jaggi.png b/data/temp/monsters/icons/Great Jaggi.png
diff --git a/data/temp/monsters/icons/Green Nargacuga.png b/data/temp/monsters/icons/Green Nargacuga.png
diff --git a/data/temp/monsters/icons/Jaggi.png b/data/temp/monsters/icons/Jaggi.png
diff --git a/data/temp/monsters/icons/Jaggia.png b/data/temp/monsters/icons/Jaggia.png
diff --git a/data/temp/monsters/icons/Jhen Mohran.png b/data/temp/monsters/icons/Jhen Mohran.png
diff --git a/data/temp/monsters/icons/Jinouga.png b/data/temp/monsters/icons/Jinouga.png
diff --git a/data/temp/monsters/icons/Nargacuga.png b/data/temp/monsters/icons/Nargacuga.png
diff --git a/data/temp/monsters/icons/Qurupeco.png b/data/temp/monsters/icons/Qurupeco.png
diff --git a/data/temp/monsters/icons/Rangurotora.png b/data/temp/monsters/icons/Rangurotora.png
diff --git a/data/temp/monsters/icons/Red Qurupeco.png b/data/temp/monsters/icons/Red Qurupeco.png
diff --git a/data/temp/monsters/icons/Tigrex.png b/data/temp/monsters/icons/Tigrex.png
diff --git a/data/temp/monsters/icons/Ukanlos.png b/data/temp/monsters/icons/Ukanlos.png
diff --git a/data/temp/monsters/icons/Uragaan.png b/data/temp/monsters/icons/Uragaan.png
diff --git a/data/temp/monsters/icons/Urukusu.png b/data/temp/monsters/icons/Urukusu.png