diff options
| author | Fate <fate-tmw@googlemail.com> | 2008-11-22 03:45:50 -0700 |
|---|---|---|
| committer | Fate <fate-tmw@googlemail.com> | 2008-11-22 03:45:50 -0700 |
| commit | 8cae569d85aba62c966fcb657bac794b2f30b0d2 (patch) | |
| tree | 04e42e2a0ddfa0869401c98e672ba347cc91776c | |
| parent | f2aa58baabb81281323c146d355a1317628afa4f (diff) | |
| download | serverdata-8cae569d85aba62c966fcb657bac794b2f30b0d2.tar.gz serverdata-8cae569d85aba62c966fcb657bac794b2f30b0d2.tar.bz2 serverdata-8cae569d85aba62c966fcb657bac794b2f30b0d2.tar.xz serverdata-8cae569d85aba62c966fcb657bac794b2f30b0d2.zip | |
Map name/warp/monster location fixes
127 files changed, 372 insertions, 372 deletions
diff --git a/npc/001-1_Tulimshar/children.txt b/npc/001-1_Tulimshar/children.txt index f14a2509..e68cfe95 100644 --- a/npc/001-1_Tulimshar/children.txt +++ b/npc/001-1_Tulimshar/children.txt @@ -53,7 +53,7 @@ L_8: close; } -new_3-1.gat,39,67,0 script Nina 103,{ +001-1.gat,39,67,0 script Nina 103,{ set @TEMP,rand(8); if(@TEMP == 0) goto L_1; if(@TEMP == 1) goto L_1; diff --git a/npc/001-1_Tulimshar/guards.txt b/npc/001-1_Tulimshar/guards.txt index c5433286..366f4475 100644 --- a/npc/001-1_Tulimshar/guards.txt +++ b/npc/001-1_Tulimshar/guards.txt @@ -65,7 +65,7 @@ L_disaster: close; } -new_3-1.gat,40,79,0 script Ryan 104,{ +001-1.gat,40,79,0 script Ryan 104,{ mes "[Ryan the Town Guard]"; mes "ZzzZzzZ..."; next; diff --git a/npc/001-1_Tulimshar/monsters.txt b/npc/001-1_Tulimshar/monsters.txt index 1fc53d88..e5e19a0d 100644 --- a/npc/001-1_Tulimshar/monsters.txt +++ b/npc/001-1_Tulimshar/monsters.txt @@ -1,4 +1,4 @@ -// Map: new_3-1 +// Map: 001-1 // This is Tulimshar the city -- southern part with market and casino/inn. // diff --git a/npc/001-2_Tulimshar/phaet.txt b/npc/001-2_Tulimshar/phaet.txt index ec4ae6dc..e495d93d 100644 --- a/npc/001-2_Tulimshar/phaet.txt +++ b/npc/001-2_Tulimshar/phaet.txt @@ -21,7 +21,7 @@ L_Sure: mes "\"Get ready!\""; next; - warp "new_6-1.gat", 0, 0; + warp "001-3.gat", 0, 0; close; L_NoMoney: diff --git a/npc/001-3_Tulimshar_arena/guards.txt b/npc/001-3_Tulimshar_arena/guards.txt index 56a677af..5b42ca4f 100644 --- a/npc/001-3_Tulimshar_arena/guards.txt +++ b/npc/001-3_Tulimshar_arena/guards.txt @@ -16,7 +16,7 @@ L_Sure: mes "\"Ok.\""; next; - warp "new_8-1.gat", 25, 23; + warp "001-2.gat", 25, 23; close; } diff --git a/npc/001-3_Tulimshar_arena/monsters.txt b/npc/001-3_Tulimshar_arena/monsters.txt index 91fe96b3..04e6b11d 100644 --- a/npc/001-3_Tulimshar_arena/monsters.txt +++ b/npc/001-3_Tulimshar_arena/monsters.txt @@ -1,4 +1,4 @@ -// Map: new_6-1 +// Map: 001-3 // This is the Tulimshar Arena -- below Tulimshar. // diff --git a/npc/002-1_Sandstorm/dark_mage.txt b/npc/002-1_Sandstorm/dark_mage.txt index 630d4471..002b5ed9 100644 --- a/npc/002-1_Sandstorm/dark_mage.txt +++ b/npc/002-1_Sandstorm/dark_mage.txt @@ -1,48 +1,48 @@ // -002-1.gat,24,24,0 script SoulThief 103,{ +// 002-1.gat,24,24,0 script SoulThief 103,{ - if (class == 1) goto L_Soul; - mes "[Dark Mage]"; - mes "\"Psss hey would you like to have more power?\""; - next; +// if (class == 1) goto L_Soul; +// mes "[Dark Mage]"; +// mes "\"Psss hey would you like to have more power?\""; +// next; - menu - "You fool, that's not possible", -, - "I'm listening...", L_Go; - close; +// menu +// "You fool, that's not possible", -, +// "I'm listening...", L_Go; +// close; -L_Go: - mes "[Dark Mage]"; - mes "\"I can give you ancient powers that will let you become the greatest warrior in The Mana World, or the best merchant."; - mes "But everything has got his price...\""; - next; +// L_Go: +// mes "[Dark Mage]"; +// mes "\"I can give you ancient powers that will let you become the greatest warrior in The Mana World, or the best merchant."; +// mes "But everything has got his price...\""; +// next; - mes "[Dark Mage]"; - mes "\"Oh nothing important nor expensive."; - mes "Just your soul!\""; - next; +// mes "[Dark Mage]"; +// mes "\"Oh nothing important nor expensive."; +// mes "Just your soul!\""; +// next; - menu - "My soul? Here it is", L_Soul, - "I need a better explanation!", -; +// menu +// "My soul? Here it is", L_Soul, +// "I need a better explanation!", -; - mes "[Dark Mage]"; - mes "Well there's a very small possibility that your player will be translated into the new server."; - mes "I said a very, very small possibility."; - mes "Players without a soul instead will be lost forever..."; - mes "Come on, you won't loose that much!\""; - next; +// mes "[Dark Mage]"; +// mes "Well there's a very small possibility that your player will be translated into the new server."; +// mes "I said a very, very small possibility."; +// mes "Players without a soul instead will be lost forever..."; +// mes "Come on, you won't loose that much!\""; +// next; - menu - "Hmmm ok, I guess you can take it.", L_Soul, - "Maybe I'll think about it a bit more", -; - mes "\"I know you'll come here again when you'll get killed by a maggot, begging me to help you\""; - close; +// menu +// "Hmmm ok, I guess you can take it.", L_Soul, +// "Maybe I'll think about it a bit more", -; +// mes "\"I know you'll come here again when you'll get killed by a maggot, begging me to help you\""; +// close; -L_Soul: - mes "[Dark Mage]"; - mes "\"Hrhrhr, your soul is finally mine!\""; - jobchange 1; - close; -} +// L_Soul: +// mes "[Dark Mage]"; +// mes "\"Hrhrhr, your soul is finally mine!\""; +// jobchange 1; +// close; +// } diff --git a/npc/002-1_Sandstorm/monsters.txt b/npc/002-1_Sandstorm/monsters.txt index a8406a7f..39783382 100644 --- a/npc/002-1_Sandstorm/monsters.txt +++ b/npc/002-1_Sandstorm/monsters.txt @@ -1,4 +1,4 @@ -// Map: new_1-1 +// Map: 002-2 // This is the Desert (Sandstorm) south of Tulimshar. // diff --git a/npc/002-4_Desert_mines/chest.txt b/npc/002-4_Desert_mines/chest.txt index 865c0f7e..bd76dd08 100644 --- a/npc/002-4_Desert_mines/chest.txt +++ b/npc/002-4_Desert_mines/chest.txt @@ -1,6 +1,6 @@ // -new_5-1.gat,93,37,0 script Treasure 111,{ +002-4.gat,93,37,0 script Treasure 111,{ if( ChestQuest == 1) goto L_Finished; mes "[Chest]"; diff --git a/npc/002-4_Desert_mines/monsters.txt b/npc/002-4_Desert_mines/monsters.txt index 34acaa9f..17d5cdee 100644 --- a/npc/002-4_Desert_mines/monsters.txt +++ b/npc/002-4_Desert_mines/monsters.txt @@ -1,4 +1,4 @@ -// Map: new_5-1 +// Map: 002-4 // This is the Desert Mines south of Tulimshar -- level 2. // diff --git a/npc/003-1_Beach/_warps.txt b/npc/003-1_Beach/_warps.txt index 2358947b..e66a28e4 100644 --- a/npc/003-1_Beach/_warps.txt +++ b/npc/003-1_Beach/_warps.txt @@ -1,4 +1,4 @@ // 003-1 Beach warps -003-1.gat,172,77 warp ToSandstorm -1,3,002-1.gat,37,109 +003-1.gat,172,77 warp ToSandstorm -1,3,002-1.gat,15,66 003-1.gat,20,23 warp ToWoodland 1,-1,007-1.gat,120,112 diff --git a/npc/003-1_Beach/monsters.txt b/npc/003-1_Beach/monsters.txt index 8407a835..248cc968 100644 --- a/npc/003-1_Beach/monsters.txt +++ b/npc/003-1_Beach/monsters.txt @@ -1,4 +1,4 @@ -// Map: new_15-1 +// Map: 003-1 // This is the Desert Beach. // diff --git a/npc/004-1_Beach/monsters.txt b/npc/004-1_Beach/monsters.txt index b842621e..8056eead 100644 --- a/npc/004-1_Beach/monsters.txt +++ b/npc/004-1_Beach/monsters.txt @@ -1,4 +1,4 @@ -// Map: new_34-1 +// Map: 004-1 // This is the Beach west of Tulimshar. // diff --git a/npc/005-1_Snake_desert/monsters.txt b/npc/005-1_Snake_desert/monsters.txt index c2ec4c71..b2334f11 100644 --- a/npc/005-1_Snake_desert/monsters.txt +++ b/npc/005-1_Snake_desert/monsters.txt @@ -1,11 +1,11 @@ -// Map: new_7-1 +// Map: 005-1 // This is the Snake Desert. // -new_7-1.gat,0,0,0,0 monster Maggot 1002,20,0,0,Mob7::OnMaggot -new_7-1.gat,0,0,0,0 monster Snake 1010,20,0,0,Mob7::OnSnake +005-1.gat,0,0,0,0 monster Maggot 1002,20,0,0,Mob7::OnMaggot +005-1.gat,0,0,0,0 monster Snake 1010,20,0,0,Mob7::OnSnake -new_7-1.gat,0,0,0 script Mob7 -1,{ +005-1.gat,0,0,0 script Mob7 -1,{ OnMaggot: set @mobID, 1002; callfunc "MobPoints"; diff --git a/npc/005-1_Snake_desert/npcs.txt b/npc/005-1_Snake_desert/npcs.txt index 8b3d1d0a..1a9a8853 100644 --- a/npc/005-1_Snake_desert/npcs.txt +++ b/npc/005-1_Snake_desert/npcs.txt @@ -1,15 +1,15 @@ // -new_7-1.gat,69,76,0 shop George 115,530:3000,1199:3,529:5,539:175,562:500 +005-1.gat,69,76,0 shop George 115,530:3000,1199:3,529:5,539:175,562:500 -new_7-1.gat,66,75,0 script Kieron 132,{ +005-1.gat,66,75,0 script Kieron 132,{ mes "[Kieron]"; mes "\"Be careful if you're going in that cave,"; mes "it's packed full of monsters.\""; close; } -new_7-1.gat,91,23,0 script William 131,{ +005-1.gat,91,23,0 script William 131,{ mes "[William]"; mes "\"Going in the cave?"; mes "You better watch your step, last time I checked it was full of monsters!\""; diff --git a/npc/005-3_Snake_pit/monsters.txt b/npc/005-3_Snake_pit/monsters.txt index 8d88def8..33906d46 100644 --- a/npc/005-3_Snake_pit/monsters.txt +++ b/npc/005-3_Snake_pit/monsters.txt @@ -1,10 +1,10 @@ -// Map: new_22-1 +// Map: 05-3 // This is the Snake Pit, a cave in the Snake Desert. // -new_22-1.gat,0,0,0,0 monster Snake 1010,175,0,0,Mob22::OnSnake +05-3.gat,0,0,0,0 monster Snake 1010,175,0,0,Mob22::OnSnake -new_22-1.gat,0,0,0 script Mob22 -1,{ +05-3.gat,0,0,0 script Mob22 -1,{ OnSnake: set @mobID, 1010; callfunc "MobPoints"; diff --git a/npc/006-1_Desert_mountains/mika.txt b/npc/006-1_Desert_mountains/mika.txt index 222accde..a572b911 100644 --- a/npc/006-1_Desert_mountains/mika.txt +++ b/npc/006-1_Desert_mountains/mika.txt @@ -1,4 +1,4 @@ -new_24-1.gat,39,27,0 script Mika 114,{ +006-1.gat,39,27,0 script Mika 114,{ mes "[Mika]"; mes "\"My father told me about a man living in this desert who makes clothes out of snake skin.\""; next; diff --git a/npc/006-1_Desert_mountains/monsters.txt b/npc/006-1_Desert_mountains/monsters.txt index 649abc39..6942d2cf 100644 --- a/npc/006-1_Desert_mountains/monsters.txt +++ b/npc/006-1_Desert_mountains/monsters.txt @@ -1,10 +1,10 @@ -// Map: new_24-1 +// Map: 006-1 // This is the Desert Mountains. // -new_24-1.gat,0,0,0,0 monster MountainSnake 1026,60,0,0,Mob24::OnMountainSnake +006-1.gat,0,0,0,0 monster MountainSnake 1026,60,0,0,Mob24::OnMountainSnake -new_24-1.gat,0,0,0 script Mob24 -1,{ +006-1.gat,0,0,0 script Mob24 -1,{ OnMountainSnake: set @mobID, 1026; callfunc "MobPoints"; diff --git a/npc/006-1_Desert_mountains/pachua.txt b/npc/006-1_Desert_mountains/pachua.txt index a40c652c..15d1610c 100644 --- a/npc/006-1_Desert_mountains/pachua.txt +++ b/npc/006-1_Desert_mountains/pachua.txt @@ -1,4 +1,4 @@ -new_24-1.gat,23,100,0 script Pachua 143,{ +006-1.gat,23,100,0 script Pachua 143,{ set @LEATHER_PATCH, 708; set @SNAKE_SKIN, 641; diff --git a/npc/006-3_Desert_mountain_caves/monsters.txt b/npc/006-3_Desert_mountain_caves/monsters.txt index b24d2e7c..5aee03a4 100644 --- a/npc/006-3_Desert_mountain_caves/monsters.txt +++ b/npc/006-3_Desert_mountain_caves/monsters.txt @@ -1,10 +1,10 @@ -// Map: new_25-1 +// Map: 006-3 // This is the Desert Mountains Caves. // -new_25-1.gat,0,0,0,0 monster MountainSnake 1026,50,0,0,Mob25::OnMountainSnake +006-3.gat,0,0,0,0 monster MountainSnake 1026,50,0,0,Mob25::OnMountainSnake -new_25-1.gat,0,0,0 script Mob25 -1,{ +006-3.gat,0,0,0 script Mob25 -1,{ OnMountainSnake: set @mobID, 1026; callfunc "MobPoints"; diff --git a/npc/007-1_Woodland/monsters.txt b/npc/007-1_Woodland/monsters.txt index e384b02b..8be691b3 100644 --- a/npc/007-1_Woodland/monsters.txt +++ b/npc/007-1_Woodland/monsters.txt @@ -1,15 +1,15 @@ -// Map: new_16-1 +// Map: 007-1 // This is South-East Woodland. // -new_16-1.gat,0,0,0,0 monster Fluffy 1020,50,0,0,Mob16::OnFluffy -new_16-1.gat,0,0,0,0 monster Flower 1014,40,0,0,Mob16::OnFlower +007-1.gat,0,0,0,0 monster Fluffy 1020,50,0,0,Mob16::OnFluffy +007-1.gat,0,0,0,0 monster Flower 1014,40,0,0,Mob16::OnFlower -new_16-1.gat,0,0,0,0 monster Gamboge 1031,1,2700000,1800000,Mob16::OnGamboge +007-1.gat,0,0,0,0 monster Gamboge 1031,1,2700000,1800000,Mob16::OnGamboge -new_16-1.gat,0,0,0,0 monster SilkWorm 1035,2,60000,30000,Mob16::OnSilkWorm +007-1.gat,0,0,0,0 monster SilkWorm 1035,2,60000,30000,Mob16::OnSilkWorm -new_16-1.gat,0,0,0 script Mob16 -1,{ +007-1.gat,0,0,0 script Mob16 -1,{ OnFluffy: set @mobID, 1020; callfunc "MobPoints"; diff --git a/npc/008-1_Hurnscald_outskirts/george.txt b/npc/008-1_Hurnscald_outskirts/george.txt index 42966bf8..429fdbca 100644 --- a/npc/008-1_Hurnscald_outskirts/george.txt +++ b/npc/008-1_Hurnscald_outskirts/george.txt @@ -1,6 +1,6 @@ // -new_18-1.gat,136,36,0 script George 138,{ +008-1.gat,136,36,0 script George 138,{ if (getequipid(equip_head) == 617) goto L_Pirate; if (getequipid(equip_head) == 622) goto L_Bandana; if (getequipid(equip_head) == 621) goto L_EyePatch; diff --git a/npc/008-1_Hurnscald_outskirts/hinnak.txt b/npc/008-1_Hurnscald_outskirts/hinnak.txt index 39f4bc5a..27dcd677 100644 --- a/npc/008-1_Hurnscald_outskirts/hinnak.txt +++ b/npc/008-1_Hurnscald_outskirts/hinnak.txt @@ -10,7 +10,7 @@ //Farmer -new_18-1.gat,101,30,0 script Hinnak 142, { +008-1.gat,101,30,0 script Hinnak 142, { if (Inspector == 10) goto L_NohMask; if (QUEST_Scythe_state == 1) goto L_Exchange; if (QUEST_Scythe_state == 2) goto L_ThanksAgain; diff --git a/npc/008-1_Hurnscald_outskirts/monsters.txt b/npc/008-1_Hurnscald_outskirts/monsters.txt index 8755285c..3d5f944f 100644 --- a/npc/008-1_Hurnscald_outskirts/monsters.txt +++ b/npc/008-1_Hurnscald_outskirts/monsters.txt @@ -1,15 +1,15 @@ -// Map: new_18-1 +// Map: 008-1 // This is Woodland around Hurnscald. // -new_18-1.gat,0,0,0,0 monster Pinkie 1018,20,0,0,Mob18::OnPinkie -new_18-1.gat,0,0,0,0 monster SpikyMushroom 1019,20,0,0,Mob18::OnSpikyMushroom +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 -new_18-1.gat,0,0,0,0 monster Mauve 1029,1,2700000,1800000,Mob18::OnMauve +008-1.gat,0,0,0,0 monster Mauve 1029,1,2700000,1800000,Mob18::OnMauve -new_18-1.gat,0,0,0,0 monster SilkWorm 1035,2,60000,30000,Mob18::OnSilkWorm +008-1.gat,0,0,0,0 monster SilkWorm 1035,2,60000,30000,Mob18::OnSilkWorm -new_18-1.gat,0,0,0 script Mob18 -1,{ +008-1.gat,0,0,0 script Mob18 -1,{ OnPinkie: set @mobID, 1018; callfunc "MobPoints"; diff --git a/npc/009-1_Hurnscald/jack.txt b/npc/009-1_Hurnscald/jack.txt index 721c4cce..ed90135a 100644 --- a/npc/009-1_Hurnscald/jack.txt +++ b/npc/009-1_Hurnscald/jack.txt @@ -14,7 +14,7 @@ //################################################################################# // Lumberjack -new_19-1.gat,40,45,0 script Jack 141, { +009-1.gat,40,45,0 script Jack 141, { set @RAWLOG, 569; set @RAWLOGS_AMOUNT, 40; set @WOODENSHIELD, 602; diff --git a/npc/009-1_Hurnscald/milly.txt b/npc/009-1_Hurnscald/milly.txt index b8bf7460..82b5cb6a 100644 --- a/npc/009-1_Hurnscald/milly.txt +++ b/npc/009-1_Hurnscald/milly.txt @@ -1,4 +1,4 @@ -new_19-1.gat,81,41,0 script Milly 114, { +009-1.gat,81,41,0 script Milly 114, { mes "[Milly]"; mes "\"Hello.\""; next; diff --git a/npc/009-1_Hurnscald/old_man.txt b/npc/009-1_Hurnscald/old_man.txt index 55812260..84079138 100644 --- a/npc/009-1_Hurnscald/old_man.txt +++ b/npc/009-1_Hurnscald/old_man.txt @@ -1,6 +1,6 @@ // Old man -new_19-1.gat,85,51,0 script Old Man 159,{ +009-1.gat,85,51,0 script Old Man 159,{ mes "[Old Man]"; mes "\"Don't let those monsters get to you.\""; next; diff --git a/npc/009-1_Hurnscald/old_woman.txt b/npc/009-1_Hurnscald/old_woman.txt index c94fe63f..5198f8ab 100644 --- a/npc/009-1_Hurnscald/old_woman.txt +++ b/npc/009-1_Hurnscald/old_woman.txt @@ -1,6 +1,6 @@ // Old woman -new_19-1.gat,29,43,0 script Old Woman 154,{ +009-1.gat,29,43,0 script Old Woman 154,{ mes "[Old Woman]"; mes "\"Hello deary.\""; next; diff --git a/npc/009-1_Hurnscald/sabine.txt b/npc/009-1_Hurnscald/sabine.txt index e45ae7a8..883d4790 100644 --- a/npc/009-1_Hurnscald/sabine.txt +++ b/npc/009-1_Hurnscald/sabine.txt @@ -1,6 +1,6 @@ // Girl sitting on bench -new_19-1.gat,89,27,0 script Sabine 106,{ +009-1.gat,89,27,0 script Sabine 106,{ mes "[Sabine]"; mes "\"Isn't this place pretty? I love hanging out here!\""; next; diff --git a/npc/009-1_Hurnscald/soul-menhir.txt b/npc/009-1_Hurnscald/soul-menhir.txt index 152f05be..d0ec1516 100644 --- a/npc/009-1_Hurnscald/soul-menhir.txt +++ b/npc/009-1_Hurnscald/soul-menhir.txt @@ -1,5 +1,5 @@ -new_19-1.gat,53,40,0 script Soul Menhir 144, { - set @map$, "new_19-1.gat"; +009-1.gat,53,40,0 script Soul Menhir 144, { + set @map$, "010-2.gat"; set @x, 53; set @y, 41; callfunc "SoulMenhir"; diff --git a/npc/009-2_Hurnscald/alan.txt b/npc/009-2_Hurnscald/alan.txt index fc779676..0235ad33 100644 --- a/npc/009-2_Hurnscald/alan.txt +++ b/npc/009-2_Hurnscald/alan.txt @@ -8,7 +8,7 @@ //################################################################################# // Archer Shop Master -new_20-1.gat,99,23,0 script Alan 125, { +009-2.gat,99,23,0 script Alan 125, { set @Q_MASK, NIBBLE_0_MASK; set @Q_SHIFT, NIBBLE_0_SHIFT; diff --git a/npc/009-2_Hurnscald/doctor.txt b/npc/009-2_Hurnscald/doctor.txt index 825db4cc..2d7c2602 100644 --- a/npc/009-2_Hurnscald/doctor.txt +++ b/npc/009-2_Hurnscald/doctor.txt @@ -1,6 +1,6 @@ // Doctor -new_20-1.gat,148,25,0 script Doctor 107,{ +009-2.gat,148,25,0 script Doctor 107,{ if (getequipid(equip_head) == 616) goto L_Axe; if (getequipid(equip_head) == 621) goto L_Eyepatch; diff --git a/npc/009-2_Hurnscald/drunks.txt b/npc/009-2_Hurnscald/drunks.txt index 410bb081..61246b4e 100644 --- a/npc/009-2_Hurnscald/drunks.txt +++ b/npc/009-2_Hurnscald/drunks.txt @@ -1,6 +1,6 @@ //Left drinking contest guy -new_20-1.gat,65,55,0 script Drinker 121, { +009-2.gat,65,55,0 script Drinker 121, { mes "[Binge Drinker]"; mes "\"Ha! I'll drink muuuch mo.. more than you! Im not ooone biiit dr...dr..unk!\""; close; @@ -8,7 +8,7 @@ new_20-1.gat,65,55,0 script Drinker 121, { //Right drinking contest guy -new_20-1.gat,68,55,0 script Drinker 121, { +009-2.gat,68,55,0 script Drinker 121, { mes "[Binge Drinker]"; mes "\"I can still drink more! Better give up you... you... teelotaler! MORE BEER MELINDA!\""; //I know it's called "teetotaler". That error is on purpose. diff --git a/npc/009-2_Hurnscald/inspector.txt b/npc/009-2_Hurnscald/inspector.txt index 89192104..f25d026a 100644 --- a/npc/009-2_Hurnscald/inspector.txt +++ b/npc/009-2_Hurnscald/inspector.txt @@ -1,6 +1,6 @@ // -new_20-1.gat,24,99,0 script Inspector#Hurnscald 150,{ +009-2.gat,24,99,0 script Inspector#Hurnscald 150,{ if (Inspector == 0 && BaseLevel >= 30) goto L_NohMask_Start; if (Inspector == 1) goto L_NohMask_AskVillage; if (Inspector == 2) goto L_NohMask_OldWoman; diff --git a/npc/009-2_Hurnscald/kfahr.txt b/npc/009-2_Hurnscald/kfahr.txt index 3ca72226..cd5bc3b7 100644 --- a/npc/009-2_Hurnscald/kfahr.txt +++ b/npc/009-2_Hurnscald/kfahr.txt @@ -13,7 +13,7 @@ //# //################################################################################# -new_20-1.gat,67,57,0 script Kfahr 125,{ +009-2.gat,67,57,0 script Kfahr 125,{ set @QS_NEWBIE, 0; set @QS_MET_KFAHR, 1; diff --git a/npc/009-2_Hurnscald/misc.txt b/npc/009-2_Hurnscald/misc.txt index b2cfe9da..56d02bf9 100644 --- a/npc/009-2_Hurnscald/misc.txt +++ b/npc/009-2_Hurnscald/misc.txt @@ -1,6 +1,6 @@ //Note in bar -new_20-1.gat,54,49,0 script Note 127, { +009-2.gat,54,49,0 script Note 127, { mes "[Note]"; mes "\"We refuse service to anyone who:\""; mes "\"-Has a bubblehead\""; diff --git a/npc/009-2_Hurnscald/nicholas.txt b/npc/009-2_Hurnscald/nicholas.txt index 7d21ab0f..30d48594 100644 --- a/npc/009-2_Hurnscald/nicholas.txt +++ b/npc/009-2_Hurnscald/nicholas.txt @@ -11,7 +11,7 @@ //# //################################################################################# -new_20-1.gat,185,55,0 script Nicholas 135,{ +009-2.gat,185,55,0 script Nicholas 135,{ set @IRON_ORE, 640; set @INFANTRY, 638; diff --git a/npc/009-2_Hurnscald/nurse.txt b/npc/009-2_Hurnscald/nurse.txt index 2ea8acb1..9fd759c8 100644 --- a/npc/009-2_Hurnscald/nurse.txt +++ b/npc/009-2_Hurnscald/nurse.txt @@ -1,7 +1,7 @@ // Nurse // heals player below level 10 for free and tells players about the doctor on the 3rd floor. -new_20-1.gat,147,65,0 script Nurse 119,{ +009-2.gat,147,65,0 script Nurse 119,{ mes "[Nurse]"; mes "\"Can I help you?\""; next; diff --git a/npc/009-2_Hurnscald/richard.txt b/npc/009-2_Hurnscald/richard.txt index 17336ee7..9b9714c2 100644 --- a/npc/009-2_Hurnscald/richard.txt +++ b/npc/009-2_Hurnscald/richard.txt @@ -1,6 +1,6 @@ // -new_20-1.gat,20, 99,0 script Richard 161,{ +009-2.gat,20, 99,0 script Richard 161,{ set @npcName$, "Richard"; callfunc "Banker"; } diff --git a/npc/009-2_Hurnscald/waitress.txt b/npc/009-2_Hurnscald/waitress.txt index 6cf9791b..cf2778fd 100644 --- a/npc/009-2_Hurnscald/waitress.txt +++ b/npc/009-2_Hurnscald/waitress.txt @@ -1,6 +1,6 @@ // Waitress -new_20-1.gat,60,52,0 script Melinda 140,{ +009-2.gat,60,52,0 script Melinda 140,{ if (zeny < 180) goto L_NoMoney; mes "[Melinda]"; mes "\"Hi sweety! Want a fresh beer for 170gp?\""; diff --git a/npc/009-3_Cave_beneath_Hurnscald/monsters.txt b/npc/009-3_Cave_beneath_Hurnscald/monsters.txt index 9b108f5f..b69bb3a1 100644 --- a/npc/009-3_Cave_beneath_Hurnscald/monsters.txt +++ b/npc/009-3_Cave_beneath_Hurnscald/monsters.txt @@ -1,12 +1,12 @@ -// Map: new_35-1 +// Map: 009-3 // This is the cave beneath Hurnscald. // -new_35-1.gat,0,0,0,0 monster YellowSlime 1007,20,0,0,Mob35::OnYellowSlime -new_35-1.gat,0,0,0,0 monster RedSlime 1008,35,0,0,Mob35::OnRedSlime -new_35-1.gat,0,0,0,0 monster BlackScorpion 1009,25,0,0,Mob35::OnBlackScorpion +009-3.gat,0,0,0,0 monster YellowSlime 1007,20,0,0,Mob35::OnYellowSlime +009-3.gat,0,0,0,0 monster RedSlime 1008,35,0,0,Mob35::OnRedSlime +009-3.gat,0,0,0,0 monster BlackScorpion 1009,25,0,0,Mob35::OnBlackScorpion -new_35-1.gat,0,0,0 script Mob35 -1,{ +009-3.gat,0,0,0 script Mob35 -1,{ OnYellowSlime: set @mobID, 1007; callfunc "MobPoints"; diff --git a/npc/010-1_Woodland/_warps.txt b/npc/010-1_Woodland/_warps.txt index b02dc45c..1e27f550 100644 --- a/npc/010-1_Woodland/_warps.txt +++ b/npc/010-1_Woodland/_warps.txt @@ -3,5 +3,5 @@ 010-1.gat,49,23 warp ToWoodland 0,-1,011-1.gat,46,99 010-1.gat,14,55 warp ToWoodland -1,0,015-1.gat,92,54 010-1.gat,36,94 warp ToDimondsCove -1,-1,010-2.gat,32,44 -010-1.gat,56,104 warp ToWoodland 1,-1,015-1.gat,56,21 +010-1.gat,56,104 warp ToWoodland 1,-1,016-1.gat,56,21 010-1.gat,131,54 warp ToWoodland -1,0,007-1.gat,25,53 diff --git a/npc/010-1_Woodland/monsters.txt b/npc/010-1_Woodland/monsters.txt index f371e497..80142466 100644 --- a/npc/010-1_Woodland/monsters.txt +++ b/npc/010-1_Woodland/monsters.txt @@ -1,16 +1,16 @@ -// Map: new_14-1 +// Map: 010-1 // This is South Woodland. // -new_14-1.gat,0,0,0,0 monster Scorpion 1003,50,0,0,Mob14::OnScorpion -new_14-1.gat,0,0,0,0 monster SpikyMushroom 1019,50,0,0,Mob14::OnSpikyMushroom -new_14-1.gat,0,0,0,0 monster LogHead 1025,50,0,0,Mob14::OnLogHead +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 -new_14-1.gat,0,0,0,0 monster Cobalt 1030,1,2700000,1800000,Mob14::OnCobalt +010-1.gat,0,0,0,0 monster Cobalt 1030,1,2700000,1800000,Mob14::OnCobalt -new_14-1.gat,0,0,0,0 monster SilkWorm 1035,2,60000,30000,Mob14::OnSilkWorm +010-1.gat,0,0,0,0 monster SilkWorm 1035,2,60000,30000,Mob14::OnSilkWorm -new_14-1.gat,0,0,0 script Mob14 -1,{ +010-1.gat,0,0,0 script Mob14 -1,{ OnScorpion: set @mobID, 1003; callfunc "MobPoints"; diff --git a/npc/010-2_Dimond's_Cove/dimonds.txt b/npc/010-2_Dimond's_Cove/dimonds.txt index 05d83b5c..713b0d69 100644 --- a/npc/010-2_Dimond's_Cove/dimonds.txt +++ b/npc/010-2_Dimond's_Cove/dimonds.txt @@ -1,6 +1,6 @@ // -new_23-1.gat,34,38,0 script Dimond 165,{ +010-2.gat,34,38,0 script Dimond 165,{ mes "[Dimond]"; mes "\"Welcome to Dimond's Cove!\""; mes ""; @@ -11,7 +11,7 @@ new_23-1.gat,34,38,0 script Dimond 165,{ close; } -new_23-1.gat,40,34,0 script Phill 157,{ +010-2.gat,40,34,0 script Phill 157,{ mes "[Phil]"; mes "\"We're having problems with our equipment!\""; next; @@ -20,7 +20,7 @@ new_23-1.gat,40,34,0 script Phill 157,{ close; } -new_23-1.gat,40,37,0 script Jerry 160,{ +010-2.gat,40,37,0 script Jerry 160,{ mes "[Jerry]"; mes "\"I don't know what's wrong.\""; next; @@ -29,7 +29,7 @@ new_23-1.gat,40,37,0 script Jerry 160,{ close; } -new_23-1.gat,42,36,0 script Robert 162,{ +010-2.gat,42,36,0 script Robert 162,{ mes "[Robert]"; mes "\"I hope we can figure something out!\""; next; @@ -38,7 +38,7 @@ new_23-1.gat,42,36,0 script Robert 162,{ close; } -new_23-1.gat,27,30,0 script Bar Rules 127,{ +010-2.gat,27,30,0 script Bar Rules 127,{ mes "Dimonds Cove Bar Rules"; next; mes "No excessive drinking!"; @@ -57,25 +57,25 @@ new_23-1.gat,27,30,0 script Bar Rules 127,{ close; } -new_23-1.gat,71,38,0 script Store Policy 127,{ +010-2.gat,71,38,0 script Store Policy 127,{ mes "All sales are final."; mes "Returns are subject to a 50% re-stocking fee."; close; } -new_23-1.gat,77,38,0 script Store Policy 127,{ +010-2.gat,77,38,0 script Store Policy 127,{ mes "All sales are final."; mes "Returns are subject to a 50% re-stocking fee."; close; } -new_23-1.gat,36,30,0 script Directions 127,{ +010-2.gat,36,30,0 script Directions 127,{ mes "This way to the Dimonds Cove Inn."; mes "Five star accommodation for the weary traveler!"; close; } -new_23-1.gat,80,32,0 script Dimonds Cove 1 127,{ +010-2.gat,80,32,0 script Dimonds Cove 1 127,{ mes "The Story of Dimonds Cove"; next; mes "One day Dimond D. Stone dreamed of her own restaurant."; @@ -94,14 +94,14 @@ new_23-1.gat,80,32,0 script Dimonds Cove 1 127,{ close; } -new_23-1.gat,85,32,0 script Dimonds Cove 2 127,{ +010-2.gat,85,32,0 script Dimonds Cove 2 127,{ mes "List of Events at Dimonds Cove"; mes "January 2008 - Construction of Dimonds Cove."; close; } -new_23-1.gat,71,30,0 script Inn 127,{ +010-2.gat,71,30,0 script Inn 127,{ mes "Welcome to the Dimonds Cove Inn"; mes "Rooms are 200 gp a night."; mes "Plese check in with Basil."; @@ -109,21 +109,21 @@ new_23-1.gat,71,30,0 script Inn 127,{ } -new_23-1.gat,24,27,0 shop Bartender 112,539:175,567:500,568:500 +010-2.gat,24,27,0 shop Bartender 112,539:175,567:500,568:500 -new_23-1.gat,32,34,0 shop Waitress 139,519:100,533:150,534:90,562:500,676:200 +010-2.gat,32,34,0 shop Waitress 139,519:100,533:150,534:90,562:500,676:200 -new_23-1.gat,85,41,0 shop Blacksmith 146,545:20000,529:5,625:20000,626:50000,603:-1 +010-2.gat,85,41,0 shop Blacksmith 146,545:20000,529:5,625:20000,626:50000,603:-1 -new_23-1.gat,65,41,0 shop General Store 137,586:1000,524:1600,544:10000,632:10000,528:1000 +010-2.gat,65,41,0 shop General Store 137,586:1000,524:1600,544:10000,632:10000,528:1000 -new_23-1.gat,75,68,0 script Basil 107,{ +010-2.gat,75,68,0 script Basil 107,{ set @npcName$, "[Basil the Inn Keeper]"; set @cost, 200; callfunc "Inn"; } -new_23-1.gat,33,25,0 script Chef 148,{ +010-2.gat,33,25,0 script Chef 148,{ mes "[Chef]"; mes "I'm too busy right now to talk."; close; diff --git a/npc/010-2_Dimond's_Cove/doug.txt b/npc/010-2_Dimond's_Cove/doug.txt index 301ae9a7..49bb349c 100644 --- a/npc/010-2_Dimond's_Cove/doug.txt +++ b/npc/010-2_Dimond's_Cove/doug.txt @@ -1,4 +1,4 @@ -new_23-1.gat,68,87,0 script Doug 113,{ +010-2.gat,68,87,0 script Doug 113,{ if(CaveSnakeLamp == 1) goto L_State2; if(CaveSnakeLamp == 2) goto L_Done; set @TEMP,rand(4); diff --git a/npc/010-2_Dimond's_Cove/workers.txt b/npc/010-2_Dimond's_Cove/workers.txt index 5579dadd..13704115 100644 --- a/npc/010-2_Dimond's_Cove/workers.txt +++ b/npc/010-2_Dimond's_Cove/workers.txt @@ -1,10 +1,10 @@ -new_23-1.gat,23,70,0 script Josh 155,{ +010-2.gat,23,70,0 script Josh 155,{ mes "[Josh]"; mes "\"We're working on getting the cellar pass open.\""; close; } -new_23-1.gat,39,75,0 script Zack 155,{ +010-2.gat,39,75,0 script Zack 155,{ mes "[Zack]"; mes "\"My brother and I are fixing the cellar pass.\""; close; diff --git a/npc/011-1_Woodland/alchemist.txt b/npc/011-1_Woodland/alchemist.txt index ed6582fa..08ba6e41 100644 --- a/npc/011-1_Woodland/alchemist.txt +++ b/npc/011-1_Woodland/alchemist.txt @@ -1,5 +1,5 @@ // This NPC makes potions and dyes -new_9-1.gat,117,77,0 script Rauk 103,{ +011-1.gat,117,77,0 script Rauk 103,{ // Setzer quest/monster oil quest participation set @SETZER_INITIAL, 0; diff --git a/npc/011-1_Woodland/monsters.txt b/npc/011-1_Woodland/monsters.txt index 52f1bc74..60a0688e 100644 --- a/npc/011-1_Woodland/monsters.txt +++ b/npc/011-1_Woodland/monsters.txt @@ -1,15 +1,15 @@ -// Map: new_9-1 +// Map: 011-1 // This is Central Woodland. // -new_9-1.gat,0,0,0,0 monster EvilMushroom 1013,25,0,0,Mob9::OnEvilMushroom -new_9-1.gat,0,0,0,0 monster Flower 1014,40,0,0,Mob9::OnFlower +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 -new_9-1.gat,0,0,0,0 monster Alizarin 1032,1,2700000,1800000,Mob9::OnAlizarin +011-1.gat,0,0,0,0 monster Alizarin 1032,1,2700000,1800000,Mob9::OnAlizarin -new_9-1.gat,0,0,0,0 monster SilkWorm 1035,2,60000,30000,Mob9::OnSilkWorm +011-1.gat,0,0,0,0 monster SilkWorm 1035,2,60000,30000,Mob9::OnSilkWorm -new_9-1.gat,0,0,0 script Mob9 -1,{ +011-1.gat,0,0,0 script Mob9 -1,{ OnEvilMushroom: set @mobID, 1013; callfunc "MobPoints"; diff --git a/npc/011-1_Woodland/oscar.txt b/npc/011-1_Woodland/oscar.txt index f33e0e47..20f9a7b5 100644 --- a/npc/011-1_Woodland/oscar.txt +++ b/npc/011-1_Woodland/oscar.txt @@ -1 +1 @@ -new_9-1.gat,87,34,0 shop Oscar 142,535:25,657:40
\ No newline at end of file +011-1.gat,87,34,0 shop Oscar 142,535:25,657:40
\ No newline at end of file diff --git a/npc/011-3_Hermit's_cave/hermit.txt b/npc/011-3_Hermit's_cave/hermit.txt index 2ef32941..0c6f7550 100644 --- a/npc/011-3_Hermit's_cave/hermit.txt +++ b/npc/011-3_Hermit's_cave/hermit.txt @@ -1,6 +1,6 @@ // -new_4-1.gat,30,30,0 script Arkim 116,{ +011-3.gat,30,30,0 script Arkim 116,{ mes "[Arkim the Hermit]"; mes "\"Do you want to go back outside?\""; next; @@ -10,7 +10,7 @@ new_4-1.gat,30,30,0 script Arkim 116,{ close; L_Sure: - warp "new_9-1.gat", 60, 95; + warp "011-1.gat", 60, 95; close; } diff --git a/npc/011-3_Hermit's_cave/monsters.txt b/npc/011-3_Hermit's_cave/monsters.txt index f51d010d..37da9f40 100644 --- a/npc/011-3_Hermit's_cave/monsters.txt +++ b/npc/011-3_Hermit's_cave/monsters.txt @@ -1,12 +1,12 @@ -// Map: new_4-1 +// Map: 011-3 // This is the Hermit's Cave -- level 1. // -new_4-1.gat,0,0,0,0 monster Bat 1017,10,0,0,Mob4::OnBat +011-3.gat,0,0,0,0 monster Bat 1017,10,0,0,Mob4::OnBat -new_4-1.gat,0,0,0,0 monster SilkWorm 1035,3,60000,30000,Mob4::OnSilkWorm +011-3.gat,0,0,0,0 monster SilkWorm 1035,3,60000,30000,Mob4::OnSilkWorm -new_4-1.gat,0,0,0 script Mob4 -1,{ +011-3.gat,0,0,0 script Mob4 -1,{ OnBat: set @mobID, 1017; callfunc "MobPoints"; diff --git a/npc/011-4_Lake_cave/monsters.txt b/npc/011-4_Lake_cave/monsters.txt index 95d09026..d3b78249 100644 --- a/npc/011-4_Lake_cave/monsters.txt +++ b/npc/011-4_Lake_cave/monsters.txt @@ -1,11 +1,11 @@ -// Map: new_17-1 +// Map: 011-4 // This is the Lake Cave, second level of the Hermit's Cave. // -new_17-1.gat,0,0,0,0 monster CaveSnake 1021,40,0,0,Mob17::OnCaveSnake -new_17-1.gat,0,0,0,0 monster SpikyMushroom 1019,15,0,0,Mob17::OnSpikyMushroom +011-4.gat,0,0,0,0 monster CaveSnake 1021,40,0,0,Mob17::OnCaveSnake +011-4.gat,0,0,0,0 monster SpikyMushroom 1019,15,0,0,Mob17::OnSpikyMushroom -new_17-1.gat,0,0,0 script Mob17 -1,{ +011-4.gat,0,0,0 script Mob17 -1,{ OnCaveSnake: set @mobID, 1021; callfunc "MobPoints"; diff --git a/npc/012-1_Woodland_Hills/monsters.txt b/npc/012-1_Woodland_Hills/monsters.txt index cc95281f..8b7c5c1b 100644 --- a/npc/012-1_Woodland_Hills/monsters.txt +++ b/npc/012-1_Woodland_Hills/monsters.txt @@ -1,18 +1,18 @@ -// Map: new_26-1 +// Map: 012-1 // This is North Woodland. // -new_26-1.gat,0,0,0,0 monster Mouboo 1028,25,0,0,Mob26::OnMouboo -new_26-1.gat,0,0,0,0 monster SpikyMushroom 1019,30,0,0,Mob26::OnSpikyMushroom +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 -new_26-1.gat,0,0,0,0 monster Alizarin 1032,1,2700000,1800000,Mob26::OnAlizarin -new_26-1.gat,0,0,0,0 monster Gamboge 1031,1,2700000,1800000,Mob26::OnGamboge -new_26-1.gat,0,0,0,0 monster Cobalt 1030,1,2700000,1800000,Mob26::OnCobalt -new_26-1.gat,0,0,0,0 monster Mauve 1029,1,2700000,1800000,Mob26::OnMauve +012-1.gat,0,0,0,0 monster Alizarin 1032,1,2700000,1800000,Mob26::OnAlizarin +012-1.gat,0,0,0,0 monster Gamboge 1031,1,2700000,1800000,Mob26::OnGamboge +012-1.gat,0,0,0,0 monster Cobalt 1030,1,2700000,1800000,Mob26::OnCobalt +012-1.gat,0,0,0,0 monster Mauve 1029,1,2700000,1800000,Mob26::OnMauve -new_26-1.gat,0,0,0,0 monster SilkWorm 1035,5,6000,3000,Mob26::OnSilkWorm +012-1.gat,0,0,0,0 monster SilkWorm 1035,5,6000,3000,Mob26::OnSilkWorm -new_26-1.gat,0,0,0 script Mob26 -1,{ +012-1.gat,0,0,0 script Mob26 -1,{ OnMouboo: set @mobID, 1028; callfunc "MobPoints"; diff --git a/npc/012-1_Woodland_Hills/shops.txt b/npc/012-1_Woodland_Hills/shops.txt index 4e2ce96e..b29e5542 100644 --- a/npc/012-1_Woodland_Hills/shops.txt +++ b/npc/012-1_Woodland_Hills/shops.txt @@ -1,3 +1,3 @@ // -new_26-1.gat,36,99,0 shop Blossom 163,661:100,664:100,665:50,662:100,667:50,663:100,671:75,673:25,669:75,672:25,674:25 +012-1.gat,36,99,0 shop Blossom 163,661:100,664:100,665:50,662:100,667:50,663:100,671:75,673:25,669:75,672:25,674:25 diff --git a/npc/012-3_Cave/monsters.txt b/npc/012-3_Cave/monsters.txt index bb0799bb..e6f4cf79 100644 --- a/npc/012-3_Cave/monsters.txt +++ b/npc/012-3_Cave/monsters.txt @@ -1,11 +1,11 @@ -// Map: new_27-1 +// Map: 012-3 // This is the Caves beneath the North Woodland. // -new_27-1.gat,0,0,0,0 monster Bat 1017,100,0,0,Mob27::OnBat -new_27-1.gat,0,0,0,0 monster CaveSnake 1021,75,0,0,Mob27::OnCaveSnake +012-3.gat,0,0,0,0 monster Bat 1017,100,0,0,Mob27::OnBat +012-3.gat,0,0,0,0 monster CaveSnake 1021,75,0,0,Mob27::OnCaveSnake -new_27-1.gat,0,0,0 script Mob27 -1,{ +012-3.gat,0,0,0 script Mob27 -1,{ OnBat: set @mobID, 1017; callfunc "MobPoints"; diff --git a/npc/013-1_Woodland_hills/_warps.txt b/npc/013-1_Woodland_hills/_warps.txt index 6daa4447..b27c118c 100644 --- a/npc/013-1_Woodland_hills/_warps.txt +++ b/npc/013-1_Woodland_hills/_warps.txt @@ -1,6 +1,6 @@ // 013-1 Woodland hills warps 013-1.gat,125,103 warp toCave -1,-1,013-3.gat,34,64 -013-1.gat,20,76 warp ToWoodlandHills -1,2,012-1.gat,149,78 +013-1.gat,20,76 warp ToWoodlandHills -1,2,012-1.gat,148,60 013-1.gat,45,21 warp ToWoodland 1,-1,017-1.gat,46,104 013-1.gat,42,90 warp toHouse -1,-1,013-2.gat,63,41 diff --git a/npc/013-1_Woodland_hills/monsters.txt b/npc/013-1_Woodland_hills/monsters.txt index fe216eae..6d6e8443 100644 --- a/npc/013-1_Woodland_hills/monsters.txt +++ b/npc/013-1_Woodland_hills/monsters.txt @@ -1,24 +1,24 @@ -// Map: new_28-1 +// Map: 013-2 // This is North-East Woodland. // -new_28-1.gat,0,0,0,0 monster Mouboo 1028,5,0,0,Mob28::OnMouboo -new_28-1.gat,0,0,0,0 monster SpikyMushroom 1019,15,0,0,Mob28::OnSpikyMushroom -new_28-1.gat,0,0,0,0 monster Flower 1014,15,0,0,Mob28::OnFlower +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 -new_28-1.gat,0,0,0,0 monster Alizarin 1032,1,0,0,Mob28::OnAlizarin -new_28-1.gat,0,0,0,0 monster Gamboge 1031,1,0,0,Mob28::OnGamboge -new_28-1.gat,0,0,0,0 monster Cobalt 1030,1,0,0,Mob28::OnCobalt -new_28-1.gat,0,0,0,0 monster Mauve 1029,1,0,0,Mob28::OnMauve +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 -new_28-1.gat,0,0,0,0 monster Alizarin 1032,2,2700000,1800000,Mob28::OnAlizarin -new_28-1.gat,0,0,0,0 monster Gamboge 1031,2,2700000,1800000,Mob28::OnGamboge -new_28-1.gat,0,0,0,0 monster Cobalt 1030,2,2700000,1800000,Mob28::OnCobalt -new_28-1.gat,0,0,0,0 monster Mauve 1029,2,2700000,1800000,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,2,2700000,1800000,Mob28::OnMauve -new_28-1.gat,0,0,0,0 monster SilkWorm 1035,4,6000,3000,Mob28::OnSilkWorm +013-1.gat,0,0,0,0 monster SilkWorm 1035,4,6000,3000,Mob28::OnSilkWorm -new_28-1.gat,0,0,0 script Mob28 -1,{ +013-1.gat,0,0,0 script Mob28 -1,{ OnMouboo: set @mobID, 1028; callfunc "MobPoints"; diff --git a/npc/013-2_Magic_house/apprentice.txt b/npc/013-2_Magic_house/apprentice.txt index b27d271d..ce3db4ad 100644 --- a/npc/013-2_Magic_house/apprentice.txt +++ b/npc/013-2_Magic_house/apprentice.txt @@ -1,4 +1,4 @@ -new_36-1.gat,25,37,0 script Fabius 115,{ +013-2.gat,25,37,0 script Fabius 115,{ mes "\"Hey! Wanna have a drink or something? High quality, low cost. A poor fella like me needs a bit of extra cash, ye know.\""; next; menu diff --git a/npc/013-2_Magic_house/notes.txt b/npc/013-2_Magic_house/notes.txt index dbcb1209..c30f7c46 100644 --- a/npc/013-2_Magic_house/notes.txt +++ b/npc/013-2_Magic_house/notes.txt @@ -1,20 +1,20 @@ -new_36-1.gat,23,32,0 script Motto 127,{ +013-2.gat,23,32,0 script Motto 127,{ mes "Mid pleasures and palaces though we may roam,"; mes "Be it ever so humble, there's no place like home."; close; } -new_36-1.gat,30,32,0 script Note 127,{ +013-2.gat,30,32,0 script Note 127,{ mes "Please do not open."; close; } -new_36-1.gat,38,20,0 script Saying 127,{ +013-2.gat,38,20,0 script Saying 127,{ mes "The early bird catcheth the worm."; close; } -new_36-1.gat,27,21,0 script Mirror 127,{ +013-2.gat,27,21,0 script Mirror 127,{ mes "You say: \"Mirror mirror on the wall, who has the nicest haircut of them all?\""; next; mes "\"Oh fair adventurer, your hair indeed looks nice. But wouldn't it look much better, after I have rolled my dice?\""; @@ -29,59 +29,59 @@ new_36-1.gat,27,21,0 script Mirror 127,{ } // Warp to north-eastern woods -new_36-1.gat,25,23,0 script Spell 127,{ +013-2.gat,25,23,0 script Spell 127,{ mes "You read: \"I see trees of green, red roses too. I see them bloom for me and you. And I think to myself: \'What a wonderful world\'\""; next; mes "You think: \"Huh?\""; next; mes "The spell fulfills its inevitable purpose..."; next; - warp "new_28-1.gat",128,28; + warp "013-1.gat",128,28; close; } // Warp to Indian in south-eastern desert -new_36-1.gat,27,24,0 script Spell 127,{ +013-2.gat,27,24,0 script Spell 127,{ mes "You read: \"A red-coloured fellow smoking his pipe - down in the desert - that's what I like!\""; next; mes "You feel the floor disappear below your feet..."; next; - warp "new_24-1.gat",33,93; + warp "006-1.gat",33,93; close; } // Warp to snow land -new_36-1.gat,25,27,0 script Spell 127,{ +013-2.gat,25,27,0 script Spell 127,{ mes "You read: \"Snow-white flakes and eminent frost - I'll go there, whatever the cost!\""; next; mes "You feel yourself getting lighter..."; next; - warp "new_11-1.gat",84,68; + warp "020-1.gat",84,68; close; } // Warp to Dimond -new_36-1.gat,27,27,0 script Spell 127,{ +013-2.gat,27,27,0 script Spell 127,{ mes "You read: \"People and cosiness, lively and fun - that's where I've gone!\""; next; mes "The world around you slowly dissolves..."; next; - warp "new_23-1.gat",34,42; + warp "010-2.gat",34,42; close; } // Warp to mines level 2 -new_36-1.gat,26,28,0 script Spell 127,{ +013-2.gat,26,28,0 script Spell 127,{ mes "You read: \"Darkness and legs, eight of them each - I'd rather not go there, but now it's too late...\""; next; mes "For a moment everything turns black..."; next; - warp "new_5-1.gat",91,41; + warp "002-4.gat",91,41; close; } // Death -new_36-1.gat,21,29,0 script Spell 127,{ +013-2.gat,21,29,0 script Spell 127,{ mes "You read: \"Heart stops pumping, breath begone - life is stopping, death has come!\""; next; mes "You're losing control of your body... everything turns black... while slipping to the floor, you hear a faraway scream... suddenly, you see THE LIGHT!"; @@ -91,7 +91,7 @@ new_36-1.gat,21,29,0 script Spell 127,{ } // Naked -new_36-1.gat,28,29,0 script Spell 127,{ +013-2.gat,28,29,0 script Spell 127,{ mes "You read: \"Cotton, steel, leather and wool - have I ever seen a greater fool?\""; next; mes "You suddenly feel naked; you ARE naked!"; diff --git a/npc/013-2_Magic_house/wizard.txt b/npc/013-2_Magic_house/wizard.txt index ec7deb36..25f30122 100644 --- a/npc/013-2_Magic_house/wizard.txt +++ b/npc/013-2_Magic_house/wizard.txt @@ -1,4 +1,4 @@ -new_36-1.gat,66,39,0 script Old Wizard 116,{ +013-2.gat,66,39,0 script Old Wizard 116,{ mes "\"Welcome, dear wanderer! Come into my humble home. Take a rest, eat and drink.\""; next; menu diff --git a/npc/014-1_Woodland/monsters.txt b/npc/014-1_Woodland/monsters.txt index cbb9e182..9805d037 100644 --- a/npc/014-1_Woodland/monsters.txt +++ b/npc/014-1_Woodland/monsters.txt @@ -1,25 +1,25 @@ -// Map: new_29-1 +// Map: 014-1 // This is West Woodland. // -new_29-1.gat,0,0,0,0 monster Mouboo 1028,5,0,0,Mob29::OnMouboo -new_29-1.gat,0,0,0,0 monster EvilMushroom 1013,15,0,0,Mob29::OnEvilMushroom -new_29-1.gat,0,0,0,0 monster Flower 1014,25,0,0,Mob29::OnFlower -new_29-1.gat,0,0,0,0 monster FireGoblin 1011,20,0,0,Mob29::OnFireGoblin +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 -new_29-1.gat,0,0,0,0 monster Alizarin 1032,1,0,0,Mob29::OnAlizarin -new_29-1.gat,0,0,0,0 monster Gamboge 1031,1,0,0,Mob29::OnGamboge -new_29-1.gat,0,0,0,0 monster Cobalt 1030,1,0,0,Mob29::OnCobalt -new_29-1.gat,0,0,0,0 monster Mauve 1029,1,0,0,Mob29::OnMauve +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 -new_29-1.gat,0,0,0,0 monster Alizarin 1032,1,2700000,1800000,Mob29::OnAlizarin -new_29-1.gat,0,0,0,0 monster Gamboge 1031,1,2700000,1800000,Mob29::OnGamboge -new_29-1.gat,0,0,0,0 monster Cobalt 1030,1,2700000,1800000,Mob29::OnCobalt -new_29-1.gat,0,0,0,0 monster Mauve 1029,1,2700000,1800000,Mob29::OnMauve +014-1.gat,0,0,0,0 monster Alizarin 1032,1,2700000,1800000,Mob29::OnAlizarin +014-1.gat,0,0,0,0 monster Gamboge 1031,1,2700000,1800000,Mob29::OnGamboge +014-1.gat,0,0,0,0 monster Cobalt 1030,1,2700000,1800000,Mob29::OnCobalt +014-1.gat,0,0,0,0 monster Mauve 1029,1,2700000,1800000,Mob29::OnMauve -new_29-1.gat,0,0,0,0 monster SilkWorm 1035,4,6000,3000,Mob29::OnSilkWorm +014-1.gat,0,0,0,0 monster SilkWorm 1035,4,6000,3000,Mob29::OnSilkWorm -new_29-1.gat,0,0,0 script Mob29 -1,{ +014-1.gat,0,0,0 script Mob29 -1,{ OnMouboo: set @mobID, 1028; callfunc "MobPoints"; diff --git a/npc/014-1_Woodland/taro.txt b/npc/014-1_Woodland/taro.txt index db6b4551..3ec76163 100644 --- a/npc/014-1_Woodland/taro.txt +++ b/npc/014-1_Woodland/taro.txt @@ -1,7 +1,7 @@ // Woodland Taro -new_29-1.gat,54,43,0 script Taro 114,{ +014-1.gat,54,43,0 script Taro 114,{ if (getequipid(equip_head) == 511 || getequipid(equip_head) == 1206) goto L_Santa; if (getequipid(equip_head) == 633) goto L_Elf; if (getequipid(equip_head) == 628) goto L_NearElf; @@ -69,6 +69,6 @@ L_Tree: close; L_Warp: - warp "new_10-1.gat",56,61; + warp "019-1.gat",56,61; close; } diff --git a/npc/014-1_Woodland/wedding-officiator.txt b/npc/014-1_Woodland/wedding-officiator.txt index 93a27c6d..7a6e606b 100644 --- a/npc/014-1_Woodland/wedding-officiator.txt +++ b/npc/014-1_Woodland/wedding-officiator.txt @@ -1,6 +1,6 @@ // Wedding officiator: Marriages and divorces -new_29-1.gat,31,31,0 script Wedding Officiator 164,{ +014-1.gat,31,31,0 script Wedding Officiator 164,{ set @WEDDING_FEE, 100; set @DIVORCE_FEE_PER_LEVEL, 500; diff --git a/npc/014-3_Cave/monsters.txt b/npc/014-3_Cave/monsters.txt index b0620568..2237ea42 100644 --- a/npc/014-3_Cave/monsters.txt +++ b/npc/014-3_Cave/monsters.txt @@ -1,10 +1,10 @@ -// Map: new_30-1 +// Map: 014-3 // This is the caves beneath West Woodland. // -new_30-1.gat,0,0,0,0 monster Bat 1017,50,0,0,Mob30::OnBat +014-3.gat,0,0,0,0 monster Bat 1017,50,0,0,Mob30::OnBat -new_30-1.gat,0,0,0 script Mob30 -1,{ +014-3.gat,0,0,0 script Mob30 -1,{ OnBat: set @mobID, 1017; callfunc "MobPoints"; diff --git a/npc/015-1_Woodland/alice.txt b/npc/015-1_Woodland/alice.txt index e35f4802..b9ce5831 100644 --- a/npc/015-1_Woodland/alice.txt +++ b/npc/015-1_Woodland/alice.txt @@ -6,7 +6,7 @@ //################################################################################# -new_31-1.gat,52,53,0 script Alice 106, { +015-1.gat,52,53,0 script Alice 106, { mes "[Alice]"; mes "\"Greeting, fellow wanderer."; mes "Are you collecting herbs, too?\""; diff --git a/npc/015-1_Woodland/monsters.txt b/npc/015-1_Woodland/monsters.txt index 0ce818c1..4984f101 100644 --- a/npc/015-1_Woodland/monsters.txt +++ b/npc/015-1_Woodland/monsters.txt @@ -1,17 +1,17 @@ -// Map: new_31-1 +// Map: 015-1 // This is South-West Woodland. // -new_31-1.gat,0,0,0,0 monster LogHead 1025,40,0,0,Mob31::OnLogHead -new_31-1.gat,0,0,0,0 monster SpikyMushroom 1019,20,0,0,Mob31::OnSpikyMushroom -new_31-1.gat,0,0,0,0 monster Flower 1014,20,0,0,Mob31::OnFlower +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 Flower 1014,20,0,0,Mob31::OnFlower -new_31-1.gat,0,0,0,0 monster Gamboge 1031,3,0,0,Mob31::OnGamboge -new_31-1.gat,0,0,0,0 monster Alizarin 1032,3,0,0,Mob31::OnAlizarin +015-1.gat,0,0,0,0 monster Gamboge 1031,3,0,0,Mob31::OnGamboge +015-1.gat,0,0,0,0 monster Alizarin 1032,3,0,0,Mob31::OnAlizarin -new_31-1.gat,0,0,0,0 monster SilkWorm 1035,7,15000,7000,Mob31::onSilkWorm +015-1.gat,0,0,0,0 monster SilkWorm 1035,7,15000,7000,Mob31::onSilkWorm -new_31-1.gat,0,0,0 script Mob31 -1,{ +015-1.gat,0,0,0 script Mob31 -1,{ OnLogHead: set @mobID, 1025; callfunc "MobPoints"; diff --git a/npc/016-1_Woodland/monsters.txt b/npc/016-1_Woodland/monsters.txt index 8075550c..3cadfa54 100644 --- a/npc/016-1_Woodland/monsters.txt +++ b/npc/016-1_Woodland/monsters.txt @@ -1,16 +1,16 @@ -// Map: new_32-1 +// Map: 016-1 // This is Southernmost Woodlands. // -new_32-1.gat,0,0,0,0 monster Mouboo 1028,5,0,0,Mob32::OnMouboo -new_32-1.gat,0,0,0,0 monster Scorpion 1003,15,0,0,Mob32::OnScorpion +016-1.gat,0,0,0,0 monster Mouboo 1028,5,0,0,Mob32::OnMouboo +016-1.gat,0,0,0,0 monster Scorpion 1003,15,0,0,Mob32::OnScorpion -new_32-1.gat,0,0,0,0 monster Mauve 1029,3,0,0,Mob32::OnMauve -new_32-1.gat,0,0,0,0 monster Cobalt 1030,3,0,0,Mob32::OnCobalt +016-1.gat,0,0,0,0 monster Mauve 1029,3,0,0,Mob32::OnMauve +016-1.gat,0,0,0,0 monster Cobalt 1030,3,0,0,Mob32::OnCobalt -new_32-1.gat,0,0,0,0 monster SilkWorm 1035,7,15000,7000,Mob32::onSilkWorm +016-1.gat,0,0,0,0 monster SilkWorm 1035,7,15000,7000,Mob32::onSilkWorm -new_32-1.gat,0,0,0 script Mob32 -1,{ +016-1.gat,0,0,0 script Mob32 -1,{ OnMouboo: set @mobID, 1028; callfunc "MobPoints"; diff --git a/npc/017-1_Woodland_hills/monsters.txt b/npc/017-1_Woodland_hills/monsters.txt index 8ec54d78..ce5468ac 100644 --- a/npc/017-1_Woodland_hills/monsters.txt +++ b/npc/017-1_Woodland_hills/monsters.txt @@ -1,22 +1,22 @@ -// Map: new_33-1 +// Map: 017-1 // This is North Woodlands Mountains. // -new_33-1.gat,0,0,0,0 monster Bat 1017,5,0,0,Mob33::OnBat -new_33-1.gat,0,0,0,0 monster FireGoblin 1011,5,0,0,Mob33::OnFireGoblin -new_33-1.gat,0,0,0,0 monster Mouboo 1028,5,0,0,Mob33::OnMouboo -new_33-1.gat,0,0,0,0 monster Flower 1014,5,0,0,Mob33::OnFlower -new_33-1.gat,0,0,0,0 monster SpikyMushroom 1019,5,0,0,Mob33::OnSpikyMushroom -new_33-1.gat,0,0,0,0 monster EvilMushshroom 1013,10,0,0,Mob33::OnEvilMushroom +017-1.gat,0,0,0,0 monster Bat 1017,5,0,0,Mob33::OnBat +017-1.gat,0,0,0,0 monster FireGoblin 1011,5,0,0,Mob33::OnFireGoblin +017-1.gat,0,0,0,0 monster Mouboo 1028,5,0,0,Mob33::OnMouboo +017-1.gat,0,0,0,0 monster Flower 1014,5,0,0,Mob33::OnFlower +017-1.gat,0,0,0,0 monster SpikyMushroom 1019,5,0,0,Mob33::OnSpikyMushroom +017-1.gat,0,0,0,0 monster EvilMushshroom 1013,10,0,0,Mob33::OnEvilMushroom -new_33-1.gat,0,0,0,0 monster Alizarin 1032,2,0,0,Mob33::OnAlizarin -new_33-1.gat,0,0,0,0 monster Gamboge 1031,2,0,0,Mob33::OnGamboge -new_33-1.gat,0,0,0,0 monster Cobalt 1030,2,0,0,Mob33::OnCobalt -new_33-1.gat,0,0,0,0 monster Mauve 1029,2,0,0,Mob33::OnMauve +017-1.gat,0,0,0,0 monster Alizarin 1032,2,0,0,Mob33::OnAlizarin +017-1.gat,0,0,0,0 monster Gamboge 1031,2,0,0,Mob33::OnGamboge +017-1.gat,0,0,0,0 monster Cobalt 1030,2,0,0,Mob33::OnCobalt +017-1.gat,0,0,0,0 monster Mauve 1029,2,0,0,Mob33::OnMauve -new_33-1.gat,0,0,0,0 monster SilkWorm 1035,10,0,0,Mob33::OnSilkWorm +017-1.gat,0,0,0,0 monster SilkWorm 1035,10,0,0,Mob33::OnSilkWorm -new_33-1.gat,0,0,0 script Mob33 -1,{ +017-1.gat,0,0,0 script Mob33 -1,{ OnBat: set @mobID, 1017; callfunc "MobPoints"; diff --git a/npc/018-1_Woodland_mining_camp/miners.txt b/npc/018-1_Woodland_mining_camp/miners.txt index 99bba7fb..17873549 100644 --- a/npc/018-1_Woodland_mining_camp/miners.txt +++ b/npc/018-1_Woodland_mining_camp/miners.txt @@ -1,6 +1,6 @@ // -new_37-1.gat,78,59,0 script Miner 109,1,1,{ +018-1.gat,78,59,0 script Miner 109,1,1,{ mes "[Miner]"; mes "\"I'm sorry, but this area is closed off.\""; } diff --git a/npc/018-1_Woodland_mining_camp/monsters.txt b/npc/018-1_Woodland_mining_camp/monsters.txt index d38d2695..04448cec 100644 --- a/npc/018-1_Woodland_mining_camp/monsters.txt +++ b/npc/018-1_Woodland_mining_camp/monsters.txt @@ -1,15 +1,15 @@ -// Map: new_37-1 +// Map: 018-1 // This is the Woodland Mines. // -new_37-1.gat,0,0,0,0 monster LogHead 1025,5,500,600,Mob37::OnLogHead -new_37-1.gat,136,77,20,35 monster SeaSlime 1033,5,1000,500,Mob37::OnSeaSlime -new_37-1.gat,0,0,0,0 monster Bat 1017,2,4000,3000,Mob37::OnBat -new_37-1.gat,79,59,0,0 monster YellowSlime 1007,1,120000,60000,Mob37::OnYellowSlime +018-1.gat,0,0,0,0 monster LogHead 1025,5,500,600,Mob37::OnLogHead +018-1.gat,136,77,20,35 monster SeaSlime 1033,5,1000,500,Mob37::OnSeaSlime +018-1.gat,0,0,0,0 monster Bat 1017,2,4000,3000,Mob37::OnBat +018-1.gat,79,59,0,0 monster YellowSlime 1007,1,120000,60000,Mob37::OnYellowSlime -new_37-1.gat,57,63,4,4 monster SilkWorm 1035,2,60000,30000,Mob37::OnSilkWorm +018-1.gat,57,63,4,4 monster SilkWorm 1035,2,60000,30000,Mob37::OnSilkWorm -new_37-1.gat,0,0,0 script Mob37 -1,{ +018-1.gat,0,0,0 script Mob37 -1,{ OnLogHead: set @mobID, 1025; callfunc "MobPoints"; diff --git a/npc/018-2_Woodland_minning_camp/angus.txt b/npc/018-2_Woodland_minning_camp/angus.txt index 7be183f4..bf9f725e 100644 --- a/npc/018-2_Woodland_minning_camp/angus.txt +++ b/npc/018-2_Woodland_minning_camp/angus.txt @@ -1,6 +1,6 @@ // Angus the craftsman -new_38-1.gat,31,39,0 script Angus 147,{ +018-2.gat,31,39,0 script Angus 147,{ set @honorific$, "lad"; if (Sex == 0) set @honorific$, "lass"; diff --git a/npc/018-2_Woodland_minning_camp/books.txt b/npc/018-2_Woodland_minning_camp/books.txt index dfd4ecda..22364c6d 100644 --- a/npc/018-2_Woodland_minning_camp/books.txt +++ b/npc/018-2_Woodland_minning_camp/books.txt @@ -1,6 +1,6 @@ // -new_38-1.gat,112,19,0 script #Bookcase38 127,0,1{ +018-2.gat,112,19,0 script #Bookcase38 127,0,1{ if (Inspector == 11) goto L_NohMask; mes "Looking over the bookcase, you find nothing strange or out of order."; diff --git a/npc/018-2_Woodland_minning_camp/caul.txt b/npc/018-2_Woodland_minning_camp/caul.txt index e84b507d..1aeda920 100644 --- a/npc/018-2_Woodland_minning_camp/caul.txt +++ b/npc/018-2_Woodland_minning_camp/caul.txt @@ -7,7 +7,7 @@ //# //################################################################################# -new_38-1.gat,37,22,0 script Caul 107,{ +018-2.gat,37,22,0 script Caul 107,{ set @SETZER_INITIAL, 0; set @SETZER_KNOWS_OIL, 1; set @SETZER_KNOWS_STINGER, 2; diff --git a/npc/018-2_Woodland_minning_camp/miners.txt b/npc/018-2_Woodland_minning_camp/miners.txt index 92261cb5..caf8afcd 100644 --- a/npc/018-2_Woodland_minning_camp/miners.txt +++ b/npc/018-2_Woodland_minning_camp/miners.txt @@ -1,6 +1,6 @@ // -new_38-1.gat,85,23,0 script Miner 109,{ +018-2.gat,85,23,0 script Miner 109,{ if (Inspector == 10) goto L_NohMask; mes "[Miner]"; diff --git a/npc/018-2_Woodland_minning_camp/monsters.txt b/npc/018-2_Woodland_minning_camp/monsters.txt index 7eb44908..dab70518 100644 --- a/npc/018-2_Woodland_minning_camp/monsters.txt +++ b/npc/018-2_Woodland_minning_camp/monsters.txt @@ -1,10 +1,10 @@ -// Map: new_38-1 +// Map: 018-2 // This is the Woodland Mines -- level 1. // -new_38-1.gat,114,21,4,3 monster YellowSlime 1007,1,120000,60000,Mob38::OnYellowSlime +018-2.gat,114,21,4,3 monster YellowSlime 1007,1,120000,60000,Mob38::OnYellowSlime -new_38-1.gat,0,0,0 script Mob38 -1,{ +018-2.gat,0,0,0 script Mob38 -1,{ OnYellowSlime: set @mobID, 1007; callfunc "MobPoints"; diff --git a/npc/018-2_Woodland_minning_camp/receptionist.txt b/npc/018-2_Woodland_minning_camp/receptionist.txt index 822d09a3..58c9ed7a 100644 --- a/npc/018-2_Woodland_minning_camp/receptionist.txt +++ b/npc/018-2_Woodland_minning_camp/receptionist.txt @@ -1,6 +1,6 @@ // -new_38-1.gat,50,24,0 script Receptionist 108,{ +018-2.gat,50,24,0 script Receptionist 108,{ mes "[Receptionist]"; mes "\"Welcome to the mining camp!"; mes "Do you need anything?\""; diff --git a/npc/019-1_Snow_field/monsters.txt b/npc/019-1_Snow_field/monsters.txt index 607ade82..d41d63b3 100644 --- a/npc/019-1_Snow_field/monsters.txt +++ b/npc/019-1_Snow_field/monsters.txt @@ -1,4 +1,4 @@ -// Map: new_10-1 +// Map: 019-1 // This is the Snow Fields. // diff --git a/npc/019-1_Snow_field/santa.txt b/npc/019-1_Snow_field/santa.txt index c53ce55f..01481d67 100644 --- a/npc/019-1_Snow_field/santa.txt +++ b/npc/019-1_Snow_field/santa.txt @@ -1,4 +1,4 @@ -new_10-1.gat,74,75,0 script Santa 105,{ +019-1.gat,74,75,0 script Santa 105,{ if (ChristmasQuest2 == 1) goto done; mes "[Santa]"; mes "Ho ho ho."; diff --git a/npc/019-1_Snow_field/taro.txt b/npc/019-1_Snow_field/taro.txt index 00976aa4..cdd368e5 100644 --- a/npc/019-1_Snow_field/taro.txt +++ b/npc/019-1_Snow_field/taro.txt @@ -67,7 +67,7 @@ L_Tree: close; L_Warp: - warp "new_29-1.gat", 52, 45; + warp "014-1.gat", 52, 45; close; } diff --git a/npc/020-1/monsters.txt b/npc/020-1/monsters.txt index 9259cfdb..fc33da8c 100644 --- a/npc/020-1/monsters.txt +++ b/npc/020-1/monsters.txt @@ -1,4 +1,4 @@ -// Map: new_11-1 +// Map: 020-1 // This is Snow Town. // diff --git a/npc/easter2008/monsters.txt b/npc/easter2008/monsters.txt index d7b9960f..d886f519 100644 --- a/npc/easter2008/monsters.txt +++ b/npc/easter2008/monsters.txt @@ -1,15 +1,15 @@ -new_1-1.gat,0,0,0,0 monster EasterFluffy 1027,1,0,0,0 -new_2-1.gat,0,0,0,0 monster EasterFluffy 1027,1,0,0,0 -new_3-1.gat,0,0,0,0 monster EasterFluffy 1027,1,0,0,0 -new_5-1.gat,0,0,0,0 monster EasterFluffy 1027,1,0,0,0 -new_7-1.gat,0,0,0,0 monster EasterFluffy 1027,1,0,0,0 -new_9-1.gat,0,0,0,0 monster EasterFluffy 1027,1,0,0,0 -new_10-1.gat,0,0,0,0 monster EasterFluffy 1027,1,0,0,0 -new_12-1.gat,0,0,0,0 monster EasterFluffy 1027,1,0,0,0 -new_14-1.gat,0,0,0,0 monster EasterFluffy 1027,1,0,0,0 -new_15-1.gat,0,0,0,0 monster EasterFluffy 1027,1,0,0,0 -new_16-1.gat,0,0,0,0 monster EasterFluffy 1027,1,0,0,0 -new_17-1.gat,0,0,0,0 monster EasterFluffy 1027,1,0,0,0 -new_18-1.gat,0,0,0,0 monster EasterFluffy 1027,1,0,0,0 -new_19-1.gat,0,0,0,0 monster EasterFluffy 1027,1,0,0,0 -new_22-1.gat,0,0,0,0 monster EasterFluffy 1027,1,0,0,0
\ No newline at end of file +002-2.gat,0,0,0,0 monster EasterFluffy 1027,1,0,0,0 +002-3.gat,0,0,0,0 monster EasterFluffy 1027,1,0,0,0 +001-1.gat,0,0,0,0 monster EasterFluffy 1027,1,0,0,0 +002-4.gat,0,0,0,0 monster EasterFluffy 1027,1,0,0,0 +005-1.gat,0,0,0,0 monster EasterFluffy 1027,1,0,0,0 +011-1.gat,0,0,0,0 monster EasterFluffy 1027,1,0,0,0 +019-1.gat,0,0,0,0 monster EasterFluffy 1027,1,0,0,0 +020-3.gat,0,0,0,0 monster EasterFluffy 1027,1,0,0,0 +010-2.gat,0,0,0,0 monster EasterFluffy 1027,1,0,0,0 +003-1.gat,0,0,0,0 monster EasterFluffy 1027,1,0,0,0 +007-1.gat,0,0,0,0 monster EasterFluffy 1027,1,0,0,0 +011-4.gat,0,0,0,0 monster EasterFluffy 1027,1,0,0,0 +008-1.gat,0,0,0,0 monster EasterFluffy 1027,1,0,0,0 +010-2.gat,0,0,0,0 monster EasterFluffy 1027,1,0,0,0 +05-3.gat,0,0,0,0 monster EasterFluffy 1027,1,0,0,0
\ No newline at end of file diff --git a/npc/easter2008/npc.txt b/npc/easter2008/npc.txt index d1698ff2..e93e27a2 100644 --- a/npc/easter2008/npc.txt +++ b/npc/easter2008/npc.txt @@ -1,4 +1,4 @@ -new_3-1.gat,40,40,6 script EasterBunny 139,{ +001-1.gat,40,40,6 script EasterBunny 139,{ if (QUEST_Easter08_state > 0) goto L_Finished; mes "[Easter Bunny]"; diff --git a/npc/halloween/2006/halloween1.txt b/npc/halloween/2006/halloween1.txt index 8af51b63..6be68cd3 100644 --- a/npc/halloween/2006/halloween1.txt +++ b/npc/halloween/2006/halloween1.txt @@ -1,4 +1,4 @@ -new_9-1.gat,119,78,0 script Halloween1 103,{ +011-1.gat,119,78,0 script Halloween1 103,{ mes "[Halloweenist]"; mes "It's Halloween."; mes "The time for tricks and treats."; diff --git a/npc/halloween/2006/halloween10.txt b/npc/halloween/2006/halloween10.txt index 702c320e..265f0371 100644 --- a/npc/halloween/2006/halloween10.txt +++ b/npc/halloween/2006/halloween10.txt @@ -1,4 +1,4 @@ -new_5-1.gat,88,99,0 script Halloween10 103,{ +002-4.gat,88,99,0 script Halloween10 103,{ mes "[Halloweenist]"; mes "It's Halloween."; mes "The time for tricks and treats."; diff --git a/npc/halloween/2006/halloween11.txt b/npc/halloween/2006/halloween11.txt index 4d7804c5..a0dbd464 100644 --- a/npc/halloween/2006/halloween11.txt +++ b/npc/halloween/2006/halloween11.txt @@ -1,4 +1,4 @@ -new_6-1.gat,71,70,0 script Halloween11 103,{ +001-3.gat,71,70,0 script Halloween11 103,{ mes "[Halloweenist]"; mes "It's Halloween."; mes "The time for tricks and treats."; diff --git a/npc/halloween/2006/halloween12.txt b/npc/halloween/2006/halloween12.txt index 9ca3db5c..2b4be211 100644 --- a/npc/halloween/2006/halloween12.txt +++ b/npc/halloween/2006/halloween12.txt @@ -1,4 +1,4 @@ -new_7-1.gat,121,69,0 script Halloween12 103,{ +005-1.gat,121,69,0 script Halloween12 103,{ mes "[Halloweenist]"; mes "It's Halloween."; mes "The time for tricks and treats."; diff --git a/npc/halloween/2006/halloween13.txt b/npc/halloween/2006/halloween13.txt index 7b9e46fa..a57108be 100644 --- a/npc/halloween/2006/halloween13.txt +++ b/npc/halloween/2006/halloween13.txt @@ -1,4 +1,4 @@ -new_8-1.gat,38,65,0 script Halloween13 103,{ +001-2.gat,38,65,0 script Halloween13 103,{ mes "[Halloweenist]"; mes "It's Halloween."; mes "The time for tricks and treats."; diff --git a/npc/halloween/2006/halloween14.txt b/npc/halloween/2006/halloween14.txt index 16a6a3fa..591d2b25 100644 --- a/npc/halloween/2006/halloween14.txt +++ b/npc/halloween/2006/halloween14.txt @@ -1,4 +1,4 @@ -new_10-1.gat,56,61,0 script Halloween14 103,{ +019-1.gat,56,61,0 script Halloween14 103,{ mes "[Halloweenist]"; mes "It's Halloween."; mes "The time for tricks and treats."; diff --git a/npc/halloween/2006/halloween15.txt b/npc/halloween/2006/halloween15.txt index 04987efb..02c7f53e 100644 --- a/npc/halloween/2006/halloween15.txt +++ b/npc/halloween/2006/halloween15.txt @@ -1,4 +1,4 @@ -new_11-1.gat,51,49,0 script Halloween15 103,{ +020-1.gat,51,49,0 script Halloween15 103,{ mes "[Halloweenist]"; mes "It's Halloween."; mes "The time for tricks and treats."; diff --git a/npc/halloween/2006/halloween16.txt b/npc/halloween/2006/halloween16.txt index dfc6ea46..a668787b 100644 --- a/npc/halloween/2006/halloween16.txt +++ b/npc/halloween/2006/halloween16.txt @@ -1,4 +1,4 @@ -new_12-1.gat,35,44,0 script Halloween16 103,{ +020-3.gat,35,44,0 script Halloween16 103,{ mes "[Halloweenist]"; mes "It's Halloween."; mes "The time for tricks and treats."; diff --git a/npc/halloween/2006/halloween17.txt b/npc/halloween/2006/halloween17.txt index c815854b..83fe2e50 100644 --- a/npc/halloween/2006/halloween17.txt +++ b/npc/halloween/2006/halloween17.txt @@ -1,4 +1,4 @@ -new_13-1.gat,74,27,0 script Halloween17 103,{ +020-2.gat,74,27,0 script Halloween17 103,{ mes "[Halloweenist]"; mes "It's Halloween."; mes "The time for tricks and treats."; diff --git a/npc/halloween/2006/halloween18.txt b/npc/halloween/2006/halloween18.txt index 117dc247..70c1cbbd 100644 --- a/npc/halloween/2006/halloween18.txt +++ b/npc/halloween/2006/halloween18.txt @@ -1,4 +1,4 @@ -new_15-1.gat,130,9,0 script Halloween18 103,{ +003-1.gat,130,9,0 script Halloween18 103,{ mes "[Halloweenist]"; mes "It's Halloween."; mes "The time for tricks and treats."; diff --git a/npc/halloween/2006/halloween19.txt b/npc/halloween/2006/halloween19.txt index f5cd2c50..c1c7536a 100644 --- a/npc/halloween/2006/halloween19.txt +++ b/npc/halloween/2006/halloween19.txt @@ -1,4 +1,4 @@ -new_16-1.gat,113,71,0 script Halloween19 103,{ +007-1.gat,113,71,0 script Halloween19 103,{ mes "[Halloweenist]"; mes "It's Halloween."; mes "The time for tricks and treats."; diff --git a/npc/halloween/2006/halloween2.txt b/npc/halloween/2006/halloween2.txt index c2bed367..fdc441c6 100644 --- a/npc/halloween/2006/halloween2.txt +++ b/npc/halloween/2006/halloween2.txt @@ -1,4 +1,4 @@ -new_9-1.gat,48,58,0 script Halloween2 103,{ +011-1.gat,48,58,0 script Halloween2 103,{ mes "[Halloweenist]"; mes "It's Halloween."; mes "The time for tricks and treats."; diff --git a/npc/halloween/2006/halloween20.txt b/npc/halloween/2006/halloween20.txt index e4ec7b71..ed7e69a5 100644 --- a/npc/halloween/2006/halloween20.txt +++ b/npc/halloween/2006/halloween20.txt @@ -1,4 +1,4 @@ -new_3-1.gat,143,20,0 script Halloween20 103,{ +001-1.gat,143,20,0 script Halloween20 103,{ mes "[Halloweenist]"; mes "It's Halloween."; mes "The time for tricks and treats."; diff --git a/npc/halloween/2006/halloween3.txt b/npc/halloween/2006/halloween3.txt index b19562fa..5ff36592 100644 --- a/npc/halloween/2006/halloween3.txt +++ b/npc/halloween/2006/halloween3.txt @@ -1,4 +1,4 @@ -new_9-1.gat,45,85,0 script Halloween3 103,{ +011-1.gat,45,85,0 script Halloween3 103,{ mes "[Halloweenist]"; mes "It's Halloween."; mes "The time for tricks and treats."; diff --git a/npc/halloween/2006/halloween4.txt b/npc/halloween/2006/halloween4.txt index 738aff0e..ac245dca 100644 --- a/npc/halloween/2006/halloween4.txt +++ b/npc/halloween/2006/halloween4.txt @@ -1,4 +1,4 @@ -new_17-1.gat,11,57,0 script Halloween4 103,{ +011-4.gat,11,57,0 script Halloween4 103,{ mes "[Halloweenist]"; mes "It's Halloween."; mes "The time for tricks and treats."; diff --git a/npc/halloween/2006/halloween5.txt b/npc/halloween/2006/halloween5.txt index df64d075..98f9abb7 100644 --- a/npc/halloween/2006/halloween5.txt +++ b/npc/halloween/2006/halloween5.txt @@ -1,4 +1,4 @@ -new_4-1.gat,17,30,0 script Halloween5 103,{ +011-3.gat,17,30,0 script Halloween5 103,{ mes "[Halloweenist]"; mes "It's Halloween."; mes "The time for tricks and treats."; diff --git a/npc/halloween/2006/halloween6.txt b/npc/halloween/2006/halloween6.txt index 964feb34..4f3dedd6 100644 --- a/npc/halloween/2006/halloween6.txt +++ b/npc/halloween/2006/halloween6.txt @@ -1,4 +1,4 @@ -new_14-1.gat,28,48,0 script Halloween6 103,{ +010-2.gat,28,48,0 script Halloween6 103,{ mes "[Halloweenist]"; mes "It's Halloween."; mes "The time for tricks and treats."; diff --git a/npc/halloween/2006/halloween7.txt b/npc/halloween/2006/halloween7.txt index f33a1aee..613aa8af 100644 --- a/npc/halloween/2006/halloween7.txt +++ b/npc/halloween/2006/halloween7.txt @@ -1,4 +1,4 @@ -new_1-1.gat,103,102,0 script Halloween7 103,{ +002-2.gat,103,102,0 script Halloween7 103,{ mes "[Halloweenist]"; mes "It's Halloween."; mes "The time for tricks and treats."; diff --git a/npc/halloween/2006/halloween8.txt b/npc/halloween/2006/halloween8.txt index 679de9ee..e0acab51 100644 --- a/npc/halloween/2006/halloween8.txt +++ b/npc/halloween/2006/halloween8.txt @@ -1,4 +1,4 @@ -new_2-1.gat,43,67,0 script Halloween8 103,{ +002-3.gat,43,67,0 script Halloween8 103,{ mes "[Halloweenist]"; mes "It's Halloween."; mes "The time for tricks and treats."; diff --git a/npc/halloween/2006/halloween9.txt b/npc/halloween/2006/halloween9.txt index 8e575bd7..ecf97801 100644 --- a/npc/halloween/2006/halloween9.txt +++ b/npc/halloween/2006/halloween9.txt @@ -1,4 +1,4 @@ -new_3-1.gat,121,33,0 script Halloween9 103,{ +001-1.gat,121,33,0 script Halloween9 103,{ mes "[Halloweenist]"; mes "It's Halloween."; mes "The time for tricks and treats."; diff --git a/npc/halloween/2006/monsters.txt b/npc/halloween/2006/monsters.txt index 1933b383..e64799f4 100644 --- a/npc/halloween/2006/monsters.txt +++ b/npc/halloween/2006/monsters.txt @@ -1,9 +1,9 @@ -new_1-1.gat,0,0,0,0 monster Jack 1022,20,0,0,0 -new_3-1.gat,0,0,0,0 monster Fire_Skull 1023,20,0,0,0 -new_7-1.gat,0,0,0,0 monster Poison_Skull 1024,20,0,0,0 -new_9-1.gat,0,0,0,0 monster Jack 1022,20,0,0,0 -new_10-1.gat,0,0,0,0 monster Fire_Skull 1023,20,0,0,0 -new_11-1.gat,0,0,0,0 monster Poison_Skull 1024,20,0,0,0 -new_14-1.gat,0,0,0,0 monster Jack 1022,20,0,0,0 -new_15-1.gat,0,0,0,0 monster Fire_Skull 1023,20,0,0,0 -new_16-1.gat,0,0,0,0 monster Poison_Skull 1024,20,0,0,0 +002-2.gat,0,0,0,0 monster Jack 1022,20,0,0,0 +001-1.gat,0,0,0,0 monster Fire_Skull 1023,20,0,0,0 +005-1.gat,0,0,0,0 monster Poison_Skull 1024,20,0,0,0 +011-1.gat,0,0,0,0 monster Jack 1022,20,0,0,0 +019-1.gat,0,0,0,0 monster Fire_Skull 1023,20,0,0,0 +020-1.gat,0,0,0,0 monster Poison_Skull 1024,20,0,0,0 +010-2.gat,0,0,0,0 monster Jack 1022,20,0,0,0 +003-1.gat,0,0,0,0 monster Fire_Skull 1023,20,0,0,0 +007-1.gat,0,0,0,0 monster Poison_Skull 1024,20,0,0,0 diff --git a/npc/halloween/2008/monsters.txt b/npc/halloween/2008/monsters.txt index 6237b02e..a0f32222 100644 --- a/npc/halloween/2008/monsters.txt +++ b/npc/halloween/2008/monsters.txt @@ -1,136 +1,136 @@ // -new_4-1.gat,0,0,0,0 monster JackO 1022,1,3600000,1800000,Mob4H +011-3.gat,0,0,0,0 monster JackO 1022,1,3600000,1800000,Mob4H -new_4-1.gat,0,0,0 script Mob4H -1,{ +011-3.gat,0,0,0 script Mob4H -1,{ set @mobID, 1022; callfunc "MobPoints"; break; } -new_6-1.gat,0,0,0,0 monster JackO 1022,5,180000,170000,Mob6H +001-3.gat,0,0,0,0 monster JackO 1022,5,180000,170000,Mob6H -new_6-1.gat,0,0,0 script Mob6H -1,{ +001-3.gat,0,0,0 script Mob6H -1,{ set @mobID, 1022; callfunc "MobPoints"; break; } -new_8-1.gat,132,25,0,0 monster JackO 1022,1,3600000,1800000,Mob8H +001-2.gat,132,25,0,0 monster JackO 1022,1,3600000,1800000,Mob8H -new_8-1.gat,0,0,0 script Mob8H -1,{ +001-2.gat,0,0,0 script Mob8H -1,{ set @mobID, 1022; callfunc "MobPoints"; break; } -new_13-1.gat,77,64,20,10 monster JackO 1022,1,3600000,1800000,Mob13H +020-2.gat,77,64,20,10 monster JackO 1022,1,3600000,1800000,Mob13H -new_13-1.gat,0,0,0 script Mob13H -1,{ +020-2.gat,0,0,0 script Mob13H -1,{ set @mobID, 1022; callfunc "MobPoints"; break; } -new_15-1.gat,0,0,0,0 monster JackO 1022,1,3600000,1800000,Mob15H +003-1.gat,0,0,0,0 monster JackO 1022,1,3600000,1800000,Mob15H -new_15-1.gat,0,0,0 script Mob15H -1,{ +003-1.gat,0,0,0 script Mob15H -1,{ set @mobID, 1022; callfunc "MobPoints"; break; } -new_17-1.gat,76,79,6,1 monster JackO 1022,1,3600000,1800000,Mob17H +011-4.gat,76,79,6,1 monster JackO 1022,1,3600000,1800000,Mob17H -new_17-1.gat,0,0,0 script Mob17H -1,{ +011-4.gat,0,0,0 script Mob17H -1,{ set @mobID, 1022; callfunc "MobPoints"; break; } -new_20-1.gat,113,47,24,6 monster JackO 1022,1,3600000,1800000,Mob20H +009-2.gat,113,47,24,6 monster JackO 1022,1,3600000,1800000,Mob20H -new_20-1.gat,0,0,0 script Mob20H -1,{ +009-2.gat,0,0,0 script Mob20H -1,{ set @mobID, 1022; callfunc "MobPoints"; break; } -new_21-1.gat,0,0,0,0 monster JackO 1022,1,3600000,1800000,Mob21H +020-4.gat,0,0,0,0 monster JackO 1022,1,3600000,1800000,Mob21H -new_21-1.gat,0,0,0 script Mob21H -1,{ +020-4.gat,0,0,0 script Mob21H -1,{ set @mobID, 1022; callfunc "MobPoints"; break; } -new_22-1.gat,86,34,0,0 monster JackO 1022,2,1800000,900000,Mob22H +05-3.gat,86,34,0,0 monster JackO 1022,2,1800000,900000,Mob22H -new_22-1.gat,0,0,0 script Mob22H -1,{ +05-3.gat,0,0,0 script Mob22H -1,{ set @mobID, 1022; callfunc "MobPoints"; break; } -new_23-1.gat,26,88,0,0 monster JackO 1022,1,3600000,1800000,Mob23H +010-2.gat,26,88,0,0 monster JackO 1022,1,3600000,1800000,Mob23H -new_23-1.gat,0,0,0 script Mob23H -1,{ +010-2.gat,0,0,0 script Mob23H -1,{ set @mobID, 1022; callfunc "MobPoints"; break; } -new_24-1.gat,115,121,0,0 monster JackO 1022,1,3600000,1800000,Mob24H +006-1.gat,115,121,0,0 monster JackO 1022,1,3600000,1800000,Mob24H -new_24-1.gat,0,0,0 script Mob24H -1,{ +006-1.gat,0,0,0 script Mob24H -1,{ set @mobID, 1022; callfunc "MobPoints"; break; } -new_25-1.gat,30,125,0,0 monster JackO 1022,1,3600000,1800000,Mob25H +006-3.gat,30,125,0,0 monster JackO 1022,1,3600000,1800000,Mob25H -new_25-1.gat,0,0,0 script Mob25H -1,{ +006-3.gat,0,0,0 script Mob25H -1,{ set @mobID, 1022; callfunc "MobPoints"; break; } -new_26-1.gat,19,54,0,0 monster JackO 1022,1,3600000,1800000,Mob26H +12-1.gat,19,54,0,0 monster JackO 1022,1,3600000,1800000,Mob26H -new_26-1.gat,0,0,0 script Mob26H -1,{ +12-1.gat,0,0,0 script Mob26H -1,{ set @mobID, 1022; callfunc "MobPoints"; break; } -new_27-1.gat,54,130,0,0 monster JackO 1022,1,3600000,1800000,Mob27H +012-3.gat,54,130,0,0 monster JackO 1022,1,3600000,1800000,Mob27H -new_27-1.gat,0,0,0 script Mob27H -1,{ +012-3.gat,0,0,0 script Mob27H -1,{ set @mobID, 1022; callfunc "MobPoints"; break; } -new_34-1.gat,68,20,0,0 monster JackO 1022,1,3600000,1800000,Mob34H +004-1.gat,68,20,0,0 monster JackO 1022,1,3600000,1800000,Mob34H -new_34-1.gat,0,0,0 script Mob34H -1,{ +004-1.gat,0,0,0 script Mob34H -1,{ set @mobID, 1022; callfunc "MobPoints"; break; } -new_35-1.gat,26,103,0,0 monster JackO 1022,1,3600000,1800000,Mob35H +009-3.gat,26,103,0,0 monster JackO 1022,1,3600000,1800000,Mob35H -new_35-1.gat,0,0,0 script Mob35H -1,{ +009-3.gat,0,0,0 script Mob35H -1,{ set @mobID, 1022; callfunc "MobPoints"; break; } -new_38-1.gat,121,46,0,0 monster JackO 1022,1,3600000,1800000,Mob38H +018-2.gat,121,46,0,0 monster JackO 1022,1,3600000,1800000,Mob38H -new_38-1.gat,0,0,0 script Mob38H -1,{ +018-2.gat,0,0,0 script Mob38H -1,{ set @mobID, 1022; callfunc "MobPoints"; break; diff --git a/npc/halloween/2008/prize_master.txt b/npc/halloween/2008/prize_master.txt index 0e621abf..2b0cf642 100644 --- a/npc/halloween/2008/prize_master.txt +++ b/npc/halloween/2008/prize_master.txt @@ -1,6 +1,6 @@ // -new_23-1.gat,43,32,0 script Prize Master 150,{ +010-2.gat,43,32,0 script Prize Master 150,{ if (Halloween08 == 65535) goto L_Finished; if (Halloween08 == 0) callsub S_Explain; @@ -432,12 +432,12 @@ L_Dev_Spawn_JackO_2: close; L_Dev_Spawn_JackO_Tulimshar: - monster "new_3-1.gat", 44, 70, "Jack O", 1022, 1; + monster "001-1.gat", 44, 70, "Jack O", 1022, 1; announce "A ghost in Tulimshar!", 0; close; L_Dev_Spawn_JackO_Hurnscald: - monster "new_19-1.gat", 52, 40, "Jack O", 1022, 1; + monster "010-2.gat", 52, 40, "Jack O", 1022, 1; announce "A ghost in Hurnscald!", 0; close; diff --git a/npc/xmas/2006/xmas1.txt b/npc/xmas/2006/xmas1.txt index 814dd9cc..a6e71686 100644 --- a/npc/xmas/2006/xmas1.txt +++ b/npc/xmas/2006/xmas1.txt @@ -1,4 +1,4 @@ -new_1-1.gat,41,60,0 script Xmas1 105,{ +002-2.gat,41,60,0 script Xmas1 105,{ if(XMASQUEST1 == 1) goto L_only_once; mes "[Helper Santa]"; mes "It's Christmas."; diff --git a/npc/xmas/2006/xmas10.txt b/npc/xmas/2006/xmas10.txt index 8ba50ae0..ed9b2654 100644 --- a/npc/xmas/2006/xmas10.txt +++ b/npc/xmas/2006/xmas10.txt @@ -1,4 +1,4 @@ -new_2-1.gat,57,64,0 script Xmas10 105,{ +002-3.gat,57,64,0 script Xmas10 105,{ if(XMASQUEST10 == 1) goto L_only_once; mes "[Helper Santa]"; mes "It's Christmas. The time for gifts and family reunions"; diff --git a/npc/xmas/2006/xmas11.txt b/npc/xmas/2006/xmas11.txt index 212a5225..559ece7c 100644 --- a/npc/xmas/2006/xmas11.txt +++ b/npc/xmas/2006/xmas11.txt @@ -1,4 +1,4 @@ -new_3-1.gat,73,51,0 script Xmas11 105,{ +001-1.gat,73,51,0 script Xmas11 105,{ if(XMASQUEST11 == 1) goto L_only_once; mes "[Helper Santa]"; mes "It's Christmas."; diff --git a/npc/xmas/2006/xmas12.txt b/npc/xmas/2006/xmas12.txt index a8527eaf..3311e902 100644 --- a/npc/xmas/2006/xmas12.txt +++ b/npc/xmas/2006/xmas12.txt @@ -1,4 +1,4 @@ -new_4-1.gat,26,51,0 script Xmas12 105,{ +011-3.gat,26,51,0 script Xmas12 105,{ if(XMASQUEST12 == 1) goto L_only_once; mes "[Helper Santa]"; mes "It's Christmas."; diff --git a/npc/xmas/2006/xmas13.txt b/npc/xmas/2006/xmas13.txt index 534403da..d84d3634 100644 --- a/npc/xmas/2006/xmas13.txt +++ b/npc/xmas/2006/xmas13.txt @@ -1,4 +1,4 @@ -new_5-1.gat,68,95,0 script Xmas13 105,{ +002-4.gat,68,95,0 script Xmas13 105,{ if(XMASQUEST13 == 1) goto L_only_once; mes "[Helper Santa]"; mes "It's Christmas."; diff --git a/npc/xmas/2006/xmas14.txt b/npc/xmas/2006/xmas14.txt index 2f1269a4..d279eed2 100644 --- a/npc/xmas/2006/xmas14.txt +++ b/npc/xmas/2006/xmas14.txt @@ -1,4 +1,4 @@ -new_7-1.gat,46,46,0 script Xmas14 105,{ +005-1.gat,46,46,0 script Xmas14 105,{ if(XMASQUEST14 == 1) goto L_only_once; mes "[Helper Santa]"; mes "It's Christmas."; diff --git a/npc/xmas/2006/xmas15.txt b/npc/xmas/2006/xmas15.txt index 32dc490c..5bad6dbf 100644 --- a/npc/xmas/2006/xmas15.txt +++ b/npc/xmas/2006/xmas15.txt @@ -1,4 +1,4 @@ -new_6-1.gat,112,54,0 script Xmas15 105,{ +001-3.gat,112,54,0 script Xmas15 105,{ if(XMASQUEST15 == 1) goto L_only_once; mes "[Helper Santa]"; mes "It's Christmas."; diff --git a/npc/xmas/2006/xmas16.txt b/npc/xmas/2006/xmas16.txt index c072684b..10a644df 100644 --- a/npc/xmas/2006/xmas16.txt +++ b/npc/xmas/2006/xmas16.txt @@ -1,4 +1,4 @@ -new_8-1.gat,37,24,0 script Xmas16 105,{ +001-2.gat,37,24,0 script Xmas16 105,{ if(XMASQUEST16 == 1) goto L_only_once; mes "[Helper Santa]"; mes "It's Christmas."; diff --git a/npc/xmas/2006/xmas17.txt b/npc/xmas/2006/xmas17.txt index 292744ef..f0d88648 100644 --- a/npc/xmas/2006/xmas17.txt +++ b/npc/xmas/2006/xmas17.txt @@ -1,4 +1,4 @@ -new_9-1.gat,106,58,0 script Xmas17 105,{ +011-1.gat,106,58,0 script Xmas17 105,{ if(XMASQUEST17 == 1) goto L_only_once; mes "[Helper Santa]"; mes "It's Christmas."; diff --git a/npc/xmas/2006/xmas18.txt b/npc/xmas/2006/xmas18.txt index e78e1b0c..fc83c980 100644 --- a/npc/xmas/2006/xmas18.txt +++ b/npc/xmas/2006/xmas18.txt @@ -1,4 +1,4 @@ -new_1-1.gat,97,18,0 script Xmas18 105,{ +002-2.gat,97,18,0 script Xmas18 105,{ if(XMASQUEST18 == 1) goto L_only_once; mes "[Helper Santa]"; mes "It's Christmas."; diff --git a/npc/xmas/2006/xmas19.txt b/npc/xmas/2006/xmas19.txt index 3c60aab7..c6e35812 100644 --- a/npc/xmas/2006/xmas19.txt +++ b/npc/xmas/2006/xmas19.txt @@ -1,4 +1,4 @@ -new_11-1.gat,90,83,0 script Xmas19 105,{ +020-1.gat,90,83,0 script Xmas19 105,{ if(XMASQUEST19 == 1) goto L_only_once; mes "[Helper Santa]"; mes "It's Christmas."; diff --git a/npc/xmas/2006/xmas2.txt b/npc/xmas/2006/xmas2.txt index bba2b0c8..9812186d 100644 --- a/npc/xmas/2006/xmas2.txt +++ b/npc/xmas/2006/xmas2.txt @@ -1,4 +1,4 @@ -new_10-1.gat,99,42,0 script Xmas2 105,{ +019-1.gat,99,42,0 script Xmas2 105,{ if(XMASQUEST2 == 1) goto L_only_once; mes "[Helper Santa]"; mes "It's Christmas."; diff --git a/npc/xmas/2006/xmas20.txt b/npc/xmas/2006/xmas20.txt index 0bc045db..62e979d4 100644 --- a/npc/xmas/2006/xmas20.txt +++ b/npc/xmas/2006/xmas20.txt @@ -1,4 +1,4 @@ -new_3-1.gat,55,28,0 script Xmas20 105,{ +001-1.gat,55,28,0 script Xmas20 105,{ if(XMASQUEST20 == 1) goto L_only_once; mes "[Helper Santa]"; mes "It's Christmas."; diff --git a/npc/xmas/2006/xmas3.txt b/npc/xmas/2006/xmas3.txt index 28dbc605..ebcb54c1 100644 --- a/npc/xmas/2006/xmas3.txt +++ b/npc/xmas/2006/xmas3.txt @@ -1,4 +1,4 @@ -new_11-1.gat,67,62,0 script Xmas3 105,{ +020-1.gat,67,62,0 script Xmas3 105,{ if(XMASQUEST3 == 1) goto L_only_once; mes "[Helper Santa]"; mes "It's Christmas."; diff --git a/npc/xmas/2006/xmas4.txt b/npc/xmas/2006/xmas4.txt index c9f13e3e..d27cd4de 100644 --- a/npc/xmas/2006/xmas4.txt +++ b/npc/xmas/2006/xmas4.txt @@ -1,4 +1,4 @@ -new_12-1.gat,24,50,0 script Xmas4 105,{ +020-3.gat,24,50,0 script Xmas4 105,{ if(XMASQUEST4 == 1) goto L_only_once; mes "[Helper Santa]"; mes "It's Christmas."; diff --git a/npc/xmas/2006/xmas5.txt b/npc/xmas/2006/xmas5.txt index 7269717c..50dd6928 100644 --- a/npc/xmas/2006/xmas5.txt +++ b/npc/xmas/2006/xmas5.txt @@ -1,4 +1,4 @@ -new_13-1.gat,22,32,0 script Xmas5 105,{ +020-2.gat,22,32,0 script Xmas5 105,{ if(XMASQUEST5 == 1) goto L_only_once; mes "[Helper Santa]"; mes "It's Christmas."; diff --git a/npc/xmas/2006/xmas6.txt b/npc/xmas/2006/xmas6.txt index da47ca1f..c424664e 100644 --- a/npc/xmas/2006/xmas6.txt +++ b/npc/xmas/2006/xmas6.txt @@ -1,4 +1,4 @@ -new_14-1.gat,92,37,0 script Xmas6 105,{ +010-2.gat,92,37,0 script Xmas6 105,{ if(XMASQUEST6 == 1) goto L_only_once; mes "[Helper Santa]"; mes "It's Christmas."; diff --git a/npc/xmas/2006/xmas7.txt b/npc/xmas/2006/xmas7.txt index 7bcc2983..00905793 100644 --- a/npc/xmas/2006/xmas7.txt +++ b/npc/xmas/2006/xmas7.txt @@ -1,4 +1,4 @@ -new_15-1.gat,130,66,0 script Xmas7 105,{ +003-1.gat,130,66,0 script Xmas7 105,{ if(XMASQUEST7 == 1) goto L_only_once; mes "[Helper Santa]"; mes "It's Christmas."; diff --git a/npc/xmas/2006/xmas8.txt b/npc/xmas/2006/xmas8.txt index 47752239..dc5793ea 100644 --- a/npc/xmas/2006/xmas8.txt +++ b/npc/xmas/2006/xmas8.txt @@ -1,4 +1,4 @@ -new_16-1.gat,125,37,0 script Xmas8 105,{ +007-1.gat,125,37,0 script Xmas8 105,{ if(XMASQUEST8 == 1) goto L_only_once; mes "[Helper Santa]"; mes "It's Christmas."; diff --git a/npc/xmas/2006/xmas9.txt b/npc/xmas/2006/xmas9.txt index f27629d8..dea1832f 100644 --- a/npc/xmas/2006/xmas9.txt +++ b/npc/xmas/2006/xmas9.txt @@ -1,4 +1,4 @@ -new_17-1.gat,71,34,0 script Xmas9 105,{ +011-4.gat,71,34,0 script Xmas9 105,{ if(XMASQUEST9 == 1) goto L_only_once; mes "[Helper Santa]"; mes "It's Christmas."; diff --git a/npc/xmas/2007/after-xmas.txt b/npc/xmas/2007/after-xmas.txt index 0d39f858..f7678d98 100644 --- a/npc/xmas/2007/after-xmas.txt +++ b/npc/xmas/2007/after-xmas.txt @@ -1,4 +1,4 @@ -new_11-1.gat,78,85,0 script Santa 105,{ +020-1.gat,78,85,0 script Santa 105,{ if (QUEST_xmas07_state == 2) goto L_State2; mes "[Santa Clause]"; mes "Ho! Ho! Ho!"; diff --git a/npc/xmas/2007/pre-xmas.txt b/npc/xmas/2007/pre-xmas.txt index 8516f7e7..ba9c7c11 100644 --- a/npc/xmas/2007/pre-xmas.txt +++ b/npc/xmas/2007/pre-xmas.txt @@ -1,4 +1,4 @@ -new_11-1.gat,76,85,0 script Assistant 105,{ +020-1.gat,76,85,0 script Assistant 105,{ if (QUEST_xmas07_state == 1) goto L_State1; mes "[Santas Assistant]"; |