diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-03-20 01:17:20 +0300 |
---|---|---|
committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-03-25 21:51:11 +0100 |
commit | 2592f3b4329519124d456d8cb95758225e2da4ea (patch) | |
tree | 72f5b4d85eccbfb69ad25215a04ba06299e4239b /world/map | |
parent | 597953ec087a8f36724d1f8d09385d2e8a9a5f35 (diff) | |
download | serverdata-2592f3b4329519124d456d8cb95758225e2da4ea.tar.gz serverdata-2592f3b4329519124d456d8cb95758225e2da4ea.tar.bz2 serverdata-2592f3b4329519124d456d8cb95758225e2da4ea.tar.xz serverdata-2592f3b4329519124d456d8cb95758225e2da4ea.zip |
Change invisible npc id from 127 to 400.
127 - invisible unselectable npc (fake npc used by server)
400 - invisible selectable npc
Diffstat (limited to 'world/map')
45 files changed, 93 insertions, 93 deletions
diff --git a/world/map/npc/001-2/casino.txt b/world/map/npc/001-2/casino.txt index 4e385ba0..cb7966bc 100644 --- a/world/map/npc/001-2/casino.txt +++ b/world/map/npc/001-2/casino.txt @@ -20,17 +20,17 @@ L_End: close; } -001-2.gat,37,65,0|script|Slot1|127,{ +001-2.gat,37,65,0|script|Slot1|400,{ callfunc "SlotMachine"; close; } -001-2.gat,39,65,0|script|Slot2|127,{ +001-2.gat,39,65,0|script|Slot2|400,{ callfunc "SlotMachine"; close; } -001-2.gat,41,65,0|script|Slot3|127,{ +001-2.gat,41,65,0|script|Slot3|400,{ callfunc "SlotMachine"; close; } diff --git a/world/map/npc/001-2/dedication.txt b/world/map/npc/001-2/dedication.txt index 1a668da7..ec4e7e52 100644 --- a/world/map/npc/001-2/dedication.txt +++ b/world/map/npc/001-2/dedication.txt @@ -1,6 +1,6 @@ // Dedication to Irene Christina -001-2.gat,76,68,0|script|#IreneDedication|127,{ +001-2.gat,76,68,0|script|#IreneDedication|400,{ mes "~ Irene Christina ~"; mes "The song in this house is dedicated to Irene."; next; diff --git a/world/map/npc/002-3/mine_triggerone.txt b/world/map/npc/002-3/mine_triggerone.txt index c4e7569f..05aa1c01 100644 --- a/world/map/npc/002-3/mine_triggerone.txt +++ b/world/map/npc/002-3/mine_triggerone.txt @@ -1,7 +1,7 @@ //Sandstorm mine trigger 1 Trigger 002-3 35,43 (127) // Variables used: nibble 4 and 5 of QUEST_SouthTulimshar -002-3.gat,30,47,0|script|Button|127,0,0,{ +002-3.gat,30,47,0|script|Button|400,0,0,{ // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/002-3/mine_triggerthree.txt b/world/map/npc/002-3/mine_triggerthree.txt index bd234617..0bfecd22 100644 --- a/world/map/npc/002-3/mine_triggerthree.txt +++ b/world/map/npc/002-3/mine_triggerthree.txt @@ -1,7 +1,7 @@ //Sandstorm mine trigger 3 Trigger 002-3 98,42 (127) // Variables used: nibble 4 and 5 of QUEST_SouthTulimshar -002-3.gat,91,99,0|script|Button|127,0,0,{ +002-3.gat,91,99,0|script|Button|400,0,0,{ // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/002-3/mine_triggertwo.txt b/world/map/npc/002-3/mine_triggertwo.txt index 0cc43552..d18712ee 100644 --- a/world/map/npc/002-3/mine_triggertwo.txt +++ b/world/map/npc/002-3/mine_triggertwo.txt @@ -3,7 +3,7 @@ // - nibble 4 and 5 of QUEST_SouthTulimshar // - in FLAGS, FLAG_OPENED_UNDERGROUND -002-3.gat,100,37,0|script|Button|127,0,0,{ +002-3.gat,100,37,0|script|Button|400,0,0,{ // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/005-1/spirit.txt b/world/map/npc/005-1/spirit.txt index 91610530..cd75d536 100644 --- a/world/map/npc/005-1/spirit.txt +++ b/world/map/npc/005-1/spirit.txt @@ -275,10 +275,10 @@ S_update_var: return; } -005-1.gat,118,70,0|script|#EarthImp0#_M|127,{ +005-1.gat,118,70,0|script|#EarthImp0#_M|400,{ callfunc "EarthImpTouch"; } -005-1.gat,119,70,0|script|#EarthImp1#_M|127,{ +005-1.gat,119,70,0|script|#EarthImp1#_M|400,{ callfunc "EarthImpTouch"; } diff --git a/world/map/npc/005-1/tree.txt b/world/map/npc/005-1/tree.txt index e5fb0366..e42a050f 100644 --- a/world/map/npc/005-1/tree.txt +++ b/world/map/npc/005-1/tree.txt @@ -156,10 +156,10 @@ L_Close: } -005-1.gat,79,41,0|script|#DruidTree0#_M|127,{ +005-1.gat,79,41,0|script|#DruidTree0#_M|400,{ callfunc "QuestTreeTouch"; } -005-1.gat,80,41,0|script|#DruidTree1#_M|127,{ +005-1.gat,80,41,0|script|#DruidTree1#_M|400,{ callfunc "QuestTreeTouch"; } diff --git a/world/map/npc/005-4/bossfight.txt b/world/map/npc/005-4/bossfight.txt index 9fc06005..bc196ef3 100644 --- a/world/map/npc/005-4/bossfight.txt +++ b/world/map/npc/005-4/bossfight.txt @@ -1,6 +1,6 @@ //Author: Kage -005-4.gat,36,19,0|script|Switch#elecave|127,{ +005-4.gat,36,19,0|script|Switch#elecave|400,{ if ($@ELE_CAVE_STATUS != 0) goto L_Enjoy; mes "*You see a switch, it is flipped off*"; diff --git a/world/map/npc/007-1/witch.txt b/world/map/npc/007-1/witch.txt index 354df9a0..a8b6c75b 100644 --- a/world/map/npc/007-1/witch.txt +++ b/world/map/npc/007-1/witch.txt @@ -639,7 +639,7 @@ OnTimer300000: } -007-1.gat,128,100,0|script|#IlliaDaemon|127,{ +007-1.gat,128,100,0|script|#IlliaDaemon|400,{ end; onInit: diff --git a/world/map/npc/009-2/misc.txt b/world/map/npc/009-2/misc.txt index 9a0a3e16..41d4c78e 100644 --- a/world/map/npc/009-2/misc.txt +++ b/world/map/npc/009-2/misc.txt @@ -1,6 +1,6 @@ //Note in bar -009-2.gat,54,49,0|script|Note|127,{ +009-2.gat,54,49,0|script|Note|400,{ mes "[Note]"; mes "\"We refuse service to anyone who:\""; mes "\"-Has a bubblehead\""; @@ -11,7 +11,7 @@ } //Bookshelf -009-2.gat,109,44,0|script|#Book|127,{ +009-2.gat,109,44,0|script|#Book|400,{ if (getskilllv(SKILL_MAGIC)) goto L_magic; mes "[Bookshelf]"; diff --git a/world/map/npc/009-2/shops.txt b/world/map/npc/009-2/shops.txt index 6071906e..ce7fc548 100644 --- a/world/map/npc/009-2/shops.txt +++ b/world/map/npc/009-2/shops.txt @@ -22,7 +22,7 @@ // Potion Shop // sells cactus drink, cactus potion, iron potion, concentration potion, and slow poison potion -009-2.gat,123,22,0|shop|Potions#_M|127,CactusDrink :-1,CactusPotion :-1,IronPotion :-1,ConcentrationPotion :-1,SlowPoisonPotion :-1 +009-2.gat,123,22,0|shop|Potions#_M|400,CactusDrink :-1,CactusPotion :-1,IronPotion :-1,ConcentrationPotion :-1,SlowPoisonPotion :-1 // General Store // Sells various things, many not sold elsewhere diff --git a/world/map/npc/009-3/sword.txt b/world/map/npc/009-3/sword.txt index 169dd7f7..a1e16036 100644 --- a/world/map/npc/009-3/sword.txt +++ b/world/map/npc/009-3/sword.txt @@ -1,4 +1,4 @@ -009-3.gat,26,100,0|script|#MysticSword#_M|127,{ +009-3.gat,26,100,0|script|#MysticSword#_M|400,{ if (getskilllv(SKILL_MAGIC)) goto L_message; close; diff --git a/world/map/npc/009-4/torches.txt b/world/map/npc/009-4/torches.txt index e8321079..842183b1 100644 --- a/world/map/npc/009-4/torches.txt +++ b/world/map/npc/009-4/torches.txt @@ -100,7 +100,7 @@ function|script|InRangeTorch3|{ } // First Torch -009-4.gat,68,21,0|script|Torch|127,{ +009-4.gat,68,21,0|script|Torch|400,{ callfunc "InRangeTorch1"; callfunc "DoneWithTorches"; @@ -202,7 +202,7 @@ L_Failed: } // Second Torch -009-4.gat,67,42,0|script|Torch|127,{ +009-4.gat,67,42,0|script|Torch|400,{ callfunc "InRangeTorch2"; callfunc "DoneWithTorches"; @@ -304,7 +304,7 @@ L_Failed: // Third Torch -009-4.gat,33,86,0|script|Torch|127,{ +009-4.gat,33,86,0|script|Torch|400,{ callfunc "InRangeTorch3"; callfunc "DoneWithTorches"; diff --git a/world/map/npc/010-2/dimonds.txt b/world/map/npc/010-2/dimonds.txt index b2179ce5..97b6fe90 100644 --- a/world/map/npc/010-2/dimonds.txt +++ b/world/map/npc/010-2/dimonds.txt @@ -476,7 +476,7 @@ leave: close; } -010-2.gat,27,30,0|script|Bar Rules|127,{ +010-2.gat,27,30,0|script|Bar Rules|400,{ mes "Dimonds Cove Bar Rules"; next; mes "No excessive drinking!"; @@ -495,25 +495,25 @@ leave: close; } -010-2.gat,71,38,0|script|Store Policy|127,{ +010-2.gat,71,38,0|script|Store Policy|400,{ mes "All sales are final."; mes "Returns are subject to a 50% re-stocking fee."; close; } -010-2.gat,77,38,0|script|Store Policy|127,{ +010-2.gat,77,38,0|script|Store Policy|400,{ mes "All sales are final."; mes "Returns are subject to a 50% re-stocking fee."; close; } -010-2.gat,36,30,0|script|Directions|127,{ +010-2.gat,36,30,0|script|Directions|400,{ mes "This way to the Dimonds Cove Inn."; mes "Five star accommodation for the weary traveler!"; close; } -010-2.gat,80,32,0|script|Dimonds Cove 1|127,{ +010-2.gat,80,32,0|script|Dimonds Cove 1|400,{ mes "The Story of Dimonds Cove"; next; mes "One day Dimond D. Stone dreamed of her own restaurant."; @@ -532,14 +532,14 @@ leave: close; } -010-2.gat,85,32,0|script|Dimonds Cove 2|127,{ +010-2.gat,85,32,0|script|Dimonds Cove 2|400,{ mes "List of Events at Dimonds Cove"; mes "January 2008 - Construction of Dimonds Cove."; close; } -010-2.gat,71,30,0|script|Inn|127,{ +010-2.gat,71,30,0|script|Inn|400,{ mes "Welcome to the Dimonds Cove Inn"; mes "Rooms are 200 gp a night."; mes "Plese check in with Basil."; diff --git a/world/map/npc/011-1/shops.txt b/world/map/npc/011-1/shops.txt index a2b6a5a2..0c3032d2 100644 --- a/world/map/npc/011-1/shops.txt +++ b/world/map/npc/011-1/shops.txt @@ -9,4 +9,4 @@ 011-1.gat,109,38,0|shop|Exotic Trader|179,ToySabre :10000000,Cap :20000000,HighPriestCrown :30000000,MonsterSkullHelmet :30000000 // Shop -011-1.gat,80,33,0|shop|Fruit Store|127,GreenApple :-1,RedApple :-1,Orange :-1 +011-1.gat,80,33,0|shop|Fruit Store|400,GreenApple :-1,RedApple :-1,Orange :-1 diff --git a/world/map/npc/013-2/notes.txt b/world/map/npc/013-2/notes.txt index c2421015..49997195 100644 --- a/world/map/npc/013-2/notes.txt +++ b/world/map/npc/013-2/notes.txt @@ -1,22 +1,22 @@ // -013-2.gat,23,32,0|script|Motto|127,{ +013-2.gat,23,32,0|script|Motto|400,{ mes "Mid pleasures and palaces though we may roam,"; mes "Be it ever so humble, there's no place like home."; close; } -013-2.gat,30,32,0|script|Note|127,{ +013-2.gat,30,32,0|script|Note|400,{ mes "Please do not open."; close; } -013-2.gat,38,20,0|script|Saying|127,{ +013-2.gat,38,20,0|script|Saying|400,{ mes "The early bird catcheth the worm."; close; } -013-2.gat,27,21,0|script|Mirror|127,{ +013-2.gat,27,21,0|script|Mirror|400,{ 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?\""; @@ -31,7 +31,7 @@ } // Warp to north-eastern woods -013-2.gat,25,23,0|script|Spell|127,{ +013-2.gat,25,23,0|script|Spell|400,{ 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?\""; @@ -43,7 +43,7 @@ } // Warp to Indian in south-eastern desert -013-2.gat,27,24,0|script|Spell|127,{ +013-2.gat,27,24,0|script|Spell|400,{ 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..."; @@ -63,7 +63,7 @@ L_cheat: } // Warp to snow area -013-2.gat,25,27,0|script|Spell|127,{ +013-2.gat,25,27,0|script|Spell|400,{ mes "You read: \"Snow-white flakes and eminent frost - I'll go there, whatever the cost!\""; next; mes "You feel yourself getting lighter..."; @@ -93,7 +93,7 @@ L_Close: } // Warp to Dimond -013-2.gat,27,27,0|script|Spell|127,{ +013-2.gat,27,27,0|script|Spell|400,{ mes "You read: \"People and cosiness, lively and fun - that's where I've gone!\""; next; mes "The world around you slowly dissolves..."; @@ -103,7 +103,7 @@ L_Close: } // Warp to mines level 2 -013-2.gat,26,28,0|script|Spell|127,{ +013-2.gat,26,28,0|script|Spell|400,{ 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..."; @@ -113,7 +113,7 @@ L_Close: } // Death -013-2.gat,21,29,0|script|Spell|127,{ +013-2.gat,21,29,0|script|Spell|400,{ 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!"; @@ -123,7 +123,7 @@ L_Close: } // Naked -013-2.gat,28,29,0|script|Spell|127,{ +013-2.gat,28,29,0|script|Spell|400,{ 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/world/map/npc/015-1/sword.txt b/world/map/npc/015-1/sword.txt index 8af20f17..55c7c65d 100644 --- a/world/map/npc/015-1/sword.txt +++ b/world/map/npc/015-1/sword.txt @@ -1,4 +1,4 @@ -015-1.gat,97,97,0|script|#MagicSword#_M|127,{ +015-1.gat,97,97,0|script|#MagicSword#_M|400,{ if (getskilllv(SKILL_MAGIC)) goto L_message; mes "It appears to be an ordinary sword."; diff --git a/world/map/npc/015-3/pot.txt b/world/map/npc/015-3/pot.txt index c511910c..03f2b2c8 100644 --- a/world/map/npc/015-3/pot.txt +++ b/world/map/npc/015-3/pot.txt @@ -1,6 +1,6 @@ // The pot where the player can deposit stuff for the cat. -015-3.gat,37,29,0|script|Pot|127,{ +015-3.gat,37,29,0|script|Pot|400,{ set @cat, ((Katze & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT); diff --git a/world/map/npc/018-1/sword.txt b/world/map/npc/018-1/sword.txt index 16804a02..607c3dbf 100644 --- a/world/map/npc/018-1/sword.txt +++ b/world/map/npc/018-1/sword.txt @@ -1,4 +1,4 @@ -018-1.gat,110,43,0|script|#IceSword#_M|127,{ +018-1.gat,110,43,0|script|#IceSword#_M|400,{ if (getskilllv(SKILL_MAGIC)) goto L_message; close; diff --git a/world/map/npc/018-2/books.txt b/world/map/npc/018-2/books.txt index 81b439da..25bbe3fe 100644 --- a/world/map/npc/018-2/books.txt +++ b/world/map/npc/018-2/books.txt @@ -1,6 +1,6 @@ // -018-2.gat,112,19,0|script|#Bookcase38|127,0,1{ +018-2.gat,112,19,0|script|#Bookcase38|400,0,1{ callfunc "ClearVariables"; set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT); diff --git a/world/map/npc/018-3/bookcase.txt b/world/map/npc/018-3/bookcase.txt index 38af0d0e..72716754 100644 --- a/world/map/npc/018-3/bookcase.txt +++ b/world/map/npc/018-3/bookcase.txt @@ -1,6 +1,6 @@ // -018-3.gat,75,123,0|script|#DemonMineBookcase1|127,{ +018-3.gat,75,123,0|script|#DemonMineBookcase1|400,{ callfunc "ClearVariables"; set @state, ((QUEST_Hurnscald & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT); diff --git a/world/map/npc/018-3/sword.txt b/world/map/npc/018-3/sword.txt index 48150330..703890f3 100644 --- a/world/map/npc/018-3/sword.txt +++ b/world/map/npc/018-3/sword.txt @@ -1,4 +1,4 @@ -018-3.gat,71,127,0|script|#DemonSword#_M|127,{ +018-3.gat,71,127,0|script|#DemonSword#_M|400,{ if (getskilllv(SKILL_MAGIC)) goto L_message; close; diff --git a/world/map/npc/020-1/well.txt b/world/map/npc/020-1/well.txt index 09ffbaeb..265ce212 100644 --- a/world/map/npc/020-1/well.txt +++ b/world/map/npc/020-1/well.txt @@ -14,7 +14,7 @@ //# used variables: QUEST_Nivalis_state Nibble4 //############################################ -020-1.gat,99,83,0|script|#Well|127,{ +020-1.gat,99,83,0|script|#Well|400,{ set @Q_MASK, NIBBLE_4_MASK; set @Q_SHIFT, NIBBLE_4_SHIFT; diff --git a/world/map/npc/021-1/north_shops.txt b/world/map/npc/021-1/north_shops.txt index a64a1d87..4d4820d2 100644 --- a/world/map/npc/021-1/north_shops.txt +++ b/world/map/npc/021-1/north_shops.txt @@ -43,7 +43,7 @@ L_Close: close; } -021-1.gat,129,40,0|script|Well|127,{ +021-1.gat,129,40,0|script|Well|400,{ callfunc "WaterBottle"; } diff --git a/world/map/npc/026-1/sign.txt b/world/map/npc/026-1/sign.txt index 10e28757..217241b5 100644 --- a/world/map/npc/026-1/sign.txt +++ b/world/map/npc/026-1/sign.txt @@ -1,6 +1,6 @@ // -026-1.gat,64,16,0|script|Sign|127,{ +026-1.gat,64,16,0|script|Sign|400,{ mes "Hurnscald's Graveyard is north of here."; mes "BEWARE!"; close; diff --git a/world/map/npc/027-1/graves.txt b/world/map/npc/027-1/graves.txt index 47ab17c0..7f54d8c1 100644 --- a/world/map/npc/027-1/graves.txt +++ b/world/map/npc/027-1/graves.txt @@ -7,84 +7,84 @@ function|script|GraveTooFar|{ close; } -027-1.gat,89,62,0|script|Grave|127,{ +027-1.gat,89,62,0|script|Grave|400,{ callfunc "GraveTooFar"; mes "~ FotherJ ~"; mes "The mad sprite making genius who made all the creepy undead monster graphics."; close; } -027-1.gat,118,54,0|script|Grave|127,{ +027-1.gat,118,54,0|script|Grave|400,{ callfunc "GraveTooFar"; mes "~ Yosuhara ~"; mes "Contributed some of the tombstones."; close; } -027-1.gat,111,62,0|script|Grave|127,{ +027-1.gat,111,62,0|script|Grave|400,{ callfunc "GraveTooFar"; mes "~ Feline Monstrosity ~"; mes "Made the background music you are hearing."; close; } -027-1.gat,112,76,0|script|Grave|127,{ +027-1.gat,112,76,0|script|Grave|400,{ callfunc "GraveTooFar"; mes "~ Superkoop ~"; mes "Mapped the swamp to the south."; close; } -027-1.gat,120,76,0|script|Grave|127,{ +027-1.gat,120,76,0|script|Grave|400,{ callfunc "GraveTooFar"; mes "~ Aroleon ~"; mes "Mapped the swamp to the southeast."; close; } -027-1.gat,100,68,0|script|Grave|127,{ +027-1.gat,100,68,0|script|Grave|400,{ callfunc "GraveTooFar"; mes "~ John P ~"; mes "Wrote the graveyard backstory and the dialog for the caretaker quest."; close; } -027-1.gat,94,70,0|script|Grave|127,{ +027-1.gat,94,70,0|script|Grave|400,{ callfunc "GraveTooFar"; mes "~ Spit23 ~"; mes "Made those freakin awesome cemetery gates."; close; } -027-1.gat,106,60,0|script|Grave|127,{ +027-1.gat,106,60,0|script|Grave|400,{ callfunc "GraveTooFar"; mes "~ Black Don ~"; mes "Contributed those cool gargoyle statues."; close; } -027-1.gat,92,54,0|script|Grave|127,{ +027-1.gat,92,54,0|script|Grave|400,{ callfunc "GraveTooFar"; mes "~ Jaxad0127 ~"; mes "Did all the scripting work for the graveyard. Made Caretaker's house."; close; } -027-1.gat,122,64,0|script|Grave|127,{ +027-1.gat,122,64,0|script|Grave|400,{ callfunc "GraveTooFar"; mes "~ Ces Vargavind ~"; mes "Scripted caretaker's daughter."; close; } -027-1.gat,102,62,0|script|Grave|127,{ +027-1.gat,102,62,0|script|Grave|400,{ callfunc "GraveTooFar"; mes "~ Crush ~"; mes "Organizer of the whole graveyard project, graveyard fence graphics, mapping of the graveyard itself."; close; } -027-1.gat,104,76,0|script|Grave|127,{ +027-1.gat,104,76,0|script|Grave|400,{ callfunc "GraveTooFar"; mes "~ Freeyorp ~"; mes "Planned out monster stats and placements."; diff --git a/world/map/npc/027-2/diary.txt b/world/map/npc/027-2/diary.txt index d3394f4a..06a8d067 100644 --- a/world/map/npc/027-2/diary.txt +++ b/world/map/npc/027-2/diary.txt @@ -1,6 +1,6 @@ // Author: Jenalya -027-2.gat,26,97,0|script|#Diary|127, { +027-2.gat,26,97,0|script|#Diary|400, { set @Graveyard_Inn_MASK, NIBBLE_0_MASK; set @Graveyard_Inn_SHIFT, NIBBLE_0_SHIFT; diff --git a/world/map/npc/027-3/caskets.txt b/world/map/npc/027-3/caskets.txt index 0fde5ce6..3531e2ee 100644 --- a/world/map/npc/027-3/caskets.txt +++ b/world/map/npc/027-3/caskets.txt @@ -1,5 +1,5 @@ // Casket monster traps and key puzzle. -027-3.gat,40,35,0|script|#casket1|127,1,1{ +027-3.gat,40,35,0|script|#casket1|400,1,1{ heal 3,0; specialeffect 301; specialeffect 302; diff --git a/world/map/npc/027-3/entrance.txt b/world/map/npc/027-3/entrance.txt index b2f9ca9c..490769a1 100644 --- a/world/map/npc/027-3/entrance.txt +++ b/world/map/npc/027-3/entrance.txt @@ -1,6 +1,6 @@ // Effects for opening and closing the gate. Also set it so no new player can't be warped in once the gate is opened. -027-3.gat,40,57,0|script|#gatecontrol|127,2,1{ +027-3.gat,40,57,0|script|#gatecontrol|400,2,1{ mes "Once you pass this point I cannot warp anyone else to help. " + "Are you sure you are ready to go?"; menu @@ -32,7 +32,7 @@ OnTimer2000: // Effects for the exit. -027-3.gat,40,78,0|script|#cryptexit2|127,3,3{ +027-3.gat,40,78,0|script|#cryptexit2|400,3,3{ mes "Unfortunately, once I bring you to this time pocket" + "you cannot leave through its normal exit." + "The only way to get out is to defeat the reaper" diff --git a/world/map/npc/028-1/Portal.txt b/world/map/npc/028-1/Portal.txt index 12ba62c9..f6598146 100644 --- a/world/map/npc/028-1/Portal.txt +++ b/world/map/npc/028-1/Portal.txt @@ -1,4 +1,4 @@ -028-1.gat,69,71,0|script|Portal#_M|127,{ +028-1.gat,69,71,0|script|Portal#_M|400,{ if (isin("028-1.gat",65,67,73,73)) goto L_Main; mes "There is something there, but you aren't quite close enough to see exactly what it is."; diff --git a/world/map/npc/051-1/desert.txt b/world/map/npc/051-1/desert.txt index 1f3676cc..c6d041af 100644 --- a/world/map/npc/051-1/desert.txt +++ b/world/map/npc/051-1/desert.txt @@ -21,7 +21,7 @@ } -051-1.gat,170,24,0|script|Cursed Waterfall|127,{ +051-1.gat,170,24,0|script|Cursed Waterfall|400,{ set $@illia_num_sealed_souls, 7; set @step, 3; if ($@illia_progress < @step) goto L_ShouldNotBeHere; diff --git a/world/map/npc/051-1/forest.txt b/world/map/npc/051-1/forest.txt index a69aba8b..e0f392ae 100644 --- a/world/map/npc/051-1/forest.txt +++ b/world/map/npc/051-1/forest.txt @@ -9,7 +9,7 @@ // 3: Players unlocked the door //----------------------------------------------------------------------------- -051-1.gat,64,46,0|script|Strange Stone|127,{ +051-1.gat,64,46,0|script|Strange Stone|400,{ set @step, 1; if ($@illia_progress < @step) goto L_ShouldNotBeHere; if (isin("051-1.gat", 65,45, 67,48) == 0) end; diff --git a/world/map/npc/051-1/janitor.txt b/world/map/npc/051-1/janitor.txt index 333bb791..1d6b2668 100644 --- a/world/map/npc/051-1/janitor.txt +++ b/world/map/npc/051-1/janitor.txt @@ -1,5 +1,5 @@ // Forest janitor -051-1.gat,1,1,0|script|#IlliaJanitor1|127,{ +051-1.gat,1,1,0|script|#IlliaJanitor1|400,{ end; OnCommandClean: @@ -9,7 +9,7 @@ OnCommandClean: } // Desert janitor -051-1.gat,1,1,0|script|#IlliaJanitor3|127,{ +051-1.gat,1,1,0|script|#IlliaJanitor3|400,{ end; OnCommandClean: diff --git a/world/map/npc/051-3/ambush.txt b/world/map/npc/051-3/ambush.txt index 74e1ced7..aa6d8c4b 100644 --- a/world/map/npc/051-3/ambush.txt +++ b/world/map/npc/051-3/ambush.txt @@ -49,7 +49,7 @@ L_ShouldNotBeHere: end; } -051-3.gat,1,1,0|script|#BndtTl|127,{ +051-3.gat,1,1,0|script|#BndtTl|400,{ end; OnCommandAmbush: @@ -137,7 +137,7 @@ L_CaptureHelper3: } -051-3.gat,29,94,0|script|Sneaky Bandit|127,{ +051-3.gat,29,94,0|script|Sneaky Bandit|400,{ end; OnCommandTalk: @@ -156,7 +156,7 @@ OnTimer3600: } -051-3.gat,33,95,0|script|Another Sneaky Bandit|127,{ +051-3.gat,33,95,0|script|Another Sneaky Bandit|400,{ end; OnCommandTalk: diff --git a/world/map/npc/051-3/janitor.txt b/world/map/npc/051-3/janitor.txt index 5dfb1c30..93b9c2c7 100644 --- a/world/map/npc/051-3/janitor.txt +++ b/world/map/npc/051-3/janitor.txt @@ -1,5 +1,5 @@ // Bandit cave janitor -051-3.gat,1,1,0|script|#IlliaJanitor2|127,{ +051-3.gat,1,1,0|script|#IlliaJanitor2|400,{ end; OnCommandClean: diff --git a/world/map/npc/051-3/locks.txt b/world/map/npc/051-3/locks.txt index 242532ae..1d89bbf8 100644 --- a/world/map/npc/051-3/locks.txt +++ b/world/map/npc/051-3/locks.txt @@ -1,4 +1,4 @@ -051-3.gat,69,107,0|script|Jail Lock 1|127,{ +051-3.gat,69,107,0|script|Jail Lock 1|400,{ if (isin("051-3.gat", 69, 108, 73, 111)) goto L_Do_Lock_Picking; end; @@ -17,7 +17,7 @@ L_OpenDoor: close; } -051-3.gat,64,100,0|script|Jail Lock 2|127,{ +051-3.gat,64,100,0|script|Jail Lock 2|400,{ if (isin("051-3.gat", 64, 101, 66, 104)) goto L_Do_Lock_Picking; end; @@ -34,7 +34,7 @@ L_OpenDoor: close; } -051-3.gat,62,100,0|script|Jail Lock 3|127,{ +051-3.gat,62,100,0|script|Jail Lock 3|400,{ if (isin("051-3.gat", 61, 101, 62, 104)) goto L_Do_Lock_Picking; end; @@ -51,7 +51,7 @@ L_OpenDoor: close; } -051-3.gat,58,100,0|script|Jail Lock 4|127,{ +051-3.gat,58,100,0|script|Jail Lock 4|400,{ if (isin("051-3.gat", 57, 101, 58, 104)) goto L_Do_Lock_Picking; end; diff --git a/world/map/npc/051-3/reinforcements.txt b/world/map/npc/051-3/reinforcements.txt index 0d1f0d79..b29a072d 100644 --- a/world/map/npc/051-3/reinforcements.txt +++ b/world/map/npc/051-3/reinforcements.txt @@ -14,7 +14,7 @@ L_ShouldNotBeHere: end; } -051-3.gat,37,24,0|script|Door|127,{ +051-3.gat,37,24,0|script|Door|400,{ set @step, 2; if ($@illia_progress < @step) goto L_ShouldNotBeHere; diff --git a/world/map/npc/052-1/channelling.txt b/world/map/npc/052-1/channelling.txt index e374dc77..3ea28fc9 100644 --- a/world/map/npc/052-1/channelling.txt +++ b/world/map/npc/052-1/channelling.txt @@ -47,7 +47,7 @@ onSpawn: } -052-1.gat,57,29,0|script|#Enchanted Door2|127,1,1{ +052-1.gat,57,29,0|script|#Enchanted Door2|400,1,1{ if ($@illia_level_4_progress == 2) goto L_Warp; end; @@ -61,7 +61,7 @@ OnCommandDestroy: } -052-1.gat,51,38,0|script|Engravings|127,{ +052-1.gat,51,38,0|script|Engravings|400,{ mes "You can read some words engraved inside this rock, but some are erased by wind and time:"; next; mes "\".. can use this .. power..´. . .´. . . amplify a spell ..´."; diff --git a/world/map/npc/052-1/janitor.txt b/world/map/npc/052-1/janitor.txt index e2ca8c4f..01d5965d 100644 --- a/world/map/npc/052-1/janitor.txt +++ b/world/map/npc/052-1/janitor.txt @@ -1,6 +1,6 @@ // Illia Island janitor -052-1.gat,1,1,0|script|#IlliaJanitor4|127,{ +052-1.gat,1,1,0|script|#IlliaJanitor4|400,{ end; OnCommandClean: diff --git a/world/map/npc/052-2/janitor.txt b/world/map/npc/052-2/janitor.txt index 9c78d638..bc2d1a25 100644 --- a/world/map/npc/052-2/janitor.txt +++ b/world/map/npc/052-2/janitor.txt @@ -1,5 +1,5 @@ // Lobby janitor -052-2.gat,1,1,0|script|#IlliaJanitor5|127,{ +052-2.gat,1,1,0|script|#IlliaJanitor5|400,{ end; OnCommandClean: @@ -11,7 +11,7 @@ OnCommandClean: } // Storage janitor -052-2.gat,1,1,0|script|#IlliaJanitor6|127,{ +052-2.gat,1,1,0|script|#IlliaJanitor6|400,{ end; OnCommandClean: @@ -22,7 +22,7 @@ OnCommandClean: } // Final boss janitor -052-2.gat,1,1,0|script|#IlliaJanitor7|127,{ +052-2.gat,1,1,0|script|#IlliaJanitor7|400,{ end; OnCommandClean: diff --git a/world/map/npc/052-2/lobby.txt b/world/map/npc/052-2/lobby.txt index b50a0273..c6d6035d 100644 --- a/world/map/npc/052-2/lobby.txt +++ b/world/map/npc/052-2/lobby.txt @@ -48,7 +48,7 @@ L_ShouldNotBeHere: end; } -052-2.gat,1,1,0|script|#LuviaShadow|127,{ +052-2.gat,1,1,0|script|#LuviaShadow|400,{ end; // Escape sequence @@ -100,7 +100,7 @@ OnNN: } -052-2.gat,1,1,0|script|#MysteriousVoice|127,{ +052-2.gat,1,1,0|script|#MysteriousVoice|400,{ end; onInit: @@ -145,7 +145,7 @@ L_Continue: // Dummy npc to display the mysterious voice, // as a workaround to fakenpcname causing problems -052-2.gat,1,1,0|script|?|127,{ +052-2.gat,1,1,0|script|?|400,{ end; OnCommandTalk: diff --git a/world/map/npc/052-2/partyroom.txt b/world/map/npc/052-2/partyroom.txt index acba1fdc..b1e44ed9 100644 --- a/world/map/npc/052-2/partyroom.txt +++ b/world/map/npc/052-2/partyroom.txt @@ -80,7 +80,7 @@ OnTimer15000: } -052-2.gat,88,15,0|script|#LuviaDaemon|127,{ +052-2.gat,88,15,0|script|#LuviaDaemon|400,{ end; OnCommandInvoke: diff --git a/world/map/npc/052-2/storage.txt b/world/map/npc/052-2/storage.txt index b52dc759..808594b9 100644 --- a/world/map/npc/052-2/storage.txt +++ b/world/map/npc/052-2/storage.txt @@ -26,7 +26,7 @@ L_StartItemInvoker: } -052-2.gat,1,1,0|script|#ItemsInvoker|127,{ +052-2.gat,1,1,0|script|#ItemsInvoker|400,{ end; onInit: diff --git a/world/map/npc/056-2/notes.txt b/world/map/npc/056-2/notes.txt index 19f1ae68..acc9ef87 100644 --- a/world/map/npc/056-2/notes.txt +++ b/world/map/npc/056-2/notes.txt @@ -1,11 +1,11 @@ -056-2.gat,77,34,0|script|Warning|127,{ +056-2.gat,77,34,0|script|Warning|400,{ mes "Turn around. Do not come any closer!"; mes "Go back upstairs and leave! I don't want to see anybody!"; mes "This is the last warning!"; mes "- Mirak"; close; } -056-2.gat,29,30,0|script|Note|127,{ +056-2.gat,29,30,0|script|Note|400,{ mes "DO NOT GO ANY FURTHER!"; mes "Put the supplies on the table and do not come downstairs. I don't want to be bothered."; mes "- Mirak"; diff --git a/world/map/npc/xmas/2011/bodyguards.txt b/world/map/npc/xmas/2011/bodyguards.txt index 6f2a84c7..acabe022 100644 --- a/world/map/npc/xmas/2011/bodyguards.txt +++ b/world/map/npc/xmas/2011/bodyguards.txt @@ -102,7 +102,7 @@ L_NoEvent: } // door to Santa's room -030-2.gat,78,87,0|script|#door|127,1,1{ +030-2.gat,78,87,0|script|#door|400,1,1{ if ((gettime(7) == $@xmas2011_year && gettime(6) == 12 && gettime(5) >= $@xmas2011_reward_start_day) || (gettime(7) == ($@xmas2011_year + 1) && gettime(6) == 1 && gettime(5) <= $@xmas2011_reward_end_day)) @@ -115,7 +115,7 @@ L_RewardTime: } // entrance of the building -030-1.gat,99,53,0|script|#Door|127,1,1,{ +030-1.gat,99,53,0|script|#Door|400,1,1,{ if (!(gettime(7) == $@xmas2011_year && gettime(6) == 12 && gettime(5) >= $@xmas2011_start_day) && !(gettime(7) == ($@xmas2011_year + 1) && gettime(6) == 1 && gettime(5) <= $@xmas2011_reward_end_day)) |