summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2012-11-22 11:01:55 -0800
committerBen Longbons <b.r.longbons@gmail.com>2012-11-22 11:01:55 -0800
commitdf01eb7500a224d711858f88f165d9a7ba00fc6d (patch)
treecd3488217b002d6336bcb97b69e5069acc43d3b2
parentc21214633e9d4f63a50c7f23b428ccd7b3713cda (diff)
downloadserverdata-df01eb7500a224d711858f88f165d9a7ba00fc6d.tar.gz
serverdata-df01eb7500a224d711858f88f165d9a7ba00fc6d.tar.bz2
serverdata-df01eb7500a224d711858f88f165d9a7ba00fc6d.tar.xz
serverdata-df01eb7500a224d711858f88f165d9a7ba00fc6d.zip
Run 'make maps' for "Spawn " fix; update submodule
m---------client-data0
-rw-r--r--world/map/npc/019-4/_mobs.txt8
-rw-r--r--world/map/npc/055-1/_mobs.txt34
-rw-r--r--world/map/npc/055-3/_mobs.txt12
-rw-r--r--world/map/npc/056-1/_mobs.txt6
-rw-r--r--world/map/npc/057-1/_mobs.txt36
6 files changed, 48 insertions, 48 deletions
diff --git a/client-data b/client-data
-Subproject e2e539c41db97b6035cd8947e89557cccb6940e
+Subproject 5851bda025379a31e7226f9bae832588bbc6814
diff --git a/world/map/npc/019-4/_mobs.txt b/world/map/npc/019-4/_mobs.txt
index fb606bd6..3b950e30 100644
--- a/world/map/npc/019-4/_mobs.txt
+++ b/world/map/npc/019-4/_mobs.txt
@@ -1,10 +1,10 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Deeper Snow Cave mobs
-019-4.gat,0,0,0,0|monster|Spawn Mogguns|1061,12,45000,30000,Mob019-4::On1061
-019-4.gat,47,67,15,9|monster|Spawn White Slime|1093,5,45000,45000,Mob019-4::On1093
-019-4.gat,0,0,0,0|monster|Spawn Bat|1017,15,45000,25000,Mob019-4::On1017
-019-4.gat,0,0,0,0|monster|Spawn Blue Slimes|1091,7,45000,30000,Mob019-4::On1091
+019-4.gat,0,0,0,0|monster|Moggun|1061,12,45000,30000,Mob019-4::On1061
+019-4.gat,47,67,15,9|monster|White Slime|1093,5,45000,45000,Mob019-4::On1093
+019-4.gat,0,0,0,0|monster|Bat|1017,15,45000,25000,Mob019-4::On1017
+019-4.gat,0,0,0,0|monster|Blue Slime|1091,7,45000,30000,Mob019-4::On1091
019-4.gat,0,0,0|script|Mob019-4|-1,{
diff --git a/world/map/npc/055-1/_mobs.txt b/world/map/npc/055-1/_mobs.txt
index 1ffa3243..8ab9f6d0 100644
--- a/world/map/npc/055-1/_mobs.txt
+++ b/world/map/npc/055-1/_mobs.txt
@@ -1,23 +1,23 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Woodland Hills mobs
-055-1.gat,68,72,22,19|monster|Spawn Butterfly|1055,16,10000,85000,Mob055-1::On1055
-055-1.gat,87,29,55,14|monster|Spawn Silk Worm|1035,15,10000,85000,Mob055-1::On1035
-055-1.gat,79,30,84,17|monster|Spawn Squirrel|1038,10,10000,45000,Mob055-1::On1038
-055-1.gat,0,0,0,0|monster|Spawn Mouboo|1028,15,10000,85000,Mob055-1::On1028
-055-1.gat,91,49,6,4|monster|Spawn Clover Patch|1037,1,10000,180000,Mob055-1::On1037
-055-1.gat,103,54,5,3|monster|Spawn Clover Patch|1037,1,10000,180000,Mob055-1::On1037
-055-1.gat,64,75,27,16|monster|Spawn Clover Patch|1037,1,10000,120000,Mob055-1::On1037
-055-1.gat,80,34,82,25|monster|Spawn snail|1041,3,10000,85000,Mob055-1::On1041
-055-1.gat,70,72,17,24|monster|Spawn Alizarin Plant|1032,2,10000,60000,Mob055-1::On1032
-055-1.gat,81,32,81,22|monster|Spawn Alizarin Plant|1032,2,10000,60000,Mob055-1::On1032
-055-1.gat,0,0,0,0|monster|Spawn Mauve Plant|1029,7,10000,55000,Mob055-1::On1029
-055-1.gat,0,0,0,0|monster|Spawn Cobalt Plant|1030,3,10000,60000,Mob055-1::On1030
-055-1.gat,0,0,0,0|monster|Spawn Gamboge Plant|1031,2,10000,60000,Mob055-1::On1031
-055-1.gat,116,60,4,2|monster|Spawn Pink Flower|1014,1,10000,45000,Mob055-1::On1014
-055-1.gat,97,60,4,2|monster|Spawn Pink Flower|1014,1,10000,45000,Mob055-1::On1014
-055-1.gat,64,73,23,17|monster|Spawn Pink Flower|1014,1,10000,45000,Mob055-1::On1014
-055-1.gat,0,0,0,0|monster|Spawn Spikey Mushroom|1019,7,10000,60000,Mob055-1::On1019
+055-1.gat,68,72,22,19|monster|Butterfly|1055,16,10000,85000,Mob055-1::On1055
+055-1.gat,87,29,55,14|monster|Silkworm|1035,15,10000,85000,Mob055-1::On1035
+055-1.gat,79,30,84,17|monster|Squirrel|1038,10,10000,45000,Mob055-1::On1038
+055-1.gat,0,0,0,0|monster|Mouboo|1028,15,10000,85000,Mob055-1::On1028
+055-1.gat,91,49,6,4|monster|Clover Patch|1037,1,10000,180000,Mob055-1::On1037
+055-1.gat,103,54,5,3|monster|Clover Patch|1037,1,10000,180000,Mob055-1::On1037
+055-1.gat,64,75,27,16|monster|Clover Patch|1037,1,10000,120000,Mob055-1::On1037
+055-1.gat,80,34,82,25|monster|snail|1041,3,10000,85000,Mob055-1::On1041
+055-1.gat,70,72,17,24|monster|Alizarin Plant|1032,2,10000,60000,Mob055-1::On1032
+055-1.gat,81,32,81,22|monster|Alizarin Plant|1032,2,10000,60000,Mob055-1::On1032
+055-1.gat,0,0,0,0|monster|Mauve Plant|1029,7,10000,55000,Mob055-1::On1029
+055-1.gat,0,0,0,0|monster|Cobalt Plant|1030,3,10000,60000,Mob055-1::On1030
+055-1.gat,0,0,0,0|monster|Gamboge Plant|1031,2,10000,60000,Mob055-1::On1031
+055-1.gat,116,60,4,2|monster|Pink Flower|1014,1,10000,45000,Mob055-1::On1014
+055-1.gat,97,60,4,2|monster|Pink Flower|1014,1,10000,45000,Mob055-1::On1014
+055-1.gat,64,73,23,17|monster|Pink Flower|1014,1,10000,45000,Mob055-1::On1014
+055-1.gat,0,0,0,0|monster|Spiky Mushroom|1019,7,10000,60000,Mob055-1::On1019
055-1.gat,0,0,0|script|Mob055-1|-1,{
diff --git a/world/map/npc/055-3/_mobs.txt b/world/map/npc/055-3/_mobs.txt
index 9499d05a..de075d1b 100644
--- a/world/map/npc/055-3/_mobs.txt
+++ b/world/map/npc/055-3/_mobs.txt
@@ -1,12 +1,12 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Cave mobs
-055-3.gat,45,44,20,14|monster|Spawn Red Slime|1008,13,10000,60000,Mob055-3::On1008
-055-3.gat,0,0,1,1|monster|Spawn Bats|1017,20,10000,45000,Mob055-3::On1017
-055-3.gat,53,75,28,40|monster|Spawn Yellow Slime|1007,13,10000,60000,Mob055-3::On1007
-055-3.gat,0,0,1,1|monster|Spawn Black Scorpion|1009,10,10000,35000,Mob055-3::On1009
-055-3.gat,0,0,1,1|monster|Spawn Spider|1012,10,10000,35000,Mob055-3::On1012
-055-3.gat,0,0,1,1|monster|Spawn Snake|1010,3,10000,20000,Mob055-3::On1010
+055-3.gat,45,44,20,14|monster|Red Slime|1008,13,10000,60000,Mob055-3::On1008
+055-3.gat,0,0,1,1|monster|Bat|1017,20,10000,45000,Mob055-3::On1017
+055-3.gat,53,75,28,40|monster|Yellow Slime|1007,13,10000,60000,Mob055-3::On1007
+055-3.gat,0,0,1,1|monster|Black Scorpion|1009,10,10000,35000,Mob055-3::On1009
+055-3.gat,0,0,1,1|monster|Spider|1012,10,10000,35000,Mob055-3::On1012
+055-3.gat,0,0,1,1|monster|Snake|1010,3,10000,20000,Mob055-3::On1010
055-3.gat,0,0,0|script|Mob055-3|-1,{
diff --git a/world/map/npc/056-1/_mobs.txt b/world/map/npc/056-1/_mobs.txt
index 8c18e38a..e9840dce 100644
--- a/world/map/npc/056-1/_mobs.txt
+++ b/world/map/npc/056-1/_mobs.txt
@@ -1,9 +1,9 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Woods mobs
-056-1.gat,0,0,0,0|monster|Spawn Evil Mushroom|1013,10,10000,45000,Mob056-1::On1013
-056-1.gat,0,0,0,0|monster|Spawn Log Head|1025,10,10000,45000,Mob056-1::On1025
-056-1.gat,0,0,0,0|monster|Spawn Mauve Herb|1029,2,10000,85000,Mob056-1::On1029
+056-1.gat,0,0,0,0|monster|Evil Mushroom|1013,10,10000,45000,Mob056-1::On1013
+056-1.gat,0,0,0,0|monster|Log Head|1025,10,10000,45000,Mob056-1::On1025
+056-1.gat,0,0,0,0|monster|Mauve Plant|1029,2,10000,85000,Mob056-1::On1029
056-1.gat,0,0,0|script|Mob056-1|-1,{
diff --git a/world/map/npc/057-1/_mobs.txt b/world/map/npc/057-1/_mobs.txt
index 9d60df26..18cbc40a 100644
--- a/world/map/npc/057-1/_mobs.txt
+++ b/world/map/npc/057-1/_mobs.txt
@@ -1,24 +1,24 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Woodland mobs
-057-1.gat,0,0,0,0|monster|Spawn Mauve Plant|1029,5,45000,45000,Mob057-1::On1029
-057-1.gat,0,0,0,0|monster|Spawn Cobalt|1030,3,10000,65000,Mob057-1::On1030
-057-1.gat,0,0,0,0|monster|Spawn Gamboge|1031,5,10000,45000,Mob057-1::On1031
-057-1.gat,0,0,0,0|monster|Spawn Alizarin|1032,7,10000,70000,Mob057-1::On1032
-057-1.gat,0,0,0,0|monster|Spawn Mouboo|1028,14,10000,45000,Mob057-1::On1028
-057-1.gat,95,42,29,9|monster|Spawn Butterfly|1055,3,10000,40000,Mob057-1::On1055
-057-1.gat,25,48,11,46|monster|Spawn Silkworm|1035,7,10000,15000,Mob057-1::On1035
-057-1.gat,99,40,22,16|monster|Spawn Pink Flower|1014,2,10000,45000,Mob057-1::On1014
-057-1.gat,100,30,19,11|monster|Spawn Butterfly|1055,2,10000,40000,Mob057-1::On1055
-057-1.gat,83,64,12,12|monster|Spawn Butterfly|1055,2,10000,40000,Mob057-1::On1055
-057-1.gat,59,34,8,11|monster|Spawn Butterfly|1055,2,10000,40000,Mob057-1::On1055
-057-1.gat,32,45,8,11|monster|Spawn Butterfly|1055,2,10000,40000,Mob057-1::On1055
-057-1.gat,144,35,12,12|monster|Spawn Butterfly|1055,2,10000,40000,Mob057-1::On1055
-057-1.gat,104,67,12,11|monster|Spawn Pink Flower|1014,2,10000,45000,Mob057-1::On1014
-057-1.gat,135,53,12,11|monster|Spawn Pink Flower|1014,2,10000,45000,Mob057-1::On1014
-057-1.gat,0,0,0,0|monster|Spawn Spiky Mushroom|1019,10,10000,45000,Mob057-1::On1019
-057-1.gat,0,0,0,0|monster|Spawn Clover Patch|1037,3,10000,180000,Mob057-1::On1037
-057-1.gat,27,46,14,52|monster|Spawn Squirrel|1038,6,10000,50000,Mob057-1::On1038
+057-1.gat,0,0,0,0|monster|Mauve Plant|1029,5,45000,45000,Mob057-1::On1029
+057-1.gat,0,0,0,0|monster|Cobalt|1030,3,10000,65000,Mob057-1::On1030
+057-1.gat,0,0,0,0|monster|Gamboge|1031,5,10000,45000,Mob057-1::On1031
+057-1.gat,0,0,0,0|monster|Alizarin|1032,7,10000,70000,Mob057-1::On1032
+057-1.gat,0,0,0,0|monster|Mouboo|1028,14,10000,45000,Mob057-1::On1028
+057-1.gat,95,42,29,9|monster|Butterfly|1055,3,10000,40000,Mob057-1::On1055
+057-1.gat,25,48,11,46|monster|Silkworm|1035,7,10000,15000,Mob057-1::On1035
+057-1.gat,99,40,22,16|monster|Pink Flower|1014,2,10000,45000,Mob057-1::On1014
+057-1.gat,100,30,19,11|monster|Butterfly|1055,2,10000,40000,Mob057-1::On1055
+057-1.gat,83,64,12,12|monster|Butterfly|1055,2,10000,40000,Mob057-1::On1055
+057-1.gat,59,34,8,11|monster|Butterfly|1055,2,10000,40000,Mob057-1::On1055
+057-1.gat,32,45,8,11|monster|Butterfly|1055,2,10000,40000,Mob057-1::On1055
+057-1.gat,144,35,12,12|monster|Butterfly|1055,2,10000,40000,Mob057-1::On1055
+057-1.gat,104,67,12,11|monster|Pink Flower|1014,2,10000,45000,Mob057-1::On1014
+057-1.gat,135,53,12,11|monster|Pink Flower|1014,2,10000,45000,Mob057-1::On1014
+057-1.gat,0,0,0,0|monster|Spiky Mushroom|1019,10,10000,45000,Mob057-1::On1019
+057-1.gat,0,0,0,0|monster|Clover Patch|1037,3,10000,180000,Mob057-1::On1037
+057-1.gat,27,46,14,52|monster|Squirrel|1038,6,10000,50000,Mob057-1::On1038
057-1.gat,0,0,0|script|Mob057-1|-1,{