summaryrefslogtreecommitdiff
path: root/world
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2011-12-30 12:35:20 +0100
committerJessica Tölke <jtoelke@mail.upb.de>2011-12-30 15:51:58 +0100
commitbbb8f464d3e34eb1edb751c48bb562991c5d95a9 (patch)
treedc1981b74f424b86842f12d709859e3659547948 /world
parentb771141707e400648c76fc3bf3843d67a841922c (diff)
downloadserverdata-bbb8f464d3e34eb1edb751c48bb562991c5d95a9.tar.gz
serverdata-bbb8f464d3e34eb1edb751c48bb562991c5d95a9.tar.bz2
serverdata-bbb8f464d3e34eb1edb751c48bb562991c5d95a9.tar.xz
serverdata-bbb8f464d3e34eb1edb751c48bb562991c5d95a9.zip
Running converter:
- remove Santa Slime spawns. - add White and Blue Slimes - adapt some map names - open warp from 031-3 to 044-1 Submodule pointer updated.
Diffstat (limited to 'world')
-rw-r--r--world/map/npc/019-1/_import.txt2
-rw-r--r--world/map/npc/019-1/_mobs.txt12
-rw-r--r--world/map/npc/030-1/_mobs.txt6
-rw-r--r--world/map/npc/031-1/_mobs.txt12
-rw-r--r--world/map/npc/031-3/_mobs.txt57
-rw-r--r--world/map/npc/031-3/_warps.txt1
-rw-r--r--world/map/npc/033-1/_import.txt2
-rw-r--r--world/map/npc/033-1/_mobs.txt2
-rw-r--r--world/map/npc/033-1/_warps.txt2
-rw-r--r--world/map/npc/045-1/_import.txt2
-rw-r--r--world/map/npc/045-1/_mobs.txt2
-rw-r--r--world/map/npc/045-1/_warps.txt2
12 files changed, 58 insertions, 44 deletions
diff --git a/world/map/npc/019-1/_import.txt b/world/map/npc/019-1/_import.txt
index 37c9e91c..cf294dcd 100644
--- a/world/map/npc/019-1/_import.txt
+++ b/world/map/npc/019-1/_import.txt
@@ -3,6 +3,6 @@
map: 019-1.gat
npc: npc/019-1/_mobs.txt
npc: npc/019-1/_warps.txt
+npc: npc/019-1/mobmanager.txt
npc: npc/019-1/santa_helper.txt
npc: npc/019-1/snowman.txt
-npc: npc/019-1/mobmanager.txt
diff --git a/world/map/npc/019-1/_mobs.txt b/world/map/npc/019-1/_mobs.txt
index 150c88f6..9684ef1f 100644
--- a/world/map/npc/019-1/_mobs.txt
+++ b/world/map/npc/019-1/_mobs.txt
@@ -2,21 +2,9 @@
// Snow Field mobs
019-1.gat,0,0,0,0|monster|Fluffy|1020,100,100000,30000,Mob019-1::On1020
-019-1.gat,0,0,0,0|monster|Santa Slime|1015,10,0,0,Mob019-1::On1015
-019-1.gat,0,0,0,0|monster|Rudolph Slime|1016,25,0,0,Mob019-1::On1016
019-1.gat,0,0,0|script|Mob019-1|-1,{
-On1015:
- set @mobID, 1015;
- callfunc "MobPoints";
- end;
-
-On1016:
- set @mobID, 1016;
- callfunc "MobPoints";
- end;
-
On1020:
set @mobID, 1020;
callfunc "MobPoints";
diff --git a/world/map/npc/030-1/_mobs.txt b/world/map/npc/030-1/_mobs.txt
index c673289c..468c50b1 100644
--- a/world/map/npc/030-1/_mobs.txt
+++ b/world/map/npc/030-1/_mobs.txt
@@ -1,17 +1,11 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Romantic Place mobs
-030-1.gat,0,0,0,0|monster|Santa Slime|1015,5,100000,30000,Mob030-1::On1015
030-1.gat,0,0,0,0|monster|Squirrel|1038,10,100000,30000,Mob030-1::On1038
030-1.gat,0,0,0,0|monster|Fluffy|1020,15,100000,30000,Mob030-1::On1020
030-1.gat,0,0,0|script|Mob030-1|-1,{
-On1015:
- set @mobID, 1015;
- callfunc "MobPoints";
- end;
-
On1020:
set @mobID, 1020;
callfunc "MobPoints";
diff --git a/world/map/npc/031-1/_mobs.txt b/world/map/npc/031-1/_mobs.txt
index 1c843eec..9aa09b6a 100644
--- a/world/map/npc/031-1/_mobs.txt
+++ b/world/map/npc/031-1/_mobs.txt
@@ -1,17 +1,12 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Nivalis Port mobs
-031-1.gat,0,0,0,0|monster|Santa Slime|1015,5,100000,30000,Mob031-1::On1015
031-1.gat,0,0,0,0|monster|Squirrel|1038,10,100000,30000,Mob031-1::On1038
031-1.gat,0,0,0,0|monster|Fluffy|1020,15,100000,30000,Mob031-1::On1020
+031-1.gat,76,26,10,5|monster|White Slime|1093,7,100000,30000,Mob031-1::On1093
031-1.gat,0,0,0|script|Mob031-1|-1,{
-On1015:
- set @mobID, 1015;
- callfunc "MobPoints";
- end;
-
On1020:
set @mobID, 1020;
callfunc "MobPoints";
@@ -22,5 +17,10 @@ On1038:
callfunc "MobPoints";
end;
+On1093:
+ set @mobID, 1093;
+ callfunc "MobPoints";
+ end;
+
end;
}
diff --git a/world/map/npc/031-3/_mobs.txt b/world/map/npc/031-3/_mobs.txt
index d9a9583a..4da9f6fb 100644
--- a/world/map/npc/031-3/_mobs.txt
+++ b/world/map/npc/031-3/_mobs.txt
@@ -1,7 +1,6 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Ice Labyrinth mobs
-031-3.gat,39,276,42,16|monster|Santa Slime|1015,5,100000,30000,Mob031-3::On1015
031-3.gat,230,279,25,26|monster|Ice Goblin|1058,5,100000,30000,Mob031-3::On1058
031-3.gat,195,277,25,26|monster|Ice Goblin|1058,3,100000,30000,Mob031-3::On1058
031-3.gat,213,282,66,43|monster|Bat|1017,5,100000,30000,Mob031-3::On1017
@@ -13,15 +12,11 @@
031-3.gat,36,148,64,43|monster|Bat|1017,11,100000,30000,Mob031-3::On1017
031-3.gat,97,277,22,42|monster|Bat|1017,11,100000,30000,Mob031-3::On1017
031-3.gat,148,282,22,42|monster|Bat|1017,11,100000,30000,Mob031-3::On1017
-031-3.gat,142,266,29,16|monster|Santa Slime|1015,3,100000,30000,Mob031-3::On1015
031-3.gat,145,293,25,26|monster|Ice Goblin|1058,6,100000,30000,Mob031-3::On1058
-031-3.gat,144,216,29,44|monster|Ice Element|1071,2,100000,30000,Mob031-3::On1071
031-3.gat,98,214,39,44|monster|Ice Element|1071,2,100000,30000,Mob031-3::On1071
031-3.gat,99,214,25,26|monster|Ice Goblin|1058,3,100000,30000,Mob031-3::On1058
031-3.gat,198,144,29,53|monster|Ice Goblin|1058,4,100000,30000,Mob031-3::On1058
031-3.gat,97,291,42,22|monster|Moggun|1061,5,100000,30000,Mob031-3::On1061
-031-3.gat,142,266,29,16|monster|Santa Slime|1015,3,100000,30000,Mob031-3::On1015
-031-3.gat,283,286,33,30|monster|Santa Slime|1015,3,100000,30000,Mob031-3::On1015
031-3.gat,278,282,33,14|monster|Ice Goblin|1058,5,100000,30000,Mob031-3::On1058
031-3.gat,98,214,39,44|monster|Ice Element|1071,2,100000,30000,Mob031-3::On1071
031-3.gat,285,218,8,75|monster|Ice Element|1071,2,100000,30000,Mob031-3::On1071
@@ -36,7 +31,6 @@
031-3.gat,213,282,66,43|monster|Bat|1017,5,100000,30000,Mob031-3::On1017
031-3.gat,199,200,45,14|monster|Bat|1017,13,100000,30000,Mob031-3::On1017
031-3.gat,209,199,12,17|monster|Yeti|1072,2,100000,30000,Mob031-3::On1072
-031-3.gat,144,216,29,44|monster|Ice Element|1071,2,100000,30000,Mob031-3::On1071
031-3.gat,234,141,18,19|monster|Yeti|1072,2,100000,30000,Mob031-3::On1072
031-3.gat,282,196,62,16|monster|Moggun|1061,3,100000,30000,Mob031-3::On1061
031-3.gat,212,159,62,16|monster|Moggun|1061,7,100000,30000,Mob031-3::On1061
@@ -48,7 +42,7 @@
031-3.gat,274,81,15,32|monster|Yeti|1072,2,100000,30000,Mob031-3::On1072
031-3.gat,40,53,44,68|monster|Moggun|1061,10,100000,30000,Mob031-3::On1061
031-3.gat,120,160,85,30|monster|Yeti|1072,4,100000,30000,Mob031-3::On1072
-031-3.gat,120,131,82,24|monster|Yeti|1072,8,100000,30000,Mob031-3::On1072
+031-3.gat,121,131,82,24|monster|Yeti|1072,8,100000,30000,Mob031-3::On1072
031-3.gat,107,130,25,26|monster|Ice Goblin|1058,6,100000,30000,Mob031-3::On1058
031-3.gat,145,160,25,24|monster|Ice Goblin|1058,6,100000,30000,Mob031-3::On1058
031-3.gat,94,167,25,24|monster|Ice Goblin|1058,6,100000,30000,Mob031-3::On1058
@@ -60,18 +54,45 @@
031-3.gat,214,75,25,26|monster|Ice Goblin|1058,3,100000,30000,Mob031-3::On1058
031-3.gat,217,37,66,43|monster|Bat|1017,10,100000,30000,Mob031-3::On1017
031-3.gat,39,52,64,56|monster|Bat|1017,5,100000,30000,Mob031-3::On1017
-031-3.gat,38,277,64,56|monster|Bat|1017,10,100000,30000,Mob031-3::On1017
+031-3.gat,39,274,64,56|monster|Bat|1017,10,100000,30000,Mob031-3::On1017
031-3.gat,119,51,39,64|monster|Bat|1017,10,100000,30000,Mob031-3::On1017
031-3.gat,119,50,57,51|monster|Ice Element|1071,5,100000,30000,Mob031-3::On1071
031-3.gat,120,79,20,17|monster|Yeti|1072,2,100000,30000,Mob031-3::On1072
+031-3.gat,37,284,6,4|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,28,255,14,9|monster|Blue Slime|1091,2,100000,30000,Mob031-3::On1091
+031-3.gat,212,277,14,9|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,289,295,6,4|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,292,288,14,9|monster|Blue Slime|1091,2,100000,30000,Mob031-3::On1091
+031-3.gat,296,233,7,6|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,271,222,7,6|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,281,215,55,21|monster|Blue Slime|1091,5,100000,30000,Mob031-3::On1091
+031-3.gat,126,35,6,5|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,143,124,34,22|monster|Blue Slime|1091,2,100000,30000,Mob031-3::On1091
+031-3.gat,48,65,14,9|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,37,113,5,13|monster|Blue Slime|1091,1,100000,30000,Mob031-3::On1091
+031-3.gat,136,227,14,9|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,152,218,13,17|monster|Blue Slime|1091,4,100000,30000,Mob031-3::On1091
+031-3.gat,135,206,9,6|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,154,202,7,7|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,136,216,6,4|monster|Blue Slime|1091,2,100000,30000,Mob031-3::On1091
+031-3.gat,112,276,6,4|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,143,294,6,4|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,149,268,6,4|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,136,264,6,4|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,157,283,6,4|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,139,264,25,19|monster|Blue Slime|1091,4,100000,30000,Mob031-3::On1091
+031-3.gat,24,265,6,4|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,52,280,6,4|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,37,254,6,4|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,24,290,6,4|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,48,298,6,4|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,53,260,6,4|monster|White Slime|1093,7,100000,30000,Mob031-3::On1093
+031-3.gat,23,275,14,9|monster|Blue Slime|1091,2,100000,30000,Mob031-3::On1091
+031-3.gat,37,272,14,9|monster|Blue Slime|1091,2,100000,30000,Mob031-3::On1091
+031-3.gat,52,285,14,9|monster|Blue Slime|1091,2,100000,30000,Mob031-3::On1091
031-3.gat,0,0,0|script|Mob031-3|-1,{
-On1015:
- set @mobID, 1015;
- callfunc "MobPoints";
- end;
-
On1017:
set @mobID, 1017;
callfunc "MobPoints";
@@ -97,5 +118,15 @@ On1072:
callfunc "MobPoints";
end;
+On1091:
+ set @mobID, 1091;
+ callfunc "MobPoints";
+ end;
+
+On1093:
+ set @mobID, 1093;
+ callfunc "MobPoints";
+ end;
+
end;
}
diff --git a/world/map/npc/031-3/_warps.txt b/world/map/npc/031-3/_warps.txt
index 826f6a2b..10ca9c26 100644
--- a/world/map/npc/031-3/_warps.txt
+++ b/world/map/npc/031-3/_warps.txt
@@ -50,3 +50,4 @@
031-3.gat,234,25|warp|To Ice Labyrinth|-1,-1,031-3.gat,232,92
031-3.gat,200,50|warp|To Ice Labyrinth|-1,-1,031-3.gat,136,30
031-3.gat,136,29|warp|To Ice Labyrinth|-1,-1,031-3.gat,200,49
+031-3.gat,115,77|warp|To Snow Hills|-1,-1,044-1.gat,154,94
diff --git a/world/map/npc/033-1/_import.txt b/world/map/npc/033-1/_import.txt
index bb31437a..39d37f0a 100644
--- a/world/map/npc/033-1/_import.txt
+++ b/world/map/npc/033-1/_import.txt
@@ -1,4 +1,4 @@
-// Map 033-1: Snow Field
+// Map 033-1: Snow Path
// This file is generated automatically. All manually changes will be removed when running the Converter.
map: 033-1.gat
npc: npc/033-1/_mobs.txt
diff --git a/world/map/npc/033-1/_mobs.txt b/world/map/npc/033-1/_mobs.txt
index 96a51f99..adc96467 100644
--- a/world/map/npc/033-1/_mobs.txt
+++ b/world/map/npc/033-1/_mobs.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Snow Field mobs
+// Snow Path mobs
diff --git a/world/map/npc/033-1/_warps.txt b/world/map/npc/033-1/_warps.txt
index 9a66308b..7a5e2213 100644
--- a/world/map/npc/033-1/_warps.txt
+++ b/world/map/npc/033-1/_warps.txt
@@ -1,4 +1,4 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Snow Field warps
+// Snow Path warps
033-1.gat,22,20|warp|To Snow Field|-1,0,034-1.gat,159,19
diff --git a/world/map/npc/045-1/_import.txt b/world/map/npc/045-1/_import.txt
index 9ef61aff..4fa77e97 100644
--- a/world/map/npc/045-1/_import.txt
+++ b/world/map/npc/045-1/_import.txt
@@ -1,4 +1,4 @@
-// Map 045-1: Snow Forest
+// Map 045-1: Deep Snow Forest
// This file is generated automatically. All manually changes will be removed when running the Converter.
map: 045-1.gat
npc: npc/045-1/_mobs.txt
diff --git a/world/map/npc/045-1/_mobs.txt b/world/map/npc/045-1/_mobs.txt
index f68b3421..72b9569b 100644
--- a/world/map/npc/045-1/_mobs.txt
+++ b/world/map/npc/045-1/_mobs.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Snow Forest mobs
+// Deep Snow Forest mobs
diff --git a/world/map/npc/045-1/_warps.txt b/world/map/npc/045-1/_warps.txt
index c916be68..a636f7b7 100644
--- a/world/map/npc/045-1/_warps.txt
+++ b/world/map/npc/045-1/_warps.txt
@@ -1,3 +1,3 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Snow Forest warps
+// Deep Snow Forest warps