summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2010-06-13 23:25:48 -0600
committerJared Adams <jaxad0127@gmail.com>2010-06-13 23:25:48 -0600
commit707648e6fe3138b0cadcebdf058bc1eac85992f3 (patch)
tree7db2d173ec3f603525b85a9c88de1eb48919863e
parent6bb57906a0f850b2b0c725086d2bc6c6da95f020 (diff)
downloadserverdata-707648e6fe3138b0cadcebdf058bc1eac85992f3.tar.gz
serverdata-707648e6fe3138b0cadcebdf058bc1eac85992f3.tar.bz2
serverdata-707648e6fe3138b0cadcebdf058bc1eac85992f3.tar.xz
serverdata-707648e6fe3138b0cadcebdf058bc1eac85992f3.zip
Remove the land bridge between desert and woodland
-rw-r--r--data/003-1.wlkbin26224 -> 26224 bytes
-rw-r--r--data/007-1.wlkbin17860 -> 17860 bytes
-rw-r--r--npc/003-1_Beach/_mobs.txt8
-rw-r--r--npc/003-1_Beach/_warps.txt1
-rw-r--r--npc/007-1_Woodland/_mobs.txt2
-rw-r--r--npc/007-1_Woodland/_warps.txt1
-rwxr-xr-xnpc/_import.txt2
7 files changed, 9 insertions, 5 deletions
diff --git a/data/003-1.wlk b/data/003-1.wlk
index dec67439..eb80e9c7 100644
--- a/data/003-1.wlk
+++ b/data/003-1.wlk
Binary files differ
diff --git a/data/007-1.wlk b/data/007-1.wlk
index 431d5e3b..2f82a60d 100644
--- a/data/007-1.wlk
+++ b/data/007-1.wlk
Binary files differ
diff --git a/npc/003-1_Beach/_mobs.txt b/npc/003-1_Beach/_mobs.txt
index 685d2d55..29ad16f6 100644
--- a/npc/003-1_Beach/_mobs.txt
+++ b/npc/003-1_Beach/_mobs.txt
@@ -1,9 +1,10 @@
// 003-1 Beach mobs
-003-1.gat,59,69,97,90 monster Sea Slime 1033,15,100000,30000,Mob003-1::On1033
+003-1.gat,64,67,87,93 monster Sea Slime 1033,15,100000,30000,Mob003-1::On1033
003-1.gat,120,31,22,22 monster Sea Slime 1033,5,100000,30000,Mob003-1::On1033
003-1.gat,119,68,105,101 monster Green Slime 1005,35,100000,30000,Mob003-1::On1005
003-1.gat,134,69,76,71 monster Red Scorpion 1004,20,100000,30000,Mob003-1::On1004
+003-1.gat,35,25,10,3 monster Mountain Snake 1026,1,700000,600000,Mob003-1::On1026
003-1.gat,0,0,0 script Mob003-1 -1,{
@@ -17,6 +18,11 @@ On1005:
callfunc "MobPoints";
break;
+On1026:
+ set @mobID, 1026;
+ callfunc "MobPoints";
+ break;
+
On1033:
set @mobID, 1033;
callfunc "MobPoints";
diff --git a/npc/003-1_Beach/_warps.txt b/npc/003-1_Beach/_warps.txt
index 4842f70e..72b84305 100644
--- a/npc/003-1_Beach/_warps.txt
+++ b/npc/003-1_Beach/_warps.txt
@@ -1,5 +1,4 @@
// 003-1 Beach warps
003-1.gat,172,77 warp ToSandstorm -1,3,002-1.gat,15,66
-003-1.gat,20,23 warp ToWoodland 1,-1,007-1.gat,120,112
003-1.gat,141,19 warp ToBeach 1,-1,004-1.gat,37,111
diff --git a/npc/007-1_Woodland/_mobs.txt b/npc/007-1_Woodland/_mobs.txt
index 39c163c1..7838015f 100644
--- a/npc/007-1_Woodland/_mobs.txt
+++ b/npc/007-1_Woodland/_mobs.txt
@@ -1,6 +1,6 @@
// 007-1 Woodland mobs
-007-1.gat,0,0,0,0 monster PinkFlower 1014,17,100000,30000,Mob007-1::On1014
+007-1.gat,0,0,0,0 monster Flower 1014,17,100000,30000,Mob007-1::On1014
007-1.gat,0,0,0,0 monster Spiky Mushroom 1019,15,100000,30000,Mob007-1::On1019
007-1.gat,0,0,0,0 monster Fluffy 1020,25,100000,30000,Mob007-1::On1020
007-1.gat,0,0,0,0 monster Mauve 1029,3,270000,180000,Mob007-1::On1029
diff --git a/npc/007-1_Woodland/_warps.txt b/npc/007-1_Woodland/_warps.txt
index 00d0b60d..1386bad7 100644
--- a/npc/007-1_Woodland/_warps.txt
+++ b/npc/007-1_Woodland/_warps.txt
@@ -1,6 +1,5 @@
// 007-1 Woodland warps
-007-1.gat,120,114 warp ToBeach 1,-1,003-1.gat,20,24
007-1.gat,20,54 warp ToHurnscald -1,0,010-1.gat,127,53
007-1.gat,69,21 warp ToHurnscald 2,-1,008-1.gat,78,100
007-1.gat,122,20 warp ToHurnscald 1,-1,008-1.gat,132,98
diff --git a/npc/_import.txt b/npc/_import.txt
index 5f0e6e24..e32f840c 100755
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -53,6 +53,6 @@ import: npc/025-1_Woodland_Swamp/_import.txt
import: npc/026-1_Swamp/_import.txt
import: npc/027-1_Graveyard/_import.txt
import: npc/027-2_Caretakers_House/_import.txt
-import: npc/botcheck/_import.txt
import: npc/028-1/_import.txt
import: npc/028-3/_import.txt
+import: npc/botcheck/_import.txt