diff options
| author | Fate <fate-tmw@googlemail.com> | 2009-05-30 20:03:41 +0000 |
|---|---|---|
| committer | Fate <fate-tmw@googlemail.com> | 2009-05-30 20:03:41 +0000 |
| commit | 8b70df06b9454fe76765dd3044b378d4b3002002 (patch) | |
| tree | 8518b9c58642ae85d17bc62ae87d0501858b7bdd /npc/test_Tulimshar | |
| parent | 96c8a2957d499b4dd7c867455bdff51920eb31ea (diff) | |
| parent | f17c823d6f91ae535ebcadd8b5b369efea09b772 (diff) | |
| download | serverdata-8b70df06b9454fe76765dd3044b378d4b3002002.tar.gz serverdata-8b70df06b9454fe76765dd3044b378d4b3002002.tar.bz2 serverdata-8b70df06b9454fe76765dd3044b378d4b3002002.tar.xz serverdata-8b70df06b9454fe76765dd3044b378d4b3002002.zip | |
Merge branch 'master' of the testing branch
Conflicts:
conf/magic.conf
db/item_db.txt
npc/013-3_Cave/barrier.txt
Eliminated conf/magic.conf. Re-build this file using conf/build-magic.sh;
otherwise marriage will be disabled and spells won't work.
Diffstat (limited to 'npc/test_Tulimshar')
| -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 |
3 files changed, 55 insertions, 0 deletions
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 |