From d712c7845887df4801f55b24404698ae3f1b99c3 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Tue, 2 Dec 2008 08:09:54 +0000 Subject: Update 004-1 --- data/004-1.wlk | Bin 15565 -> 15565 bytes data/021-1.wlk | Bin 0 -> 19042 bytes data/022-1.wlk | Bin 0 -> 30004 bytes npc/004-1_Beach/_import.txt | 1 - npc/004-1_Beach/_mobs.txt | 28 ++++++++++++++++++++++++++++ npc/004-1_Beach/monsters.txt | 26 -------------------------- npc/021-1_Tulimshar/_import.txt | 2 +- npc/021-1_Tulimshar/_warps.txt | 3 +++ npc/022-1_Beach_Cliffs/_import.txt | 3 +++ npc/022-1_Beach_Cliffs/_mobs.txt | 7 +++++++ npc/022-1_Beach_Cliffs/_warps.txt | 4 ++++ npc/_import.txt | 2 ++ 12 files changed, 48 insertions(+), 28 deletions(-) create mode 100644 data/021-1.wlk create mode 100644 data/022-1.wlk delete mode 100644 npc/004-1_Beach/monsters.txt create mode 100644 npc/022-1_Beach_Cliffs/_import.txt create mode 100644 npc/022-1_Beach_Cliffs/_mobs.txt create mode 100644 npc/022-1_Beach_Cliffs/_warps.txt diff --git a/data/004-1.wlk b/data/004-1.wlk index 68d9c716..55ed9b21 100644 Binary files a/data/004-1.wlk and b/data/004-1.wlk differ diff --git a/data/021-1.wlk b/data/021-1.wlk new file mode 100644 index 00000000..5c21ddd0 Binary files /dev/null and b/data/021-1.wlk differ diff --git a/data/022-1.wlk b/data/022-1.wlk new file mode 100644 index 00000000..fa71f6cc Binary files /dev/null and b/data/022-1.wlk differ diff --git a/npc/004-1_Beach/_import.txt b/npc/004-1_Beach/_import.txt index 0b1dba07..7bd39a8b 100644 --- a/npc/004-1_Beach/_import.txt +++ b/npc/004-1_Beach/_import.txt @@ -1,4 +1,3 @@ map: 004-1.gat npc: npc/004-1_Beach/_mobs.txt npc: npc/004-1_Beach/_warps.txt -npc: npc/004-1_Beach/monsters.txt diff --git a/npc/004-1_Beach/_mobs.txt b/npc/004-1_Beach/_mobs.txt index bc8e68a9..ba1436e1 100644 --- a/npc/004-1_Beach/_mobs.txt +++ b/npc/004-1_Beach/_mobs.txt @@ -1,7 +1,35 @@ // 004-1 Beach mobs +004-1.gat,39,52,5,19 monster Sea slime 1033,5,0,0,Mob004-1::On1033 +004-1.gat,33,88,5,14 monster Sea Slime 1033,5,0,0,Mob004-1::On1033 +004-1.gat,27,107,8,6 monster Sea slime 1033,4,0,0,Mob004-1::On1033 +004-1.gat,31,99,5,7 monster Sea slime 1033,3,0,0,Mob004-1::On1033 +004-1.gat,71,103,27,19 monster Giant maggot 1006,5,0,0,Mob004-1::On1006 +004-1.gat,76,68,21,49 monster Red scorpion 1004,13,0,0,Mob004-1::On1004 +004-1.gat,69,23,10,6 monster Giant maggot 1006,2,0,0,Mob004-1::On1006 +004-1.gat,93,27,1,1 monster Black scorpion 1009,1,120000,60000,Mob004-1::On1009 004-1.gat,0,0,0 script Mob004-1 -1,{ +On1004: + set @mobID, 1004; + callfunc "MobPoints"; + break; + +On1006: + set @mobID, 1006; + callfunc "MobPoints"; + break; + +On1009: + set @mobID, 1009; + callfunc "MobPoints"; + break; + +On1033: + set @mobID, 1033; + callfunc "MobPoints"; + break; + end; } diff --git a/npc/004-1_Beach/monsters.txt b/npc/004-1_Beach/monsters.txt deleted file mode 100644 index 8056eead..00000000 --- a/npc/004-1_Beach/monsters.txt +++ /dev/null @@ -1,26 +0,0 @@ -// Map: 004-1 -// This is the Beach west of Tulimshar. -// - -004-1.gat,0,0,0,0 monster SeaSlime 1033,30,0,0,Mob34::OnSeaSlime -004-1.gat,0,0,0,0 monster GiantMaggot 1006,10,0,0,Mob34::OnGiantMaggot -004-1.gat,0,0,0,0 monster RedScorpion 1004,12,0,0,Mob34::OnRedScorpion - -004-1.gat,0,0,0 script Mob34 -1,{ -OnSeaSlime: - set @mobID, 1033; - callfunc "MobPoints"; - break; - -OnGiantMaggot: - set @mobID, 1006; - callfunc "MobPoints"; - break; - -OnRedScorpion: - set @mobID, 1004; - callfunc "MobPoints"; - break; - - end; -} diff --git a/npc/021-1_Tulimshar/_import.txt b/npc/021-1_Tulimshar/_import.txt index 27ebcad7..81e7f2df 100644 --- a/npc/021-1_Tulimshar/_import.txt +++ b/npc/021-1_Tulimshar/_import.txt @@ -1,3 +1,3 @@ map: 021-1.gat -npc: npc/021-1_Tulimshar/_warps.txt npc: npc/021-1_Tulimshar/_mobs.txt +npc: npc/021-1_Tulimshar/_warps.txt diff --git a/npc/021-1_Tulimshar/_warps.txt b/npc/021-1_Tulimshar/_warps.txt index 7e907749..3c771539 100644 --- a/npc/021-1_Tulimshar/_warps.txt +++ b/npc/021-1_Tulimshar/_warps.txt @@ -1,2 +1,5 @@ // 021-1 Tulimshar warps +021-1.gat,44,88 warp ToSandstorm 3,-1,002-1.gat,58,17 +021-1.gat,32,71 warp ToInn -1,-1,001-2.gat,25,34 +021-1.gat,75,41 warp ToHouse -1,-1,001-2.gat,71,72 diff --git a/npc/022-1_Beach_Cliffs/_import.txt b/npc/022-1_Beach_Cliffs/_import.txt new file mode 100644 index 00000000..6dab9d52 --- /dev/null +++ b/npc/022-1_Beach_Cliffs/_import.txt @@ -0,0 +1,3 @@ +map: 022-1.gat +npc: npc/022-1_Beach_Cliffs/_mobs.txt +npc: npc/022-1_Beach_Cliffs/_warps.txt diff --git a/npc/022-1_Beach_Cliffs/_mobs.txt b/npc/022-1_Beach_Cliffs/_mobs.txt new file mode 100644 index 00000000..7dfedcec --- /dev/null +++ b/npc/022-1_Beach_Cliffs/_mobs.txt @@ -0,0 +1,7 @@ +// 022-1 Beach Cliffs mobs + + + +022-1.gat,0,0,0 script Mob022-1 -1,{ + end; +} diff --git a/npc/022-1_Beach_Cliffs/_warps.txt b/npc/022-1_Beach_Cliffs/_warps.txt new file mode 100644 index 00000000..c856a583 --- /dev/null +++ b/npc/022-1_Beach_Cliffs/_warps.txt @@ -0,0 +1,4 @@ +// 022-1 Beach Cliffs warps + +022-1.gat,84,113 warp ToSandstorm 1,-1,002-1.gat,29,15 +022-1.gat,37,111 warp ToBeach 1,-1,003-1.gat,141,21 diff --git a/npc/_import.txt b/npc/_import.txt index df218035..77e9a46b 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -38,3 +38,5 @@ import: npc/020-1/_import.txt import: npc/020-2/_import.txt import: npc/020-3_Ice_cave/_import.txt import: npc/020-4_Ice_cave/_import.txt +import: npc/021-1_Tulimshar/_import.txt +import: npc/022-1_Beach_Cliffs/_import.txt -- cgit v1.2.3-60-g2f50