summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/char_athena.conf2
-rw-r--r--conf/magic.conf4
-rw-r--r--conf/map_athena.conf322
-rw-r--r--conf/map_local.conf.example11
-rw-r--r--data/001-1.wlk (renamed from data/new_3-1.wlk)bin19042 -> 19042 bytes
-rw-r--r--data/001-2.wlk (renamed from data/new_8-1.wlk)bin16004 -> 16004 bytes
-rw-r--r--data/001-3.wlk (renamed from data/new_6-1.wlk)bin22504 -> 22504 bytes
-rw-r--r--data/002-1.wlk (renamed from data/new_1-1.wlk)bin17412 -> 17412 bytes
-rw-r--r--data/002-3.wlk (renamed from data/new_2-1.wlk)bin16388 -> 16388 bytes
-rw-r--r--data/002-4.wlk (renamed from data/new_5-1.wlk)bin16388 -> 16388 bytes
-rw-r--r--data/003-1.wlk (renamed from data/new_15-1.wlk)bin26224 -> 26224 bytes
-rw-r--r--data/004-1.wlk (renamed from data/new_34-1.wlk)bin15565 -> 15565 bytes
-rw-r--r--data/005-1.wlk (renamed from data/new_7-1.wlk)bin26004 -> 26004 bytes
-rw-r--r--data/005-3.wlk (renamed from data/new_22-1.wlk)bin13924 -> 13924 bytes
-rw-r--r--data/006-1.wlk (renamed from data/new_24-1.wlk)bin22504 -> 22504 bytes
-rw-r--r--data/006-3.wlk (renamed from data/new_25-1.wlk)bin22504 -> 22504 bytes
-rw-r--r--data/007-1.wlk (renamed from data/new_16-1.wlk)bin17860 -> 17860 bytes
-rw-r--r--data/008-1.wlk (renamed from data/new_18-1.wlk)bin18484 -> 18484 bytes
-rw-r--r--data/009-1.wlk (renamed from data/new_19-1.wlk)bin8779 -> 8779 bytes
-rw-r--r--data/009-2.wlk (renamed from data/new_20-1.wlk)bin24004 -> 24004 bytes
-rw-r--r--data/009-3.wlk (renamed from data/new_35-1.wlk)bin30204 -> 30204 bytes
-rw-r--r--data/010-1.wlk (renamed from data/new_14-1.wlk)bin18004 -> 18004 bytes
-rw-r--r--data/010-2.wlk (renamed from data/new_23-1.wlk)bin11774 -> 11774 bytes
-rw-r--r--data/011-1.wlk (renamed from data/new_9-1.wlk)bin19100 -> 19100 bytes
-rw-r--r--data/011-3.wlk (renamed from data/new_4-1.wlk)bin3604 -> 3604 bytes
-rw-r--r--data/011-4.wlk (renamed from data/new_17-1.wlk)bin22504 -> 22504 bytes
-rw-r--r--data/012-1.wlk (renamed from data/new_26-1.wlk)bin28228 -> 28228 bytes
-rw-r--r--data/012-3.wlk (renamed from data/new_27-1.wlk)bin109204 -> 109204 bytes
-rw-r--r--data/013-1.wlk (renamed from data/new_28-1.wlk)bin19100 -> 19100 bytes
-rw-r--r--data/013-2.wlk (renamed from data/new_36-1.wlk)bin5548 -> 5548 bytes
-rw-r--r--data/013-3.wlkbin0 -> 40004 bytes
-rw-r--r--data/014-1.wlk (renamed from data/new_29-1.wlk)bin16804 -> 16804 bytes
-rw-r--r--data/014-3.wlk (renamed from data/new_30-1.wlk)bin28004 -> 28004 bytes
-rw-r--r--data/015-1.wlk (renamed from data/new_31-1.wlk)bin16804 -> 16804 bytes
-rw-r--r--data/016-1.wlk (renamed from data/new_32-1.wlk)bin16804 -> 16804 bytes
-rw-r--r--data/017-1.wlk (renamed from data/new_33-1.wlk)bin19100 -> 19100 bytes
-rw-r--r--data/018-1.wlk (renamed from data/new_37-1.wlk)bin24004 -> 24004 bytes
-rw-r--r--data/018-2.wlk (renamed from data/new_38-1.wlk)bin10224 -> 10224 bytes
-rw-r--r--data/018-3.wlkbin0 -> 40004 bytes
-rw-r--r--data/019-1.wlk (renamed from data/new_10-1.wlk)bin17668 -> 17668 bytes
-rw-r--r--data/020-1.wlk (renamed from data/new_11-1.wlk)bin18948 -> 18948 bytes
-rw-r--r--data/020-2.wlk (renamed from data/new_13-1.wlk)bin16004 -> 16004 bytes
-rw-r--r--data/020-3.wlk (renamed from data/new_12-1.wlk)bin6404 -> 6404 bytes
-rw-r--r--data/020-4.wlk (renamed from data/new_21-1.wlk)bin10004 -> 10004 bytes
-rw-r--r--data/resnametable.txt80
-rw-r--r--db/mob_db.txt2
-rw-r--r--npc/001-1_Tulimshar/_import.txt22
-rw-r--r--npc/001-1_Tulimshar/_mobs.txt7
-rw-r--r--npc/001-1_Tulimshar/_warps.txt5
-rw-r--r--npc/001-1_Tulimshar/banker.txt (renamed from npc/new_3-1-tulimshar/banker.txt)2
-rw-r--r--npc/001-1_Tulimshar/barber.txt (renamed from npc/new_3-1-tulimshar/barber.txt)4
-rw-r--r--npc/001-1_Tulimshar/bard.txt (renamed from npc/new_3-1-tulimshar/bard.txt)2
-rw-r--r--npc/001-1_Tulimshar/bleacher.txt140
-rw-r--r--npc/001-1_Tulimshar/children.txt (renamed from npc/new_3-1-tulimshar/children.txt)6
-rw-r--r--npc/001-1_Tulimshar/constable.txt (renamed from npc/new_3-1-tulimshar/constable.txt)2
-rw-r--r--npc/001-1_Tulimshar/elanore.txt (renamed from npc/new_3-1-tulimshar/elanore.txt)4
-rw-r--r--npc/001-1_Tulimshar/guards.txt (renamed from npc/new_3-1-tulimshar/guards.txt)6
-rw-r--r--npc/001-1_Tulimshar/guide.txt (renamed from npc/new_3-1-tulimshar/guide.txt)4
-rw-r--r--npc/001-1_Tulimshar/man.txt (renamed from npc/new_3-1-tulimshar/man.txt)4
-rw-r--r--npc/001-1_Tulimshar/merchant.txt3
-rw-r--r--npc/001-1_Tulimshar/monster_guide.txt (renamed from npc/new_3-1-tulimshar/monster_guide.txt)4
-rw-r--r--npc/001-1_Tulimshar/monsters.txt (renamed from npc/new_3-1-tulimshar/monsters.txt)10
-rw-r--r--npc/001-1_Tulimshar/rewards_master.txt (renamed from npc/new_3-1-tulimshar/rewards_master.txt)4
-rw-r--r--npc/001-1_Tulimshar/rules.txt (renamed from npc/new_3-1-tulimshar/rules.txt)2
-rw-r--r--npc/001-1_Tulimshar/sandra.txt (renamed from npc/new_3-1-tulimshar/sandra.txt)4
-rw-r--r--npc/001-1_Tulimshar/soul-menhir.txt8
-rw-r--r--npc/001-1_Tulimshar/vincent.txt (renamed from npc/new_3-1-tulimshar/vincent.txt)4
-rw-r--r--npc/001-1_Tulimshar/workers.txt (renamed from npc/new_3-1-tulimshar/workers.txt)4
-rw-r--r--npc/001-2_Tulimshar/_import.txt8
-rw-r--r--npc/001-2_Tulimshar/_mobs.txt7
-rw-r--r--npc/001-2_Tulimshar/_warps.txt13
-rw-r--r--npc/001-2_Tulimshar/casino.txt (renamed from npc/new_8-1-tulimshar/casino.txt)14
-rw-r--r--npc/001-2_Tulimshar/omar.txt (renamed from npc/new_8-1-tulimshar/omar.txt)2
-rw-r--r--npc/001-2_Tulimshar/phaet.txt (renamed from npc/new_8-1-tulimshar/phaet.txt)4
-rw-r--r--npc/001-2_Tulimshar/shops.txt9
-rw-r--r--npc/001-2_Tulimshar/troupe_leader.txt (renamed from npc/new_8-1-tulimshar/troupe_leader.txt)2
-rw-r--r--npc/001-3_Tulimshar_arena/_import.txt6
-rw-r--r--npc/001-3_Tulimshar_arena/_mobs.txt7
-rw-r--r--npc/001-3_Tulimshar_arena/_warps.txt3
-rw-r--r--npc/001-3_Tulimshar_arena/guards.txt (renamed from npc/new_6-1-arena/guards.txt)6
-rw-r--r--npc/001-3_Tulimshar_arena/monsters.txt (renamed from npc/new_6-1-arena/monsters.txt)6
-rw-r--r--npc/001-3_Tulimshar_arena/pvpflag.txt1
-rw-r--r--npc/002-1_Sandstorm/_import.txt8
-rw-r--r--npc/002-1_Sandstorm/_mobs.txt13
-rw-r--r--npc/002-1_Sandstorm/_warps.txt7
-rw-r--r--npc/002-1_Sandstorm/dark_mage.txt48
-rw-r--r--npc/002-1_Sandstorm/merchant.txt3
-rw-r--r--npc/002-1_Sandstorm/monsters.txt24
-rw-r--r--npc/002-1_Sandstorm/nomads.txt (renamed from npc/new_1-1-western-desert/nomads.txt)6
-rw-r--r--npc/002-1_Sandstorm/rogue.txt (renamed from npc/new_1-1-western-desert/rogue.txt)4
-rw-r--r--npc/002-3_Desert_mines/_import.txt5
-rw-r--r--npc/002-3_Desert_mines/_mobs.txt19
-rw-r--r--npc/002-3_Desert_mines/_warps.txt4
-rw-r--r--npc/002-3_Desert_mines/miners.txt17
-rw-r--r--npc/002-3_Desert_mines/monsters.txt (renamed from npc/new_2-1-cave1/monsters.txt)6
-rw-r--r--npc/002-4_Desert_mines/_import.txt6
-rw-r--r--npc/002-4_Desert_mines/_mobs.txt19
-rw-r--r--npc/002-4_Desert_mines/_warps.txt3
-rw-r--r--npc/002-4_Desert_mines/chest.txt (renamed from npc/new_5-1-cave2/chest.txt)6
-rw-r--r--npc/002-4_Desert_mines/miners.txt7
-rw-r--r--npc/002-4_Desert_mines/monsters.txt (renamed from npc/new_5-1-cave2/monsters.txt)8
-rw-r--r--npc/003-1_Beach/_import.txt4
-rw-r--r--npc/003-1_Beach/_mobs.txt19
-rw-r--r--npc/003-1_Beach/_warps.txt4
-rw-r--r--npc/003-1_Beach/monsters.txt20
-rw-r--r--npc/004-1_Beach/_import.txt4
-rw-r--r--npc/004-1_Beach/_mobs.txt7
-rw-r--r--npc/004-1_Beach/_warps.txt4
-rw-r--r--npc/004-1_Beach/monsters.txt26
-rw-r--r--npc/005-1_Snake_desert/_import.txt5
-rw-r--r--npc/005-1_Snake_desert/_mobs.txt19
-rw-r--r--npc/005-1_Snake_desert/_warps.txt18
-rw-r--r--npc/005-1_Snake_desert/monsters.txt20
-rw-r--r--npc/005-1_Snake_desert/npcs.txt (renamed from npc/new_7-1-eastern-desert/npcs.txt)6
-rw-r--r--npc/005-3_Snake_pit/_import.txt4
-rw-r--r--npc/005-3_Snake_pit/_mobs.txt7
-rw-r--r--npc/005-3_Snake_pit/_warps.txt4
-rw-r--r--npc/005-3_Snake_pit/monsters.txt (renamed from npc/new_22-1-snake-cave/monsters.txt)6
-rw-r--r--npc/006-1_Desert_mountains/_import.txt6
-rw-r--r--npc/006-1_Desert_mountains/_mobs.txt7
-rw-r--r--npc/006-1_Desert_mountains/_warps.txt34
-rw-r--r--npc/006-1_Desert_mountains/mika.txt (renamed from npc/new_24-1-eastern-desert-mountain-passage/mika.txt)2
-rw-r--r--npc/006-1_Desert_mountains/monsters.txt14
-rw-r--r--npc/006-1_Desert_mountains/pachua.txt (renamed from npc/new_24-1-eastern-desert-mountain-passage/pachua.txt)2
-rw-r--r--npc/006-3_Desert_mountain_caves/_import.txt4
-rw-r--r--npc/006-3_Desert_mountain_caves/_mobs.txt7
-rw-r--r--npc/006-3_Desert_mountain_caves/_warps.txt20
-rw-r--r--npc/006-3_Desert_mountain_caves/monsters.txt14
-rw-r--r--npc/007-1_Woodland/_import.txt4
-rw-r--r--npc/007-1_Woodland/_mobs.txt19
-rw-r--r--npc/007-1_Woodland/_warps.txt6
-rw-r--r--npc/007-1_Woodland/monsters.txt35
-rw-r--r--npc/008-1_Hurnscald_outskirts/_import.txt6
-rw-r--r--npc/008-1_Hurnscald_outskirts/_mobs.txt7
-rw-r--r--npc/008-1_Hurnscald_outskirts/_warps.txt10
-rw-r--r--npc/008-1_Hurnscald_outskirts/george.txt (renamed from npc/new_18-1-woodland-village/george.txt)2
-rw-r--r--npc/008-1_Hurnscald_outskirts/hinnak.txt (renamed from npc/new_18-1-woodland-village/hinnak.txt)2
-rw-r--r--npc/008-1_Hurnscald_outskirts/monsters.txt34
-rw-r--r--npc/009-1_Hurnscald/_import.txt9
-rw-r--r--npc/009-1_Hurnscald/_mobs.txt7
-rw-r--r--npc/009-1_Hurnscald/_warps.txt13
-rw-r--r--npc/009-1_Hurnscald/jack.txt (renamed from npc/new_19-1-woodland-village/jack.txt)2
-rw-r--r--npc/009-1_Hurnscald/milly.txt (renamed from npc/new_19-1-woodland-village/milly.txt)2
-rw-r--r--npc/009-1_Hurnscald/old_man.txt (renamed from npc/new_19-1-woodland-village/old_man.txt)2
-rw-r--r--npc/009-1_Hurnscald/old_woman.txt (renamed from npc/new_19-1-woodland-village/old_woman.txt)2
-rw-r--r--npc/009-1_Hurnscald/sabine.txt (renamed from npc/new_19-1-woodland-village/sabine.txt)2
-rw-r--r--npc/009-1_Hurnscald/soul-menhir.txt8
-rw-r--r--npc/009-2_Hurnscald/_import.txt15
-rw-r--r--npc/009-2_Hurnscald/_mobs.txt7
-rw-r--r--npc/009-2_Hurnscald/_warps.txt20
-rw-r--r--npc/009-2_Hurnscald/alan.txt (renamed from npc/new_20-1-woodland-village/alan.txt)2
-rw-r--r--npc/009-2_Hurnscald/doctor.txt (renamed from npc/new_20-1-woodland-village/doctor.txt)2
-rw-r--r--npc/009-2_Hurnscald/drunks.txt (renamed from npc/new_20-1-woodland-village/drunks.txt)4
-rw-r--r--npc/009-2_Hurnscald/inspector.txt (renamed from npc/new_20-1-woodland-village/inspector.txt)2
-rw-r--r--npc/009-2_Hurnscald/kfahr.txt (renamed from npc/new_20-1-woodland-village/kfahr.txt)2
-rw-r--r--npc/009-2_Hurnscald/misc.txt (renamed from npc/new_20-1-woodland-village/misc.txt)2
-rw-r--r--npc/009-2_Hurnscald/nicholas.txt (renamed from npc/new_20-1-woodland-village/nicholas.txt)2
-rw-r--r--npc/009-2_Hurnscald/nurse.txt (renamed from npc/new_20-1-woodland-village/nurse.txt)2
-rw-r--r--npc/009-2_Hurnscald/richard.txt (renamed from npc/new_20-1-woodland-village/richard.txt)2
-rw-r--r--npc/009-2_Hurnscald/selim.txt (renamed from npc/new_20-1-woodland-village/selim.txt)16
-rw-r--r--npc/009-2_Hurnscald/shops.txt (renamed from npc/new_20-1-woodland-village/shops.txt)12
-rw-r--r--npc/009-2_Hurnscald/waitress.txt (renamed from npc/new_20-1-woodland-village/waitress.txt)2
-rw-r--r--npc/009-3_Cave_beneath_Hurnscald/_import.txt4
-rw-r--r--npc/009-3_Cave_beneath_Hurnscald/_mobs.txt7
-rw-r--r--npc/009-3_Cave_beneath_Hurnscald/_warps.txt6
-rw-r--r--npc/009-3_Cave_beneath_Hurnscald/monsters.txt26
-rw-r--r--npc/010-1_Woodland/_import.txt4
-rw-r--r--npc/010-1_Woodland/_mobs.txt19
-rw-r--r--npc/010-1_Woodland/_warps.txt7
-rw-r--r--npc/010-1_Woodland/monsters.txt40
-rw-r--r--npc/010-2_Dimond's_Cove/_import.txt7
-rw-r--r--npc/010-2_Dimond's_Cove/_mobs.txt7
-rw-r--r--npc/010-2_Dimond's_Cove/_warps.txt9
-rw-r--r--npc/010-2_Dimond's_Cove/dimonds.txt (renamed from npc/new_23-1-dimonds-cove/dimonds.txt)34
-rw-r--r--npc/010-2_Dimond's_Cove/doug.txt (renamed from npc/new_23-1-dimonds-cove/doug.txt)2
-rw-r--r--npc/010-2_Dimond's_Cove/loratay.txt (renamed from npc/new_23-1-dimonds-cove/loratay.txt)70
-rw-r--r--npc/010-2_Dimond's_Cove/workers.txt (renamed from npc/new_23-1-dimonds-cove/workers.txt)4
-rw-r--r--npc/011-1_Woodland/_import.txt6
-rw-r--r--npc/011-1_Woodland/_mobs.txt7
-rw-r--r--npc/011-1_Woodland/_warps.txt7
-rw-r--r--npc/011-1_Woodland/alchemist.txt (renamed from npc/new_9-1-woodland/alchemist.txt)2
-rw-r--r--npc/011-1_Woodland/monsters.txt34
-rw-r--r--npc/011-1_Woodland/oscar.txt1
-rw-r--r--npc/011-3_Hermit's_cave/_import.txt5
-rw-r--r--npc/011-3_Hermit's_cave/_mobs.txt7
-rw-r--r--npc/011-3_Hermit's_cave/_warps.txt3
-rw-r--r--npc/011-3_Hermit's_cave/hermit.txt (renamed from npc/new_4-1-cave-small/hermit.txt)4
-rw-r--r--npc/011-3_Hermit's_cave/monsters.txt21
-rw-r--r--npc/011-4_Lake_cave/_import.txt4
-rw-r--r--npc/011-4_Lake_cave/_mobs.txt19
-rw-r--r--npc/011-4_Lake_cave/_warps.txt4
-rw-r--r--npc/011-4_Lake_cave/monsters.txt (renamed from npc/new_17-1-cave-big/monsters.txt)8
-rw-r--r--npc/012-1_Woodland_Hills/_import.txt5
-rw-r--r--npc/012-1_Woodland_Hills/_mobs.txt7
-rw-r--r--npc/012-1_Woodland_Hills/_warps.txt12
-rw-r--r--npc/012-1_Woodland_Hills/monsters.txt52
-rw-r--r--npc/012-1_Woodland_Hills/shops.txt3
-rw-r--r--npc/012-3_Cave/_import.txt4
-rw-r--r--npc/012-3_Cave/_mobs.txt7
-rw-r--r--npc/012-3_Cave/_warps.txt11
-rw-r--r--npc/012-3_Cave/monsters.txt (renamed from npc/new_27-1-hill2/monsters.txt)8
-rw-r--r--npc/013-1_Woodland_hills/_import.txt4
-rw-r--r--npc/013-1_Woodland_hills/_mobs.txt7
-rw-r--r--npc/013-1_Woodland_hills/_warps.txt6
-rw-r--r--npc/013-1_Woodland_hills/monsters.txt63
-rw-r--r--npc/013-2_Magic_house/_import.txt6
-rw-r--r--npc/013-2_Magic_house/_mobs.txt7
-rw-r--r--npc/013-2_Magic_house/_warps.txt5
-rw-r--r--npc/013-2_Magic_house/apprentice.txt (renamed from npc/new_36-1-magic-house/apprentice.txt)2
-rw-r--r--npc/013-2_Magic_house/notes.txt (renamed from npc/new_36-1-magic-house/notes.txt)32
-rw-r--r--npc/013-2_Magic_house/wizard.txt (renamed from npc/new_36-1-magic-house/wizard.txt)2
-rw-r--r--npc/013-3_Cave/_import.txt7
-rw-r--r--npc/013-3_Cave/_mobs.txt86
-rw-r--r--npc/013-3_Cave/_warps.txt29
-rw-r--r--npc/013-3_Cave/barrier.txt17
-rw-r--r--npc/013-3_Cave/mask_chest.txt151
-rw-r--r--npc/013-3_Cave/misc.txt6
-rw-r--r--npc/013-3_Cave/sword_chest.txt31
-rw-r--r--npc/014-1_Woodland/_import.txt6
-rw-r--r--npc/014-1_Woodland/_mobs.txt7
-rw-r--r--npc/014-1_Woodland/_warps.txt5
-rw-r--r--npc/014-1_Woodland/monsters.txt69
-rw-r--r--npc/014-1_Woodland/taro.txt (renamed from npc/new_29-1-west-woodland/taro.txt)4
-rw-r--r--npc/014-1_Woodland/wedding-officiator.txt (renamed from npc/new_29-1-west-woodland/wedding-officiator.txt)2
-rw-r--r--npc/014-3_Cave/_import.txt4
-rw-r--r--npc/014-3_Cave/_mobs.txt7
-rw-r--r--npc/014-3_Cave/_warps.txt6
-rw-r--r--npc/014-3_Cave/monsters.txt (renamed from npc/new_30-1-west-woodland-cave/monsters.txt)6
-rw-r--r--npc/015-1_Woodland/_import.txt5
-rw-r--r--npc/015-1_Woodland/_mobs.txt7
-rw-r--r--npc/015-1_Woodland/_warps.txt3
-rw-r--r--npc/015-1_Woodland/alice.txt (renamed from npc/new_31-1-southwest-woodland/alice.txt)2
-rw-r--r--npc/015-1_Woodland/monsters.txt46
-rw-r--r--npc/016-1_Woodland/_import.txt4
-rw-r--r--npc/016-1_Woodland/_mobs.txt7
-rw-r--r--npc/016-1_Woodland/_warps.txt3
-rw-r--r--npc/016-1_Woodland/monsters.txt40
-rw-r--r--npc/017-1_Woodland_hills/_import.txt4
-rw-r--r--npc/017-1_Woodland_hills/_mobs.txt7
-rw-r--r--npc/017-1_Woodland_hills/_warps.txt3
-rw-r--r--npc/017-1_Woodland_hills/monsters.txt76
-rw-r--r--npc/018-1_Woodland_mining_camp/_import.txt4
-rw-r--r--npc/018-1_Woodland_mining_camp/_mobs.txt105
-rw-r--r--npc/018-1_Woodland_mining_camp/_warps.txt17
-rw-r--r--npc/018-1_Woodland_mining_camp/miners.txt6
-rw-r--r--npc/018-2_Woodland_minning_camp/_import.txt8
-rw-r--r--npc/018-2_Woodland_minning_camp/_mobs.txt13
-rw-r--r--npc/018-2_Woodland_minning_camp/_warps.txt9
-rw-r--r--npc/018-2_Woodland_minning_camp/angus.txt (renamed from npc/new_38-1-woodland-mine/angus.txt)2
-rw-r--r--npc/018-2_Woodland_minning_camp/books.txt (renamed from npc/new_38-1-woodland-mine/books.txt)2
-rw-r--r--npc/018-2_Woodland_minning_camp/caul.txt (renamed from npc/new_38-1-woodland-mine/caul.txt)2
-rw-r--r--npc/018-2_Woodland_minning_camp/miners.txt (renamed from npc/new_38-1-woodland-mine/miners.txt)2
-rw-r--r--npc/018-2_Woodland_minning_camp/receptionist.txt (renamed from npc/new_38-1-woodland-mine/receptionist.txt)2
-rw-r--r--npc/018-3_Cave/_import.txt4
-rw-r--r--npc/018-3_Cave/_mobs.txt118
-rw-r--r--npc/018-3_Cave/_warps.txt23
-rw-r--r--npc/018-3_Cave/bookcase.txt64
-rw-r--r--npc/019-1_Snow_field/_import.txt7
-rw-r--r--npc/019-1_Snow_field/_mobs.txt7
-rw-r--r--npc/019-1_Snow_field/_warps.txt3
-rw-r--r--npc/019-1_Snow_field/monsters.txt20
-rw-r--r--npc/019-1_Snow_field/santa.txt (renamed from npc/new_10-1-xmas/santa.txt)2
-rw-r--r--npc/019-1_Snow_field/snowman.txt (renamed from npc/new_10-1-xmas/snowman.txt)4
-rw-r--r--npc/019-1_Snow_field/taro.txt (renamed from npc/new_10-1-xmas/taro.txt)4
-rw-r--r--npc/020-1/_import.txt8
-rw-r--r--npc/020-1/_mobs.txt7
-rw-r--r--npc/020-1/_warps.txt9
-rw-r--r--npc/020-1/amrak.txt (renamed from npc/new_11-1-snow-village/amrak.txt)2
-rw-r--r--npc/020-1/monsters.txt14
-rw-r--r--npc/020-1/sexchanger.txt (renamed from npc/new_11-1-snow-village/sexchanger.txt)4
-rw-r--r--npc/020-1/soul-menhir.txt8
-rw-r--r--npc/020-1/startrek.txt (renamed from npc/new_11-1-snow-village/startrek.txt)6
-rw-r--r--npc/020-2/_import.txt5
-rw-r--r--npc/020-2/_mobs.txt7
-rw-r--r--npc/020-2/_warps.txt7
-rw-r--r--npc/020-2/furquest.txt (renamed from npc/new_13-1-snow-village-shops/furquest.txt)2
-rw-r--r--npc/020-2/shops.txt21
-rw-r--r--npc/020-3_Ice_cave/_import.txt4
-rw-r--r--npc/020-3_Ice_cave/_mobs.txt19
-rw-r--r--npc/020-3_Ice_cave/_warps.txt4
-rw-r--r--npc/020-3_Ice_cave/monsters.txt18
-rw-r--r--npc/020-4_Ice_cave/_import.txt4
-rw-r--r--npc/020-4_Ice_cave/_mobs.txt7
-rw-r--r--npc/020-4_Ice_cave/_warps.txt3
-rw-r--r--npc/020-4_Ice_cave/monsters.txt18
-rw-r--r--npc/021-1_Tulimshar/_import.txt3
-rw-r--r--npc/021-1_Tulimshar/_mobs.txt7
-rw-r--r--npc/021-1_Tulimshar/_warps.txt2
-rw-r--r--npc/_import.txt40
-rw-r--r--npc/easter2008/monsters.txt30
-rw-r--r--npc/easter2008/npc.txt2
-rw-r--r--npc/halloween/2006/halloween1.txt2
-rw-r--r--npc/halloween/2006/halloween10.txt2
-rw-r--r--npc/halloween/2006/halloween11.txt2
-rw-r--r--npc/halloween/2006/halloween12.txt2
-rw-r--r--npc/halloween/2006/halloween13.txt2
-rw-r--r--npc/halloween/2006/halloween14.txt2
-rw-r--r--npc/halloween/2006/halloween15.txt2
-rw-r--r--npc/halloween/2006/halloween16.txt2
-rw-r--r--npc/halloween/2006/halloween17.txt2
-rw-r--r--npc/halloween/2006/halloween18.txt2
-rw-r--r--npc/halloween/2006/halloween19.txt2
-rw-r--r--npc/halloween/2006/halloween2.txt2
-rw-r--r--npc/halloween/2006/halloween20.txt2
-rw-r--r--npc/halloween/2006/halloween3.txt2
-rw-r--r--npc/halloween/2006/halloween4.txt2
-rw-r--r--npc/halloween/2006/halloween5.txt2
-rw-r--r--npc/halloween/2006/halloween6.txt2
-rw-r--r--npc/halloween/2006/halloween7.txt2
-rw-r--r--npc/halloween/2006/halloween8.txt2
-rw-r--r--npc/halloween/2006/halloween9.txt2
-rw-r--r--npc/halloween/2006/monsters.txt18
-rw-r--r--npc/halloween/2008/monsters.txt68
-rw-r--r--npc/halloween/2008/prize_master.txt6
-rw-r--r--npc/new_1-1-western-desert/dark_mage.txt46
-rw-r--r--npc/new_1-1-western-desert/merchant.txt1
-rw-r--r--npc/new_1-1-western-desert/monsters.txt24
-rw-r--r--npc/new_1-1-western-desert/passages.txt5
-rw-r--r--npc/new_10-1-xmas/monsters.txt20
-rw-r--r--npc/new_10-1-xmas/passages.txt1
-rw-r--r--npc/new_11-1-snow-village/monsters.txt14
-rw-r--r--npc/new_11-1-snow-village/passages.txt13
-rw-r--r--npc/new_11-1-snow-village/soul-menhir.txt6
-rw-r--r--npc/new_12-1-ice-cave/monsters.txt20
-rw-r--r--npc/new_12-1-ice-cave/passages.txt2
-rw-r--r--npc/new_13-1-snow-village-shops/passages.txt10
-rw-r--r--npc/new_13-1-snow-village-shops/shops.txt19
-rw-r--r--npc/new_14-1-south-woodland/monsters.txt40
-rw-r--r--npc/new_14-1-south-woodland/passages.txt4
-rw-r--r--npc/new_15-1-woodland-desert/monsters.txt20
-rw-r--r--npc/new_15-1-woodland-desert/passages.txt3
-rw-r--r--npc/new_16-1-south-east-woodland/monsters.txt35
-rw-r--r--npc/new_16-1-south-east-woodland/passages.txt4
-rw-r--r--npc/new_17-1-cave-big/passages.txt2
-rw-r--r--npc/new_18-1-woodland-village/monsters.txt34
-rw-r--r--npc/new_18-1-woodland-village/passages.txt19
-rw-r--r--npc/new_19-1-woodland-village/passages.txt30
-rw-r--r--npc/new_19-1-woodland-village/soul-menhir.txt8
-rw-r--r--npc/new_2-1-cave1/miners.txt39
-rw-r--r--npc/new_2-1-cave1/passages.txt1
-rw-r--r--npc/new_20-1-woodland-village/passages.txt66
-rw-r--r--npc/new_21-1-ice-cave2/monsters.txt20
-rw-r--r--npc/new_21-1-ice-cave2/passages.txt1
-rw-r--r--npc/new_22-1-snake-cave/passages.txt2
-rw-r--r--npc/new_23-1-dimonds-cove/passages.txt21
-rw-r--r--npc/new_24-1-eastern-desert-mountain-passage/monsters.txt14
-rw-r--r--npc/new_24-1-eastern-desert-mountain-passage/passages.txt32
-rw-r--r--npc/new_25-1-eastern-desert-cave/monsters.txt14
-rw-r--r--npc/new_25-1-eastern-desert-cave/passages.txt19
-rw-r--r--npc/new_26-1-hill1/monsters.txt52
-rw-r--r--npc/new_26-1-hill1/passages.txt11
-rw-r--r--npc/new_26-1-hill1/shops.txt3
-rw-r--r--npc/new_27-1-hill2/passages.txt9
-rw-r--r--npc/new_28-1-hillwest/monsters.txt63
-rw-r--r--npc/new_28-1-hillwest/passages.txt3
-rw-r--r--npc/new_29-1-west-woodland/monsters.txt69
-rw-r--r--npc/new_29-1-west-woodland/passages.txt3
-rw-r--r--npc/new_3-1-tulimshar/bleacher.txt126
-rw-r--r--npc/new_3-1-tulimshar/merchant.txt1
-rw-r--r--npc/new_3-1-tulimshar/passages.txt5
-rw-r--r--npc/new_3-1-tulimshar/soul-menhir.txt6
-rw-r--r--npc/new_30-1-west-woodland-cave/passages.txt4
-rw-r--r--npc/new_31-1-southwest-woodland/monsters.txt46
-rw-r--r--npc/new_31-1-southwest-woodland/passages.txt1
-rw-r--r--npc/new_32-1-south-woodland-2/monsters.txt40
-rw-r--r--npc/new_32-1-south-woodland-2/passages.txt1
-rw-r--r--npc/new_33-1-hill-northwest/monsters.txt76
-rw-r--r--npc/new_33-1-hill-northwest/passages.txt1
-rw-r--r--npc/new_34-1-north-beach/monsters.txt26
-rw-r--r--npc/new_34-1-north-beach/passages.txt2
-rw-r--r--npc/new_35-1-woodland-village/monsters.txt26
-rw-r--r--npc/new_35-1-woodland-village/passages.txt5
-rw-r--r--npc/new_36-1-magic-house/passages.txt3
-rw-r--r--npc/new_37-1-woodland-mine/miners.txt6
-rw-r--r--npc/new_37-1-woodland-mine/monsters.txt39
-rw-r--r--npc/new_37-1-woodland-mine/passages.txt5
-rw-r--r--npc/new_38-1-woodland-mine/monsters.txt14
-rw-r--r--npc/new_38-1-woodland-mine/passages.txt12
-rw-r--r--npc/new_4-1-cave-small/monsters.txt21
-rw-r--r--npc/new_4-1-cave-small/passages.txt1
-rw-r--r--npc/new_5-1-cave2/passages.txt4
-rw-r--r--npc/new_6-1-arena/pvpflag.txt1
-rw-r--r--npc/new_7-1-eastern-desert/monsters.txt20
-rw-r--r--npc/new_7-1-eastern-desert/passages.txt21
-rw-r--r--npc/new_8-1-tulimshar/passages.txt28
-rw-r--r--npc/new_8-1-tulimshar/shops.txt9
-rw-r--r--npc/new_9-1-woodland/monsters.txt34
-rw-r--r--npc/new_9-1-woodland/oscar.txt1
-rw-r--r--npc/new_9-1-woodland/passages.txt5
-rw-r--r--npc/scripts.conf51
-rw-r--r--npc/xmas/2006/xmas1.txt (renamed from npc/new_10-1-xmas/xmas1.txt)2
-rw-r--r--npc/xmas/2006/xmas10.txt (renamed from npc/new_10-1-xmas/xmas10.txt)2
-rw-r--r--npc/xmas/2006/xmas11.txt (renamed from npc/new_10-1-xmas/xmas11.txt)2
-rw-r--r--npc/xmas/2006/xmas12.txt (renamed from npc/new_10-1-xmas/xmas12.txt)2
-rw-r--r--npc/xmas/2006/xmas13.txt (renamed from npc/new_10-1-xmas/xmas13.txt)2
-rw-r--r--npc/xmas/2006/xmas14.txt (renamed from npc/new_10-1-xmas/xmas14.txt)2
-rw-r--r--npc/xmas/2006/xmas15.txt (renamed from npc/new_10-1-xmas/xmas15.txt)2
-rw-r--r--npc/xmas/2006/xmas16.txt (renamed from npc/new_10-1-xmas/xmas16.txt)2
-rw-r--r--npc/xmas/2006/xmas17.txt (renamed from npc/new_10-1-xmas/xmas17.txt)2
-rw-r--r--npc/xmas/2006/xmas18.txt (renamed from npc/new_10-1-xmas/xmas18.txt)2
-rw-r--r--npc/xmas/2006/xmas19.txt (renamed from npc/new_10-1-xmas/xmas19.txt)2
-rw-r--r--npc/xmas/2006/xmas2.txt (renamed from npc/new_10-1-xmas/xmas2.txt)2
-rw-r--r--npc/xmas/2006/xmas20.txt (renamed from npc/new_10-1-xmas/xmas20.txt)2
-rw-r--r--npc/xmas/2006/xmas3.txt (renamed from npc/new_10-1-xmas/xmas3.txt)2
-rw-r--r--npc/xmas/2006/xmas4.txt (renamed from npc/new_10-1-xmas/xmas4.txt)2
-rw-r--r--npc/xmas/2006/xmas5.txt (renamed from npc/new_10-1-xmas/xmas5.txt)2
-rw-r--r--npc/xmas/2006/xmas6.txt (renamed from npc/new_10-1-xmas/xmas6.txt)2
-rw-r--r--npc/xmas/2006/xmas7.txt (renamed from npc/new_10-1-xmas/xmas7.txt)2
-rw-r--r--npc/xmas/2006/xmas8.txt (renamed from npc/new_10-1-xmas/xmas8.txt)2
-rw-r--r--npc/xmas/2006/xmas9.txt (renamed from npc/new_10-1-xmas/xmas9.txt)2
-rw-r--r--npc/xmas/2007/after-xmas.txt (renamed from npc/xmas2007/after-xmas.txt)2
-rw-r--r--npc/xmas/2007/pre-xmas.txt (renamed from npc/xmas2007/pre-xmas.txt)2
412 files changed, 3077 insertions, 2046 deletions
diff --git a/conf/char_athena.conf b/conf/char_athena.conf
index c7b14429..b488623b 100644
--- a/conf/char_athena.conf
+++ b/conf/char_athena.conf
@@ -44,7 +44,7 @@ backup_txt_flag: no
backup_txt: save/athena_backup.txt
// Start point, Map name followed by coordinates (x,y)
-start_point: new_3-1.gat,29,28
+start_point: 001-1.gat,29,28
// Starting weapon for new characters
start_weapon: 1201
diff --git a/conf/magic.conf b/conf/magic.conf
index 7d3918b5..bfe56741 100644
--- a/conf/magic.conf
+++ b/conf/magic.conf
@@ -492,8 +492,8 @@ SPELL shroud : "#aw" =
CONST MIN_MARRY_LEVEL = 32;
-SILENT SPELL marriage (target : PC) : "marry" =
- (REQUIRE is_in(location(caster), @("new_29-1.gat", 28,39) @+ (8, 6)))=>
+NONMAGIC SILENT SPELL marriage (target : PC) : "marry" =
+ (REQUIRE is_in(location(caster), @("014-1.gat", 28,39) @+ (8, 6)))=>
EFFECT IF target == caster # no valid target or tried to marry self?
THEN ABORT;
diff --git a/conf/map_athena.conf b/conf/map_athena.conf
index 25ea0676..82e8c08b 100644
--- a/conf/map_athena.conf
+++ b/conf/map_athena.conf
@@ -1,323 +1,17 @@
// eAthena Map-Server Configuration File
-// Maps
-map: new_39-1.gat
-map: new_38-1.gat
-map: new_37-1.gat
-map: new_36-1.gat
-map: new_35-1.gat
-map: new_34-1.gat
-map: new_33-1.gat
-map: new_32-1.gat
-map: new_31-1.gat
-map: new_30-1.gat
-map: new_29-1.gat
-map: new_28-1.gat
-map: new_27-1.gat
-map: new_26-1.gat
-map: new_25-1.gat
-map: new_24-1.gat
-map: new_23-1.gat
-map: new_22-1.gat
-map: new_21-1.gat
-map: new_20-1.gat
-map: new_19-1.gat
-map: new_18-1.gat
-map: new_17-1.gat
-map: new_16-1.gat
-map: new_15-1.gat
-map: new_14-1.gat
-map: new_13-1.gat
-map: new_12-1.gat
-map: new_11-1.gat
-map: new_10-1.gat
-map: new_9-1.gat
-map: new_8-1.gat
-map: new_7-1.gat
-map: new_6-1.gat
-map: new_5-1.gat
-map: new_4-1.gat
-map: new_3-1.gat
-map: new_2-1.gat
-map: new_1-1.gat
+// Database autosave time, in seconds.
+autosave_time: 60
-// NPC Functions
-npc: npc/functions/banker.txt
-npc: npc/functions/barber.txt
-npc: npc/functions/game_rules.txt
-npc: npc/functions/inn.txt
-npc: npc/functions/mob_points.txt
-npc: npc/functions/process_equip.txt
-npc: npc/functions/slot_machine.txt
-npc: npc/functions/soul_menhir.txt
+// Message of the day file, when a character logs on, this message is displayed.
+motd_txt: conf/motd.txt
-// NPCs (ordered by map number).
+// When @help or @h is typed when you are a gm, this is displayed for helping new gms understand gm commands.
+help_txt: conf/help.txt
-// new_1-1 Western desert
-// npc: npc/western-desert/dark_mage.txt
-npc: npc/new_1-1-western-desert/rogue.txt
-npc: npc/new_1-1-western-desert/merchant.txt
-npc: npc/new_1-1-western-desert/monsters.txt
-npc: npc/new_1-1-western-desert/nomads.txt
-npc: npc/new_1-1-western-desert/passages.txt
+mapreg_txt: save/mapreg.txt
-// new-2_1 Cave level 1
-npc: npc/new_2-1-cave1/miners.txt
-npc: npc/new_2-1-cave1/monsters.txt
-npc: npc/new_2-1-cave1/passages.txt
-
-// new_3-1 Tulimshar
-npc: npc/new_3-1-tulimshar/banker.txt
-npc: npc/new_3-1-tulimshar/barber.txt
-npc: npc/new_3-1-tulimshar/bard.txt
-npc: npc/new_3-1-tulimshar/bleacher.txt
-npc: npc/new_3-1-tulimshar/children.txt
-npc: npc/new_3-1-tulimshar/constable.txt
-npc: npc/new_3-1-tulimshar/elanore.txt
-npc: npc/new_3-1-tulimshar/guards.txt
-npc: npc/new_3-1-tulimshar/guide.txt
-npc: npc/new_3-1-tulimshar/man.txt
-npc: npc/new_3-1-tulimshar/merchant.txt
-npc: npc/new_3-1-tulimshar/monster_guide.txt
-npc: npc/new_3-1-tulimshar/monsters.txt
-npc: npc/new_3-1-tulimshar/passages.txt
-npc: npc/new_3-1-tulimshar/rewards_master.txt
-npc: npc/new_3-1-tulimshar/rules.txt
-npc: npc/new_3-1-tulimshar/sandra.txt
-npc: npc/new_3-1-tulimshar/vincent.txt
-npc: npc/new_3-1-tulimshar/soul-menhir.txt
-npc: npc/new_3-1-tulimshar/workers.txt
-
-// new_4-1 Small bat cave
-npc: npc/new_4-1-cave-small/hermit.txt
-npc: npc/new_4-1-cave-small/monsters.txt
-npc: npc/new_4-1-cave-small/passages.txt
-
-// new_5-1 Cave level 2 (Underground Palace)
-npc: npc/new_5-1-cave2/chest.txt
-npc: npc/new_5-1-cave2/monsters.txt
-npc: npc/new_5-1-cave2/passages.txt
-
-// new_6-1 Arena
-npc: npc/new_6-1-arena/guards.txt
-npc: npc/new_6-1-arena/monsters.txt
-npc: npc/new_6-1-arena/pvpflag.txt
-
-// new_7-1 Eastern desert
-npc: npc/new_7-1-eastern-desert/monsters.txt
-npc: npc/new_7-1-eastern-desert/passages.txt
-npc: npc/new_7-1-eastern-desert/npcs.txt
-
-// new_8-1 Tulimshar indoor
-npc: npc/new_8-1-tulimshar/casino.txt
-npc: npc/new_8-1-tulimshar/omar.txt
-npc: npc/new_8-1-tulimshar/passages.txt
-npc: npc/new_8-1-tulimshar/phaet.txt
-npc: npc/new_8-1-tulimshar/shops.txt
-npc: npc/new_8-1-tulimshar/troupe_leader.txt
-
-// new_9-1 Woodland
-npc: npc/new_9-1-woodland/alchemist.txt
-npc: npc/new_9-1-woodland/monsters.txt
-npc: npc/new_9-1-woodland/passages.txt
-npc: npc/new_9-1-woodland/oscar.txt
-
-// new_10-1 Xmas snow map
-npc: npc/new_10-1-xmas/monsters.txt
-npc: npc/new_10-1-xmas/passages.txt
-// npc: npc/new_10-1-xmas/santa.txt
-npc: npc/new_10-1-xmas/snowman.txt
-npc: npc/new_10-1-xmas/taro.txt
-
-// new_11-1 Snow village
-// npc: npc/new_11-1-snow-village/monsters.txt
-npc: npc/new_11-1-snow-village/sexchanger.txt
-npc: npc/new_11-1-snow-village/startrek.txt
-npc: npc/new_11-1-snow-village/passages.txt
-npc: npc/new_11-1-snow-village/soul-menhir.txt
-npc: npc/new_11-1-snow-village/amrak.txt
-
-// new_12-1 Ice cave
-npc: npc/new_12-1-ice-cave/monsters.txt
-npc: npc/new_12-1-ice-cave/passages.txt
-
-// new_13-1 Snow village shops.
-npc: npc/new_13-1-snow-village-shops/shops.txt
-npc: npc/new_13-1-snow-village-shops/passages.txt
-npc: npc/new_13-1-snow-village-shops/furquest.txt
-
-// new_14-1 South-woodland
-npc: npc/new_14-1-south-woodland/monsters.txt
-npc: npc/new_14-1-south-woodland/passages.txt
-
-// new_15-1 Woodland-desert link
-npc: npc/new_15-1-woodland-desert/monsters.txt
-npc: npc/new_15-1-woodland-desert/passages.txt
-
-// new_16-1 South-west woodland
-npc: npc/new_16-1-south-east-woodland/monsters.txt
-npc: npc/new_16-1-south-east-woodland/passages.txt
-
-// new_17-1 Big cave
-npc: npc/new_17-1-cave-big/monsters.txt
-npc: npc/new_17-1-cave-big/passages.txt
-
-// new_18-1 Woodland village surroundings
-npc: npc/new_18-1-woodland-village/monsters.txt
-npc: npc/new_18-1-woodland-village/passages.txt
-npc: npc/new_18-1-woodland-village/george.txt
-npc: npc/new_18-1-woodland-village/hinnak.txt
-
-// new_19-1 Woodland village
-npc: npc/new_19-1-woodland-village/jack.txt
-npc: npc/new_19-1-woodland-village/milly.txt
-npc: npc/new_19-1-woodland-village/old_man.txt
-npc: npc/new_19-1-woodland-village/old_woman.txt
-npc: npc/new_19-1-woodland-village/passages.txt
-npc: npc/new_19-1-woodland-village/sabine.txt
-npc: npc/new_19-1-woodland-village/soul-menhir.txt
-
-// new_20-1 Woodland village indoor
-npc: npc/new_20-1-woodland-village/alan.txt
-npc: npc/new_20-1-woodland-village/doctor.txt
-npc: npc/new_20-1-woodland-village/drunks.txt
-npc: npc/new_20-1-woodland-village/inspector.txt
-npc: npc/new_20-1-woodland-village/kfahr.txt
-npc: npc/new_20-1-woodland-village/misc.txt
-npc: npc/new_20-1-woodland-village/nicholas.txt
-npc: npc/new_20-1-woodland-village/nurse.txt
-npc: npc/new_20-1-woodland-village/passages.txt
-npc: npc/new_20-1-woodland-village/richard.txt
-npc: npc/new_20-1-woodland-village/selim.txt
-npc: npc/new_20-1-woodland-village/shops.txt
-npc: npc/new_20-1-woodland-village/waitress.txt
-
-// new_21-1 Ice cave 2
-npc: npc/new_21-1-ice-cave2/monsters.txt
-npc: npc/new_21-1-ice-cave2/passages.txt
-
-// new_22-1 Snake cave
-npc: npc/new_22-1-snake-cave/monsters.txt
-npc: npc/new_22-1-snake-cave/passages.txt
-
-// new_23-1 Dimonds Cove
-npc: npc/new_23-1-dimonds-cove/passages.txt
-npc: npc/new_23-1-dimonds-cove/dimonds.txt
-npc: npc/new_23-1-dimonds-cove/doug.txt
-npc: npc/new_23-1-dimonds-cove/loratay.txt
-npc: npc/new_23-1-dimonds-cove/workers.txt
-
-// new_24-1 Eastern desert mountain passage
-npc: npc/new_24-1-eastern-desert-mountain-passage/mika.txt
-npc: npc/new_24-1-eastern-desert-mountain-passage/monsters.txt
-npc: npc/new_24-1-eastern-desert-mountain-passage/pachua.txt
-npc: npc/new_24-1-eastern-desert-mountain-passage/passages.txt
-
-// new_25-1 Eastern desert cave
-npc: npc/new_25-1-eastern-desert-cave/monsters.txt
-npc: npc/new_25-1-eastern-desert-cave/passages.txt
-
-// new_26-1 Forest Hill 1
-npc: npc/new_26-1-hill1/monsters.txt
-npc: npc/new_26-1-hill1/passages.txt
-npc: npc/new_26-1-hill1/shops.txt
-
-// new_27-1 Forest Hill 2 (Cave)
-npc: npc/new_27-1-hill2/monsters.txt
-npc: npc/new_27-1-hill2/passages.txt
-
-// new_28-1 Forest east of map 26
-npc: npc/new_28-1-hillwest/passages.txt
-npc: npc/new_28-1-hillwest/monsters.txt
-
-// new_29-1 Forest west of map 9
-npc: npc/new_29-1-west-woodland/passages.txt
-npc: npc/new_29-1-west-woodland/monsters.txt
-npc: npc/new_29-1-west-woodland/taro.txt
-npc: npc/new_29-1-west-woodland/wedding-officiator.txt
-
-// new_30-1 Caves for map 29
-npc: npc/new_30-1-west-woodland-cave/passages.txt
-npc: npc/new_30-1-west-woodland-cave/monsters.txt
-
-// new_31-1 Forest west of map 14
-npc: npc/new_31-1-southwest-woodland/passages.txt
-npc: npc/new_31-1-southwest-woodland/monsters.txt
-npc: npc/new_31-1-southwest-woodland/alice.txt
-
-// new_32-1 Forest south of map 14
-npc: npc/new_32-1-south-woodland-2/passages.txt
-npc: npc/new_32-1-south-woodland-2/monsters.txt
-
-// new_33-1 Forest north of map 28
-npc: npc/new_33-1-hill-northwest/passages.txt
-npc: npc/new_33-1-hill-northwest/monsters.txt
-
-// new_34-1 Beach west of Tulimshar
-npc: npc/new_34-1-north-beach/passages.txt
-npc: npc/new_34-1-north-beach/monsters.txt
-
-// new_35-1 Cave beneath Hurnscald
-npc: npc/new_35-1-woodland-village/passages.txt
-npc: npc/new_35-1-woodland-village/monsters.txt
-
-// new_36-1 Magic house in forest 28
-npc: npc/new_36-1-magic-house/passages.txt
-npc: npc/new_36-1-magic-house/wizard.txt
-npc: npc/new_36-1-magic-house/apprentice.txt
-npc: npc/new_36-1-magic-house/notes.txt
-
-// new_37-1 Mine north of Hurnscald
-npc: npc/new_37-1-woodland-mine/miners.txt
-npc: npc/new_37-1-woodland-mine/monsters.txt
-npc: npc/new_37-1-woodland-mine/passages.txt
-
-// new_38-1 Mines north of Hurnscald (indoor)
-npc: npc/new_38-1-woodland-mine/angus.txt
-npc: npc/new_38-1-woodland-mine/books.txt
-npc: npc/new_38-1-woodland-mine/caul.txt
-npc: npc/new_38-1-woodland-mine/miners.txt
-npc: npc/new_38-1-woodland-mine/monsters.txt
-npc: npc/new_38-1-woodland-mine/passages.txt
-npc: npc/new_38-1-woodland-mine/receptionist.txt
-
-// Christmas 2006
-// npc: npc/xmas/xmas1.txt
-// npc: npc/xmas/xmas2.txt
-// npc: npc/xmas/xmas3.txt
-// npc: npc/xmas/xmas4.txt
-// npc: npc/xmas/xmas5.txt
-// npc: npc/xmas/xmas6.txt
-// npc: npc/xmas/xmas7.txt
-// npc: npc/xmas/xmas8.txt
-// npc: npc/xmas/xmas9.txt
-// npc: npc/xmas/xmas10.txt
-// npc: npc/xmas/xmas11.txt
-// npc: npc/xmas/xmas12.txt
-// npc: npc/xmas/xmas13.txt
-// npc: npc/xmas/xmas14.txt
-// npc: npc/xmas/xmas15.txt
-// npc: npc/xmas/xmas16.txt
-// npc: npc/xmas/xmas17.txt
-// npc: npc/xmas/xmas18.txt
-// npc: npc/xmas/xmas19.txt
-// npc: npc/xmas/xmas20.txt
-
-// Halloween 2007
-// npc: npc/halloween/2007/monsters.txt
-// npc: npc/halloween/2007/summon.txt
-
-// Christmas 2007
-// npc: npc/xmas2007/pre-xmas.txt
-// npc: npc/xmas2007/after-xmas.txt
-
-// Easter 2008
-// npc: npc/easter2008/monsters.txt
-// npc: npc/easter2008/npc.txt
-
-// Halloween 2008
-// npc: npc/halloween/2008/monsters.txt
-// npc: npc/halloween/2008/prize_master.txt
+import: npc/scripts.conf
// local settings for this server in this file
import: conf/map_local.conf
diff --git a/conf/map_local.conf.example b/conf/map_local.conf.example
index 42e98bce..0f09bf59 100644
--- a/conf/map_local.conf.example
+++ b/conf/map_local.conf.example
@@ -13,14 +13,3 @@ char_port: 6122
map_ip:81.161.192.4
// Map Server Port
map_port: 5122
-
-// Database autosave time, in seconds.
-autosave_time: 60
-
-// Message of the day file, when a character logs on, this message is displayed.
-motd_txt: conf/motd.txt
-
-// When @help or @h is typed when you are a gm, this is displayed for helping new gms understand gm commands.
-help_txt: conf/help.txt
-
-mapreg_txt: save/mapreg.txt
diff --git a/data/new_3-1.wlk b/data/001-1.wlk
index 05b6c7aa..05b6c7aa 100644
--- a/data/new_3-1.wlk
+++ b/data/001-1.wlk
Binary files differ
diff --git a/data/new_8-1.wlk b/data/001-2.wlk
index 0a762e12..0a762e12 100644
--- a/data/new_8-1.wlk
+++ b/data/001-2.wlk
Binary files differ
diff --git a/data/new_6-1.wlk b/data/001-3.wlk
index 4a9cd117..4a9cd117 100644
--- a/data/new_6-1.wlk
+++ b/data/001-3.wlk
Binary files differ
diff --git a/data/new_1-1.wlk b/data/002-1.wlk
index 871a2267..3fe7589b 100644
--- a/data/new_1-1.wlk
+++ b/data/002-1.wlk
Binary files differ
diff --git a/data/new_2-1.wlk b/data/002-3.wlk
index 5abd252f..30854f47 100644
--- a/data/new_2-1.wlk
+++ b/data/002-3.wlk
Binary files differ
diff --git a/data/new_5-1.wlk b/data/002-4.wlk
index 2e2e7b75..a9d3449b 100644
--- a/data/new_5-1.wlk
+++ b/data/002-4.wlk
Binary files differ
diff --git a/data/new_15-1.wlk b/data/003-1.wlk
index 3ba9d269..49f98e3b 100644
--- a/data/new_15-1.wlk
+++ b/data/003-1.wlk
Binary files differ
diff --git a/data/new_34-1.wlk b/data/004-1.wlk
index 68d9c716..68d9c716 100644
--- a/data/new_34-1.wlk
+++ b/data/004-1.wlk
Binary files differ
diff --git a/data/new_7-1.wlk b/data/005-1.wlk
index fe816a52..fe816a52 100644
--- a/data/new_7-1.wlk
+++ b/data/005-1.wlk
Binary files differ
diff --git a/data/new_22-1.wlk b/data/005-3.wlk
index f3c047db..f3c047db 100644
--- a/data/new_22-1.wlk
+++ b/data/005-3.wlk
Binary files differ
diff --git a/data/new_24-1.wlk b/data/006-1.wlk
index 39bc32a1..49ddb542 100644
--- a/data/new_24-1.wlk
+++ b/data/006-1.wlk
Binary files differ
diff --git a/data/new_25-1.wlk b/data/006-3.wlk
index d635df84..d635df84 100644
--- a/data/new_25-1.wlk
+++ b/data/006-3.wlk
Binary files differ
diff --git a/data/new_16-1.wlk b/data/007-1.wlk
index 768cf1c4..cae67d2e 100644
--- a/data/new_16-1.wlk
+++ b/data/007-1.wlk
Binary files differ
diff --git a/data/new_18-1.wlk b/data/008-1.wlk
index b011a566..b011a566 100644
--- a/data/new_18-1.wlk
+++ b/data/008-1.wlk
Binary files differ
diff --git a/data/new_19-1.wlk b/data/009-1.wlk
index 51e508fa..32a3777c 100644
--- a/data/new_19-1.wlk
+++ b/data/009-1.wlk
Binary files differ
diff --git a/data/new_20-1.wlk b/data/009-2.wlk
index 596bb0e3..06d01de3 100644
--- a/data/new_20-1.wlk
+++ b/data/009-2.wlk
Binary files differ
diff --git a/data/new_35-1.wlk b/data/009-3.wlk
index 1336606f..1336606f 100644
--- a/data/new_35-1.wlk
+++ b/data/009-3.wlk
Binary files differ
diff --git a/data/new_14-1.wlk b/data/010-1.wlk
index 6311da10..33a7505f 100644
--- a/data/new_14-1.wlk
+++ b/data/010-1.wlk
Binary files differ
diff --git a/data/new_23-1.wlk b/data/010-2.wlk
index f2cfcd6c..94fb92cd 100644
--- a/data/new_23-1.wlk
+++ b/data/010-2.wlk
Binary files differ
diff --git a/data/new_9-1.wlk b/data/011-1.wlk
index 2fa117b4..2fa117b4 100644
--- a/data/new_9-1.wlk
+++ b/data/011-1.wlk
Binary files differ
diff --git a/data/new_4-1.wlk b/data/011-3.wlk
index a1e039c4..d85523c9 100644
--- a/data/new_4-1.wlk
+++ b/data/011-3.wlk
Binary files differ
diff --git a/data/new_17-1.wlk b/data/011-4.wlk
index 8796a8f4..edb29d59 100644
--- a/data/new_17-1.wlk
+++ b/data/011-4.wlk
Binary files differ
diff --git a/data/new_26-1.wlk b/data/012-1.wlk
index 79ad3078..c1b69913 100644
--- a/data/new_26-1.wlk
+++ b/data/012-1.wlk
Binary files differ
diff --git a/data/new_27-1.wlk b/data/012-3.wlk
index d485cd87..3d964065 100644
--- a/data/new_27-1.wlk
+++ b/data/012-3.wlk
Binary files differ
diff --git a/data/new_28-1.wlk b/data/013-1.wlk
index 2c925d89..f696920b 100644
--- a/data/new_28-1.wlk
+++ b/data/013-1.wlk
Binary files differ
diff --git a/data/new_36-1.wlk b/data/013-2.wlk
index c6c06b31..c536fec6 100644
--- a/data/new_36-1.wlk
+++ b/data/013-2.wlk
Binary files differ
diff --git a/data/013-3.wlk b/data/013-3.wlk
new file mode 100644
index 00000000..c9a3a1df
--- /dev/null
+++ b/data/013-3.wlk
Binary files differ
diff --git a/data/new_29-1.wlk b/data/014-1.wlk
index 34a98185..34a98185 100644
--- a/data/new_29-1.wlk
+++ b/data/014-1.wlk
Binary files differ
diff --git a/data/new_30-1.wlk b/data/014-3.wlk
index bcdaa8c5..f879ddba 100644
--- a/data/new_30-1.wlk
+++ b/data/014-3.wlk
Binary files differ
diff --git a/data/new_31-1.wlk b/data/015-1.wlk
index f3e7bbc9..f3e7bbc9 100644
--- a/data/new_31-1.wlk
+++ b/data/015-1.wlk
Binary files differ
diff --git a/data/new_32-1.wlk b/data/016-1.wlk
index 2d4f1bbf..2d4f1bbf 100644
--- a/data/new_32-1.wlk
+++ b/data/016-1.wlk
Binary files differ
diff --git a/data/new_33-1.wlk b/data/017-1.wlk
index 7632b813..e1468b16 100644
--- a/data/new_33-1.wlk
+++ b/data/017-1.wlk
Binary files differ
diff --git a/data/new_37-1.wlk b/data/018-1.wlk
index 7a62dc2e..8d1e57ec 100644
--- a/data/new_37-1.wlk
+++ b/data/018-1.wlk
Binary files differ
diff --git a/data/new_38-1.wlk b/data/018-2.wlk
index b80a18a8..522bb73d 100644
--- a/data/new_38-1.wlk
+++ b/data/018-2.wlk
Binary files differ
diff --git a/data/018-3.wlk b/data/018-3.wlk
new file mode 100644
index 00000000..f61f75fe
--- /dev/null
+++ b/data/018-3.wlk
Binary files differ
diff --git a/data/new_10-1.wlk b/data/019-1.wlk
index 9ac1927c..9e82af57 100644
--- a/data/new_10-1.wlk
+++ b/data/019-1.wlk
Binary files differ
diff --git a/data/new_11-1.wlk b/data/020-1.wlk
index f3119594..ce86eb9a 100644
--- a/data/new_11-1.wlk
+++ b/data/020-1.wlk
Binary files differ
diff --git a/data/new_13-1.wlk b/data/020-2.wlk
index b51db172..b51db172 100644
--- a/data/new_13-1.wlk
+++ b/data/020-2.wlk
Binary files differ
diff --git a/data/new_12-1.wlk b/data/020-3.wlk
index 7b7f6c25..49f8a6bc 100644
--- a/data/new_12-1.wlk
+++ b/data/020-3.wlk
Binary files differ
diff --git a/data/new_21-1.wlk b/data/020-4.wlk
index e2a1852c..e2a1852c 100644
--- a/data/new_21-1.wlk
+++ b/data/020-4.wlk
Binary files differ
diff --git a/data/resnametable.txt b/data/resnametable.txt
index 7b4ae334..9a330350 100644
--- a/data/resnametable.txt
+++ b/data/resnametable.txt
@@ -1,39 +1,41 @@
-new_1-1.gat#new_1-1.wlk#
-new_2-1.gat#new_2-1.wlk#
-new_3-1.gat#new_3-1.wlk#
-new_4-1.gat#new_4-1.wlk#
-new_5-1.gat#new_5-1.wlk#
-new_6-1.gat#new_6-1.wlk#
-new_7-1.gat#new_7-1.wlk#
-new_8-1.gat#new_8-1.wlk#
-new_9-1.gat#new_9-1.wlk#
-new_10-1.gat#new_10-1.wlk#
-new_11-1.gat#new_11-1.wlk#
-new_12-1.gat#new_12-1.wlk#
-new_13-1.gat#new_13-1.wlk#
-new_14-1.gat#new_14-1.wlk#
-new_15-1.gat#new_15-1.wlk#
-new_16-1.gat#new_16-1.wlk#
-new_17-1.gat#new_17-1.wlk#
-new_18-1.gat#new_18-1.wlk#
-new_19-1.gat#new_19-1.wlk#
-new_20-1.gat#new_20-1.wlk#
-new_21-1.gat#new_21-1.wlk#
-new_22-1.gat#new_22-1.wlk#
-new_23-1.gat#new_23-1.wlk#
-new_24-1.gat#new_24-1.wlk#
-new_25-1.gat#new_25-1.wlk#
-new_26-1.gat#new_26-1.wlk#
-new_27-1.gat#new_27-1.wlk#
-new_28-1.gat#new_28-1.wlk#
-new_29-1.gat#new_29-1.wlk#
-new_30-1.gat#new_30-1.wlk#
-new_31-1.gat#new_31-1.wlk#
-new_32-1.gat#new_32-1.wlk#
-new_33-1.gat#new_33-1.wlk#
-new_34-1.gat#new_34-1.wlk#
-new_35-1.gat#new_35-1.wlk#
-new_36-1.gat#new_36-1.wlk#
-new_37-1.gat#new_37-1.wlk#
-new_38-1.gat#new_38-1.wlk#
-new_39-1.gat#new_39-1.wlk#
+001-1.gat#001-1.wlk#
+001-2.gat#001-2.wlk#
+001-3.gat#001-3.wlk#
+002-1.gat#002-1.wlk#
+002-2.gat#002-2.wlk#
+002-3.gat#002-3.wlk#
+002-4.gat#002-4.wlk#
+003-1.gat#003-1.wlk#
+004-1.gat#004-1.wlk#
+005-1.gat#005-1.wlk#
+005-3.gat#005-3.wlk#
+006-1.gat#006-1.wlk#
+006-3.gat#006-3.wlk#
+007-1.gat#007-1.wlk#
+008-1.gat#008-1.wlk#
+009-1.gat#009-1.wlk#
+009-2.gat#009-2.wlk#
+009-3.gat#009-3.wlk#
+010-1.gat#010-1.wlk#
+010-2.gat#010-2.wlk#
+011-1.gat#011-1.wlk#
+011-3.gat#011-3.wlk#
+011-4.gat#011-4.wlk#
+012-1.gat#012-1.wlk#
+012-3.gat#012-3.wlk#
+013-1.gat#013-1.wlk#
+013-2.gat#013-2.wlk#
+013-3.gat#013-3.wlk#
+014-1.gat#014-1.wlk#
+014-3.gat#014-3.wlk#
+015-1.gat#015-1.wlk#
+016-1.gat#016-1.wlk#
+017-1.gat#017-1.wlk#
+018-1.gat#018-1.wlk#
+018-2.gat#018-2.wlk#
+018-3.gat#018-3.wlk#
+019-1.gat#019-1.wlk#
+020-1.gat#020-1.wlk#
+020-2.gat#020-2.wlk#
+020-3.gat#020-3.wlk#
+020-4.gat#020-4.wlk#
diff --git a/db/mob_db.txt b/db/mob_db.txt
index 849dc878..cec627e2 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -35,5 +35,5 @@
1031, GambogePlant, Gamboge Plant, 1, 1, 0, 1, 1, 1, 0, 0, 100, 100, 0, 0, 0, 0, 0, 0, 1, 1, 1, 3, 22, 0, 800, 800, 672, 480, 682, 3000, 682, 3000, 682, 3000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , ,
1032, AlizarinPlant, Alizarin Plant, 1, 1, 0, 1, 1, 1, 0, 0, 100, 100, 0, 0, 0, 0, 0, 0, 1, 1, 1, 3, 22, 0, 800, 800, 672, 480, 683, 3000, 683, 3000, 683, 3000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , ,
1033, SeaSlime, Sea Slime, 70, 600, 0, 90, 9, 1, 30, 40, 3, 7, 1, 25, 1, 0, 30, 30, 1, 1, 1, 0, 41, 131, 1500, 1872, 672, 480, 535, 800, 657, 800, 518, 500, 510, 1000, 700, 100, 1199, 5000, 568, 100, 541, 50, 0, 0, 0, 0, , , , , ,
-1034, GrassSnake, Grass Snake, 150, 1000, 0, 700, 100, 1, 80, 120, 2, 10, 20, 40, 10, 10, 40, 50, 1, 1, 1, 0, 20, 133, 500, 1100, 672, 480, 716, 400, 716, 400, 712, 500, 676, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , ,
+1034, GrassSnake, Grass Snake, 150, 1000, 0, 700, 100, 1, 80, 120, 2, 10, 20, 40, 10, 10, 40, 50, 1, 1, 1, 0, 20, 133, 500, 1100, 672, 480, 716, 400, 716, 400, 712, 500, 676, 500, 660, 350, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , ,
1035, Silkworm, Silkworm, 20, 1, 0, 1, 1, 1, 0, 0, 2, 10, 20, 11, 10, 10, 40, 10, 1, 1, 1, 0, 20, 129, 1300, 1100, 672, 480, 718, 5000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , ,
diff --git a/npc/001-1_Tulimshar/_import.txt b/npc/001-1_Tulimshar/_import.txt
new file mode 100644
index 00000000..31adafe1
--- /dev/null
+++ b/npc/001-1_Tulimshar/_import.txt
@@ -0,0 +1,22 @@
+map: 001-1.gat
+npc: npc/001-1_Tulimshar/_mobs.txt
+npc: npc/001-1_Tulimshar/_warps.txt
+npc: npc/001-1_Tulimshar/banker.txt
+npc: npc/001-1_Tulimshar/barber.txt
+npc: npc/001-1_Tulimshar/bard.txt
+npc: npc/001-1_Tulimshar/bleacher.txt
+npc: npc/001-1_Tulimshar/children.txt
+npc: npc/001-1_Tulimshar/constable.txt
+npc: npc/001-1_Tulimshar/elanore.txt
+npc: npc/001-1_Tulimshar/guards.txt
+npc: npc/001-1_Tulimshar/guide.txt
+npc: npc/001-1_Tulimshar/man.txt
+npc: npc/001-1_Tulimshar/merchant.txt
+npc: npc/001-1_Tulimshar/monster_guide.txt
+npc: npc/001-1_Tulimshar/monsters.txt
+npc: npc/001-1_Tulimshar/rewards_master.txt
+npc: npc/001-1_Tulimshar/rules.txt
+npc: npc/001-1_Tulimshar/sandra.txt
+npc: npc/001-1_Tulimshar/soul-menhir.txt
+npc: npc/001-1_Tulimshar/vincent.txt
+npc: npc/001-1_Tulimshar/workers.txt
diff --git a/npc/001-1_Tulimshar/_mobs.txt b/npc/001-1_Tulimshar/_mobs.txt
new file mode 100644
index 00000000..db1ae2e8
--- /dev/null
+++ b/npc/001-1_Tulimshar/_mobs.txt
@@ -0,0 +1,7 @@
+// 001-1 Tulimshar mobs
+
+
+
+001-1.gat,0,0,0 script Mob001-1 -1,{
+ end;
+}
diff --git a/npc/001-1_Tulimshar/_warps.txt b/npc/001-1_Tulimshar/_warps.txt
new file mode 100644
index 00000000..7e8af69d
--- /dev/null
+++ b/npc/001-1_Tulimshar/_warps.txt
@@ -0,0 +1,5 @@
+// 001-1 Tulimshar warps
+
+001-1.gat,44,88 warp ToSandstorm 3,-1,002-1.gat,58,17
+001-1.gat,32,71 warp ToInn -1,-1,001-2.gat,25,34
+001-1.gat,75,41 warp ToHouse -1,-1,001-2.gat,71,72
diff --git a/npc/new_3-1-tulimshar/banker.txt b/npc/001-1_Tulimshar/banker.txt
index 9431f5cc..f94ea304 100644
--- a/npc/new_3-1-tulimshar/banker.txt
+++ b/npc/001-1_Tulimshar/banker.txt
@@ -1,4 +1,4 @@
-new_3-1.gat,57,52,0 script Tybalt 107,{
+001-1.gat,57,52,0 script Tybalt 107,{
set @npcName$, "Tybalt";
callfunc "Banker";
}
diff --git a/npc/new_3-1-tulimshar/barber.txt b/npc/001-1_Tulimshar/barber.txt
index bd6b148e..502e5401 100644
--- a/npc/new_3-1-tulimshar/barber.txt
+++ b/npc/001-1_Tulimshar/barber.txt
@@ -1,4 +1,6 @@
-new_3-1.gat,53,38,0 script Nicolas 100,{
+//
+
+001-1.gat,53,38,0 script Nicolas 100,{
mes "[Nicolas the Barber]";
mes "\"Do you need a barber?\"";
next;
diff --git a/npc/new_3-1-tulimshar/bard.txt b/npc/001-1_Tulimshar/bard.txt
index dcb56424..8d53fc72 100644
--- a/npc/new_3-1-tulimshar/bard.txt
+++ b/npc/001-1_Tulimshar/bard.txt
@@ -1,6 +1,6 @@
//
-new_3-1.gat,50,44,0 script Bard 152,{
+001-1.gat,50,44,0 script Bard 152,{
setarray @songs$, "\"There once was a bard, who had it hard, because a man in dark green, was very mean.\"",
"\"At Hurnscald inn, there was a person of fairest skin, declining wedding bands from quite a many hands.\"",
"\"As the Sun sets down in the forest's brown, she whom the fragrance holds counts her gold.\"";
diff --git a/npc/001-1_Tulimshar/bleacher.txt b/npc/001-1_Tulimshar/bleacher.txt
new file mode 100644
index 00000000..48b5c6c6
--- /dev/null
+++ b/npc/001-1_Tulimshar/bleacher.txt
@@ -0,0 +1,140 @@
+//
+
+001-1.gat,27,53,0 script Candide 156,{
+ mes "[Candide]";
+ mes "\"I've figured out how that volcanic ash bleaches cloth.";
+ mes "I could do it for you, but I'll need three piles of ash and 5,000 GP for supplies per item.\"";
+ next;
+
+ if (countitem(701) < 3) goto L_no_ash;
+
+ if (zeny < 5000) goto L_no_money;
+
+ menu "I'd like to bleach something", -,
+ "No thanks", L_close;
+
+L_bleach_menu:
+ mes "[Candide]";
+ mes "\"What would you like to bleach?\"";
+ next;
+
+ menu
+ "Cotton shirt", L_cottonshirt,
+ "V-Neck sweater", L_vneck,
+ "Turtleneck sweater", L_tneck,
+ "Cotton shorts", L_shorts,
+ "Cotton skirt", L_skirt,
+ "Tank top ", L_tanktop,
+ "Short tank top", L_tanktop_short,
+ "Silk robe", L_robe,
+ "Cotton headband", L_cotton_headband,
+ "Desert hat", L_desert_hat,
+ "Nevermind", -;
+ goto L_close;
+
+L_cottonshirt: set @normal, 1202;
+ set @dyeBase, 2050;
+ goto L_choose_color;
+
+L_vneck: set @normal, 624;
+ set @dyeBase, 2060;
+ goto L_choose_color;
+
+L_tneck: set @normal, 564;
+ set @dyeBase, 2070;
+ goto L_choose_color;
+
+L_shorts: set @normal, 586;
+ set @dyeBase, 2110;
+ goto L_choose_color;
+
+L_skirt: set @normal, 632;
+ set @dyeBase, 2100;
+ goto L_choose_color;
+
+L_tanktop: set @normal, 688;
+ set @dyeBase, 2090;
+ goto L_choose_color;
+
+L_tanktop_short: set @normal, 689;
+ set @dyeBase, 2120;
+ goto L_choose_color;
+
+L_robe:
+ set @normal, 720;
+ set @dyeBase, 2080;
+ goto L_choose_color;
+
+L_cotton_headband:
+ set @normal, 724;
+ set @dyeBase, 2140;
+ goto L_choose_color;
+
+L_desert_hat:
+ set @normal, 723;
+ set @dyeBase, 2130;
+ goto L_choose_color;
+
+L_choose_color:
+ mes "[Candide]";
+ mes "\"And the color?\"";
+ next;
+
+ menu "Red", -,
+ "Green", -,
+ "Dark Blue", -,
+ "Yellow", -,
+ "Light Blue", -,
+ "Pink", -,
+ "Black", -,
+ "Orange", -,
+ "Purple", -,
+ "Dark Green", -;
+
+ set @del, @dyeBase + @menu - 1;
+
+ if (countitem(@del) == 0) goto L_no_item;
+
+ if (countitem(701) < 3) goto L_no_ash;
+
+ if (zeny < 5000) goto L_no_money;
+
+ delitem @del, 1;
+ getitem @normal, 1;
+ delitem 701, 3;
+ set zeny, zeny - 5000;
+
+L_again:
+ mes "[Candide]";
+ mes "\"Would you like to bleach something else?\"";
+ next;
+
+ menu "Yes", L_bleach_menu,
+ "No", L_close;
+
+L_no_item:
+ mes "[Candide]";
+ mes "\"You don't have one of those.\"";
+ next;
+
+ goto L_again;
+
+L_no_ash:
+ mes "[Candide]";
+ mes "\"You don't have enough ash for me to bleach anything.";
+ mes "I need three piles.\"";
+ next;
+
+ goto L_close;
+
+L_no_money:
+ mes "[Candide]";
+ mes "\"You don't have enough gold for me to bleach anything.";
+ mes "I need 5,000 GP for supplies.\"";
+ next;
+
+L_close:
+ mes "[Candide]";
+ mes "\"Come again.\"";
+ close;
+}
diff --git a/npc/new_3-1-tulimshar/children.txt b/npc/001-1_Tulimshar/children.txt
index 40efb233..e68cfe95 100644
--- a/npc/new_3-1-tulimshar/children.txt
+++ b/npc/001-1_Tulimshar/children.txt
@@ -1,4 +1,6 @@
-new_3-1.gat,94,27,0 script Aisha 108,{
+//
+
+001-1.gat,94,27,0 script Aisha 108,{
set @TEMP,rand(9);
if(@TEMP == 0) goto L_1;
if(@TEMP == 1) goto L_1;
@@ -51,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/new_3-1-tulimshar/constable.txt b/npc/001-1_Tulimshar/constable.txt
index 673ff0a0..c07889c6 100644
--- a/npc/new_3-1-tulimshar/constable.txt
+++ b/npc/001-1_Tulimshar/constable.txt
@@ -1,6 +1,6 @@
//
-new_3-1.gat,37,35,0 script Constable Perry Graf 150,{
+001-1.gat,37,35,0 script Constable Perry Graf 150,{
// set @npcName$, "Constable Perry Graf";
set @canSkip, 1;
callfunc "GameRules";
diff --git a/npc/new_3-1-tulimshar/elanore.txt b/npc/001-1_Tulimshar/elanore.txt
index cc474ca0..4171e54f 100644
--- a/npc/new_3-1-tulimshar/elanore.txt
+++ b/npc/001-1_Tulimshar/elanore.txt
@@ -1,6 +1,6 @@
-//Heal NPC costs 100 money
+//
-new_3-1.gat,58,68,0 script Elanore 108,{
+001-1.gat,58,68,0 script Elanore 108,{
if (baselevel > 10) goto L_NoHeal;
diff --git a/npc/new_3-1-tulimshar/guards.txt b/npc/001-1_Tulimshar/guards.txt
index 158a00a1..366f4475 100644
--- a/npc/new_3-1-tulimshar/guards.txt
+++ b/npc/001-1_Tulimshar/guards.txt
@@ -1,4 +1,6 @@
-new_3-1.gat,48,79,0 script Ekinu 104,{
+//
+
+001-1.gat,48,79,0 script Ekinu 104,{
mes "[Ekinu the Town Guard]";
mes "\"What a disaster... I can't believe that we managed to rebuild the town so fast, though.\"";
next;
@@ -63,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/new_3-1-tulimshar/guide.txt b/npc/001-1_Tulimshar/guide.txt
index b1458919..1efc79fe 100644
--- a/npc/new_3-1-tulimshar/guide.txt
+++ b/npc/001-1_Tulimshar/guide.txt
@@ -1,4 +1,6 @@
-new_3-1.gat,33,27,0 script Ian 102,{
+//
+
+001-1.gat,33,27,0 script Ian 102,{
if (TUT_var & 1 == 1 && TUT_var & 2 == 0 && BaseLevel >= 10) callsub S_Grad;
mes "[Ian the Guide]";
mes "\"Would you like to know about something?\"";
diff --git a/npc/new_3-1-tulimshar/man.txt b/npc/001-1_Tulimshar/man.txt
index f2638a51..804acf8e 100644
--- a/npc/new_3-1-tulimshar/man.txt
+++ b/npc/001-1_Tulimshar/man.txt
@@ -1,4 +1,6 @@
-new_3-1.gat,108,55,0 script Luca 102,{
+//
+
+001-1.gat,108,55,0 script Luca 102,{
mes "[Luca the Hunter]";
mes "\"Ouch! It hurts, this wound I got from battle.\"";
next;
diff --git a/npc/001-1_Tulimshar/merchant.txt b/npc/001-1_Tulimshar/merchant.txt
new file mode 100644
index 00000000..cd7ecd02
--- /dev/null
+++ b/npc/001-1_Tulimshar/merchant.txt
@@ -0,0 +1,3 @@
+//
+
+001-1.gat,39,52,0 shop Neko 101,501:50,502:60,1201:100,522:300,521:1000,656:250,1202:1000,523:8000,603:-1,724:3000
diff --git a/npc/new_3-1-tulimshar/monster_guide.txt b/npc/001-1_Tulimshar/monster_guide.txt
index 3b2d8b6f..23392b2d 100644
--- a/npc/new_3-1-tulimshar/monster_guide.txt
+++ b/npc/001-1_Tulimshar/monster_guide.txt
@@ -1,4 +1,6 @@
-new_3-1.gat,48,52,0 script Aidan 102,{
+//
+
+001-1.gat,48,52,0 script Aidan 102,{
if(MPQUEST == 0) goto Register;
mes "[Aidan the Monster Guide]";
mes "You currently have " +Mobpt+ " Monster Points. These points are acquired while killing monsters";
diff --git a/npc/new_3-1-tulimshar/monsters.txt b/npc/001-1_Tulimshar/monsters.txt
index 1a17628f..e5e19a0d 100644
--- a/npc/new_3-1-tulimshar/monsters.txt
+++ b/npc/001-1_Tulimshar/monsters.txt
@@ -1,12 +1,12 @@
-// Map: new_3-1
+// Map: 001-1
// This is Tulimshar the city -- southern part with market and casino/inn.
//
-new_3-1.gat,0,0,0,0 monster Maggot 1002,35,2000,0,Mob3::OnMaggot
-new_3-1.gat,0,0,0,0 monster Scorpion 1003,25,2500,0,Mob3::OnScorpion
-new_3-1.gat,0,0,0,0 monster Firegoblin 1011,20,2500,0,Mob3::OnFireGoblin
+001-1.gat,0,0,0,0 monster Maggot 1002,35,2000,0,Mob3::OnMaggot
+001-1.gat,0,0,0,0 monster Scorpion 1003,25,2500,0,Mob3::OnScorpion
+001-1.gat,0,0,0,0 monster Firegoblin 1011,20,2500,0,Mob3::OnFireGoblin
-new_3-1.gat,0,0,0 script Mob3 -1,{
+001-1.gat,0,0,0 script Mob3 -1,{
OnMaggot:
set @mobID, 1002;
callfunc "MobPoints";
diff --git a/npc/new_3-1-tulimshar/rewards_master.txt b/npc/001-1_Tulimshar/rewards_master.txt
index 9c0ddb43..657b82f4 100644
--- a/npc/new_3-1-tulimshar/rewards_master.txt
+++ b/npc/001-1_Tulimshar/rewards_master.txt
@@ -1,4 +1,6 @@
-new_3-1.gat,50,53,0 script Ishi 106,{
+//
+
+001-1.gat,50,53,0 script Ishi 106,{
if (MPQUEST == 0) goto L_Register;
if (tvis == 0) set tvis, 1;
if (Mobpt < tvis) goto L_NotEnough;
diff --git a/npc/new_3-1-tulimshar/rules.txt b/npc/001-1_Tulimshar/rules.txt
index 70917804..a67eeb14 100644
--- a/npc/new_3-1-tulimshar/rules.txt
+++ b/npc/001-1_Tulimshar/rules.txt
@@ -1,6 +1,6 @@
//
-new_3-1.gat,29,28,0 script #Rules 127,1,1,{
+001-1.gat,29,28,0 script #Rules 127,1,1,{
if (TUT_var & 1 == 1) close;
callfunc "GameRules";
mes "Ian, the trainer, can help you get to know the game.";
diff --git a/npc/new_3-1-tulimshar/sandra.txt b/npc/001-1_Tulimshar/sandra.txt
index 4922bd60..eb1ebdf0 100644
--- a/npc/new_3-1-tulimshar/sandra.txt
+++ b/npc/001-1_Tulimshar/sandra.txt
@@ -1,4 +1,6 @@
-new_3-1.gat,110,71,0 script Sandra 114,{
+//
+
+001-1.gat,110,71,0 script Sandra 114,{
if(Scorp == 2) goto done;
if(Scorp == 1) goto reas;
set @TEMP,rand(3);
diff --git a/npc/001-1_Tulimshar/soul-menhir.txt b/npc/001-1_Tulimshar/soul-menhir.txt
new file mode 100644
index 00000000..45c5dfea
--- /dev/null
+++ b/npc/001-1_Tulimshar/soul-menhir.txt
@@ -0,0 +1,8 @@
+//
+
+001-1.gat,38,69,0 script Soul Menhir 144, {
+ set @map$, "001-1.gat";
+ set @x, 38;
+ set @y, 70;
+ callfunc "SoulMenhir";
+}
diff --git a/npc/new_3-1-tulimshar/vincent.txt b/npc/001-1_Tulimshar/vincent.txt
index 4e2a0926..ef17ba18 100644
--- a/npc/new_3-1-tulimshar/vincent.txt
+++ b/npc/001-1_Tulimshar/vincent.txt
@@ -1,4 +1,6 @@
-new_3-1.gat,135,42,0 script Vincent 113,{
+//
+
+001-1.gat,135,42,0 script Vincent 113,{
if(Bugleg == 1) goto L_Reas;
if(Bugleg == 2) goto L_Done;
set @TEMP, rand(4);
diff --git a/npc/new_3-1-tulimshar/workers.txt b/npc/001-1_Tulimshar/workers.txt
index 31c6afa3..43ee9795 100644
--- a/npc/new_3-1-tulimshar/workers.txt
+++ b/npc/001-1_Tulimshar/workers.txt
@@ -1,12 +1,12 @@
//
-new_3-1.gat,45,21,0 script Construction Worker 155,{
+001-1.gat,45,21,0 script Construction Worker 155,{
mes "[Construction worker]";
mes "\"I can't let you beyond this gate. The area is closed for renovation; most of it was destroyed during the earthquake.\"";
close;
}
-new_3-1.gat,124,21,0 script Construction Worker 155,{
+001-1.gat,124,21,0 script Construction Worker 155,{
mes "[Construction worker]";
mes "\"Move along.\"";
close;
diff --git a/npc/001-2_Tulimshar/_import.txt b/npc/001-2_Tulimshar/_import.txt
new file mode 100644
index 00000000..99123cba
--- /dev/null
+++ b/npc/001-2_Tulimshar/_import.txt
@@ -0,0 +1,8 @@
+map: 001-2.gat
+npc: npc/001-2_Tulimshar/_mobs.txt
+npc: npc/001-2_Tulimshar/_warps.txt
+npc: npc/001-2_Tulimshar/casino.txt
+npc: npc/001-2_Tulimshar/omar.txt
+npc: npc/001-2_Tulimshar/phaet.txt
+npc: npc/001-2_Tulimshar/shops.txt
+npc: npc/001-2_Tulimshar/troupe_leader.txt
diff --git a/npc/001-2_Tulimshar/_mobs.txt b/npc/001-2_Tulimshar/_mobs.txt
new file mode 100644
index 00000000..afe32cd5
--- /dev/null
+++ b/npc/001-2_Tulimshar/_mobs.txt
@@ -0,0 +1,7 @@
+// 001-2 Tulimshar mobs
+
+
+
+001-2.gat,0,0,0 script Mob001-2 -1,{
+ end;
+}
diff --git a/npc/001-2_Tulimshar/_warps.txt b/npc/001-2_Tulimshar/_warps.txt
new file mode 100644
index 00000000..87d2254d
--- /dev/null
+++ b/npc/001-2_Tulimshar/_warps.txt
@@ -0,0 +1,13 @@
+// 001-2 Tulimshar warps
+
+001-2.gat,25,35 warp ToOutside -1,-1,001-1.gat,32,72
+001-2.gat,23,24 warp ToArena -1,0,001-3.gat,72,31
+001-2.gat,44,25 warp To2ndFloor -1,0,001-2.gat,65,25
+001-2.gat,64,25 warp To1stFloor -1,-1,001-2.gat,42,25
+001-2.gat,67,30 warp ToBedroom -1,-1,001-2.gat,102,23
+001-2.gat,76,30 warp ToDeposit -1,-1,001-2.gat,130,23
+001-2.gat,69,22 warp ToCasino 0,-1,001-2.gat,32,72
+001-2.gat,103,22 warp To2ndFloor 0,-1,001-2.gat,67,29
+001-2.gat,131,22 warp To2ndFloor 0,-1,001-2.gat,76,29
+001-2.gat,32,73 warp To2ndFloor -1,-1,001-2.gat,68,23
+001-2.gat,71,73 warp ToOutdoor -1,-1,001-1.gat,75,42
diff --git a/npc/new_8-1-tulimshar/casino.txt b/npc/001-2_Tulimshar/casino.txt
index 58f99ea5..b5da3933 100644
--- a/npc/new_8-1-tulimshar/casino.txt
+++ b/npc/001-2_Tulimshar/casino.txt
@@ -1,26 +1,26 @@
//
-new_8-1.gat,134,23,0 script Valdo 117,{
+001-2.gat,134,23,0 script Valdo 117,{
mes "[Valdo the Worker]";
mes "\"Please let me work, I'm really in a hurry!\"";
close;
}
-new_8-1.gat,37,65,0 script Slot1 127,{
+001-2.gat,37,65,0 script Slot1 127,{
callfunc "SlotMachine";
}
-new_8-1.gat,39,65,0 script Slot2 127,{
+001-2.gat,39,65,0 script Slot2 127,{
callfunc "SlotMachine";
}
-new_8-1.gat,41,65,0 script Slot3 127,{
+001-2.gat,41,65,0 script Slot3 127,{
callfunc "SlotMachine";
}
-new_8-1.gat,32,67,0 shop MoneyChanger 124,503:10
+001-2.gat,32,67,0 shop MoneyChanger 124,503:10
-new_8-1.gat,28,63,0 script BlackJack 107,{
+001-2.gat,28,63,0 script BlackJack 107,{
mes "[Croupier]";
mes "\"Would you like to play Black Jack?";
mes "You will need 15 casino coins.\"";
@@ -93,7 +93,7 @@ L_Ace:
}
-new_8-1.gat,22,69,0 script Roulette 107,{
+001-2.gat,22,69,0 script Roulette 107,{
mes "\"Good evening monsieur...";
mes "How much would you like to bet?\"";
next;
diff --git a/npc/new_8-1-tulimshar/omar.txt b/npc/001-2_Tulimshar/omar.txt
index 25865e5f..009e7b5d 100644
--- a/npc/new_8-1-tulimshar/omar.txt
+++ b/npc/001-2_Tulimshar/omar.txt
@@ -1,6 +1,6 @@
//
-new_8-1.gat,70,60,0 script Omar 162,{
+001-2.gat,70,60,0 script Omar 162,{
mes "[Omar]";
mes "\"Welcome to my humble abode.\"";
}
diff --git a/npc/new_8-1-tulimshar/phaet.txt b/npc/001-2_Tulimshar/phaet.txt
index 4cc13e9a..e495d93d 100644
--- a/npc/new_8-1-tulimshar/phaet.txt
+++ b/npc/001-2_Tulimshar/phaet.txt
@@ -1,6 +1,6 @@
//
-new_8-1.gat,24,23,0 script Phaet 125,{
+001-2.gat,24,23,0 script Phaet 125,{
mes "[Phaet the Royal Guard]";
mes "\"Hey, you seem tough enough! Would you like to prove your skills? I'll let you in the arena if you give me 50 gp. You can fight against other players there.\"";
next;
@@ -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-2_Tulimshar/shops.txt b/npc/001-2_Tulimshar/shops.txt
new file mode 100644
index 00000000..479969cd
--- /dev/null
+++ b/npc/001-2_Tulimshar/shops.txt
@@ -0,0 +1,9 @@
+//
+
+001-2.gat,26,26,0 shop InnKeeper 112,539:175,513:20,519
+
+001-2.gat,103,26,0 script Rebecca 118,{
+ set @npcName$, "Rebecca the Inn Keeper";
+ set @cost, 100;
+ callfunc "Inn";
+}
diff --git a/npc/new_8-1-tulimshar/troupe_leader.txt b/npc/001-2_Tulimshar/troupe_leader.txt
index a602b1d2..1114de56 100644
--- a/npc/new_8-1-tulimshar/troupe_leader.txt
+++ b/npc/001-2_Tulimshar/troupe_leader.txt
@@ -1,6 +1,6 @@
//
-new_8-1.gat,34,25,0 script Troupe Leader 165,{
+001-2.gat,34,25,0 script Troupe Leader 165,{
if (Inspector == 4) goto L_NohMask_Troupe;
if (Inspector == 13) goto L_NohMask_Found;
diff --git a/npc/001-3_Tulimshar_arena/_import.txt b/npc/001-3_Tulimshar_arena/_import.txt
new file mode 100644
index 00000000..a6824625
--- /dev/null
+++ b/npc/001-3_Tulimshar_arena/_import.txt
@@ -0,0 +1,6 @@
+map: 001-3.gat
+npc: npc/001-3_Tulimshar_arena/_mobs.txt
+npc: npc/001-3_Tulimshar_arena/_warps.txt
+npc: npc/001-3_Tulimshar_arena/guards.txt
+npc: npc/001-3_Tulimshar_arena/monsters.txt
+npc: npc/001-3_Tulimshar_arena/pvpflag.txt
diff --git a/npc/001-3_Tulimshar_arena/_mobs.txt b/npc/001-3_Tulimshar_arena/_mobs.txt
new file mode 100644
index 00000000..493a64ad
--- /dev/null
+++ b/npc/001-3_Tulimshar_arena/_mobs.txt
@@ -0,0 +1,7 @@
+// 001-3 Tulimshar arena mobs
+
+
+
+001-3.gat,0,0,0 script Mob001-3 -1,{
+ end;
+}
diff --git a/npc/001-3_Tulimshar_arena/_warps.txt b/npc/001-3_Tulimshar_arena/_warps.txt
new file mode 100644
index 00000000..bd8cd0d1
--- /dev/null
+++ b/npc/001-3_Tulimshar_arena/_warps.txt
@@ -0,0 +1,3 @@
+// 001-3 Tulimshar arena warps
+
+001-3.gat,72,29 warp ToInn 1,-1,001-2.gat,24,23
diff --git a/npc/new_6-1-arena/guards.txt b/npc/001-3_Tulimshar_arena/guards.txt
index 065ed765..5b42ca4f 100644
--- a/npc/new_6-1-arena/guards.txt
+++ b/npc/001-3_Tulimshar_arena/guards.txt
@@ -1,6 +1,6 @@
//
-new_6-1.gat,77,37,0 script Phaet 125,{
+001-3.gat,77,37,0 script Phaet 125,{
mes "[Phaet the Royal Guard]";
mes "\"Do you want to go back?\"";
next;
@@ -16,11 +16,11 @@ L_Sure:
mes "\"Ok.\"";
next;
- warp "new_8-1.gat", 25, 23;
+ warp "001-2.gat", 25, 23;
close;
}
-new_6-1.gat,69,37,0 script Aradin 126,{
+001-3.gat,69,37,0 script Aradin 126,{
mes "[Aradin the Royal Guard]";
mes "\"Don't touch me...";
mes "You wouldn't enjoy the consequences.\"";
diff --git a/npc/new_6-1-arena/monsters.txt b/npc/001-3_Tulimshar_arena/monsters.txt
index 51d72132..04e6b11d 100644
--- a/npc/new_6-1-arena/monsters.txt
+++ b/npc/001-3_Tulimshar_arena/monsters.txt
@@ -1,10 +1,10 @@
-// Map: new_6-1
+// Map: 001-3
// This is the Tulimshar Arena -- below Tulimshar.
//
-new_6-1.gat,0,0,0,0 monster Maggot 1002,10,0,0,Mob6::OnMaggot
+001-3.gat,0,0,0,0 monster Maggot 1002,10,0,0,Mob6::OnMaggot
-new_6-1.gat,0,0,0 script Mob6 -1,{
+001-3.gat,0,0,0 script Mob6 -1,{
OnMaggot:
set @mobID, 1002;
callfunc "MobPoints";
diff --git a/npc/001-3_Tulimshar_arena/pvpflag.txt b/npc/001-3_Tulimshar_arena/pvpflag.txt
new file mode 100644
index 00000000..73b6e556
--- /dev/null
+++ b/npc/001-3_Tulimshar_arena/pvpflag.txt
@@ -0,0 +1 @@
+001-3.gat mapflag pvp
diff --git a/npc/002-1_Sandstorm/_import.txt b/npc/002-1_Sandstorm/_import.txt
new file mode 100644
index 00000000..14adaccf
--- /dev/null
+++ b/npc/002-1_Sandstorm/_import.txt
@@ -0,0 +1,8 @@
+map: 002-1.gat
+npc: npc/002-1_Sandstorm/_mobs.txt
+npc: npc/002-1_Sandstorm/_warps.txt
+npc: npc/002-1_Sandstorm/dark_mage.txt
+npc: npc/002-1_Sandstorm/merchant.txt
+npc: npc/002-1_Sandstorm/monsters.txt
+npc: npc/002-1_Sandstorm/nomads.txt
+npc: npc/002-1_Sandstorm/rogue.txt
diff --git a/npc/002-1_Sandstorm/_mobs.txt b/npc/002-1_Sandstorm/_mobs.txt
new file mode 100644
index 00000000..2ef2a902
--- /dev/null
+++ b/npc/002-1_Sandstorm/_mobs.txt
@@ -0,0 +1,13 @@
+// 002-1 Sandstorm mobs
+
+002-1.gat,0,0,0,0 monster Maggot 1002,20,1000,500,Mob002-1::On1002
+
+
+002-1.gat,0,0,0 script Mob002-1 -1,{
+On1002:
+ set @mobID, 1002;
+ callfunc "MobPoints";
+ break;
+
+ end;
+}
diff --git a/npc/002-1_Sandstorm/_warps.txt b/npc/002-1_Sandstorm/_warps.txt
new file mode 100644
index 00000000..5153e83b
--- /dev/null
+++ b/npc/002-1_Sandstorm/_warps.txt
@@ -0,0 +1,7 @@
+// 002-1 Sandstorm warps
+
+002-1.gat,58,12 warp ToTulimshar 3,-1,001-1.gat,44,80
+002-1.gat,108,79 warp ToEasternDesert -1,1,005-1.gat,23,40
+002-1.gat,12,66 warp ToWesternDesert -1,3,003-1.gat,168,76
+002-1.gat,28,13 warp ToBeach 1,-1,004-1.gat,84,111
+002-1.gat,20,94 warp ToCave -1,-1,002-3.gat,37,32
diff --git a/npc/002-1_Sandstorm/dark_mage.txt b/npc/002-1_Sandstorm/dark_mage.txt
new file mode 100644
index 00000000..002b5ed9
--- /dev/null
+++ b/npc/002-1_Sandstorm/dark_mage.txt
@@ -0,0 +1,48 @@
+//
+
+// 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;
+
+// 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;
+
+// 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!", -;
+
+// 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;
+
+// L_Soul:
+// mes "[Dark Mage]";
+// mes "\"Hrhrhr, your soul is finally mine!\"";
+// jobchange 1;
+// close;
+// }
diff --git a/npc/002-1_Sandstorm/merchant.txt b/npc/002-1_Sandstorm/merchant.txt
new file mode 100644
index 00000000..8a84ae92
--- /dev/null
+++ b/npc/002-1_Sandstorm/merchant.txt
@@ -0,0 +1,3 @@
+//
+
+002-1.gat,19,99,0 shop Ishyah 109,525:800,531:3000,530:8000,1199:3,603:-1
diff --git a/npc/002-1_Sandstorm/monsters.txt b/npc/002-1_Sandstorm/monsters.txt
new file mode 100644
index 00000000..39783382
--- /dev/null
+++ b/npc/002-1_Sandstorm/monsters.txt
@@ -0,0 +1,24 @@
+// Map: 002-2
+// This is the Desert (Sandstorm) south of Tulimshar.
+//
+
+002-1.gat,0,0,0,0 monster GreenSlime 1005,50,0,0,Mob1::OnGreenSlime
+002-1.gat,0,0,0,0 monster GiantMaggot 1006,30,0,0,Mob1::OnGiantMaggot
+002-1.gat,0,0,0,0 monster RedScorpion 1004,20,0,0,Mob1::OnRedScorpion
+
+002-1.gat,0,0,0 script Mob1 -1,{
+OnGreenSlime:
+ set @mobID, 1005;
+ callfunc "MobPoints";
+ break;
+
+OnGiantMaggot:
+ set @mobID, 1006;
+ callfunc "MobPoints";
+ break;
+
+OnRedScorpion:
+ set @mobID, 1004;
+ callfunc "MobPoints";
+ break;
+}
diff --git a/npc/new_1-1-western-desert/nomads.txt b/npc/002-1_Sandstorm/nomads.txt
index 13edea35..0b7e7426 100644
--- a/npc/new_1-1-western-desert/nomads.txt
+++ b/npc/002-1_Sandstorm/nomads.txt
@@ -1,4 +1,6 @@
-new_1-1.gat,15,67,0 script Samuel 132,{
+//
+
+002-1.gat,15,67,0 script Samuel 132,{
mes "[Samuel the Nomad]";
mes "\"This is really a nice place.\"";
@@ -6,7 +8,7 @@ new_1-1.gat,15,67,0 script Samuel 132,{
close;
}
-new_1-1.gat,18,68,0 script Elijah 128,{
+002-1.gat,18,68,0 script Elijah 128,{
mes "[Elijah the Nomad]";
mes "\"If I only had a tent...\"";
diff --git a/npc/new_1-1-western-desert/rogue.txt b/npc/002-1_Sandstorm/rogue.txt
index 87ec45fa..7169e446 100644
--- a/npc/new_1-1-western-desert/rogue.txt
+++ b/npc/002-1_Sandstorm/rogue.txt
@@ -1,4 +1,6 @@
-new_1-1.gat,22,21,0 script Malivox 103,{
+//
+
+002-1.gat,22,21,0 script Malivox 103,{
// if (ResetA_charstate == 1) goto L_Multiple;
diff --git a/npc/002-3_Desert_mines/_import.txt b/npc/002-3_Desert_mines/_import.txt
new file mode 100644
index 00000000..3e223b09
--- /dev/null
+++ b/npc/002-3_Desert_mines/_import.txt
@@ -0,0 +1,5 @@
+map: 002-3.gat
+npc: npc/002-3_Desert_mines/_mobs.txt
+npc: npc/002-3_Desert_mines/_warps.txt
+npc: npc/002-3_Desert_mines/miners.txt
+npc: npc/002-3_Desert_mines/monsters.txt
diff --git a/npc/002-3_Desert_mines/_mobs.txt b/npc/002-3_Desert_mines/_mobs.txt
new file mode 100644
index 00000000..63150759
--- /dev/null
+++ b/npc/002-3_Desert_mines/_mobs.txt
@@ -0,0 +1,19 @@
+// 002-3 Desert mines mobs
+
+002-3.gat,38,38,9,9 monster Red Slime 1008,1,0,0,Mob002-3::On1008
+002-3.gat,82,92,9,9 monster Black Scorpion 1009,1,0,0,Mob002-3::On1009
+
+
+002-3.gat,0,0,0 script Mob002-3 -1,{
+On1008:
+ set @mobID, 1008;
+ callfunc "MobPoints";
+ break;
+
+On1009:
+ set @mobID, 1009;
+ callfunc "MobPoints";
+ break;
+
+ end;
+}
diff --git a/npc/002-3_Desert_mines/_warps.txt b/npc/002-3_Desert_mines/_warps.txt
new file mode 100644
index 00000000..8f5b51c2
--- /dev/null
+++ b/npc/002-3_Desert_mines/_warps.txt
@@ -0,0 +1,4 @@
+// 002-3 Desert mines warps
+
+002-3.gat,38,30 warp CaveExit 2,-1,002-1.gat,25,95
+002-3.gat,68,98 warp toLevel2 -1,-1,002-4.gat,34,98
diff --git a/npc/002-3_Desert_mines/miners.txt b/npc/002-3_Desert_mines/miners.txt
new file mode 100644
index 00000000..2ee99b26
--- /dev/null
+++ b/npc/002-3_Desert_mines/miners.txt
@@ -0,0 +1,17 @@
+//
+
+002-3.gat,35,35,6 script Nathan 109,{
+ mes "[Nathan the Miner]";
+ mes "\"It's very dangerous in here.";
+ mes "We had a big earthquake here";
+ mes "just recently, too... so be";
+ mes "careful!\"";
+ close;
+}
+
+002-3-1.gat,85,97,6 script Naem 109,{
+ mes "[Naem the Miner]";
+ mes "\"We discovered an underground palace.";
+ mes "You can get there using the passage ont he left.\"";
+ close;
+}
diff --git a/npc/new_2-1-cave1/monsters.txt b/npc/002-3_Desert_mines/monsters.txt
index b673ef65..550b3d17 100644
--- a/npc/new_2-1-cave1/monsters.txt
+++ b/npc/002-3_Desert_mines/monsters.txt
@@ -2,10 +2,10 @@
// This is the Desert mines south of Tulimshar -- level 1.
//
-new_2-1.gat,0,0,0,0 monster RedSlime 1008,30,2500,0,Mob2::OnRedSlime
-new_2-1.gat,0,0,0,0 monster BlackScorpion 1009,15,2500,0,Mob2::OnBlackScorpion
+002-3.gat,0,0,0,0 monster RedSlime 1008,30,2500,0,Mob2::OnRedSlime
+002-3.gat,0,0,0,0 monster BlackScorpion 1009,15,2500,0,Mob2::OnBlackScorpion
-new_2-1.gat,0,0,0 script Mob2 -1,{
+002-3.gat,0,0,0 script Mob2 -1,{
OnRedSlime:
set @mobID, 1008;
callfunc "MobPoints";
diff --git a/npc/002-4_Desert_mines/_import.txt b/npc/002-4_Desert_mines/_import.txt
new file mode 100644
index 00000000..cb715b3d
--- /dev/null
+++ b/npc/002-4_Desert_mines/_import.txt
@@ -0,0 +1,6 @@
+map: 002-4.gat
+npc: npc/002-4_Desert_mines/_mobs.txt
+npc: npc/002-4_Desert_mines/_warps.txt
+npc: npc/002-4_Desert_mines/chest.txt
+npc: npc/002-4_Desert_mines/miners.txt
+npc: npc/002-4_Desert_mines/monsters.txt
diff --git a/npc/002-4_Desert_mines/_mobs.txt b/npc/002-4_Desert_mines/_mobs.txt
new file mode 100644
index 00000000..ff53d9c6
--- /dev/null
+++ b/npc/002-4_Desert_mines/_mobs.txt
@@ -0,0 +1,19 @@
+// 002-4 Desert mines mobs
+
+002-4.gat,0,0,0,0 monster Spider 1012,20,0,0,Mob002-4::On1012
+002-4.gat,0,0,0,0 monster Yellow Slime 1007,25,0,0,Mob002-4::On1007
+
+
+002-4.gat,0,0,0 script Mob002-4 -1,{
+On1007:
+ set @mobID, 1007;
+ callfunc "MobPoints";
+ break;
+
+On1012:
+ set @mobID, 1012;
+ callfunc "MobPoints";
+ break;
+
+ end;
+}
diff --git a/npc/002-4_Desert_mines/_warps.txt b/npc/002-4_Desert_mines/_warps.txt
new file mode 100644
index 00000000..24f71a1d
--- /dev/null
+++ b/npc/002-4_Desert_mines/_warps.txt
@@ -0,0 +1,3 @@
+// 002-4 Desert mines warps
+
+002-4.gat,34,99 warp toLevel1 -1,-1,002-3.gat,68,99
diff --git a/npc/new_5-1-cave2/chest.txt b/npc/002-4_Desert_mines/chest.txt
index 865c0f7e..49014976 100644
--- a/npc/new_5-1-cave2/chest.txt
+++ b/npc/002-4_Desert_mines/chest.txt
@@ -1,7 +1,7 @@
//
-new_5-1.gat,93,37,0 script Treasure 111,{
- if( ChestQuest == 1) goto L_Finished;
+002-4.gat,93,37,0 script Treasure 111,{
+ if( ChestQuest && 1) goto L_Finished;
mes "[Chest]";
mes "Would you try to open it?";
@@ -17,7 +17,7 @@ L_Yes:
getitem 536, 1;
mes "[Chest]";
mes "You opened it and found a short sword!";
- set ChestQuest, 1;
+ set ChestQuest, ChestQuest || 1;
close;
L_Not_Enough:
diff --git a/npc/002-4_Desert_mines/miners.txt b/npc/002-4_Desert_mines/miners.txt
new file mode 100644
index 00000000..9e67c1ec
--- /dev/null
+++ b/npc/002-4_Desert_mines/miners.txt
@@ -0,0 +1,7 @@
+//
+
+002-4.gat,32,94,6 script Naem 109,{
+ mes "[Naem the Miner]";
+ mes "\"This place is odd.\"";
+ close;
+}
diff --git a/npc/new_5-1-cave2/monsters.txt b/npc/002-4_Desert_mines/monsters.txt
index 0b8f967b..17d5cdee 100644
--- a/npc/new_5-1-cave2/monsters.txt
+++ b/npc/002-4_Desert_mines/monsters.txt
@@ -1,11 +1,11 @@
-// Map: new_5-1
+// Map: 002-4
// This is the Desert Mines south of Tulimshar -- level 2.
//
-new_5-1.gat,0,0,0,0 monster Spider 1012,10,2500,0,Mob5::OnSpider
-new_5-1.gat,0,0,0,0 monster YellowSlime 1007,25,2500,0,Mob5::OnYellowSlime
+002-4.gat,0,0,0,0 monster Spider 1012,10,2500,0,Mob5::OnSpider
+002-4.gat,0,0,0,0 monster YellowSlime 1007,25,2500,0,Mob5::OnYellowSlime
-new_5-1.gat,0,0,0 script Mob5 -1,{
+002-4.gat,0,0,0 script Mob5 -1,{
OnSpider:
set @mobID, 1012;
callfunc "MobPoints";
diff --git a/npc/003-1_Beach/_import.txt b/npc/003-1_Beach/_import.txt
new file mode 100644
index 00000000..58b5145e
--- /dev/null
+++ b/npc/003-1_Beach/_import.txt
@@ -0,0 +1,4 @@
+map: 003-1.gat
+npc: npc/003-1_Beach/_mobs.txt
+npc: npc/003-1_Beach/_warps.txt
+npc: npc/003-1_Beach/monsters.txt
diff --git a/npc/003-1_Beach/_mobs.txt b/npc/003-1_Beach/_mobs.txt
new file mode 100644
index 00000000..c7daca33
--- /dev/null
+++ b/npc/003-1_Beach/_mobs.txt
@@ -0,0 +1,19 @@
+// 003-1 Beach mobs
+
+003-1.gat,117,48,19,19 monster Black Scorpion 1009,10,0,0,Mob003-1::On1009
+003-1.gat,105,64,19,19 monster Snake 1010,10,0,0,Mob003-1::On1010
+
+
+003-1.gat,0,0,0 script Mob003-1 -1,{
+On1009:
+ set @mobID, 1009;
+ callfunc "MobPoints";
+ break;
+
+On1010:
+ set @mobID, 1010;
+ callfunc "MobPoints";
+ break;
+
+ end;
+}
diff --git a/npc/003-1_Beach/_warps.txt b/npc/003-1_Beach/_warps.txt
new file mode 100644
index 00000000..e66a28e4
--- /dev/null
+++ b/npc/003-1_Beach/_warps.txt
@@ -0,0 +1,4 @@
+// 003-1 Beach warps
+
+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
new file mode 100644
index 00000000..248cc968
--- /dev/null
+++ b/npc/003-1_Beach/monsters.txt
@@ -0,0 +1,20 @@
+// Map: 003-1
+// This is the Desert Beach.
+//
+
+003-1.gat,0,0,0,0 monster BlackScorpion 1009,20,0,0,Mob15::OnBlackScorpion
+003-1.gat,0,0,0,0 monster Snake 1010,10,0,0,Mob15::OnSnake
+
+003-1.gat,0,0,0 script Mob15 -1,{
+OnBlackScorpion:
+ set @mobID, 1009;
+ callfunc "MobPoints";
+ break;
+
+OnSnake:
+ set @mobID, 1010;
+ callfunc "MobPoints";
+ break;
+
+ end;
+}
diff --git a/npc/004-1_Beach/_import.txt b/npc/004-1_Beach/_import.txt
new file mode 100644
index 00000000..0b1dba07
--- /dev/null
+++ b/npc/004-1_Beach/_import.txt
@@ -0,0 +1,4 @@
+map: 004-1.gat
+npc: npc/004-1_Beach/_mobs.txt
+npc: npc/004-1_Beach/_warps.txt
+npc: npc/004-1_Beach/monsters.txt
diff --git a/npc/004-1_Beach/_mobs.txt b/npc/004-1_Beach/_mobs.txt
new file mode 100644
index 00000000..bc8e68a9
--- /dev/null
+++ b/npc/004-1_Beach/_mobs.txt
@@ -0,0 +1,7 @@
+// 004-1 Beach mobs
+
+
+
+004-1.gat,0,0,0 script Mob004-1 -1,{
+ end;
+}
diff --git a/npc/004-1_Beach/_warps.txt b/npc/004-1_Beach/_warps.txt
new file mode 100644
index 00000000..b6ccc7d0
--- /dev/null
+++ b/npc/004-1_Beach/_warps.txt
@@ -0,0 +1,4 @@
+// 004-1 Beach warps
+
+004-1.gat,84,113 warp ToSandstorm 1,-1,002-1.gat,29,15
+004-1.gat,37,111 warp ToBeach 1,-1,003-1.gat,141,21
diff --git a/npc/004-1_Beach/monsters.txt b/npc/004-1_Beach/monsters.txt
new file mode 100644
index 00000000..8056eead
--- /dev/null
+++ b/npc/004-1_Beach/monsters.txt
@@ -0,0 +1,26 @@
+// Map: 004-1
+// This is the Beach west of Tulimshar.
+//
+
+004-1.gat,0,0,0,0 monster SeaSlime 1033,30,0,0,Mob34::OnSeaSlime
+004-1.gat,0,0,0,0 monster GiantMaggot 1006,10,0,0,Mob34::OnGiantMaggot
+004-1.gat,0,0,0,0 monster RedScorpion 1004,12,0,0,Mob34::OnRedScorpion
+
+004-1.gat,0,0,0 script Mob34 -1,{
+OnSeaSlime:
+ set @mobID, 1033;
+ callfunc "MobPoints";
+ break;
+
+OnGiantMaggot:
+ set @mobID, 1006;
+ callfunc "MobPoints";
+ break;
+
+OnRedScorpion:
+ set @mobID, 1004;
+ callfunc "MobPoints";
+ break;
+
+ end;
+}
diff --git a/npc/005-1_Snake_desert/_import.txt b/npc/005-1_Snake_desert/_import.txt
new file mode 100644
index 00000000..0259ed1e
--- /dev/null
+++ b/npc/005-1_Snake_desert/_import.txt
@@ -0,0 +1,5 @@
+map: 005-1.gat
+npc: npc/005-1_Snake_desert/_mobs.txt
+npc: npc/005-1_Snake_desert/_warps.txt
+npc: npc/005-1_Snake_desert/monsters.txt
+npc: npc/005-1_Snake_desert/npcs.txt
diff --git a/npc/005-1_Snake_desert/_mobs.txt b/npc/005-1_Snake_desert/_mobs.txt
new file mode 100644
index 00000000..79d958db
--- /dev/null
+++ b/npc/005-1_Snake_desert/_mobs.txt
@@ -0,0 +1,19 @@
+// 005-1 Snake desert mobs
+
+005-1.gat,0,0,0,0 monster Maggot 1002,1,0,0,Mob005-1::On1002
+005-1.gat,0,0,0,0 monster Snake 1010,1,0,0,Mob005-1::On1010
+
+
+005-1.gat,0,0,0 script Mob005-1 -1,{
+On1002:
+ set @mobID, 1002;
+ callfunc "MobPoints";
+ break;
+
+On1010:
+ set @mobID, 1010;
+ callfunc "MobPoints";
+ break;
+
+ end;
+}
diff --git a/npc/005-1_Snake_desert/_warps.txt b/npc/005-1_Snake_desert/_warps.txt
new file mode 100644
index 00000000..f21bdf8a
--- /dev/null
+++ b/npc/005-1_Snake_desert/_warps.txt
@@ -0,0 +1,18 @@
+// 005-1 Snake desert warps
+
+005-1.gat,19,41 warp ToSandstorm -1,2,002-1.gat,106,78
+005-1.gat,89,23 warp ToSnakeCave -1,-1,005-3.gat,52,34
+005-1.gat,71,75 warp ToSnakeCave -1,-1,005-3.gat,33,83
+005-1.gat,167,108 warp ToDesertMountains -1,-1,006-1.gat,20,33
+005-1.gat,168,107 warp ToDesertMountains -1,-1,006-1.gat,21,32
+005-1.gat,169,106 warp ToDesertMountains -1,-1,006-1.gat,22,31
+005-1.gat,171,104 warp ToDesertMountains -1,-1,006-1.gat,24,29
+005-1.gat,170,105 warp ToDesertMountains -1,-1,006-1.gat,23,30
+005-1.gat,172,103 warp ToDesertMountains -1,-1,006-1.gat,25,28
+005-1.gat,174,101 warp ToDesertMountains -1,-1,006-1.gat,27,26
+005-1.gat,173,102 warp ToDesertMountains -1,-1,006-1.gat,26,27
+005-1.gat,175,100 warp ToDesertMountains -1,-1,006-1.gat,28,25
+005-1.gat,176,99 warp ToDesertMountains -1,-1,006-1.gat,29,24
+005-1.gat,177,98 warp ToDesertMountains -1,-1,006-1.gat,30,23
+005-1.gat,178,97 warp ToDesertMountains -1,-1,006-1.gat,31,22
+005-1.gat,179,96 warp ToDesertMountains -1,-1,006-1.gat,32,21
diff --git a/npc/005-1_Snake_desert/monsters.txt b/npc/005-1_Snake_desert/monsters.txt
new file mode 100644
index 00000000..b2334f11
--- /dev/null
+++ b/npc/005-1_Snake_desert/monsters.txt
@@ -0,0 +1,20 @@
+// Map: 005-1
+// This is the Snake Desert.
+//
+
+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
+
+005-1.gat,0,0,0 script Mob7 -1,{
+OnMaggot:
+ set @mobID, 1002;
+ callfunc "MobPoints";
+ break;
+
+OnSnake:
+ set @mobID, 1010;
+ callfunc "MobPoints";
+ break;
+
+ end;
+}
diff --git a/npc/new_7-1-eastern-desert/npcs.txt b/npc/005-1_Snake_desert/npcs.txt
index 8b3d1d0a..1a9a8853 100644
--- a/npc/new_7-1-eastern-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/_import.txt b/npc/005-3_Snake_pit/_import.txt
new file mode 100644
index 00000000..1f66ac7f
--- /dev/null
+++ b/npc/005-3_Snake_pit/_import.txt
@@ -0,0 +1,4 @@
+map: 005-3.gat
+npc: npc/005-3_Snake_pit/_mobs.txt
+npc: npc/005-3_Snake_pit/_warps.txt
+npc: npc/005-3_Snake_pit/monsters.txt
diff --git a/npc/005-3_Snake_pit/_mobs.txt b/npc/005-3_Snake_pit/_mobs.txt
new file mode 100644
index 00000000..c129d051
--- /dev/null
+++ b/npc/005-3_Snake_pit/_mobs.txt
@@ -0,0 +1,7 @@
+// 005-3 Snake pit mobs
+
+
+
+005-3.gat,0,0,0 script Mob005-3 -1,{
+ end;
+}
diff --git a/npc/005-3_Snake_pit/_warps.txt b/npc/005-3_Snake_pit/_warps.txt
new file mode 100644
index 00000000..95a1e419
--- /dev/null
+++ b/npc/005-3_Snake_pit/_warps.txt
@@ -0,0 +1,4 @@
+// 005-3 Snake pit warps
+
+005-3.gat,52,33 warp CaveExit -1,-1,005-1.gat,89,24
+005-3.gat,33,82 warp CaveExit -1,-1,005-1.gat,71,76
diff --git a/npc/new_22-1-snake-cave/monsters.txt b/npc/005-3_Snake_pit/monsters.txt
index 8d88def8..439b6300 100644
--- a/npc/new_22-1-snake-cave/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
+005-3.gat,0,0,0,0 monster Snake 1010,175,0,0,Mob22::OnSnake
-new_22-1.gat,0,0,0 script Mob22 -1,{
+005-3.gat,0,0,0 script Mob22 -1,{
OnSnake:
set @mobID, 1010;
callfunc "MobPoints";
diff --git a/npc/006-1_Desert_mountains/_import.txt b/npc/006-1_Desert_mountains/_import.txt
new file mode 100644
index 00000000..aa3a86de
--- /dev/null
+++ b/npc/006-1_Desert_mountains/_import.txt
@@ -0,0 +1,6 @@
+map: 006-1.gat
+npc: npc/006-1_Desert_mountains/_mobs.txt
+npc: npc/006-1_Desert_mountains/_warps.txt
+npc: npc/006-1_Desert_mountains/mika.txt
+npc: npc/006-1_Desert_mountains/monsters.txt
+npc: npc/006-1_Desert_mountains/pachua.txt
diff --git a/npc/006-1_Desert_mountains/_mobs.txt b/npc/006-1_Desert_mountains/_mobs.txt
new file mode 100644
index 00000000..0225efff
--- /dev/null
+++ b/npc/006-1_Desert_mountains/_mobs.txt
@@ -0,0 +1,7 @@
+// 006-1 Desert mountains mobs
+
+
+
+006-1.gat,0,0,0 script Mob006-1 -1,{
+ end;
+}
diff --git a/npc/006-1_Desert_mountains/_warps.txt b/npc/006-1_Desert_mountains/_warps.txt
new file mode 100644
index 00000000..6bc6e86c
--- /dev/null
+++ b/npc/006-1_Desert_mountains/_warps.txt
@@ -0,0 +1,34 @@
+// 006-1 Desert mountains warps
+
+006-1.gat,28,21 warp ToSnakeDesert -1,-1,005-1.gat,175,96
+006-1.gat,27,22 warp ToSnakeDesert -1,-1,005-1.gat,174,97
+006-1.gat,30,19 warp ToSnakeDesert -1,-1,005-1.gat,177,94
+006-1.gat,29,20 warp ToSnakeDesert -1,-1,005-1.gat,176,95
+006-1.gat,26,23 warp ToSnakeDesert -1,-1,005-1.gat,173,98
+006-1.gat,25,24 warp ToSnakeDesert -1,-1,005-1.gat,172,99
+006-1.gat,23,26 warp ToSnakeDesert -1,-1,005-1.gat,170,101
+006-1.gat,24,25 warp ToSnakeDesert -1,-1,005-1.gat,171,100
+006-1.gat,22,27 warp ToSnakeDesert -1,-1,005-1.gat,169,102
+006-1.gat,21,28 warp ToSnakeDesert -1,-1,005-1.gat,168,103
+006-1.gat,20,29 warp ToSnakeDesert -1,-1,005-1.gat,167,104
+006-1.gat,19,30 warp ToSnakeDesert -1,-1,005-1.gat,166,105
+006-1.gat,18,31 warp ToSnakeDesert -1,-1,005-1.gat,165,106
+006-1.gat,40,26 warp ToDesertMountainCaves -1,-1,006-3.gat,40,27
+006-1.gat,60,58 warp ToDesertMountainCaves -1,-1,006-3.gat,60,69
+006-1.gat,62,30 warp ToDesertMountainCaves -1,-1,006-3.gat,62,31
+006-1.gat,55,27 warp ToDesertMountainCaves -1,-1,006-3.gat,55,28
+006-1.gat,77,44 warp ToDesertMountainCaves -1,-1,006-3.gat,77,45
+006-1.gat,86,24 warp ToDesertMountainCaves -1,-1,006-3.gat,86,25
+006-1.gat,91,24 warp ToDesertMountainCaves -1,-1,006-3.gat,91,25
+006-1.gat,104,44 warp ToDesertMountainCaves -1,-1,006-3.gat,104,45
+006-1.gat,122,24 warp ToDesertMountainCaves -1,-1,006-3.gat,122,25
+006-1.gat,114,49 warp ToDesertMountainCaves -1,-1,006-3.gat,114,50
+006-1.gat,110,56 warp ToDesertMountainCaves -1,-1,006-3.gat,110,57
+006-1.gat,125,59 warp ToDesertMountainCaves -1,-1,006-3.gat,125,60
+006-1.gat,92,63 warp ToDesertMountainCaves -1,-1,006-3.gat,92,64
+006-1.gat,112,74 warp ToDesertMountainCaves -1,-1,006-3.gat,112,75
+006-1.gat,121,110 warp ToDesertMountainCaves -1,-1,006-3.gat,121,111
+006-1.gat,79,120 warp ToDesertMountainCaves -1,-1,006-3.gat,79,121
+006-1.gat,38,121 warp ToDesertMountainCaves -1,-1,006-3.gat,38,122
+006-1.gat,74,90 warp ToDesertMountainCaves -1,-1,006-3.gat,74,91
+006-1.gat,51,90 warp ToDesertMountainCaves -1,-1,006-3.gat,51,91
diff --git a/npc/new_24-1-eastern-desert-mountain-passage/mika.txt b/npc/006-1_Desert_mountains/mika.txt
index 222accde..a572b911 100644
--- a/npc/new_24-1-eastern-desert-mountain-passage/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
new file mode 100644
index 00000000..6942d2cf
--- /dev/null
+++ b/npc/006-1_Desert_mountains/monsters.txt
@@ -0,0 +1,14 @@
+// Map: 006-1
+// This is the Desert Mountains.
+//
+
+006-1.gat,0,0,0,0 monster MountainSnake 1026,60,0,0,Mob24::OnMountainSnake
+
+006-1.gat,0,0,0 script Mob24 -1,{
+OnMountainSnake:
+ set @mobID, 1026;
+ callfunc "MobPoints";
+ break;
+
+ end;
+}
diff --git a/npc/new_24-1-eastern-desert-mountain-passage/pachua.txt b/npc/006-1_Desert_mountains/pachua.txt
index a40c652c..15d1610c 100644
--- a/npc/new_24-1-eastern-desert-mountain-passage/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/_import.txt b/npc/006-3_Desert_mountain_caves/_import.txt
new file mode 100644
index 00000000..f3a4690c
--- /dev/null
+++ b/npc/006-3_Desert_mountain_caves/_import.txt
@@ -0,0 +1,4 @@
+map: 006-3.gat
+npc: npc/006-3_Desert_mountain_caves/_mobs.txt
+npc: npc/006-3_Desert_mountain_caves/_warps.txt
+npc: npc/006-3_Desert_mountain_caves/monsters.txt
diff --git a/npc/006-3_Desert_mountain_caves/_mobs.txt b/npc/006-3_Desert_mountain_caves/_mobs.txt
new file mode 100644
index 00000000..fd6e317b
--- /dev/null
+++ b/npc/006-3_Desert_mountain_caves/_mobs.txt
@@ -0,0 +1,7 @@
+// 006-3 Desert mountain caves mobs
+
+
+
+006-3.gat,0,0,0 script Mob006-3 -1,{
+ end;
+}
diff --git a/npc/006-3_Desert_mountain_caves/_warps.txt b/npc/006-3_Desert_mountain_caves/_warps.txt
new file mode 100644
index 00000000..9c40defc
--- /dev/null
+++ b/npc/006-3_Desert_mountain_caves/_warps.txt
@@ -0,0 +1,20 @@
+// 006-3 Desert mountain caves warps
+
+006-3.gat,40,26 warp CavesExit -1,-1,006-1.gat,40,27
+006-3.gat,55,27 warp CavesExit -1,-1,006-1.gat,55,28
+006-3.gat,62,30 warp CavesExit -1,-1,006-1.gat,62,31
+006-3.gat,86,24 warp CavesExit -1,-1,006-1.gat,86,25
+006-3.gat,91,24 warp CavesExit -1,-1,006-1.gat,91,25
+006-3.gat,122,24 warp CavesExit -1,-1,006-1.gat,122,25
+006-3.gat,114,49 warp CavesExit -1,-1,006-1.gat,114,50
+006-3.gat,104,44 warp CavesExit -1,-1,006-1.gat,104,45
+006-3.gat,60,68 warp CavesExit -1,-1,006-1.gat,60,59
+006-3.gat,92,63 warp CavesExit -1,-1,006-1.gat,92,64
+006-3.gat,112,74 warp CavesExit -1,-1,006-1.gat,112,75
+006-3.gat,110,56 warp CavesExit -1,-1,006-1.gat,110,57
+006-3.gat,125,59 warp CavesExit -1,-1,006-1.gat,125,60
+006-3.gat,74,90 warp CavesExit -1,-1,006-1.gat,74,91
+006-3.gat,51,90 warp CavesExit -1,-1,006-1.gat,51,91
+006-3.gat,38,121 warp CavesExit -1,-1,006-1.gat,38,122
+006-3.gat,79,120 warp CavesExit -1,-1,006-1.gat,79,121
+006-3.gat,121,110 warp CavesExit -1,-1,006-1.gat,121,111
diff --git a/npc/006-3_Desert_mountain_caves/monsters.txt b/npc/006-3_Desert_mountain_caves/monsters.txt
new file mode 100644
index 00000000..5aee03a4
--- /dev/null
+++ b/npc/006-3_Desert_mountain_caves/monsters.txt
@@ -0,0 +1,14 @@
+// Map: 006-3
+// This is the Desert Mountains Caves.
+//
+
+006-3.gat,0,0,0,0 monster MountainSnake 1026,50,0,0,Mob25::OnMountainSnake
+
+006-3.gat,0,0,0 script Mob25 -1,{
+OnMountainSnake:
+ set @mobID, 1026;
+ callfunc "MobPoints";
+ break;
+
+ end;
+}
diff --git a/npc/007-1_Woodland/_import.txt b/npc/007-1_Woodland/_import.txt
new file mode 100644
index 00000000..1bd01390
--- /dev/null
+++ b/npc/007-1_Woodland/_import.txt
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 00000000..b4653078
--- /dev/null
+++ b/npc/007-1_Woodland/_mobs.txt
@@ -0,0 +1,19 @@
+// 007-1 Woodland mobs
+
+007-1.gat,119,66,9,9 monster Fluffy 1020,1,0,0,Mob007-1::On1020
+007-1.gat,96,35,9,9 monster Sleep Flower 1014,1,0,0,Mob007-1::On1014
+
+
+007-1.gat,0,0,0 script Mob007-1 -1,{
+On1014:
+ set @mobID, 1014;
+ callfunc "MobPoints";
+ break;
+
+On1020:
+ set @mobID, 1020;
+ callfunc "MobPoints";
+ break;
+
+ end;
+}
diff --git a/npc/007-1_Woodland/_warps.txt b/npc/007-1_Woodland/_warps.txt
new file mode 100644
index 00000000..00d0b60d
--- /dev/null
+++ b/npc/007-1_Woodland/_warps.txt
@@ -0,0 +1,6 @@
+// 007-1 Woodland warps
+
+007-1.gat,120,114 warp ToBeach 1,-1,003-1.gat,20,24
+007-1.gat,20,54 warp ToHurnscald -1,0,010-1.gat,127,53
+007-1.gat,69,21 warp ToHurnscald 2,-1,008-1.gat,78,100
+007-1.gat,122,20 warp ToHurnscald 1,-1,008-1.gat,132,98
diff --git a/npc/007-1_Woodland/monsters.txt b/npc/007-1_Woodland/monsters.txt
new file mode 100644
index 00000000..8be691b3
--- /dev/null
+++ b/npc/007-1_Woodland/monsters.txt
@@ -0,0 +1,35 @@
+// Map: 007-1
+// This is South-East Woodland.
+//
+
+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
+
+007-1.gat,0,0,0,0 monster Gamboge 1031,1,2700000,1800000,Mob16::OnGamboge
+
+007-1.gat,0,0,0,0 monster SilkWorm 1035,2,60000,30000,Mob16::OnSilkWorm
+
+007-1.gat,0,0,0 script Mob16 -1,{
+OnFluffy:
+ set @mobID, 1020;
+ callfunc "MobPoints";
+ break;
+
+OnFlower:
+ set @mobID, 1014;
+ callfunc "MobPoints";
+ break;
+
+OnGamboge:
+ set @mobID, 1031;
+ callfunc "MobPoints";
+ break;
+
+OnSilkWorm:
+ set @mobID, 1035;
+ callfunc "MobPoints";
+ break;
+
+
+ end;
+}
diff --git a/npc/008-1_Hurnscald_outskirts/_import.txt b/npc/008-1_Hurnscald_outskirts/_import.txt
new file mode 100644
index 00000000..a5a1eec8
--- /dev/null
+++ b/npc/008-1_Hurnscald_outskirts/_import.txt
@@ -0,0 +1,6 @@
+map: 008-1.gat
+npc: npc/008-1_Hurnscald_outskirts/_mobs.txt
+npc: npc/008-1_Hurnscald_outskirts/_warps.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
new file mode 100644
index 00000000..2ae45fb9
--- /dev/null
+++ b/npc/008-1_Hurnscald_outskirts/_mobs.txt
@@ -0,0 +1,7 @@
+// 008-1 Hurnscald outskirts mobs
+
+
+
+008-1.gat,0,0,0 script Mob008-1 -1,{
+ end;
+}
diff --git a/npc/008-1_Hurnscald_outskirts/_warps.txt b/npc/008-1_Hurnscald_outskirts/_warps.txt
new file mode 100644
index 00000000..275de68e
--- /dev/null
+++ b/npc/008-1_Hurnscald_outskirts/_warps.txt
@@ -0,0 +1,10 @@
+// 008-1 Hurnscald outskirts warps
+
+008-1.gat,54,61 warp HurnscaldWestGate -1,1,009-1.gat,26,36
+008-1.gat,79,80 warp HurnscaldSouthGate 2,-1,009-1.gat,48,54
+008-1.gat,127,61 warp HurnscaldEastGate -1,0,009-1.gat,96,35
+008-1.gat,79,49 warp HurnscaldNorthGate 2,-1,009-1.gat,48,24
+008-1.gat,24,62 warp ToWoodland -1,2,011-1.gat,122,61
+008-1.gat,79,17 warp ToWoodlandMines 2,-1,018-1.gat,79,97
+008-1.gat,79,102 warp ToWoodland 2,-1,007-1.gat,68,23
+008-1.gat,132,101 warp ToWoodland 1,-1,007-1.gat,122,23
diff --git a/npc/new_18-1-woodland-village/george.txt b/npc/008-1_Hurnscald_outskirts/george.txt
index 42966bf8..429fdbca 100644
--- a/npc/new_18-1-woodland-village/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/new_18-1-woodland-village/hinnak.txt b/npc/008-1_Hurnscald_outskirts/hinnak.txt
index 39f4bc5a..27dcd677 100644
--- a/npc/new_18-1-woodland-village/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
new file mode 100644
index 00000000..3d5f944f
--- /dev/null
+++ b/npc/008-1_Hurnscald_outskirts/monsters.txt
@@ -0,0 +1,34 @@
+// 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 SilkWorm 1035,2,60000,30000,Mob18::OnSilkWorm
+
+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;
+
+ end;
+}
diff --git a/npc/009-1_Hurnscald/_import.txt b/npc/009-1_Hurnscald/_import.txt
new file mode 100644
index 00000000..b98c06c3
--- /dev/null
+++ b/npc/009-1_Hurnscald/_import.txt
@@ -0,0 +1,9 @@
+map: 009-1.gat
+npc: npc/009-1_Hurnscald/_mobs.txt
+npc: npc/009-1_Hurnscald/_warps.txt
+npc: npc/009-1_Hurnscald/jack.txt
+npc: npc/009-1_Hurnscald/milly.txt
+npc: npc/009-1_Hurnscald/old_man.txt
+npc: npc/009-1_Hurnscald/old_woman.txt
+npc: npc/009-1_Hurnscald/sabine.txt
+npc: npc/009-1_Hurnscald/soul-menhir.txt
diff --git a/npc/009-1_Hurnscald/_mobs.txt b/npc/009-1_Hurnscald/_mobs.txt
new file mode 100644
index 00000000..8e5290ee
--- /dev/null
+++ b/npc/009-1_Hurnscald/_mobs.txt
@@ -0,0 +1,7 @@
+// 009-1 Hurnscald mobs
+
+
+
+009-1.gat,0,0,0 script Mob009-1 -1,{
+ end;
+}
diff --git a/npc/009-1_Hurnscald/_warps.txt b/npc/009-1_Hurnscald/_warps.txt
new file mode 100644
index 00000000..a41c63a4
--- /dev/null
+++ b/npc/009-1_Hurnscald/_warps.txt
@@ -0,0 +1,13 @@
+// 009-1 Hurnscald warps
+
+009-1.gat,49,55 warp HurnscaldSouthGate 2,-1,008-1.gat,78,82
+009-1.gat,97,36 warp HurnscaldEastGate -1,0,008-1.gat,129,60
+009-1.gat,35,30 warp ToInn -1,-1,009-2.gat,50,55
+009-1.gat,58,46 warp ToGeneralStore -1,-1,009-2.gat,27,105
+009-1.gat,59,33 warp ToArcherShop -1,-1,009-2.gat,95,29
+009-1.gat,71,30 warp ToPotionShop -1,-1,009-2.gat,130,25
+009-1.gat,80,31 warp ToHospital -1,-1,009-2.gat,149,66
+009-1.gat,72,44 warp ToMayor -1,-1,009-2.gat,113,77
+009-1.gat,91,46 warp ToBlacksmith -1,-1,009-2.gat,181,66
+009-1.gat,24,36 warp HurnscaldWestGate -1,1,008-1.gat,53,61
+009-1.gat,49,24 warp HurnscaldNorthGate 2,-1,008-1.gat,78,48
diff --git a/npc/new_19-1-woodland-village/jack.txt b/npc/009-1_Hurnscald/jack.txt
index 721c4cce..ed90135a 100644
--- a/npc/new_19-1-woodland-village/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/new_19-1-woodland-village/milly.txt b/npc/009-1_Hurnscald/milly.txt
index b8bf7460..82b5cb6a 100644
--- a/npc/new_19-1-woodland-village/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/new_19-1-woodland-village/old_man.txt b/npc/009-1_Hurnscald/old_man.txt
index 55812260..84079138 100644
--- a/npc/new_19-1-woodland-village/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/new_19-1-woodland-village/old_woman.txt b/npc/009-1_Hurnscald/old_woman.txt
index c94fe63f..5198f8ab 100644
--- a/npc/new_19-1-woodland-village/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/new_19-1-woodland-village/sabine.txt b/npc/009-1_Hurnscald/sabine.txt
index e45ae7a8..883d4790 100644
--- a/npc/new_19-1-woodland-village/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
new file mode 100644
index 00000000..d0ec1516
--- /dev/null
+++ b/npc/009-1_Hurnscald/soul-menhir.txt
@@ -0,0 +1,8 @@
+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/_import.txt b/npc/009-2_Hurnscald/_import.txt
new file mode 100644
index 00000000..d2badb7b
--- /dev/null
+++ b/npc/009-2_Hurnscald/_import.txt
@@ -0,0 +1,15 @@
+map: 009-2.gat
+npc: npc/009-2_Hurnscald/_mobs.txt
+npc: npc/009-2_Hurnscald/_warps.txt
+npc: npc/009-2_Hurnscald/alan.txt
+npc: npc/009-2_Hurnscald/doctor.txt
+npc: npc/009-2_Hurnscald/drunks.txt
+npc: npc/009-2_Hurnscald/inspector.txt
+npc: npc/009-2_Hurnscald/kfahr.txt
+npc: npc/009-2_Hurnscald/misc.txt
+npc: npc/009-2_Hurnscald/nicholas.txt
+npc: npc/009-2_Hurnscald/nurse.txt
+npc: npc/009-2_Hurnscald/richard.txt
+npc: npc/009-2_Hurnscald/selim.txt
+npc: npc/009-2_Hurnscald/shops.txt
+npc: npc/009-2_Hurnscald/waitress.txt
diff --git a/npc/009-2_Hurnscald/_mobs.txt b/npc/009-2_Hurnscald/_mobs.txt
new file mode 100644
index 00000000..d7a860f9
--- /dev/null
+++ b/npc/009-2_Hurnscald/_mobs.txt
@@ -0,0 +1,7 @@
+// 009-2 Hurnscald mobs
+
+
+
+009-2.gat,0,0,0 script Mob009-2 -1,{
+ end;
+}
diff --git a/npc/009-2_Hurnscald/_warps.txt b/npc/009-2_Hurnscald/_warps.txt
new file mode 100644
index 00000000..bb75379b
--- /dev/null
+++ b/npc/009-2_Hurnscald/_warps.txt
@@ -0,0 +1,20 @@
+// 009-2 Hurnscald warps
+
+009-2.gat,75,23 warp To1stFloor 0,-1,009-2.gat,73,46
+009-2.gat,95,30 warp ToOutdoor -1,-1,009-1.gat,59,34
+009-2.gat,130,26 warp ToOutdoor -1,-1,009-1.gat,71,31
+009-2.gat,144,26 warp To2ndFloor 0,-1,009-2.gat,143,44
+009-2.gat,144,42 warp To3rdFloor 0,-1,009-2.gat,143,24
+009-2.gat,155,47 warp To1stFloor 0,-1,009-2.gat,154,63
+009-2.gat,114,46 warp To1stFloor 0,-1,009-2.gat,113,69
+009-2.gat,50,55 warp ToOutdoor -1,-1,009-1.gat,35,31
+009-2.gat,74,53 warp ToCellar -1,-1,009-2.gat,143,81
+009-2.gat,74,45 warp To2ndFloor 0,-1,009-2.gat,74,23
+009-2.gat,114,78 warp ToOutdoor 0,-1,009-1.gat,72,45
+009-2.gat,114,68 warp To2ndFloor 0,-1,009-2.gat,113,46
+009-2.gat,149,67 warp ToOutdoor -1,-1,009-1.gat,80,32
+009-2.gat,143,79 warp To1stFloor -1,-1,009-2.gat,74,52
+009-2.gat,155,62 warp To2ndFloor 0,-1,009-2.gat,154,46
+009-2.gat,182,67 warp ToOutdoor 0,-1,009-1.gat,91,47
+009-2.gat,147,89 warp ToCaveBeneathHurnscald -1,-1,009-3.gat,173,22
+009-2.gat,27,106 warp ToOutdoor -1,-1,009-1.gat,58,47
diff --git a/npc/new_20-1-woodland-village/alan.txt b/npc/009-2_Hurnscald/alan.txt
index fc779676..0235ad33 100644
--- a/npc/new_20-1-woodland-village/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/new_20-1-woodland-village/doctor.txt b/npc/009-2_Hurnscald/doctor.txt
index 825db4cc..2d7c2602 100644
--- a/npc/new_20-1-woodland-village/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/new_20-1-woodland-village/drunks.txt b/npc/009-2_Hurnscald/drunks.txt
index 410bb081..61246b4e 100644
--- a/npc/new_20-1-woodland-village/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/new_20-1-woodland-village/inspector.txt b/npc/009-2_Hurnscald/inspector.txt
index 89192104..f25d026a 100644
--- a/npc/new_20-1-woodland-village/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/new_20-1-woodland-village/kfahr.txt b/npc/009-2_Hurnscald/kfahr.txt
index 3ca72226..cd5bc3b7 100644
--- a/npc/new_20-1-woodland-village/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/new_20-1-woodland-village/misc.txt b/npc/009-2_Hurnscald/misc.txt
index b2cfe9da..56d02bf9 100644
--- a/npc/new_20-1-woodland-village/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/new_20-1-woodland-village/nicholas.txt b/npc/009-2_Hurnscald/nicholas.txt
index 7d21ab0f..30d48594 100644
--- a/npc/new_20-1-woodland-village/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/new_20-1-woodland-village/nurse.txt b/npc/009-2_Hurnscald/nurse.txt
index 2ea8acb1..9fd759c8 100644
--- a/npc/new_20-1-woodland-village/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/new_20-1-woodland-village/richard.txt b/npc/009-2_Hurnscald/richard.txt
index 17336ee7..9b9714c2 100644
--- a/npc/new_20-1-woodland-village/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/new_20-1-woodland-village/selim.txt b/npc/009-2_Hurnscald/selim.txt
index 952bac9e..cc7a8863 100644
--- a/npc/new_20-1-woodland-village/selim.txt
+++ b/npc/009-2_Hurnscald/selim.txt
@@ -5,7 +5,7 @@
//# #
//#################################################################################
-new_20-1.gat,32,104,0 script Selim 142,{
+009-2.gat,32,104,0 script Selim 142,{
setarray @all_colours$, "red", "green", "dark blue", "yellow", "light blue", "pink", "black", "orange", "purple", "dark green";
setarray @all_colours_cap$, "Red", "Green", "Dark Blue", "Yellow", "Light Blue", "Pink", "Black", "Orange", "Purple", "Dark Green";
@@ -26,6 +26,8 @@ L_clothes_choice:
"Tank top ", L_tanktop,
"Short tank top", L_tanktop_short,
"Silk robe", L_robe,
+ "Cotton headband", L_headband,
+ "Desert hat", L_desert_hat,
"I'm fine for now, thanks.", -;
close;
@@ -79,6 +81,18 @@ L_robe:
set @name$, "silk robe";
goto L_picked_item;
+L_headband:
+ set @del, 724;
+ set @new, 2140;
+ set @name$, "cotton headband";
+ goto L_picked_item;
+
+L_desert_hat:
+ set @del, 723;
+ set @new, 2130;
+ set @name$, "desert hat";
+ goto L_picked_item;
+
L_picked_item:
if (countitem(@del) == 0) goto L_havenone;
L_colour:
diff --git a/npc/new_20-1-woodland-village/shops.txt b/npc/009-2_Hurnscald/shops.txt
index d965cf68..ebd9f767 100644
--- a/npc/new_20-1-woodland-village/shops.txt
+++ b/npc/009-2_Hurnscald/shops.txt
@@ -6,11 +6,11 @@
// Bartender
// sells beer, cake and steak
-new_20-1.gat,65,49,0 shop Barkeeper 112,539:-1,513:-1,676:-1
+009-2.gat,65,49,0 shop Barkeeper 112,539:-1,513:-1,676:-1
// Receptionist
// Offers the player to rest at the inn for 100gp
-new_20-1.gat,50,48,0 script Receptionist 108,{
+009-2.gat,50,48,0 script Receptionist 108,{
set @npcName$, "Receptionist";
set @cost, 100;
callfunc "Inn";
@@ -18,17 +18,17 @@ new_20-1.gat,50,48,0 script Receptionist 108,{
// Archer Shop
// sells bow, short bow, arrows and iron arrows
-new_20-1.gat,97,24,0 shop Apprentice 120,1199:3,529:5,1200:1000,530:3000
+009-2.gat,97,24,0 shop Apprentice 120,1199:3,529:5,1200:1000,530:3000
// Potion Shop
// sells cactus drink, cactus potion, iron potion and concentration potion
-new_20-1.gat,121,26,0 shop Witch 103,501:50,502:70,567:500,568:500
+009-2.gat,121,26,0 shop Witch 103,501:50,502:70,567:500,568:500
// Blacksmith
// Sells all knives, chainmail armor, light platemail
-new_20-1.gat,183,57,0 shop Blacksmith 135,625:20000,626:50000,658:100000,1201:25,522:100,521:1000
+009-2.gat,183,57,0 shop Blacksmith 135,625:20000,626:50000,658:100000,1201:25,522:100,521:1000
// General Store
// Sells various things, many not sold elsewhere
-new_20-1.gat,32,99,0 shop General Store 112,527:-1,541:-1,1202:-1,586:-1,528:-1,656:-1
+009-2.gat,32,99,0 shop General Store 112,527:-1,541:-1,1202:-1,586:-1,528:-1,656:-1,724:3000
diff --git a/npc/new_20-1-woodland-village/waitress.txt b/npc/009-2_Hurnscald/waitress.txt
index 6cf9791b..cf2778fd 100644
--- a/npc/new_20-1-woodland-village/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/_import.txt b/npc/009-3_Cave_beneath_Hurnscald/_import.txt
new file mode 100644
index 00000000..0297260b
--- /dev/null
+++ b/npc/009-3_Cave_beneath_Hurnscald/_import.txt
@@ -0,0 +1,4 @@
+map: 009-3.gat
+npc: npc/009-3_Cave_beneath_Hurnscald/_mobs.txt
+npc: npc/009-3_Cave_beneath_Hurnscald/_warps.txt
+npc: npc/009-3_Cave_beneath_Hurnscald/monsters.txt
diff --git a/npc/009-3_Cave_beneath_Hurnscald/_mobs.txt b/npc/009-3_Cave_beneath_Hurnscald/_mobs.txt
new file mode 100644
index 00000000..45708c75
--- /dev/null
+++ b/npc/009-3_Cave_beneath_Hurnscald/_mobs.txt
@@ -0,0 +1,7 @@
+// 009-3 Cave beneath Hurnscald mobs
+
+
+
+009-3.gat,0,0,0 script Mob009-3 -1,{
+ end;
+}
diff --git a/npc/009-3_Cave_beneath_Hurnscald/_warps.txt b/npc/009-3_Cave_beneath_Hurnscald/_warps.txt
new file mode 100644
index 00000000..513872a0
--- /dev/null
+++ b/npc/009-3_Cave_beneath_Hurnscald/_warps.txt
@@ -0,0 +1,6 @@
+// 009-3 Cave beneath Hurnscald warps
+
+009-3.gat,173,20 warp CaveExitToInn -1,-1,009-2.gat,147,88
+009-3.gat,20,56 warp ToLakeCave -1,-1,011-4.gat,129,88
+009-3.gat,157,30 warp toCave -1,-1,018-3.gat,179,178
+009-3.gat,117,19 warp toCave -1,-1,013-3.gat,160,101
diff --git a/npc/009-3_Cave_beneath_Hurnscald/monsters.txt b/npc/009-3_Cave_beneath_Hurnscald/monsters.txt
new file mode 100644
index 00000000..b69bb3a1
--- /dev/null
+++ b/npc/009-3_Cave_beneath_Hurnscald/monsters.txt
@@ -0,0 +1,26 @@
+// Map: 009-3
+// This is the cave beneath Hurnscald.
+//
+
+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
+
+009-3.gat,0,0,0 script Mob35 -1,{
+OnYellowSlime:
+ set @mobID, 1007;
+ callfunc "MobPoints";
+ break;
+
+OnRedSlime:
+ set @mobID, 1008;
+ callfunc "MobPoints";
+ break;
+
+OnBlackScorpion:
+ set @mobID, 1009;
+ callfunc "MobPoints";
+ break;
+
+ end;
+}
diff --git a/npc/010-1_Woodland/_import.txt b/npc/010-1_Woodland/_import.txt
new file mode 100644
index 00000000..3b2aca90
--- /dev/null
+++ b/npc/010-1_Woodland/_import.txt
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 00000000..c4b359db
--- /dev/null
+++ b/npc/010-1_Woodland/_mobs.txt
@@ -0,0 +1,19 @@
+// 010-1 Woodland mobs
+
+010-1.gat,82,63,19,19 monster Scorpion 1003,1,0,0,Mob010-1::On1003
+010-1.gat,49,71,31,19 monster Shroom 1019,1,0,0,Mob010-1::On1019
+
+
+010-1.gat,0,0,0 script Mob010-1 -1,{
+On1003:
+ set @mobID, 1003;
+ callfunc "MobPoints";
+ break;
+
+On1019:
+ set @mobID, 1019;
+ callfunc "MobPoints";
+ break;
+
+ end;
+}
diff --git a/npc/010-1_Woodland/_warps.txt b/npc/010-1_Woodland/_warps.txt
new file mode 100644
index 00000000..1e27f550
--- /dev/null
+++ b/npc/010-1_Woodland/_warps.txt
@@ -0,0 +1,7 @@
+// 010-1 Woodland warps
+
+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,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
new file mode 100644
index 00000000..80142466
--- /dev/null
+++ b/npc/010-1_Woodland/monsters.txt
@@ -0,0 +1,40 @@
+// 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 SilkWorm 1035,2,60000,30000,Mob14::OnSilkWorm
+
+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;
+
+OnCobalt:
+ set @mobID, 1030;
+ callfunc "MobPoints";
+ break;
+
+OnSilkWorm:
+ set @mobID, 1035;
+ callfunc "MobPoints";
+ break;
+
+ end;
+}
diff --git a/npc/010-2_Dimond's_Cove/_import.txt b/npc/010-2_Dimond's_Cove/_import.txt
new file mode 100644
index 00000000..dc812c2d
--- /dev/null
+++ b/npc/010-2_Dimond's_Cove/_import.txt
@@ -0,0 +1,7 @@
+map: 010-2.gat
+npc: npc/010-2_Dimond's_Cove/_mobs.txt
+npc: npc/010-2_Dimond's_Cove/_warps.txt
+npc: npc/010-2_Dimond's_Cove/dimonds.txt
+npc: npc/010-2_Dimond's_Cove/doug.txt
+npc: npc/010-2_Dimond's_Cove/loratay.txt
+npc: npc/010-2_Dimond's_Cove/workers.txt
diff --git a/npc/010-2_Dimond's_Cove/_mobs.txt b/npc/010-2_Dimond's_Cove/_mobs.txt
new file mode 100644
index 00000000..7ccbfc8c
--- /dev/null
+++ b/npc/010-2_Dimond's_Cove/_mobs.txt
@@ -0,0 +1,7 @@
+// 010-2 Dimond's Cove mobs
+
+
+
+010-2.gat,0,0,0 script Mob010-2 -1,{
+ end;
+}
diff --git a/npc/010-2_Dimond's_Cove/_warps.txt b/npc/010-2_Dimond's_Cove/_warps.txt
new file mode 100644
index 00000000..8760c121
--- /dev/null
+++ b/npc/010-2_Dimond's_Cove/_warps.txt
@@ -0,0 +1,9 @@
+// 010-2 Dimond's Cove warps
+
+010-2.gat,27,24 warp ToCellar -1,-1,010-2.gat,35,68
+010-2.gat,32,45 warp ToOutdoor -1,-1,010-1.gat,36,95
+010-2.gat,40,27 warp To2ndFloor 1,-1,010-2.gat,82,26
+010-2.gat,36,68 warp To1stFloor -1,-1,010-2.gat,28,24
+010-2.gat,67,27 warp To3rdFloor 1,-1,010-2.gat,67,71
+010-2.gat,83,29 warp To1stFloor 1,-1,010-2.gat,40,27
+010-2.gat,67,73 warp To2ndFloor 1,-1,010-2.gat,67,28
diff --git a/npc/new_23-1-dimonds-cove/dimonds.txt b/npc/010-2_Dimond's_Cove/dimonds.txt
index 05d83b5c..713b0d69 100644
--- a/npc/new_23-1-dimonds-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/new_23-1-dimonds-cove/doug.txt b/npc/010-2_Dimond's_Cove/doug.txt
index 301ae9a7..49bb349c 100644
--- a/npc/new_23-1-dimonds-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/new_23-1-dimonds-cove/loratay.txt b/npc/010-2_Dimond's_Cove/loratay.txt
index 744557e7..559ba578 100644
--- a/npc/new_23-1-dimonds-cove/loratay.txt
+++ b/npc/010-2_Dimond's_Cove/loratay.txt
@@ -1,4 +1,4 @@
-new_23-1.gat,85,85,0 script Lora Tay 151,{
+010-2.gat,85,85,0 script Lora Tay 151,{
set @COTTON, 660;
set @SILK_COCOON, 718;
@@ -233,6 +233,7 @@ L_main_menu:
"Can you make fur boots for me?", -,
"Can you make winter gloves me?", -,
"Can you sew a robe for me?", L_robe,
+ "Can you make a desert hat for me?", L_desert_hat,
"Goodbye for now!", L_end;
mes "[Lora Tay the Seamstress]";
@@ -240,6 +241,65 @@ L_main_menu:
next;
goto L_main_menu;
+L_desert_hat:
+ mes "[Lora Tay the Seamstress]";
+ mes "The seamstress sighs.";
+ mes "\"One of these days it would be nice to have an actual challenge... yes, of course I can make a desert hat. A cotton headband, three pieces of cotton cloth. Hmm. And let's add 300 GP to that.\"";
+ next;
+
+ set @default_choice$, "Never mind.";
+ setarray @items, 724, 2140, 2141, 2142, 2143, 2144, 2145, 2146, 2147, 2148, 2149;
+ setarray @item_names$, "Here is a white headband", "Here is a red headband", "Here is a green headband", "Here is a dark blue headband", "Here is a yellow headband", "Here is a light blue headband", "Here is a pink headband", "Here is a black headband", "Here is a orange headband", "Here is a puple headband", "Here is a dark green headband";
+ set @items_nr, 11;
+
+ callsub SUB_pick_one_of_many_items;
+ if (@item == 0) goto L_main_menu;
+
+ if (@item == 724)
+ set @genitem, 723;
+ if (@item != 724)
+ set @genitem, @item - 10;
+
+ if (countitem(@item) < 1)
+ goto L_desert_hat_noheadband;
+ if (countitem(@COTTON) < 3)
+ goto L_desert_hat_nocotton;
+ if (zeny < 300)
+ goto L_desert_hat_nogp;
+
+ delitem @item, 1;
+ delitem @COTTON, 3;
+ set zeny, zeny - 300;
+ getitem @genitem, 1;
+ mes "[Lora Tay the Seamstress]";
+ mes "\"Now then, this should only take a minute.\"";
+ mes "The seamstress folds your cotton cloth in a complicated fashion, wraps the resulting bundle into and out of the headband, and finally sews together several loose ends.";
+ next;
+ mes "[Lora Tay the Seamstress]";
+ mes "The result resembles a huge knot.";
+ mes "Lora picks two ends and pulls, hard-- to your amazement, the knot unfolds, yielding a desert hat.";
+ mes "\"Here you are.\"";
+ next;
+ goto L_main_menu;
+
+L_desert_hat_nocotton:
+ mes "[Lora Tay the Seamstress]";
+ mes "\"You're asking me to make a desert hat without enough cloth? Here, have your headband back-- see, that's how much I can do without cloth! And since I'm generous today, you can even keep your GP...\"";
+ next;
+ goto L_main_menu;
+
+L_desert_hat_nogp:
+ mes "[Lora Tay the Seamstress]";
+ mes "\"No, no, no. 300 GP. That's not that much, I've been told. I can't just work for free, now can I?\"";
+ next;
+ goto L_main_menu;
+
+L_desert_hat_noheadband:
+ mes "[Lora Tay the Seamstress]";
+ mes "\"Now that is odd. Where did your headband vanish to? Well, I'm not going to make you something as silly as a headband, so get one from elsewhere.\"";
+ next;
+ goto L_main_menu;
+
L_trim:
mes "[Lora Tay the Seamstress]";
mes "\"Trimming... you mean that you can't do that yourself? Well, alright... I suppose I should charge 100 GP and do it.\"";
@@ -249,8 +309,8 @@ L_trim:
set @default_choice$, "Never mind.";
setarray @items, 1202, 2050, 2051, 2052, 2053, 2054, 2055, 2056, 2057, 2058, 2059,
688, 2090, 2091, 2092, 2093, 2094, 2095, 2096, 2097, 2098, 2099;
- setarray @item_names$, "cotton shirt", "red cotton shirt", "green cotton shirt", "dark blue cotton shirt", "yellow cotton shirt", "light blue cotton shirt", "pink cotton shirt", "black cotton shirt", "orange cotton shirt", "puple cotton shirt", "cotton shirt 9",
- "tank top", "red tank top", "green tank top", "dark blue tank top", "yellow tank top", "light blue tank top", "pink tank top", "black tank top", "orange tank top", "purple tank top", "tank top 9";
+ setarray @item_names$, "cotton shirt", "red cotton shirt", "green cotton shirt", "dark blue cotton shirt", "yellow cotton shirt", "light blue cotton shirt", "pink cotton shirt", "black cotton shirt", "orange cotton shirt", "puple cotton shirt", "dark green cotton shirt",
+ "tank top", "red tank top", "green tank top", "dark blue tank top", "yellow tank top", "light blue tank top", "pink tank top", "black tank top", "orange tank top", "purple tank top", "dark green tank top";
set @items_nr, 22;
callsub SUB_pick_one_of_many_items;
if (@item == 0) goto L_main_menu;
@@ -297,8 +357,8 @@ L_lengthen:
set @default_choice$, "Never mind.";
setarray @items, 688, 2090, 2091, 2092, 2093, 2094, 2095, 2096, 2097, 2098, 2099,
689, 2120, 2121, 2122, 2123, 2124, 2125, 2126, 2127, 2128, 2129;
- setarray @item_names$, "tank top", "red tank top", "green tank top", "dark blue tank top", "yellow tank top", "light blue tank top", "pink tank top", "black tank top", "orange tank top", "purple tank top", "tank top 9",
- "short tank top", "red short tank top", "green short tank top", "dark blue short tank top", "yellow short tank top", "light blue short tank top", "pink short tank top", "black short tank top", "orange short tank top", "purple short tank top", "short tank top 9";
+ setarray @item_names$, "tank top", "red tank top", "green tank top", "dark blue tank top", "yellow tank top", "light blue tank top", "pink tank top", "black tank top", "orange tank top", "purple tank top", "dark green tank top",
+ "short tank top", "red short tank top", "green short tank top", "dark blue short tank top", "yellow short tank top", "light blue short tank top", "pink short tank top", "black short tank top", "orange short tank top", "purple short tank top", "dark green short tank top";
set @items_nr, 22;
callsub SUB_pick_one_of_many_items;
if (@item == 0) goto L_main_menu;
diff --git a/npc/new_23-1-dimonds-cove/workers.txt b/npc/010-2_Dimond's_Cove/workers.txt
index 5579dadd..13704115 100644
--- a/npc/new_23-1-dimonds-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/_import.txt b/npc/011-1_Woodland/_import.txt
new file mode 100644
index 00000000..ce529acf
--- /dev/null
+++ b/npc/011-1_Woodland/_import.txt
@@ -0,0 +1,6 @@
+map: 011-1.gat
+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/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
new file mode 100644
index 00000000..9d20aeaa
--- /dev/null
+++ b/npc/011-1_Woodland/_mobs.txt
@@ -0,0 +1,7 @@
+// 011-1 Woodland mobs
+
+
+
+011-1.gat,0,0,0 script Mob011-1 -1,{
+ end;
+}
diff --git a/npc/011-1_Woodland/_warps.txt b/npc/011-1_Woodland/_warps.txt
new file mode 100644
index 00000000..345ffbe2
--- /dev/null
+++ b/npc/011-1_Woodland/_warps.txt
@@ -0,0 +1,7 @@
+// 011-1 Woodland warps
+
+011-1.gat,58,92 warp ToCave -1,-1,011-3.gat,15,15
+011-1.gat,30,61 warp ToWoodland -1,1,014-1.gat,180,90
+011-1.gat,49,104 warp ToWoodland 0,-1,010-1.gat,50,25
+011-1.gat,125,62 warp ToWoodland -1,2,008-1.gat,27,61
+011-1.gat,73,11 warp ToWoodlandHills 0,-1,012-1.gat,131,162
diff --git a/npc/new_9-1-woodland/alchemist.txt b/npc/011-1_Woodland/alchemist.txt
index ed6582fa..08ba6e41 100644
--- a/npc/new_9-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
new file mode 100644
index 00000000..60a0688e
--- /dev/null
+++ b/npc/011-1_Woodland/monsters.txt
@@ -0,0 +1,34 @@
+// 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 SilkWorm 1035,2,60000,30000,Mob9::OnSilkWorm
+
+011-1.gat,0,0,0 script Mob9 -1,{
+OnEvilMushroom:
+ set @mobID, 1013;
+ callfunc "MobPoints";
+ break;
+
+OnFlower:
+ set @mobID, 1014;
+ callfunc "MobPoints";
+ break;
+
+OnAlizarin:
+ set @mobID, 1032;
+ callfunc "MobPoints";
+ break;
+
+OnSilkWorm:
+ set @mobID, 1035;
+ callfunc "MobPoints";
+ break;
+
+ end;
+}
diff --git a/npc/011-1_Woodland/oscar.txt b/npc/011-1_Woodland/oscar.txt
new file mode 100644
index 00000000..20f9a7b5
--- /dev/null
+++ b/npc/011-1_Woodland/oscar.txt
@@ -0,0 +1 @@
+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/_import.txt b/npc/011-3_Hermit's_cave/_import.txt
new file mode 100644
index 00000000..5cf9225b
--- /dev/null
+++ b/npc/011-3_Hermit's_cave/_import.txt
@@ -0,0 +1,5 @@
+map: 011-3.gat
+npc: npc/011-3_Hermit's_cave/_mobs.txt
+npc: npc/011-3_Hermit's_cave/_warps.txt
+npc: npc/011-3_Hermit's_cave/hermit.txt
+npc: npc/011-3_Hermit's_cave/monsters.txt
diff --git a/npc/011-3_Hermit's_cave/_mobs.txt b/npc/011-3_Hermit's_cave/_mobs.txt
new file mode 100644
index 00000000..39ac018b
--- /dev/null
+++ b/npc/011-3_Hermit's_cave/_mobs.txt
@@ -0,0 +1,7 @@
+// 011-3 Hermit's cave mobs
+
+
+
+011-3.gat,0,0,0 script Mob011-3 -1,{
+ end;
+}
diff --git a/npc/011-3_Hermit's_cave/_warps.txt b/npc/011-3_Hermit's_cave/_warps.txt
new file mode 100644
index 00000000..be9b6a83
--- /dev/null
+++ b/npc/011-3_Hermit's_cave/_warps.txt
@@ -0,0 +1,3 @@
+// 011-3 Hermit's cave warps
+
+011-3.gat,31,21 warp ToLakeCave -1,-1,011-4.gat,72,11
diff --git a/npc/new_4-1-cave-small/hermit.txt b/npc/011-3_Hermit's_cave/hermit.txt
index 2ef32941..0c6f7550 100644
--- a/npc/new_4-1-cave-small/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
new file mode 100644
index 00000000..37da9f40
--- /dev/null
+++ b/npc/011-3_Hermit's_cave/monsters.txt
@@ -0,0 +1,21 @@
+// Map: 011-3
+// This is the Hermit's Cave -- level 1.
+//
+
+011-3.gat,0,0,0,0 monster Bat 1017,10,0,0,Mob4::OnBat
+
+011-3.gat,0,0,0,0 monster SilkWorm 1035,3,60000,30000,Mob4::OnSilkWorm
+
+011-3.gat,0,0,0 script Mob4 -1,{
+OnBat:
+ set @mobID, 1017;
+ callfunc "MobPoints";
+ break;
+
+OnSilkWorm:
+ set @mobID, 1035;
+ callfunc "MobPoints";
+ break;
+
+ end;
+}
diff --git a/npc/011-4_Lake_cave/_import.txt b/npc/011-4_Lake_cave/_import.txt
new file mode 100644
index 00000000..f2cfbc87
--- /dev/null
+++ b/npc/011-4_Lake_cave/_import.txt
@@ -0,0 +1,4 @@
+map: 011-4.gat
+npc: npc/011-4_Lake_cave/_mobs.txt
+npc: npc/011-4_Lake_cave/_warps.txt
+npc: npc/011-4_Lake_cave/monsters.txt
diff --git a/npc/011-4_Lake_cave/_mobs.txt b/npc/011-4_Lake_cave/_mobs.txt
new file mode 100644
index 00000000..62bb6fb4
--- /dev/null
+++ b/npc/011-4_Lake_cave/_mobs.txt
@@ -0,0 +1,19 @@
+// 011-4 Lake cave mobs
+
+011-4.gat,51,29,39,39 monster Shroom 1019,1,0,0,Mob011-4::On1019
+011-4.gat,93,114,39,39 monster Lamp Snake 1021,1,0,0,Mob011-4::On1021
+
+
+011-4.gat,0,0,0 script Mob011-4 -1,{
+On1019:
+ set @mobID, 1019;
+ callfunc "MobPoints";
+ break;
+
+On1021:
+ set @mobID, 1021;
+ callfunc "MobPoints";
+ break;
+
+ end;
+}
diff --git a/npc/011-4_Lake_cave/_warps.txt b/npc/011-4_Lake_cave/_warps.txt
new file mode 100644
index 00000000..e0fe5a00
--- /dev/null
+++ b/npc/011-4_Lake_cave/_warps.txt
@@ -0,0 +1,4 @@
+// 011-4 Lake cave warps
+
+011-4.gat,73,8 warp ToHermitsCave 0,-1,011-3.gat,31,24
+011-4.gat,129,86 warp ToCaveBeneathHurnscald -1,-1,009-3.gat,21,55
diff --git a/npc/new_17-1-cave-big/monsters.txt b/npc/011-4_Lake_cave/monsters.txt
index 95d09026..d3b78249 100644
--- a/npc/new_17-1-cave-big/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/_import.txt b/npc/012-1_Woodland_Hills/_import.txt
new file mode 100644
index 00000000..851f97fc
--- /dev/null
+++ b/npc/012-1_Woodland_Hills/_import.txt
@@ -0,0 +1,5 @@
+map: 012-1.gat
+npc: npc/012-1_Woodland_Hills/_mobs.txt
+npc: npc/012-1_Woodland_Hills/_warps.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
new file mode 100644
index 00000000..8bb05fe9
--- /dev/null
+++ b/npc/012-1_Woodland_Hills/_mobs.txt
@@ -0,0 +1,7 @@
+// 012-1 Woodland Hills mobs
+
+
+
+012-1.gat,0,0,0 script Mob012-1 -1,{
+ end;
+}
diff --git a/npc/012-1_Woodland_Hills/_warps.txt b/npc/012-1_Woodland_Hills/_warps.txt
new file mode 100644
index 00000000..f8c58466
--- /dev/null
+++ b/npc/012-1_Woodland_Hills/_warps.txt
@@ -0,0 +1,12 @@
+// 012-1 Woodland Hills warps
+
+012-1.gat,51,39 warp ToCaves -1,-1,012-3.gat,370,45
+012-1.gat,41,48 warp ToCaves -1,-1,012-3.gat,353,78
+012-1.gat,44,88 warp ToCaves -1,-1,012-3.gat,354,187
+012-1.gat,92,104 warp ToCaves -1,-1,012-3.gat,270,111
+012-1.gat,98,99 warp ToCaves -1,-1,012-3.gat,36,81
+012-1.gat,109,92 warp ToCaves -1,-1,012-3.gat,79,73
+012-1.gat,123,90 warp ToCaves -1,-1,012-3.gat,38,156
+012-1.gat,150,61 warp ToWoodlandHills -1,2,013-1.gat,21,75
+012-1.gat,132,163 warp ToWoodland 0,-1,011-1.gat,72,16
+012-1.gat,65,126 warp ToCaves -1,-1,012-3.gat,176,139
diff --git a/npc/012-1_Woodland_Hills/monsters.txt b/npc/012-1_Woodland_Hills/monsters.txt
new file mode 100644
index 00000000..8b7c5c1b
--- /dev/null
+++ b/npc/012-1_Woodland_Hills/monsters.txt
@@ -0,0 +1,52 @@
+// 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,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
+
+012-1.gat,0,0,0,0 monster SilkWorm 1035,5,6000,3000,Mob26::OnSilkWorm
+
+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;
+
+ end;
+}
diff --git a/npc/012-1_Woodland_Hills/shops.txt b/npc/012-1_Woodland_Hills/shops.txt
new file mode 100644
index 00000000..b29e5542
--- /dev/null
+++ b/npc/012-1_Woodland_Hills/shops.txt
@@ -0,0 +1,3 @@
+//
+
+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/_import.txt b/npc/012-3_Cave/_import.txt
new file mode 100644
index 00000000..92995992
--- /dev/null
+++ b/npc/012-3_Cave/_import.txt
@@ -0,0 +1,4 @@
+map: 012-3.gat
+npc: npc/012-3_Cave/_mobs.txt
+npc: npc/012-3_Cave/_warps.txt
+npc: npc/012-3_Cave/monsters.txt
diff --git a/npc/012-3_Cave/_mobs.txt b/npc/012-3_Cave/_mobs.txt
new file mode 100644
index 00000000..70c39e3d
--- /dev/null
+++ b/npc/012-3_Cave/_mobs.txt
@@ -0,0 +1,7 @@
+// 012-3 Cave mobs
+
+
+
+012-3.gat,0,0,0 script Mob012-3 -1,{
+ end;
+}
diff --git a/npc/012-3_Cave/_warps.txt b/npc/012-3_Cave/_warps.txt
new file mode 100644
index 00000000..58e842ba
--- /dev/null
+++ b/npc/012-3_Cave/_warps.txt
@@ -0,0 +1,11 @@
+// 012-3 Cave warps
+
+012-3.gat,37,82 warp CaveExit 0,-1,012-1.gat,98,100
+012-3.gat,80,74 warp CaveExit 0,-1,012-1.gat,109,93
+012-3.gat,39,157 warp CaveExit 0,-1,012-1.gat,123,91
+012-3.gat,270,112 warp CaveExit -1,-1,012-1.gat,92,105
+012-3.gat,176,138 warp CaveExit -1,-1,012-1.gat,65,127
+012-3.gat,355,188 warp CaveExit 0,-1,012-1.gat,44,89
+012-3.gat,371,46 warp CaveExit 0,-1,012-1.gat,51,40
+012-3.gat,354,79 warp CaveExit 0,-1,012-1.gat,41,48
+012-3.gat,473,104 warp CaveExit -1,1,012-1.gat,146,67
diff --git a/npc/new_27-1-hill2/monsters.txt b/npc/012-3_Cave/monsters.txt
index bb0799bb..e6f4cf79 100644
--- a/npc/new_27-1-hill2/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/_import.txt b/npc/013-1_Woodland_hills/_import.txt
new file mode 100644
index 00000000..c4c325bc
--- /dev/null
+++ b/npc/013-1_Woodland_hills/_import.txt
@@ -0,0 +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
diff --git a/npc/013-1_Woodland_hills/_mobs.txt b/npc/013-1_Woodland_hills/_mobs.txt
new file mode 100644
index 00000000..159476a8
--- /dev/null
+++ b/npc/013-1_Woodland_hills/_mobs.txt
@@ -0,0 +1,7 @@
+// 013-1 Woodland hills mobs
+
+
+
+013-1.gat,0,0,0 script Mob013-1 -1,{
+ end;
+}
diff --git a/npc/013-1_Woodland_hills/_warps.txt b/npc/013-1_Woodland_hills/_warps.txt
new file mode 100644
index 00000000..b27c118c
--- /dev/null
+++ b/npc/013-1_Woodland_hills/_warps.txt
@@ -0,0 +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,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
new file mode 100644
index 00000000..6d6e8443
--- /dev/null
+++ b/npc/013-1_Woodland_hills/monsters.txt
@@ -0,0 +1,63 @@
+// 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,2,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 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;
+
+ end;
+}
diff --git a/npc/013-2_Magic_house/_import.txt b/npc/013-2_Magic_house/_import.txt
new file mode 100644
index 00000000..3be5cbed
--- /dev/null
+++ b/npc/013-2_Magic_house/_import.txt
@@ -0,0 +1,6 @@
+map: 013-2.gat
+npc: npc/013-2_Magic_house/_mobs.txt
+npc: npc/013-2_Magic_house/_warps.txt
+npc: npc/013-2_Magic_house/apprentice.txt
+npc: npc/013-2_Magic_house/notes.txt
+npc: npc/013-2_Magic_house/wizard.txt
diff --git a/npc/013-2_Magic_house/_mobs.txt b/npc/013-2_Magic_house/_mobs.txt
new file mode 100644
index 00000000..4215f188
--- /dev/null
+++ b/npc/013-2_Magic_house/_mobs.txt
@@ -0,0 +1,7 @@
+// 013-2 Magic house mobs
+
+
+
+013-2.gat,0,0,0 script Mob013-2 -1,{
+ end;
+}
diff --git a/npc/013-2_Magic_house/_warps.txt b/npc/013-2_Magic_house/_warps.txt
new file mode 100644
index 00000000..56df14d3
--- /dev/null
+++ b/npc/013-2_Magic_house/_warps.txt
@@ -0,0 +1,5 @@
+// 013-2 Magic house warps
+
+013-2.gat,63,43 warp toOutside -1,-1,013-1.gat,42,91
+013-2.gat,67,36 warp toRoom -1,-1,013-2.gat,21,41
+013-2.gat,21,42 warp toRoom -1,-1,013-2.gat,67,37
diff --git a/npc/new_36-1-magic-house/apprentice.txt b/npc/013-2_Magic_house/apprentice.txt
index b27d271d..ce3db4ad 100644
--- a/npc/new_36-1-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/new_36-1-magic-house/notes.txt b/npc/013-2_Magic_house/notes.txt
index dbcb1209..c30f7c46 100644
--- a/npc/new_36-1-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/new_36-1-magic-house/wizard.txt b/npc/013-2_Magic_house/wizard.txt
index ec7deb36..25f30122 100644
--- a/npc/new_36-1-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/013-3_Cave/_import.txt b/npc/013-3_Cave/_import.txt
new file mode 100644
index 00000000..79b734a4
--- /dev/null
+++ b/npc/013-3_Cave/_import.txt
@@ -0,0 +1,7 @@
+map: 013-3.gat
+npc: npc/013-3_Cave/_mobs.txt
+npc: npc/013-3_Cave/_warps.txt
+npc: npc/013-3_Cave/barrier.txt
+npc: npc/013-3_Cave/mask_chest.txt
+npc: npc/013-3_Cave/misc.txt
+npc: npc/013-3_Cave/sword_chest.txt
diff --git a/npc/013-3_Cave/_mobs.txt b/npc/013-3_Cave/_mobs.txt
new file mode 100644
index 00000000..b89dc170
--- /dev/null
+++ b/npc/013-3_Cave/_mobs.txt
@@ -0,0 +1,86 @@
+// 013-3 Cave mobs
+
+013-3.gat,28,89,16,52 monster Cave Snake 1021,10,0,0,Mob013-3::On1021
+013-3.gat,61,22,2,2 monster Fire Skull 1023,3,0,0,Mob013-3::On1023
+013-3.gat,81,22,2,2 monster Poison Skull 1024,3,0,0,Mob013-3::On1024
+013-3.gat,109,31,6,22 monster Black Scorpion 1009,20,0,0,Mob013-3::On1009
+013-3.gat,119,84,27,38 monster Spider 1012,20,0,0,Mob013-3::On1012
+013-3.gat,176,23,5,6 monster Spider 1012,10,0,0,Mob013-3::On1012
+013-3.gat,82,75,2,2 monster Fire skull 1023,1,0,0,Mob013-3::On1023
+013-3.gat,142,37,2,2 monster Poison skull 1024,1,0,0,Mob013-3::On1024
+013-3.gat,79,134,21,16 monster Scorpion 1003,5,0,0,Mob013-3::On1003
+013-3.gat,71,169,38,17 monster Red scorpion 1004,5,0,0,Mob013-3::On1004
+013-3.gat,64,85,9,21 monster Black scorpion 1009,10,0,0,Mob013-3::On1009
+013-3.gat,81,92,3,20 monster Black scorpion 1009,10,0,0,Mob013-3::On1009
+013-3.gat,162,84,33,37 monster Snake 1010,30,0,0,Mob013-3::On1010
+013-3.gat,162,85,33,37 monster Spider 1012,30,0,0,Mob013-3::On1012
+013-3.gat,172,77,18,25 monster Black scorpion 1009,15,0,0,Mob013-3::On1009
+013-3.gat,145,36,20,15 monster Red slime 1008,25,0,0,Mob013-3::On1008
+013-3.gat,167,37,23,11 monster Snake 1010,20,0,0,Mob013-3::On1010
+013-3.gat,165,25,16,11 monster Black scorpion 1009,15,0,0,Mob013-3::On1009
+013-3.gat,71,39,2,3 monster Cave snake 1021,2,0,0,Mob013-3::On1021
+013-3.gat,159,102,3,5 monster Yellow slime 1007,2,0,0,Mob013-3::On1007
+013-3.gat,67,22,2,2 monster Maggot 1002,2,0,0,Mob013-3::On1002
+013-3.gat,75,22,2,2 monster Maggot 1002,2,0,0,Mob013-3::On1002
+013-3.gat,76,39,7,4 monster Black scorpion 1009,8,0,0,Mob013-3::On1009
+013-3.gat,65,39,7,4 monster Red slime 1008,8,0,0,Mob013-3::On1008
+
+
+013-3.gat,0,0,0 script Mob013-3 -1,{
+On1002:
+ set @mobID, 1002;
+ callfunc "MobPoints";
+ break;
+
+On1003:
+ set @mobID, 1003;
+ callfunc "MobPoints";
+ break;
+
+On1004:
+ set @mobID, 1004;
+ callfunc "MobPoints";
+ break;
+
+On1007:
+ set @mobID, 1007;
+ callfunc "MobPoints";
+ break;
+
+On1008:
+ set @mobID, 1008;
+ callfunc "MobPoints";
+ break;
+
+On1009:
+ set @mobID, 1009;
+ callfunc "MobPoints";
+ break;
+
+On1010:
+ set @mobID, 1010;
+ callfunc "MobPoints";
+ break;
+
+On1012:
+ set @mobID, 1012;
+ callfunc "MobPoints";
+ break;
+
+On1021:
+ set @mobID, 1021;
+ callfunc "MobPoints";
+ break;
+
+On1023:
+ set @mobID, 1023;
+ callfunc "MobPoints";
+ break;
+
+On1024:
+ set @mobID, 1024;
+ callfunc "MobPoints";
+ break;
+
+ end;
+}
diff --git a/npc/013-3_Cave/_warps.txt b/npc/013-3_Cave/_warps.txt
new file mode 100644
index 00000000..d28235eb
--- /dev/null
+++ b/npc/013-3_Cave/_warps.txt
@@ -0,0 +1,29 @@
+// 013-3 Cave warps
+
+013-3.gat,28,20 warp hiddenExit -1,-1,013-1.gat,126,102
+013-3.gat,34,63 warp toOutside -1,-1,013-1.gat,125,102
+013-3.gat,36,96 warp toCave -1,-1,013-3.gat,79,126
+013-3.gat,79,125 warp toCave -1,-1,013-3.gat,35,96
+013-3.gat,22,115 warp toOutside -1,-1,018-1.gat,115,41
+013-3.gat,139,45 warp toOutside -1,-1,018-1.gat,127,37
+013-3.gat,61,179 warp toOutside -1,-1,018-1.gat,134,46
+013-3.gat,69,143 warp toCave -1,-1,018-3.gat,50,89
+013-3.gat,81,103 warp toOutside -1,-1,018-1.gat,147,41
+013-3.gat,177,91 warp toOutside -1,-1,018-1.gat,177,21
+013-3.gat,178,44 warp toCave -1,-1,018-3.gat,97,70
+013-3.gat,169,45 warp toCave -1,-1,018-3.gat,27,55
+013-3.gat,152,28 warp toCave -1,-1,018-3.gat,134,60
+013-3.gat,123,104 warp toCave -1,-1,018-3.gat,172,22
+013-3.gat,147,104 warp toCave -1,-1,018-3.gat,177,22
+013-3.gat,158,66 warp toCave -1,-1,018-3.gat,27,90
+013-3.gat,75,51 warp toCave -1,-1,013-3.gat,75,52
+013-3.gat,109,64 warp toCave -1,-1,013-3.gat,75,50
+013-3.gat,67,51 warp toCave -1,-1,018-3.gat,90,51
+013-3.gat,71,20 warp toCave -1,-1,013-3.gat,28,40
+013-3.gat,28,41 warp toCave -1,-1,013-3.gat,71,21
+013-3.gat,71,42 warp toCave -1,-1,013-3.gat,109,21
+013-3.gat,109,20 warp toCave -1,-1,013-3.gat,71,41
+013-3.gat,111,42 warp toCave -1,-1,018-3.gat,71,123
+013-3.gat,62,100 warp toCave -1,-1,018-3.gat,174,86
+013-3.gat,68,97 warp toCave -1,-1,018-3.gat,102,70
+013-3.gat,160,102 warp toCave -1,-1,009-3.gat,117,20
diff --git a/npc/013-3_Cave/barrier.txt b/npc/013-3_Cave/barrier.txt
new file mode 100644
index 00000000..90d10ce5
--- /dev/null
+++ b/npc/013-3_Cave/barrier.txt
@@ -0,0 +1,17 @@
+//
+
+013-3.gat,71,21,0 script #DemonMineBarrier1 127,1,1,{
+ if (QUEST_demon_mines >= 2) close;
+
+ if (QUEST_demon_mines == 1 && countitem(1198) >= 1) goto L_Has_Jack_O_Soul;
+
+ mes "A barrier around the opening pushes you back as you approach.";
+
+ warp "013-3.gat", 71, 25;
+ close;
+
+L_Has_Jack_O_Soul:
+ mes "The barrier around the opening allows you passage.";
+ set QUEST_demon_mines, 2;
+ delitem 1198, 1;
+}
diff --git a/npc/013-3_Cave/mask_chest.txt b/npc/013-3_Cave/mask_chest.txt
new file mode 100644
index 00000000..0dbbf415
--- /dev/null
+++ b/npc/013-3_Cave/mask_chest.txt
@@ -0,0 +1,151 @@
+//
+
+013-3.gat,28,27,0 script Chest#DemonMask 111,{
+ if (QUEST_demon_mines < 2) goto L_This_shouldn_t_happen;
+ if (QUEST_demon_mines == 3) goto L_Finished;
+
+ if (countitem(505) == 0) goto L_No_maggot_slime;
+ if (countitem(566) == 0) goto L_No_mushroom;
+ if (countitem(565) == 0) goto L_No_petal;
+
+ if (countitem(700) == 0) goto L_No_pearl;
+ if (countitem(613) == 0) goto L_No_hard_spike;
+ if (countitem(569) == 0) goto L_No_raw_log;
+
+ if (countitem(614) == 0) goto L_No_pink_antenna;
+ if (countitem(710) == 0 || countitem(711) == 0 || countitem(712) == 0 || countitem(713) == 0) goto L_No_tongues;
+ if (countitem(537) == 0) goto L_No_treasure_key;
+
+ if (countitem(701) == 0) goto L_No_ash;
+ if (countitem(680) == 0 || countitem(681) == 0 || countitem(682) == 0 || countitem(683) == 0) goto L_No_herbs;
+ if (countitem(518) == 0) goto L_No_bug_leg;
+
+ if (countitem(612) == 0) goto L_No_lamp;
+ if (countitem(640) == 0) goto L_No_iron_ore;
+ if (countitem(507) == 0 || countitem(517) == 0 || countitem(709) == 0) goto L_No_stingers;
+
+ if (countitem(718) == 0) goto L_No_silk;
+ if (countitem(611) == 0) goto L_No_fur;
+ if (countitem(631) == 0) goto L_No_dark_crystal;
+
+ if (countitem(541) == 0) goto L_No_water;
+
+ delitem 505, 1;
+ delitem 518, 1;
+ delitem 718, 1;
+ delitem 566, 1;
+ delitem 565, 1;
+ delitem 700, 1;
+ delitem 613, 1;
+ delitem 569, 1;
+ delitem 614, 1;
+ delitem 631, 1;
+ delitem 630, 1;
+ delitem 507, 1;
+ delitem 517, 1;
+ delitem 709, 1;
+ delitem 710, 1;
+ delitem 711, 1;
+ delitem 712, 1;
+ delitem 713, 1;
+ delitem 680, 1;
+ delitem 681, 1;
+ delitem 682, 1;
+ delitem 683, 1;
+ delitem 537, 1;
+ delitem 612, 1;
+ delitem 701, 1;
+ delitem 541, 1;
+
+ mes "You managed to preform the ritual and open the chest.";
+ getitem 679, 1;
+ mes "You found a demon mask inside.";
+ set QUEST_demon_mines, 3;
+ close;
+
+L_No_maggot_slime:
+ mes "You do not have any maggot slime.";
+ close;
+
+L_No_mushroom:
+ mes "You do not have a mushroom, neither big, nor small.";
+ close;
+
+L_No_petal:
+ mes "You can't seem to find that petal you had.";
+ close;
+
+L_No_pearl:
+ mes "You do not have a pearl, let alone one from the sea.";
+ close;
+
+L_No_hard_spike:
+ mes "You weren't able to find a hard spike in the stuff you brought.";
+ close;
+
+L_No_raw_log:
+ mes "You don't have any wood.";
+ close;
+
+L_No_pink_antenna:
+ mes "You aren't carrying any antenna.";
+ close;
+
+L_No_tongues:
+ mes "You don't four different snake tongues.";
+ close;
+
+L_No_treasure_key:
+ mes "No treasure chest key, no opening ritual.";
+ close;
+
+L_No_ash:
+ mes "You still need a pile of ash.";
+ close;
+
+L_No_herbs:
+ mes "Four different herbs are needed to get this thing open.";
+ close;
+
+L_No_bug_leg:
+ mes "You do not have part of a bug on you. That is rather odd considering what you went through to get here.";
+ close;
+
+L_No_lamp:
+ mes "You do not have a lamp. Yet, somehow, you were able to get this far into this dark cave.";
+ close;
+
+L_No_iron_ore:
+ mes "\"Rock and metal, as one.\" You don't seem to have anything that fits the bill.";
+ close;
+
+L_No_stingers:
+ mes "Three scorpion deaths are still missing.";
+ close;
+
+L_No_silk:
+ mes "You could not find the womb for a butterfly among your stuff.";
+ close;
+
+L_No_fur:
+ mes "You wonder how you can carry the \"gentle caress of a creature without blemish.\" But you need it to get this thing open.";
+ close;
+
+L_No_dark_crystal:
+ mes "A piece of darkness is missing.";
+ close;
+
+L_No_water:
+ mes "Just one bottle of water and you can start the ritual.";
+ close;
+
+L_This_shouldn_t_happen:
+ warp "013-3.gat", 71, 25;
+ // You need to go through the barrier to get to the chest, so this shouldn't happen. So just warp them like the barrier does.
+ close;
+
+L_Finished:
+ mes "[Chest]";
+ mes "You already opened this chest.";
+ close;
+}
diff --git a/npc/013-3_Cave/misc.txt b/npc/013-3_Cave/misc.txt
new file mode 100644
index 00000000..8f7da034
--- /dev/null
+++ b/npc/013-3_Cave/misc.txt
@@ -0,0 +1,6 @@
+//
+
+013-3.gat,127,68,0 script Chest 111,{
+ mes "You can't see any way to open this chest.";
+ close;
+}
diff --git a/npc/013-3_Cave/sword_chest.txt b/npc/013-3_Cave/sword_chest.txt
new file mode 100644
index 00000000..aad6dde8
--- /dev/null
+++ b/npc/013-3_Cave/sword_chest.txt
@@ -0,0 +1,31 @@
+//
+
+013-3.gat,177,22,0 script Chest 111,{
+ if( ChestQuest && 2) goto L_Finished;
+
+ mes "[Chest]";
+ mes "Would you try to open it?";
+ next;
+ menu
+ "Yes", L_Yes,
+ "No", -;
+ close;
+
+L_Yes:
+ if(countitem(537) < 10) goto L_Not_Enough;
+ delitem 537, 3;
+ getitem 536, 1;
+ mes "[Chest]";
+ mes "You opened it and found a short sword!";
+ set ChestQuest, ChestQuest || 2;
+ close;
+
+L_Not_Enough:
+ mes "It seems that this is not the right key...";
+ close;
+
+L_Finished:
+ mes "[Chest]";
+ mes "You already opened this chest.";
+ close;
+}
diff --git a/npc/014-1_Woodland/_import.txt b/npc/014-1_Woodland/_import.txt
new file mode 100644
index 00000000..6160ff13
--- /dev/null
+++ b/npc/014-1_Woodland/_import.txt
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 00000000..3fd75a93
--- /dev/null
+++ b/npc/014-1_Woodland/_mobs.txt
@@ -0,0 +1,7 @@
+// 014-1 Woodland mobs
+
+
+
+014-1.gat,0,0,0 script Mob014-1 -1,{
+ end;
+}
diff --git a/npc/014-1_Woodland/_warps.txt b/npc/014-1_Woodland/_warps.txt
new file mode 100644
index 00000000..5922f1f1
--- /dev/null
+++ b/npc/014-1_Woodland/_warps.txt
@@ -0,0 +1,5 @@
+// 014-1 Woodland warps
+
+014-1.gat,109,91 warp ToWoodland -1,1,011-1.gat,31,62
+014-1.gat,93,58 warp ToCave -1,-1,014-3.gat,56,172
+014-1.gat,76,38 warp ToCave -1,-1,014-3.gat,35,33
diff --git a/npc/014-1_Woodland/monsters.txt b/npc/014-1_Woodland/monsters.txt
new file mode 100644
index 00000000..9805d037
--- /dev/null
+++ b/npc/014-1_Woodland/monsters.txt
@@ -0,0 +1,69 @@
+// 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,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
+
+014-1.gat,0,0,0,0 monster SilkWorm 1035,4,6000,3000,Mob29::OnSilkWorm
+
+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;
+
+ end;
+}
diff --git a/npc/new_29-1-west-woodland/taro.txt b/npc/014-1_Woodland/taro.txt
index db6b4551..3ec76163 100644
--- a/npc/new_29-1-west-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/new_29-1-west-woodland/wedding-officiator.txt b/npc/014-1_Woodland/wedding-officiator.txt
index 93a27c6d..7a6e606b 100644
--- a/npc/new_29-1-west-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/_import.txt b/npc/014-3_Cave/_import.txt
new file mode 100644
index 00000000..c9f668ac
--- /dev/null
+++ b/npc/014-3_Cave/_import.txt
@@ -0,0 +1,4 @@
+map: 014-3.gat
+npc: npc/014-3_Cave/_mobs.txt
+npc: npc/014-3_Cave/_warps.txt
+npc: npc/014-3_Cave/monsters.txt
diff --git a/npc/014-3_Cave/_mobs.txt b/npc/014-3_Cave/_mobs.txt
new file mode 100644
index 00000000..417a4ef0
--- /dev/null
+++ b/npc/014-3_Cave/_mobs.txt
@@ -0,0 +1,7 @@
+// 014-3 Cave mobs
+
+
+
+014-3.gat,0,0,0 script Mob014-3 -1,{
+ end;
+}
diff --git a/npc/014-3_Cave/_warps.txt b/npc/014-3_Cave/_warps.txt
new file mode 100644
index 00000000..39704f98
--- /dev/null
+++ b/npc/014-3_Cave/_warps.txt
@@ -0,0 +1,6 @@
+// 014-3 Cave warps
+
+014-3.gat,35,32 warp ToOutside -1,-1,014-1.gat,76,39
+014-3.gat,57,173 warp ToOutside 0,-1,014-1.gat,93,59
+014-3.gat,91,108 warp ToCave -1,-1,014-3.gat,103,53
+014-3.gat,103,54 warp ToCave -1,-1,014-3.gat,91,109
diff --git a/npc/new_30-1-west-woodland-cave/monsters.txt b/npc/014-3_Cave/monsters.txt
index b0620568..2237ea42 100644
--- a/npc/new_30-1-west-woodland-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/_import.txt b/npc/015-1_Woodland/_import.txt
new file mode 100644
index 00000000..d92e0749
--- /dev/null
+++ b/npc/015-1_Woodland/_import.txt
@@ -0,0 +1,5 @@
+map: 015-1.gat
+npc: npc/015-1_Woodland/_mobs.txt
+npc: npc/015-1_Woodland/_warps.txt
+npc: npc/015-1_Woodland/alice.txt
+npc: npc/015-1_Woodland/monsters.txt
diff --git a/npc/015-1_Woodland/_mobs.txt b/npc/015-1_Woodland/_mobs.txt
new file mode 100644
index 00000000..6ec8206f
--- /dev/null
+++ b/npc/015-1_Woodland/_mobs.txt
@@ -0,0 +1,7 @@
+// 015-1 Woodland mobs
+
+
+
+015-1.gat,0,0,0 script Mob015-1 -1,{
+ end;
+}
diff --git a/npc/015-1_Woodland/_warps.txt b/npc/015-1_Woodland/_warps.txt
new file mode 100644
index 00000000..c6ca1856
--- /dev/null
+++ b/npc/015-1_Woodland/_warps.txt
@@ -0,0 +1,3 @@
+// 015-1 Woodland warps
+
+015-1.gat,93,55 warp ToWoodland -1,0,010-1.gat,15,55
diff --git a/npc/new_31-1-southwest-woodland/alice.txt b/npc/015-1_Woodland/alice.txt
index e35f4802..b9ce5831 100644
--- a/npc/new_31-1-southwest-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
new file mode 100644
index 00000000..4984f101
--- /dev/null
+++ b/npc/015-1_Woodland/monsters.txt
@@ -0,0 +1,46 @@
+// Map: 015-1
+// This is South-West Woodland.
+//
+
+015-1.gat,0,0,0,0 monster LogHead 1025,40,0,0,Mob31::OnLogHead
+015-1.gat,0,0,0,0 monster SpikyMushroom 1019,20,0,0,Mob31::OnSpikyMushroom
+015-1.gat,0,0,0,0 monster Flower 1014,20,0,0,Mob31::OnFlower
+
+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
+
+015-1.gat,0,0,0,0 monster SilkWorm 1035,7,15000,7000,Mob31::onSilkWorm
+
+015-1.gat,0,0,0 script Mob31 -1,{
+OnLogHead:
+ set @mobID, 1025;
+ callfunc "MobPoints";
+ break;
+
+OnSpikyMushroom:
+ set @mobID, 1019;
+ callfunc "MobPoints";
+ break;
+
+OnFlower:
+ set @mobID, 1014;
+ callfunc "MobPoints";
+ break;
+
+OnGamboge:
+ set @mobID, 1031;
+ callfunc "MobPoints";
+ break;
+
+OnAlizarin:
+ set @mobID, 1032;
+ callfunc "MobPoints";
+ break;
+
+OnSilkWorm:
+ set @mobID, 1035;
+ callfunc "MobPoints";
+ break;
+
+ end;
+}
diff --git a/npc/016-1_Woodland/_import.txt b/npc/016-1_Woodland/_import.txt
new file mode 100644
index 00000000..6d6c7bc9
--- /dev/null
+++ b/npc/016-1_Woodland/_import.txt
@@ -0,0 +1,4 @@
+map: 016-1.gat
+npc: npc/016-1_Woodland/_mobs.txt
+npc: npc/016-1_Woodland/_warps.txt
+npc: npc/016-1_Woodland/monsters.txt
diff --git a/npc/016-1_Woodland/_mobs.txt b/npc/016-1_Woodland/_mobs.txt
new file mode 100644
index 00000000..dd0a4eca
--- /dev/null
+++ b/npc/016-1_Woodland/_mobs.txt
@@ -0,0 +1,7 @@
+// 016-1 Woodland mobs
+
+
+
+016-1.gat,0,0,0 script Mob016-1 -1,{
+ end;
+}
diff --git a/npc/016-1_Woodland/_warps.txt b/npc/016-1_Woodland/_warps.txt
new file mode 100644
index 00000000..a9c59657
--- /dev/null
+++ b/npc/016-1_Woodland/_warps.txt
@@ -0,0 +1,3 @@
+// 016-1 Woodland warps
+
+016-1.gat,56,20 warp ToWoodland 1,-1,010-1.gat,56,103
diff --git a/npc/016-1_Woodland/monsters.txt b/npc/016-1_Woodland/monsters.txt
new file mode 100644
index 00000000..3cadfa54
--- /dev/null
+++ b/npc/016-1_Woodland/monsters.txt
@@ -0,0 +1,40 @@
+// Map: 016-1
+// This is Southernmost Woodlands.
+//
+
+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
+
+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
+
+016-1.gat,0,0,0,0 monster SilkWorm 1035,7,15000,7000,Mob32::onSilkWorm
+
+016-1.gat,0,0,0 script Mob32 -1,{
+OnMouboo:
+ set @mobID, 1028;
+ callfunc "MobPoints";
+ break;
+
+OnScorpion:
+ set @mobID, 1003;
+ callfunc "MobPoints";
+ break;
+
+OnMauve:
+ set @mobID, 1029;
+ callfunc "MobPoints";
+ break;
+
+OnCobalt:
+ set @mobID, 1030;
+ callfunc "MobPoints";
+ break;
+
+OnSilkWorm:
+ set @mobID, 1035;
+ callfunc "MobPoints";
+ break;
+
+ end;
+}
diff --git a/npc/017-1_Woodland_hills/_import.txt b/npc/017-1_Woodland_hills/_import.txt
new file mode 100644
index 00000000..30f8ac26
--- /dev/null
+++ b/npc/017-1_Woodland_hills/_import.txt
@@ -0,0 +1,4 @@
+map: 017-1.gat
+npc: npc/017-1_Woodland_hills/_mobs.txt
+npc: npc/017-1_Woodland_hills/_warps.txt
+npc: npc/017-1_Woodland_hills/monsters.txt
diff --git a/npc/017-1_Woodland_hills/_mobs.txt b/npc/017-1_Woodland_hills/_mobs.txt
new file mode 100644
index 00000000..c14e5e2f
--- /dev/null
+++ b/npc/017-1_Woodland_hills/_mobs.txt
@@ -0,0 +1,7 @@
+// 017-1 Woodland hills mobs
+
+
+
+017-1.gat,0,0,0 script Mob017-1 -1,{
+ end;
+}
diff --git a/npc/017-1_Woodland_hills/_warps.txt b/npc/017-1_Woodland_hills/_warps.txt
new file mode 100644
index 00000000..26917709
--- /dev/null
+++ b/npc/017-1_Woodland_hills/_warps.txt
@@ -0,0 +1,3 @@
+// 017-1 Woodland hills warps
+
+017-1.gat,46,105 warp toWoodland 2,-1,013-1.gat,45,22
diff --git a/npc/017-1_Woodland_hills/monsters.txt b/npc/017-1_Woodland_hills/monsters.txt
new file mode 100644
index 00000000..ce5468ac
--- /dev/null
+++ b/npc/017-1_Woodland_hills/monsters.txt
@@ -0,0 +1,76 @@
+// Map: 017-1
+// This is North Woodlands Mountains.
+//
+
+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
+
+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
+
+017-1.gat,0,0,0,0 monster SilkWorm 1035,10,0,0,Mob33::OnSilkWorm
+
+017-1.gat,0,0,0 script Mob33 -1,{
+OnBat:
+ set @mobID, 1017;
+ callfunc "MobPoints";
+ break;
+
+OnFireGoblin:
+ set @mobID, 1011;
+ callfunc "MobPoints";
+ break;
+
+OnMouboo:
+ set @mobID, 1028;
+ callfunc "MobPoints";
+ break;
+
+OnFlower:
+ set @mobID, 1014;
+ callfunc "MobPoints";
+ break;
+
+OnSpikyMushroom:
+ set @mobID, 1019;
+ callfunc "MobPoints";
+ break;
+
+OnEvilMushroom:
+ set @mobID, 1013;
+ 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;
+
+ end;
+}
diff --git a/npc/018-1_Woodland_mining_camp/_import.txt b/npc/018-1_Woodland_mining_camp/_import.txt
new file mode 100644
index 00000000..9be2065c
--- /dev/null
+++ b/npc/018-1_Woodland_mining_camp/_import.txt
@@ -0,0 +1,4 @@
+map: 018-1.gat
+npc: npc/018-1_Woodland_mining_camp/_mobs.txt
+npc: npc/018-1_Woodland_mining_camp/_warps.txt
+npc: npc/018-1_Woodland_mining_camp/miners.txt
diff --git a/npc/018-1_Woodland_mining_camp/_mobs.txt b/npc/018-1_Woodland_mining_camp/_mobs.txt
new file mode 100644
index 00000000..1f6d4706
--- /dev/null
+++ b/npc/018-1_Woodland_mining_camp/_mobs.txt
@@ -0,0 +1,105 @@
+// 018-1 Woodland mining camp mobs
+
+018-1.gat,136,79,9,41 monster Sea Slime 1033,10,0,0,Mob018-1::On1033
+018-1.gat,108,87,53,25 monster Log Head 1025,10,0,0,Mob018-1::On1025
+018-1.gat,116,44,6,7 monster Sea Slime 1033,3,0,0,Mob018-1::On1033
+018-1.gat,119,56,13,6 monster Flower 1014,2,0,0,Mob018-1::On1014
+018-1.gat,175,28,17,19 monster Jack O 1022,1,300000,240000,Mob018-1::On1022
+018-1.gat,78,59,3,1 monster Yellow Slime 1007,1,0,0,Mob018-1::On1007
+018-1.gat,57,63,14,7 monster Silk Worm 1035,2,0,0,Mob018-1::On1035
+018-1.gat,43,63,31,28 monster Bat 1017,10,0,0,Mob018-1::On1017
+018-1.gat,134,39,18,10 monster Grass Snake 1034,4,0,0,Mob018-1::On1034
+018-1.gat,124,42,9,11 monster Grass Snake 1034,2,0,0,Mob018-1::On1034
+018-1.gat,124,19,22,9 monster Mountain Snake 1026,3,0,0,Mob018-1::On1026
+018-1.gat,122,29,19,9 monster Mountain Snake 1026,2,0,0,Mob018-1::On1026
+018-1.gat,149,45,10,8 monster Bat 1017,5,0,0,Mob018-1::On1017
+018-1.gat,169,47,20,10 monster Pinkie 1018,4,0,0,Mob018-1::On1018
+018-1.gat,136,49,13,8 monster Fluffy 1020,4,0,0,Mob018-1::On1020
+018-1.gat,111,62,5,2 monster Silk Worm 1035,1,0,0,Mob018-1::On1035
+018-1.gat,117,50,4,3 monster Sea Slime 1033,1,0,0,Mob018-1::On1033
+018-1.gat,96,47,18,11 monster Mouboo 1028,3,0,0,Mob018-1::On1028
+018-1.gat,106,52,15,6 monster Mouboo 1028,1,0,0,Mob018-1::On1028
+018-1.gat,78,55,37,6 monster Fire Goblin 1011,7,0,0,Mob018-1::On1011
+018-1.gat,145,24,10,9 monster Green Slime 1005,3,0,0,Mob018-1::On1005
+018-1.gat,68,89,14,17 monster Scorpion 1003,3,0,0,Mob018-1::On1003
+018-1.gat,160,31,11,18 monster Scorpion 1003,5,0,0,Mob018-1::On1003
+
+
+018-1.gat,0,0,0 script Mob018-1 -1,{
+On1003:
+ set @mobID, 1003;
+ callfunc "MobPoints";
+ break;
+
+On1005:
+ set @mobID, 1005;
+ callfunc "MobPoints";
+ break;
+
+On1007:
+ set @mobID, 1007;
+ callfunc "MobPoints";
+ break;
+
+On1011:
+ set @mobID, 1011;
+ callfunc "MobPoints";
+ break;
+
+On1014:
+ set @mobID, 1014;
+ callfunc "MobPoints";
+ break;
+
+On1017:
+ set @mobID, 1017;
+ callfunc "MobPoints";
+ break;
+
+On1018:
+ set @mobID, 1018;
+ callfunc "MobPoints";
+ break;
+
+On1020:
+ set @mobID, 1020;
+ callfunc "MobPoints";
+ break;
+
+On1022:
+ set @mobID, 1022;
+ callfunc "MobPoints";
+ break;
+
+On1025:
+ set @mobID, 1025;
+ callfunc "MobPoints";
+ break;
+
+On1026:
+ set @mobID, 1026;
+ callfunc "MobPoints";
+ break;
+
+On1028:
+ set @mobID, 1028;
+ callfunc "MobPoints";
+ break;
+
+On1033:
+ set @mobID, 1033;
+ callfunc "MobPoints";
+ break;
+
+On1034:
+ set @mobID, 1034;
+ callfunc "MobPoints";
+ break;
+
+On1035:
+ set @mobID, 1035;
+ callfunc "MobPoints";
+ break;
+
+ end;
+}
diff --git a/npc/018-1_Woodland_mining_camp/_warps.txt b/npc/018-1_Woodland_mining_camp/_warps.txt
new file mode 100644
index 00000000..5d18916c
--- /dev/null
+++ b/npc/018-1_Woodland_mining_camp/_warps.txt
@@ -0,0 +1,17 @@
+// 018-1 Woodland mining camp warps
+
+018-1.gat,79,59 warp toMine 0,-1,018-3.gat,100,130
+018-1.gat,112,61 warp toCave -1,-1,018-3.gat,44,36
+018-1.gat,115,40 warp toCave -1,-1,013-3.gat,22,114
+018-1.gat,128,56 warp toCave -1,-1,018-3.gat,49,97
+018-1.gat,90,42 warp toCave -1,-1,018-3.gat,123,164
+018-1.gat,69,54 warp toCave -1,-1,018-3.gat,70,103
+018-1.gat,127,36 warp toCave -1,-1,013-3.gat,139,44
+018-1.gat,134,45 warp toCave -1,-1,013-3.gat,61,178
+018-1.gat,147,40 warp toCave -1,-1,013-3.gat,81,102
+018-1.gat,153,46 warp toCave -1,-1,018-3.gat,146,160
+018-1.gat,158,34 warp toCave -1,-1,018-3.gat,64,101
+018-1.gat,162,44 warp toCave -1,-1,018-3.gat,29,164
+018-1.gat,177,20 warp toCave -1,-1,013-3.gat,177,90
+018-1.gat,65,73 warp toIndoor -1,-1,018-2.gat,50,28
+018-1.gat,79,98 warp toHurnscald 2,-1,008-1.gat,79,18
diff --git a/npc/018-1_Woodland_mining_camp/miners.txt b/npc/018-1_Woodland_mining_camp/miners.txt
new file mode 100644
index 00000000..cfa990dd
--- /dev/null
+++ b/npc/018-1_Woodland_mining_camp/miners.txt
@@ -0,0 +1,6 @@
+//
+
+018-1.gat,80,61,0 script Miner 109,{
+ mes "[Miner]";
+ mes "\"Be careful in there.\"";
+}
diff --git a/npc/018-2_Woodland_minning_camp/_import.txt b/npc/018-2_Woodland_minning_camp/_import.txt
new file mode 100644
index 00000000..6b8cbc52
--- /dev/null
+++ b/npc/018-2_Woodland_minning_camp/_import.txt
@@ -0,0 +1,8 @@
+map: 018-2.gat
+npc: npc/018-2_Woodland_minning_camp/_mobs.txt
+npc: npc/018-2_Woodland_minning_camp/_warps.txt
+npc: npc/018-2_Woodland_minning_camp/angus.txt
+npc: npc/018-2_Woodland_minning_camp/books.txt
+npc: npc/018-2_Woodland_minning_camp/caul.txt
+npc: npc/018-2_Woodland_minning_camp/miners.txt
+npc: npc/018-2_Woodland_minning_camp/receptionist.txt
diff --git a/npc/018-2_Woodland_minning_camp/_mobs.txt b/npc/018-2_Woodland_minning_camp/_mobs.txt
new file mode 100644
index 00000000..756b1956
--- /dev/null
+++ b/npc/018-2_Woodland_minning_camp/_mobs.txt
@@ -0,0 +1,13 @@
+// 018-2 Woodland minning camp mobs
+
+018-2.gat,114,21,4,3 monster Yellow Slime 1007,1,0,0,Mob018-2::On1007
+
+
+018-2.gat,0,0,0 script Mob018-2 -1,{
+On1007:
+ set @mobID, 1007;
+ callfunc "MobPoints";
+ break;
+
+ end;
+}
diff --git a/npc/018-2_Woodland_minning_camp/_warps.txt b/npc/018-2_Woodland_minning_camp/_warps.txt
new file mode 100644
index 00000000..a4252c53
--- /dev/null
+++ b/npc/018-2_Woodland_minning_camp/_warps.txt
@@ -0,0 +1,9 @@
+// 018-2 Woodland minning camp warps
+
+018-2.gat,50,29 warp toOutside -1,-1,018-1.gat,65,74
+018-2.gat,41,20 warp toOutside -1,-1,018-1.gat,65,69
+018-2.gat,20,24 warp toBasement -1,-1,018-2.gat,112,27
+018-2.gat,112,26 warp toFirstFloor -1,-1,018-2.gat,20,23
+018-2.gat,21,28 warp toSecondFloor 0,-1,018-2.gat,79,25
+018-2.gat,79,26 warp toFirstFloor 0,-1,018-2.gat,21,29
+018-2.gat,114,20 warp toCave -1,-1,018-3.gat,177,53
diff --git a/npc/new_38-1-woodland-mine/angus.txt b/npc/018-2_Woodland_minning_camp/angus.txt
index 7be183f4..bf9f725e 100644
--- a/npc/new_38-1-woodland-mine/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/new_38-1-woodland-mine/books.txt b/npc/018-2_Woodland_minning_camp/books.txt
index dfd4ecda..22364c6d 100644
--- a/npc/new_38-1-woodland-mine/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/new_38-1-woodland-mine/caul.txt b/npc/018-2_Woodland_minning_camp/caul.txt
index e84b507d..1aeda920 100644
--- a/npc/new_38-1-woodland-mine/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/new_38-1-woodland-mine/miners.txt b/npc/018-2_Woodland_minning_camp/miners.txt
index 92261cb5..caf8afcd 100644
--- a/npc/new_38-1-woodland-mine/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/new_38-1-woodland-mine/receptionist.txt b/npc/018-2_Woodland_minning_camp/receptionist.txt
index 822d09a3..58c9ed7a 100644
--- a/npc/new_38-1-woodland-mine/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/018-3_Cave/_import.txt b/npc/018-3_Cave/_import.txt
new file mode 100644
index 00000000..cf5a8562
--- /dev/null
+++ b/npc/018-3_Cave/_import.txt
@@ -0,0 +1,4 @@
+map: 018-3.gat
+npc: npc/018-3_Cave/_mobs.txt
+npc: npc/018-3_Cave/_warps.txt
+npc: npc/018-3_Cave/bookcase.txt
diff --git a/npc/018-3_Cave/_mobs.txt b/npc/018-3_Cave/_mobs.txt
new file mode 100644
index 00000000..668d5902
--- /dev/null
+++ b/npc/018-3_Cave/_mobs.txt
@@ -0,0 +1,118 @@
+// 018-3 Cave mobs
+
+018-3.gat,48,28,57,16 monster Silk Worm 1035,8,0,0,Mob018-3::On1035
+018-3.gat,48,28,56,17 monster Bat 1017,10,0,0,Mob018-3::On1017
+018-3.gat,35,62,31,15 monster Evil Mushroom 1013,10,0,0,Mob018-3::On1013
+018-3.gat,35,65,28,22 monster Spiky Mushroom 1019,15,0,0,Mob018-3::On1019
+018-3.gat,28,157,3,2 monster Flower 1014,1,0,0,Mob018-3::On1014
+018-3.gat,99,110,17,39 monster Yellow slime 1007,10,0,0,Mob018-3::On1007
+018-3.gat,137,140,2,1 monster Spider 1012,1,300000,120000,Mob018-3::On1012
+018-3.gat,102,172,131,13 monster Black scorpions 1009,20,0,0,Mob018-3::On1009
+018-3.gat,174,37,10,31 monster Yellow slime 1007,5,0,0,Mob018-3::On1007
+018-3.gat,135,148,10,6 monster Giant maggot 1006,2,0,0,Mob018-3::On1006
+018-3.gat,134,140,12,8 monster Maggot 1002,3,0,0,Mob018-3::On1002
+018-3.gat,34,142,30,48 monster Fire goblin 1011,4,0,0,Mob018-3::On1011
+018-3.gat,87,153,78,22 monster Snake 1010,10,0,0,Mob018-3::On1010
+018-3.gat,148,148,13,24 monster Bat 1017,3,0,0,Mob018-3::On1017
+018-3.gat,153,97,18,22 monster Yellow slime 1007,6,0,0,Mob018-3::On1007
+018-3.gat,81,77,27,21 monster Red slime 1008,15,0,0,Mob018-3::On1008
+018-3.gat,111,80,5,6 monster Black scorpions 1009,10,0,0,Mob018-3::On1009
+018-3.gat,175,122,5,40 monster Snake 1010,15,0,0,Mob018-3::On1010
+018-3.gat,98,75,1,2 monster Fire skull 1023,1,0,0,Mob018-3::On1023
+018-3.gat,100,75,1,2 monster Poison skull 2024,1,0,0,Mob018-3::On2024
+018-3.gat,171,95,15,19 monster Red scorpion 1004,5,0,0,Mob018-3::On1004
+018-3.gat,134,87,17,7 monster Red slime 1008,10,0,0,Mob018-3::On1008
+018-3.gat,59,95,11,8 monster Spider 1012,15,0,0,Mob018-3::On1012
+018-3.gat,77,92,23,7 monster Black scorpion 1009,15,0,0,Mob018-3::On1009
+018-3.gat,133,39,12,17 monster Spider 1012,10,0,0,Mob018-3::On1012
+018-3.gat,111,33,30,16 monster Mountain snake 1026,15,0,0,Mob018-3::On1026
+
+
+018-3.gat,0,0,0 script Mob018-3 -1,{
+On1002:
+ set @mobID, 1002;
+ callfunc "MobPoints";
+ break;
+
+On1004:
+ set @mobID, 1004;
+ callfunc "MobPoints";
+ break;
+
+On1006:
+ set @mobID, 1006;
+ callfunc "MobPoints";
+ break;
+
+On1007:
+ set @mobID, 1007;
+ callfunc "MobPoints";
+ break;
+
+On1008:
+ set @mobID, 1008;
+ callfunc "MobPoints";
+ break;
+
+On1009:
+ set @mobID, 1009;
+ callfunc "MobPoints";
+ break;
+
+On1010:
+ set @mobID, 1010;
+ callfunc "MobPoints";
+ break;
+
+On1011:
+ set @mobID, 1011;
+ callfunc "MobPoints";
+ break;
+
+On1012:
+ set @mobID, 1012;
+ callfunc "MobPoints";
+ break;
+
+On1013:
+ set @mobID, 1013;
+ callfunc "MobPoints";
+ break;
+
+On1014:
+ set @mobID, 1014;
+ callfunc "MobPoints";
+ break;
+
+On1017:
+ set @mobID, 1017;
+ callfunc "MobPoints";
+ break;
+
+On1019:
+ set @mobID, 1019;
+ callfunc "MobPoints";
+ break;
+
+On1023:
+ set @mobID, 1023;
+ callfunc "MobPoints";
+ break;
+
+On1026:
+ set @mobID, 1026;
+ callfunc "MobPoints";
+ break;
+
+On1035:
+ set @mobID, 1035;
+ callfunc "MobPoints";
+ break;
+
+On2024:
+ set @mobID, 2024;
+ callfunc "MobPoints";
+ break;
+
+ end;
+}
diff --git a/npc/018-3_Cave/_warps.txt b/npc/018-3_Cave/_warps.txt
new file mode 100644
index 00000000..5d32cf8b
--- /dev/null
+++ b/npc/018-3_Cave/_warps.txt
@@ -0,0 +1,23 @@
+// 018-3 Cave warps
+
+018-3.gat,100,131 warp toOutside 0,-1,018-1.gat,79,60
+018-3.gat,44,37 warp toOutside -1,-1,018-1.gat,112,62
+018-3.gat,49,98 warp toOutside -1,-1,018-1.gat,128,57
+018-3.gat,123,165 warp toOutside -1,-1,018-1.gat,90,43
+018-3.gat,70,104 warp toOutside -1,-1,018-1.gat,69,55
+018-3.gat,50,88 warp toCave -1,-1,013-3.gat,69,142
+018-3.gat,146,161 warp toOutside 0,-1,018-1.gat,153,47
+018-3.gat,64,102 warp toOutside -1,-1,018-1.gat,158,35
+018-3.gat,29,165 warp toOutside -1,-1,018-1.gat,162,45
+018-3.gat,97,69 warp toCave -1,-1,013-3.gat,178,43
+018-3.gat,27,54 warp toCave -1,-1,013-3.gat,169,44
+018-3.gat,134,61 warp toCave -1,-1,013-3.gat,152,29
+018-3.gat,177,54 warp toBasement -1,-1,018-2.gat,114,20
+018-3.gat,172,21 warp toCave -1,-1,013-3.gat,123,103
+018-3.gat,177,21 warp toCave -1,-1,013-3.gat,147,103
+018-3.gat,27,91 warp toCave -1,-1,013-3.gat,158,67
+018-3.gat,90,50 warp toCave -1,-1,013-3.gat,67,50
+018-3.gat,71,122 warp toCave -1,-1,013-3.gat,111,41
+018-3.gat,174,85 warp toCave -1,-1,013-3.gat,62,99
+018-3.gat,102,69 warp toCave -1,-1,013-3.gat,68,96
+018-3.gat,179,179 warp toCave -1,-1,009-3.gat,157,31
diff --git a/npc/018-3_Cave/bookcase.txt b/npc/018-3_Cave/bookcase.txt
new file mode 100644
index 00000000..b2e14e41
--- /dev/null
+++ b/npc/018-3_Cave/bookcase.txt
@@ -0,0 +1,64 @@
+//
+
+018-3.gat,75,123,0 script #DemonMineBookcase1 127,{
+ if (QUEST_demon_mines == 0) goto L_Search;
+
+ mes "You see nothing different about the bookcase.";
+ mes "Do you want to search it again anyways?";
+ next;
+ menu
+ "Yes", L_Search,
+ "No", -;
+ close;
+
+L_Search:
+ mes "After searching the bookcase, you were able to find a few pasages that you can read.";
+ next;
+
+ mes "One of the describes an ancient barrier that guards a great treasure.";
+ mes "";
+ mes "To get trough it, you need to consume the soul of a great pumpkin ghost.";
+ next;
+
+ mes "Another passage describes a ritual needed to open a certain cursed chest.";
+ mes "";
+ mes "It looks like a lot of items will be needed.";
+ next;
+
+ mes "The slime of a maggot.";
+ mes "A mushroom, big or small.";
+ mes "The petal of a flower.";
+ next;
+
+ mes "A pearl from the sea.";
+ mes "A spike; the harder, the better.";
+ mes "Some raw wood. One log should do.";
+ next;
+
+ mes "An antenna. Preferably pink.";
+ mes "The tongues of four different snakes.";
+ mes "A key to a treasure chest.";
+ next;
+
+ mes "A pile of ash.";
+ mes "Four different herbs.";
+ mes "A bug, or part of one.";
+ next;
+
+ mes "A lamp for the dark.";
+ mes "Rock and metal, as one.";
+ mes "Three different deaths dealt by three different scorpions.";
+ next;
+
+ mes "The womb that gives birth to butterflies.";
+ mes "The gentle caress of a creature without blemish.";
+ mes "A single piece of darkness.";
+ next;
+
+ mes "And a bottle's worth of water.";
+ mes "";
+ mes "You begin to wonder if you read that list right.";
+ next;
+
+ set QUEST_demon_mines, 1;
+}
diff --git a/npc/019-1_Snow_field/_import.txt b/npc/019-1_Snow_field/_import.txt
new file mode 100644
index 00000000..855671ad
--- /dev/null
+++ b/npc/019-1_Snow_field/_import.txt
@@ -0,0 +1,7 @@
+map: 019-1.gat
+npc: npc/019-1_Snow_field/_mobs.txt
+npc: npc/019-1_Snow_field/_warps.txt
+npc: npc/019-1_Snow_field/monsters.txt
+npc: npc/019-1_Snow_field/santa.txt
+npc: npc/019-1_Snow_field/snowman.txt
+npc: npc/019-1_Snow_field/taro.txt
diff --git a/npc/019-1_Snow_field/_mobs.txt b/npc/019-1_Snow_field/_mobs.txt
new file mode 100644
index 00000000..bdc591a7
--- /dev/null
+++ b/npc/019-1_Snow_field/_mobs.txt
@@ -0,0 +1,7 @@
+// 019-1 Snow field mobs
+
+
+
+019-1.gat,0,0,0 script Mob019-1 -1,{
+ end;
+}
diff --git a/npc/019-1_Snow_field/_warps.txt b/npc/019-1_Snow_field/_warps.txt
new file mode 100644
index 00000000..63b04561
--- /dev/null
+++ b/npc/019-1_Snow_field/_warps.txt
@@ -0,0 +1,3 @@
+// 019-1 Snow field warps
+
+019-1.gat,70,21 warp ToVillage 2,-1,020-1.gat,70,126
diff --git a/npc/019-1_Snow_field/monsters.txt b/npc/019-1_Snow_field/monsters.txt
new file mode 100644
index 00000000..d41d63b3
--- /dev/null
+++ b/npc/019-1_Snow_field/monsters.txt
@@ -0,0 +1,20 @@
+// Map: 019-1
+// This is the Snow Fields.
+//
+
+019-1.gat,0,0,0,0 monster SantaSlime 1015,10,0,0,Mob10::OnSantaSlime
+019-1.gat,0,0,0,0 monster RudolphSlime 1016,25,0,0,Mob10::OnRudolphSlime
+
+019-1.gat,0,0,0 script Mob10 -1,{
+OnSantaSlime:
+ set @mobID, 1015;
+ callfunc "MobPoints";
+ break;
+
+OnRudolphSlime:
+ set @mobID, 1016;
+ callfunc "MobPoints";
+ break;
+
+ end;
+}
diff --git a/npc/new_10-1-xmas/santa.txt b/npc/019-1_Snow_field/santa.txt
index c53ce55f..01481d67 100644
--- a/npc/new_10-1-xmas/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/new_10-1-xmas/snowman.txt b/npc/019-1_Snow_field/snowman.txt
index 1e5ba412..1f56e4f2 100644
--- a/npc/new_10-1-xmas/snowman.txt
+++ b/npc/019-1_Snow_field/snowman.txt
@@ -1,4 +1,6 @@
-new_10-1.gat,77,44,0 script Snowman 129,{
+//
+
+019-1.gat,77,44,0 script Snowman 129,{
if( ChristmasQuest == 1) goto L_Done;
mes "[Snowman]";
diff --git a/npc/new_10-1-xmas/taro.txt b/npc/019-1_Snow_field/taro.txt
index c5ab3289..cdd368e5 100644
--- a/npc/new_10-1-xmas/taro.txt
+++ b/npc/019-1_Snow_field/taro.txt
@@ -1,6 +1,6 @@
// Snow Taro
-new_10-1.gat,57,61,0 script Taro 114,{
+019-1.gat,57,61,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;
@@ -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/_import.txt b/npc/020-1/_import.txt
new file mode 100644
index 00000000..2565ac9d
--- /dev/null
+++ b/npc/020-1/_import.txt
@@ -0,0 +1,8 @@
+map: 020-1.gat
+npc: npc/020-1/_mobs.txt
+npc: npc/020-1/_warps.txt
+npc: npc/020-1/amrak.txt
+npc: npc/020-1/monsters.txt
+npc: npc/020-1/sexchanger.txt
+npc: npc/020-1/soul-menhir.txt
+npc: npc/020-1/startrek.txt
diff --git a/npc/020-1/_mobs.txt b/npc/020-1/_mobs.txt
new file mode 100644
index 00000000..fa94c232
--- /dev/null
+++ b/npc/020-1/_mobs.txt
@@ -0,0 +1,7 @@
+// 020-1 mobs
+
+
+
+020-1.gat,0,0,0 script Mob020-1 -1,{
+ end;
+}
diff --git a/npc/020-1/_warps.txt b/npc/020-1/_warps.txt
new file mode 100644
index 00000000..36e0449a
--- /dev/null
+++ b/npc/020-1/_warps.txt
@@ -0,0 +1,9 @@
+// 020-1 warps
+
+020-1.gat,76,38 warp ToIceCave 1,-1,020-3.gat,31,28
+020-1.gat,47,48 warp ToClothesShop -1,-1,020-2.gat,25,33
+020-1.gat,66,52 warp ToHouse -1,-1,020-2.gat,72,68
+020-1.gat,70,127 warp toSnowField 2,-1,019-1.gat,70,22
+020-1.gat,64,82 warp toInn -1,-1,020-2.gat,111,31
+020-1.gat,86,46 warp toWeaponShop -1,-1,020-2.gat,32,72
+020-1.gat,56,90 warp ToPotionsShop -1,-1,020-2.gat,66,25
diff --git a/npc/new_11-1-snow-village/amrak.txt b/npc/020-1/amrak.txt
index b5b52962..19979ca0 100644
--- a/npc/new_11-1-snow-village/amrak.txt
+++ b/npc/020-1/amrak.txt
@@ -1,6 +1,6 @@
//
-new_11-1.gat,66,90,0 script Amrak 103, {
+020-1.gat,66,90,0 script Amrak 103, {
mes "[Amrak]";
mes "\"This... stone...";
mes "I have never seen a mineral like this";
diff --git a/npc/020-1/monsters.txt b/npc/020-1/monsters.txt
new file mode 100644
index 00000000..fc33da8c
--- /dev/null
+++ b/npc/020-1/monsters.txt
@@ -0,0 +1,14 @@
+// Map: 020-1
+// This is Snow Town.
+//
+
+020-1.gat,56,63,1,1 monster Maggot 1002,2,0,0,Mob11::OnMaggot
+
+020-1.gat,0,0,0 script Mob11 -1,{
+OnMaggot:
+ set @mobID, 1002;
+ callfunc "MobPoints";
+ break;
+
+ end;
+}
diff --git a/npc/new_11-1-snow-village/sexchanger.txt b/npc/020-1/sexchanger.txt
index b26f9e14..168f47a3 100644
--- a/npc/new_11-1-snow-village/sexchanger.txt
+++ b/npc/020-1/sexchanger.txt
@@ -1,4 +1,6 @@
-new_11-1.gat,50,49,0 script Xanith 136,{
+//
+
+020-1.gat,50,49,0 script Xanith 136,{
mes "[Xanith the Surgeon]";
mes "\"No sex changes right now, sorry.\"";
close;
diff --git a/npc/020-1/soul-menhir.txt b/npc/020-1/soul-menhir.txt
new file mode 100644
index 00000000..3d0bc82a
--- /dev/null
+++ b/npc/020-1/soul-menhir.txt
@@ -0,0 +1,8 @@
+//
+
+020-1.gat,64,89,0 script Soul Menhir 144, {
+ set @map$, "020-1.gat";
+ set @x, 64;
+ set @y, 90;
+ callfunc "SoulMenhir";
+}
diff --git a/npc/new_11-1-snow-village/startrek.txt b/npc/020-1/startrek.txt
index 72afe5e3..5c8847ad 100644
--- a/npc/new_11-1-snow-village/startrek.txt
+++ b/npc/020-1/startrek.txt
@@ -1,11 +1,13 @@
-new_11-1.gat,79,77,0 script Kirk 133,{
+//
+
+020-1.gat,79,77,0 script Kirk 133,{
mes "[Capt. Kirk]";
mes "\"Spock: We're breaking the prime directive.";
mes "This is not the right way to have the first contact.\"";
close;
}
-new_11-1.gat,81,77,0 script Spock 134,{
+020-1.gat,81,77,0 script Spock 134,{
mes "[Spock]";
mes "\"Live long and prosper captain.\"";
next;
diff --git a/npc/020-2/_import.txt b/npc/020-2/_import.txt
new file mode 100644
index 00000000..f71241f7
--- /dev/null
+++ b/npc/020-2/_import.txt
@@ -0,0 +1,5 @@
+map: 020-2.gat
+npc: npc/020-2/_mobs.txt
+npc: npc/020-2/_warps.txt
+npc: npc/020-2/furquest.txt
+npc: npc/020-2/shops.txt
diff --git a/npc/020-2/_mobs.txt b/npc/020-2/_mobs.txt
new file mode 100644
index 00000000..4289bb7e
--- /dev/null
+++ b/npc/020-2/_mobs.txt
@@ -0,0 +1,7 @@
+// 020-2 mobs
+
+
+
+020-2.gat,0,0,0 script Mob020-2 -1,{
+ end;
+}
diff --git a/npc/020-2/_warps.txt b/npc/020-2/_warps.txt
new file mode 100644
index 00000000..2306316d
--- /dev/null
+++ b/npc/020-2/_warps.txt
@@ -0,0 +1,7 @@
+// 020-2 warps
+
+020-2.gat,25,35 warp ToOutside -1,-1,020-1.gat,47,50
+020-2.gat,64,25 warp ToOutside -1,-1,020-1.gat,55,90
+020-2.gat,111,32 warp ToOutside -1,-1,020-1.gat,64,83
+020-2.gat,32,73 warp ToOutside -1,-1,020-1.gat,84,48
+020-2.gat,72,70 warp ToOutside -1,-1,020-1.gat,66,54
diff --git a/npc/new_13-1-snow-village-shops/furquest.txt b/npc/020-2/furquest.txt
index 01b6c546..4d67f8c4 100644
--- a/npc/new_13-1-snow-village-shops/furquest.txt
+++ b/npc/020-2/furquest.txt
@@ -3,7 +3,7 @@
//#################################################################################
// Santa's Inn - Agostine, The Legendary Tailor
-new_13-1.gat,102,28,0 script Agostine 137, {
+020-2.gat,102,28,0 script Agostine 137, {
if (QUEST_WG_state == 1) goto L_State_0_3;
if (QUEST_WG_state == 2) goto L_State_1;
if (QUEST_WG_state == 3) goto L_State_2;
diff --git a/npc/020-2/shops.txt b/npc/020-2/shops.txt
new file mode 100644
index 00000000..f3d9dedc
--- /dev/null
+++ b/npc/020-2/shops.txt
@@ -0,0 +1,21 @@
+// Snow town shops
+
+// Clothes shop
+020-2.gat,27,26,0 shop Taylor 137,523:2000,524:1600,543:800,544:5000,546:10000,586:1000,610,2000
+// Weapons shop
+020-2.gat,25,65,0 shop Bracco 135,1201:50,521:1000,522:100,545:20000,529:5
+// Potions shop
+020-2.gat,75,26,0 shop Mede 103,501:50,502:70,567:500,568:500
+
+// INN
+020-2.gat,111,23,0 script Kane 120,{
+ set @npcName$, "Kane the Inn Keeper";
+ set @cost, 100;
+
+ mes "[" + @npcName$ + "]";
+ mes "\"Welcome strangers.";
+ mes "What? You've already seen an INN like mine?";
+ mes "That's impossible!\"";
+ next;
+ callfunc "Inn";
+}
diff --git a/npc/020-3_Ice_cave/_import.txt b/npc/020-3_Ice_cave/_import.txt
new file mode 100644
index 00000000..182e4b6e
--- /dev/null
+++ b/npc/020-3_Ice_cave/_import.txt
@@ -0,0 +1,4 @@
+map: 020-3.gat
+npc: npc/020-3_Ice_cave/_mobs.txt
+npc: npc/020-3_Ice_cave/_warps.txt
+npc: npc/020-3_Ice_cave/monsters.txt
diff --git a/npc/020-3_Ice_cave/_mobs.txt b/npc/020-3_Ice_cave/_mobs.txt
new file mode 100644
index 00000000..12acdfe0
--- /dev/null
+++ b/npc/020-3_Ice_cave/_mobs.txt
@@ -0,0 +1,19 @@
+// 020-3 Ice cave mobs
+
+020-3.gat,40,36,29,4 monster Bat 1017,1,0,0,Mob020-3::On1017
+020-3.gat,40,49,34,7 monster Violet 1018,1,0,0,Mob020-3::On1018
+
+
+020-3.gat,0,0,0 script Mob020-3 -1,{
+On1017:
+ set @mobID, 1017;
+ callfunc "MobPoints";
+ break;
+
+On1018:
+ set @mobID, 1018;
+ callfunc "MobPoints";
+ break;
+
+ end;
+}
diff --git a/npc/020-3_Ice_cave/_warps.txt b/npc/020-3_Ice_cave/_warps.txt
new file mode 100644
index 00000000..51539391
--- /dev/null
+++ b/npc/020-3_Ice_cave/_warps.txt
@@ -0,0 +1,4 @@
+// 020-3 Ice cave warps
+
+020-3.gat,31,25 warp toOutside -1,-1,020-1.gat,76,37
+020-3.gat,25,22 warp toIceCave2 -1,-1,020-4.gat,36,34
diff --git a/npc/020-3_Ice_cave/monsters.txt b/npc/020-3_Ice_cave/monsters.txt
new file mode 100644
index 00000000..062c6a9f
--- /dev/null
+++ b/npc/020-3_Ice_cave/monsters.txt
@@ -0,0 +1,18 @@
+// Ice Cave level 1
+
+020-3.gat,0,0,0,0 monster Bat 1017,20,0,0,Mob12::OnBat
+020-3.gat,0,0,0,0 monster Pinkie 1018,10,0,0,Mob12::OnPinkie
+
+020-3.gat,0,0,0 script Mob12 -1,{
+OnBat:
+ set @mobID, 1017;
+ callfunc "MobPoints";
+ break;
+
+OnPinkie:
+ set @mobID, 1018;
+ callfunc "MobPoints";
+ break;
+
+ end;
+}
diff --git a/npc/020-4_Ice_cave/_import.txt b/npc/020-4_Ice_cave/_import.txt
new file mode 100644
index 00000000..64953f5d
--- /dev/null
+++ b/npc/020-4_Ice_cave/_import.txt
@@ -0,0 +1,4 @@
+map: 020-4.gat
+npc: npc/020-4_Ice_cave/_mobs.txt
+npc: npc/020-4_Ice_cave/_warps.txt
+npc: npc/020-4_Ice_cave/monsters.txt
diff --git a/npc/020-4_Ice_cave/_mobs.txt b/npc/020-4_Ice_cave/_mobs.txt
new file mode 100644
index 00000000..99c21fea
--- /dev/null
+++ b/npc/020-4_Ice_cave/_mobs.txt
@@ -0,0 +1,7 @@
+// 020-4 Ice cave mobs
+
+
+
+020-4.gat,0,0,0 script Mob020-4 -1,{
+ end;
+}
diff --git a/npc/020-4_Ice_cave/_warps.txt b/npc/020-4_Ice_cave/_warps.txt
new file mode 100644
index 00000000..a02cadc4
--- /dev/null
+++ b/npc/020-4_Ice_cave/_warps.txt
@@ -0,0 +1,3 @@
+// 020-4 Ice cave warps
+
+020-4.gat,36,33 warp toIceCave1 -1,-1,020-3.gat,25,23
diff --git a/npc/020-4_Ice_cave/monsters.txt b/npc/020-4_Ice_cave/monsters.txt
new file mode 100644
index 00000000..5aadddab
--- /dev/null
+++ b/npc/020-4_Ice_cave/monsters.txt
@@ -0,0 +1,18 @@
+// Ice Cave second level
+
+020-4.gat,0,0,0,0 monster Bat 1017,5,0,0,Mob21::OnBat
+020-4.gat,0,0,0,0 monster Fluffy 1020,15,0,0,Mob21::OnFluffy
+
+020-4.gat,0,0,0 script Mob21 -1,{
+OnBat:
+ set @mobID, 1017;
+ callfunc "MobPoints";
+ break;
+
+OnFluffy:
+ set @mobID, 1020;
+ callfunc "MobPoints";
+ break;
+
+ end;
+}
diff --git a/npc/021-1_Tulimshar/_import.txt b/npc/021-1_Tulimshar/_import.txt
new file mode 100644
index 00000000..27ebcad7
--- /dev/null
+++ b/npc/021-1_Tulimshar/_import.txt
@@ -0,0 +1,3 @@
+map: 021-1.gat
+npc: npc/021-1_Tulimshar/_warps.txt
+npc: npc/021-1_Tulimshar/_mobs.txt
diff --git a/npc/021-1_Tulimshar/_mobs.txt b/npc/021-1_Tulimshar/_mobs.txt
new file mode 100644
index 00000000..e488bf54
--- /dev/null
+++ b/npc/021-1_Tulimshar/_mobs.txt
@@ -0,0 +1,7 @@
+// 021-1 Tulimshar mobs
+
+
+
+021-1.gat,0,0,0 script Mob021-1 -1,{
+ end;
+}
diff --git a/npc/021-1_Tulimshar/_warps.txt b/npc/021-1_Tulimshar/_warps.txt
new file mode 100644
index 00000000..7e907749
--- /dev/null
+++ b/npc/021-1_Tulimshar/_warps.txt
@@ -0,0 +1,2 @@
+// 021-1 Tulimshar warps
+
diff --git a/npc/_import.txt b/npc/_import.txt
new file mode 100644
index 00000000..51db0dff
--- /dev/null
+++ b/npc/_import.txt
@@ -0,0 +1,40 @@
+import: npc/001-1_Tulimshar/_import.txt
+import: npc/001-2_Tulimshar/_import.txt
+import: npc/001-3_Tulimshar_arena/_import.txt
+import: npc/002-1_Sandstorm/_import.txt
+import: npc/002-3_Desert_mines/_import.txt
+import: npc/002-4_Desert_mines/_import.txt
+import: npc/003-1_Beach/_import.txt
+import: npc/004-1_Beach/_import.txt
+import: npc/005-1_Snake_desert/_import.txt
+import: npc/005-3_Snake_pit/_import.txt
+import: npc/006-1_Desert_mountains/_import.txt
+import: npc/006-3_Desert_mountain_caves/_import.txt
+import: npc/007-1_Woodland/_import.txt
+import: npc/008-1_Hurnscald_outskirts/_import.txt
+import: npc/009-1_Hurnscald/_import.txt
+import: npc/009-2_Hurnscald/_import.txt
+import: npc/009-3_Cave_beneath_Hurnscald/_import.txt
+import: npc/010-1_Woodland/_import.txt
+import: npc/010-2_Dimond's_Cove/_import.txt
+import: npc/011-1_Woodland/_import.txt
+import: npc/011-3_Hermit's_cave/_import.txt
+import: npc/011-4_Lake_cave/_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
+import: npc/013-2_Magic_house/_import.txt
+import: npc/013-3_Cave/_import.txt
+import: npc/014-1_Woodland/_import.txt
+import: npc/014-3_Cave/_import.txt
+import: npc/015-1_Woodland/_import.txt
+import: npc/016-1_Woodland/_import.txt
+import: npc/017-1_Woodland_hills/_import.txt
+import: npc/018-1_Woodland_mining_camp/_import.txt
+import: npc/018-2_Woodland_minning_camp/_import.txt
+import: npc/018-3_Cave/_import.txt
+import: npc/019-1_Snow_field/_import.txt
+import: npc/020-1/_import.txt
+import: npc/020-2/_import.txt
+import: npc/020-3_Ice_cave/_import.txt
+import: npc/020-4_Ice_cave/_import.txt
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/new_1-1-western-desert/dark_mage.txt b/npc/new_1-1-western-desert/dark_mage.txt
deleted file mode 100644
index 1bf8df8c..00000000
--- a/npc/new_1-1-western-desert/dark_mage.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-new_1-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;
-
- 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;
-
- 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!", -;
-
- 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;
-
-L_Soul:
- mes "[Dark Mage]";
- mes "\"Hrhrhr, your soul is finally mine!\"";
- jobchange 1;
- close;
-} \ No newline at end of file
diff --git a/npc/new_1-1-western-desert/merchant.txt b/npc/new_1-1-western-desert/merchant.txt
deleted file mode 100644
index d01a9164..00000000
--- a/npc/new_1-1-western-desert/merchant.txt
+++ /dev/null
@@ -1 +0,0 @@
-new_1-1.gat,19,99,0 shop Ishyah 109,525:800,531:3000,530:8000,1199:3,603:-1
diff --git a/npc/new_1-1-western-desert/monsters.txt b/npc/new_1-1-western-desert/monsters.txt
deleted file mode 100644
index a98c8406..00000000
--- a/npc/new_1-1-western-desert/monsters.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-// Map: new_1-1
-// This is the Desert (Sandstorm) south of Tulimshar.
-//
-
-new_1-1.gat,0,0,0,0 monster GreenSlime 1005,50,0,0,Mob1::OnGreenSlime
-new_1-1.gat,0,0,0,0 monster GiantMaggot 1006,30,0,0,Mob1::OnGiantMaggot
-new_1-1.gat,0,0,0,0 monster RedScorpion 1004,20,0,0,Mob1::OnRedScorpion
-
-new_1-1.gat,0,0,0 script Mob1 -1,{
-OnGreenSlime:
- set @mobID, 1005;
- callfunc "MobPoints";
- break;
-
-OnGiantMaggot:
- set @mobID, 1006;
- callfunc "MobPoints";
- break;
-
-OnRedScorpion:
- set @mobID, 1004;
- callfunc "MobPoints";
- break;
-}
diff --git a/npc/new_1-1-western-desert/passages.txt b/npc/new_1-1-western-desert/passages.txt
deleted file mode 100644
index 61212ec0..00000000
--- a/npc/new_1-1-western-desert/passages.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-new_1-1.gat,19,94 warp caveentrance 1,1,new_2-1.gat,37,31
-new_1-1.gat,111,79 warp eastdesert 2,2,new_7-1.gat,23,40
-new_1-1.gat,11,66 warp tobeach 1,2,new_15-1.gat,168,76
-new_1-1.gat,56,12 warp totown 5,1,new_3-1.gat,44,80
-new_1-1.gat,27,12 warp tobeach 3,1,new_34-1.gat,84,111
diff --git a/npc/new_10-1-xmas/monsters.txt b/npc/new_10-1-xmas/monsters.txt
deleted file mode 100644
index b4515cf2..00000000
--- a/npc/new_10-1-xmas/monsters.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-// Map: new_10-1
-// This is the Snow Fields.
-//
-
-new_10-1.gat,0,0,0,0 monster SantaSlime 1015,10,0,0,Mob10::OnSantaSlime
-new_10-1.gat,0,0,0,0 monster RudolphSlime 1016,25,0,0,Mob10::OnRudolphSlime
-
-new_10-1.gat,0,0,0 script Mob10 -1,{
-OnSantaSlime:
- set @mobID, 1015;
- callfunc "MobPoints";
- break;
-
-OnRudolphSlime:
- set @mobID, 1016;
- callfunc "MobPoints";
- break;
-
- end;
-}
diff --git a/npc/new_10-1-xmas/passages.txt b/npc/new_10-1-xmas/passages.txt
deleted file mode 100644
index 6a879b95..00000000
--- a/npc/new_10-1-xmas/passages.txt
+++ /dev/null
@@ -1 +0,0 @@
-new_10-1.gat,69,19 warp tovillage 4,1,new_11-1.gat,69,127 \ No newline at end of file
diff --git a/npc/new_11-1-snow-village/monsters.txt b/npc/new_11-1-snow-village/monsters.txt
deleted file mode 100644
index 92c95f81..00000000
--- a/npc/new_11-1-snow-village/monsters.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-// Map: new_11-1
-// This is Snow Town.
-//
-
-new_11-1.gat,56,63,1,1 monster Maggot 1002,2,0,0,Mob11::OnMaggot
-
-new_11-1.gat,0,0,0 script Mob11 -1,{
-OnMaggot:
- set @mobID, 1002;
- callfunc "MobPoints";
- break;
-
- end;
-}
diff --git a/npc/new_11-1-snow-village/passages.txt b/npc/new_11-1-snow-village/passages.txt
deleted file mode 100644
index b42939ec..00000000
--- a/npc/new_11-1-snow-village/passages.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-new_11-1.gat,76,38 warp tocave 0,0,new_12-1.gat,31,28
-new_11-1.gat,69,128 warp tomap 3,0,new_10-1.gat,69,21
-
-// outside -> Clothes shop
-new_11-1.gat,47,49 warp inside1 0,0,new_13-1.gat,25,33
-// outside -> Potions shop
-new_11-1.gat,57,90 warp inside2 0,0,new_13-1.gat,66,25
-// outside -> INN
-new_11-1.gat,64,83 warp inside3 0,0,new_13-1.gat,111,30
-// outside -> Weapons shop
-new_11-1.gat,87,47 warp inside4 0,0,new_13-1.gat,32,71
-// outside -> House
-new_11-1.gat,66,53 warp inside5 0,0,new_13-1.gat,72,68 \ No newline at end of file
diff --git a/npc/new_11-1-snow-village/soul-menhir.txt b/npc/new_11-1-snow-village/soul-menhir.txt
deleted file mode 100644
index 7769530c..00000000
--- a/npc/new_11-1-snow-village/soul-menhir.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-new_11-1.gat,64,89,0 script Soul Menhir 144, {
- set @map$, "new_11-1.gat";
- set @x, 64;
- set @y, 90;
- callfunc "SoulMenhir";
-}
diff --git a/npc/new_12-1-ice-cave/monsters.txt b/npc/new_12-1-ice-cave/monsters.txt
deleted file mode 100644
index b9dce5f5..00000000
--- a/npc/new_12-1-ice-cave/monsters.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-// Map: new_12-1
-// This is the Ice Cave below Snow Town.
-//
-
-new_12-1.gat,0,0,0,0 monster Bat 1017,20,0,0,Mob12::OnBat
-new_12-1.gat,0,0,0,0 monster Pinkie 1018,10,0,0,Mob12::OnPinkie
-
-new_12-1.gat,0,0,0 script Mob12 -1,{
-OnBat:
- set @mobID, 1017;
- callfunc "MobPoints";
- break;
-
-OnPinkie:
- set @mobID, 1018;
- callfunc "MobPoints";
- break;
-
- end;
-}
diff --git a/npc/new_12-1-ice-cave/passages.txt b/npc/new_12-1-ice-cave/passages.txt
deleted file mode 100644
index 3db46ebe..00000000
--- a/npc/new_12-1-ice-cave/passages.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-new_12-1.gat,31,25 warp totown 2,1,new_11-1.gat,76,36
-new_12-1.gat,26,23 warp toice2 1,0,new_21-1.gat,37,36
diff --git a/npc/new_13-1-snow-village-shops/passages.txt b/npc/new_13-1-snow-village-shops/passages.txt
deleted file mode 100644
index afae9fe4..00000000
--- a/npc/new_13-1-snow-village-shops/passages.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-// Clothes shop -> outside
-new_13-1.gat,25,36 warp outside1 0,0,new_11-1.gat,47,50
-// Potions shop -> outside
-new_13-1.gat,64,25 warp outside2 1,1,new_11-1.gat,55,90
-// INN -> outside
-new_13-1.gat,111,33 warp outside3 0,0,new_11-1.gat,64,84
-// Weapons shop -> outside
-new_13-1.gat,32,74 warp outside4 0,0,new_11-1.gat,86,48
-// House -> outside
-new_13-1.gat,72,71 warp outside5 0,0,new_11-1.gat,66,54
diff --git a/npc/new_13-1-snow-village-shops/shops.txt b/npc/new_13-1-snow-village-shops/shops.txt
deleted file mode 100644
index eb84181e..00000000
--- a/npc/new_13-1-snow-village-shops/shops.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-// Clothes shop
-new_13-1.gat,27,26,0 shop Taylor 137,523:2000,524:1600,543:800,544:5000,546:10000,586:1000,610,2000
-// Weapons shop
-new_13-1.gat,25,65,0 shop Bracco 135,1201:50,521:1000,522:100,545:20000,529:5
-// Potions shop
-new_13-1.gat,75,26,0 shop Mede 103,501:50,502:70,567:500,568:500
-
-// INN
-new_13-1.gat,111,23,0 script Kane 120,{
- set @npcName$, "Kane the Inn Keeper";
- set @cost, 100;
-
- mes "[" + @npcName$ + "]";
- mes "\"Welcome strangers.";
- mes "What? You've already seen an INN like mine?";
- mes "That's impossible!\"";
- next;
- callfunc "Inn";
-}
diff --git a/npc/new_14-1-south-woodland/monsters.txt b/npc/new_14-1-south-woodland/monsters.txt
deleted file mode 100644
index f371e497..00000000
--- a/npc/new_14-1-south-woodland/monsters.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-// Map: new_14-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
-
-new_14-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
-
-new_14-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;
-
-OnCobalt:
- set @mobID, 1030;
- callfunc "MobPoints";
- break;
-
-OnSilkWorm:
- set @mobID, 1035;
- callfunc "MobPoints";
- break;
-
- end;
-}
diff --git a/npc/new_14-1-south-woodland/passages.txt b/npc/new_14-1-south-woodland/passages.txt
deleted file mode 100644
index 787de46c..00000000
--- a/npc/new_14-1-south-woodland/passages.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-new_14-1.gat,131,53 warp tofield 2,2,new_16-1.gat,25,53
-new_14-1.gat,48,23 warp tofield 1,1,new_9-1.gat,46,99
-new_14-1.gat,14,54 warp tomap31 0,2,new_31-1.gat,92,54
-new_14-1.gat,55,104 warp tomap32 3,1,new_32-1.gat,56,21 \ No newline at end of file
diff --git a/npc/new_15-1-woodland-desert/monsters.txt b/npc/new_15-1-woodland-desert/monsters.txt
deleted file mode 100644
index 81246489..00000000
--- a/npc/new_15-1-woodland-desert/monsters.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-// Map: new_15-1
-// This is the Desert Beach.
-//
-
-new_15-1.gat,0,0,0,0 monster BlackScorpion 1009,20,0,0,Mob15::OnBlackScorpion
-new_15-1.gat,0,0,0,0 monster Snake 1010,10,0,0,Mob15::OnSnake
-
-new_15-1.gat,0,0,0 script Mob15 -1,{
-OnBlackScorpion:
- set @mobID, 1009;
- callfunc "MobPoints";
- break;
-
-OnSnake:
- set @mobID, 1010;
- callfunc "MobPoints";
- break;
-
- end;
-}
diff --git a/npc/new_15-1-woodland-desert/passages.txt b/npc/new_15-1-woodland-desert/passages.txt
deleted file mode 100644
index b9969e9b..00000000
--- a/npc/new_15-1-woodland-desert/passages.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-new_15-1.gat,170,75 warp todesert 2,2,new_1-1.gat,15,66
-new_15-1.gat,20,23 warp towoodland 2,0,new_16-1.gat,120,112
-new_15-1.gat,140,19 warp tobeach 2,0,new_34-1.gat,37,109
diff --git a/npc/new_16-1-south-east-woodland/monsters.txt b/npc/new_16-1-south-east-woodland/monsters.txt
deleted file mode 100644
index e384b02b..00000000
--- a/npc/new_16-1-south-east-woodland/monsters.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-// Map: new_16-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
-
-new_16-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
-
-new_16-1.gat,0,0,0 script Mob16 -1,{
-OnFluffy:
- set @mobID, 1020;
- callfunc "MobPoints";
- break;
-
-OnFlower:
- set @mobID, 1014;
- callfunc "MobPoints";
- break;
-
-OnGamboge:
- set @mobID, 1031;
- callfunc "MobPoints";
- break;
-
-OnSilkWorm:
- set @mobID, 1035;
- callfunc "MobPoints";
- break;
-
-
- end;
-}
diff --git a/npc/new_16-1-south-east-woodland/passages.txt b/npc/new_16-1-south-east-woodland/passages.txt
deleted file mode 100644
index 4696b482..00000000
--- a/npc/new_16-1-south-east-woodland/passages.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-new_16-1.gat,120,114 warp todesert 3,0,new_15-1.gat,20,24
-new_16-1.gat,22,54 warp towoodland 2,2,new_14-1.gat,127,53
-new_16-1.gat,68,22 warp warp2 3,1,new_18-1.gat,78,100
-new_16-1.gat,122,21 warp warp2 1,1,new_18-1.gat,132,98
diff --git a/npc/new_17-1-cave-big/passages.txt b/npc/new_17-1-cave-big/passages.txt
deleted file mode 100644
index 8192c69e..00000000
--- a/npc/new_17-1-cave-big/passages.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-new_17-1.gat,71,10 warp firstlvl 3,0,new_4-1.gat,31,24
-new_17-1.gat,129,87 warp cave 0,0,new_35-1.gat,21,55
diff --git a/npc/new_18-1-woodland-village/monsters.txt b/npc/new_18-1-woodland-village/monsters.txt
deleted file mode 100644
index 8755285c..00000000
--- a/npc/new_18-1-woodland-village/monsters.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-// Map: new_18-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
-
-new_18-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
-
-new_18-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;
-
- end;
-}
diff --git a/npc/new_18-1-woodland-village/passages.txt b/npc/new_18-1-woodland-village/passages.txt
deleted file mode 100644
index d8fdecb9..00000000
--- a/npc/new_18-1-woodland-village/passages.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-// West gate
-new_18-1.gat,54,61 warp warp1 0,1,new_19-1.gat,26,36
-
-// South gate
-new_18-1.gat,78,80 warp warp1 3,0,new_19-1.gat,48,54
-
-// East gate
-new_18-1.gat,128,60 warp warp1 0,1,new_19-1.gat,96,35
-
-// North gate
-new_18-1.gat,78,49 warp warp1 3,0,new_19-1.gat,48,24
-
-// To woodland
-new_18-1.gat,78,101 warp warp1 3,1,new_16-1.gat,68,23
-
-new_18-1.gat,132,100 warp warp1 1,1,new_16-1.gat,122,23
-
-// Mine
-new_18-1.gat,79,17 warp woodland 2,-1,new_37-1.gat,78,96
diff --git a/npc/new_19-1-woodland-village/passages.txt b/npc/new_19-1-woodland-village/passages.txt
deleted file mode 100644
index 990b50e7..00000000
--- a/npc/new_19-1-woodland-village/passages.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-// West gate
-new_19-1.gat,23,36 warp warp2 1,1,new_18-1.gat,53,61
-
-// South gate
-new_19-1.gat,48,56 warp warp2 3,1,new_18-1.gat,78,82
-
-// East gate
-new_19-1.gat,97,36 warp warp2 1,1,new_18-1.gat,129,60
-
-// North gate
-new_19-1.gat,48,23 warp warp2 3,1,new_18-1.gat,78,48
-
-// indoor <-> outdoor and indoor <-> indoor
-
-// Inn
-new_19-1.gat,35,29 warp out-in 1,1,new_20-1.gat,50,55
-
-// Archer Shop
-new_19-1.gat,59,33 warp out-in 0,0,new_20-1.gat,95,29
-
-// Potion Shop
-new_19-1.gat,71,30 warp out-in 0,0,new_20-1.gat,130,25
-
-// Doctor
-new_19-1.gat,80,31 warp out-in 0,0,new_20-1.gat,149,66
-
-// Blacksmith
-
-// Mayor
-new_19-1.gat,72,44 warp out-in 0,0,new_20-1.gat,113,77
diff --git a/npc/new_19-1-woodland-village/soul-menhir.txt b/npc/new_19-1-woodland-village/soul-menhir.txt
deleted file mode 100644
index 152f05be..00000000
--- a/npc/new_19-1-woodland-village/soul-menhir.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-new_19-1.gat,53,40,0 script Soul Menhir 144, {
- set @map$, "new_19-1.gat";
- set @x, 53;
- set @y, 41;
- callfunc "SoulMenhir";
-}
-
-
diff --git a/npc/new_2-1-cave1/miners.txt b/npc/new_2-1-cave1/miners.txt
deleted file mode 100644
index 1bbb1637..00000000
--- a/npc/new_2-1-cave1/miners.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-
-new_2-1.gat,35,35,6 script Nathan 109,{
- mes "[Nathan the Miner]";
- mes "\"It's very dangerous in here.";
- mes "We had a big earthquake here";
- mes "just recently, too... so be";
- mes "careful!\"";
- close;
-}
-
-new_5-1.gat,32,94,6 script Naem 109,{
- mes "[Naem the Miner]";
- mes "\"Do you want me to lift you to the upper level?\"";
- next;
- menu
- "Sure", L_Sure,
- "Not yet!", -;
- close;
-
-L_Sure:
- warp "new_2-1.gat", 87, 99;
- close;
-}
-
-new_2-1.gat,85,97,6 script Naem 109,{
- mes "[Naem the Miner]";
- mes "\"We discovered an underground palace.";
- mes "Do you want me to let you in?\"";
- next;
- menu
- "Sure", L_Sure,
- "Not yet!", -;
- close;
-
-L_Sure:
- warp "new_5-1.gat", 34, 92;
- close;
-}
diff --git a/npc/new_2-1-cave1/passages.txt b/npc/new_2-1-cave1/passages.txt
deleted file mode 100644
index e11badd6..00000000
--- a/npc/new_2-1-cave1/passages.txt
+++ /dev/null
@@ -1 +0,0 @@
-new_2-1.gat,36,30 warp caveexit 3,0,new_1-1.gat,25,95
diff --git a/npc/new_20-1-woodland-village/passages.txt b/npc/new_20-1-woodland-village/passages.txt
deleted file mode 100644
index fab35171..00000000
--- a/npc/new_20-1-woodland-village/passages.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-// West gate
-new_18-1.gat,54,61 warp warp1 0,1,new_19-1.gat,26,36
-new_19-1.gat,23,36 warp warp2 1,1,new_18-1.gat,53,61
-
-// South gate
-new_18-1.gat,78,80 warp warp1 3,0,new_19-1.gat,48,54
-new_19-1.gat,48,56 warp warp2 3,1,new_18-1.gat,78,82
-
-// East gate
-new_18-1.gat,128,60 warp warp1 0,1,new_19-1.gat,96,35
-new_19-1.gat,97,36 warp warp2 1,1,new_18-1.gat,129,60
-
-// North gate
-new_18-1.gat,78,49 warp warp1 3,0,new_19-1.gat,48,24
-new_19-1.gat,48,23 warp warp2 3,1,new_18-1.gat,78,48
-
-// To woodland
-new_18-1.gat,78,101 warp warp1 3,1,new_16-1.gat,68,23
-new_16-1.gat,68,22 warp warp2 3,1,new_18-1.gat,78,100
-
-new_18-1.gat,132,100 warp warp1 1,1,new_16-1.gat,122,23
-new_16-1.gat,122,21 warp warp2 1,1,new_18-1.gat,132,98
-
-new_9-1.gat,124,61 warp warp1 1,3,new_18-1.gat,27,61
-new_18-1.gat,25,61 warp warp2 1,3,new_9-1.gat,122,61
-
-// indoor <-> outdoor and indoor <-> indoor
-
-// Inn
-new_19-1.gat,35,29 warp out-in 1,1,new_20-1.gat,50,55
-new_20-1.gat,50,56 warp in-out 1,1,new_19-1.gat,35,31
-new_20-1.gat,73,45 warp in-1f 2,1,new_20-1.gat,74,23
-new_20-1.gat,74,24 warp 1f-in 2,1,new_20-1.gat,73,46
-new_20-1.gat,74,53 warp 1f-1b 0,0,new_20-1.gat,143,81
-new_20-1.gat,143,79 warp 1b-1f 0,0,new_20-1.gat,74,52
-new_20-1.gat,147,89 warp 1b-cv 0,0,new_35-1.gat,173,22
-
-// Archer Shop
-new_19-1.gat,59,33 warp out-in 0,0,new_20-1.gat,95,29
-new_20-1.gat,95,31 warp in-out 0,0,new_19-1.gat,59,34
-
-// Potion Shop
-new_19-1.gat,71,30 warp out-in 0,0,new_20-1.gat,130,25
-new_20-1.gat,130,27 warp in-out 0,0,new_19-1.gat,71,31
-
-// Doctor
-new_19-1.gat,80,31 warp out-in 0,0,new_20-1.gat,149,66
-new_20-1.gat,149,68 warp in-out 0,0,new_19-1.gat,80,32
-new_20-1.gat,154,62 warp in-1f 1,0,new_20-1.gat,154,46
-new_20-1.gat,154,47 warp 1f-in 1,0,new_20-1.gat,154,63
-new_20-1.gat,143,43 warp 1f-2f 1,0,new_20-1.gat,143,24
-new_20-1.gat,143,26 warp 2f-1f 1,0,new_20-1.gat,143,44
-
-// Blacksmith
-new_19-1.gat,91,46 warp out-in 0,0,new_20-1.gat,181,66
-new_20-1.gat,181,68 warp in-out 1,0,new_19-1.gat,91,47
-
-// Mayor
-new_19-1.gat,72,44 warp out-in 0,0,new_20-1.gat,113,77
-new_20-1.gat,113,79 warp in-out 1,0,new_19-1.gat,72,45
-new_20-1.gat,113,68 warp in-1f 1,0,new_20-1.gat,113,46
-new_20-1.gat,113,47 warp 1f-in 1,0,new_20-1.gat,113,69
-
-// General Store
-new_19-1.gat,58,46 warp out-in 0,0,new_20-1.gat,27,105
-new_20-1.gat,27,107 warp in-out 0,0,new_19-1.gat,58,47
diff --git a/npc/new_21-1-ice-cave2/monsters.txt b/npc/new_21-1-ice-cave2/monsters.txt
deleted file mode 100644
index b1a238b3..00000000
--- a/npc/new_21-1-ice-cave2/monsters.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-// Map: new_21-1
-// This is the second level of the Ice Cave beneath Snow Town.
-//
-
-new_21-1.gat,0,0,0,0 monster Bat 1017,5,0,0,Mob21::OnBat
-new_21-1.gat,0,0,0,0 monster Fluffy 1020,15,0,0,Mob21::OnFluffy
-
-new_21-1.gat,0,0,0 script Mob21 -1,{
-OnBat:
- set @mobID, 1017;
- callfunc "MobPoints";
- break;
-
-OnFluffy:
- set @mobID, 1020;
- callfunc "MobPoints";
- break;
-
- end;
-}
diff --git a/npc/new_21-1-ice-cave2/passages.txt b/npc/new_21-1-ice-cave2/passages.txt
deleted file mode 100644
index 6e419384..00000000
--- a/npc/new_21-1-ice-cave2/passages.txt
+++ /dev/null
@@ -1 +0,0 @@
-new_21-1.gat,36,34 warp toice1 1,0,new_12-1.gat,26,25
diff --git a/npc/new_22-1-snake-cave/passages.txt b/npc/new_22-1-snake-cave/passages.txt
deleted file mode 100644
index adf4468d..00000000
--- a/npc/new_22-1-snake-cave/passages.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-new_22-1.gat,52,33 warp fromsnakecaveN 0,0,new_7-1.gat,89,24
-new_22-1.gat,33,82 warp fromsnakecaveS 0,0,new_7-1.gat,71,76 \ No newline at end of file
diff --git a/npc/new_23-1-dimonds-cove/passages.txt b/npc/new_23-1-dimonds-cove/passages.txt
deleted file mode 100644
index 5d9fcc8b..00000000
--- a/npc/new_23-1-dimonds-cove/passages.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-new_14-1.gat,36,94 warp toDimondsCove 0,0,new_23-1.gat,32,44
-new_23-1.gat,32,46 warp fromDimondsCove 0,0,new_14-1.gat,36,95
-
-
-new_23-1.gat,27,24 warp toBasement 0,1,new_23-1.gat,35,68
-new_23-1.gat,37,68 warp fromBasement 0,1,new_23-1.gat,28,24
-
-new_23-1.gat,39,26 warp toSecond 0,0,new_23-1.gat,82,26
-new_23-1.gat,40,26 warp toSecond 0,0,new_23-1.gat,83,26
-new_23-1.gat,41,26 warp toSecond 0,0,new_23-1.gat,84,26
-new_23-1.gat,82,29 warp toFirst 0,0,new_23-1.gat,39,27
-new_23-1.gat,83,29 warp toFirst 0,0,new_23-1.gat,40,27
-new_23-1.gat,84,29 warp toFirst 0,0,new_23-1.gat,41,27
-
-new_23-1.gat,66,27 warp toThird 0,0,new_23-1.gat,66,71
-new_23-1.gat,67,27 warp toThird 0,0,new_23-1.gat,67,71
-new_23-1.gat,68,27 warp toThird 0,0,new_23-1.gat,68,71
-new_23-1.gat,66,73 warp toSecond 0,0,new_23-1.gat,66,28
-new_23-1.gat,67,73 warp toSecond 0,0,new_23-1.gat,67,28
-new_23-1.gat,68,73 warp toSecond 0,0,new_23-1.gat,68,28
-
diff --git a/npc/new_24-1-eastern-desert-mountain-passage/monsters.txt b/npc/new_24-1-eastern-desert-mountain-passage/monsters.txt
deleted file mode 100644
index 649abc39..00000000
--- a/npc/new_24-1-eastern-desert-mountain-passage/monsters.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-// Map: new_24-1
-// This is the Desert Mountains.
-//
-
-new_24-1.gat,0,0,0,0 monster MountainSnake 1026,60,0,0,Mob24::OnMountainSnake
-
-new_24-1.gat,0,0,0 script Mob24 -1,{
-OnMountainSnake:
- set @mobID, 1026;
- callfunc "MobPoints";
- break;
-
- end;
-}
diff --git a/npc/new_24-1-eastern-desert-mountain-passage/passages.txt b/npc/new_24-1-eastern-desert-mountain-passage/passages.txt
deleted file mode 100644
index ae6d5a01..00000000
--- a/npc/new_24-1-eastern-desert-mountain-passage/passages.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-new_24-1.gat,19,32 warp toEastDesert 0,0,new_7-1.gat,160,101
-new_24-1.gat,20,31 warp toEastDesert 0,0,new_7-1.gat,161,100
-new_24-1.gat,21,30 warp toEastDesert 0,0,new_7-1.gat,162,99
-new_24-1.gat,22,29 warp toEastDesert 0,0,new_7-1.gat,163,98
-new_24-1.gat,23,28 warp toEastDesert 0,0,new_7-1.gat,164,97
-new_24-1.gat,24,27 warp toEastDesert 0,0,new_7-1.gat,165,96
-new_24-1.gat,25,26 warp toEastDesert 0,0,new_7-1.gat,166,95
-new_24-1.gat,26,25 warp toEastDesert 0,0,new_7-1.gat,167,94
-new_24-1.gat,27,24 warp toEastDesert 0,0,new_7-1.gat,168,93
-new_24-1.gat,28,23 warp toEastDesert 0,0,new_7-1.gat,169,92
-new_24-1.gat,29,22 warp toEastDesert 0,0,new_7-1.gat,170,91
-new_24-1.gat,30,21 warp toEastDesert 0,0,new_7-1.gat,171,90
-new_24-1.gat,31,20 warp toEastDesert 0,0,new_7-1.gat,172,89
-new_24-1.gat,40,26 warp toMountainCave 0,0,new_25-1.gat,40,27
-new_24-1.gat,55,27 warp toMountainCave 0,0,new_25-1.gat,55,28
-new_24-1.gat,62,30 warp toMountainCave 0,0,new_25-1.gat,62,31
-new_24-1.gat,86,24 warp toMountainCave 0,0,new_25-1.gat,86,25
-new_24-1.gat,91,24 warp toMountainCave 0,0,new_25-1.gat,91,25
-new_24-1.gat,122,24 warp toMountainCave 0,0,new_25-1.gat,122,25
-new_24-1.gat,77,44 warp toMountainCave 0,0,new_25-1.gat,77,45
-new_24-1.gat,104,44 warp toMountainCave 0,0,new_25-1.gat,104,45
-new_24-1.gat,114,49 warp toMountainCave 0,0,new_25-1.gat,114,50
-new_24-1.gat,110,56 warp toMountainCave 0,0,new_25-1.gat,110,57
-new_24-1.gat,125,59 warp toMountainCave 0,0,new_25-1.gat,125,60
-new_24-1.gat,60,58 warp toMountainCave 0,0,new_25-1.gat,60,69
-new_24-1.gat,92,63 warp toMountainCave 0,0,new_25-1.gat,92,64
-new_24-1.gat,112,74 warp toMountainCave 0,0,new_25-1.gat,112,75
-new_24-1.gat,51,90 warp toMountainCave 0,0,new_25-1.gat,51,91
-new_24-1.gat,74,90 warp toMountainCave 0,0,new_25-1.gat,74,91
-new_24-1.gat,38,121 warp toMountainCave 0,0,new_25-1.gat,38,122
-new_24-1.gat,79,120 warp toMountainCave 0,0,new_25-1.gat,79,121
-new_24-1.gat,121,110 warp toMountainCave 0,0,new_25-1.gat,121,111
diff --git a/npc/new_25-1-eastern-desert-cave/monsters.txt b/npc/new_25-1-eastern-desert-cave/monsters.txt
deleted file mode 100644
index b24d2e7c..00000000
--- a/npc/new_25-1-eastern-desert-cave/monsters.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-// Map: new_25-1
-// This is the Desert Mountains Caves.
-//
-
-new_25-1.gat,0,0,0,0 monster MountainSnake 1026,50,0,0,Mob25::OnMountainSnake
-
-new_25-1.gat,0,0,0 script Mob25 -1,{
-OnMountainSnake:
- set @mobID, 1026;
- callfunc "MobPoints";
- break;
-
- end;
-}
diff --git a/npc/new_25-1-eastern-desert-cave/passages.txt b/npc/new_25-1-eastern-desert-cave/passages.txt
deleted file mode 100644
index 9fc66eff..00000000
--- a/npc/new_25-1-eastern-desert-cave/passages.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-new_25-1.gat,40,26 warp toMountainPass 0,0,new_24-1.gat,40,27
-new_25-1.gat,55,27 warp toMountainPass 0,0,new_24-1.gat,55,28
-new_25-1.gat,62,30 warp toMountainPass 0,0,new_24-1.gat,62,31
-new_25-1.gat,86,24 warp toMountainPass 0,0,new_24-1.gat,86,25
-new_25-1.gat,91,24 warp toMountainPass 0,0,new_24-1.gat,91,25
-new_25-1.gat,122,24 warp toMountainPass 0,0,new_24-1.gat,122,25
-new_25-1.gat,77,44 warp toMountainPass 0,0,new_24-1.gat,77,45
-new_25-1.gat,104,44 warp toMountainPass 0,0,new_24-1.gat,104,45
-new_25-1.gat,114,49 warp toMountainPass 0,0,new_24-1.gat,114,50
-new_25-1.gat,110,56 warp toMountainPass 0,0,new_24-1.gat,110,57
-new_25-1.gat,125,59 warp toMountainPass 0,0,new_24-1.gat,125,60
-new_25-1.gat,60,68 warp toMountainPass 0,0,new_24-1.gat,60,59
-new_25-1.gat,92,63 warp toMountainPass 0,0,new_24-1.gat,92,64
-new_25-1.gat,112,74 warp toMountainPass 0,0,new_24-1.gat,112,75
-new_25-1.gat,51,90 warp toMountainPass 0,0,new_24-1.gat,51,91
-new_25-1.gat,74,90 warp toMountainPass 0,0,new_24-1.gat,74,91
-new_25-1.gat,38,121 warp toMountainPass 0,0,new_24-1.gat,38,122
-new_25-1.gat,79,120 warp toMountainPass 0,0,new_24-1.gat,79,121
-new_25-1.gat,121,110 warp toMountainPass 0,0,new_24-1.gat,121,111
diff --git a/npc/new_26-1-hill1/monsters.txt b/npc/new_26-1-hill1/monsters.txt
deleted file mode 100644
index cc95281f..00000000
--- a/npc/new_26-1-hill1/monsters.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-// Map: new_26-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
-
-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
-
-new_26-1.gat,0,0,0,0 monster SilkWorm 1035,5,6000,3000,Mob26::OnSilkWorm
-
-new_26-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;
-
- end;
-}
diff --git a/npc/new_26-1-hill1/passages.txt b/npc/new_26-1-hill1/passages.txt
deleted file mode 100644
index 6d5cabe0..00000000
--- a/npc/new_26-1-hill1/passages.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-new_26-1.gat,132,164 warp south 2,0,new_9-1.gat,72,16
-new_26-1.gat,98,99 warp lowtunnel1 0,0,new_27-1.gat,36,81
-new_26-1.gat,109,92 warp hightunnel1 0,0,new_27-1.gat,79,73
-new_26-1.gat,123,90 warp npccave 0,0,new_27-1.gat,38,156
-new_26-1.gat,92,104 warp lowtunnel2 0,0,new_27-1.gat,270,111
-new_26-1.gat,65,126 warp hightunnel2 0,0,new_27-1.gat,176,139
-new_26-1.gat,44,88 warp starttunnel3 0,0,new_27-1.gat,354,187
-new_26-1.gat,41,48 warp realhightunnel3 0,0,new_27-1.gat,353,78
-new_26-1.gat,51,39 warp high1tunnel3 0,0,new_27-1.gat,370,45
-new_26-1.gat,148,67 warp high2tunnel3 0,0,new_27-1.gat,475,104
-new_26-1.gat,150,59 warp map26to28 0,4,new_28-1.gat,21,75
diff --git a/npc/new_26-1-hill1/shops.txt b/npc/new_26-1-hill1/shops.txt
deleted file mode 100644
index 4e2ce96e..00000000
--- a/npc/new_26-1-hill1/shops.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-//
-
-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
diff --git a/npc/new_27-1-hill2/passages.txt b/npc/new_27-1-hill2/passages.txt
deleted file mode 100644
index b85404fb..00000000
--- a/npc/new_27-1-hill2/passages.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-new_27-1.gat,36,83 warp lowerexit 1,0,new_26-1.gat,98,100
-new_27-1.gat,79,75 warp higherexit 1,0,new_26-1.gat,109,93
-new_27-1.gat,38,157 warp caveexit 1,0,new_26-1.gat,123,91
-new_27-1.gat,270,112 warp lowerexit 0,1,new_26-1.gat,92,105
-new_27-1.gat,176,138 warp higherexit 0,0,new_26-1.gat,65,127
-new_27-1.gat,354,189 warp startexit 1,0,new_26-1.gat,44,89
-new_27-1.gat,353,80 warp realexit 1,0,new_26-1.gat,41,48
-new_27-1.gat,370,47 warp higher1exit 1,0,new_26-1.gat,51,40
-new_27-1.gat,474,104 warp higher2exit 0,1,new_26-1.gat,146,67
diff --git a/npc/new_28-1-hillwest/monsters.txt b/npc/new_28-1-hillwest/monsters.txt
deleted file mode 100644
index fe216eae..00000000
--- a/npc/new_28-1-hillwest/monsters.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-// Map: new_28-1
-// 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
-
-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
-
-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
-
-new_28-1.gat,0,0,0,0 monster SilkWorm 1035,4,6000,3000,Mob28::OnSilkWorm
-
-new_28-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;
-
- end;
-}
diff --git a/npc/new_28-1-hillwest/passages.txt b/npc/new_28-1-hillwest/passages.txt
deleted file mode 100644
index ed0ea552..00000000
--- a/npc/new_28-1-hillwest/passages.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-new_28-1.gat,20,74 warp map28to26 0,4,new_26-1.gat,148,60
-new_28-1.gat,45,21 warp map28to33 1,0,new_33-1.gat,46,104
-new_28-1.gat,43,90 warp map28to36 0,0,new_36-1.gat,63,41
diff --git a/npc/new_29-1-west-woodland/monsters.txt b/npc/new_29-1-west-woodland/monsters.txt
deleted file mode 100644
index cbb9e182..00000000
--- a/npc/new_29-1-west-woodland/monsters.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-// Map: new_29-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
-
-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
-
-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
-
-new_29-1.gat,0,0,0,0 monster SilkWorm 1035,4,6000,3000,Mob29::OnSilkWorm
-
-new_29-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;
-
- end;
-}
diff --git a/npc/new_29-1-west-woodland/passages.txt b/npc/new_29-1-west-woodland/passages.txt
deleted file mode 100644
index 1bfb67a7..00000000
--- a/npc/new_29-1-west-woodland/passages.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-new_29-1.gat,109,90 warp map29to9 0,3,new_9-1.gat,31,60
-new_29-1.gat,93,58 warp map29to30low 0,0,new_30-1.gat,56,172
-new_29-1.gat,76,38 warp map29to30high 0,0,new_30-1.gat,35,33 \ No newline at end of file
diff --git a/npc/new_3-1-tulimshar/bleacher.txt b/npc/new_3-1-tulimshar/bleacher.txt
deleted file mode 100644
index 6a15e273..00000000
--- a/npc/new_3-1-tulimshar/bleacher.txt
+++ /dev/null
@@ -1,126 +0,0 @@
-//
-
-new_3-1.gat,27,53,0 script Candide 156,{
- mes "[Candide]";
- mes "\"I've figured out how that volcanic ash bleaches cloth.";
- mes "I could do it for you, but I'll need three piles of ash and 5,000 GP for supplies per item.\"";
- next;
-
- if (countitem(701) < 3) goto L_no_ash;
-
- if (zeny < 5000) goto L_no_money;
-
- menu "I'd like to bleach something", -,
- "No thanks", L_close;
-
-L_bleach_menu:
- mes "[Candide]";
- mes "\"What would you like to bleach?\"";
- next;
-
- menu "Cotton shirt", L_cottonshirt,
- "V-Neck sweater", L_vneck,
- "Turtleneck sweater", L_tneck,
- "Cotton shorts", L_shorts,
- "Cotton skirt", L_skirt,
- "Tank top ", L_tanktop,
- "Short tank top", L_tanktop_short,
- "Silk robe", L_robe,
- "Nevermind", -;
- goto L_close;
-
-L_cottonshirt: set @normal, 1202;
- set @dyeBase, 2050;
- goto L_choose_color;
-
-L_vneck: set @normal, 624;
- set @dyeBase, 2060;
- goto L_choose_color;
-
-L_tneck: set @normal, 564;
- set @dyeBase, 2070;
- goto L_choose_color;
-
-L_shorts: set @normal, 586;
- set @dyeBase, 2110;
- goto L_choose_color;
-
-L_skirt: set @normal, 632;
- set @dyeBase, 2100;
- goto L_choose_color;
-
-L_tanktop: set @normal, 688;
- set @dyeBase, 2090;
- goto L_choose_color;
-
-L_tanktop_short: set @normal, 689;
- set @dyeBase, 2120;
- goto L_choose_color;
-
-L_robe: set @normal, 720;
- set @dyeBase, 2080;
- goto L_choose_color;
-
-L_choose_color:
- mes "[Candide]";
- mes "\"And the color?\"";
- next;
-
- menu "Red", -,
- "Green", -,
- "Dark Blue", -,
- "Yellow", -,
- "Light Blue", -,
- "Pink", -,
- "Black", -,
- "Orange", -,
- "Purple", -,
- "Dark Green", -;
-
- set @del, @dyeBase + @menu - 1;
-
- if (countitem(@del) == 0) goto L_no_item;
-
- if (countitem(701) < 3) goto L_no_ash;
-
- if (zeny < 5000) goto L_no_money;
-
- delitem @del, 1;
- getitem @normal, 1;
- delitem 701, 3;
- set zeny, zeny - 5000;
-
-L_again:
- mes "[Candide]";
- mes "\"Would you like to bleach something else?\"";
- next;
-
- menu "Yes", L_bleach_menu,
- "No", L_close;
-
-L_no_item:
- mes "[Candide]";
- mes "\"You don't have one of those.\"";
- next;
-
- goto L_again;
-
-L_no_ash:
- mes "[Candide]";
- mes "\"You don't have enough ash for me to bleach anything.";
- mes "I need three piles.\"";
- next;
-
- goto L_close;
-
-L_no_money:
- mes "[Candide]";
- mes "\"You don't have enough gold for me to bleach anything.";
- mes "I need 5,000 GP for supplies.\"";
- next;
-
-L_close:
- mes "[Candide]";
- mes "\"Come again.\"";
- close;
-}
diff --git a/npc/new_3-1-tulimshar/merchant.txt b/npc/new_3-1-tulimshar/merchant.txt
deleted file mode 100644
index 186365d6..00000000
--- a/npc/new_3-1-tulimshar/merchant.txt
+++ /dev/null
@@ -1 +0,0 @@
-new_3-1.gat,39,52,0 shop Neko 101,501:50,502:60,1201:100,522:300,521:1000,656:250,1202:1000,523:8000,603:-1
diff --git a/npc/new_3-1-tulimshar/passages.txt b/npc/new_3-1-tulimshar/passages.txt
deleted file mode 100644
index 2ce31455..00000000
--- a/npc/new_3-1-tulimshar/passages.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-//
-
-new_3-1.gat,42,88 warp tofield 5,2,new_1-1.gat,58,17
-new_3-1.gat,32,71 warp toinn 0,0,new_8-1.gat,25,34
-new_3-1.gat,75,41 warp tohouse 0,0,new_8-1.gat,71,72
diff --git a/npc/new_3-1-tulimshar/soul-menhir.txt b/npc/new_3-1-tulimshar/soul-menhir.txt
deleted file mode 100644
index 147ed63d..00000000
--- a/npc/new_3-1-tulimshar/soul-menhir.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-new_3-1.gat,38,69,0 script Soul Menhir 144, {
- set @map$, "new_3-1.gat";
- set @x, 38;
- set @y, 70;
- callfunc "SoulMenhir";
-}
diff --git a/npc/new_30-1-west-woodland-cave/passages.txt b/npc/new_30-1-west-woodland-cave/passages.txt
deleted file mode 100644
index 9ef108a2..00000000
--- a/npc/new_30-1-west-woodland-cave/passages.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-new_30-1.gat,91,108 warp lowtohigh 0,0,new_30-1.gat,103,52
-new_30-1.gat,101,54 warp hightolow 5,0,new_30-1.gat,91,109
-new_30-1.gat,56,174 warp tomap29low 2,0,new_29-1.gat,93,59
-new_30-1.gat,35,32 warp tomap29high 0,0,new_29-1.gat,76,39 \ No newline at end of file
diff --git a/npc/new_31-1-southwest-woodland/monsters.txt b/npc/new_31-1-southwest-woodland/monsters.txt
deleted file mode 100644
index 0ce818c1..00000000
--- a/npc/new_31-1-southwest-woodland/monsters.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-// Map: new_31-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
-
-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
-
-new_31-1.gat,0,0,0,0 monster SilkWorm 1035,7,15000,7000,Mob31::onSilkWorm
-
-new_31-1.gat,0,0,0 script Mob31 -1,{
-OnLogHead:
- set @mobID, 1025;
- callfunc "MobPoints";
- break;
-
-OnSpikyMushroom:
- set @mobID, 1019;
- callfunc "MobPoints";
- break;
-
-OnFlower:
- set @mobID, 1014;
- callfunc "MobPoints";
- break;
-
-OnGamboge:
- set @mobID, 1031;
- callfunc "MobPoints";
- break;
-
-OnAlizarin:
- set @mobID, 1032;
- callfunc "MobPoints";
- break;
-
-OnSilkWorm:
- set @mobID, 1035;
- callfunc "MobPoints";
- break;
-
- end;
-}
diff --git a/npc/new_31-1-southwest-woodland/passages.txt b/npc/new_31-1-southwest-woodland/passages.txt
deleted file mode 100644
index 4adfcdcd..00000000
--- a/npc/new_31-1-southwest-woodland/passages.txt
+++ /dev/null
@@ -1 +0,0 @@
-new_31-1.gat,93,54 warp map31to14 0,1,new_14-1.gat,15,54 \ No newline at end of file
diff --git a/npc/new_32-1-south-woodland-2/monsters.txt b/npc/new_32-1-south-woodland-2/monsters.txt
deleted file mode 100644
index 8075550c..00000000
--- a/npc/new_32-1-south-woodland-2/monsters.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-// Map: new_32-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
-
-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
-
-new_32-1.gat,0,0,0,0 monster SilkWorm 1035,7,15000,7000,Mob32::onSilkWorm
-
-new_32-1.gat,0,0,0 script Mob32 -1,{
-OnMouboo:
- set @mobID, 1028;
- callfunc "MobPoints";
- break;
-
-OnScorpion:
- set @mobID, 1003;
- callfunc "MobPoints";
- break;
-
-OnMauve:
- set @mobID, 1029;
- callfunc "MobPoints";
- break;
-
-OnCobalt:
- set @mobID, 1030;
- callfunc "MobPoints";
- break;
-
-OnSilkWorm:
- set @mobID, 1035;
- callfunc "MobPoints";
- break;
-
- end;
-}
diff --git a/npc/new_32-1-south-woodland-2/passages.txt b/npc/new_32-1-south-woodland-2/passages.txt
deleted file mode 100644
index 06fba664..00000000
--- a/npc/new_32-1-south-woodland-2/passages.txt
+++ /dev/null
@@ -1 +0,0 @@
-new_32-1.gat,55,20 warp map32to14 3,0,new_14-1.gat,56,103
diff --git a/npc/new_33-1-hill-northwest/monsters.txt b/npc/new_33-1-hill-northwest/monsters.txt
deleted file mode 100644
index 8ec54d78..00000000
--- a/npc/new_33-1-hill-northwest/monsters.txt
+++ /dev/null
@@ -1,76 +0,0 @@
-// Map: new_33-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
-
-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
-
-new_33-1.gat,0,0,0,0 monster SilkWorm 1035,10,0,0,Mob33::OnSilkWorm
-
-new_33-1.gat,0,0,0 script Mob33 -1,{
-OnBat:
- set @mobID, 1017;
- callfunc "MobPoints";
- break;
-
-OnFireGoblin:
- set @mobID, 1011;
- callfunc "MobPoints";
- break;
-
-OnMouboo:
- set @mobID, 1028;
- callfunc "MobPoints";
- break;
-
-OnFlower:
- set @mobID, 1014;
- callfunc "MobPoints";
- break;
-
-OnSpikyMushroom:
- set @mobID, 1019;
- callfunc "MobPoints";
- break;
-
-OnEvilMushroom:
- set @mobID, 1013;
- 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;
-
- end;
-}
diff --git a/npc/new_33-1-hill-northwest/passages.txt b/npc/new_33-1-hill-northwest/passages.txt
deleted file mode 100644
index f026428c..00000000
--- a/npc/new_33-1-hill-northwest/passages.txt
+++ /dev/null
@@ -1 +0,0 @@
-new_33-1.gat,46,105 warp map33to28 2,-1,new_28-1.gat,45,22
diff --git a/npc/new_34-1-north-beach/monsters.txt b/npc/new_34-1-north-beach/monsters.txt
deleted file mode 100644
index 89fcbda7..00000000
--- a/npc/new_34-1-north-beach/monsters.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-// Map: new_34-1
-// This is the Beach west of Tulimshar.
-//
-
-new_34-1.gat,0,0,0,0 monster SeaSlime 1033,30,0,0,Mob34::OnSeaSlime
-new_34-1.gat,0,0,0,0 monster GiantMaggot 1006,10,0,0,Mob34::OnGiantMaggot
-new_34-1.gat,0,0,0,0 monster RedScorpion 1004,12,0,0,Mob34::OnRedScorpion
-
-new_34-1.gat,0,0,0 script Mob34 -1,{
-OnSeaSlime:
- set @mobID, 1033;
- callfunc "MobPoints";
- break;
-
-OnGiantMaggot:
- set @mobID, 1006;
- callfunc "MobPoints";
- break;
-
-OnRedScorpion:
- set @mobID, 1004;
- callfunc "MobPoints";
- break;
-
- end;
-}
diff --git a/npc/new_34-1-north-beach/passages.txt b/npc/new_34-1-north-beach/passages.txt
deleted file mode 100644
index 198c55b4..00000000
--- a/npc/new_34-1-north-beach/passages.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-new_34-1.gat,83,113 warp todesert 3,1,new_1-1.gat,29,15
-new_34-1.gat,36,111 warp tobeach 3,1,new_15-1.gat,141,21
diff --git a/npc/new_35-1-woodland-village/monsters.txt b/npc/new_35-1-woodland-village/monsters.txt
deleted file mode 100644
index 9b108f5f..00000000
--- a/npc/new_35-1-woodland-village/monsters.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-// Map: new_35-1
-// 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
-
-new_35-1.gat,0,0,0 script Mob35 -1,{
-OnYellowSlime:
- set @mobID, 1007;
- callfunc "MobPoints";
- break;
-
-OnRedSlime:
- set @mobID, 1008;
- callfunc "MobPoints";
- break;
-
-OnBlackScorpion:
- set @mobID, 1009;
- callfunc "MobPoints";
- break;
-
- end;
-}
diff --git a/npc/new_35-1-woodland-village/passages.txt b/npc/new_35-1-woodland-village/passages.txt
deleted file mode 100644
index c72af585..00000000
--- a/npc/new_35-1-woodland-village/passages.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-// To village
-new_35-1.gat,173,20 warp cv-1b 0,0,new_20-1.gat,147,88
-
-// To cave snake cave
-new_35-1.gat,20,57 warp cave 0,1,new_17-1.gat,129,88
diff --git a/npc/new_36-1-magic-house/passages.txt b/npc/new_36-1-magic-house/passages.txt
deleted file mode 100644
index d5376f5b..00000000
--- a/npc/new_36-1-magic-house/passages.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-new_36-1.gat,63,43 warp map36to28 0,1,new_28-1.gat,42,91
-new_36-1.gat,67,35 warp tobigroom 0,0,new_36-1.gat,21,40
-new_36-1.gat,21,42 warp tosmallroom 0,1,new_36-1.gat,67,37
diff --git a/npc/new_37-1-woodland-mine/miners.txt b/npc/new_37-1-woodland-mine/miners.txt
deleted file mode 100644
index 99bba7fb..00000000
--- a/npc/new_37-1-woodland-mine/miners.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-//
-
-new_37-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/new_37-1-woodland-mine/monsters.txt b/npc/new_37-1-woodland-mine/monsters.txt
deleted file mode 100644
index d38d2695..00000000
--- a/npc/new_37-1-woodland-mine/monsters.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-// Map: new_37-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
-
-new_37-1.gat,57,63,4,4 monster SilkWorm 1035,2,60000,30000,Mob37::OnSilkWorm
-
-new_37-1.gat,0,0,0 script Mob37 -1,{
-OnLogHead:
- set @mobID, 1025;
- callfunc "MobPoints";
- break;
-
-OnSeaSlime:
- set @mobID, 1033;
- callfunc "MobPoints";
- break;
-
-OnBat:
- set @mobID, 1017;
- callfunc "MobPoints";
- break;
-
-OnYellowSlime:
- set @mobID, 1007;
- callfunc "MobPoints";
- break;
-
-OnSilkWorm:
- set @mobID, 1035;
- callfunc "MobPoints";
- break;
-
- end;
-}
diff --git a/npc/new_37-1-woodland-mine/passages.txt b/npc/new_37-1-woodland-mine/passages.txt
deleted file mode 100644
index be98b28c..00000000
--- a/npc/new_37-1-woodland-mine/passages.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-// To village
-new_37-1.gat,79,97 warp woodland 2,-1,new_18-1.gat,78,18
-
-// To camp building
-new_37-1.gat,65,73 warp inside -1,-1,new_38-1.gat,50,27
diff --git a/npc/new_38-1-woodland-mine/monsters.txt b/npc/new_38-1-woodland-mine/monsters.txt
deleted file mode 100644
index 7eb44908..00000000
--- a/npc/new_38-1-woodland-mine/monsters.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-// Map: new_38-1
-// This is the Woodland Mines -- level 1.
-//
-
-new_38-1.gat,114,21,4,3 monster YellowSlime 1007,1,120000,60000,Mob38::OnYellowSlime
-
-new_38-1.gat,0,0,0 script Mob38 -1,{
-OnYellowSlime:
- set @mobID, 1007;
- callfunc "MobPoints";
- break;
-
- end;
-}
diff --git a/npc/new_38-1-woodland-mine/passages.txt b/npc/new_38-1-woodland-mine/passages.txt
deleted file mode 100644
index 8ab42aa4..00000000
--- a/npc/new_38-1-woodland-mine/passages.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-// Outside
-new_38-1.gat,50,28 warp outside -1,-1,new_37-1.gat,65,74
-new_38-1.gat,41,21 warp outside -1,-1,new_37-1.gat,64,69
-
-// Basement
-new_38-1.gat,20,24 warp 1b -1,-1,new_38-1.gat,112,27
-new_38-1.gat,112,26 warp 1f -1,-1,new_38-1.gat,20,23
-
-// Second floor
-new_38-1.gat,21,28 warp 2f 0,-1,new_38-1.gat,79,25
-new_38-1.gat,79,26 warp 1f 0,-1,new_38-1.gat,21,29
- \ No newline at end of file
diff --git a/npc/new_4-1-cave-small/monsters.txt b/npc/new_4-1-cave-small/monsters.txt
deleted file mode 100644
index f51d010d..00000000
--- a/npc/new_4-1-cave-small/monsters.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-// Map: new_4-1
-// This is the Hermit's Cave -- level 1.
-//
-
-new_4-1.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
-
-new_4-1.gat,0,0,0 script Mob4 -1,{
-OnBat:
- set @mobID, 1017;
- callfunc "MobPoints";
- break;
-
-OnSilkWorm:
- set @mobID, 1035;
- callfunc "MobPoints";
- break;
-
- end;
-}
diff --git a/npc/new_4-1-cave-small/passages.txt b/npc/new_4-1-cave-small/passages.txt
deleted file mode 100644
index 200ab60f..00000000
--- a/npc/new_4-1-cave-small/passages.txt
+++ /dev/null
@@ -1 +0,0 @@
-new_4-1.gat,31,22 warp secondlvl 3,0,new_17-1.gat,72,11
diff --git a/npc/new_5-1-cave2/passages.txt b/npc/new_5-1-cave2/passages.txt
deleted file mode 100644
index ec363db0..00000000
--- a/npc/new_5-1-cave2/passages.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-new_2-1.gat,36,30 warp caveexit 3,0,new_1-1.gat,25,95
-new_1-1.gat,19,94 warp caveentrance 1,1,new_2-1.gat,37,31
-new_1-1.gat,111,79 warp eastdesert 2,2,new_7-1.gat,23,40
-new_7-1.gat,18,39 warp westdesert 3,4,new_1-1.gat,106,78 \ No newline at end of file
diff --git a/npc/new_6-1-arena/pvpflag.txt b/npc/new_6-1-arena/pvpflag.txt
deleted file mode 100644
index 361e062b..00000000
--- a/npc/new_6-1-arena/pvpflag.txt
+++ /dev/null
@@ -1 +0,0 @@
-new_6-1.gat mapflag pvp
diff --git a/npc/new_7-1-eastern-desert/monsters.txt b/npc/new_7-1-eastern-desert/monsters.txt
deleted file mode 100644
index c2ec4c71..00000000
--- a/npc/new_7-1-eastern-desert/monsters.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-// Map: new_7-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
-
-new_7-1.gat,0,0,0 script Mob7 -1,{
-OnMaggot:
- set @mobID, 1002;
- callfunc "MobPoints";
- break;
-
-OnSnake:
- set @mobID, 1010;
- callfunc "MobPoints";
- break;
-
- end;
-}
diff --git a/npc/new_7-1-eastern-desert/passages.txt b/npc/new_7-1-eastern-desert/passages.txt
deleted file mode 100644
index f0850ca1..00000000
--- a/npc/new_7-1-eastern-desert/passages.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-new_2-1.gat,36,30 warp caveexit 3,0,new_1-1.gat,25,95
-new_1-1.gat,19,94 warp caveentrance 1,1,new_2-1.gat,37,31
-new_1-1.gat,111,79 warp eastdesert 2,2,new_7-1.gat,23,40
-new_7-1.gat,18,39 warp westdesert 3,4,new_1-1.gat,106,78
-new_7-1.gat,89,23 warp tosnakecaveN 0,0,new_22-1.gat,52,34
-new_7-1.gat,71,75 warp tosnakecaveS 0,0,new_22-1.gat,33,83
-new_7-1.gat,162,103 warp toMountainPass 0,0,new_24-1.gat,20,33
-new_7-1.gat,163,102 warp toMountainPass 0,0,new_24-1.gat,21,32
-new_7-1.gat,164,101 warp toMountainPass 0,0,new_24-1.gat,22,31
-new_7-1.gat,165,100 warp toMountainPass 0,0,new_24-1.gat,23,30
-new_7-1.gat,166,99 warp toMountainPass 0,0,new_24-1.gat,24,29
-new_7-1.gat,167,98 warp toMountainPass 0,0,new_24-1.gat,25,28
-new_7-1.gat,168,97 warp toMountainPass 0,0,new_24-1.gat,26,27
-new_7-1.gat,169,96 warp toMountainPass 0,0,new_24-1.gat,27,26
-new_7-1.gat,170,95 warp toMountainPass 0,0,new_24-1.gat,28,25
-new_7-1.gat,171,94 warp toMountainPass 0,0,new_24-1.gat,29,24
-new_7-1.gat,172,93 warp toMountainPass 0,0,new_24-1.gat,30,23
-new_7-1.gat,173,92 warp toMountainPass 0,0,new_24-1.gat,31,22
-new_7-1.gat,174,91 warp toMountainPass 0,0,new_24-1.gat,32,21
-new_22-1.gat,52,33 warp fromsnakecaveN 0,0,new_7-1.gat,89,24
-new_22-1.gat,33,82 warp fromsnakecaveS 0,0,new_7-1.gat,71,76 \ No newline at end of file
diff --git a/npc/new_8-1-tulimshar/passages.txt b/npc/new_8-1-tulimshar/passages.txt
deleted file mode 100644
index 43a7f9f7..00000000
--- a/npc/new_8-1-tulimshar/passages.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-///////////////
-// Inn/Casino
-///////////////
-
-// Warps room 1
-new_8-1.gat,45,24 warp upstairs 0,2,new_8-1.gat,65,25
-new_8-1.gat,25,35 warp outside 0,0,new_3-1.gat,32,72
-
-// Warps room 2
-new_8-1.gat,65,25 warp downstairs 0,1,new_8-1.gat,42,25
-new_8-1.gat,68,22 warp tocasino 2,0,new_8-1.gat,32,72
-new_8-1.gat,67,31 warp tobedroom1 1,1,new_8-1.gat,102,23
-new_8-1.gat,76,31 warp tobedroom2 1,1,new_8-1.gat,130,23
-
-// Warps room 3
-new_8-1.gat,102,22 warp bedroom1tohall 2,0,new_8-1.gat,67,29
-
-// Warps room 4
-new_8-1.gat,130,22 warp bedroom2tohall 2,0,new_8-1.gat,76,29
-
-// Warps room 5
-new_8-1.gat,32,74 warp tohall 1,0,new_8-1.gat,68,23
-
-///////////////
-// Houses
-///////////////
-
-new_8-1.gat,71,73 warp outside 0,0,new_3-1.gat,75,42
diff --git a/npc/new_8-1-tulimshar/shops.txt b/npc/new_8-1-tulimshar/shops.txt
deleted file mode 100644
index 8482edd9..00000000
--- a/npc/new_8-1-tulimshar/shops.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-//
-
-new_8-1.gat,26,26,0 shop InnKeeper 112,539:175,513:20,519
-
-new_8-1.gat,103,26,0 script Rebecca 118,{
- set @npcName$, "Rebecca the Inn Keeper";
- set @cost, 100;
- callfunc "Inn";
-}
diff --git a/npc/new_9-1-woodland/monsters.txt b/npc/new_9-1-woodland/monsters.txt
deleted file mode 100644
index 52f1bc74..00000000
--- a/npc/new_9-1-woodland/monsters.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-// Map: new_9-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
-
-new_9-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
-
-new_9-1.gat,0,0,0 script Mob9 -1,{
-OnEvilMushroom:
- set @mobID, 1013;
- callfunc "MobPoints";
- break;
-
-OnFlower:
- set @mobID, 1014;
- callfunc "MobPoints";
- break;
-
-OnAlizarin:
- set @mobID, 1032;
- callfunc "MobPoints";
- break;
-
-OnSilkWorm:
- set @mobID, 1035;
- callfunc "MobPoints";
- break;
-
- end;
-}
diff --git a/npc/new_9-1-woodland/oscar.txt b/npc/new_9-1-woodland/oscar.txt
deleted file mode 100644
index f33e0e47..00000000
--- a/npc/new_9-1-woodland/oscar.txt
+++ /dev/null
@@ -1 +0,0 @@
-new_9-1.gat,87,34,0 shop Oscar 142,535:25,657:40 \ No newline at end of file
diff --git a/npc/new_9-1-woodland/passages.txt b/npc/new_9-1-woodland/passages.txt
deleted file mode 100644
index fa980cae..00000000
--- a/npc/new_9-1-woodland/passages.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-new_9-1.gat,58,91 warp tofield 1,1,new_4-1.gat,15,15
-new_9-1.gat,47,102 warp tosouth 2,2,new_14-1.gat,50,25
-new_9-1.gat,124,61 warp warp1 1,3,new_18-1.gat,27,61
-new_9-1.gat,30,60 warp tomap29 0,3,new_29-1.gat,108,90
-new_9-1.gat,72,15 warp tomap26 2,1,new_26-1.gat,131,162
diff --git a/npc/scripts.conf b/npc/scripts.conf
new file mode 100644
index 00000000..e10705cd
--- /dev/null
+++ b/npc/scripts.conf
@@ -0,0 +1,51 @@
+// This is the main script import file
+
+// NPC Functions
+npc: npc/functions/banker.txt
+npc: npc/functions/barber.txt
+npc: npc/functions/game_rules.txt
+npc: npc/functions/inn.txt
+npc: npc/functions/mob_points.txt
+npc: npc/functions/process_equip.txt
+npc: npc/functions/slot_machine.txt
+npc: npc/functions/soul_menhir.txt
+
+import: npc/_import.txt
+
+// Christmas 2006
+// npc: npc/xmas/2006/xmas1.txt
+// npc: npc/xmas/2006/xmas2.txt
+// npc: npc/xmas/2006/xmas3.txt
+// npc: npc/xmas/2006/xmas4.txt
+// npc: npc/xmas/2006/xmas5.txt
+// npc: npc/xmas/2006/xmas6.txt
+// npc: npc/xmas/2006/xmas7.txt
+// npc: npc/xmas/2006/xmas8.txt
+// npc: npc/xmas/2006/xmas9.txt
+// npc: npc/xmas/2006/xmas10.txt
+// npc: npc/xmas/2006/xmas11.txt
+// npc: npc/xmas/2006/xmas12.txt
+// npc: npc/xmas/2006/xmas13.txt
+// npc: npc/xmas/2006/xmas14.txt
+// npc: npc/xmas/2006/xmas15.txt
+// npc: npc/xmas/2006/xmas16.txt
+// npc: npc/xmas/2006/xmas17.txt
+// npc: npc/xmas/2006/xmas18.txt
+// npc: npc/xmas/2006/xmas19.txt
+// npc: npc/xmas/2006/xmas20.txt
+
+// Halloween 2007
+// npc: npc/halloween/2007/monsters.txt
+// npc: npc/halloween/2007/summon.txt
+
+// Christmas 2007
+// npc: npc/xmas2007/pre-xmas.txt
+// npc: npc/xmas2007/after-xmas.txt
+
+// Easter 2008
+// npc: npc/easter2008/monsters.txt
+// npc: npc/easter2008/npc.txt
+
+// Halloween 2008
+// npc: npc/halloween/2008/monsters.txt
+// npc: npc/halloween/2008/prize_master.txt
diff --git a/npc/new_10-1-xmas/xmas1.txt b/npc/xmas/2006/xmas1.txt
index 814dd9cc..a6e71686 100644
--- a/npc/new_10-1-xmas/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/new_10-1-xmas/xmas10.txt b/npc/xmas/2006/xmas10.txt
index 8ba50ae0..ed9b2654 100644
--- a/npc/new_10-1-xmas/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/new_10-1-xmas/xmas11.txt b/npc/xmas/2006/xmas11.txt
index 212a5225..559ece7c 100644
--- a/npc/new_10-1-xmas/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/new_10-1-xmas/xmas12.txt b/npc/xmas/2006/xmas12.txt
index a8527eaf..3311e902 100644
--- a/npc/new_10-1-xmas/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/new_10-1-xmas/xmas13.txt b/npc/xmas/2006/xmas13.txt
index 534403da..d84d3634 100644
--- a/npc/new_10-1-xmas/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/new_10-1-xmas/xmas14.txt b/npc/xmas/2006/xmas14.txt
index 2f1269a4..d279eed2 100644
--- a/npc/new_10-1-xmas/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/new_10-1-xmas/xmas15.txt b/npc/xmas/2006/xmas15.txt
index 32dc490c..5bad6dbf 100644
--- a/npc/new_10-1-xmas/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/new_10-1-xmas/xmas16.txt b/npc/xmas/2006/xmas16.txt
index c072684b..10a644df 100644
--- a/npc/new_10-1-xmas/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/new_10-1-xmas/xmas17.txt b/npc/xmas/2006/xmas17.txt
index 292744ef..f0d88648 100644
--- a/npc/new_10-1-xmas/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/new_10-1-xmas/xmas18.txt b/npc/xmas/2006/xmas18.txt
index e78e1b0c..fc83c980 100644
--- a/npc/new_10-1-xmas/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/new_10-1-xmas/xmas19.txt b/npc/xmas/2006/xmas19.txt
index 3c60aab7..c6e35812 100644
--- a/npc/new_10-1-xmas/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/new_10-1-xmas/xmas2.txt b/npc/xmas/2006/xmas2.txt
index bba2b0c8..9812186d 100644
--- a/npc/new_10-1-xmas/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/new_10-1-xmas/xmas20.txt b/npc/xmas/2006/xmas20.txt
index 0bc045db..62e979d4 100644
--- a/npc/new_10-1-xmas/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/new_10-1-xmas/xmas3.txt b/npc/xmas/2006/xmas3.txt
index 28dbc605..ebcb54c1 100644
--- a/npc/new_10-1-xmas/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/new_10-1-xmas/xmas4.txt b/npc/xmas/2006/xmas4.txt
index c9f13e3e..d27cd4de 100644
--- a/npc/new_10-1-xmas/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/new_10-1-xmas/xmas5.txt b/npc/xmas/2006/xmas5.txt
index 7269717c..50dd6928 100644
--- a/npc/new_10-1-xmas/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/new_10-1-xmas/xmas6.txt b/npc/xmas/2006/xmas6.txt
index da47ca1f..c424664e 100644
--- a/npc/new_10-1-xmas/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/new_10-1-xmas/xmas7.txt b/npc/xmas/2006/xmas7.txt
index 7bcc2983..00905793 100644
--- a/npc/new_10-1-xmas/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/new_10-1-xmas/xmas8.txt b/npc/xmas/2006/xmas8.txt
index 47752239..dc5793ea 100644
--- a/npc/new_10-1-xmas/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/new_10-1-xmas/xmas9.txt b/npc/xmas/2006/xmas9.txt
index f27629d8..dea1832f 100644
--- a/npc/new_10-1-xmas/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/xmas2007/after-xmas.txt b/npc/xmas/2007/after-xmas.txt
index 0d39f858..f7678d98 100644
--- a/npc/xmas2007/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/xmas2007/pre-xmas.txt b/npc/xmas/2007/pre-xmas.txt
index 8516f7e7..ba9c7c11 100644
--- a/npc/xmas2007/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]";