diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-02-14 20:13:54 +0000 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-02-14 20:13:54 +0000 |
| commit | c0beb02940f3ab25d805d6419f839dc36c50285e (patch) | |
| tree | cabd3709c2f238ff12fab9a1afe01fef48b9e602 | |
| parent | 481d1eca66e38154063b078b84fe76a830e5ac0d (diff) | |
| download | serverdata-c0beb02940f3ab25d805d6419f839dc36c50285e.tar.gz serverdata-c0beb02940f3ab25d805d6419f839dc36c50285e.tar.bz2 serverdata-c0beb02940f3ab25d805d6419f839dc36c50285e.tar.xz serverdata-c0beb02940f3ab25d805d6419f839dc36c50285e.zip | |
Merge mainline
| -rw-r--r-- | data/021-2.wlk | bin | 0 -> 11290 bytes | |||
| -rw-r--r-- | data/023-1.wlk | bin | 0 -> 30004 bytes | |||
| -rw-r--r-- | data/test.wlk | bin | 0 -> 19042 bytes | |||
| -rw-r--r-- | npc/test_Tulimshar/_import.txt | 3 | ||||
| -rw-r--r-- | npc/test_Tulimshar/_mobs.txt | 47 | ||||
| -rw-r--r-- | npc/test_Tulimshar/_warps.txt | 5 |
6 files changed, 55 insertions, 0 deletions
diff --git a/data/021-2.wlk b/data/021-2.wlk Binary files differnew file mode 100644 index 00000000..2f85d054 --- /dev/null +++ b/data/021-2.wlk diff --git a/data/023-1.wlk b/data/023-1.wlk Binary files differnew file mode 100644 index 00000000..1e728154 --- /dev/null +++ b/data/023-1.wlk diff --git a/data/test.wlk b/data/test.wlk Binary files differnew file mode 100644 index 00000000..cf612ae7 --- /dev/null +++ b/data/test.wlk diff --git a/npc/test_Tulimshar/_import.txt b/npc/test_Tulimshar/_import.txt new file mode 100644 index 00000000..d1091f7d --- /dev/null +++ b/npc/test_Tulimshar/_import.txt @@ -0,0 +1,3 @@ +map: test.gat +npc: npc/test_Tulimshar/_mobs.txt +npc: npc/test_Tulimshar/_warps.txt diff --git a/npc/test_Tulimshar/_mobs.txt b/npc/test_Tulimshar/_mobs.txt new file mode 100644 index 00000000..2589b562 --- /dev/null +++ b/npc/test_Tulimshar/_mobs.txt @@ -0,0 +1,47 @@ +// test Tulimshar mobs + +test.gat,44,87,2,1 monster Scorpion 1003,1,30000,0,Mobtest::On1003 +test.gat,44,87,2,1 monster Scorpion 1003,1,60000,0,Mobtest::On1003 +test.gat,44,87,2,1 monster Scorpion 1003,1,90000,0,Mobtest::On1003 +test.gat,44,87,2,1 monster Scorpion 1003,1,180000,0,Mobtest::On1003 +test.gat,44,87,2,1 monster Scorpion 1003,1,270000,0,Mobtest::On1003 +test.gat,44,87,2,1 monster Scorpion 1003,1,360000,0,Mobtest::On1003 +test.gat,82,30,9,8 monster Maggot 1002,5,0,0,Mobtest::On1002 +test.gat,115,25,8,4 monster Maggot 1002,3,0,0,Mobtest::On1002 +test.gat,124,53,15,13 monster Maggot 1002,10,0,0,Mobtest::On1002 +test.gat,120,64,15,13 monster Maggot 1002,11,0,0,Mobtest::On1002 +test.gat,63,24,3,2 monster Maggot 1002,2,0,0,Mobtest::On1002 +test.gat,72,64,3,2 monster Maggots 1002,2,0,0,Mobtest::On1002 +test.gat,97,80,3,2 monster Maggot 1002,2,0,0,Mobtest::On1002 +test.gat,134,61,3,2 monster Maggots 1002,2,0,0,Mobtest::On1002 +test.gat,112,47,3,2 monster Maggot 1002,2,0,0,Mobtest::On1002 +test.gat,129,37,3,2 monster Maggot 1002,2,0,0,Mobtest::On1002 +test.gat,89,31,3,2 monster Maggot 1002,2,0,0,Mobtest::On1002 +test.gat,19,78,3,2 monster Maggot 1002,2,0,0,Mobtest::On1002 +test.gat,122,59,17,22 monster Giant Maggot 1006,1,0,0,Mobtest::On1006 +test.gat,130,22,1,1 monster Fire Goblin 1011,1,61000,60000,Mobtest::On1011 + + +test.gat,0,0,0 script Mobtest -1,{ +On1002: + set @mobID, 1002; + callfunc "MobPoints"; + break; + +On1003: + set @mobID, 1003; + callfunc "MobPoints"; + break; + +On1006: + set @mobID, 1006; + callfunc "MobPoints"; + break; + +On1011: + set @mobID, 1011; + callfunc "MobPoints"; + break; + + end; +} diff --git a/npc/test_Tulimshar/_warps.txt b/npc/test_Tulimshar/_warps.txt new file mode 100644 index 00000000..fe07c49e --- /dev/null +++ b/npc/test_Tulimshar/_warps.txt @@ -0,0 +1,5 @@ +// test Tulimshar warps + +test.gat,44,88 warp ToSandstorm 3,-1,002-1.gat,58,17 +test.gat,32,71 warp ToInn -1,-1,001-2.gat,25,34 +test.gat,75,41 warp ToHouse -1,-1,001-2.gat,71,72 |