diff options
author | Jessica Tölke <jtoelke@mail.upb.de> | 2011-09-08 20:36:29 +0200 |
---|---|---|
committer | Jessica Tölke <jtoelke@mail.upb.de> | 2011-09-08 20:36:29 +0200 |
commit | 5ea6c568c86d9c0f76983705258951e2db9974fa (patch) | |
tree | 94a402b645140a7bb9fbfa467a73cfb30d880a56 /world/map/npc/015-1 | |
parent | 2629fa14c6f7e6a5a7a71f5c784424cf80189f17 (diff) | |
parent | cba4de9a5f7b9de412b9f458c80904cee9764a85 (diff) | |
download | serverdata-2011.09.08.tar.gz serverdata-2011.09.08.tar.bz2 serverdata-2011.09.08.tar.xz serverdata-2011.09.08.zip |
Merge remote-tracking branch 'testing/master'v2011.09.08
Diffstat (limited to 'world/map/npc/015-1')
-rw-r--r-- | world/map/npc/015-1/_import.txt | 1 | ||||
-rw-r--r-- | world/map/npc/015-1/_mobs.txt | 48 | ||||
-rw-r--r-- | world/map/npc/015-1/monsters.txt | 59 |
3 files changed, 48 insertions, 60 deletions
diff --git a/world/map/npc/015-1/_import.txt b/world/map/npc/015-1/_import.txt index 94963d0b..7e038c51 100644 --- a/world/map/npc/015-1/_import.txt +++ b/world/map/npc/015-1/_import.txt @@ -5,5 +5,4 @@ npc: npc/015-1/_mobs.txt npc: npc/015-1/_warps.txt npc: npc/015-1/alice.txt npc: npc/015-1/barrier.txt -npc: npc/015-1/monsters.txt npc: npc/015-1/sword.txt diff --git a/world/map/npc/015-1/_mobs.txt b/world/map/npc/015-1/_mobs.txt index a398b22b..44544f23 100644 --- a/world/map/npc/015-1/_mobs.txt +++ b/world/map/npc/015-1/_mobs.txt @@ -3,14 +3,62 @@ 015-1.gat,0,0,0,0|monster|Clover|1037,2,100000,1000,Mob015-1::On1037 015-1.gat,0,0,0,0|monster|Butterfly|1055,10,30,20,Mob015-1::On1055 +015-1.gat,0,0,0,0|monster|Squirrel|1038,30,20,10,Mob015-1::On1038 +015-1.gat,0,0,0,0|monster|LogHead|1025,40,0,0,Mob015-1::On1025 +015-1.gat,0,0,0,0|monster|SpikyMushroom|1019,20,0,0,Mob015-1::On1019 +015-1.gat,0,0,0,0|monster|PinkFlower|1014,20,0,0,Mob015-1::On1014 +015-1.gat,0,0,0,0|monster|Gamboge|1031,5,0,0,Mob015-1::On1031 +015-1.gat,0,0,0,0|monster|Alizarin|1032,5,0,0,Mob015-1::On1032 +015-1.gat,0,0,0,0|monster|Silkworm|1035,7,15000,7000,Mob015-1::On1035 +015-1.gat,0,0,0,0|monster|Mauve|1029,4,270000,180000,Mob015-1::On1029 015-1.gat,0,0,0|script|Mob015-1|-1,{ +On1014: + set @mobID, 1014; + callfunc "MobPoints"; + end; + +On1019: + set @mobID, 1019; + callfunc "MobPoints"; + end; + +On1025: + set @mobID, 1025; + callfunc "MobPoints"; + end; + +On1029: + set @mobID, 1029; + callfunc "MobPoints"; + end; + +On1031: + set @mobID, 1031; + callfunc "MobPoints"; + end; + +On1032: + set @mobID, 1032; + callfunc "MobPoints"; + end; + +On1035: + set @mobID, 1035; + callfunc "MobPoints"; + end; + On1037: set @mobID, 1037; callfunc "MobPoints"; end; +On1038: + set @mobID, 1038; + callfunc "MobPoints"; + end; + On1055: set @mobID, 1055; callfunc "MobPoints"; diff --git a/world/map/npc/015-1/monsters.txt b/world/map/npc/015-1/monsters.txt deleted file mode 100644 index b6ff0fd9..00000000 --- a/world/map/npc/015-1/monsters.txt +++ /dev/null @@ -1,59 +0,0 @@ -// Map: 015-1 -// This is South-West Woodland. -// - -015-1.gat,0,0,0,0 monster LogHead 1025,40,0,0,Mob31::OnLogHead -015-1.gat,0,0,0,0 monster SpikyMushroom 1019,20,0,0,Mob31::OnSpikyMushroom -015-1.gat,0,0,0,0 monster PinkFlower 1014,20,0,0,Mob31::OnPinkFlower - -015-1.gat,0,0,0,0 monster Gamboge 1031,5,0,0,Mob31::OnGamboge -015-1.gat,0,0,0,0 monster Alizarin 1032,5,0,0,Mob31::OnAlizarin -015-1.gat,0,0,0,0 monster Mauve 1029,4,270000,180000,Mob31::OnMauve - -015-1.gat,0,0,0,0 monster SilkWorm 1035,7,15000,7000,Mob31::onSilkWorm - -015-1.gat,0,0,0,0 monster Squirrel 1038,30,20,10,Mob31::OnSquirrel - -015-1.gat,0,0,0 script Mob31 -1,{ -OnLogHead: - set @mobID, 1025; - callfunc "MobPoints"; - break; - -OnSpikyMushroom: - set @mobID, 1019; - callfunc "MobPoints"; - break; - -OnPinkFlower: - set @mobID, 1014; - callfunc "MobPoints"; - break; - -OnMauve: - set @mobID, 1029; - callfunc "MobPoints"; - break; - -OnGamboge: - set @mobID, 1031; - callfunc "MobPoints"; - break; - -OnAlizarin: - set @mobID, 1032; - callfunc "MobPoints"; - break; - -OnSilkWorm: - set @mobID, 1035; - callfunc "MobPoints"; - break; - -OnSquirrel: - set @mobID, 1038; - callfunc "MobPoints"; - break; - - end; -} |