From 4d1173474839057a77019944043c73375a8a6b5a Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Wed, 17 Jun 2009 11:21:19 -0600 Subject: Move some woodland spawns to TMX format --- data/resnametable.txt | 1 + npc/007-1_Woodland/_import.txt | 1 - npc/007-1_Woodland/_mobs.txt | 30 ++++++++++-- npc/007-1_Woodland/monsters.txt | 47 ------------------ npc/008-1_Hurnscald_outskirts/_import.txt | 1 - npc/008-1_Hurnscald_outskirts/_mobs.txt | 42 +++++++++++++++++ npc/008-1_Hurnscald_outskirts/monsters.txt | 42 ----------------- npc/009-1_Hurnscald/_mobs.txt | 7 +++ npc/010-1_Woodland/_import.txt | 1 - npc/010-1_Woodland/_mobs.txt | 49 +++++++++++++++++++ npc/010-1_Woodland/monsters.txt | 53 --------------------- npc/011-1_Woodland/_import.txt | 1 - npc/011-1_Woodland/_mobs.txt | 54 +++++++++++++++++++++ npc/011-1_Woodland/monsters.txt | 47 ------------------ npc/012-1_Woodland_Hills/_import.txt | 1 - npc/012-1_Woodland_Hills/_mobs.txt | 54 +++++++++++++++++++++ npc/012-1_Woodland_Hills/monsters.txt | 59 ----------------------- npc/013-1_Woodland_hills/_import.txt | 1 - npc/013-1_Woodland_hills/_mobs.txt | 58 +++++++++++++++++++++++ npc/013-1_Woodland_hills/monsters.txt | 70 --------------------------- npc/014-1_Woodland/_import.txt | 1 - npc/014-1_Woodland/_mobs.txt | 64 +++++++++++++++++++++++++ npc/014-1_Woodland/monsters.txt | 76 ------------------------------ npc/022-1_Tulimshar/_import.txt | 2 + npc/_import.txt | 3 ++ npc/test_Tulimshar/_import.txt | 3 -- npc/test_Tulimshar/_mobs.txt | 47 ------------------ npc/test_Tulimshar/_warps.txt | 5 -- 28 files changed, 361 insertions(+), 459 deletions(-) delete mode 100644 npc/007-1_Woodland/monsters.txt delete mode 100644 npc/008-1_Hurnscald_outskirts/monsters.txt delete mode 100644 npc/010-1_Woodland/monsters.txt delete mode 100644 npc/011-1_Woodland/monsters.txt delete mode 100644 npc/012-1_Woodland_Hills/monsters.txt delete mode 100644 npc/013-1_Woodland_hills/monsters.txt delete mode 100644 npc/014-1_Woodland/monsters.txt delete mode 100644 npc/test_Tulimshar/_import.txt delete mode 100644 npc/test_Tulimshar/_mobs.txt delete mode 100644 npc/test_Tulimshar/_warps.txt diff --git a/data/resnametable.txt b/data/resnametable.txt index e74aac31..8970d6c2 100644 --- a/data/resnametable.txt +++ b/data/resnametable.txt @@ -22,6 +22,7 @@ 011-1.gat#011-1.wlk# 011-3.gat#011-3.wlk# 011-4.gat#011-4.wlk# +011-5.gat#011-5.wlk# 012-1.gat#012-1.wlk# 012-3.gat#012-3.wlk# 013-1.gat#013-1.wlk# diff --git a/npc/007-1_Woodland/_import.txt b/npc/007-1_Woodland/_import.txt index 1bd01390..0b239a93 100644 --- a/npc/007-1_Woodland/_import.txt +++ b/npc/007-1_Woodland/_import.txt @@ -1,4 +1,3 @@ map: 007-1.gat npc: npc/007-1_Woodland/_mobs.txt npc: npc/007-1_Woodland/_warps.txt -npc: npc/007-1_Woodland/monsters.txt diff --git a/npc/007-1_Woodland/_mobs.txt b/npc/007-1_Woodland/_mobs.txt index 6fc539af..7838015f 100644 --- a/npc/007-1_Woodland/_mobs.txt +++ b/npc/007-1_Woodland/_mobs.txt @@ -1,9 +1,13 @@ // 007-1 Woodland mobs -007-1.gat,53,46,67,53 monster Flower 1014,15,100000,30000,Mob007-1::On1014 -007-1.gat,105,57,53,74 monster Fluffy 1020,20,100000,30000,Mob007-1::On1020 -007-1.gat,105,48,55,51 monster Spiky Mushroom 1019,10,100000,30000,Mob007-1::On1019 +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 +007-1.gat,0,0,0,0 monster Gamboge 1031,1,2700000,1800000,Mob007-1::On1031 +007-1.gat,0,0,0,0 monster SilkWorm 1035,2,60000,30000,Mob007-1::On1035 007-1.gat,0,0,0,0 monster Clover 1037,2,0,1000,Mob007-1::On1037 +007-1.gat,0,0,0,0 monster Squirrel 1038,25,30,20,Mob007-1::On1038 007-1.gat,0,0,0 script Mob007-1 -1,{ @@ -22,10 +26,30 @@ On1020: callfunc "MobPoints"; break; +On1029: + set @mobID, 1029; + callfunc "MobPoints"; + break; + +On1031: + set @mobID, 1031; + callfunc "MobPoints"; + break; + +On1035: + set @mobID, 1035; + callfunc "MobPoints"; + break; + On1037: set @mobID, 1037; callfunc "MobPoints"; break; +On1038: + set @mobID, 1038; + callfunc "MobPoints"; + break; + end; } diff --git a/npc/007-1_Woodland/monsters.txt b/npc/007-1_Woodland/monsters.txt deleted file mode 100644 index ab1f2b7d..00000000 --- a/npc/007-1_Woodland/monsters.txt +++ /dev/null @@ -1,47 +0,0 @@ -// Map: 007-1 -// This is South-East Woodland. -// - -007-1.gat,0,0,0,0 monster Fluffy 1020,50,20,15,Mob16::OnFluffy -007-1.gat,0,0,0,0 monster Flower 1014,40,30,10,Mob16::OnFlower - -007-1.gat,0,0,0,0 monster Gamboge 1031,1,2700000,1800000,Mob16::OnGamboge -007-1.gat,0,0,0,0 monster Mauve 1029,4,270000,180000,Mob16::OnMauve - -007-1.gat,0,0,0,0 monster SilkWorm 1035,2,60000,30000,Mob16::OnSilkWorm - -007-1.gat,0,0,0,0 monster Squirrel 1038,30,20,10,Mob16::OnSquirrel - -007-1.gat,0,0,0 script Mob16 -1,{ -OnFluffy: - set @mobID, 1020; - callfunc "MobPoints"; - break; - -OnFlower: - set @mobID, 1014; - callfunc "MobPoints"; - break; - -OnMauve: - set @mobID, 1029; - callfunc "MobPoints"; - break; - -OnGamboge: - set @mobID, 1031; - callfunc "MobPoints"; - break; - -OnSilkWorm: - set @mobID, 1035; - callfunc "MobPoints"; - break; - -OnSquirrel: - set @mobID, 1038; - callfunc "MobPoints"; - break; - - end; -} diff --git a/npc/008-1_Hurnscald_outskirts/_import.txt b/npc/008-1_Hurnscald_outskirts/_import.txt index 3101190e..ee2463a5 100644 --- a/npc/008-1_Hurnscald_outskirts/_import.txt +++ b/npc/008-1_Hurnscald_outskirts/_import.txt @@ -5,4 +5,3 @@ npc: npc/008-1_Hurnscald_outskirts/andra.txt npc: npc/008-1_Hurnscald_outskirts/dock_worker.txt npc: npc/008-1_Hurnscald_outskirts/george.txt npc: npc/008-1_Hurnscald_outskirts/hinnak.txt -npc: npc/008-1_Hurnscald_outskirts/monsters.txt diff --git a/npc/008-1_Hurnscald_outskirts/_mobs.txt b/npc/008-1_Hurnscald_outskirts/_mobs.txt index 45df49ae..ba75f159 100644 --- a/npc/008-1_Hurnscald_outskirts/_mobs.txt +++ b/npc/008-1_Hurnscald_outskirts/_mobs.txt @@ -1,13 +1,55 @@ // 008-1 Hurnscald outskirts mobs +008-1.gat,0,0,0,0 monster Flower 1014,10,20,0,Mob008-1::On1014 +008-1.gat,0,0,0,0 monster Pinkie 1018,18,20,0,Mob008-1::On1018 +008-1.gat,0,0,0,0 monster SpikyMushroom 1019,18,20,0,Mob008-1::On1019 +008-1.gat,0,0,0,0 monster Fluffy 1020,5,30,0,Mob008-1::On1020 +008-1.gat,0,0,0,0 monster Mauve 1029,2,270000,180000,Mob008-1::On1029 +008-1.gat,0,0,0,0 monster SilkWorm 1035,2,60000,30000,Mob008-1::On1035 008-1.gat,0,0,0,0 monster Clover 1037,2,0,1000,Mob008-1::On1037 +008-1.gat,0,0,0,0 monster Squirrel 1038,10,30,20,Mob008-1::On1038 008-1.gat,0,0,0 script Mob008-1 -1,{ +On1014: + set @mobID, 1014; + callfunc "MobPoints"; + break; + +On1018: + set @mobID, 1018; + callfunc "MobPoints"; + break; + +On1019: + set @mobID, 1019; + callfunc "MobPoints"; + break; + +On1020: + set @mobID, 1020; + callfunc "MobPoints"; + break; + +On1029: + set @mobID, 1029; + callfunc "MobPoints"; + break; + +On1035: + set @mobID, 1035; + callfunc "MobPoints"; + break; + On1037: set @mobID, 1037; callfunc "MobPoints"; break; +On1038: + set @mobID, 1038; + callfunc "MobPoints"; + break; + end; } diff --git a/npc/008-1_Hurnscald_outskirts/monsters.txt b/npc/008-1_Hurnscald_outskirts/monsters.txt deleted file mode 100644 index 8be26271..00000000 --- a/npc/008-1_Hurnscald_outskirts/monsters.txt +++ /dev/null @@ -1,42 +0,0 @@ -// Map: 008-1 -// This is Woodland around Hurnscald. -// - -008-1.gat,0,0,0,0 monster Pinkie 1018,20,0,0,Mob18::OnPinkie -008-1.gat,0,0,0,0 monster SpikyMushroom 1019,20,0,0,Mob18::OnSpikyMushroom - -008-1.gat,0,0,0,0 monster Mauve 1029,1,2700000,1800000,Mob18::OnMauve -008-1.gat,0,0,0,0 monster Mauve 1029,4,270000,180000,Mob18::OnMauve - -008-1.gat,0,0,0,0 monster SilkWorm 1035,2,60000,30000,Mob18::OnSilkWorm - -008-1.gat,0,0,0,0 monster Squirrel 1038,30,20,10,Mob18::OnSquirrel - -008-1.gat,0,0,0 script Mob18 -1,{ -OnPinkie: - set @mobID, 1018; - callfunc "MobPoints"; - break; - -OnSpikyMushroom: - set @mobID, 1019; - callfunc "MobPoints"; - break; - -OnMauve: - set @mobID, 1029; - callfunc "MobPoints"; - break; - -OnSilkWorm: - set @mobID, 1035; - callfunc "MobPoints"; - break; - -OnSquirrel: - set @mobID, 1038; - callfunc "MobPoints"; - break; - - end; -} diff --git a/npc/009-1_Hurnscald/_mobs.txt b/npc/009-1_Hurnscald/_mobs.txt index 6a3aa742..a866c132 100644 --- a/npc/009-1_Hurnscald/_mobs.txt +++ b/npc/009-1_Hurnscald/_mobs.txt @@ -2,6 +2,8 @@ 009-1.gat,74,32,2,1 monster Clover patch 1037,1,100000,120000,Mob009-1::On1037 009-1.gat,29,44,9,13 monster Flower 1014,2,0,250,Mob009-1::On1014 +009-1.gat,88,51,15,4 monster Squirrel 1038,2,0,5000,Mob009-1::On1038 +009-1.gat,80,38,5,5 monster Squirrel 1038,1,0,5000,Mob009-1::On1038 009-1.gat,0,0,0 script Mob009-1 -1,{ @@ -15,5 +17,10 @@ On1037: callfunc "MobPoints"; break; +On1038: + set @mobID, 1038; + callfunc "MobPoints"; + break; + end; } diff --git a/npc/010-1_Woodland/_import.txt b/npc/010-1_Woodland/_import.txt index 3b2aca90..4c0bc6f4 100644 --- a/npc/010-1_Woodland/_import.txt +++ b/npc/010-1_Woodland/_import.txt @@ -1,4 +1,3 @@ map: 010-1.gat npc: npc/010-1_Woodland/_mobs.txt npc: npc/010-1_Woodland/_warps.txt -npc: npc/010-1_Woodland/monsters.txt diff --git a/npc/010-1_Woodland/_mobs.txt b/npc/010-1_Woodland/_mobs.txt index b90691aa..42ddea6f 100644 --- a/npc/010-1_Woodland/_mobs.txt +++ b/npc/010-1_Woodland/_mobs.txt @@ -2,7 +2,16 @@ 010-1.gat,82,63,19,19 monster Scorpion 1003,1,100000,30000,Mob010-1::On1003 010-1.gat,49,71,31,19 monster Shroom 1019,1,100000,30000,Mob010-1::On1019 +010-1.gat,0,0,0,0 monster Flower 1014,30,50,0,Mob010-1::On1014 +010-1.gat,0,0,0,0 monster Fluffy 1018,20,50,0,Mob010-1::On1018 +010-1.gat,0,0,0,0 monster SpikyMushroom 1019,45,50,0,Mob010-1::On1019 +010-1.gat,0,0,0,0 monster LogHead 1025,40,100,0,Mob010-1::On1025 +010-1.gat,0,0,0,0 monster Mouboo 1028,15,0,10,Mob010-1::On1028 +010-1.gat,0,0,0,0 monster Mauve 1029,3,270000,180000,Mob010-1::On1029 +010-1.gat,0,0,0,0 monster Cobalt 1030,1,2700000,1800000,Mob010-1::On1030 +010-1.gat,0,0,0,0 monster SilkWorm 1035,2,60000,30000,Mob010-1::On1035 010-1.gat,0,0,0,0 monster Clover 1037,2,0,1000,Mob010-1::On1037 +010-1.gat,0,0,0,0 monster Squirrel 1038,25,30,20,Mob010-1::On1038 010-1.gat,0,0,0 script Mob010-1 -1,{ @@ -11,15 +20,55 @@ On1003: callfunc "MobPoints"; break; +On1014: + set @mobID, 1014; + callfunc "MobPoints"; + break; + +On1018: + set @mobID, 1018; + callfunc "MobPoints"; + break; + On1019: set @mobID, 1019; callfunc "MobPoints"; break; +On1025: + set @mobID, 1025; + callfunc "MobPoints"; + break; + +On1028: + set @mobID, 1028; + callfunc "MobPoints"; + break; + +On1029: + set @mobID, 1029; + callfunc "MobPoints"; + break; + +On1030: + set @mobID, 1030; + callfunc "MobPoints"; + break; + +On1035: + set @mobID, 1035; + callfunc "MobPoints"; + break; + On1037: set @mobID, 1037; callfunc "MobPoints"; break; +On1038: + set @mobID, 1038; + callfunc "MobPoints"; + break; + end; } diff --git a/npc/010-1_Woodland/monsters.txt b/npc/010-1_Woodland/monsters.txt deleted file mode 100644 index a1745c88..00000000 --- a/npc/010-1_Woodland/monsters.txt +++ /dev/null @@ -1,53 +0,0 @@ -// Map: 010-1 -// This is South Woodland. -// - -010-1.gat,0,0,0,0 monster Scorpion 1003,50,0,0,Mob14::OnScorpion -010-1.gat,0,0,0,0 monster SpikyMushroom 1019,50,0,0,Mob14::OnSpikyMushroom -010-1.gat,0,0,0,0 monster LogHead 1025,50,0,0,Mob14::OnLogHead - -010-1.gat,0,0,0,0 monster Cobalt 1030,1,2700000,1800000,Mob14::OnCobalt -010-1.gat,0,0,0,0 monster Mauve 1029,4,270000,180000,Mob14::OnMauve - -010-1.gat,0,0,0,0 monster SilkWorm 1035,2,60000,30000,Mob14::OnSilkWorm - -010-1.gat,0,0,0,0 monster Squirrel 1038,30,20,10,Mob14::OnSquirrel - -010-1.gat,0,0,0 script Mob14 -1,{ -OnScorpion: - set @mobID, 1003; - callfunc "MobPoints"; - break; - -OnSpikyMushroom: - set @mobID, 1019; - callfunc "MobPoints"; - break; - -OnLogHead: - set @mobID, 1025; - callfunc "MobPoints"; - break; - -OnMauve: - set @mobID, 1029; - callfunc "MobPoints"; - break; - -OnCobalt: - set @mobID, 1030; - callfunc "MobPoints"; - break; - -OnSilkWorm: - set @mobID, 1035; - callfunc "MobPoints"; - break; - -OnSquirrel: - set @mobID, 1038; - callfunc "MobPoints"; - break; - - end; -} diff --git a/npc/011-1_Woodland/_import.txt b/npc/011-1_Woodland/_import.txt index 3e18f94e..e8b35152 100644 --- a/npc/011-1_Woodland/_import.txt +++ b/npc/011-1_Woodland/_import.txt @@ -3,5 +3,4 @@ npc: npc/011-1_Woodland/_mobs.txt npc: npc/011-1_Woodland/_warps.txt npc: npc/011-1_Woodland/alchemist.txt npc: npc/011-1_Woodland/auldsbel.txt -npc: npc/011-1_Woodland/monsters.txt npc: npc/011-1_Woodland/oscar.txt diff --git a/npc/011-1_Woodland/_mobs.txt b/npc/011-1_Woodland/_mobs.txt index 0d6971cf..353f8f2d 100644 --- a/npc/011-1_Woodland/_mobs.txt +++ b/npc/011-1_Woodland/_mobs.txt @@ -1,13 +1,67 @@ // 011-1 Woodland mobs +011-1.gat,0,0,0,0 monster EvilMushroom 1013,30,0,0,Mob011-1::On1013 +011-1.gat,0,0,0,0 monster Flower 1014,20,0,0,Mob011-1::On1014 +011-1.gat,0,0,0,0 monster Spiky Mushroom 1019,5,0,0,Mob011-1::On1019 +011-1.gat,0,0,0,0 monster Fluffy 1020,1,0,0,Mob011-1::On1020 +011-1.gat,0,0,0,0 monster Mouboo 1028,5,0,10,Mob011-1::On1028 +011-1.gat,0,0,0,0 monster Mauve 1029,3,270000,180000,Mob011-1::On1029 +011-1.gat,0,0,0,0 monster Alizarin 1032,1,2700000,1800000,Mob011-1::On1032 +011-1.gat,0,0,0,0 monster SilkWorm 1035,2,60000,30000,Mob011-1::On1035 011-1.gat,0,0,0,0 monster Clover 1037,2,0,1000,Mob011-1::On1037 +011-1.gat,0,0,0,0 monster Squirrel 1038,25,30,20,Mob011-1::On1038 011-1.gat,0,0,0 script Mob011-1 -1,{ +On1013: + set @mobID, 1013; + callfunc "MobPoints"; + break; + +On1014: + set @mobID, 1014; + callfunc "MobPoints"; + break; + +On1019: + set @mobID, 1019; + callfunc "MobPoints"; + break; + +On1020: + set @mobID, 1020; + callfunc "MobPoints"; + break; + +On1028: + set @mobID, 1028; + callfunc "MobPoints"; + break; + +On1029: + set @mobID, 1029; + callfunc "MobPoints"; + break; + +On1032: + set @mobID, 1032; + callfunc "MobPoints"; + break; + +On1035: + set @mobID, 1035; + callfunc "MobPoints"; + break; + On1037: set @mobID, 1037; callfunc "MobPoints"; break; +On1038: + set @mobID, 1038; + callfunc "MobPoints"; + break; + end; } diff --git a/npc/011-1_Woodland/monsters.txt b/npc/011-1_Woodland/monsters.txt deleted file mode 100644 index 15e69164..00000000 --- a/npc/011-1_Woodland/monsters.txt +++ /dev/null @@ -1,47 +0,0 @@ -// Map: 011-1 -// This is Central Woodland. -// - -011-1.gat,0,0,0,0 monster EvilMushroom 1013,25,0,0,Mob9::OnEvilMushroom -011-1.gat,0,0,0,0 monster Flower 1014,40,0,0,Mob9::OnFlower - -011-1.gat,0,0,0,0 monster Alizarin 1032,1,2700000,1800000,Mob9::OnAlizarin -011-1.gat,0,0,0,0 monster Mauve 1029,4,270000,180000,Mob9::OnMauve - -011-1.gat,0,0,0,0 monster SilkWorm 1035,2,60000,30000,Mob9::OnSilkWorm - -011-1.gat,0,0,0,0 monster Squirrel 1038,30,20,10,Mob9::OnSquirrel - -011-1.gat,0,0,0 script Mob9 -1,{ -OnEvilMushroom: - set @mobID, 1013; - callfunc "MobPoints"; - break; - -OnFlower: - set @mobID, 1014; - callfunc "MobPoints"; - break; - -OnMauve: - set @mobID, 1029; - 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; -} diff --git a/npc/012-1_Woodland_Hills/_import.txt b/npc/012-1_Woodland_Hills/_import.txt index c330811f..842667dc 100644 --- a/npc/012-1_Woodland_Hills/_import.txt +++ b/npc/012-1_Woodland_Hills/_import.txt @@ -3,5 +3,4 @@ npc: npc/012-1_Woodland_Hills/_mobs.txt npc: npc/012-1_Woodland_Hills/_warps.txt npc: npc/012-1_Woodland_Hills/amrak.txt npc: npc/012-1_Woodland_Hills/injured-mouboo.txt -npc: npc/012-1_Woodland_Hills/monsters.txt npc: npc/012-1_Woodland_Hills/shops.txt diff --git a/npc/012-1_Woodland_Hills/_mobs.txt b/npc/012-1_Woodland_Hills/_mobs.txt index a5159257..65aa2be8 100644 --- a/npc/012-1_Woodland_Hills/_mobs.txt +++ b/npc/012-1_Woodland_Hills/_mobs.txt @@ -1,13 +1,67 @@ // 012-1 Woodland Hills mobs +012-1.gat,0,0,0,0 monster Flower 1014,13,0,100,Mob012-1::On1014 +012-1.gat,0,0,0,0 monster SpikyMushroom 1019,25,0,10,Mob012-1::On1019 +012-1.gat,0,0,0,0 monster Mouboo 1028,20,0,10,Mob012-1::On1028 +012-1.gat,0,0,0,0 monster Mauve 1029,5,2700000,1800000,Mob012-1::On1029 +012-1.gat,0,0,0,0 monster Cobalt 1030,2,2700000,1800000,Mob012-1::On1030 +012-1.gat,0,0,0,0 monster Gamboge 1031,2,2700000,1800000,Mob012-1::On1031 +012-1.gat,0,0,0,0 monster Alizarin 1032,2,2700000,1800000,Mob012-1::On1032 +012-1.gat,0,0,0,0 monster SilkWorm 1035,5,60000,30000,Mob012-1::On1035 012-1.gat,0,0,0,0 monster Clover 1037,2,0,1000,Mob012-1::On1037 +012-1.gat,0,0,0,0 monster Squirrel 1038,25,30,20,Mob012-1::On1038 012-1.gat,0,0,0 script Mob012-1 -1,{ +On1014: + set @mobID, 1014; + callfunc "MobPoints"; + break; + +On1019: + set @mobID, 1019; + callfunc "MobPoints"; + break; + +On1028: + set @mobID, 1028; + callfunc "MobPoints"; + break; + +On1029: + set @mobID, 1029; + callfunc "MobPoints"; + break; + +On1030: + set @mobID, 1030; + callfunc "MobPoints"; + break; + +On1031: + set @mobID, 1031; + callfunc "MobPoints"; + break; + +On1032: + set @mobID, 1032; + callfunc "MobPoints"; + break; + +On1035: + set @mobID, 1035; + callfunc "MobPoints"; + break; + On1037: set @mobID, 1037; callfunc "MobPoints"; break; +On1038: + set @mobID, 1038; + callfunc "MobPoints"; + break; + end; } diff --git a/npc/012-1_Woodland_Hills/monsters.txt b/npc/012-1_Woodland_Hills/monsters.txt deleted file mode 100644 index c9c4ab02..00000000 --- a/npc/012-1_Woodland_Hills/monsters.txt +++ /dev/null @@ -1,59 +0,0 @@ -// Map: 012-1 -// This is North Woodland. -// - -012-1.gat,0,0,0,0 monster Mouboo 1028,25,0,0,Mob26::OnMouboo -012-1.gat,0,0,0,0 monster SpikyMushroom 1019,30,0,0,Mob26::OnSpikyMushroom - -012-1.gat,0,0,0,0 monster Alizarin 1032,2,2700000,1800000,Mob26::OnAlizarin -012-1.gat,0,0,0,0 monster Gamboge 1031,2,2700000,1800000,Mob26::OnGamboge -012-1.gat,0,0,0,0 monster Cobalt 1030,2,2700000,1800000,Mob26::OnCobalt -012-1.gat,0,0,0,0 monster Mauve 1029,6,2700000,1800000,Mob26::OnMauve - -012-1.gat,0,0,0,0 monster SilkWorm 1035,5,6000,3000,Mob26::OnSilkWorm - -012-1.gat,0,0,0,0 monster Squirrel 1038,30,20,10,Mob26::OnSquirrel - -012-1.gat,0,0,0 script Mob26 -1,{ -OnMouboo: - set @mobID, 1028; - callfunc "MobPoints"; - break; - -OnSpikyMushroom: - set @mobID, 1019; - callfunc "MobPoints"; - break; - -OnAlizarin: - set @mobID, 1032; - callfunc "MobPoints"; - break; - -OnGamboge: - set @mobID, 1031; - callfunc "MobPoints"; - break; - -OnCobalt: - set @mobID, 1030; - callfunc "MobPoints"; - break; - -OnMauve: - set @mobID, 1029; - callfunc "MobPoints"; - break; - -OnSilkWorm: - set @mobID, 1035; - callfunc "MobPoints"; - break; - -OnSquirrel: - set @mobID, 1038; - callfunc "MobPoints"; - break; - - end; -} diff --git a/npc/013-1_Woodland_hills/_import.txt b/npc/013-1_Woodland_hills/_import.txt index 899d3d7e..ea553681 100644 --- a/npc/013-1_Woodland_hills/_import.txt +++ b/npc/013-1_Woodland_hills/_import.txt @@ -1,5 +1,4 @@ map: 013-1.gat npc: npc/013-1_Woodland_hills/_mobs.txt npc: npc/013-1_Woodland_hills/_warps.txt -npc: npc/013-1_Woodland_hills/monsters.txt npc: npc/013-1_Woodland_hills/sagatha.txt diff --git a/npc/013-1_Woodland_hills/_mobs.txt b/npc/013-1_Woodland_hills/_mobs.txt index 32aeb3f6..5fba767e 100644 --- a/npc/013-1_Woodland_hills/_mobs.txt +++ b/npc/013-1_Woodland_hills/_mobs.txt @@ -1,13 +1,71 @@ // 013-1 Woodland hills mobs +013-1.gat,0,0,0,0 monster Flower 1014,13,0,100,Mob013-1::On1014 +013-1.gat,0,0,0,0 monster SpikyMushroom 1019,12,0,100,Mob013-1::On1019 +013-1.gat,0,0,0,0 monster Mouboo 1028,5,0,100,Mob013-1::On1028 +013-1.gat,0,0,0,0 monster Mauve 1029,1,270,180,Mob013-1::On1029 +013-1.gat,0,0,0,0 monster Mauve 1029,4,2700000,1800000,Mob013-1::On1029 +013-1.gat,0,0,0,0 monster Cobalt 1030,1,270,180,Mob013-1::On1030 +013-1.gat,0,0,0,0 monster Cobalt 1030,2,2700000,1800000,Mob013-1::On1030 +013-1.gat,0,0,0,0 monster Gamboge 1031,1,270,180,Mob013-1::On1031 +013-1.gat,0,0,0,0 monster Gamboge 1031,2,2700000,1800000,Mob013-1::On1031 +013-1.gat,0,0,0,0 monster Alizarin 1032,1,270,180,Mob013-1::On1032 +013-1.gat,0,0,0,0 monster Alizarin 1032,2,2700000,1800000,Mob013-1::On1032 +013-1.gat,0,0,0,0 monster SilkWorm 1035,4,60000,30000,Mob013-1::On1035 013-1.gat,0,0,0,0 monster Clover 1037,2,0,1000,Mob013-1::On1037 +013-1.gat,0,0,0,0 monster Squirrel 1038,25,30,20,Mob013-1::On1038 013-1.gat,0,0,0 script Mob013-1 -1,{ +On1014: + set @mobID, 1014; + callfunc "MobPoints"; + break; + +On1019: + set @mobID, 1019; + callfunc "MobPoints"; + break; + +On1028: + set @mobID, 1028; + callfunc "MobPoints"; + break; + +On1029: + set @mobID, 1029; + callfunc "MobPoints"; + break; + +On1030: + set @mobID, 1030; + callfunc "MobPoints"; + break; + +On1031: + set @mobID, 1031; + callfunc "MobPoints"; + break; + +On1032: + set @mobID, 1032; + callfunc "MobPoints"; + break; + +On1035: + set @mobID, 1035; + callfunc "MobPoints"; + break; + On1037: set @mobID, 1037; callfunc "MobPoints"; break; +On1038: + set @mobID, 1038; + callfunc "MobPoints"; + break; + end; } diff --git a/npc/013-1_Woodland_hills/monsters.txt b/npc/013-1_Woodland_hills/monsters.txt deleted file mode 100644 index f9bb0925..00000000 --- a/npc/013-1_Woodland_hills/monsters.txt +++ /dev/null @@ -1,70 +0,0 @@ -// Map: 013-2 -// This is North-East Woodland. -// - -013-1.gat,0,0,0,0 monster Mouboo 1028,5,0,0,Mob28::OnMouboo -013-1.gat,0,0,0,0 monster SpikyMushroom 1019,15,0,0,Mob28::OnSpikyMushroom -013-1.gat,0,0,0,0 monster Flower 1014,15,0,0,Mob28::OnFlower - -013-1.gat,0,0,0,0 monster Alizarin 1032,1,0,0,Mob28::OnAlizarin -013-1.gat,0,0,0,0 monster Gamboge 1031,1,0,0,Mob28::OnGamboge -013-1.gat,0,0,0,0 monster Cobalt 1030,1,0,0,Mob28::OnCobalt -013-1.gat,0,0,0,0 monster Mauve 1029,1,0,0,Mob28::OnMauve - -013-1.gat,0,0,0,0 monster Alizarin 1032,2,2700000,1800000,Mob28::OnAlizarin -013-1.gat,0,0,0,0 monster Gamboge 1031,2,2700000,1800000,Mob28::OnGamboge -013-1.gat,0,0,0,0 monster Cobalt 1030,2,2700000,1800000,Mob28::OnCobalt -013-1.gat,0,0,0,0 monster Mauve 1029,4,2700000,1800000,Mob28::OnMauve - -013-1.gat,0,0,0,0 monster SilkWorm 1035,4,6000,3000,Mob28::OnSilkWorm - -013-1.gat,0,0,0,0 monster Squirrel 1038,30,20,10,Mob28::OnSquirrel - -013-1.gat,0,0,0 script Mob28 -1,{ -OnMouboo: - set @mobID, 1028; - callfunc "MobPoints"; - break; - -OnSpikyMushroom: - set @mobID, 1019; - callfunc "MobPoints"; - break; - -OnFlower: - set @mobID, 1014; - callfunc "MobPoints"; - break; - -OnAlizarin: - set @mobID, 1032; - callfunc "MobPoints"; - break; - -OnGamboge: - set @mobID, 1031; - callfunc "MobPoints"; - break; - -OnCobalt: - set @mobID, 1030; - callfunc "MobPoints"; - break; - -OnMauve: - set @mobID, 1029; - callfunc "MobPoints"; - break; - -OnSilkWorm: - set @mobID, 1035; - callfunc "MobPoints"; - break; - -OnSquirrel: - set @mobID, 1038; - callfunc "MobPoints"; - break; - - end; -} diff --git a/npc/014-1_Woodland/_import.txt b/npc/014-1_Woodland/_import.txt index 6160ff13..3c67f38f 100644 --- a/npc/014-1_Woodland/_import.txt +++ b/npc/014-1_Woodland/_import.txt @@ -1,6 +1,5 @@ map: 014-1.gat npc: npc/014-1_Woodland/_mobs.txt npc: npc/014-1_Woodland/_warps.txt -npc: npc/014-1_Woodland/monsters.txt npc: npc/014-1_Woodland/taro.txt npc: npc/014-1_Woodland/wedding-officiator.txt diff --git a/npc/014-1_Woodland/_mobs.txt b/npc/014-1_Woodland/_mobs.txt index 4c86f12b..19194433 100644 --- a/npc/014-1_Woodland/_mobs.txt +++ b/npc/014-1_Woodland/_mobs.txt @@ -1,13 +1,77 @@ // 014-1 Woodland mobs +014-1.gat,0,0,0,0 monster EvilMushroom 1013,20,0,0,Mob014-1::On1013 +014-1.gat,0,0,0,0 monster Flower 1014,25,0,0,Mob014-1::On1014 +014-1.gat,0,0,0,0 monster Spiky Mushroom 1019,15,0,0,Mob014-1::On1019 +014-1.gat,0,0,0,0 monster Mouboo 1028,5,0,10,Mob014-1::On1028 +014-1.gat,0,0,0,0 monster Mauve 1029,1,270,180,Mob014-1::On1029 +014-1.gat,0,0,0,0 monster Mauve 1029,5,2700000,1800000,Mob014-1::On1029 +014-1.gat,0,0,0,0 monster Cobalt 1030,1,270,180,Mob014-1::On1030 +014-1.gat,0,0,0,0 monster Cobalt 1030,2,2700000,1800000,Mob014-1::On1030 +014-1.gat,0,0,0,0 monster Gamboge 1031,1,270,180,Mob014-1::On1031 +014-1.gat,0,0,0,0 monster Gamboge 1031,2,2700000,1800000,Mob014-1::On1031 +014-1.gat,0,0,0,0 monster Alizarin 1032,1,270,180,Mob014-1::On1032 +014-1.gat,0,0,0,0 monster Alizarin 1032,2,2700000,1800000,Mob014-1::On1032 +014-1.gat,0,0,0,0 monster SilkWorm 1035,4,6000,3000,Mob014-1::On1035 014-1.gat,0,0,0,0 monster Clover 1037,2,0,1000,Mob014-1::On1037 +014-1.gat,0,0,0,0 monster Squirrel 1038,25,30,20,Mob014-1::On1038 014-1.gat,0,0,0 script Mob014-1 -1,{ +On1013: + set @mobID, 1013; + callfunc "MobPoints"; + break; + +On1014: + set @mobID, 1014; + callfunc "MobPoints"; + break; + +On1019: + set @mobID, 1019; + callfunc "MobPoints"; + break; + +On1028: + set @mobID, 1028; + callfunc "MobPoints"; + break; + +On1029: + set @mobID, 1029; + callfunc "MobPoints"; + break; + +On1030: + set @mobID, 1030; + callfunc "MobPoints"; + break; + +On1031: + set @mobID, 1031; + callfunc "MobPoints"; + break; + +On1032: + set @mobID, 1032; + callfunc "MobPoints"; + break; + +On1035: + set @mobID, 1035; + callfunc "MobPoints"; + break; + On1037: set @mobID, 1037; callfunc "MobPoints"; break; +On1038: + set @mobID, 1038; + callfunc "MobPoints"; + break; + end; } diff --git a/npc/014-1_Woodland/monsters.txt b/npc/014-1_Woodland/monsters.txt deleted file mode 100644 index be07addc..00000000 --- a/npc/014-1_Woodland/monsters.txt +++ /dev/null @@ -1,76 +0,0 @@ -// Map: 014-1 -// This is West Woodland. -// - -014-1.gat,0,0,0,0 monster Mouboo 1028,5,0,0,Mob29::OnMouboo -014-1.gat,0,0,0,0 monster EvilMushroom 1013,15,0,0,Mob29::OnEvilMushroom -014-1.gat,0,0,0,0 monster Flower 1014,25,0,0,Mob29::OnFlower -014-1.gat,0,0,0,0 monster FireGoblin 1011,20,0,0,Mob29::OnFireGoblin - -014-1.gat,0,0,0,0 monster Alizarin 1032,1,0,0,Mob29::OnAlizarin -014-1.gat,0,0,0,0 monster Gamboge 1031,1,0,0,Mob29::OnGamboge -014-1.gat,0,0,0,0 monster Cobalt 1030,1,0,0,Mob29::OnCobalt -014-1.gat,0,0,0,0 monster Mauve 1029,1,0,0,Mob29::OnMauve - -014-1.gat,0,0,0,0 monster Alizarin 1032,2,2700000,1800000,Mob29::OnAlizarin -014-1.gat,0,0,0,0 monster Gamboge 1031,2,2700000,1800000,Mob29::OnGamboge -014-1.gat,0,0,0,0 monster Cobalt 1030,2,2700000,1800000,Mob29::OnCobalt -014-1.gat,0,0,0,0 monster Mauve 1029,6,2700000,1800000,Mob29::OnMauve - -014-1.gat,0,0,0,0 monster SilkWorm 1035,4,6000,3000,Mob29::OnSilkWorm - -014-1.gat,0,0,0,0 monster Squirrel 1038,30,20,10,Mob29::OnSquirrel - -014-1.gat,0,0,0 script Mob29 -1,{ -OnMouboo: - set @mobID, 1028; - callfunc "MobPoints"; - break; - -OnEvilMushroom: - set @mobID, 1013; - callfunc "MobPoints"; - break; - -OnFlower: - set @mobID, 1014; - callfunc "MobPoints"; - break; - -OnFireGoblin: - set @mobID, 1011; - callfunc "MobPoints"; - break; - -OnAlizarin: - set @mobID, 1032; - callfunc "MobPoints"; - break; - -OnGamboge: - set @mobID, 1031; - callfunc "MobPoints"; - break; - -OnCobalt: - set @mobID, 1030; - callfunc "MobPoints"; - break; - -OnMauve: - set @mobID, 1029; - callfunc "MobPoints"; - break; - -OnSilkWorm: - set @mobID, 1035; - callfunc "MobPoints"; - break; - -OnSquirrel: - set @mobID, 1038; - callfunc "MobPoints"; - break; - - end; -} diff --git a/npc/022-1_Tulimshar/_import.txt b/npc/022-1_Tulimshar/_import.txt index e3e6f0d8..cdeb7170 100644 --- a/npc/022-1_Tulimshar/_import.txt +++ b/npc/022-1_Tulimshar/_import.txt @@ -1,3 +1,5 @@ map: 022-1.gat npc: npc/022-1_Tulimshar/_mobs.txt npc: npc/022-1_Tulimshar/_warps.txt +npc: npc/022-1_Tulimshar/elanore.txt +npc: npc/022-1_Tulimshar/ferry_master.txt diff --git a/npc/_import.txt b/npc/_import.txt index fdc8cf5c..033698bc 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -21,6 +21,7 @@ import: npc/010-2_Dimonds_Cove/_import.txt import: npc/011-1_Woodland/_import.txt import: npc/011-3_Hermits_cave/_import.txt import: npc/011-4_Lake_cave/_import.txt +import: npc/011-5/_import.txt import: npc/012-1_Woodland_Hills/_import.txt import: npc/012-3_Cave/_import.txt import: npc/013-1_Woodland_hills/_import.txt @@ -42,7 +43,9 @@ 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/021-2_Tulimshar/_import.txt +import: npc/021-8_Meeting_Rooms/_import.txt import: npc/022-1_Tulimshar/_import.txt +import: npc/023-1_Beach_Cliffs/_import.txt import: npc/024-1_Tulimshar_Canyon/_import.txt import: npc/024-2_Tulimshar_Magic_School/_import.txt import: npc/botcheck/_import.txt diff --git a/npc/test_Tulimshar/_import.txt b/npc/test_Tulimshar/_import.txt deleted file mode 100644 index d1091f7d..00000000 --- a/npc/test_Tulimshar/_import.txt +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 2589b562..00000000 --- a/npc/test_Tulimshar/_mobs.txt +++ /dev/null @@ -1,47 +0,0 @@ -// 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 deleted file mode 100644 index fe07c49e..00000000 --- a/npc/test_Tulimshar/_warps.txt +++ /dev/null @@ -1,5 +0,0 @@ -// 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 -- cgit v1.2.3-60-g2f50