diff options
| author | mekolat <mekolat@gmail.com> | 2015-02-01 14:11:22 -0500 |
|---|---|---|
| committer | mekolat <mekolat@gmail.com> | 2015-02-01 14:11:22 -0500 |
| commit | 22cfbc011ce19e96767861b60473fa3136177f10 (patch) | |
| tree | 5a5c78db513146769798d2b9e891f15a52886a77 /world/map/npc | |
| parent | b192aaa6afe5cfaedfe364a2893036348270f5b4 (diff) | |
| download | serverdata-22cfbc011ce19e96767861b60473fa3136177f10.tar.gz serverdata-22cfbc011ce19e96767861b60473fa3136177f10.tar.bz2 serverdata-22cfbc011ce19e96767861b60473fa3136177f10.tar.xz serverdata-22cfbc011ce19e96767861b60473fa3136177f10.zip | |
remove .gat from npcs
Diffstat (limited to 'world/map/npc')
483 files changed, 1642 insertions, 1642 deletions
diff --git a/world/map/npc/001-1/adrian.txt b/world/map/npc/001-1/adrian.txt index 4f9722d0..dba78c21 100644 --- a/world/map/npc/001-1/adrian.txt +++ b/world/map/npc/001-1/adrian.txt @@ -5,7 +5,7 @@ // state 2: Adrian gave the luggage to the player // state 3: player gave luggage to Kylian and Kylian asks who to talk to for the shop license -001-1.gat,113,64,0|script|Adrian|213 +001-1,113,64,0|script|Adrian|213 { set @state, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT); diff --git a/world/map/npc/001-1/ched.txt b/world/map/npc/001-1/ched.txt index 7dfc4ed7..b6159583 100644 --- a/world/map/npc/001-1/ched.txt +++ b/world/map/npc/001-1/ched.txt @@ -1,6 +1,6 @@ // Student at Tulimshar's magic academy -001-1.gat,43,48,0|script|Ched|113 +001-1,43,48,0|script|Ched|113 { mes "[Ched]"; mes "\"I'm trying to get a spell to work. It's supposed to combine two potions, but I can't seem to figure out which two those are...\""; diff --git a/world/map/npc/001-1/children.txt b/world/map/npc/001-1/children.txt index 3ce987c1..6749f0e3 100644 --- a/world/map/npc/001-1/children.txt +++ b/world/map/npc/001-1/children.txt @@ -1,6 +1,6 @@ // Aisha -001-1.gat,102,27,0|script|Aisha|108 +001-1,102,27,0|script|Aisha|108 { set @TEMP,rand(10); if(@TEMP == 1) goto L_1; diff --git a/world/map/npc/001-1/constable.txt b/world/map/npc/001-1/constable.txt index 0d8bc06c..73a74a2f 100644 --- a/world/map/npc/001-1/constable.txt +++ b/world/map/npc/001-1/constable.txt @@ -1,6 +1,6 @@ // -001-1.gat,50,74,0|script|Constable Perry Graf|150 +001-1,50,74,0|script|Constable Perry Graf|150 { mes "[Constable Perry Graf]"; mes "\"Hello, make sure the rules are followed.\""; diff --git a/world/map/npc/001-1/dock.txt b/world/map/npc/001-1/dock.txt index 941e222a..05402b94 100644 --- a/world/map/npc/001-1/dock.txt +++ b/world/map/npc/001-1/dock.txt @@ -2,19 +2,19 @@ // Author: Wushin // Ferry Sign -001-1.gat,61,71,0|script|Ferry Schedule#2|396 +001-1,61,71,0|script|Ferry Schedule#2|396 { callfunc "FerryManifest"; end; } -001-1.gat,75,70,0|script|Tulimshar Koga|395,8,3 +001-1,75,70,0|script|Tulimshar Koga|395,8,3 { callfunc "BoardFerry"; close; } -001-1.gat,70,70,0|script|#TulimsharDock|127 +001-1,70,70,0|script|#TulimsharDock|127 { end; OnCommandArrive: diff --git a/world/map/npc/001-1/eomie.txt b/world/map/npc/001-1/eomie.txt index ab6a72bc..6528ddbe 100644 --- a/world/map/npc/001-1/eomie.txt +++ b/world/map/npc/001-1/eomie.txt @@ -18,7 +18,7 @@ // state 14: gave present to Eomie // state 15: reported back to Anwar and done -001-1.gat,71,23,0|script|Eomie|164 +001-1,71,23,0|script|Eomie|164 { set @state, ((QUEST_NorthTulimshar & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT); diff --git a/world/map/npc/001-1/ferry_master.txt b/world/map/npc/001-1/ferry_master.txt index 6454d310..9cfb1e74 100644 --- a/world/map/npc/001-1/ferry_master.txt +++ b/world/map/npc/001-1/ferry_master.txt @@ -1,6 +1,6 @@ // -001-1.gat,64,75,0|script|Ferry Master#tulimshar|138 +001-1,64,75,0|script|Ferry Master#tulimshar|138 { mes "[Ferry Master]"; mes "\"Hello! Do you need something?\""; diff --git a/world/map/npc/001-1/gate_guards.txt b/world/map/npc/001-1/gate_guards.txt index 5eb44e36..dea801ef 100644 --- a/world/map/npc/001-1/gate_guards.txt +++ b/world/map/npc/001-1/gate_guards.txt @@ -1,24 +1,24 @@ // Guard near the magic school -001-1.gat,39,33,0|script|Guard#school|104 +001-1,39,33,0|script|Guard#school|104 { mes "[Guard]"; mes "\"I'm just here to provide a presence for the guards at this gate. The mages here can defend themselves without problem.\""; close; } -001-1.gat,56,47,0|script|Guard#castle|104 +001-1,56,47,0|script|Guard#castle|104 { mes "[Guard]"; mes "\"The volcano and earthquake did a lot of damage, but the citizens of Tulimshar sure did a good job of cleaning up.\""; close; } -001-1.gat,61,99,0|script|Guard#east3|104 +001-1,61,99,0|script|Guard#east3|104 { mes "[Guard]"; mes "\"The Palace is North of here. That is where you will find the Council of Wizards.\""; close; } -001-1.gat,53,72,0|script|Guard#govt_out|123 +001-1,53,72,0|script|Guard#govt_out|123 { mes "[Guard]"; mes "\"This is a government building. They have some clerical and tax offices in here. There is also a jail in the subbasement.\""; diff --git a/world/map/npc/001-1/gossip.txt b/world/map/npc/001-1/gossip.txt index 5d3bb671..283de9d7 100644 --- a/world/map/npc/001-1/gossip.txt +++ b/world/map/npc/001-1/gossip.txt @@ -1,6 +1,6 @@ // NPC to provide hints on progression of linear quest chain in Tulimshar -001-1.gat,66,104,0|script|Gladys|154 +001-1,66,104,0|script|Gladys|154 { mes "[Gladys, Town Gossip]"; mes "\"Hello deary! I hear some of the most fascinating rumors and bits of news. I just heard a bit more today!\""; diff --git a/world/map/npc/001-1/guards.txt b/world/map/npc/001-1/guards.txt index 358604eb..0167510e 100644 --- a/world/map/npc/001-1/guards.txt +++ b/world/map/npc/001-1/guards.txt @@ -1,6 +1,6 @@ // -001-1.gat,103,99,0|script|Ekinu|104 +001-1,103,99,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 quickly.\""; @@ -75,7 +75,7 @@ L_Close: close; } -001-1.gat,107,42,0|script|Ryan|104 +001-1,107,42,0|script|Ryan|104 { if (getskilllv(SKILL_MAGIC)) goto L_message; diff --git a/world/map/npc/001-1/inac.txt b/world/map/npc/001-1/inac.txt index 7d5f6e4d..2eb6e0a5 100644 --- a/world/map/npc/001-1/inac.txt +++ b/world/map/npc/001-1/inac.txt @@ -1,6 +1,6 @@ // -001-1.gat,58,81,0|script|Inac|156 +001-1,58,81,0|script|Inac|156 { set @halloween_npc_id, $@halloween_npc_inac; callfunc "TrickOrTreat"; diff --git a/world/map/npc/001-1/mapflags.txt b/world/map/npc/001-1/mapflags.txt index 896cff6a..5815d542 100644 --- a/world/map/npc/001-1/mapflags.txt +++ b/world/map/npc/001-1/mapflags.txt @@ -1,2 +1,2 @@ -001-1.gat|mapflag|town -001-1.gat|mapflag|resave|001-1,60,105 +001-1|mapflag|town +001-1|mapflag|resave|001-1,60,105 diff --git a/world/map/npc/001-1/north_shops.txt b/world/map/npc/001-1/north_shops.txt index 592e351c..a99e09ff 100644 --- a/world/map/npc/001-1/north_shops.txt +++ b/world/map/npc/001-1/north_shops.txt @@ -1,7 +1,7 @@ // Northern shopping plaza -001-1.gat,106,105,0|shop|Neko|101,TonoriDelight:*10,CactusDrink:*1,CactusPotion:*1,RoastedMaggot:*1,Beer:*1,ChickenLeg:*2 -001-1.gat,111,108,0|shop|Inar|108,CottonShirt:*1,SerfHat:*1,CottonShorts:*1,CottonBoots:*1,DesertShirt:*1,CottonHeadband:*1,DesertHat:*4 -001-1.gat,48,79,0|script|Well|400 +001-1,106,105,0|shop|Neko|101,TonoriDelight:*10,CactusDrink:*1,CactusPotion:*1,RoastedMaggot:*1,Beer:*1,ChickenLeg:*2 +001-1,111,108,0|shop|Inar|108,CottonShirt:*1,SerfHat:*1,CottonShorts:*1,CottonBoots:*1,DesertShirt:*1,CottonHeadband:*1,DesertHat:*4 +001-1,48,79,0|script|Well|400 { callfunc "WaterBottle"; end; diff --git a/world/map/npc/001-1/npcs.txt b/world/map/npc/001-1/npcs.txt index add8cd90..2e10dbd1 100644 --- a/world/map/npc/001-1/npcs.txt +++ b/world/map/npc/001-1/npcs.txt @@ -1,4 +1,4 @@ -001-1.gat,49,82,0|script|Cyndala|210 +001-1,49,82,0|script|Cyndala|210 { set @npcname$, "Cyndala"; @@ -9,7 +9,7 @@ set @npcname$, ""; close; } -001-1.gat,100,79,0|script|Marikel|211 +001-1,100,79,0|script|Marikel|211 { set @npcname$, "Marikel"; @@ -36,7 +36,7 @@ L_Marikel_2: close; } -001-1.gat,105,53,0|script|Joelin|212 +001-1,105,53,0|script|Joelin|212 { set @npcname$, "Joelin"; @@ -47,7 +47,7 @@ L_Marikel_2: close; } -001-1.gat,107,53,0|script|Harper|213 +001-1,107,53,0|script|Harper|213 { set @npcname$, "Harper"; @@ -55,7 +55,7 @@ L_Marikel_2: mes "\"My captain knows an awlful lot about the world's continents.\""; close; } -001-1.gat,75,99,0|script|Swezanne|206 +001-1,75,99,0|script|Swezanne|206 { set @npcname$, "Swezanne"; @@ -63,7 +63,7 @@ L_Marikel_2: mes "\"Just through over this bridge is the bazaar. I go to the Bazaar and shop at Neko's.\""; close; } -001-1.gat,92,107,0|script|Michel|215 +001-1,92,107,0|script|Michel|215 { set @npcname$, "Michel"; diff --git a/world/map/npc/001-1/sewer_east.txt b/world/map/npc/001-1/sewer_east.txt index 2b1e7bc4..70a10cfc 100644 --- a/world/map/npc/001-1/sewer_east.txt +++ b/world/map/npc/001-1/sewer_east.txt @@ -1,6 +1,6 @@ // The Sewer Grate -001-1.gat,117,110,0|script|#tulimsharsewer2|45,0,0 +001-1,117,110,0|script|#tulimsharsewer2|45,0,0 { mes "Descend into the sewers?"; next; diff --git a/world/map/npc/001-1/sewer_north.txt b/world/map/npc/001-1/sewer_north.txt index ce33cca3..1e2419d3 100644 --- a/world/map/npc/001-1/sewer_north.txt +++ b/world/map/npc/001-1/sewer_north.txt @@ -1,6 +1,6 @@ // The Sewer Grate -001-1.gat,58,83,0|script|#tulimsharsewer1|45,0,0 +001-1,58,83,0|script|#tulimsharsewer1|45,0,0 { mes "Descend into the sewers?"; next; diff --git a/world/map/npc/001-1/stat_reset.txt b/world/map/npc/001-1/stat_reset.txt index 61d1328b..1ad2bc4e 100644 --- a/world/map/npc/001-1/stat_reset.txt +++ b/world/map/npc/001-1/stat_reset.txt @@ -1,6 +1,6 @@ // -001-1.gat,117,105,0|script|Malivox|103 +001-1,117,105,0|script|Malivox|103 { set @NpcName$, "Malivox"; callfunc "StatReset"; diff --git a/world/map/npc/001-1/tinris.txt b/world/map/npc/001-1/tinris.txt index c2b52d85..1a6aab33 100644 --- a/world/map/npc/001-1/tinris.txt +++ b/world/map/npc/001-1/tinris.txt @@ -17,7 +17,7 @@ // state 14: gave present to Eomie // state 15: reported back to Anwar and done -001-1.gat,69,29,0|script|Tinris|160 +001-1,69,29,0|script|Tinris|160 { set @state, ((QUEST_NorthTulimshar & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT); diff --git a/world/map/npc/001-1/tombstones.txt b/world/map/npc/001-1/tombstones.txt index 2dfd3178..39c98ade 100644 --- a/world/map/npc/001-1/tombstones.txt +++ b/world/map/npc/001-1/tombstones.txt @@ -1,6 +1,6 @@ // RIPs in Noble memorial -001-1.gat,56,103,0|script|RIP#1|400 +001-1,56,103,0|script|RIP#1|400 { mes "~ wushin ~"; @@ -8,7 +8,7 @@ close; } -001-1.gat,57,103,0|script|RIP#2|400 +001-1,57,103,0|script|RIP#2|400 { mes "~ Nard ~"; @@ -16,7 +16,7 @@ close; } -001-1.gat,58,103,0|script|RIP#3|400 +001-1,58,103,0|script|RIP#3|400 { mes "~ tux9th ~"; @@ -24,7 +24,7 @@ close; } -001-1.gat,59,103,0|script|RIP#4|400 +001-1,59,103,0|script|RIP#4|400 { mes "~ o11c ~"; @@ -32,14 +32,14 @@ close; } -001-1.gat,60,103,0|script|RIP#5|400 +001-1,60,103,0|script|RIP#5|400 { mes "~ " + strcharinfo(0) + " ~"; mes "The tombstone is blank and the grave freshly dug."; close; } -001-1.gat,56,106,0|script|RIP#6|400 +001-1,56,106,0|script|RIP#6|400 { mes "~ Cassy ~"; @@ -47,28 +47,28 @@ close; } -001-1.gat,57,106,0|script|RIP#7|400 +001-1,57,106,0|script|RIP#7|400 { mes "~ George ~"; mes "Eaten by Snakes."; close; } -001-1.gat,58,106,0|script|RIP#8|400 +001-1,58,106,0|script|RIP#8|400 { mes "~ Kieron ~"; mes "He was right, monsters were in the cave."; close; } -001-1.gat,59,106,0|script|RIP#9|400 +001-1,59,106,0|script|RIP#9|400 { mes "~ William ~"; mes "Kieron was definitely right."; close; } -001-1.gat,60,106,0|script|RIP#10|400 +001-1,60,106,0|script|RIP#10|400 { mes "~ Tyer ~"; mes "An experiement went wrong."; diff --git a/world/map/npc/001-1/weellos.txt b/world/map/npc/001-1/weellos.txt index b2a89aed..ae5604f5 100644 --- a/world/map/npc/001-1/weellos.txt +++ b/world/map/npc/001-1/weellos.txt @@ -1,7 +1,7 @@ // A historian // takes part in quest given by 021-2/kylian.txt -001-1.gat,55,25,0|script|Weellos|103 +001-1,55,25,0|script|Weellos|103 { set @halloween_npc_id, $@halloween_npc_weellos; callfunc "TrickOrTreat"; @@ -9,7 +9,7 @@ set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@knowWeellosNT; set @kylian, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT); - if (isin("001-1.gat", 48, 20, 61, 28)) goto L_In; + if (isin("001-1", 48, 20, 61, 28)) goto L_In; mes "[Weellos]"; mes "\"This is a very historic building. One of the oldest in the area.\""; diff --git a/world/map/npc/001-2/bank.txt b/world/map/npc/001-2/bank.txt index b5bab670..b4286240 100644 --- a/world/map/npc/001-2/bank.txt +++ b/world/map/npc/001-2/bank.txt @@ -1,5 +1,5 @@ // A Banker -001-2.gat,63,17,0|script|Hydusun|149 +001-2,63,17,0|script|Hydusun|149 { set @npcname$, "Hydusun"; callfunc "Banker"; diff --git a/world/map/npc/001-2/david.txt b/world/map/npc/001-2/david.txt index fc9e3fd7..4f6c40f4 100644 --- a/world/map/npc/001-2/david.txt +++ b/world/map/npc/001-2/david.txt @@ -1,4 +1,4 @@ -001-2.gat,92,88,0|script|David|120 +001-2,92,88,0|script|David|120 { set @Potion_EXP, 2000; diff --git a/world/map/npc/001-2/fieri.txt b/world/map/npc/001-2/fieri.txt index 1264be4e..dbf12c2e 100644 --- a/world/map/npc/001-2/fieri.txt +++ b/world/map/npc/001-2/fieri.txt @@ -1,6 +1,6 @@ // Variables used: nibble 0 of QUEST_SouthTulimshar -001-2.gat,114,89,0|script|Fieri|117 +001-2,114,89,0|script|Fieri|117 { set @state, ((QUEST_SouthTulimshar & NIBBLE_6_MASK) >> NIBBLE_6_SHIFT); diff --git a/world/map/npc/001-2/forge_shops.txt b/world/map/npc/001-2/forge_shops.txt index f98d7265..31a4d25e 100644 --- a/world/map/npc/001-2/forge_shops.txt +++ b/world/map/npc/001-2/forge_shops.txt @@ -1,4 +1,4 @@ // Forge Shops -001-2.gat,30,60,0|shop|Gungnir|311,SlingShot:*1,SlingBullet:*1,ShortBow:*4,Arrow:1,IronArrow:*1 -001-2.gat,25,59,0|shop|Mjolnir|377,Knife:*1,SharpKnife:*1,Dagger:*1,LeatherShirt:*1,LeatherShield:*1 +001-2,30,60,0|shop|Gungnir|311,SlingShot:*1,SlingBullet:*1,ShortBow:*4,Arrow:1,IronArrow:*1 +001-2,25,59,0|shop|Mjolnir|377,Knife:*1,SharpKnife:*1,Dagger:*1,LeatherShirt:*1,LeatherShield:*1 diff --git a/world/map/npc/001-2/government_building.txt b/world/map/npc/001-2/government_building.txt index f201f192..d62159cb 100644 --- a/world/map/npc/001-2/government_building.txt +++ b/world/map/npc/001-2/government_building.txt @@ -1,7 +1,7 @@ // The government builing in the south west // A clerk -001-2.gat,25,21,0|script|Estard|107 +001-2,25,21,0|script|Estard|107 { mes "[Estard]"; mes "\"Hello what can I do for you?\""; @@ -136,7 +136,7 @@ S_give_rings: } // Guard -001-2.gat,22,21,0|script|Guard#govt_in|123 +001-2,22,21,0|script|Guard#govt_in|123 { mes "[Guard]"; mes "\"You can't come back here.\""; diff --git a/world/map/npc/001-2/heathin.txt b/world/map/npc/001-2/heathin.txt index 113b1b7e..e6548542 100644 --- a/world/map/npc/001-2/heathin.txt +++ b/world/map/npc/001-2/heathin.txt @@ -1,6 +1,6 @@ //Items for NPC are incomplete. Makes "simple ring" which can be crafted into a useful ring by Inya and terranite armor. -001-2.gat,23,55,0|script|Heathin|147 +001-2,23,55,0|script|Heathin|147 { set @TARROW_REQ_TERRA_ORE, 1; set @TARROW_REQ_COAL, 5; @@ -337,7 +337,7 @@ S_Update_Mask: set QUEST_NorthTulimshar, (QUEST_NorthTulimshar & ~(NIBBLE_6_MASK)) | (@state << NIBBLE_6_SHIFT); return; } -001-2.gat,25,55,0|script|HeathinDebug|147 +001-2,25,55,0|script|HeathinDebug|147 { mes "[Heathin Debug]"; mes "Debug Action"; diff --git a/world/map/npc/001-2/jhedia.txt b/world/map/npc/001-2/jhedia.txt index fdee36c9..bca7d113 100644 --- a/world/map/npc/001-2/jhedia.txt +++ b/world/map/npc/001-2/jhedia.txt @@ -1,6 +1,6 @@ // Ingot maker takes iron ore, gives ingots for future crafting purposes. -001-2.gat,23,50,0|script|Jhedia|160 +001-2,23,50,0|script|Jhedia|160 { set @Cost_Per_Ingot, 1000; set @Iron_Ore_Per, 5; diff --git a/world/map/npc/001-2/manakins.txt b/world/map/npc/001-2/manakins.txt index 23a59909..dabe7fc5 100644 --- a/world/map/npc/001-2/manakins.txt +++ b/world/map/npc/001-2/manakins.txt @@ -1,19 +1,19 @@ // Display Manakins. // Forge -001-2.gat,29,57,0|script|Terranite Armor#Female|401 +001-2,29,57,0|script|Terranite Armor#Female|401 { mes "Terranite Armor complete set, made to order, inquire with Heathin"; close; } -001-2.gat,34,57,0|script|Terranite Armor#Male|402 +001-2,34,57,0|script|Terranite Armor#Male|402 { mes "Terranite Armor complete set, made to order, inquire with Heathin"; close; } -001-2.gat,34,62,0|script|Terranite|403 +001-2,34,62,0|script|Terranite|403 { mes "Ahhh! A Terranite! Wait it appears to just be a display model."; close; @@ -21,25 +21,25 @@ // Museum -001-2.gat,91,39,0|script|Talponian#Female|404 +001-2,91,39,0|script|Talponian#Female|404 { mes "A Female Talponian."; close; } -001-2.gat,91,44,0|script|Talponian#Male|405 +001-2,91,44,0|script|Talponian#Male|405 { mes "A Male Talponian."; close; } -001-2.gat,118,39,0|script|Gispaan#Female|406 +001-2,118,39,0|script|Gispaan#Female|406 { mes "A Female Gispaan."; close; } -001-2.gat,118,44,0|script|Gispaan#Male|407 +001-2,118,44,0|script|Gispaan#Male|407 { mes "A Male Gispaan."; close; diff --git a/world/map/npc/001-2/mapflags.txt b/world/map/npc/001-2/mapflags.txt index 3a1f27a7..38689f49 100644 --- a/world/map/npc/001-2/mapflags.txt +++ b/world/map/npc/001-2/mapflags.txt @@ -1,2 +1,2 @@ -001-2.gat|mapflag|town -001-2.gat|mapflag|resave|001-1,60,105 +001-2|mapflag|town +001-2|mapflag|resave|001-1,60,105 diff --git a/world/map/npc/001-2/pauline.txt b/world/map/npc/001-2/pauline.txt index 2c49bef6..1136795f 100644 --- a/world/map/npc/001-2/pauline.txt +++ b/world/map/npc/001-2/pauline.txt @@ -12,7 +12,7 @@ // @pauline_ingredient2$ Second ingredient input. // @pauline_REWARD amount of XP gained for telling her ingredients for each spell. -001-2.gat,77,78,0|script|Pauline|208 +001-2,77,78,0|script|Pauline|208 { //Bitmasking @@ -173,7 +173,7 @@ L_Pass2Mouboo: L_TrySpellMouboo: mes "The Witch takes " + @pauline_ingredient1$ + " and " + @pauline_ingredient2$ + " and puts them together calling " + getspellinvocation("summon-mouboo") + "."; - monster "001-1.gat", 55,68, "Good", 1028, 1; + monster "001-1", 55,68, "Good", 1028, 1; mes "[Pauline]"; mes "\"It worked!\""; set @pauline_state, 3; @@ -234,7 +234,7 @@ L_Pass2Pinkie: L_TrySpellPinkie: mes "The Witch takes " + @pauline_ingredient1$ + " and " + @pauline_ingredient2$ + " and puts them together calling " + getspellinvocation("summon-pinkie") + "."; - monster "001-1.gat", 54,68, "Good", 1018, 1; + monster "001-1", 54,68, "Good", 1018, 1; mes "[Pauline]"; mes "\"It worked!\""; set @pauline_state, 4; @@ -277,7 +277,7 @@ S_Update_Mask: return; } -001-2.gat,79,74,0|script|PaulineDebug|208 +001-2,79,74,0|script|PaulineDebug|208 { //load Bitmasks; set @Pauline_MASK, NIBBLE_4_MASK; diff --git a/world/map/npc/001-2/sandra.txt b/world/map/npc/001-2/sandra.txt index 48632e58..3eceeff6 100644 --- a/world/map/npc/001-2/sandra.txt +++ b/world/map/npc/001-2/sandra.txt @@ -1,6 +1,6 @@ // Variables used: nibble 3 of QUEST_SouthTulimshar -001-2.gat,98,88,0|script|Sandra|114 +001-2,98,88,0|script|Sandra|114 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/001-2/tathin.txt b/world/map/npc/001-2/tathin.txt index 491eb151..dda26009 100644 --- a/world/map/npc/001-2/tathin.txt +++ b/world/map/npc/001-2/tathin.txt @@ -1,4 +1,4 @@ -001-2.gat,28,21,0|script|Tathin|107 +001-2,28,21,0|script|Tathin|107 { mes "[Tathin]"; mes "\"Hello what Can I do for you?\""; diff --git a/world/map/npc/001-2/tondar.txt b/world/map/npc/001-2/tondar.txt index 5c15dddb..ba4c0fff 100644 --- a/world/map/npc/001-2/tondar.txt +++ b/world/map/npc/001-2/tondar.txt @@ -1,6 +1,6 @@ // A professor at Tulimshar's magic academy -001-2.gat,95,79,0|script|Tondar|168 +001-2,95,79,0|script|Tondar|168 { mes "[Tondar]"; mes "\"We're not accepting any new students right now.\""; diff --git a/world/map/npc/001-2/wizards.txt b/world/map/npc/001-2/wizards.txt index 587c999c..4f88c58b 100644 --- a/world/map/npc/001-2/wizards.txt +++ b/world/map/npc/001-2/wizards.txt @@ -1,60 +1,60 @@ // Council of Ruling Wizards Room // manaseed -001-2.gat,104,19,0|script|Desert Mana Seed#_M|166 +001-2,104,19,0|script|Desert Mana Seed#_M|166 { end; } // -001-2.gat,99,22,0|script|Wizard#1|355 +001-2,99,22,0|script|Wizard#1|355 { end; } // -001-2.gat,92,24,0|script|Wizard#2|356 +001-2,92,24,0|script|Wizard#2|356 { end; } // -001-2.gat,92,30,0|script|Wizard#3|357 +001-2,92,30,0|script|Wizard#3|357 { end; } // -001-2.gat,99,32,0|script|Wizard#4|358 +001-2,99,32,0|script|Wizard#4|358 { end; } // -001-2.gat,110,22,0|script|Wizard#5|359 +001-2,110,22,0|script|Wizard#5|359 { end; } // -001-2.gat,117,24,0|script|Wizard#6|360 +001-2,117,24,0|script|Wizard#6|360 { end; } // -001-2.gat,117,30,0|script|Wizard#7|361 +001-2,117,30,0|script|Wizard#7|361 { end; } // -001-2.gat,110,32,0|script|Wizard#8|362 +001-2,110,32,0|script|Wizard#8|362 { end; } // -001-2.gat,104,27,0|script|Arch-Wizard#9|354 +001-2,104,27,0|script|Arch-Wizard#9|354 { end; } diff --git a/world/map/npc/001-2/yanis.txt b/world/map/npc/001-2/yanis.txt index 67175704..e8cf13a3 100644 --- a/world/map/npc/001-2/yanis.txt +++ b/world/map/npc/001-2/yanis.txt @@ -1,7 +1,7 @@ // Government official taking care about shop licenses // involved in quest given by 021-1/imec.txt and 021-2/kylian.txt -001-2.gat,31,21,0|script|Yanis|107 +001-2,31,21,0|script|Yanis|107 { set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@knowYanisNT; set @kylian, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT); diff --git a/world/map/npc/001-3/guards.txt b/world/map/npc/001-3/guards.txt index e6b11a0f..5fd08a9e 100644 --- a/world/map/npc/001-3/guards.txt +++ b/world/map/npc/001-3/guards.txt @@ -1,4 +1,4 @@ -001-3.gat,77,37,0|script|Phaet#arena|125 +001-3,77,37,0|script|Phaet#arena|125 { mes "[Phaet the Royal Guard]"; mes "\"Do you want to go back?\""; @@ -16,16 +16,16 @@ L_Sure: mes "\"Ok.\""; next; if(DUELS & $@DuelPvpBit) goto L_FightClub; - warp "002-2.gat", 74, 59; + warp "002-2", 74, 59; close; L_FightClub: set DUELS, DUELS &~ $@DuelPvpBit; - warp "009-7.gat", 39, 37; + warp "009-7", 39, 37; close; } -001-3.gat,69,37,0|script|Aradin|126 +001-3,69,37,0|script|Aradin|126 { mes "[Aradin the Royal Guard]"; mes "\"Don't touch me..."; diff --git a/world/map/npc/001-3/mapflags.txt b/world/map/npc/001-3/mapflags.txt index 7f8170b1..c3a71c5c 100644 --- a/world/map/npc/001-3/mapflags.txt +++ b/world/map/npc/001-3/mapflags.txt @@ -1,2 +1,2 @@ -001-3.gat|mapflag|nosave|002-2,74,59 -001-3.gat|mapflag|resave|002-2,74,59 +001-3|mapflag|nosave|002-2,74,59 +001-3|mapflag|resave|002-2,74,59 diff --git a/world/map/npc/001-3/pvpflag.txt b/world/map/npc/001-3/pvpflag.txt index 96d382d4..68e1b53a 100644 --- a/world/map/npc/001-3/pvpflag.txt +++ b/world/map/npc/001-3/pvpflag.txt @@ -1 +1 @@ -001-3.gat|mapflag|pvp +001-3|mapflag|pvp diff --git a/world/map/npc/002-1/anwar.txt b/world/map/npc/002-1/anwar.txt index 707e577e..d0c73abf 100644 --- a/world/map/npc/002-1/anwar.txt +++ b/world/map/npc/002-1/anwar.txt @@ -16,7 +16,7 @@ // state 13: Anwar asked to bring present to Eomie // state 14: gave present to Eomie // state 15: reported back to Anwar and done -002-1.gat,95,67,0|script|Anwar|156 +002-1,95,67,0|script|Anwar|156 { set @state, ((QUEST_NorthTulimshar & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT); diff --git a/world/map/npc/002-1/bard.txt b/world/map/npc/002-1/bard.txt index c977b136..22c3b113 100644 --- a/world/map/npc/002-1/bard.txt +++ b/world/map/npc/002-1/bard.txt @@ -1,6 +1,6 @@ // -002-1.gat,91,33,0|script|Bard|152 +002-1,91,33,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.\"", diff --git a/world/map/npc/002-1/dock.txt b/world/map/npc/002-1/dock.txt index f902006d..db947145 100644 --- a/world/map/npc/002-1/dock.txt +++ b/world/map/npc/002-1/dock.txt @@ -1,4 +1,4 @@ -002-1.gat,67,65,0|script|Ferry Schedule#3|396 +002-1,67,65,0|script|Ferry Schedule#3|396 { callfunc "FerryManifest"; end; diff --git a/world/map/npc/002-1/elanore.txt b/world/map/npc/002-1/elanore.txt index fec70d44..da73a88f 100644 --- a/world/map/npc/002-1/elanore.txt +++ b/world/map/npc/002-1/elanore.txt @@ -17,7 +17,7 @@ function|script|ElanoreFix return; } -002-1.gat,75,62,0|script|Elanore#_M|108 +002-1,75,62,0|script|Elanore#_M|108 { set @has_magic, getskilllv(SKILL_MAGIC); diff --git a/world/map/npc/002-1/gaurds.txt b/world/map/npc/002-1/gaurds.txt index d7fb023f..6700a1b8 100644 --- a/world/map/npc/002-1/gaurds.txt +++ b/world/map/npc/002-1/gaurds.txt @@ -1,17 +1,17 @@ // Guards by the gates to the port -002-1.gat,100,21,0|script|Guard#port1|104 +002-1,100,21,0|script|Guard#port1|104 { mes "[Guard]"; mes "\"Lots of stuff happens in the port district. Those sailors can get quite rowdy.\""; close; } -002-1.gat,61,27,0|script|Guard#port2|104 +002-1,61,27,0|script|Guard#port2|104 { mes "[Guard]"; mes "\"You wouldn't believe the refuse that comes in from the docks.\""; close; } -002-1.gat,83,48,0|script|Guard#east1|104 +002-1,83,48,0|script|Guard#east1|104 { mes "[Guard]"; mes "\"I make sure less desirables don't bother the Nobles.\""; diff --git a/world/map/npc/002-1/itka.txt b/world/map/npc/002-1/itka.txt index fec553d8..54c4a572 100644 --- a/world/map/npc/002-1/itka.txt +++ b/world/map/npc/002-1/itka.txt @@ -1,5 +1,5 @@ // Outside the Hotel -002-1.gat,66,39,0|script|Itka|114 +002-1,66,39,0|script|Itka|114 { mes "[Itka]"; mes "\"This hotel is the best!\""; diff --git a/world/map/npc/002-1/lieutenant_dausen.txt b/world/map/npc/002-1/lieutenant_dausen.txt index c945a296..38ac6b08 100644 --- a/world/map/npc/002-1/lieutenant_dausen.txt +++ b/world/map/npc/002-1/lieutenant_dausen.txt @@ -1,7 +1,7 @@ // Lieutenant in charge of monitoring the monster threat surrounding the city. // Variables used: nibble 4 and 5 of QUEST_SouthTulimshar -002-1.gat,63,67,0|script|Lieutenant Dausen|122 +002-1,63,67,0|script|Lieutenant Dausen|122 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/002-1/luca.txt b/world/map/npc/002-1/luca.txt index 17ac66c7..8db36cf9 100644 --- a/world/map/npc/002-1/luca.txt +++ b/world/map/npc/002-1/luca.txt @@ -1,6 +1,6 @@ // -002-1.gat,112,26,0|script|Luca|102 +002-1,112,26,0|script|Luca|102 { set @EXP_BRAWLING, 2000; diff --git a/world/map/npc/002-1/mapflags.txt b/world/map/npc/002-1/mapflags.txt index 91b323a1..ac3e9967 100644 --- a/world/map/npc/002-1/mapflags.txt +++ b/world/map/npc/002-1/mapflags.txt @@ -1 +1 @@ -002-1.gat|mapflag|resave|001-1,60,105 +002-1|mapflag|resave|001-1,60,105 diff --git a/world/map/npc/002-1/mine_debug.txt b/world/map/npc/002-1/mine_debug.txt index d9ee55dc..0fdcb9b3 100644 --- a/world/map/npc/002-1/mine_debug.txt +++ b/world/map/npc/002-1/mine_debug.txt @@ -39,7 +39,7 @@ S_Update_Var: set QUEST_SouthTulimshar, (QUEST_SouthTulimshar & ~(BYTE_2_MASK) | (@state << BYTE_2_SHIFT)); return; } -002-1.gat,61,69,0|script|Mine Debug#1|122 +002-1,61,69,0|script|Mine Debug#1|122 { callfunc "DesertMineDebug"; end; @@ -49,7 +49,7 @@ OnInit: disablenpc "Mine Debug#1"; end; } -002-3.gat,45,49,6|script|Mine Debug#2|109 +002-3,45,49,6|script|Mine Debug#2|109 { callfunc "DesertMineDebug"; end; @@ -59,7 +59,7 @@ OnInit: disablenpc "Mine Debug#2"; end; } -002-4.gat,88,99,6|script|Mine Debug#3|109 +002-4,88,99,6|script|Mine Debug#3|109 { callfunc "DesertMineDebug"; end; @@ -69,7 +69,7 @@ OnInit: disablenpc "Mine Debug#3"; end; } -002-5.gat,43,96,6|script|Mine Debug#4|340 +002-5,43,96,6|script|Mine Debug#4|340 { callfunc "DesertMineDebug"; end; diff --git a/world/map/npc/002-1/nickos.txt b/world/map/npc/002-1/nickos.txt index 2377bbaf..45644cee 100644 --- a/world/map/npc/002-1/nickos.txt +++ b/world/map/npc/002-1/nickos.txt @@ -1,7 +1,7 @@ // Sandstorm mine guard // Variables used: nibble 4 and 5 of QUEST_SouthTulimshar -002-1.gat,46,108,0|script|Nickos|123 +002-1,46,108,0|script|Nickos|123 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/002-1/nomads.txt b/world/map/npc/002-1/nomads.txt index 987d10ce..07d10972 100644 --- a/world/map/npc/002-1/nomads.txt +++ b/world/map/npc/002-1/nomads.txt @@ -1,6 +1,6 @@ // -002-1.gat,101,114,0|script|Samuel|132 +002-1,101,114,0|script|Samuel|132 { mes "[Samuel the Nomad]"; mes "\"This is really a nice place.\""; @@ -8,7 +8,7 @@ close; } -002-1.gat,105,114,0|script|Elijah|128 +002-1,105,114,0|script|Elijah|128 { mes "[Elijah the Nomad]"; mes "\"It's nice to find a respite like this...\""; diff --git a/world/map/npc/002-1/npcs.txt b/world/map/npc/002-1/npcs.txt index a2ae00ac..e7fa55c2 100644 --- a/world/map/npc/002-1/npcs.txt +++ b/world/map/npc/002-1/npcs.txt @@ -1,4 +1,4 @@ -002-1.gat,96,23,0|script|Jeric|214 +002-1,96,23,0|script|Jeric|214 { set @npcname$, "Jeric"; @@ -9,7 +9,7 @@ set @npcname$, ""; close; } -002-1.gat,112,48,0|script|Silvia|207 +002-1,112,48,0|script|Silvia|207 { set @npcname$, "Silvia"; diff --git a/world/map/npc/002-1/sarah.txt b/world/map/npc/002-1/sarah.txt index 15eeb83b..83fc6558 100644 --- a/world/map/npc/002-1/sarah.txt +++ b/world/map/npc/002-1/sarah.txt @@ -1,6 +1,6 @@ // Variables used: nibble 1 of QUEST_SouthTulimshar -002-1.gat,93,43,0|script|Sarah|106 +002-1,93,43,0|script|Sarah|106 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/002-1/soul-menhir.txt b/world/map/npc/002-1/soul-menhir.txt index 9fe0c06a..3260e511 100644 --- a/world/map/npc/002-1/soul-menhir.txt +++ b/world/map/npc/002-1/soul-menhir.txt @@ -1,9 +1,9 @@ // -002-1.gat,58,60,0|script|Soul Menhir#tulimshar|345 +002-1,58,60,0|script|Soul Menhir#tulimshar|345 { callfunc "ClearVariables"; - set @map$, "001-1.gat"; + set @map$, "001-1"; setarray @Xs, 57, 58, 59, 57, 59, 57, 59; setarray @Ys, 59, 59, 59, 60, 60, 61, 61; set @x, 0; diff --git a/world/map/npc/002-1/stewen.txt b/world/map/npc/002-1/stewen.txt index 461451fe..4368f590 100644 --- a/world/map/npc/002-1/stewen.txt +++ b/world/map/npc/002-1/stewen.txt @@ -1,7 +1,7 @@ // East sandstorm guard // Variables used: nibble 4 and 5 of QUEST_SouthTulimshar -002-1.gat,116,93,0|script|Stewen|123 +002-1,116,93,0|script|Stewen|123 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/002-1/traveler.txt b/world/map/npc/002-1/traveler.txt index 567d8667..0645cce2 100644 --- a/world/map/npc/002-1/traveler.txt +++ b/world/map/npc/002-1/traveler.txt @@ -2,7 +2,7 @@ // Author: Wombat, wushin // cost depending on level and adapted to new scripting guidelines: Jenalya -002-1.gat,60,41,0|script|Nina the Traveler|103 +002-1,60,41,0|script|Nina the Traveler|103 { set @NpcName$, "Nina"; set @NpcTravelBit, $@tulimshar_bit; diff --git a/world/map/npc/002-2/bakery.txt b/world/map/npc/002-2/bakery.txt index e5328723..5a21678a 100644 --- a/world/map/npc/002-2/bakery.txt +++ b/world/map/npc/002-2/bakery.txt @@ -1,7 +1,7 @@ // The bakery // The chef -002-2.gat,21,22,0|script|Riskim|148 +002-2,21,22,0|script|Riskim|148 { mes "[Riskim]"; mes ""; @@ -120,7 +120,7 @@ L_End: } // Server -002-2.gat,28,31,0|script|Sara|108 +002-2,28,31,0|script|Sara|108 { mes "[Sara]"; mes ""; @@ -129,10 +129,10 @@ L_End: } // The cashier -002-2.gat,25,22,0|shop|Drabur|112,WhiteCake:*1,ChocolateCake:*1,OrangeCake:*1,AppleCake:*1,Cake:*1,CherryCake:*1,OrangeCupcake:*1,Milk:*1,XmasCake:*1 +002-2,25,22,0|shop|Drabur|112,WhiteCake:*1,ChocolateCake:*1,OrangeCake:*1,AppleCake:*1,Cake:*1,CherryCake:*1,OrangeCupcake:*1,Milk:*1,XmasCake:*1 // Bus boy -002-2.gat,21,28,0|script|Iormo|160 +002-2,21,28,0|script|Iormo|160 { mes "[Iormo]"; mes ""; @@ -141,7 +141,7 @@ L_End: } // An old couple eating at the bakery -002-2.gat,24,27,0|script|Rynoh|159 +002-2,24,27,0|script|Rynoh|159 { mes "[Rynoh]"; mes ""; @@ -149,7 +149,7 @@ L_End: close; } -002-2.gat,26,27,0|script|Ontas|154 +002-2,26,27,0|script|Ontas|154 { mes "[Ontas]"; mes ""; diff --git a/world/map/npc/002-2/barber.txt b/world/map/npc/002-2/barber.txt index eb1a5821..076dbfab 100644 --- a/world/map/npc/002-2/barber.txt +++ b/world/map/npc/002-2/barber.txt @@ -1,5 +1,5 @@ // A barber (later we can make it so certain styles need to come from him, for a price) -002-2.gat,117,30,0|script|Issay|156 +002-2,117,30,0|script|Issay|156 { mes "[Issay the Barber]"; mes "\"Do you need a change of style?\""; diff --git a/world/map/npc/002-2/bleacher.txt b/world/map/npc/002-2/bleacher.txt index 3391a62c..e93201d2 100644 --- a/world/map/npc/002-2/bleacher.txt +++ b/world/map/npc/002-2/bleacher.txt @@ -1,6 +1,6 @@ // -002-2.gat,72,92,0|script|Candide|156 +002-2,72,92,0|script|Candide|156 { mes "[Candide]"; mes "\"I've figured out how that volcanic ash bleaches cloth."; diff --git a/world/map/npc/002-2/casino.txt b/world/map/npc/002-2/casino.txt index d49313a6..14ac5226 100644 --- a/world/map/npc/002-2/casino.txt +++ b/world/map/npc/002-2/casino.txt @@ -1,7 +1,7 @@ // Casino // takes part in quest given by 021-2/kylian.txt -002-2.gat,79,68,0|script|#CasinoEntrance|32767,13,0 +002-2,79,68,0|script|#CasinoEntrance|32767,13,0 { set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@knowCasinoNT; set @kylian, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT); @@ -15,34 +15,34 @@ L_End: end; } -002-2.gat,86,29,0|script|Valdo|117 +002-2,86,29,0|script|Valdo|117 { mes "[Valdo the Worker]"; mes "\"Please let me work. I'm really in a hurry!\""; close; } -002-2.gat,84,62,0|script|Slots#1|400 +002-2,84,62,0|script|Slots#1|400 { callfunc "SlotMachine"; close; } -002-2.gat,86,62,0|script|Slots#2|400 +002-2,86,62,0|script|Slots#2|400 { callfunc "SlotMachine"; close; } -002-2.gat,88,62,0|script|Slots#3|400 +002-2,88,62,0|script|Slots#3|400 { callfunc "SlotMachine"; close; } -002-2.gat,78,56,0|shop|MoneyChanger|124,CasinoCoins:*1 +002-2,78,56,0|shop|MoneyChanger|124,CasinoCoins:*1 -002-2.gat,75,60,0|script|BlackJack|107 +002-2,75,60,0|script|BlackJack|107 { mes "[Croupier]"; mes "\"Would you like to play Black Jack?"; @@ -117,7 +117,7 @@ L_Close: close; } -002-2.gat,69,67,0|script|Roulette|107 +002-2,69,67,0|script|Roulette|107 { mes "[Croupier]"; mes "\"Good evening monsieur..."; diff --git a/world/map/npc/002-2/dedication.txt b/world/map/npc/002-2/dedication.txt index 4ab9ba22..dfd507ca 100644 --- a/world/map/npc/002-2/dedication.txt +++ b/world/map/npc/002-2/dedication.txt @@ -1,6 +1,6 @@ // Dedication to Irene Christina -002-2.gat,116,123,0|script|#IreneDedication|400 +002-2,116,123,0|script|#IreneDedication|400 { mes "~ Irene Christina ~"; mes "The song in this house is dedicated to Irene."; diff --git a/world/map/npc/002-2/eurni.txt b/world/map/npc/002-2/eurni.txt index a084acbc..c63a71eb 100644 --- a/world/map/npc/002-2/eurni.txt +++ b/world/map/npc/002-2/eurni.txt @@ -1,6 +1,6 @@ // -002-2.gat,22,77,0|script|Eurni|136 +002-2,22,77,0|script|Eurni|136 { set @halloween_npc_id, $@halloween_npc_eurni; callfunc "TrickOrTreat"; diff --git a/world/map/npc/002-2/hetchel.txt b/world/map/npc/002-2/hetchel.txt index 134d40dc..d87c1f64 100644 --- a/world/map/npc/002-2/hetchel.txt +++ b/world/map/npc/002-2/hetchel.txt @@ -17,7 +17,7 @@ // // @silkpants_state: variable indicating silkpant quest status. -002-2.gat,76,92,0|script|Hetchel|376 +002-2,76,92,0|script|Hetchel|376 { set @wg_state, ((QUEST_WG_state & BYTE_0_MASK) >> BYTE_0_SHIFT); set @spants_state, ((QUEST_WG_state & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT); @@ -408,7 +408,7 @@ L_Close: close; } -002-2.gat,73,95,0|script|HetchelDebug|376 +002-2,73,95,0|script|HetchelDebug|376 { set @wg_state, ((QUEST_WG_state & BYTE_0_MASK) >> BYTE_0_SHIFT); set @spants_state, ((QUEST_WG_state & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT); diff --git a/world/map/npc/002-2/imec.txt b/world/map/npc/002-2/imec.txt index 851dd49b..59966ff0 100644 --- a/world/map/npc/002-2/imec.txt +++ b/world/map/npc/002-2/imec.txt @@ -2,7 +2,7 @@ // after finishing this, daily quest with scorpion stingers // Using bit 8 and 9 of QUEST_NorthTulimshar (first half of nibble 2) // author: Jenalya -002-2.gat,36,75,0|script|Imec|162 +002-2,36,75,0|script|Imec|162 { set @state, ((QUEST_NorthTulimshar & TWOBIT_4_MASK) >> TWOBIT_4_SHIFT); set @EXP, 90; diff --git a/world/map/npc/002-2/inya.txt b/world/map/npc/002-2/inya.txt index d05b19b4..7f0184f8 100644 --- a/world/map/npc/002-2/inya.txt +++ b/world/map/npc/002-2/inya.txt @@ -1,9 +1,9 @@ //Gemstones: Diamond (white) , Ruby (red), Emerald (green), Sapphire (blue), Topaz (yellow), Amethyst (purple) //The power of the gems is important to future balance of these rings. Are they related to stats, tiers of power, schools of magic? -002-2.gat,116,61,0|shop|#InyaShop|127,SimpleRing:*1 +002-2,116,61,0|shop|#InyaShop|127,SimpleRing:*1 -002-2.gat,116,61,0|script|Inya|106 +002-2,116,61,0|script|Inya|106 { mes "[Inya]"; mes "\"I am Inya, a jeweler of fine rings. I sell and make rings.\""; diff --git a/world/map/npc/002-2/kps.txt b/world/map/npc/002-2/kps.txt index a17df1a3..558166ec 100644 --- a/world/map/npc/002-2/kps.txt +++ b/world/map/npc/002-2/kps.txt @@ -4,7 +4,7 @@ // reuse the 4 bits // To Mark 4 Different NPCs. // setarray $@kps_npc_bits, $@knowYanisNT, $@knowLatoyNT, $@knowWeellosNT, $@knowCasinoNT; -002-2.gat,120,89,0|script|KPS Manager|191 +002-2,120,89,0|script|KPS Manager|191 { set @state, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT); set @run, ((QUEST_NorthTulimshar & TWOBIT_8_MASK) >> TWOBIT_8_SHIFT); diff --git a/world/map/npc/002-2/kylian.txt b/world/map/npc/002-2/kylian.txt index 7f832b87..b1dadac2 100644 --- a/world/map/npc/002-2/kylian.txt +++ b/world/map/npc/002-2/kylian.txt @@ -57,14 +57,14 @@ OnInit: set $@delivery_exp_mod, 10; end; } -002-2.gat,44,107,0|script|#KylianOut|32767,1,1 +002-2,44,107,0|script|#KylianOut|32767,1,1 { set @KylianNTLicense, 0; set @KylianNTSightSeeing, 0; set @KylianNTCasino, 0; end; } -002-2.gat,43,101,0|script|Kylian|193 +002-2,43,101,0|script|Kylian|193 { set @state, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT); @@ -404,7 +404,7 @@ L_MoreWorkTimer: L_Close: close; } -002-2.gat,40,101,0|script|KylianDebug#1|193 +002-2,40,101,0|script|KylianDebug#1|193 { callfunc "KylianDebug"; end; @@ -413,7 +413,7 @@ OnInit: disablenpc "KylianDebug#1"; end; } -002-2.gat,118,89,0|script|KylianDebug#2|193 +002-2,118,89,0|script|KylianDebug#2|193 { callfunc "KylianDebug"; end; diff --git a/world/map/npc/002-2/latoy.txt b/world/map/npc/002-2/latoy.txt index 3e8701a2..49be414e 100644 --- a/world/map/npc/002-2/latoy.txt +++ b/world/map/npc/002-2/latoy.txt @@ -1,9 +1,9 @@ // A snobby store that won't sell to the player // takes part in quest given by 021-2/kylian.txt -002-2.gat,86,93,0|shop|#LatoyShop|127,SilkHeadband:*4,SilkGloves:*4,SilkPants:*4,SilkRobe:*4 +002-2,86,93,0|shop|#LatoyShop|127,SilkHeadband:*4,SilkGloves:*4,SilkPants:*4,SilkRobe:*4 -002-2.gat,86,93,0|script|Latoy|106 +002-2,86,93,0|script|Latoy|106 { set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@knowLatoyNT; set @kylian, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT); diff --git a/world/map/npc/002-2/mapflags.txt b/world/map/npc/002-2/mapflags.txt index 5448030e..b33ced4f 100644 --- a/world/map/npc/002-2/mapflags.txt +++ b/world/map/npc/002-2/mapflags.txt @@ -1 +1 @@ -002-2.gat|mapflag|resave|001-1,60,105 +002-2|mapflag|resave|001-1,60,105 diff --git a/world/map/npc/002-2/omar.txt b/world/map/npc/002-2/omar.txt index 048f129c..6e51a706 100644 --- a/world/map/npc/002-2/omar.txt +++ b/world/map/npc/002-2/omar.txt @@ -21,7 +21,7 @@ function|script|KadiyaSubquestConsts return; } -002-2.gat,117,126,0|script|Omar|162 +002-2,117,126,0|script|Omar|162 { callfunc "ElanoreFix"; callfunc "KadiyaSubquestConsts"; @@ -178,7 +178,7 @@ S_update_var: return; } -002-2.gat,124,124,0|script|Kadiya|174 +002-2,124,124,0|script|Kadiya|174 { set @child_number, 7; callfunc "XmasList"; diff --git a/world/map/npc/002-2/phaet.txt b/world/map/npc/002-2/phaet.txt index eb464e1e..a0ec83ee 100644 --- a/world/map/npc/002-2/phaet.txt +++ b/world/map/npc/002-2/phaet.txt @@ -1,6 +1,6 @@ // -002-2.gat,75,56,0|script|Phaet|125,0,0 +002-2,75,56,0|script|Phaet|125,0,0 { 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.\""; @@ -21,7 +21,7 @@ L_Sure: mes "[Phaet the Royal Guard]"; mes "\"Get ready!\""; next; - warp "001-3.gat", 0, 0; + warp "001-3", 0, 0; close; L_NoMoney: diff --git a/world/map/npc/002-2/rebecca.txt b/world/map/npc/002-2/rebecca.txt index 54244115..faf53007 100644 --- a/world/map/npc/002-2/rebecca.txt +++ b/world/map/npc/002-2/rebecca.txt @@ -1,6 +1,6 @@ // -002-2.gat,44,27,0|script|Rebecca|118 +002-2,44,27,0|script|Rebecca|118 { set @npcname$, "Rebecca the Inn Keeper"; set @cost, 100; diff --git a/world/map/npc/002-2/shops.txt b/world/map/npc/002-2/shops.txt index b1818d04..f1f09592 100644 --- a/world/map/npc/002-2/shops.txt +++ b/world/map/npc/002-2/shops.txt @@ -1,3 +1,3 @@ // Bartender -002-2.gat,68,25,0|shop|Bartender#Casino|112,Beer:*1,Cake:*1,CherryCake:*1 +002-2,68,25,0|shop|Bartender#Casino|112,Beer:*1,Cake:*1,CherryCake:*1 diff --git a/world/map/npc/002-2/stranger.txt b/world/map/npc/002-2/stranger.txt index 563af742..c1d4699e 100644 --- a/world/map/npc/002-2/stranger.txt +++ b/world/map/npc/002-2/stranger.txt @@ -1,4 +1,4 @@ -002-2.gat,38,57,0|script|Stranger|192 +002-2,38,57,0|script|Stranger|192 { set @IRONINGOT, 5; set @PINKANTENNA, 21; diff --git a/world/map/npc/002-2/troupe_leader.txt b/world/map/npc/002-2/troupe_leader.txt index c736899d..de8517c5 100644 --- a/world/map/npc/002-2/troupe_leader.txt +++ b/world/map/npc/002-2/troupe_leader.txt @@ -1,6 +1,6 @@ // -002-2.gat,81,21,0|script|Troupe Leader|165 +002-2,81,21,0|script|Troupe Leader|165 { callfunc "ClearVariables"; diff --git a/world/map/npc/002-3/mapflags.txt b/world/map/npc/002-3/mapflags.txt index 6c79bfef..9b47ca70 100644 --- a/world/map/npc/002-3/mapflags.txt +++ b/world/map/npc/002-3/mapflags.txt @@ -1 +1 @@ -002-3.gat|mapflag|resave|002-3,72,66 +002-3|mapflag|resave|002-3,72,66 diff --git a/world/map/npc/002-3/merchant.txt b/world/map/npc/002-3/merchant.txt index 5285d7e5..55386d17 100644 --- a/world/map/npc/002-3/merchant.txt +++ b/world/map/npc/002-3/merchant.txt @@ -1,3 +1,3 @@ // -002-3.gat,60,47,0|shop|Ishyah|109,MinersHat:*1,MinerGloves:*1,ShortBow:*4,Arrow:*2,LeatherShield:*1 +002-3,60,47,0|shop|Ishyah|109,MinersHat:*1,MinerGloves:*1,ShortBow:*4,Arrow:*2,LeatherShield:*1 diff --git a/world/map/npc/002-3/mining_camp_barrier.txt b/world/map/npc/002-3/mining_camp_barrier.txt index a1ae29ed..e26720d9 100644 --- a/world/map/npc/002-3/mining_camp_barrier.txt +++ b/world/map/npc/002-3/mining_camp_barrier.txt @@ -1,6 +1,6 @@ //Sandstorm mine barrier -002-3.gat,82,32,0|script|#Sandstorm_Mine_Barrier|45,0,0 +002-3,82,32,0|script|#Sandstorm_Mine_Barrier|45,0,0 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; @@ -13,7 +13,7 @@ goto L_End; L_Sandstorm_Barrier_Open: - warp "002-4.gat",37,31; + warp "002-4",37,31; goto L_End; L_End: diff --git a/world/map/npc/002-3/nathan.txt b/world/map/npc/002-3/nathan.txt index 45817d2a..9661fc18 100644 --- a/world/map/npc/002-3/nathan.txt +++ b/world/map/npc/002-3/nathan.txt @@ -1,6 +1,6 @@ // Variables used: nibble 4 and 5 of QUEST_SouthTulimshar -002-3.gat,42,45,6|script|Nathan|109 +002-3,42,45,6|script|Nathan|109 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/002-3/traveler.txt b/world/map/npc/002-3/traveler.txt index ff53af8f..a1fd4f6f 100644 --- a/world/map/npc/002-3/traveler.txt +++ b/world/map/npc/002-3/traveler.txt @@ -2,7 +2,7 @@ // Author: Wombat, wushin // cost depending on level and adapted to new scripting guidelines: Jenalya -002-3.gat,25,28,0|script|Jena the Traveler|103 +002-3,25,28,0|script|Jena the Traveler|103 { set @NpcName$, "Jena"; set @NpcTravelBit, $@tul_mine_bit; diff --git a/world/map/npc/002-4/mapflags.txt b/world/map/npc/002-4/mapflags.txt index 7fdafe55..c6b4a046 100644 --- a/world/map/npc/002-4/mapflags.txt +++ b/world/map/npc/002-4/mapflags.txt @@ -1 +1 @@ -002-4.gat|mapflag|resave|002-3,72,66 +002-4|mapflag|resave|002-3,72,66 diff --git a/world/map/npc/002-4/mine_triggerone.txt b/world/map/npc/002-4/mine_triggerone.txt index 2df6c84c..03cee2da 100644 --- a/world/map/npc/002-4/mine_triggerone.txt +++ b/world/map/npc/002-4/mine_triggerone.txt @@ -1,7 +1,7 @@ //Sandstorm mine trigger 1 Trigger 002-4 35,43 (127) // Variables used: nibble 4 and 5 of QUEST_SouthTulimshar -002-4.gat,30,47,0|script|Button#mine-1|400,0,0 +002-4,30,47,0|script|Button#mine-1|400,0,0 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/002-4/mine_triggerthree.txt b/world/map/npc/002-4/mine_triggerthree.txt index 925c01b6..fe9fe672 100644 --- a/world/map/npc/002-4/mine_triggerthree.txt +++ b/world/map/npc/002-4/mine_triggerthree.txt @@ -1,7 +1,7 @@ //Sandstorm mine trigger 3 Trigger 002-4 98,42 (127) // Variables used: nibble 4 and 5 of QUEST_SouthTulimshar -002-4.gat,91,99,0|script|Button#mine-3|400,0,0 +002-4,91,99,0|script|Button#mine-3|400,0,0 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/002-4/mine_triggertwo.txt b/world/map/npc/002-4/mine_triggertwo.txt index 4858bd42..ec181596 100644 --- a/world/map/npc/002-4/mine_triggertwo.txt +++ b/world/map/npc/002-4/mine_triggertwo.txt @@ -3,7 +3,7 @@ // - nibble 4 and 5 of QUEST_SouthTulimshar // - in FLAGS, FLAG_OPENED_UNDERGROUND -002-4.gat,100,37,0|script|Button#mine-2|400,0,0 +002-4,100,37,0|script|Button#mine-2|400,0,0 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/002-4/naem.txt b/world/map/npc/002-4/naem.txt index 08bf0056..9c2c1f65 100644 --- a/world/map/npc/002-4/naem.txt +++ b/world/map/npc/002-4/naem.txt @@ -2,7 +2,7 @@ // - nibble 4 and 5 of QUEST_SouthTulimshar // - in FLAGS, bits FLAG_GOT_NAEM_GLOVES and FLAG_OPENED_UNDERGROUND -002-4.gat,91,96,6|script|Naem|109 +002-4,91,96,6|script|Naem|109 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/002-4/underground_palace_barrier.txt b/world/map/npc/002-4/underground_palace_barrier.txt index c0946963..ecc8b78b 100644 --- a/world/map/npc/002-4/underground_palace_barrier.txt +++ b/world/map/npc/002-4/underground_palace_barrier.txt @@ -1,6 +1,6 @@ //underground palace barrier -002-4.gat,68,98,0|script|#UGP_Barrier|45,0,0 +002-4,68,98,0|script|#UGP_Barrier|45,0,0 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; @@ -13,7 +13,7 @@ goto L_End; L_Underground_Palace_Barrier_Open: - warp "002-5.gat",35,97; + warp "002-5",35,97; goto L_End; L_End: diff --git a/world/map/npc/002-5/chest.txt b/world/map/npc/002-5/chest.txt index 785247d5..fe0c2448 100644 --- a/world/map/npc/002-5/chest.txt +++ b/world/map/npc/002-5/chest.txt @@ -1,6 +1,6 @@ // Variables used: nibble 4 and 5 of QUEST_SouthTulimshar -002-5.gat,93,37,0|script|Supply Chest|378 +002-5,93,37,0|script|Supply Chest|378 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/002-5/mapflags.txt b/world/map/npc/002-5/mapflags.txt index 38e2b3bd..b1250e34 100644 --- a/world/map/npc/002-5/mapflags.txt +++ b/world/map/npc/002-5/mapflags.txt @@ -1 +1 @@ -002-5.gat|mapflag|resave|002-3,72,66 +002-5|mapflag|resave|002-3,72,66 diff --git a/world/map/npc/002-5/sema.txt b/world/map/npc/002-5/sema.txt index 25b4fc29..7a859f05 100644 --- a/world/map/npc/002-5/sema.txt +++ b/world/map/npc/002-5/sema.txt @@ -1,6 +1,6 @@ // Variables used: nibble 4 and 5 of QUEST_SouthTulimshar -002-5.gat,43,91,6|script|Sema|340 +002-5,43,91,6|script|Sema|340 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; @@ -30,7 +30,7 @@ L_Sema_No: L_Sema_Yes: set @state, 27; callsub S_Update_Var; - monster "002-5.gat", 70, 90, "", 1059, 1; + monster "002-5", 70, 90, "", 1059, 1; mes "[Sema the Miner]"; mes "\"Good luck. To prove you killed it, please bring the Iten it swallowed when it ate the miner. Be careful, there could be more than one.\""; goto L_Close; diff --git a/world/map/npc/004-3/mapflags.txt b/world/map/npc/004-3/mapflags.txt index a6af2bfc..1365bc09 100644 --- a/world/map/npc/004-3/mapflags.txt +++ b/world/map/npc/004-3/mapflags.txt @@ -1 +1 @@ -004-3.gat|mapflag|resave|001-1,60,105 +004-3|mapflag|resave|001-1,60,105 diff --git a/world/map/npc/004-4/mapflags.txt b/world/map/npc/004-4/mapflags.txt index 5a8e7b9e..fee09311 100644 --- a/world/map/npc/004-4/mapflags.txt +++ b/world/map/npc/004-4/mapflags.txt @@ -1 +1 @@ -004-4.gat|mapflag|resave|001-1,60,105 +004-4|mapflag|resave|001-1,60,105 diff --git a/world/map/npc/004-5/chest.txt b/world/map/npc/004-5/chest.txt index 23674b24..a54739fc 100644 --- a/world/map/npc/004-5/chest.txt +++ b/world/map/npc/004-5/chest.txt @@ -1,4 +1,4 @@ -004-5.gat,89,67,0|script|Old Chest#crastur|111 +004-5,89,67,0|script|Old Chest#crastur|111 { setarray @npc_loc, 89, 67, 1; callfunc "PCtoNPCRange"; diff --git a/world/map/npc/004-5/mapflags.txt b/world/map/npc/004-5/mapflags.txt index 4bdc0a1b..d449e0f6 100644 --- a/world/map/npc/004-5/mapflags.txt +++ b/world/map/npc/004-5/mapflags.txt @@ -1 +1 @@ -004-5.gat|mapflag|resave|001-1,60,105 +004-5|mapflag|resave|001-1,60,105 diff --git a/world/map/npc/005-3/mapflags.txt b/world/map/npc/005-3/mapflags.txt index 8916c392..087876e0 100644 --- a/world/map/npc/005-3/mapflags.txt +++ b/world/map/npc/005-3/mapflags.txt @@ -1 +1 @@ -005-3.gat|mapflag|resave|006-1,36,18 +005-3|mapflag|resave|006-1,36,18 diff --git a/world/map/npc/006-1/mapflags.txt b/world/map/npc/006-1/mapflags.txt index 85c94b9f..5b3b3a39 100644 --- a/world/map/npc/006-1/mapflags.txt +++ b/world/map/npc/006-1/mapflags.txt @@ -1 +1 @@ -006-1.gat|mapflag|resave|006-1,36,18 +006-1|mapflag|resave|006-1,36,18 diff --git a/world/map/npc/006-1/mika.txt b/world/map/npc/006-1/mika.txt index 82b3db85..2d4a37a7 100644 --- a/world/map/npc/006-1/mika.txt +++ b/world/map/npc/006-1/mika.txt @@ -1,4 +1,4 @@ -006-1.gat,39,22,0|script|Mika|114 +006-1,39,22,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.\""; diff --git a/world/map/npc/006-1/miriam.txt b/world/map/npc/006-1/miriam.txt index 4279e3d5..7fab4bcd 100644 --- a/world/map/npc/006-1/miriam.txt +++ b/world/map/npc/006-1/miriam.txt @@ -18,7 +18,7 @@ // after you gained the speed skill, all variables are reset to zero. //############################################# -006-1.gat,115,111,0|script|Miriam|175 +006-1,115,111,0|script|Miriam|175 { setarray @npc_loc, 115, 111, 2; callfunc "PCtoNPCRange"; @@ -240,7 +240,7 @@ L_LetsDoThis: close2; message strcharinfo(0), "Miriam quickly grabs your arm and pull you to the place where she is sitting."; // Warp the player to the place where the NPC is defined, so he can't cheat. - warp "032-1.gat",55,21; + warp "032-1",55,21; npctalk "Run " +strcharinfo(0)+ ", run!"; set QUEST_MIRIAM, 5; set QUEST_MIRIAM_start, gettimetick(2); @@ -319,7 +319,7 @@ L_goodjob: next; mes "You feel dizzy and as soon as you move your head and look to the ground, Miriam pushes you hard, sending you meters away from her."; close2; - warp "032-1.gat",55,22; + warp "032-1",55,22; // free all used player variables. This can be done, since there is a conditional on the speedskill at the beginning. set QUEST_MIRIAM_start, 0; set QUEST_MIRIAM_run, 0; diff --git a/world/map/npc/006-1/pachua.txt b/world/map/npc/006-1/pachua.txt index a84922da..7b39dce7 100644 --- a/world/map/npc/006-1/pachua.txt +++ b/world/map/npc/006-1/pachua.txt @@ -1,4 +1,4 @@ -006-1.gat,24,113,0|script|Pachua|143 +006-1,24,113,0|script|Pachua|143 { setarray @npc_loc, 24, 113, 4; callfunc "PCtoNPCRange"; diff --git a/world/map/npc/006-1/spirit.txt b/world/map/npc/006-1/spirit.txt index 5f7d06fb..ef88d7d7 100644 --- a/world/map/npc/006-1/spirit.txt +++ b/world/map/npc/006-1/spirit.txt @@ -286,13 +286,13 @@ S_update_var: return; } -006-1.gat,63,79,0|script|#EarthImp0#_M|400 +006-1,63,79,0|script|#EarthImp0#_M|400 { callfunc "EarthImpTouch"; end; } -006-1.gat,64,79,0|script|#EarthImp1#_M|400 +006-1,64,79,0|script|#EarthImp1#_M|400 { callfunc "EarthImpTouch"; end; diff --git a/world/map/npc/006-1/traveler.txt b/world/map/npc/006-1/traveler.txt index 82b8c8a5..f87cf083 100644 --- a/world/map/npc/006-1/traveler.txt +++ b/world/map/npc/006-1/traveler.txt @@ -2,7 +2,7 @@ // Author: Wombat, wushin // cost depending on level and adapted to new scripting guidelines: Jenalya -006-1.gat,25,95,0|script|Rhutan the Traveler|103 +006-1,25,95,0|script|Rhutan the Traveler|103 { set @NpcName$, "Rhutan"; set @NpcTravelBit, $@pachua_bit; diff --git a/world/map/npc/006-1/tree.txt b/world/map/npc/006-1/tree.txt index dbef23f2..ecbc3584 100644 --- a/world/map/npc/006-1/tree.txt +++ b/world/map/npc/006-1/tree.txt @@ -155,13 +155,13 @@ L_Close: } -006-1.gat,82,59,0|script|#DruidTree0#_M|400 +006-1,82,59,0|script|#DruidTree0#_M|400 { callfunc "QuestTreeTouch"; end; } -006-1.gat,83,59,0|script|#DruidTree1#_M|400 +006-1,83,59,0|script|#DruidTree1#_M|400 { callfunc "QuestTreeTouch"; end; diff --git a/world/map/npc/006-2/mapflags.txt b/world/map/npc/006-2/mapflags.txt index b904e327..a1ac020d 100644 --- a/world/map/npc/006-2/mapflags.txt +++ b/world/map/npc/006-2/mapflags.txt @@ -1 +1 @@ -006-2.gat|mapflag|resave|006-1,36,18 +006-2|mapflag|resave|006-1,36,18 diff --git a/world/map/npc/006-2/npcs.txt b/world/map/npc/006-2/npcs.txt index 6a32164e..d8ead479 100644 --- a/world/map/npc/006-2/npcs.txt +++ b/world/map/npc/006-2/npcs.txt @@ -1,6 +1,6 @@ // Pachua's Tribe -006-2.gat,49,25,0|script|Falkurn|178 +006-2,49,25,0|script|Falkurn|178 { set @run, ((QUEST_NorthTulimshar & TWOBIT_8_MASK) >> TWOBIT_8_SHIFT); set @state, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT); @@ -45,7 +45,7 @@ L_Close: close; } -006-2.gat,80,25,0|script|Darug|178 +006-2,80,25,0|script|Darug|178 { mes "[Darug]"; mes "\"We are the all thats left of the natives that used to wander the plains.\""; @@ -65,7 +65,7 @@ L_Close: close; } -006-2.gat,34,64,0|script|Meluna|179 +006-2,34,64,0|script|Meluna|179 { mes "[Meluna]"; mes "\"Greetings traveler, how blows the wind?\""; diff --git a/world/map/npc/006-2/shops.txt b/world/map/npc/006-2/shops.txt index 8f7331f8..0ad8a506 100644 --- a/world/map/npc/006-2/shops.txt +++ b/world/map/npc/006-2/shops.txt @@ -1,5 +1,5 @@ // Exotic Trader // Toy Sabre - 10mil, Cap - 20mil, High Priest Crown - 30mil, Monster Skull Helmet - 30mil -006-2.gat,81,36,0|shop|Reathe|179,ToySabre:*5,Cap:*5,HighPriestCrown:*5,MonsterSkullHelmet:*5 +006-2,81,36,0|shop|Reathe|179,ToySabre:*5,Cap:*5,HighPriestCrown:*5,MonsterSkullHelmet:*5 -006-2.gat,30,35,0|shop|Ardra|179,CactusDrink:*1,CactusPotion:*1,BottleOfWater:*1,RoastedMaggot:*1 +006-2,30,35,0|shop|Ardra|179,CactusDrink:*1,CactusPotion:*1,BottleOfWater:*1,RoastedMaggot:*1 diff --git a/world/map/npc/006-3/mapflags.txt b/world/map/npc/006-3/mapflags.txt index efadf501..9fb55277 100644 --- a/world/map/npc/006-3/mapflags.txt +++ b/world/map/npc/006-3/mapflags.txt @@ -1 +1 @@ -006-3.gat|mapflag|resave|006-1,36,18 +006-3|mapflag|resave|006-1,36,18 diff --git a/world/map/npc/007-1/mapflags.txt b/world/map/npc/007-1/mapflags.txt index d1d702ec..a32e6b44 100644 --- a/world/map/npc/007-1/mapflags.txt +++ b/world/map/npc/007-1/mapflags.txt @@ -1 +1 @@ -007-1.gat|mapflag|resave|009-2,149,43 +007-1|mapflag|resave|009-2,149,43 diff --git a/world/map/npc/007-1/voltain.txt b/world/map/npc/007-1/voltain.txt index ed1c3ee8..9c51fe3f 100644 --- a/world/map/npc/007-1/voltain.txt +++ b/world/map/npc/007-1/voltain.txt @@ -25,7 +25,7 @@ // # 12: bring gamboge herbs // # 13: bring chocolate cake -007-1.gat,37,21,0|script|Voltain|103 +007-1,37,21,0|script|Voltain|103 { set @BOTTLE_NEEDED, 3; set @BOTTLE_REWARD_XP, 100; diff --git a/world/map/npc/007-1/witch.txt b/world/map/npc/007-1/witch.txt index 97649deb..0c921e8e 100644 --- a/world/map/npc/007-1/witch.txt +++ b/world/map/npc/007-1/witch.txt @@ -14,7 +14,7 @@ // 254: Quest is being ended and cleaned: the hero logged off. // 255: Quest is being ended and cleaned: the hero died or he ran out of time -007-1.gat,77,81,0|script|Valia|370 +007-1,77,81,0|script|Valia|370 { set @illia_sapphire_powder, 3; set @illia_amethyst_powder, 1; @@ -402,22 +402,22 @@ L_AskToTeleport: // $@ILLIA_HERO$ $@ILLIA_HELPER1$ $@ILLIA_HELPER2$ $@ILLIA_HELPER3$ if (!(attachrid(getcharid(3,$@ILLIA_HELPER1$)))) goto L_NotEveryoneHere; - if (!(isin("007-1.gat", 66, 73, 92, 88))) + if (!(isin("007-1", 66, 73, 92, 88))) goto L_NotEveryoneHere; detachrid; if (!(attachrid(getcharid(3,$@ILLIA_HELPER2$)))) goto L_NotEveryoneHere; - if (!(isin("007-1.gat", 66, 73, 92, 88))) + if (!(isin("007-1", 66, 73, 92, 88))) goto L_NotEveryoneHere; detachrid; if (!(attachrid(getcharid(3,$@ILLIA_HELPER3$)))) goto L_NotEveryoneHere; - if (!(isin("007-1.gat", 66, 73, 92, 88))) + if (!(isin("007-1", 66, 73, 92, 88))) goto L_NotEveryoneHere; detachrid; if (!(attachrid(getcharid(3,$@ILLIA_HERO$)))) goto L_NotEveryoneHere; - if (!(isin("007-1.gat", 66, 73, 92, 88))) + if (!(isin("007-1", 66, 73, 92, 88))) goto L_NotEveryoneHere; mes "[Valia]"; mes "\"Everyone seems to be here. Make sure to stay close to me.\""; @@ -494,7 +494,7 @@ L_Warp: end; OnRealWarp: - warp "051-1.gat", 23 + rand(2), 24 + rand(3); + warp "051-1", 23 + rand(2), 24 + rand(3); if (strcharinfo(0) == $@ILLIA_HERO$) goto L_InitVars; end; @@ -639,10 +639,10 @@ OnTimer34000: end; // Trigger 4 areatimers to show the teleport spell // This is better looking than a basic areawarp - areatimer "007-1.gat", 66, 73, 92, 88, 3000, "Valia::OnWarpHero"; - areatimer "007-1.gat", 66, 73, 92, 88, 3500, "Valia::OnWarpHelper1"; - areatimer "007-1.gat", 66, 73, 92, 88, 4000, "Valia::OnWarpHelper2"; - areatimer "007-1.gat", 66, 73, 92, 88, 4500, "Valia::OnWarpHelper3"; + areatimer "007-1", 66, 73, 92, 88, 3000, "Valia::OnWarpHero"; + areatimer "007-1", 66, 73, 92, 88, 3500, "Valia::OnWarpHelper1"; + areatimer "007-1", 66, 73, 92, 88, 4000, "Valia::OnWarpHelper2"; + areatimer "007-1", 66, 73, 92, 88, 4500, "Valia::OnWarpHelper3"; npctalk "Spiralis Major!"; misceffect FX_BLUE_MAGIC_CAST; end; @@ -686,7 +686,7 @@ L_KillHero: } -007-1.gat,128,100,0|script|#IlliaDaemon|127 +007-1,128,100,0|script|#IlliaDaemon|127 { end; @@ -727,10 +727,10 @@ OnTimer4000: if (isloggedin($@ILLIA_HERO_ID) == 0) end; if ($@ILLIA_STATUS == 255 && attachrid($@ILLIA_HERO_ID) && ( - isin("051-1.gat",1,1,190,80) || - isin("051-3.gat",1,1,115,130) || - isin("052-1.gat",1,1,100,80) || - isin("052-2.gat",1,1,150,100) + isin("051-1",1,1,190,80) || + isin("051-3",1,1,115,130) || + isin("052-1",1,1,100,80) || + isin("052-2",1,1,150,100) ) ) goto L_WarpHero; detachrid; @@ -767,10 +767,10 @@ L_CheckHelperNeedNotification: if ( $@illia_helper$ != "" && attachrid(getcharid(3, $@illia_helper$)) && ( - isin("051-1.gat",1,1,190,80) || - isin("051-3.gat",1,1,115,130) || - isin("052-1.gat",1,1,100,80) || - isin("052-2.gat",1,1,150,100) + isin("051-1",1,1,190,80) || + isin("051-3",1,1,115,130) || + isin("052-1",1,1,100,80) || + isin("052-2",1,1,150,100) ) ) goto L_NotifyHelperFail; detachrid; @@ -825,10 +825,10 @@ L_CleanHelpersWarps: L_WarpHelper: // Proceed only if the helper is still on one of the quest's maps if ( - isin("051-1.gat",1,1,190,80 ) || - isin("051-3.gat",1,1,115,130) || - isin("052-1.gat",1,1,100,80 ) || - isin("052-2.gat",1,1,150,100) + isin("051-1",1,1,190,80 ) || + isin("051-3",1,1,115,130) || + isin("052-1",1,1,100,80 ) || + isin("052-2",1,1,150,100) ) goto L_DoWarpHelper; detachrid; goto L_NextHelperToWarp; @@ -837,7 +837,7 @@ L_DoWarpHelper: // At this point, the player has been attached if ($@illia_progress >= 5) message strcharinfo(0), "You feel dizzy, and that your memory is being rewritten... Who is Luvia? Something isn't right."; - warp "007-1.gat",85 + rand(0,2),75 + rand(0,2); + warp "007-1",85 + rand(0,2),75 + rand(0,2); detachrid; goto L_NextHelperToWarp; @@ -846,10 +846,10 @@ L_Check: if (isloggedin($@ILLIA_HERO_ID) == 0) goto L_HeroLogOff; if (attachrid($@ILLIA_HERO_ID) && - (isin("051-1.gat",1,1,190,80 ) == 0) && - (isin("051-3.gat",1,1,115,130) == 0) && - (isin("052-1.gat",1,1,100,80 ) == 0) && - (isin("052-2.gat",1,1,150,100) == 0) + (isin("051-1",1,1,190,80 ) == 0) && + (isin("051-3",1,1,115,130) == 0) && + (isin("052-1",1,1,100,80 ) == 0) && + (isin("052-2",1,1,150,100) == 0) ) goto L_HeroEscape; if (isdead()) goto L_HeroDead; @@ -892,7 +892,7 @@ L_WarpHero: // At this point, the player has been attached if ($@illia_progress >= 5) message strcharinfo(0), "You feel dizzy, and that your memory is being rewritten... Who is Luvia? Something isn't right."; - warp "007-1.gat",85 + rand(0,2),75 + rand(0,2); + warp "007-1",85 + rand(0,2),75 + rand(0,2); detachrid; end; @@ -981,42 +981,42 @@ L_Torch1: return; } -007-1.gat,72,88,0|script|#IlliaTorch1|374 +007-1,72,88,0|script|#IlliaTorch1|374 { end; } -007-1.gat,71,85,0|script|#IlliaTorch2|374 +007-1,71,85,0|script|#IlliaTorch2|374 { end; } -007-1.gat,75,70,0|script|#IlliaTorch3|374 +007-1,75,70,0|script|#IlliaTorch3|374 { end; } -007-1.gat,85,71,0|script|#IlliaTorch4|374 +007-1,85,71,0|script|#IlliaTorch4|374 { end; } -007-1.gat,88,69,0|script|#IlliaTorch5|374 +007-1,88,69,0|script|#IlliaTorch5|374 { end; } -007-1.gat,86,68,0|script|#IlliaTorch6|374 +007-1,86,68,0|script|#IlliaTorch6|374 { end; } -007-1.gat,87,68,0|script|#IlliaTorch7|374 +007-1,87,68,0|script|#IlliaTorch7|374 { end; } -007-1.gat,88,67,0|script|#IlliaTorch8|374 +007-1,88,67,0|script|#IlliaTorch8|374 { end; } diff --git a/world/map/npc/008-1/andra.txt b/world/map/npc/008-1/andra.txt index 989005f0..3bd79058 100644 --- a/world/map/npc/008-1/andra.txt +++ b/world/map/npc/008-1/andra.txt @@ -1,6 +1,6 @@ // Andra asks for your help to keep the soil fertile. The best way to do it is planting, so she asks for water and seeds. When she plants the seeds, some plants are spawned. -008-1.gat,36,26,0|script|Andra|201 +008-1,36,26,0|script|Andra|201 { set @water_amount, 1; set @seeds_amount, 4; @@ -68,7 +68,7 @@ L_PreSummon: OnTimer1000: set $@plant_id, rand(1029,1032); - areamonster "008-1.gat",44,18,135,46,"plant",$@plant_id,$@PLANTS_PER_SEED, "Andra::OnPlantDeath"; + areamonster "008-1",44,18,135,46,"plant",$@plant_id,$@PLANTS_PER_SEED, "Andra::OnPlantDeath"; if (attachrid(getcharid(3,$@farmer$)) == 0) goto L_Spawn1000; message strcharinfo(0), "Andra: I think some plants will grow almost instantly! Just Watch..."; @@ -80,19 +80,19 @@ L_Spawn1000: OnTimer3000: set $@plant_id, rand(1029,1032); - areamonster "008-1.gat",44,18,135,46,"plant",$@plant_id,$@PLANTS_PER_SEED, "Andra::OnPlantDeath"; + areamonster "008-1",44,18,135,46,"plant",$@plant_id,$@PLANTS_PER_SEED, "Andra::OnPlantDeath"; set $@spawned_plants, $@spawned_plants + $@PLANTS_PER_SEED; end; OnTimer5000: set $@plant_id, rand(1029,1032); - areamonster "008-1.gat",44,18,135,46,"plant",$@plant_id,$@PLANTS_PER_SEED, "Andra::OnPlantDeath"; + areamonster "008-1",44,18,135,46,"plant",$@plant_id,$@PLANTS_PER_SEED, "Andra::OnPlantDeath"; set $@spawned_plants, $@spawned_plants + $@PLANTS_PER_SEED; end; OnTimer7000: set $@plant_id, rand(1029,1032); - areamonster "008-1.gat",44,18,135,46,"plant",$@plant_id,$@PLANTS_PER_SEED, "Andra::OnPlantDeath"; + areamonster "008-1",44,18,135,46,"plant",$@plant_id,$@PLANTS_PER_SEED, "Andra::OnPlantDeath"; if (attachrid(getcharid(3,$@farmer$)) == 0) goto L_Spawn7000; message strcharinfo(0), "Andra: Good... Just take a walk and you will be able to see how your seeds turned into some nice looking plants."; diff --git a/world/map/npc/008-1/annualeaster.txt b/world/map/npc/008-1/annualeaster.txt index a8bbc20b..51c901a3 100644 --- a/world/map/npc/008-1/annualeaster.txt +++ b/world/map/npc/008-1/annualeaster.txt @@ -113,21 +113,21 @@ L_End1: return; } -008-1.gat,65,40,0|script|#TestEgg0|375 +008-1,65,40,0|script|#TestEgg0|375 { set @EasterEggID, 0; callfunc("AnnualEasterEvent"); end; } -008-1.gat,65,40,0|script|#TestEgg1|375 +008-1,65,40,0|script|#TestEgg1|375 { set @EasterEggID, 1; callfunc("AnnualEasterEvent"); end; } -008-1.gat,65,40,0|script|#TestEgg2|375 +008-1,65,40,0|script|#TestEgg2|375 { set @EasterEggID, 2; callfunc("AnnualEasterEvent"); @@ -135,7 +135,7 @@ L_End1: } -008-1.gat,59,38,0|script|#AnnualEaster|-1 +008-1,59,38,0|script|#AnnualEaster|-1 { end; @@ -170,7 +170,7 @@ OnTimer1000: // an egg can be 'found' multiple times, make this number of possible findings // depend on the number of players currently on the map. - set $@AEASTER_mapcount, 1 + getmapusers("008-1.gat") / 3; + set $@AEASTER_mapcount, 1 + getmapusers("008-1") / 3; set $@isEaster, 0; if ((gettime(6) == 3 && gettime(5) >= 22) || (gettime(6) == 4 && gettime(5) <= 25)) diff --git a/world/map/npc/008-1/banu.txt b/world/map/npc/008-1/banu.txt index 957d74d4..4c3a2e7f 100644 --- a/world/map/npc/008-1/banu.txt +++ b/world/map/npc/008-1/banu.txt @@ -3,7 +3,7 @@ // Using bit 10 and 11 of QUEST_NorthTulimshar (second half of nibble 2) // author: Jenalya -008-1.gat,70,42,0|script|Banu|154 +008-1,70,42,0|script|Banu|154 { set @state, ((QUEST_NorthTulimshar & TWOBIT_5_MASK) >> TWOBIT_5_SHIFT); set @EXP, 100; diff --git a/world/map/npc/008-1/diryn.txt b/world/map/npc/008-1/diryn.txt index d0630074..dae18c13 100644 --- a/world/map/npc/008-1/diryn.txt +++ b/world/map/npc/008-1/diryn.txt @@ -2,7 +2,7 @@ // Author: Wombat, wushin // cost depending on level and adapted to new scripting guidelines: Jenalya -008-1.gat,81,82,0|script|Diryn the Traveler|103 +008-1,81,82,0|script|Diryn the Traveler|103 { set @NpcName$, "Diryn"; set @NpcTravelBit, $@hurnscald_bit; diff --git a/world/map/npc/008-1/dock.txt b/world/map/npc/008-1/dock.txt index c4c701d3..4be8ad11 100644 --- a/world/map/npc/008-1/dock.txt +++ b/world/map/npc/008-1/dock.txt @@ -1,18 +1,18 @@ // The ferry dock -008-1.gat,134,69,0|script|Ferry Schedule#5|397 +008-1,134,69,0|script|Ferry Schedule#5|397 { callfunc "FerryManifest"; end; } -008-1.gat,147,64,0|script|Hurnscald North Koga|395,8,3 +008-1,147,64,0|script|Hurnscald North Koga|395,8,3 { callfunc "BoardFerry"; close; } -008-1.gat,120,44,0|script|#Hurnscald NorthDock|127 +008-1,120,44,0|script|#Hurnscald NorthDock|127 { end; OnCommandArrive: @@ -24,13 +24,13 @@ OnCommandWarp: end; } -008-1.gat,147,75,0|script|Hurnscald South Koga|395,8,3 +008-1,147,75,0|script|Hurnscald South Koga|395,8,3 { callfunc "BoardCandorFerry"; close; } -008-1.gat,65,25,0|script|#Hurnscald SouthDock|127 +008-1,65,25,0|script|#Hurnscald SouthDock|127 { end; OnCommandArrive: diff --git a/world/map/npc/008-1/george.txt b/world/map/npc/008-1/george.txt index 24679b34..8cd95734 100644 --- a/world/map/npc/008-1/george.txt +++ b/world/map/npc/008-1/george.txt @@ -1,6 +1,6 @@ // -008-1.gat,135,62,0|script|George#pirate|138 +008-1,135,62,0|script|George#pirate|138 { set @halloween_npc_id, $@halloween_npc_george; callfunc "TrickOrTreat"; diff --git a/world/map/npc/008-1/hinnak.txt b/world/map/npc/008-1/hinnak.txt index 36a8d3f5..0213c3cc 100644 --- a/world/map/npc/008-1/hinnak.txt +++ b/world/map/npc/008-1/hinnak.txt @@ -5,7 +5,7 @@ // // Variables used: Nibble 1 of QUEST_Hurnscald (previously QUEST_Scythe_state) -008-1.gat,101,30,0|script|Hinnak|142 +008-1,101,30,0|script|Hinnak|142 { callfunc "ClearVariables"; diff --git a/world/map/npc/008-1/mapflags.txt b/world/map/npc/008-1/mapflags.txt index 67199894..95ad83d5 100644 --- a/world/map/npc/008-1/mapflags.txt +++ b/world/map/npc/008-1/mapflags.txt @@ -1 +1 @@ -008-1.gat|mapflag|resave|009-2,149,43 +008-1|mapflag|resave|009-2,149,43 diff --git a/world/map/npc/008-1/mikhail.txt b/world/map/npc/008-1/mikhail.txt index 9de0480c..3c5f7679 100644 --- a/world/map/npc/008-1/mikhail.txt +++ b/world/map/npc/008-1/mikhail.txt @@ -1,6 +1,6 @@ // Variables used: nibble 0 of QUEST_SouthTulimshar -008-1.gat,135,25,0|script|Mikhail|120 +008-1,135,25,0|script|Mikhail|120 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/009-1/dock.txt b/world/map/npc/009-1/dock.txt index a3ed067d..fab8f3d0 100644 --- a/world/map/npc/009-1/dock.txt +++ b/world/map/npc/009-1/dock.txt @@ -1,6 +1,6 @@ // Ferry Sign -009-1.gat,46,34,0|script|FerrySchedule#4|397 +009-1,46,34,0|script|FerrySchedule#4|397 { callfunc "FerryManifest"; end; diff --git a/world/map/npc/009-1/guide.txt b/world/map/npc/009-1/guide.txt index 0be17d68..75dd0bb4 100644 --- a/world/map/npc/009-1/guide.txt +++ b/world/map/npc/009-1/guide.txt @@ -1,6 +1,6 @@ // -009-1.gat,92,29,0|script|Ian|102 +009-1,92,29,0|script|Ian|102 { // This line is only relevant for players, who started before the timestamp was introduced. // Set the graduation cap flag at the right position. diff --git a/world/map/npc/009-1/jack.txt b/world/map/npc/009-1/jack.txt index c2206faa..206f0c3e 100644 --- a/world/map/npc/009-1/jack.txt +++ b/world/map/npc/009-1/jack.txt @@ -14,7 +14,7 @@ //################################################################################# // Lumberjack -009-1.gat,40,45,0|script|Jack|141 +009-1,40,45,0|script|Jack|141 { callfunc "ClearVariables"; diff --git a/world/map/npc/009-1/mapflags.txt b/world/map/npc/009-1/mapflags.txt index f22e4be4..25408361 100644 --- a/world/map/npc/009-1/mapflags.txt +++ b/world/map/npc/009-1/mapflags.txt @@ -1,2 +1,2 @@ -009-1.gat|mapflag|town -009-1.gat|mapflag|resave|009-2,149,43 +009-1|mapflag|town +009-1|mapflag|resave|009-2,149,43 diff --git a/world/map/npc/009-1/milly.txt b/world/map/npc/009-1/milly.txt index 0e488c13..3e389d27 100644 --- a/world/map/npc/009-1/milly.txt +++ b/world/map/npc/009-1/milly.txt @@ -6,7 +6,7 @@ // // Inspector quest -009-1.gat,81,41,0|script|Milly|114 +009-1,81,41,0|script|Milly|114 { callfunc "ClearVariables"; @@ -385,7 +385,7 @@ L_Return: return; } -009-1.gat,82,41,0|script|MillyDebugHelper|114 +009-1,82,41,0|script|MillyDebugHelper|114 { mes "You can set certain quests as finished or not finished. What would you like to do?"; menu diff --git a/world/map/npc/009-1/old_man.txt b/world/map/npc/009-1/old_man.txt index 7328cd1f..5ce64ec1 100644 --- a/world/map/npc/009-1/old_man.txt +++ b/world/map/npc/009-1/old_man.txt @@ -1,6 +1,6 @@ // Old man -009-1.gat,85,51,0|script|Old Man|159 +009-1,85,51,0|script|Old Man|159 { callfunc "ClearVariables"; diff --git a/world/map/npc/009-1/old_woman.txt b/world/map/npc/009-1/old_woman.txt index 7442e174..83e59eaa 100644 --- a/world/map/npc/009-1/old_woman.txt +++ b/world/map/npc/009-1/old_woman.txt @@ -1,6 +1,6 @@ // Old woman -009-1.gat,29,43,0|script|Old Woman|154 +009-1,29,43,0|script|Old Woman|154 { callfunc "ClearVariables"; diff --git a/world/map/npc/009-1/sabine.txt b/world/map/npc/009-1/sabine.txt index 8c74819a..348e28c4 100644 --- a/world/map/npc/009-1/sabine.txt +++ b/world/map/npc/009-1/sabine.txt @@ -1,6 +1,6 @@ // Girl sitting on bench -009-1.gat,88,27,0|script|Sabine|106 +009-1,88,27,0|script|Sabine|106 { callfunc "ClearVariables"; diff --git a/world/map/npc/009-1/soul-menhir.txt b/world/map/npc/009-1/soul-menhir.txt index 9ffd8614..855eddf1 100644 --- a/world/map/npc/009-1/soul-menhir.txt +++ b/world/map/npc/009-1/soul-menhir.txt @@ -1,9 +1,9 @@ // -009-1.gat,53,40,0|script|Soul Menhir#hurnscald|344 +009-1,53,40,0|script|Soul Menhir#hurnscald|344 { callfunc "ClearVariables"; - set @map$, "009-1.gat"; + set @map$, "009-1"; setarray @Xs, 52, 53, 54, 52, 54, 52, 54; setarray @Ys, 39, 39, 39, 40, 40, 41, 41; set @x, 0; diff --git a/world/map/npc/009-1/water_pump.txt b/world/map/npc/009-1/water_pump.txt index b7de62a5..89a0ff24 100644 --- a/world/map/npc/009-1/water_pump.txt +++ b/world/map/npc/009-1/water_pump.txt @@ -1,6 +1,6 @@ // Water pump. You can fill empty bottles here -009-1.gat,76,33,0|script|Water Pump|400 +009-1,76,33,0|script|Water Pump|400 { callfunc "WaterBottle"; end; diff --git a/world/map/npc/009-2/airlia.txt b/world/map/npc/009-2/airlia.txt index df430683..c7e52273 100644 --- a/world/map/npc/009-2/airlia.txt +++ b/world/map/npc/009-2/airlia.txt @@ -6,7 +6,7 @@ // * Airlia quest = 2 unlocks other options, perhaps with future Warrior Guild prospects (this is long term) -009-2.gat,123,71,0|script|Airlia|108 +009-2,123,71,0|script|Airlia|108 { // Subquest 1a: Caretaker's daughter (initial, once) set @LETTER_REWARD_GOLD_INITIAL, 1000; diff --git a/world/map/npc/009-2/alan.txt b/world/map/npc/009-2/alan.txt index b02b1904..12f5cde8 100644 --- a/world/map/npc/009-2/alan.txt +++ b/world/map/npc/009-2/alan.txt @@ -8,7 +8,7 @@ //################################################################################# // Archer Shop Master -009-2.gat,99,23,0|script|Alan|125 +009-2,99,23,0|script|Alan|125 { callfunc "ClearVariables"; diff --git a/world/map/npc/009-2/bernard.txt b/world/map/npc/009-2/bernard.txt index 307e7591..f0c03fbc 100644 --- a/world/map/npc/009-2/bernard.txt +++ b/world/map/npc/009-2/bernard.txt @@ -1,6 +1,6 @@ // Variables used: nibble 0 of QUEST_SouthTulimshar -009-2.gat,67,79,0|script|Bernard|117 +009-2,67,79,0|script|Bernard|117 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/009-2/doctor.txt b/world/map/npc/009-2/doctor.txt index 8810e4e3..9137d8d4 100644 --- a/world/map/npc/009-2/doctor.txt +++ b/world/map/npc/009-2/doctor.txt @@ -1,6 +1,6 @@ // Doctor -009-2.gat,148,25,0|script|Doctor|107 +009-2,148,25,0|script|Doctor|107 { callfunc "ClearVariables"; diff --git a/world/map/npc/009-2/drunks.txt b/world/map/npc/009-2/drunks.txt index c5585d59..608f7db6 100644 --- a/world/map/npc/009-2/drunks.txt +++ b/world/map/npc/009-2/drunks.txt @@ -1,6 +1,6 @@ //Left drinking contest guy -009-2.gat,65,55,0|script|Drinker#1|121 +009-2,65,55,0|script|Drinker#1|121 { mes "[Binge Drinker]"; mes "\"Ha! I'll drink muuuch mo.. more than you! Im not ooone biiit dr...dr..unk!\""; @@ -9,7 +9,7 @@ //Right drinking contest guy -009-2.gat,68,55,0|script|Drinker#2|121 +009-2,68,55,0|script|Drinker#2|121 { mes "[Binge Drinker]"; mes "\"I can still drink more! Better give up you... you... teelotaler! MORE BEER MELINDA!\""; diff --git a/world/map/npc/009-2/entertainer.txt b/world/map/npc/009-2/entertainer.txt index 1b2b9622..57119894 100644 --- a/world/map/npc/009-2/entertainer.txt +++ b/world/map/npc/009-2/entertainer.txt @@ -1,6 +1,6 @@ // Emote NPC allows for players to learn the emote skill -009-2.gat,61,49,0|script|Entertainer|165 +009-2,61,49,0|script|Entertainer|165 { mes "[Entertainer]"; mes "\"Yes how can I help you?\""; diff --git a/world/map/npc/009-2/inspector.txt b/world/map/npc/009-2/inspector.txt index 476b4596..1effd16b 100644 --- a/world/map/npc/009-2/inspector.txt +++ b/world/map/npc/009-2/inspector.txt @@ -1,6 +1,6 @@ // -009-2.gat,24,99,0|script|Inspector#Hurnscald|150 +009-2,24,99,0|script|Inspector#Hurnscald|150 { callfunc "ClearVariables"; diff --git a/world/map/npc/009-2/kfahr.txt b/world/map/npc/009-2/kfahr.txt index ef5cb001..49e0c449 100644 --- a/world/map/npc/009-2/kfahr.txt +++ b/world/map/npc/009-2/kfahr.txt @@ -13,7 +13,7 @@ //# //################################################################################# -009-2.gat,67,57,0|script|Kfahr|125 +009-2,67,57,0|script|Kfahr|125 { set @halloween_npc_id, $@halloween_npc_kfahr; callfunc "TrickOrTreat"; diff --git a/world/map/npc/009-2/lena.txt b/world/map/npc/009-2/lena.txt index e29863c5..3917cec0 100644 --- a/world/map/npc/009-2/lena.txt +++ b/world/map/npc/009-2/lena.txt @@ -1,7 +1,7 @@ // Quest for Fairy Hat and Forest Armor // Variables used: nibble 0 of QUEST_Hurnscald -009-2.gat,146,43,0|script|Lena|182 +009-2,146,43,0|script|Lena|182 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; @@ -34,8 +34,8 @@ L_Lena_Approves: callsub S_Update_Var; mes "[Lena]"; mes "\"You look like you can handle yourself in a fight. If you can take on this scourge I'll reward you with a hat like mine. In order to prove your mettle, bring me 10 Bandit Hoods so I know they've met their match.\""; - areamonster "008-1.gat",25,60,40,65,"Bandit",1064,3, "::"; - areamonster "011-1.gat",35,40,65,60,"Bandit",1064,3, "::"; + areamonster "008-1",25,60,40,65,"Bandit",1064,3, "::"; + areamonster "011-1",35,40,65,60,"Bandit",1064,3, "::"; goto L_Close; L_Lena_No_Fan: @@ -76,8 +76,8 @@ L_Lena_Bandit_Leader: L_Lena_Bandit_Leader_Yes: set @state, 3; callsub S_Update_Var; - areamonster "008-1.gat",25,60,40,65,"Bandit",1064,3, "::"; - areamonster "011-1.gat",35,40,65,60,"Bandit",1064,3, "::"; + areamonster "008-1",25,60,40,65,"Bandit",1064,3, "::"; + areamonster "011-1",35,40,65,60,"Bandit",1064,3, "::"; mes "[Lena]"; mes "\"You have a brave heart. Though I know you can succeed on your own, I recommend finding others to help you defeat the bandit leader. I believe he could pose a significant threat to solitary individuals seeking to challenge him. Good luck!\""; goto L_Close; diff --git a/world/map/npc/009-2/mapflags.txt b/world/map/npc/009-2/mapflags.txt index 66f03254..e18532fc 100644 --- a/world/map/npc/009-2/mapflags.txt +++ b/world/map/npc/009-2/mapflags.txt @@ -1,2 +1,2 @@ -009-2.gat|mapflag|town -009-2.gat|mapflag|resave|009-2,149,43 +009-2|mapflag|town +009-2|mapflag|resave|009-2,149,43 diff --git a/world/map/npc/009-2/misc.txt b/world/map/npc/009-2/misc.txt index ff350b88..b28d43b5 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#bar|400 +009-2,54,49,0|script|Note#bar|400 { mes "[Note]"; mes "\"We refuse service to anyone who:\""; @@ -12,7 +12,7 @@ } //Bookshelf -009-2.gat,109,44,0|script|#Book|400 +009-2,109,44,0|script|#Book|400 { if (getskilllv(SKILL_MAGIC)) goto L_magic; diff --git a/world/map/npc/009-2/nicholas.txt b/world/map/npc/009-2/nicholas.txt index 568f9a71..a91fb153 100644 --- a/world/map/npc/009-2/nicholas.txt +++ b/world/map/npc/009-2/nicholas.txt @@ -11,7 +11,7 @@ //# //################################################################################# -009-2.gat,185,55,0|script|Nicholas|135 +009-2,185,55,0|script|Nicholas|135 { set @SETZER_XP, 100000; set @SHIELD_XP, 20000; diff --git a/world/map/npc/009-2/nurse.txt b/world/map/npc/009-2/nurse.txt index 3c6be98a..fa1ee5d2 100644 --- a/world/map/npc/009-2/nurse.txt +++ b/world/map/npc/009-2/nurse.txt @@ -22,7 +22,7 @@ //###################################################################################### -009-2.gat,147,65,0|script|Nurse|119 +009-2,147,65,0|script|Nurse|119 { callfunc "ClearVariables"; set @halloween_npc_id, $@halloween_npc_nurse; diff --git a/world/map/npc/009-2/olana.txt b/world/map/npc/009-2/olana.txt index 7c654759..9fcfe351 100644 --- a/world/map/npc/009-2/olana.txt +++ b/world/map/npc/009-2/olana.txt @@ -1,6 +1,6 @@ // Authors: alastrim, Ali-g, Dark Mage -009-2.gat,63,79,0|script|Olana|190 +009-2,63,79,0|script|Olana|190 { set @MinLevel, 60; diff --git a/world/map/npc/009-2/peter.txt b/world/map/npc/009-2/peter.txt index e5375149..818f09cf 100644 --- a/world/map/npc/009-2/peter.txt +++ b/world/map/npc/009-2/peter.txt @@ -1,7 +1,7 @@ // Nicholas' Apprentice and Armorsmith -009-2.gat,183,57,0|shop|#PeterShop|127,Knife:*1,SharpKnife:*1,Dagger:*1 +009-2,183,57,0|shop|#PeterShop|127,Knife:*1,SharpKnife:*1,Dagger:*1 -009-2.gat,183,57,0|script|Peter|157 +009-2,183,57,0|script|Peter|157 { set @peter_chain_mail_coal, 10; set @peter_chain_mail_ingot, 5; diff --git a/world/map/npc/009-2/richard.txt b/world/map/npc/009-2/richard.txt index f7c48633..b39a7969 100644 --- a/world/map/npc/009-2/richard.txt +++ b/world/map/npc/009-2/richard.txt @@ -1,6 +1,6 @@ // -009-2.gat,20,99,0|script|Richard|161 +009-2,20,99,0|script|Richard|161 { callfunc "ClearVariables"; set @npcname$, "Richard"; diff --git a/world/map/npc/009-2/selim.txt b/world/map/npc/009-2/selim.txt index c34f3968..f9dc3b40 100644 --- a/world/map/npc/009-2/selim.txt +++ b/world/map/npc/009-2/selim.txt @@ -5,7 +5,7 @@ //# # //################################################################################# -009-2.gat,32,104,0|script|Selim|326 +009-2,32,104,0|script|Selim|326 { setarray @all_colours$, "red", "green", "dark blue", "yellow", "light blue", "pink", "black", "orange", "purple", "dark green"; diff --git a/world/map/npc/009-2/shops.txt b/world/map/npc/009-2/shops.txt index 52508ce2..3dcfbc9a 100644 --- a/world/map/npc/009-2/shops.txt +++ b/world/map/npc/009-2/shops.txt @@ -1,9 +1,9 @@ // Bartender -009-2.gat,65,49,0|shop|Barkeeper|112,Beer:*1,Cake:*1,Steak:*1 +009-2,65,49,0|shop|Barkeeper|112,Beer:*1,Cake:*1,Steak:*1 // Receptionist // Offers the player to rest at the inn for 100gp -009-2.gat,50,48,0|script|Receptionist#inn|108 +009-2,50,48,0|script|Receptionist#inn|108 { set @npcname$, "Receptionist"; set @cost, 100; @@ -12,10 +12,10 @@ } // Archer Shop -009-2.gat,97,24,0|shop|Apprentice|120,SlingBullet:*1,Arrow:*2,IronArrow:*1,Bow:*1,ShortBow:*2 +009-2,97,24,0|shop|Apprentice|120,SlingBullet:*1,Arrow:*2,IronArrow:*1,Bow:*1,ShortBow:*2 // Potion Shop -009-2.gat,123,22,0|shop|Potions#_M|400,CactusDrink:*1,CactusPotion:*1,IronPotion:*1,ConcentrationPotion:*1,SlowPoisonPotion:*1 +009-2,123,22,0|shop|Potions#_M|400,CactusDrink:*1,CactusPotion:*1,IronPotion:*1,ConcentrationPotion:*1,SlowPoisonPotion:*1 // General Store -009-2.gat,32,99,0|shop|General Store#hurnscald|112,Milk:*1,BottleOfWater:*1,CottonShirt:*1,CottonShorts:*1,Boots:*1,SerfHat:*1,CottonHeadband:*1,CottonGloves:*1 +009-2,32,99,0|shop|General Store#hurnscald|112,Milk:*1,BottleOfWater:*1,CottonShirt:*1,CottonShorts:*1,Boots:*1,SerfHat:*1,CottonHeadband:*1,CottonGloves:*1 diff --git a/world/map/npc/009-2/trader.txt b/world/map/npc/009-2/trader.txt index c386b05a..aaba3afb 100644 --- a/world/map/npc/009-2/trader.txt +++ b/world/map/npc/009-2/trader.txt @@ -3,7 +3,7 @@ // Updated by: TheKandiman // Reviewed by: Wombat -009-2.gat,29,98,0|script|Trader|115 +009-2,29,98,0|script|Trader|115 { set @Ironprice, 1000; set @Sulphurprice, 1200; diff --git a/world/map/npc/009-2/waitress.txt b/world/map/npc/009-2/waitress.txt index 57eca972..1bacd738 100644 --- a/world/map/npc/009-2/waitress.txt +++ b/world/map/npc/009-2/waitress.txt @@ -1,6 +1,6 @@ // Waitress -009-2.gat,60,52,0|script|Melinda|140 +009-2,60,52,0|script|Melinda|140 { mes "[Melinda]"; mes "\"Hi, sweetie! Want a fresh beer for 170 GP?\""; diff --git a/world/map/npc/009-2/wyara.txt b/world/map/npc/009-2/wyara.txt index f8df574a..c6875740 100644 --- a/world/map/npc/009-2/wyara.txt +++ b/world/map/npc/009-2/wyara.txt @@ -1,7 +1,7 @@ // ---------------------------------------- // Wyara the Hurnscald witch // ---------------------------------------- -009-2.gat,121,26,0|script|Wyara#_M|103 +009-2,121,26,0|script|Wyara#_M|103 { set @Q_MASK, NIBBLE_2_MASK; set @Q_SHIFT, NIBBLE_2_SHIFT; diff --git a/world/map/npc/009-2/yalina.txt b/world/map/npc/009-2/yalina.txt index 92055b48..db701188 100644 --- a/world/map/npc/009-2/yalina.txt +++ b/world/map/npc/009-2/yalina.txt @@ -1,4 +1,4 @@ -009-2.gat,148,47,0|script|Yalina|209 +009-2,148,47,0|script|Yalina|209 { set @npcname$, "Yalina"; diff --git a/world/map/npc/009-3/mapflags.txt b/world/map/npc/009-3/mapflags.txt index c012a6fa..b56842f1 100644 --- a/world/map/npc/009-3/mapflags.txt +++ b/world/map/npc/009-3/mapflags.txt @@ -1 +1 @@ -009-3.gat|mapflag|resave|009-2,149,43 +009-3|mapflag|resave|009-2,149,43 diff --git a/world/map/npc/009-3/sword.txt b/world/map/npc/009-3/sword.txt index 12c85bbd..91366f9e 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|400 +009-3,26,100,0|script|#MysticSword#_M|400 { if (getskilllv(SKILL_MAGIC)) goto L_message; diff --git a/world/map/npc/009-3/warp.txt b/world/map/npc/009-3/warp.txt index 739751bf..ab781e38 100644 --- a/world/map/npc/009-3/warp.txt +++ b/world/map/npc/009-3/warp.txt @@ -1,4 +1,4 @@ -009-3.gat,162,80,0|script|#PVPCaveBarrier|45,0,0 +009-3,162,80,0|script|#PVPCaveBarrier|45,0,0 { mes "Do you want to enter the PVP cave? It costs 150GP."; menu @@ -17,7 +17,7 @@ L_Exit: L_Pay: set Zeny, Zeny - 150; - warp "009-6.gat", 36, 47; + warp "009-6", 36, 47; close; L_NotEnoughMoney: diff --git a/world/map/npc/009-4/barriers.txt b/world/map/npc/009-4/barriers.txt index 49fd3877..adaa384e 100644 --- a/world/map/npc/009-4/barriers.txt +++ b/world/map/npc/009-4/barriers.txt @@ -44,7 +44,7 @@ L_Error2: // Starting Barrier / Quest Entrance -009-4.gat,37,119,0|script|#OrumCaveStartMessage|127,0,0 +009-4,37,119,0|script|#OrumCaveStartMessage|127,0,0 { if (OrumQuest >= 3) end; if (OrumQuest == 2) goto L_Started; @@ -58,15 +58,15 @@ L_Started: close; } -009-4.gat,37,120,0|script|#OrumCaveStartBarrier|127,0,0 +009-4,37,120,0|script|#OrumCaveStartBarrier|127,0,0 { if (OrumQuest >= 3) end; - warp "009-4.gat", 37, 118; + warp "009-4", 37, 118; end; } // First Barrier -009-4.gat,57,29,0|script|#OrumCaveFirstBarrier|127,0,0 +009-4,57,29,0|script|#OrumCaveFirstBarrier|127,0,0 { if (OrumQuest >= 5) close; @@ -76,7 +76,7 @@ L_Started: } // Second Barrier -009-4.gat,61,55,0|script|#OrumCaveSecondMessage|127,0,0 +009-4,61,55,0|script|#OrumCaveSecondMessage|127,0,0 { if (OrumQuest == 3) set OrumQuest, 4; @@ -103,15 +103,15 @@ L_Advance_Quest: end; } -009-4.gat,61,54,0|script|#OrumCaveSecondBarrier|127,0,0 +009-4,61,54,0|script|#OrumCaveSecondBarrier|127,0,0 { if (OrumQuest >= 9) end; - warp "009-4.gat", 60, 56; + warp "009-4", 60, 56; end; } // Third Barrier -009-4.gat,24,65,0|script|#OrumCaveThirdMessage|127,0,0 +009-4,24,65,0|script|#OrumCaveThirdMessage|127,0,0 { if (OrumQuest == 3) set OrumQuest, 4; if (OrumQuest > 8 && @Torch1Color == @firstColor && @Torch2Color == @secondColor) @@ -152,15 +152,15 @@ L_Advance_Quest: end; } -009-4.gat,24,66,0|script|#OrumCaveThirdBarrier|127,0,0 +009-4,24,66,0|script|#OrumCaveThirdBarrier|127,0,0 { if (OrumQuest >= 10) end; - warp "009-4.gat", 23, 64; + warp "009-4", 23, 64; end; } // Ending Barrier -009-4.gat,48,37,0|script|#OrumCaveEndMessage|127,0,0 +009-4,48,37,0|script|#OrumCaveEndMessage|127,0,0 { if (OrumQuest >= 11) end; if (OrumQuest == 3) set OrumQuest, 4; @@ -272,9 +272,9 @@ L_Advance_Quest: close; } -009-4.gat,48,38,0|script|#OrumCaveEndBarrier|127,0,0 +009-4,48,38,0|script|#OrumCaveEndBarrier|127,0,0 { if (OrumQuest >= 11) end; - warp "009-4.gat", 47, 36; + warp "009-4", 47, 36; end; } diff --git a/world/map/npc/009-4/mapflags.txt b/world/map/npc/009-4/mapflags.txt index 05aa9324..f9b9cfa9 100644 --- a/world/map/npc/009-4/mapflags.txt +++ b/world/map/npc/009-4/mapflags.txt @@ -1 +1 @@ -009-4.gat|mapflag|resave|009-4,37,118 +009-4|mapflag|resave|009-4,37,118 diff --git a/world/map/npc/009-4/orum.txt b/world/map/npc/009-4/orum.txt index db99d50c..84afced4 100644 --- a/world/map/npc/009-4/orum.txt +++ b/world/map/npc/009-4/orum.txt @@ -18,7 +18,7 @@ //# OrumQuestBarrier nibble (0,1,2) stores the color of the barriers # //################################################################################# -009-4.gat,35,115,0|script|OrumDebug|158 +009-4,35,115,0|script|OrumDebug|158 { mes "[Orum Debug]"; menu @@ -49,7 +49,7 @@ OnInit: disablenpc "OrumDebug"; end; } -009-4.gat,37,115,0|script|Orum#barrier|158 +009-4,37,115,0|script|Orum#barrier|158 { // needed to pass the very first barrier set @B0_WISPPOWDER, 4; diff --git a/world/map/npc/009-4/orum_warps.txt b/world/map/npc/009-4/orum_warps.txt index 86afb56f..6353a14a 100644 --- a/world/map/npc/009-4/orum_warps.txt +++ b/world/map/npc/009-4/orum_warps.txt @@ -1,33 +1,33 @@ -009-3.gat,162,113,0|script|#OrumQuestEnter|45,0,0 +009-3,162,113,0|script|#OrumQuestEnter|45,0,0 { if (OrumQuest >= 12) goto L_Second_Entrance; - warp "009-4.gat", 37, 113; + warp "009-4", 37, 113; close; L_Second_Entrance: - warp "009-4.gat", 72, 126; + warp "009-4", 72, 126; close; } -009-4.gat,36,26,0|script|#LairExit|45,0,0 +009-4,36,26,0|script|#LairExit|45,0,0 { if (OrumQuest >= 12) goto L_Second_Entrance; - warp "009-4.gat", 37, 122; + warp "009-4", 37, 122; close; L_Second_Entrance: - warp "009-4.gat", 72, 135; + warp "009-4", 72, 135; close; } -009-4.gat,51,47,0|script|#CavernEnter|45,0,0 +009-4,51,47,0|script|#CavernEnter|45,0,0 { if (OrumQuest >= 14) goto L_Second_Cavern; if (OrumQuest < 12) goto L_See_Orum; - warp "009-4.gat", 103, 23; + warp "009-4", 103, 23; close; L_Second_Cavern: - warp "009-4.gat", 103, 77; + warp "009-4", 103, 77; close; L_See_Orum: diff --git a/world/map/npc/009-4/torches.txt b/world/map/npc/009-4/torches.txt index fbb88a84..7049b446 100644 --- a/world/map/npc/009-4/torches.txt +++ b/world/map/npc/009-4/torches.txt @@ -89,7 +89,7 @@ L_Return: // To make sure in range of torches function|script|InRangeTorch1 { - if (isin("009-4.gat",67,20,69,25)) + if (isin("009-4",67,20,69,25)) goto L_Return; mes "You're too far away to do anything with that torch."; close; @@ -99,7 +99,7 @@ L_Return: } function|script|InRangeTorch2 { - if (isin("009-4.gat",65,41,69,46)) + if (isin("009-4",65,41,69,46)) goto L_Return; mes "You're too far away to do anything with that torch."; close; @@ -109,7 +109,7 @@ L_Return: } function|script|InRangeTorch3 { - if (isin("009-4.gat",33,84,37,88)) + if (isin("009-4",33,84,37,88)) goto L_Return; mes "You're too far away to do anything with that torch."; close; @@ -281,7 +281,7 @@ L_Failed: } // First Torch -009-4.gat,68,21,0|script|Torch#1|400 +009-4,68,21,0|script|Torch#1|400 { callfunc "InRangeTorch1"; callfunc "DoneWithTorches"; @@ -293,7 +293,7 @@ L_Failed: } // Second Torch -009-4.gat,67,42,0|script|Torch#2|400 +009-4,67,42,0|script|Torch#2|400 { callfunc "InRangeTorch2"; callfunc "DoneWithTorches"; @@ -305,7 +305,7 @@ L_Failed: } // Third Torch -009-4.gat,33,86,0|script|Torch#3|400 +009-4,33,86,0|script|Torch#3|400 { callfunc "InRangeTorch3"; callfunc "DoneWithTorches"; diff --git a/world/map/npc/009-4/waric.txt b/world/map/npc/009-4/waric.txt index b83a14cc..29eff17b 100644 --- a/world/map/npc/009-4/waric.txt +++ b/world/map/npc/009-4/waric.txt @@ -1,6 +1,6 @@ //# see detailed description at orum.txt -009-4.gat,99,33,0|script|#WizardTrap|127,2,1 +009-4,99,33,0|script|#WizardTrap|127,2,1 { set @gender$, "They're"; if (Sex == 0) @@ -10,7 +10,7 @@ mes "As you explore further into the cave you see a figure looking at you who appears angry. But as you begin to speak, he quickly chants some words and you start to lose conciousness!"; next; - warp "009-4.gat", 117, 40; + warp "009-4", 117, 40; mes "When you awake you find yourself unable to move. You seem to be held in place by something. As your eyes regain focus you see Orum talking with the figure you saw earlier. Orum looks over at you and mumbles."; mes ""; mes "[Orum]"; @@ -19,7 +19,7 @@ close; } -009-4.gat,120,43,0|script|Orum#trap|158 +009-4,120,43,0|script|Orum#trap|158 { mes "[Orum]"; mes "\"I told you to forget about this place but you did not heed my advice!\""; @@ -28,7 +28,7 @@ close; } -009-4.gat,118,42,0|script|Waric#trap|153 +009-4,118,42,0|script|Waric#trap|153 { set @EXP_LEARNED_ALOT, 10000; if (OrumQuest >= 13) @@ -92,10 +92,10 @@ L_Explain: next; set OrumQuest, 14; misceffect 10; - warp "008-1.gat", 65, 90; + warp "008-1", 65, 90; getexp @EXP_LEARNED_ALOT, 0; mes "You awake on your back with a squirrel sitting on top of you arranging it's acorns. It quickly gathers them up and runs off as it sees you looking at it them."; - monster "008-1.gat", 65, 90, "Squirrel", 1038, 1; + monster "008-1", 65, 90, "Squirrel", 1038, 1; goto L_Close; L_Close: diff --git a/world/map/npc/009-5/mapflags.txt b/world/map/npc/009-5/mapflags.txt index 5a3b920a..c654d851 100644 --- a/world/map/npc/009-5/mapflags.txt +++ b/world/map/npc/009-5/mapflags.txt @@ -1 +1 @@ -009-5.gat|mapflag|nosave|009-3,162,82 +009-5|mapflag|nosave|009-3,162,82 diff --git a/world/map/npc/009-6/brodomir.txt b/world/map/npc/009-6/brodomir.txt index f1ca3789..9b2c55d5 100644 --- a/world/map/npc/009-6/brodomir.txt +++ b/world/map/npc/009-6/brodomir.txt @@ -18,7 +18,7 @@ // $@BRODOMIR_MONEY: Amount of money given by the sponsor -009-6.gat,36,40,0|script|Brodomir|116 +009-6,36,40,0|script|Brodomir|116 { set @brodomir_money, 0; set @brodomir_item_amount, 0; @@ -164,17 +164,17 @@ OnTimer5000: end; L_Warp: - if (getareausers("009-6.gat", 20, 20, 80, 80, 1) < 3) + if (getareausers("009-6", 20, 20, 80, 80, 1) < 3) goto L_Warpfail; set $@BRODOMIR_PVP_STATUS, $@BRODOMIR_PVP_STATUS + 1; - set $@BRODOMIR_PLAYERS, getareausers("009-6.gat", 20, 20, 80, 80, 1); - mapwarp "009-6.gat", "009-5.gat", 0, 0; - mapannounce "009-5.gat", "PvP On!", 0; - pvpon "009-5.gat"; + set $@BRODOMIR_PLAYERS, getareausers("009-6", 20, 20, 80, 80, 1); + mapwarp "009-6", "009-5", 0, 0; + mapannounce "009-5", "PvP On!", 0; + pvpon "009-5"; end; L_Warpfail: - mapannounce "009-6.gat", "There are not enough players around to start!", 0; + mapannounce "009-6", "There are not enough players around to start!", 0; if ($@BRODOMIR_ITEM_AMOUNT == 0 || $@BRODOMIR_ITEM$ == "") goto L_Cleanup; if (attachrid($@BRODOMIR_SPONSOR) == 0) @@ -196,9 +196,9 @@ L_SkipItemback: goto L_Cleanup; L_Check: - if (getareausers("009-5.gat", 20, 20, 80, 80, 1) > 1) + if (getareausers("009-5", 20, 20, 80, 80, 1) > 1) end; - areatimer "009-5.gat", 20, 20, 80, 80, 0, "Brodomir::OnReward"; + areatimer "009-5", 20, 20, 80, 80, 0, "Brodomir::OnReward"; goto L_End; OnReward: @@ -227,16 +227,16 @@ L_SkipItem: L_Dead_Duels: set DUELS, DUELS &~ $@DuelPvpBit; - warp "009-7.gat", 39, 37; + warp "009-7", 39, 37; end; L_Dead: if(DUELS & $@DuelPvpBit) goto L_Dead_Duels; - warp "009-3.gat", 155,83; + warp "009-3", 155,83; end; L_End: - mapwarp "009-5.gat", "009-6.gat", 36, 42; + mapwarp "009-5", "009-6", 36, 42; goto L_Cleanup; L_Alreadystarted: @@ -255,7 +255,7 @@ L_TooCheap: goto L_Close; L_Cleanup: - pvpoff "009-5.gat"; + pvpoff "009-5"; set $@BRODOMIR_PVP_STATUS , 0; set $@BRODOMIR_START_TIME, 0; stopnpctimer; diff --git a/world/map/npc/009-6/mapflags.txt b/world/map/npc/009-6/mapflags.txt index 5d9fed65..22c55741 100644 --- a/world/map/npc/009-6/mapflags.txt +++ b/world/map/npc/009-6/mapflags.txt @@ -1 +1 @@ -009-6.gat|mapflag|nosave|009-3,162,82 +009-6|mapflag|nosave|009-3,162,82 diff --git a/world/map/npc/009-7/battlemaster.txt b/world/map/npc/009-7/battlemaster.txt index a946c5f9..bbac54e9 100644 --- a/world/map/npc/009-7/battlemaster.txt +++ b/world/map/npc/009-7/battlemaster.txt @@ -1,4 +1,4 @@ -009-7.gat,40,35,0|script|Battle Master#Duels|322 +009-7,40,35,0|script|Battle Master#Duels|322 { if($SANGUINE & $@SV_BMDBit != 0) goto L_Disabled; mes "[Battle Master]"; @@ -26,8 +26,8 @@ L_Brodomir: mes "\"Get ready!\""; close2; set DUELS, DUELS | $@DuelPvpBit; // tell the arena to send the player back here when he exits - warp "009-6.gat", 33, 37; - savepoint "009-7.gat", 39, 37; + warp "009-6", 33, 37; + savepoint "009-7", 39, 37; end; L_PVP: @@ -37,8 +37,8 @@ L_PVP: mes "\"Get ready!\""; close2; set DUELS, DUELS | $@DuelPvpBit; // tell the arena to send the player back here when he dies - warp "001-3.gat", 0, 0; - savepoint "009-7.gat", 39, 37; + warp "001-3", 0, 0; + savepoint "009-7", 39, 37; end; L_NoMoney: @@ -57,34 +57,34 @@ function|script|fightclub_GoBack L_GoBack: set DUELS, DUELS &~ $@DuelPvpBit; - warp "009-7.gat", 39, 37; + warp "009-7", 39, 37; gmcommand "@alive"; message strcharinfo(0), "Thank you for participating!"; return; } -009-6.gat,36,48,0|script|#GoBack2Duels|127,0,1 +009-6,36,48,0|script|#GoBack2Duels|127,0,1 { callfunc "fightclub_GoBack"; end; } -009-5.gat,53,74,0|script|#GoBack3Duels|127,3,1 +009-5,53,74,0|script|#GoBack3Duels|127,3,1 { callfunc "fightclub_GoBack"; end; } -009-3.gat,158,83,0|script|#GoBack5Duels|127,7,0 +009-3,158,83,0|script|#GoBack5Duels|127,7,0 { callfunc "fightclub_GoBack"; end; } -001-2.gat,130,22,0|script|#GoBack4Duels|127,1,1 +001-2,130,22,0|script|#GoBack4Duels|127,1,1 { callfunc "fightclub_GoBack"; end; } -001-3.gat,73,28,0|script|#GoBack1Duels|127,0,1 +001-3,73,28,0|script|#GoBack1Duels|127,0,1 { callfunc "fightclub_GoBack"; end; diff --git a/world/map/npc/009-7/core.txt b/world/map/npc/009-7/core.txt index cd30e359..03eb2095 100644 --- a/world/map/npc/009-7/core.txt +++ b/world/map/npc/009-7/core.txt @@ -238,7 +238,7 @@ function|script|fightclub_DestroyMe sc_end 132; sc_end 14; sc_end 37; sc_end 185; sc_end 194; sc_end 195; sc_end 196; sc_end 197; sc_end 198; sc_end 199; // remove effects percentheal -100, 0; // doing @killer is unreliable gmcommand "@alive"; // refill hp/mana - if(getmap() == "009-7") warp "009-7.gat", rand($@fightclub_x1, $@fightclub_x2), rand(($@fightclub_y1 - 2), ($@fightclub_y1 - 3)); + if(getmap() == "009-7") warp "009-7", rand($@fightclub_x1, $@fightclub_x2), rand(($@fightclub_y1 - 2), ($@fightclub_y1 - 3)); return; } @@ -316,7 +316,7 @@ function|script|fightclub_StartUp // ** called before and after each duel to wipe the vars function|script|fightclub_CleanStage { - if($@Duel_NoWarp != 1) areawarp "009-7.gat", $@fightclub_x1, $@fightclub_y1, $@fightclub_x2, $@fightclub_y2, "009-7.gat", 31, 40; // kick all players from stage + if($@Duel_NoWarp != 1) areawarp "009-7", $@fightclub_x1, $@fightclub_y1, $@fightclub_x2, $@fightclub_y2, "009-7", 31, 40; // kick all players from stage set $@Duel_NoWarp, 0; set $@Duel_NoMagic, 0; // clean the Duel parameters set $@Duel_CurrentDuel, 0; // no duel atm @@ -327,7 +327,7 @@ function|script|fightclub_CleanStage set $@Duel_TotalTime, 0; npcwarp 32, 45, "Rouge#Duels"; donpcevent "#FightClubTimeLimit::OnStopTimer"; - killmonster "009-7.gat", "All"; + killmonster "009-7", "All"; return; } @@ -434,7 +434,7 @@ L_Reset: // the player has duel_fighter but no duel is ongoing (happens if the p function|script|fightclub_enter { set @Duel_Fighter, 1; - warp "009-7.gat", rand($@fightclub_x1,$@fightclub_x2), rand($@fightclub_y1,$@fightclub_y2); + warp "009-7", rand($@fightclub_x1,$@fightclub_x2), rand($@fightclub_y1,$@fightclub_y2); gmcommand "@alive"; // ensure that you can't duel wih a corpse sc_end 132; sc_end 14; sc_end 37; sc_end 185; sc_end 194; sc_end 195; sc_end 196; sc_end 197; sc_end 198; sc_end 199; // remove effects message strcharinfo(0), "Get Ready."; diff --git a/world/map/npc/009-7/debug.txt b/world/map/npc/009-7/debug.txt index 27f16009..f5283898 100644 --- a/world/map/npc/009-7/debug.txt +++ b/world/map/npc/009-7/debug.txt @@ -141,7 +141,7 @@ L_End: return; } -009-7.gat,41,45,0|script|Debug#Duels|181 +009-7,41,45,0|script|Debug#Duels|181 { mes "The debug menu can also be accessed by wearing a dev cap while talking to Rouge."; mes "For the documentation, @@https://wiki.themanaworld.org/index.php/User:Meko/FightClub/debug|click here@@##0"; diff --git a/world/map/npc/009-7/eventHandler.txt b/world/map/npc/009-7/eventHandler.txt index a310ff4c..7104d0a7 100644 --- a/world/map/npc/009-7/eventHandler.txt +++ b/world/map/npc/009-7/eventHandler.txt @@ -1,21 +1,21 @@ // this file handles every events related to the fight club and calls the appropriate functions from core -009-7.gat,45,33,0|script|#trapdoor2FightClub|327,0,0 +009-7,45,33,0|script|#trapdoor2FightClub|327,0,0 { if(countitem(647)||countitem(725)||countitem(1178)||countitem(5131)||countitem(5132)||countitem(5133)||countitem(5134)||countitem(5135)||countitem(5136)||countitem(5137)||countitem(5138)||countitem(5139)||countitem(5140)||(getgmlevel()>=20)) goto L_Enter; end; L_Enter: - warp "009-7.gat",34,22; // this warp is a special thanks for contributors + warp "009-7",34,22; // this warp is a special thanks for contributors end; } -009-7.gat,33,21,0|script|#trapdoor3FightClub|327,0,0 +009-7,33,21,0|script|#trapdoor3FightClub|327,0,0 { - warp "009-7.gat",44,32; + warp "009-7",44,32; end; } -009-7.gat,22,38,0|script|#FightClubUtils|127 +009-7,22,38,0|script|#FightClubUtils|127 { end; @@ -40,11 +40,11 @@ OnBecomeKiller: end; OnCommandIntrusion: - areatimer "009-7.gat", $@fightclub_x1, $@fightclub_y1, $@fightclub_x2, $@fightclub_y2, 0, "#FightClubUtils::OnIntrusion"; // we can not do this directly on #handler because it already have a timer + areatimer "009-7", $@fightclub_x1, $@fightclub_y1, $@fightclub_x2, $@fightclub_y2, 0, "#FightClubUtils::OnIntrusion"; // we can not do this directly on #handler because it already have a timer end; } -009-7.gat,20,45,0|script|#FightClubTimeLimit|127,0,0 +009-7,20,45,0|script|#FightClubTimeLimit|127,0,0 { end; @@ -76,7 +76,7 @@ OnInit: end; } -009-7.gat,20,44,0|script|#FightClubHandler|127,0,0 +009-7,20,44,0|script|#FightClubHandler|127,0,0 { end; @@ -99,15 +99,15 @@ L_StartTimer: OnTimer2000: // this events checks who is on stage every 2 seconds - set $@areausers, getareausers("009-7.gat", $@fightclub_x1, $@fightclub_y1, $@fightclub_x2, $@fightclub_y2); // get the number of players on stage + set $@areausers, getareausers("009-7", $@fightclub_x1, $@fightclub_y1, $@fightclub_x2, $@fightclub_y2); // get the number of players on stage if (($@areausers > 2) || (($@Duel_CurrentDuel < 1) && ($@areausers >= 1))) goto L_Intrusion; // too many players on the stage if (($@Duel_CurrentDuel < 1) && ($@Duel_Started != 1)) goto L_Request; // start the next duel if ($@Duel_Started != 1) goto L_StartTimer; // no intrusion and no duel ongoing so loop again if (attachrid($@Duel_BluePlayer) == 0) goto L_BlueMissing; - if (isin("009-7.gat", $@fightclub_x1, $@fightclub_y1, $@fightclub_x2, $@fightclub_y2) == 0) goto L_BlueMissing; + if (isin("009-7", $@fightclub_x1, $@fightclub_y1, $@fightclub_x2, $@fightclub_y2) == 0) goto L_BlueMissing; if (isdead() == 1) goto L_IAmACorpse; if (attachrid($@Duel_RedPlayer) == 0) goto L_RedMissing; - if (isin("009-7.gat", $@fightclub_x1, $@fightclub_y1, $@fightclub_x2, $@fightclub_y2) == 0) goto L_RedMissing; + if (isin("009-7", $@fightclub_x1, $@fightclub_y1, $@fightclub_x2, $@fightclub_y2) == 0) goto L_RedMissing; if (isdead() == 1) goto L_IAmACorpse; detachrid; goto L_StartTimer; diff --git a/world/map/npc/009-7/mapflags.txt b/world/map/npc/009-7/mapflags.txt index 6a40d04d..9fdd3a99 100644 --- a/world/map/npc/009-7/mapflags.txt +++ b/world/map/npc/009-7/mapflags.txt @@ -1,2 +1,2 @@ -009-7.gat|mapflag|noteleport -009-7.gat|mapflag|monster_noteleport +009-7|mapflag|noteleport +009-7|mapflag|monster_noteleport diff --git a/world/map/npc/009-7/rouge.txt b/world/map/npc/009-7/rouge.txt index dd86679c..4ce3be8e 100644 --- a/world/map/npc/009-7/rouge.txt +++ b/world/map/npc/009-7/rouge.txt @@ -1,4 +1,4 @@ -009-7.gat,32,45,0|script|Rouge#Duels|181 +009-7,32,45,0|script|Rouge#Duels|181 { if (getgmlevel() >= 40 && (getequipid(equip_head) == 647 || getequipid(equip_head) == 725)) goto L_CallDebug; goto L_Main; diff --git a/world/map/npc/009-7/shops.txt b/world/map/npc/009-7/shops.txt index 13dd0a4c..aca61234 100644 --- a/world/map/npc/009-7/shops.txt +++ b/world/map/npc/009-7/shops.txt @@ -1,3 +1,3 @@ -009-7.gat,34,23,0|shop|Bartender#Duels|177,Beer:*1,IronPotion:*1,ConcentrationPotion:*1,SmallManaElixir:*9,BottleOfWater:*1,Milk:*1 +009-7,34,23,0|shop|Bartender#Duels|177,Beer:*1,IronPotion:*1,ConcentrationPotion:*1,SmallManaElixir:*9,BottleOfWater:*1,Milk:*1 -009-7.gat,27,26,0|shop|Garçon#Duels|180,RoastedMaggot:*1,PickledBeets:*30,ChickenLeg:*1,Steak:*1,Beer:*1 +009-7,27,26,0|shop|Garçon#Duels|180,RoastedMaggot:*1,PickledBeets:*30,ChickenLeg:*1,Steak:*1,Beer:*1 diff --git a/world/map/npc/009-7/trapdoor.txt b/world/map/npc/009-7/trapdoor.txt index aff98cbd..b2709eef 100644 --- a/world/map/npc/009-7/trapdoor.txt +++ b/world/map/npc/009-7/trapdoor.txt @@ -1,4 +1,4 @@ -009-2.gat,38,105,0|script|#trapdoor#FightClub|327,0,0 +009-2,38,105,0|script|#trapdoor#FightClub|327,0,0 { set @index, rand(0,(getarraysize($@fightclub_randompasswords$) - 1)); set @password$, $@fightclub_definitions$[@index]; @@ -48,7 +48,7 @@ L_Enter: if(@menu != (@good + 1)) goto L_Close; mes "Correct. You may enter."; close2; - warp "009-7.gat", 22, 21; + warp "009-7", 22, 21; end; L_Close: diff --git a/world/map/npc/010-1/mapflags.txt b/world/map/npc/010-1/mapflags.txt index f6936e04..cfbe9788 100644 --- a/world/map/npc/010-1/mapflags.txt +++ b/world/map/npc/010-1/mapflags.txt @@ -1 +1 @@ -010-1.gat|mapflag|resave|010-1,27,97 +010-1|mapflag|resave|010-1,27,97 diff --git a/world/map/npc/010-2/band.txt b/world/map/npc/010-2/band.txt index ab0074f3..86fec363 100644 --- a/world/map/npc/010-2/band.txt +++ b/world/map/npc/010-2/band.txt @@ -1,17 +1,17 @@ // dimonds band -010-2.gat,40,35,0|script|Phil|157 +010-2,40,35,0|script|Phil|157 { callfunc "DimondBand"; end; } -010-2.gat,40,37,0|script|Jerry|160 +010-2,40,37,0|script|Jerry|160 { callfunc "DimondBand"; end; } -010-2.gat,42,36,0|script|Robert|162 +010-2,42,36,0|script|Robert|162 { callfunc "DimondBand"; end; diff --git a/world/map/npc/010-2/chef.txt b/world/map/npc/010-2/chef.txt index 572e5185..0de4761c 100644 --- a/world/map/npc/010-2/chef.txt +++ b/world/map/npc/010-2/chef.txt @@ -1,4 +1,4 @@ -010-2.gat,33,25,0|script|Chef#dimond|148 +010-2,33,25,0|script|Chef#dimond|148 { mes "[Chef]"; mes ""; diff --git a/world/map/npc/010-2/dimonds.txt b/world/map/npc/010-2/dimonds.txt index c6766892..868ad796 100644 --- a/world/map/npc/010-2/dimonds.txt +++ b/world/map/npc/010-2/dimonds.txt @@ -1,6 +1,6 @@ // -010-2.gat,34,38,0|script|Dimond|165 +010-2,34,38,0|script|Dimond|165 { mes "[Dimond]"; mes "\"Welcome to Dimond's Cove!\""; @@ -12,7 +12,7 @@ close; } -010-2.gat,35,35,0|script|Shannon|193 +010-2,35,35,0|script|Shannon|193 { set @month, 1; set @start_day, 24; @@ -458,7 +458,7 @@ L_Close: close; } -010-2.gat,27,30,0|script|Bar Rules|400 +010-2,27,30,0|script|Bar Rules|400 { mes "Dimonds Cove Bar Rules"; next; @@ -478,28 +478,28 @@ L_Close: close; } -010-2.gat,71,38,0|script|Store Policy#1|400 +010-2,71,38,0|script|Store Policy#1|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#2|400 +010-2,77,38,0|script|Store Policy#2|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|400 +010-2,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|400 +010-2,80,32,0|script|Dimonds Cove 1|400 { mes "The Story of Dimonds Cove"; next; @@ -519,7 +519,7 @@ L_Close: close; } -010-2.gat,85,32,0|script|Dimonds Cove 2|400 +010-2,85,32,0|script|Dimonds Cove 2|400 { mes "List of Events at Dimonds Cove"; mes "January 2008 - Construction of Dimonds Cove."; @@ -527,7 +527,7 @@ L_Close: } -010-2.gat,71,30,0|script|Inn|400 +010-2,71,30,0|script|Inn|400 { mes "Welcome to the Dimonds Cove Inn"; mes "Rooms are 200 gp a night."; @@ -536,15 +536,15 @@ L_Close: } -010-2.gat,24,27,0|shop|Bartender|112,Beer:*1,IronPotion:*1,ConcentrationPotion:*1 +010-2,24,27,0|shop|Bartender|112,Beer:*1,IronPotion:*1,ConcentrationPotion:*1 -010-2.gat,32,34,0|shop|Waitress|139,CherryCake:*1,RoastedMaggot:*1,OrangeCupcake:*1,ChickenLeg:*1,Steak:*1 +010-2,32,34,0|shop|Waitress|139,CherryCake:*1,RoastedMaggot:*1,OrangeCupcake:*1,ChickenLeg:*1,Steak:*1 -010-2.gat,85,41,0|shop|Blacksmith|146,ForestBow:*1,IronArrow:*1,LeatherShield:*1 +010-2,85,41,0|shop|Blacksmith|146,ForestBow:*1,IronArrow:*1,LeatherShield:*1 -010-2.gat,65,41,0|shop|General Store#dimond|137,CottonShorts:*1,FancyHat:*1,SilkHeadband:*1,CottonSkirt:*1,Boots:*1,CottonBoots:*1 +010-2,65,41,0|shop|General Store#dimond|137,CottonShorts:*1,FancyHat:*1,SilkHeadband:*1,CottonSkirt:*1,Boots:*1,CottonBoots:*1 -010-2.gat,75,68,0|script|Basil|107 +010-2,75,68,0|script|Basil|107 { set @npcname$, "Basil the Inn Keeper"; set @cost, 200; diff --git a/world/map/npc/010-2/doug.txt b/world/map/npc/010-2/doug.txt index 1f984a3d..c209e58a 100644 --- a/world/map/npc/010-2/doug.txt +++ b/world/map/npc/010-2/doug.txt @@ -1,6 +1,6 @@ // -010-2.gat,68,87,0|script|Doug|113 +010-2,68,87,0|script|Doug|113 { mes "[Doug]"; mes "\"This room is too dark. I want to brighten it up.\""; diff --git a/world/map/npc/010-2/loratay.txt b/world/map/npc/010-2/loratay.txt index 324f953a..c2fa1062 100644 --- a/world/map/npc/010-2/loratay.txt +++ b/world/map/npc/010-2/loratay.txt @@ -1,4 +1,4 @@ -010-2.gat,83,85,0|script|Lora Tay Debug|151 +010-2,83,85,0|script|Lora Tay Debug|151 { mes "[Lora Tay Debug]"; mes "What do you want to do?"; @@ -34,7 +34,7 @@ OnInit: disablenpc "Lora Tay Debug"; end; } -010-2.gat,85,85,0|script|Lora Tay|151 +010-2,85,85,0|script|Lora Tay|151 { set @ROBE_COCOONS_NR, 150; // must be multiple of ten set @ROBE_ZENY, 10000; diff --git a/world/map/npc/010-2/mapflags.txt b/world/map/npc/010-2/mapflags.txt index 143c5f2a..c2a82329 100644 --- a/world/map/npc/010-2/mapflags.txt +++ b/world/map/npc/010-2/mapflags.txt @@ -1 +1 @@ -010-2.gat|mapflag|resave|010-1,27,97 +010-2|mapflag|resave|010-1,27,97 diff --git a/world/map/npc/010-2/workers.txt b/world/map/npc/010-2/workers.txt index e88ba650..438a12ca 100644 --- a/world/map/npc/010-2/workers.txt +++ b/world/map/npc/010-2/workers.txt @@ -1,13 +1,13 @@ // -010-2.gat,23,70,0|script|Josh|155 +010-2,23,70,0|script|Josh|155 { mes "[Josh]"; mes "\"We're working on getting the cellar pass open.\""; close; } -010-2.gat,39,75,0|script|Zack|155 +010-2,39,75,0|script|Zack|155 { set @halloween_npc_id, $@halloween_npc_zack; callfunc "TrickOrTreat"; diff --git a/world/map/npc/011-1/alchemist.txt b/world/map/npc/011-1/alchemist.txt index 6e78a408..e4eade06 100644 --- a/world/map/npc/011-1/alchemist.txt +++ b/world/map/npc/011-1/alchemist.txt @@ -1,5 +1,5 @@ // This NPC makes potions and dyes -011-1.gat,117,77,0|script|Rauk|103 +011-1,117,77,0|script|Rauk|103 { // Setzer quest/monster oil quest participation set @SETZER_INITIAL, 0; diff --git a/world/map/npc/011-1/auldsbel.txt b/world/map/npc/011-1/auldsbel.txt index 9790e8ef..a99eef70 100644 --- a/world/map/npc/011-1/auldsbel.txt +++ b/world/map/npc/011-1/auldsbel.txt @@ -1,7 +1,7 @@ // Auldsbel the Wizard // Transmutation Magic expert -011-1.gat,50,68,0|script|Auldsbel#_M|168 +011-1,50,68,0|script|Auldsbel#_M|168 { set @mexp, MAGIC_EXPERIENCE & 65535; diff --git a/world/map/npc/011-1/mapflags.txt b/world/map/npc/011-1/mapflags.txt index 75d34ade..0932c5c3 100644 --- a/world/map/npc/011-1/mapflags.txt +++ b/world/map/npc/011-1/mapflags.txt @@ -1 +1 @@ -011-1.gat|mapflag|resave|011-1,103,34 +011-1|mapflag|resave|011-1,103,34 diff --git a/world/map/npc/011-1/oscar.txt b/world/map/npc/011-1/oscar.txt index 0db51330..3cc5c1e3 100644 --- a/world/map/npc/011-1/oscar.txt +++ b/world/map/npc/011-1/oscar.txt @@ -37,7 +37,7 @@ function|script|HalloweenQuestWaterPumpkins end; } -011-1.gat,94,38,0|script|Oscar|142 +011-1,94,38,0|script|Oscar|142 { // Check we are at the good time of the year if (!(gettime(6) == 11 && (gettime(5) >= 4 && gettime(5) <= 30))) goto L_NoEvent; @@ -331,8 +331,8 @@ L_TimerFunction: end; callsub S_CheckPlayer; set $@HalloweenQuest_PumpkinsTimer, $@HalloweenQuest_PumpkinsTimer + 1; - if (mobcount("011-1.gat", "Oscar::OnPD") < 0 && - mobcount("011-1.gat", "Oscar::OnPDP") < 0 && + if (mobcount("011-1", "Oscar::OnPD") < 0 && + mobcount("011-1", "Oscar::OnPDP") < 0 && $@HalloweenQuest_PumpkinsCount <= 0) goto L_AllPumpkinsDead; // A quick "cheer up" @@ -348,14 +348,14 @@ L_TimerFunction: L_TrySpawnPumpkin: if ($@HalloweenQuest_PumpkinsCount > 0) - areamonster "011-1.gat", 97, 40, 101, 44, "", 1063, 1, "Oscar::OnPD"; + areamonster "011-1", 97, 40, 101, 44, "", 1063, 1, "Oscar::OnPD"; setnpctimer 0; end; OnTimer2500: if ($@HalloweenQuest_PumpkinsState != 0) end; - areamonster "011-1.gat", 97, 40, 101, 44, "", 1063, 2, "Oscar::OnPD"; + areamonster "011-1", 97, 40, 101, 44, "", 1063, 2, "Oscar::OnPD"; end; OnTimer6000: @@ -388,13 +388,13 @@ OnPD: getitem "PumpkinHelmet", 1; // huntsman spider x1 if (@halloween_rand < (15*BaseLevel)/100) - areamonster "011-1.gat", 97, 40, 101, 44, "", 1083, 1, "Oscar::OnPDP"; + areamonster "011-1", 97, 40, 101, 44, "", 1083, 1, "Oscar::OnPDP"; // Or spider x1 if (@halloween_rand >= (15*BaseLevel)/100 && @halloween_rand < (75*BaseLevel)/100) - areamonster "011-1.gat", 97, 40, 101, 44, "", 1012, 1, "Oscar::OnPDP"; + areamonster "011-1", 97, 40, 101, 44, "", 1012, 1, "Oscar::OnPDP"; // Or archant x2 if (@halloween_rand >= (75*BaseLevel)/100) - areamonster "011-1.gat", 97, 40, 101, 44, "", 1060, 2, "Oscar::OnPDP"; + areamonster "011-1", 97, 40, 101, 44, "", 1060, 2, "Oscar::OnPDP"; set @halloween_rand, 0; end; @@ -419,7 +419,7 @@ S_CheckPlayer: goto L_PlayerOff; if (isdead()) goto L_PlayerDead; - if (isin("011-1.gat",20,5,130,110) == 0) + if (isin("011-1",20,5,130,110) == 0) goto L_PlayerLeft; detachrid; return; @@ -454,8 +454,8 @@ L_Success: goto L_Clean; L_Clean: - killmonster "011-1.gat", "Oscar::OnPD"; - killmonster "011-1.gat", "Oscar::OnPDP"; + killmonster "011-1", "Oscar::OnPD"; + killmonster "011-1", "Oscar::OnPDP"; set $@HalloweenQuest_PumpkinHunter$, ""; set $@HalloweenQuest_PumpkinsCount, 0; set $@HalloweenQuest_PumpkinsState, 0; diff --git a/world/map/npc/011-1/shops.txt b/world/map/npc/011-1/shops.txt index 48126fe2..1ccedec6 100644 --- a/world/map/npc/011-1/shops.txt +++ b/world/map/npc/011-1/shops.txt @@ -5,4 +5,4 @@ //################################################################################# // Shop -011-1.gat,80,33,0|shop|Fruit Store|400,GreenApple:*1,RedApple:*1,Orange:*1 +011-1,80,33,0|shop|Fruit Store|400,GreenApple:*1,RedApple:*1,Orange:*1 diff --git a/world/map/npc/011-3/hermit.txt b/world/map/npc/011-3/hermit.txt index 2f758ee7..351b41a4 100644 --- a/world/map/npc/011-3/hermit.txt +++ b/world/map/npc/011-3/hermit.txt @@ -1,6 +1,6 @@ // -011-3.gat,30,23,0|script|Arkim|116 +011-3,30,23,0|script|Arkim|116 { mes "[Arkim the Hermit]"; mes "\"Do you want to go back outside?\""; @@ -17,7 +17,7 @@ L_Short_Menu: "What was that deal you were offering?", L_Quest; L_Sure: - warp "011-1.gat", 60, 95; + warp "011-1", 60, 95; close; L_Interested: diff --git a/world/map/npc/011-3/mapflags.txt b/world/map/npc/011-3/mapflags.txt index 8b9a503f..23143d92 100644 --- a/world/map/npc/011-3/mapflags.txt +++ b/world/map/npc/011-3/mapflags.txt @@ -1 +1 @@ -011-3.gat|mapflag|resave|011-1,103,34 +011-3|mapflag|resave|011-1,103,34 diff --git a/world/map/npc/011-4/bl_barrier.txt b/world/map/npc/011-4/bl_barrier.txt index 98f52d39..563c3319 100644 --- a/world/map/npc/011-4/bl_barrier.txt +++ b/world/map/npc/011-4/bl_barrier.txt @@ -1,6 +1,6 @@ //bandit lord barrier -011-4.gat,111,121,0|script|#BL_Barrier|45,0,0 +011-4,111,121,0|script|#BL_Barrier|45,0,0 { set @state, ((QUEST_Hurnscald & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT); @@ -12,12 +12,12 @@ L_Bandit_Cave_Abandoned: message strcharinfo(0), "This place looks like it was abandoned."; - warp "011-6.gat",251,275; + warp "011-6",251,275; goto L_End; L_Bandit_Lord_Barrier_Open: message strcharinfo(0), "You insert the silver arrow key and unlock the entrance."; - warp "011-6.gat",251,275; + warp "011-6",251,275; goto L_End; L_End: diff --git a/world/map/npc/011-4/mapflags.txt b/world/map/npc/011-4/mapflags.txt index 9e064cbd..499a6147 100644 --- a/world/map/npc/011-4/mapflags.txt +++ b/world/map/npc/011-4/mapflags.txt @@ -1 +1 @@ -011-4.gat|mapflag|resave|011-1,103,34 +011-4|mapflag|resave|011-1,103,34 diff --git a/world/map/npc/011-6/barrier.txt b/world/map/npc/011-6/barrier.txt index 7b4f2b25..15639a18 100644 --- a/world/map/npc/011-6/barrier.txt +++ b/world/map/npc/011-6/barrier.txt @@ -1,4 +1,4 @@ -011-6.gat,264,236,0|script|#BL_Barrier2|45,0,0 +011-6,264,236,0|script|#BL_Barrier2|45,0,0 { set @state, ((QUEST_Hurnscald & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT); @@ -7,7 +7,7 @@ goto L_End; L_Bandit_Lord_Hideout_Open: - warp "011-6.gat",174,255; + warp "011-6",174,255; goto L_End; L_End: diff --git a/world/map/npc/011-6/bryant.txt b/world/map/npc/011-6/bryant.txt index 2aaa15fe..fae31706 100644 --- a/world/map/npc/011-6/bryant.txt +++ b/world/map/npc/011-6/bryant.txt @@ -1,7 +1,7 @@ //NPC to set the state for killing the bandit lord. // Variables used: nibble 0 of QUEST_Hurnscald -011-6.gat,27,200,0|script|Bryant|126 +011-6,27,200,0|script|Bryant|126 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; @@ -25,7 +25,7 @@ L_Bryant_Summon: mes "\"I believe I saw him run into a cave south and east of here. There is a red carpet in front of the cave entrance. Be careful and good luck.\""; set @state, 4; callsub S_Update_Var; - monster "011-6.gat",260,250,"BanditLord",1065,1, "Bryant::OnBanditLordDead"; + monster "011-6",260,250,"BanditLord",1065,1, "Bryant::OnBanditLordDead"; goto L_Close; OnBanditLordDead: @@ -53,15 +53,15 @@ L_Bryant_Waits: L_Bryant_No: mes "[Bryant]"; mes "\"Well, maybe he ran off. I'm pretty sure he should be there now.\""; - killmonster "011-6.gat", "Bryant::OnBanditLordDead"; - monster "011-6.gat",260,250,"BanditLord",1065,1, "Bryant::OnBanditLordDead"; + killmonster "011-6", "Bryant::OnBanditLordDead"; + monster "011-6",260,250,"BanditLord",1065,1, "Bryant::OnBanditLordDead"; goto L_Close; L_Bryant_Yes: mes "[Bryant]"; mes "\"I don't think you killed him. Please try to find and kill him. He should be in the cave south and east of here with the red carpet in front of it.\""; - killmonster "011-6.gat", "Bryant::OnBanditLordDead"; - monster "011-6.gat",260,250,"BanditLord",1065,1, "Bryant::OnBanditLordDead"; + killmonster "011-6", "Bryant::OnBanditLordDead"; + monster "011-6",260,250,"BanditLord",1065,1, "Bryant::OnBanditLordDead"; goto L_Close; L_Bryant_Quiet: diff --git a/world/map/npc/011-6/crastur.txt b/world/map/npc/011-6/crastur.txt index aae2ff38..16dda84f 100644 --- a/world/map/npc/011-6/crastur.txt +++ b/world/map/npc/011-6/crastur.txt @@ -1,4 +1,4 @@ -011-6.gat,172,250,0|script|Crastur the Ugly|418 +011-6,172,250,0|script|Crastur the Ugly|418 { set @spants_state, ((QUEST_WG_state & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT); set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT); diff --git a/world/map/npc/011-6/mapflags.txt b/world/map/npc/011-6/mapflags.txt index 0ff444d7..47ba426a 100644 --- a/world/map/npc/011-6/mapflags.txt +++ b/world/map/npc/011-6/mapflags.txt @@ -1 +1 @@ -011-6.gat|mapflag|resave|011-1,103,34 +011-6|mapflag|resave|011-1,103,34 diff --git a/world/map/npc/012-1/amrak.txt b/world/map/npc/012-1/amrak.txt index 1305b9dd..59bafd4e 100644 --- a/world/map/npc/012-1/amrak.txt +++ b/world/map/npc/012-1/amrak.txt @@ -1,6 +1,6 @@ // -012-1.gat,137,104,0|script|Amrak|103 +012-1,137,104,0|script|Amrak|103 { mes "[Amrak]"; mes "\"I'm studying this waterfall. The water seems to flow from it like magic.\""; diff --git a/world/map/npc/012-1/flowerpentagram2.txt b/world/map/npc/012-1/flowerpentagram2.txt index 35a9a21e..3ce479e9 100644 --- a/world/map/npc/012-1/flowerpentagram2.txt +++ b/world/map/npc/012-1/flowerpentagram2.txt @@ -1,6 +1,6 @@ // Author: Jenalya -012-1.gat,143,70,0|script|#FlowerPentagram2|400 +012-1,143,70,0|script|#FlowerPentagram2|400 { if (OrumQuest >= 31) goto L_PlacedFifthFlower; @@ -17,7 +17,7 @@ L_SecondFlower: "Leave.", L_Close; L_Next: - if (isin("012-1.gat", 142, 69, 144, 71)) + if (isin("012-1", 142, 69, 144, 71)) goto L_Place; mes "This isn't working, you're too far away."; @@ -25,10 +25,10 @@ L_Next: L_Place: set @localMonsterCount, - mobcount("012-1.gat", "#FlowerPentagram2::OnSquirrelDeath") + - mobcount("012-1.gat", "#FlowerPentagram2::OnMushroomDeath") + - mobcount("012-1.gat", "#FlowerPentagram2::OnScorpionDeath") + - mobcount("012-1.gat", "#FlowerPentagram2::OnRScorpionDeath") + + mobcount("012-1", "#FlowerPentagram2::OnSquirrelDeath") + + mobcount("012-1", "#FlowerPentagram2::OnMushroomDeath") + + mobcount("012-1", "#FlowerPentagram2::OnScorpionDeath") + + mobcount("012-1", "#FlowerPentagram2::OnRScorpionDeath") + 4; // the mobcount function has an offset of -1, so we add 4 to have the actual amount of monsters if (@localMonsterCount > 2) goto L_MonstersAlive; @@ -40,10 +40,10 @@ L_Place: mes "Sensing a certain tension build up around you, you can't help but feel alarmed."; set OrumQuest, 21; close2; - areamonster "012-1.gat", 140, 64, 146, 73, "", 1105, 2, "#FlowerPentagram2::OnSquirrelDeath"; - areamonster "012-1.gat", 140, 64, 146, 73, "", 1106, 2, "#FlowerPentagram2::OnMushroomDeath"; - areamonster "012-1.gat", 140, 64, 146, 73, "", 1003, 2, "#FlowerPentagram2::OnScorpionDeath"; - areamonster "012-1.gat", 140, 64, 146, 73, "", 1004, 2, "#FlowerPentagram2::OnRScorpionDeath"; + areamonster "012-1", 140, 64, 146, 73, "", 1105, 2, "#FlowerPentagram2::OnSquirrelDeath"; + areamonster "012-1", 140, 64, 146, 73, "", 1106, 2, "#FlowerPentagram2::OnMushroomDeath"; + areamonster "012-1", 140, 64, 146, 73, "", 1003, 2, "#FlowerPentagram2::OnScorpionDeath"; + areamonster "012-1", 140, 64, 146, 73, "", 1004, 2, "#FlowerPentagram2::OnRScorpionDeath"; set @value, 15; callfunc "QuestSagathaAnnoy"; set @value, 0; diff --git a/world/map/npc/012-1/injured-mouboo.txt b/world/map/npc/012-1/injured-mouboo.txt index 03a5bb70..58a6af50 100644 --- a/world/map/npc/012-1/injured-mouboo.txt +++ b/world/map/npc/012-1/injured-mouboo.txt @@ -43,7 +43,7 @@ S_update_var: return; } -012-1.gat,57,153,0|script|Mouboo|171 +012-1,57,153,0|script|Mouboo|171 { set @Q_MASK, NIBBLE_2_MASK; set @Q_SHIFT, NIBBLE_2_SHIFT; diff --git a/world/map/npc/012-1/mapflags.txt b/world/map/npc/012-1/mapflags.txt index 19586c27..915346ad 100644 --- a/world/map/npc/012-1/mapflags.txt +++ b/world/map/npc/012-1/mapflags.txt @@ -1 +1 @@ -012-1.gat|mapflag|resave|012-1,88,141 +012-1|mapflag|resave|012-1,88,141 diff --git a/world/map/npc/012-1/shops.txt b/world/map/npc/012-1/shops.txt index fb29a68a..f93ec464 100644 --- a/world/map/npc/012-1/shops.txt +++ b/world/map/npc/012-1/shops.txt @@ -1,8 +1,8 @@ // -012-1.gat,36,99,0|shop|#FlowerShop|127,RedRose:*1,PinkRose:*1,YellowRose:*1,WhiteRose:*1,OrangeRose:*1,DarkRedRose:*1,RedTulip:*1,PinkTulip:*1,YellowTulip:*1,WhiteTulip:*1,OrangeTulip:*1 +012-1,36,99,0|shop|#FlowerShop|127,RedRose:*1,PinkRose:*1,YellowRose:*1,WhiteRose:*1,OrangeRose:*1,DarkRedRose:*1,RedTulip:*1,PinkTulip:*1,YellowTulip:*1,WhiteTulip:*1,OrangeTulip:*1 -012-1.gat,36,99,0|script|Blossom|163 +012-1,36,99,0|script|Blossom|163 { mes "[Blossom]"; mes "\"Hello, would you like to buy some flowers?\""; diff --git a/world/map/npc/012-3/mana-seed.txt b/world/map/npc/012-3/mana-seed.txt index 7f4dcb5c..8e5956f5 100644 --- a/world/map/npc/012-3/mana-seed.txt +++ b/world/map/npc/012-3/mana-seed.txt @@ -1,4 +1,4 @@ -012-3.gat,62,130,0|script|Forest Mana Seed#_M|166 +012-3,62,130,0|script|Forest Mana Seed#_M|166 { setarray @magic_exp_needed, 0, // level 0 diff --git a/world/map/npc/012-3/mapflags.txt b/world/map/npc/012-3/mapflags.txt index 28007390..e3fd146f 100644 --- a/world/map/npc/012-3/mapflags.txt +++ b/world/map/npc/012-3/mapflags.txt @@ -1 +1 @@ -012-3.gat|mapflag|resave|012-1,88,141 +012-3|mapflag|resave|012-1,88,141 diff --git a/world/map/npc/012-3/traveler.txt b/world/map/npc/012-3/traveler.txt index 958fdec9..aa173080 100644 --- a/world/map/npc/012-3/traveler.txt +++ b/world/map/npc/012-3/traveler.txt @@ -2,7 +2,7 @@ // Author: Wombat, wushin // cost depending on level and adapted to new scripting guidelines: Jenalya -012-3.gat,439,62,0|script|Meridith the Traveler|103 +012-3,439,62,0|script|Meridith the Traveler|103 { set @NpcName$, "Meridith"; set @NpcTravelBit, $@terranite_cave_bit; diff --git a/world/map/npc/012-3/warningsigns.txt b/world/map/npc/012-3/warningsigns.txt index 0c84a895..d95537e0 100644 --- a/world/map/npc/012-3/warningsigns.txt +++ b/world/map/npc/012-3/warningsigns.txt @@ -1,6 +1,6 @@ //warning signs at pvp entrance! -012-3.gat,445,61,0|script|sign#pvp-1|187 +012-3,445,61,0|script|sign#pvp-1|187 { mes "You are about to enter a dangerous area!"; next; @@ -9,7 +9,7 @@ close; } -012-3.gat,451,61,0|script|sign#pvp-2|186 +012-3,451,61,0|script|sign#pvp-2|186 { mes "You are about to enter a dangerous area!"; next; diff --git a/world/map/npc/012-4/mapflags.txt b/world/map/npc/012-4/mapflags.txt index 9e9dcfaa..aa107ce9 100644 --- a/world/map/npc/012-4/mapflags.txt +++ b/world/map/npc/012-4/mapflags.txt @@ -1 +1 @@ -012-4.gat|mapflag|resave|012-1,143,70 +012-4|mapflag|resave|012-1,143,70 diff --git a/world/map/npc/012-4/pvpflag.txt b/world/map/npc/012-4/pvpflag.txt index 021ecc36..3ce803de 100644 --- a/world/map/npc/012-4/pvpflag.txt +++ b/world/map/npc/012-4/pvpflag.txt @@ -1 +1 @@ -012-4.gat|mapflag|pvp +012-4|mapflag|pvp diff --git a/world/map/npc/013-1/flowerpentagram.txt b/world/map/npc/013-1/flowerpentagram.txt index 59c8e392..5be2c99a 100644 --- a/world/map/npc/013-1/flowerpentagram.txt +++ b/world/map/npc/013-1/flowerpentagram.txt @@ -1,4 +1,4 @@ -013-1.gat,1,1,0|script|#FlowerPentagram|127 +013-1,1,1,0|script|#FlowerPentagram|127 { end; @@ -8,32 +8,32 @@ OnSummon: callsub S_CleanUp; // area closely to sagatha - areamonster "013-1.gat", 119, 21, 134, 36, "", 1105, 3, "#FlowerPentagram::OnSquirrelDeath"; - areamonster "013-1.gat", 119, 21, 134, 36, "", 1106, 2, "#FlowerPentagram::OnMushroomDeath"; - areamonster "013-1.gat", 119, 21, 134, 36, "", 1107, 3, "#FlowerPentagram::OnBlueparDeath"; - areamonster "013-1.gat", 119, 21, 134, 36, "", 1104, 2, "#FlowerPentagram::OnMoubooDeath"; - areamonster "013-1.gat", 119, 21, 134, 36, "", 1003, 10, "#FlowerPentagram::OnScorpionDeath"; - areamonster "013-1.gat", 119, 21, 134, 36, "", 1004, 7, "#FlowerPentagram::OnRScorpionDeath"; - areamonster "013-1.gat", 119, 21, 134, 36, "", 1057, 5, "#FlowerPentagram::OnAScorpionDeath"; - areamonster "013-1.gat", 119, 21, 134, 36, "", 1009, 3, "#FlowerPentagram::OnBScorpionDeath"; + areamonster "013-1", 119, 21, 134, 36, "", 1105, 3, "#FlowerPentagram::OnSquirrelDeath"; + areamonster "013-1", 119, 21, 134, 36, "", 1106, 2, "#FlowerPentagram::OnMushroomDeath"; + areamonster "013-1", 119, 21, 134, 36, "", 1107, 3, "#FlowerPentagram::OnBlueparDeath"; + areamonster "013-1", 119, 21, 134, 36, "", 1104, 2, "#FlowerPentagram::OnMoubooDeath"; + areamonster "013-1", 119, 21, 134, 36, "", 1003, 10, "#FlowerPentagram::OnScorpionDeath"; + areamonster "013-1", 119, 21, 134, 36, "", 1004, 7, "#FlowerPentagram::OnRScorpionDeath"; + areamonster "013-1", 119, 21, 134, 36, "", 1057, 5, "#FlowerPentagram::OnAScorpionDeath"; + areamonster "013-1", 119, 21, 134, 36, "", 1009, 3, "#FlowerPentagram::OnBScorpionDeath"; // wider area around sagatha - areamonster "013-1.gat", 68, 25, 133, 73, "", 1105, 3, "#FlowerPentagram::OnSquirrelDeath"; - areamonster "013-1.gat", 68, 25, 133, 73, "", 1106, 3, "#FlowerPentagram::OnMushroomDeath"; - areamonster "013-1.gat", 68, 25, 133, 73, "", 1107, 5, "#FlowerPentagram::OnBlueparDeath"; - areamonster "013-1.gat", 68, 25, 133, 73, "", 1104, 2, "#FlowerPentagram::OnMoubooDeath"; - areamonster "013-1.gat", 68, 25, 133, 73, "", 1003, 6, "#FlowerPentagram::OnScorpionDeath"; - areamonster "013-1.gat", 68, 25, 133, 73, "", 1004, 5, "#FlowerPentagram::OnRScorpionDeath"; - areamonster "013-1.gat", 68, 25, 133, 73, "", 1057, 4, "#FlowerPentagram::OnAScorpionDeath"; - areamonster "013-1.gat", 68, 25, 133, 73, "", 1009, 2, "#FlowerPentagram::OnBScorpionDeath"; + areamonster "013-1", 68, 25, 133, 73, "", 1105, 3, "#FlowerPentagram::OnSquirrelDeath"; + areamonster "013-1", 68, 25, 133, 73, "", 1106, 3, "#FlowerPentagram::OnMushroomDeath"; + areamonster "013-1", 68, 25, 133, 73, "", 1107, 5, "#FlowerPentagram::OnBlueparDeath"; + areamonster "013-1", 68, 25, 133, 73, "", 1104, 2, "#FlowerPentagram::OnMoubooDeath"; + areamonster "013-1", 68, 25, 133, 73, "", 1003, 6, "#FlowerPentagram::OnScorpionDeath"; + areamonster "013-1", 68, 25, 133, 73, "", 1004, 5, "#FlowerPentagram::OnRScorpionDeath"; + areamonster "013-1", 68, 25, 133, 73, "", 1057, 4, "#FlowerPentagram::OnAScorpionDeath"; + areamonster "013-1", 68, 25, 133, 73, "", 1009, 2, "#FlowerPentagram::OnBScorpionDeath"; // almost the entire map - areamonster "013-1.gat", 24, 22, 136, 100, "", 1105, 4, "#FlowerPentagram::OnSquirrelDeath"; - areamonster "013-1.gat", 24, 22, 136, 100, "", 1106, 3, "#FlowerPentagram::OnMushroomDeath"; - areamonster "013-1.gat", 24, 22, 136, 100, "", 1107, 5, "#FlowerPentagram::OnBlueparDeath"; - areamonster "013-1.gat", 24, 22, 136, 100, "", 1104, 3, "#FlowerPentagram::OnMoubooDeath"; - areamonster "013-1.gat", 24, 22, 136, 100, "", 1003, 5, "#FlowerPentagram::OnScorpionDeath"; - areamonster "013-1.gat", 24, 22, 136, 100, "", 1004, 4, "#FlowerPentagram::OnRScorpionDeath"; - areamonster "013-1.gat", 24, 22, 136, 100, "", 1057, 3, "#FlowerPentagram::OnAScorpionDeath"; - areamonster "013-1.gat", 24, 22, 136, 100, "", 1009, 1, "#FlowerPentagram::OnBScorpionDeath"; + areamonster "013-1", 24, 22, 136, 100, "", 1105, 4, "#FlowerPentagram::OnSquirrelDeath"; + areamonster "013-1", 24, 22, 136, 100, "", 1106, 3, "#FlowerPentagram::OnMushroomDeath"; + areamonster "013-1", 24, 22, 136, 100, "", 1107, 5, "#FlowerPentagram::OnBlueparDeath"; + areamonster "013-1", 24, 22, 136, 100, "", 1104, 3, "#FlowerPentagram::OnMoubooDeath"; + areamonster "013-1", 24, 22, 136, 100, "", 1003, 5, "#FlowerPentagram::OnScorpionDeath"; + areamonster "013-1", 24, 22, 136, 100, "", 1004, 4, "#FlowerPentagram::OnRScorpionDeath"; + areamonster "013-1", 24, 22, 136, 100, "", 1057, 3, "#FlowerPentagram::OnAScorpionDeath"; + areamonster "013-1", 24, 22, 136, 100, "", 1009, 1, "#FlowerPentagram::OnBScorpionDeath"; end; OnSquirrelDeath: @@ -77,28 +77,28 @@ OnBScorpionDeath: end; S_CleanUp: - killmonster "013-1.gat", "#FlowerPentagram::OnSquirrelDeath"; - killmonster "013-1.gat", "#FlowerPentagram::OnMushroomDeath"; - killmonster "013-1.gat", "#FlowerPentagram::OnBlueparDeath"; - killmonster "013-1.gat", "#FlowerPentagram::OnMoubooDeath"; - killmonster "013-1.gat", "#FlowerPentagram::OnScorpionDeath"; - killmonster "013-1.gat", "#FlowerPentagram::OnRScorpionDeath"; - killmonster "013-1.gat", "#FlowerPentagram::OnAScorpionDeath"; - killmonster "013-1.gat", "#FlowerPentagram::OnBScorpionDeath"; + killmonster "013-1", "#FlowerPentagram::OnSquirrelDeath"; + killmonster "013-1", "#FlowerPentagram::OnMushroomDeath"; + killmonster "013-1", "#FlowerPentagram::OnBlueparDeath"; + killmonster "013-1", "#FlowerPentagram::OnMoubooDeath"; + killmonster "013-1", "#FlowerPentagram::OnScorpionDeath"; + killmonster "013-1", "#FlowerPentagram::OnRScorpionDeath"; + killmonster "013-1", "#FlowerPentagram::OnAScorpionDeath"; + killmonster "013-1", "#FlowerPentagram::OnBScorpionDeath"; return; } function|script|FlowerPentagramCount { set $@Flower_Pentagram_Mobcount, - mobcount("013-1.gat", "#FlowerPentagram::OnSquirrelDeath") + - mobcount("013-1.gat", "#FlowerPentagram::OnMushroomDeath") + - mobcount("013-1.gat", "#FlowerPentagram::OnBlueparDeath") + - mobcount("013-1.gat", "#FlowerPentagram::OnMoubooDeath") + - mobcount("013-1.gat", "#FlowerPentagram::OnScorpionDeath") + - mobcount("013-1.gat", "#FlowerPentagram::OnRScorpionDeath") + - mobcount("013-1.gat", "#FlowerPentagram::OnAScorpionDeath") + - mobcount("013-1.gat", "#FlowerPentagram::OnBScorpionDeath") + + mobcount("013-1", "#FlowerPentagram::OnSquirrelDeath") + + mobcount("013-1", "#FlowerPentagram::OnMushroomDeath") + + mobcount("013-1", "#FlowerPentagram::OnBlueparDeath") + + mobcount("013-1", "#FlowerPentagram::OnMoubooDeath") + + mobcount("013-1", "#FlowerPentagram::OnScorpionDeath") + + mobcount("013-1", "#FlowerPentagram::OnRScorpionDeath") + + mobcount("013-1", "#FlowerPentagram::OnAScorpionDeath") + + mobcount("013-1", "#FlowerPentagram::OnBScorpionDeath") + 8; // the mobcount function has an offset of -1, so we add 8 to have the actual amount of monsters return; } diff --git a/world/map/npc/013-1/mapflags.txt b/world/map/npc/013-1/mapflags.txt index 4c296e01..5c043bd9 100644 --- a/world/map/npc/013-1/mapflags.txt +++ b/world/map/npc/013-1/mapflags.txt @@ -1 +1 @@ -013-1.gat|mapflag|resave|013-1,126,99 +013-1|mapflag|resave|013-1,126,99 diff --git a/world/map/npc/013-1/sagatha.txt b/world/map/npc/013-1/sagatha.txt index cf99cd28..1251d025 100644 --- a/world/map/npc/013-1/sagatha.txt +++ b/world/map/npc/013-1/sagatha.txt @@ -72,7 +72,7 @@ L_next: } //---------------------------------------- -013-1.gat,131,24,0|script|Sagatha#_M|167 +013-1,131,24,0|script|Sagatha#_M|167 { callfunc "SagathaStatus"; diff --git a/world/map/npc/013-1/traveler.txt b/world/map/npc/013-1/traveler.txt index ff36ded4..efa6c53a 100644 --- a/world/map/npc/013-1/traveler.txt +++ b/world/map/npc/013-1/traveler.txt @@ -1,4 +1,4 @@ -013-1.gat,120,90,0|script|Faris the Traveler|103 +013-1,120,90,0|script|Faris the Traveler|103 { set @NpcName$, "Faris"; set @NpcTravelBit, $@magic_house_bit; diff --git a/world/map/npc/013-2/apprentice.txt b/world/map/npc/013-2/apprentice.txt index 0b0e4ea2..12bd3926 100644 --- a/world/map/npc/013-2/apprentice.txt +++ b/world/map/npc/013-2/apprentice.txt @@ -1,4 +1,4 @@ -013-2.gat,25,37,0|script|Fabius|115 +013-2,25,37,0|script|Fabius|115 { mes "[Fabius]"; 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.\""; diff --git a/world/map/npc/013-2/mapflags.txt b/world/map/npc/013-2/mapflags.txt index e032acab..6d675d4d 100644 --- a/world/map/npc/013-2/mapflags.txt +++ b/world/map/npc/013-2/mapflags.txt @@ -1 +1 @@ -013-2.gat|mapflag|resave|013-1,126,99 +013-2|mapflag|resave|013-1,126,99 diff --git a/world/map/npc/013-2/notes.txt b/world/map/npc/013-2/notes.txt index 20ce05c1..988d2895 100644 --- a/world/map/npc/013-2/notes.txt +++ b/world/map/npc/013-2/notes.txt @@ -1,25 +1,25 @@ // -013-2.gat,23,32,0|script|Motto#wiz|400 +013-2,23,32,0|script|Motto#wiz|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#wiz|400 +013-2,30,32,0|script|Note#wiz|400 { mes "Please do not open."; close; } -013-2.gat,38,20,0|script|Saying#wiz|400 +013-2,38,20,0|script|Saying#wiz|400 { mes "The early bird catcheth the worm."; close; } -013-2.gat,27,21,0|script|Mirror#wiz|400 +013-2,27,21,0|script|Mirror#wiz|400 { mes "You say: \"Mirror mirror on the wall, who has the nicest haircut of them all?\""; next; @@ -33,7 +33,7 @@ } // Warp to wood clearings -013-2.gat,25,23,0|script|Spell#wiz1|400 +013-2,25,23,0|script|Spell#wiz1|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; @@ -49,15 +49,15 @@ goto L_PlaceThree; L_PlaceOne: - warp "013-1.gat",128,28; + warp "013-1",128,28; goto L_Close; L_PlaceTwo: - warp "016-1.gat",62,89; + warp "016-1",62,89; goto L_Close; L_PlaceThree: - warp "014-1.gat",33,35; + warp "014-1",33,35; goto L_Close; L_Close: @@ -66,7 +66,7 @@ L_Close: } // Warp to desert -013-2.gat,27,24,0|script|Spell#wiz2|400 +013-2,27,24,0|script|Spell#wiz2|400 { mes "You read: \"You must not fear, for it is the mind-killer. That and sharp pointy things.\""; next; @@ -93,15 +93,15 @@ L_Warp: goto L_PlaceThree; L_PlaceOne: - warp "006-1.gat",83,60; + warp "006-1",83,60; goto L_Close; L_PlaceTwo: - warp "006-1.gat",77,22; + warp "006-1",77,22; goto L_Close; L_PlaceThree: - warp "006-1.gat",33,93; + warp "006-1",33,93; goto L_Close; L_Close: @@ -110,7 +110,7 @@ L_Close: } // Warp to snow area -013-2.gat,25,27,0|script|Spell#wiz3|400 +013-2,25,27,0|script|Spell#wiz3|400 { mes "You read: \"Snow-white flakes and eminent frost - I'll go there, whatever the cost!\""; next; @@ -124,15 +124,15 @@ L_Close: goto L_Cave; L_FriendlyPlace: - warp "019-3.gat",102,77; + warp "019-3",102,77; goto L_Close; L_DeepCave: - warp "031-3.gat",135,163; + warp "031-3",135,163; goto L_Close; L_Cave: - warp "031-3.gat",37,213; + warp "031-3",37,213; goto L_Close; L_Close: @@ -141,7 +141,7 @@ L_Close: } // Warp to Inns -013-2.gat,27,27,0|script|Spell#wiz4|400 +013-2,27,27,0|script|Spell#wiz4|400 { mes "You read: \"People and cosiness, lively and fun - that's where I've gone!\""; next; @@ -155,15 +155,15 @@ L_Close: goto L_PlaceThree; L_PlaceOne: - warp "030-2.gat",88,24; + warp "030-2",88,24; goto L_Close; L_PlaceTwo: - warp "001-2.gat",30,29; + warp "001-2",30,29; goto L_Close; L_PlaceThree: - warp "010-2.gat",34,42; + warp "010-2",34,42; goto L_Close; L_Close: @@ -172,7 +172,7 @@ L_Close: } // Warp to mines -013-2.gat,26,28,0|script|Spell#wiz5|400 +013-2,26,28,0|script|Spell#wiz5|400 { mes "You read: \"Darkness and legs, eight of them each - I'd rather not go there, but now it's too late...\""; next; @@ -186,15 +186,15 @@ L_Close: goto L_PlaceThree; L_PlaceOne: - warp "012-4.gat",431,36; + warp "012-4",431,36; goto L_Close; L_PlaceTwo: - warp "013-3.gat",134,54; + warp "013-3",134,54; goto L_Close; L_PlaceThree: - warp "013-3.gat",178,67; + warp "013-3",178,67; goto L_Close; L_Close: @@ -203,7 +203,7 @@ L_Close: } // Death -013-2.gat,21,29,0|script|Spell#wiz6|400 +013-2,21,29,0|script|Spell#wiz6|400 { mes "You read: \"Heart stops pumping, breath begone - life is stopping, death has come!\""; next; @@ -214,7 +214,7 @@ L_Close: } // Naked -013-2.gat,28,29,0|script|Spell#wiz7|400 +013-2,28,29,0|script|Spell#wiz7|400 { mes "You read: \"Cotton, steel, leather and wool - have I ever seen a greater fool?\""; next; diff --git a/world/map/npc/013-2/wizard.txt b/world/map/npc/013-2/wizard.txt index 1cc47128..37eaeae5 100644 --- a/world/map/npc/013-2/wizard.txt +++ b/world/map/npc/013-2/wizard.txt @@ -1,4 +1,4 @@ -013-2.gat,66,39,0|script|Old Wizard#_W|116 +013-2,66,39,0|script|Old Wizard#_W|116 { set @has_magic, getskilllv(SKILL_MAGIC); set MAGIC_FLAGS, MAGIC_FLAGS | MFLAG_KNOWS_OLD_WIZARD; diff --git a/world/map/npc/013-3/barrier.txt b/world/map/npc/013-3/barrier.txt index bf6621e1..442870d9 100644 --- a/world/map/npc/013-3/barrier.txt +++ b/world/map/npc/013-3/barrier.txt @@ -1,6 +1,6 @@ // -013-3.gat,71,21,0|script|#DemonMineBarrier1#_M|45,1,1 +013-3,71,21,0|script|#DemonMineBarrier1#_M|45,1,1 { callfunc "ClearVariables"; @@ -11,7 +11,7 @@ message strcharinfo(0), "A barrier around the opening pushes you back as you approach."; - warp "013-3.gat", 71, 25; + warp "013-3", 71, 25; goto L_End; L_Has_Soul: diff --git a/world/map/npc/013-3/mapflags.txt b/world/map/npc/013-3/mapflags.txt index b9d4496b..73d2a995 100644 --- a/world/map/npc/013-3/mapflags.txt +++ b/world/map/npc/013-3/mapflags.txt @@ -1 +1 @@ -013-3.gat|mapflag|resave|013-1,126,99 +013-3|mapflag|resave|013-1,126,99 diff --git a/world/map/npc/013-3/mask_chest.txt b/world/map/npc/013-3/mask_chest.txt index 44d7956b..a175b4b2 100644 --- a/world/map/npc/013-3/mask_chest.txt +++ b/world/map/npc/013-3/mask_chest.txt @@ -1,6 +1,6 @@ // -013-3.gat,28,27,0|script|Chest#DemonMask|111 +013-3,28,27,0|script|Chest#DemonMask|111 { callfunc "ClearVariables"; @@ -198,7 +198,7 @@ L_No_water: goto L_Close; L_This_shouldn_t_happen: - warp "013-3.gat", 71, 25; + warp "013-3", 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. goto L_Close; diff --git a/world/map/npc/013-3/misc.txt b/world/map/npc/013-3/misc.txt index 5a23b850..dde3f366 100644 --- a/world/map/npc/013-3/misc.txt +++ b/world/map/npc/013-3/misc.txt @@ -1,6 +1,6 @@ // -013-3.gat,127,68,0|script|Chest#boring|111 +013-3,127,68,0|script|Chest#boring|111 { mes "You can't see any way to open this chest."; close; diff --git a/world/map/npc/013-3/sword_chest.txt b/world/map/npc/013-3/sword_chest.txt index bbcd4fb9..de06261d 100644 --- a/world/map/npc/013-3/sword_chest.txt +++ b/world/map/npc/013-3/sword_chest.txt @@ -1,6 +1,6 @@ // -013-3.gat,177,22,0|script|Chest#sword|111 +013-3,177,22,0|script|Chest#sword|111 { callfunc "ClearVariables"; if (FLAGS & FLAG_HURNSMINE_CHEST) goto L_Finished; diff --git a/world/map/npc/014-1/mapflags.txt b/world/map/npc/014-1/mapflags.txt index 222a1738..97fe03e3 100644 --- a/world/map/npc/014-1/mapflags.txt +++ b/world/map/npc/014-1/mapflags.txt @@ -1 +1 @@ -014-1.gat|mapflag|resave|014-1,89,102 +014-1|mapflag|resave|014-1,89,102 diff --git a/world/map/npc/014-1/wedding-officiator.txt b/world/map/npc/014-1/wedding-officiator.txt index 273f3025..30f6201c 100644 --- a/world/map/npc/014-1/wedding-officiator.txt +++ b/world/map/npc/014-1/wedding-officiator.txt @@ -1,6 +1,6 @@ // Wedding officiator: Marriages and divorces -014-1.gat,31,31,0|script|Wedding Officiator|164 +014-1,31,31,0|script|Wedding Officiator|164 { mes "[Wedding Officiator]"; mes "A young lady in a long, green dress is overseeing the park. As she notices you looking at her, she gives you a broad and happy smile."; diff --git a/world/map/npc/014-3/mapflags.txt b/world/map/npc/014-3/mapflags.txt index d7565279..eee5f6a9 100644 --- a/world/map/npc/014-3/mapflags.txt +++ b/world/map/npc/014-3/mapflags.txt @@ -1 +1 @@ -014-3.gat|mapflag|resave|014-1,89,102 +014-3|mapflag|resave|014-1,89,102 diff --git a/world/map/npc/015-1/alice.txt b/world/map/npc/015-1/alice.txt index 4b1d0a9a..3e1d82de 100644 --- a/world/map/npc/015-1/alice.txt +++ b/world/map/npc/015-1/alice.txt @@ -1,7 +1,7 @@ // A herb collector giving the players some hints about finding and brewing // herbs. -015-1.gat,52,53,0|script|Alice|106 +015-1,52,53,0|script|Alice|106 { set @cat, ((Katze & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT); set @Hiss, ((Katze & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT); diff --git a/world/map/npc/015-1/barrier.txt b/world/map/npc/015-1/barrier.txt index dacad6e7..a87cfd23 100644 --- a/world/map/npc/015-1/barrier.txt +++ b/world/map/npc/015-1/barrier.txt @@ -1,7 +1,7 @@ // This barrier is for checking whether the player went outside after // progressing with the cat quest. -015-1.gat,59,32,0|script|#CatOutsideBarrier|127,1,1 +015-1,59,32,0|script|#CatOutsideBarrier|127,1,1 { set @catNeedsAlone, 0; end; diff --git a/world/map/npc/015-1/mapflags.txt b/world/map/npc/015-1/mapflags.txt index a626da24..7e6513cf 100644 --- a/world/map/npc/015-1/mapflags.txt +++ b/world/map/npc/015-1/mapflags.txt @@ -1 +1 @@ -015-1.gat|mapflag|resave|010-1,27,97 +015-1|mapflag|resave|010-1,27,97 diff --git a/world/map/npc/015-1/sword.txt b/world/map/npc/015-1/sword.txt index 199066f2..6e218f9b 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|400 +015-1,97,97,0|script|#MagicSword#_M|400 { if (getskilllv(SKILL_MAGIC)) goto L_message; diff --git a/world/map/npc/015-3/barrier.txt b/world/map/npc/015-3/barrier.txt index 7e34aeee..f65b6c85 100644 --- a/world/map/npc/015-3/barrier.txt +++ b/world/map/npc/015-3/barrier.txt @@ -1,7 +1,7 @@ // You can only enter the cat cave naked, otherwise the cat's reaction scares // you away. You can also get in while wearing the cat ears. -015-3.gat,31,42,0|script|#CatCaveBarrier|45,1,1 +015-3,31,42,0|script|#CatCaveBarrier|45,1,1 { set @Hiss, ((Katze & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT); if (getequipid(equip_head) != 1217 @@ -24,7 +24,7 @@ goto L_Close; L_Not_Naked: - warp "015-1.gat", 60, 32; + warp "015-1", 60, 32; set @Hiss, 1; callsub S_Update_Hiss; mes "\"GRAAUWL! Hissss...\""; diff --git a/world/map/npc/015-3/katze.txt b/world/map/npc/015-3/katze.txt index cbf48d22..8e94ce06 100644 --- a/world/map/npc/015-3/katze.txt +++ b/world/map/npc/015-3/katze.txt @@ -16,7 +16,7 @@ // * 2 Hard spikes // * 2 Tiny potions -015-3.gat,32,25,0|script|Katze|172 +015-3,32,25,0|script|Katze|172 { set @cat, ((Katze & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT); @@ -44,7 +44,7 @@ L_ThrowStone: set @cat, 0; callsub S_Update_Katze; percentheal -30, 0; - warp "015-1.gat", 60, 32; + warp "015-1", 60, 32; mes "\"GRAAUWL! Hissss...\""; mes "Yikes, the cat attacked you! Your whole body is scratched. Maybe throwing a stone wasn't such a great idea..."; goto L_Close; diff --git a/world/map/npc/015-3/mapflags.txt b/world/map/npc/015-3/mapflags.txt index 0123e3b9..04397e31 100644 --- a/world/map/npc/015-3/mapflags.txt +++ b/world/map/npc/015-3/mapflags.txt @@ -1,2 +1,2 @@ -015-3.gat|mapflag|nosave|015-1,59,32 -015-3.gat|mapflag|resave|010-1,27,97 +015-3|mapflag|nosave|015-1,59,32 +015-3|mapflag|resave|010-1,27,97 diff --git a/world/map/npc/015-3/pot.txt b/world/map/npc/015-3/pot.txt index 9c6ccc8f..523be319 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|400 +015-3,37,29,0|script|Pot|400 { set @cat, ((Katze & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT); diff --git a/world/map/npc/016-1/gwendolyn.txt b/world/map/npc/016-1/gwendolyn.txt index e27b61db..f95336e9 100644 --- a/world/map/npc/016-1/gwendolyn.txt +++ b/world/map/npc/016-1/gwendolyn.txt @@ -21,7 +21,7 @@ // 5, state5: you are ready to do the targeting minigame // 6, state6: you did the minigame -016-1.gat,33,45,0|script|Gwendolyn|182 +016-1,33,45,0|script|Gwendolyn|182 { // schoolfee in gp set @SCHOOLFEE, 25000; diff --git a/world/map/npc/016-1/mapflags.txt b/world/map/npc/016-1/mapflags.txt index 407d15b5..4c31651b 100644 --- a/world/map/npc/016-1/mapflags.txt +++ b/world/map/npc/016-1/mapflags.txt @@ -1 +1 @@ -016-1.gat|mapflag|resave|010-1,27,97 +016-1|mapflag|resave|010-1,27,97 diff --git a/world/map/npc/017-1/flowerpentagram1.txt b/world/map/npc/017-1/flowerpentagram1.txt index e925445c..64128b4b 100644 --- a/world/map/npc/017-1/flowerpentagram1.txt +++ b/world/map/npc/017-1/flowerpentagram1.txt @@ -1,6 +1,6 @@ // Author: Jenalya -017-1.gat,95,42,0|script|#FlowerPentagram1|400 +017-1,95,42,0|script|#FlowerPentagram1|400 { if (OrumQuest >= 31) goto L_PlacedFifthFlower; @@ -17,7 +17,7 @@ L_FirstFlower: "Leave.", L_Close; L_Next: - if (isin("017-1.gat", 94, 41, 96, 43)) + if (isin("017-1", 94, 41, 96, 43)) goto L_Place; mes "You're too far away."; @@ -25,8 +25,8 @@ L_Next: L_Place: set @localMonsterCount, - mobcount("017-1.gat", "#FlowerPentagram1::OnSquirrelDeath") + - mobcount("017-1.gat", "#FlowerPentagram1::OnScorpionDeath") + + mobcount("017-1", "#FlowerPentagram1::OnSquirrelDeath") + + mobcount("017-1", "#FlowerPentagram1::OnScorpionDeath") + 2; // the mobcount function has an offset of -1, so we add 2 to have the actual amount of monsters if (@localMonsterCount > 2) goto L_MonstersAlive; @@ -37,8 +37,8 @@ L_Place: mes "You carefully place the magic flower on the marked spot. You feel some tension in the air around you."; set OrumQuest, 18; close2; - areamonster "017-1.gat", 91, 37, 101, 46, "", 1105, 2, "#FlowerPentagram1::OnSquirrelDeath"; - areamonster "017-1.gat", 91, 37, 101, 46, "", 1003, 3, "#FlowerPentagram1::OnScorpionDeath"; + areamonster "017-1", 91, 37, 101, 46, "", 1105, 2, "#FlowerPentagram1::OnSquirrelDeath"; + areamonster "017-1", 91, 37, 101, 46, "", 1003, 3, "#FlowerPentagram1::OnScorpionDeath"; set @value, 15; callfunc "QuestSagathaAnnoy"; set @value, 0; diff --git a/world/map/npc/017-1/flowerpentagram5.txt b/world/map/npc/017-1/flowerpentagram5.txt index 24b2a9d2..f8947dbd 100644 --- a/world/map/npc/017-1/flowerpentagram5.txt +++ b/world/map/npc/017-1/flowerpentagram5.txt @@ -1,7 +1,7 @@ // Author: Jenalya // $@Flower_Pentagram_Time saves the time when the last summoning happened -017-1.gat,176,59,0|script|#FlowerPentagram5|400 +017-1,176,59,0|script|#FlowerPentagram5|400 { if (OrumQuest >= 31) goto L_PlacedFifthFlower; @@ -17,7 +17,7 @@ L_FifthFlower: "Leave.", L_Close; L_PlaceTheFlower: - if (isin("017-1.gat", 175, 58, 177, 60)) + if (isin("017-1", 175, 58, 177, 60)) goto L_Place; mes "This isn't working, you're too far away."; @@ -25,14 +25,14 @@ L_PlaceTheFlower: L_Place: set @localMonsterCount, - mobcount("013-1.gat", "#FlowerPentagram5::OnSquirrelDeath") + - mobcount("013-1.gat", "#FlowerPentagram5::OnMushroomDeath") + - mobcount("013-1.gat", "#FlowerPentagram5::OnBlueparDeath") + - mobcount("013-1.gat", "#FlowerPentagram5::OnMoubooDeath") + - mobcount("013-1.gat", "#FlowerPentagram5::OnScorpionDeath") + - mobcount("013-1.gat", "#FlowerPentagram5::OnRScorpionDeath") + - mobcount("013-1.gat", "#FlowerPentagram5::OnAScorpionDeath") + - mobcount("013-1.gat", "#FlowerPentagram5::OnBScorpionDeath") + + mobcount("013-1", "#FlowerPentagram5::OnSquirrelDeath") + + mobcount("013-1", "#FlowerPentagram5::OnMushroomDeath") + + mobcount("013-1", "#FlowerPentagram5::OnBlueparDeath") + + mobcount("013-1", "#FlowerPentagram5::OnMoubooDeath") + + mobcount("013-1", "#FlowerPentagram5::OnScorpionDeath") + + mobcount("013-1", "#FlowerPentagram5::OnRScorpionDeath") + + mobcount("013-1", "#FlowerPentagram5::OnAScorpionDeath") + + mobcount("013-1", "#FlowerPentagram5::OnBScorpionDeath") + 8; // the mobcount function has an offset of -1, so we add 8 to have the actual amount of monsters if (@localMonsterCount > 4) goto L_MonstersAlive; @@ -53,14 +53,14 @@ L_Place: mes "The pressure builds to the point where you don't think you can endure it any longer; the fabric that binds your consciousness together seemingly unravels."; set OrumQuest, 31; close2; - areamonster "017-1.gat", 170, 55, 190, 75, "", 1105, 3, "#FlowerPentagram5::OnSquirrelDeath"; - areamonster "017-1.gat", 170, 55, 190, 75, "", 1106, 2, "#FlowerPentagram5::OnMushroomDeath"; - areamonster "017-1.gat", 170, 55, 190, 75, "", 1107, 3, "#FlowerPentagram5::OnBlueparDeath"; - areamonster "017-1.gat", 170, 55, 190, 75, "", 1104, 2, "#FlowerPentagram5::OnMoubooDeath"; - areamonster "017-1.gat", 170, 55, 190, 75, "", 1003, 3, "#FlowerPentagram5::OnScorpionDeath"; - areamonster "017-1.gat", 170, 55, 190, 75, "", 1004, 2, "#FlowerPentagram5::OnRScorpionDeath"; - areamonster "017-1.gat", 170, 55, 190, 75, "", 1057, 2, "#FlowerPentagram5::OnAScorpionDeath"; - areamonster "017-1.gat", 170, 55, 190, 75, "", 1009, 2, "#FlowerPentagram5::OnBScorpionDeath"; + areamonster "017-1", 170, 55, 190, 75, "", 1105, 3, "#FlowerPentagram5::OnSquirrelDeath"; + areamonster "017-1", 170, 55, 190, 75, "", 1106, 2, "#FlowerPentagram5::OnMushroomDeath"; + areamonster "017-1", 170, 55, 190, 75, "", 1107, 3, "#FlowerPentagram5::OnBlueparDeath"; + areamonster "017-1", 170, 55, 190, 75, "", 1104, 2, "#FlowerPentagram5::OnMoubooDeath"; + areamonster "017-1", 170, 55, 190, 75, "", 1003, 3, "#FlowerPentagram5::OnScorpionDeath"; + areamonster "017-1", 170, 55, 190, 75, "", 1004, 2, "#FlowerPentagram5::OnRScorpionDeath"; + areamonster "017-1", 170, 55, 190, 75, "", 1057, 2, "#FlowerPentagram5::OnAScorpionDeath"; + areamonster "017-1", 170, 55, 190, 75, "", 1009, 2, "#FlowerPentagram5::OnBScorpionDeath"; set @value, 15; callfunc "QuestSagathaAnnoy"; set @value, 0; diff --git a/world/map/npc/017-1/mapflags.txt b/world/map/npc/017-1/mapflags.txt index 98c67d63..5a7ac704 100644 --- a/world/map/npc/017-1/mapflags.txt +++ b/world/map/npc/017-1/mapflags.txt @@ -1 +1 @@ -017-1.gat|mapflag|resave|017-1,107,70 +017-1|mapflag|resave|017-1,107,70 diff --git a/world/map/npc/017-2/mapflags.txt b/world/map/npc/017-2/mapflags.txt index c9e26119..9f81d1b5 100644 --- a/world/map/npc/017-2/mapflags.txt +++ b/world/map/npc/017-2/mapflags.txt @@ -1 +1 @@ -017-2.gat|mapflag|resave|017-1,107,70 +017-2|mapflag|resave|017-1,107,70 diff --git a/world/map/npc/017-3/mapflags.txt b/world/map/npc/017-3/mapflags.txt index b04c452e..90a2bb6f 100644 --- a/world/map/npc/017-3/mapflags.txt +++ b/world/map/npc/017-3/mapflags.txt @@ -1 +1 @@ -017-3.gat|mapflag|resave|017-1,107,70 +017-3|mapflag|resave|017-1,107,70 diff --git a/world/map/npc/017-4/guardingspirit.txt b/world/map/npc/017-4/guardingspirit.txt index 6b39bbd5..8fef95ed 100644 --- a/world/map/npc/017-4/guardingspirit.txt +++ b/world/map/npc/017-4/guardingspirit.txt @@ -1,6 +1,6 @@ // Author: Jenalya -017-4.gat,173,47,0|script|#Guarding Spirit#_M|204,0,0 +017-4,173,47,0|script|#Guarding Spirit#_M|204,0,0 { goto L_Talk; @@ -59,7 +59,7 @@ L_Pass: next; mes "\"Remember that when you speak with him, do so with respect for someone befitting his status.\""; set OrumQuest, 15; - warp "017-4.gat", 201, 26; + warp "017-4", 201, 26; goto L_Close; L_Block: @@ -92,6 +92,6 @@ OnTouch: goto L_Talk; if (OrumQuest == 35) goto L_Block; - warp "017-4.gat", 201, 26; + warp "017-4", 201, 26; end; } diff --git a/world/map/npc/017-4/mapflags.txt b/world/map/npc/017-4/mapflags.txt index bd0ecdff..a137e471 100644 --- a/world/map/npc/017-4/mapflags.txt +++ b/world/map/npc/017-4/mapflags.txt @@ -1 +1 @@ -017-4.gat|mapflag|resave|017-1,107,70 +017-4|mapflag|resave|017-1,107,70 diff --git a/world/map/npc/017-4/orum.txt b/world/map/npc/017-4/orum.txt index b13f415d..213f14af 100644 --- a/world/map/npc/017-4/orum.txt +++ b/world/map/npc/017-4/orum.txt @@ -20,7 +20,7 @@ // 31: Placed fifth flower // 32: Got reward -017-4.gat,211,32,0|script|Orum|158 +017-4,211,32,0|script|Orum|158 { // first flower set @AMOUNT_SMALLMUSHROOM, 5; @@ -124,7 +124,7 @@ L_Banish: mes "He starts mumbling under his breath and you suddenly feel weirdly weightless. Your vision fades..."; mes "The last thing you hear is Waric shouting something about untalented apprentices."; set Hp, 1 + rand(5); - warp "017-1.gat", 0, 0; + warp "017-1", 0, 0; goto L_Close; L_FirstFlower: // 16: Got task to bring materials for first magical flower diff --git a/world/map/npc/017-4/waric.txt b/world/map/npc/017-4/waric.txt index 917c93db..618f4a8f 100644 --- a/world/map/npc/017-4/waric.txt +++ b/world/map/npc/017-4/waric.txt @@ -19,7 +19,7 @@ // OrumQuest State 41 - Learned Summon snake // When extending these Quest Variable to 51 all of the other dark magic spells will be available. Keep this in mind. -017-4.gat,216,36,0|script|Waric|153 +017-4,216,36,0|script|Waric|153 { set @mouboo_status, ((QUEST_MAGIC & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT) & 3; set @killed_mouboo, 0; @@ -223,7 +223,7 @@ L_Next3: L_NoOath: mes "Waric mumbles something. You guess it's a magic spell."; - warp "005-3.gat", 86 , 33; + warp "005-3", 86 , 33; percentheal 100, 0; percentheal -50, 0; set OrumQuest, OrumQuest + 1; @@ -298,7 +298,7 @@ L_Next6: next; mes "The Egg cracks open and a living snake comes out of the egg."; next; - monster "017-4.gat", 217,36, "Evil", 1010, 1; + monster "017-4", 217,36, "Evil", 1010, 1; mes "The wizard looks at you, his eyes flashing, and laughs diabolically."; set OrumQuest, 40; goto L_Close; @@ -383,7 +383,7 @@ L_Close: close; } -017-1.gat,74,32,0|script|DebugFlowerP|153 +017-1,74,32,0|script|DebugFlowerP|153 { mes "Debug options for Orum's quest:"; menu diff --git a/world/map/npc/017-9/announcements.txt b/world/map/npc/017-9/announcements.txt index 3ee68b07..696f961f 100644 --- a/world/map/npc/017-9/announcements.txt +++ b/world/map/npc/017-9/announcements.txt @@ -13,7 +13,7 @@ // $@GMSA_TICK: broadcast the message every $@GMSA_TICK hours // $@GMSA_CURRENT_TICK: internal counter incremented every hour -017-9.gat,26,24,0|script|Stone Board|145 +017-9,26,24,0|script|Stone Board|145 { if (getgmlevel() < 30) goto L_Close; diff --git a/world/map/npc/017-9/mapflags.txt b/world/map/npc/017-9/mapflags.txt index 75269c1a..7a013d6a 100644 --- a/world/map/npc/017-9/mapflags.txt +++ b/world/map/npc/017-9/mapflags.txt @@ -1 +1 @@ -017-9.gat|mapflag|resave|017-9,26,25 +017-9|mapflag|resave|017-9,26,25 diff --git a/world/map/npc/017-9/secret.txt b/world/map/npc/017-9/secret.txt index 49261537..555d6837 100644 --- a/world/map/npc/017-9/secret.txt +++ b/world/map/npc/017-9/secret.txt @@ -1,37 +1,37 @@ -009-1.gat,42,43,0|script|#SecretDoor|127,0,0 +009-1,42,43,0|script|#SecretDoor|127,0,0 { if (getgmlevel() < 40 && !debug) goto L_close; - warp "017-9.gat", 26, 25; + warp "017-9", 26, 25; goto L_close; L_close: close; } -020-1.gat,60,76,0|script|#SecretDoor2|127,0,0 +020-1,60,76,0|script|#SecretDoor2|127,0,0 { if (getgmlevel() < 40 && !debug) goto L_close; - warp "017-9.gat", 22, 22; + warp "017-9", 22, 22; goto L_close; L_close: close; } -001-1.gat,54,118,0|script|#SecretDoor3|127,0,0 +001-1,54,118,0|script|#SecretDoor3|127,0,0 { if (getgmlevel() < 40 && !debug) goto L_close; - warp "017-9.gat", 30, 22; + warp "017-9", 30, 22; goto L_close; L_close: close; } -027-2.gat,118,111,0|script|#SecretDoor4|127,0,0 +027-2,118,111,0|script|#SecretDoor4|127,0,0 { if (getgmlevel() < 40 && !debug) goto L_close; - warp "017-9.gat", 30, 29; + warp "017-9", 30, 29; goto L_close; L_close: diff --git a/world/map/npc/018-1/flowerpentagram3.txt b/world/map/npc/018-1/flowerpentagram3.txt index 08d72e79..857c412d 100644 --- a/world/map/npc/018-1/flowerpentagram3.txt +++ b/world/map/npc/018-1/flowerpentagram3.txt @@ -1,6 +1,6 @@ // Author: Jenalya -018-1.gat,83,29,0|script|#FlowerPentagram3|400 +018-1,83,29,0|script|#FlowerPentagram3|400 { if (OrumQuest >= 31) goto L_PlacedFifthFlower; @@ -17,7 +17,7 @@ L_ThirdFlower: "Leave.", L_Close; L_Next: - if (isin("018-1.gat", 82, 28, 84, 30)) + if (isin("018-1", 82, 28, 84, 30)) goto L_Place; mes "This isn't working, you're too far away."; @@ -25,12 +25,12 @@ L_Next: L_Place: set @localMonsterCount, - mobcount("018-1.gat", "#FlowerPentagram3::OnSquirrelDeath") + - mobcount("018-1.gat", "#FlowerPentagram3::OnMushroomDeath") + - mobcount("018-1.gat", "#FlowerPentagram3::OnBlueparDeath") + - mobcount("018-1.gat", "#FlowerPentagram3::OnScorpionDeath") + - mobcount("018-1.gat", "#FlowerPentagram3::OnRScorpionDeath") + - mobcount("018-1.gat", "#FlowerPentagram3::OnAScorpionDeath") + + mobcount("018-1", "#FlowerPentagram3::OnSquirrelDeath") + + mobcount("018-1", "#FlowerPentagram3::OnMushroomDeath") + + mobcount("018-1", "#FlowerPentagram3::OnBlueparDeath") + + mobcount("018-1", "#FlowerPentagram3::OnScorpionDeath") + + mobcount("018-1", "#FlowerPentagram3::OnRScorpionDeath") + + mobcount("018-1", "#FlowerPentagram3::OnAScorpionDeath") + 6; // the mobcount function has an offset of -1, so we add 6 to have the actual amount of monsters if (@localMonsterCount > 4) goto L_MonstersAlive; @@ -42,12 +42,12 @@ L_Place: mes "You feel the now familiar tension around you. Here they come."; set OrumQuest, 24; close2; - areamonster "018-1.gat", 73, 22, 89, 36, "", 1105, 1, "#FlowerPentagram3::OnSquirrelDeath"; - areamonster "018-1.gat", 73, 22, 89, 36, "", 1106, 2, "#FlowerPentagram3::OnMushroomDeath"; - areamonster "018-1.gat", 73, 22, 89, 36, "", 1107, 1, "#FlowerPentagram3::OnBlueparDeath"; - areamonster "018-1.gat", 73, 22, 89, 36, "", 1003, 2, "#FlowerPentagram3::OnScorpionDeath"; - areamonster "018-1.gat", 73, 22, 89, 36, "", 1004, 1, "#FlowerPentagram3::OnRScorpionDeath"; - areamonster "018-1.gat", 73, 22, 89, 36, "", 1057, 2, "#FlowerPentagram3::OnAScorpionDeath"; + areamonster "018-1", 73, 22, 89, 36, "", 1105, 1, "#FlowerPentagram3::OnSquirrelDeath"; + areamonster "018-1", 73, 22, 89, 36, "", 1106, 2, "#FlowerPentagram3::OnMushroomDeath"; + areamonster "018-1", 73, 22, 89, 36, "", 1107, 1, "#FlowerPentagram3::OnBlueparDeath"; + areamonster "018-1", 73, 22, 89, 36, "", 1003, 2, "#FlowerPentagram3::OnScorpionDeath"; + areamonster "018-1", 73, 22, 89, 36, "", 1004, 1, "#FlowerPentagram3::OnRScorpionDeath"; + areamonster "018-1", 73, 22, 89, 36, "", 1057, 2, "#FlowerPentagram3::OnAScorpionDeath"; set @value, 15; callfunc "QuestSagathaAnnoy"; set @value, 0; diff --git a/world/map/npc/018-1/mapflags.txt b/world/map/npc/018-1/mapflags.txt index b694150b..a1b62aab 100644 --- a/world/map/npc/018-1/mapflags.txt +++ b/world/map/npc/018-1/mapflags.txt @@ -1 +1 @@ -018-1.gat|mapflag|resave|018-2,88,32 +018-1|mapflag|resave|018-2,88,32 diff --git a/world/map/npc/018-1/mike.txt b/world/map/npc/018-1/mike.txt index 0ee02342..38fce03d 100644 --- a/world/map/npc/018-1/mike.txt +++ b/world/map/npc/018-1/mike.txt @@ -1,4 +1,4 @@ -018-1.gat,77,60,0|script|Mike|113 +018-1,77,60,0|script|Mike|113 { mes "[Mike]"; mes "\"I need black stingers to make some medicine to cure my sister.\""; diff --git a/world/map/npc/018-1/miners.txt b/world/map/npc/018-1/miners.txt index f7837f0c..a634ded4 100644 --- a/world/map/npc/018-1/miners.txt +++ b/world/map/npc/018-1/miners.txt @@ -1,5 +1,5 @@ // -018-1.gat,80,61,0|script|Miner|109 +018-1,80,61,0|script|Miner|109 { mes "[Miner]"; mes "\"Be careful in there.\""; diff --git a/world/map/npc/018-1/sword.txt b/world/map/npc/018-1/sword.txt index 58ad8ed2..8d5dc827 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|400 +018-1,110,43,0|script|#IceSword#_M|400 { if (getskilllv(SKILL_MAGIC)) goto L_message; diff --git a/world/map/npc/018-2/angus.txt b/world/map/npc/018-2/angus.txt index 6c9a76ed..5b7dda85 100644 --- a/world/map/npc/018-2/angus.txt +++ b/world/map/npc/018-2/angus.txt @@ -1,6 +1,6 @@ // Angus the craftsman -018-2.gat,31,39,0|script|Angus|147 +018-2,31,39,0|script|Angus|147 { set @honorific$, "lad"; if (Sex == 0) set @honorific$, "lass"; diff --git a/world/map/npc/018-2/books.txt b/world/map/npc/018-2/books.txt index 90c4d090..cd8148c0 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|400,0,1 +018-2,112,19,0|script|#Bookcase38|400,0,1 { callfunc "ClearVariables"; diff --git a/world/map/npc/018-2/caul.txt b/world/map/npc/018-2/caul.txt index eeae9b37..bf3bc4dd 100644 --- a/world/map/npc/018-2/caul.txt +++ b/world/map/npc/018-2/caul.txt @@ -7,7 +7,7 @@ //# //################################################################################# -018-2.gat,37,22,0|script|Caul|107 +018-2,37,22,0|script|Caul|107 { callfunc "ClearVariables"; diff --git a/world/map/npc/018-2/mapflags.txt b/world/map/npc/018-2/mapflags.txt index 2f4d4354..146c0378 100644 --- a/world/map/npc/018-2/mapflags.txt +++ b/world/map/npc/018-2/mapflags.txt @@ -1 +1 @@ -018-2.gat|mapflag|resave|018-2,88,32 +018-2|mapflag|resave|018-2,88,32 diff --git a/world/map/npc/018-2/miners.txt b/world/map/npc/018-2/miners.txt index 26662238..e29f15f6 100644 --- a/world/map/npc/018-2/miners.txt +++ b/world/map/npc/018-2/miners.txt @@ -1,7 +1,7 @@ // This NPC makes gem powders out of gemstones // Authors: Ali-G, enchilado, Jenalya -018-2.gat,85,23,0|script|Malek|109 +018-2,85,23,0|script|Malek|109 { callfunc "ClearVariables"; diff --git a/world/map/npc/018-2/receptionist.txt b/world/map/npc/018-2/receptionist.txt index b85ff2c1..50143f2c 100644 --- a/world/map/npc/018-2/receptionist.txt +++ b/world/map/npc/018-2/receptionist.txt @@ -1,6 +1,6 @@ // -018-2.gat,50,24,0|script|Receptionist#mine|108 +018-2,50,24,0|script|Receptionist#mine|108 { callfunc "ClearVariables"; diff --git a/world/map/npc/018-3/bookcase.txt b/world/map/npc/018-3/bookcase.txt index 50e2a40d..a2cf0431 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|400 +018-3,75,123,0|script|#DemonMineBookcase1|400 { callfunc "ClearVariables"; diff --git a/world/map/npc/018-3/evil-obelisk.txt b/world/map/npc/018-3/evil-obelisk.txt index b173e7f4..ac316fd5 100644 --- a/world/map/npc/018-3/evil-obelisk.txt +++ b/world/map/npc/018-3/evil-obelisk.txt @@ -1,9 +1,9 @@ // -018-3.gat,67,28,0|script|Evil Obelisk|185 +018-3,67,28,0|script|Evil Obelisk|185 { callfunc "ClearVariables"; - set @map$, "018-3.gat"; + set @map$, "018-3"; set @x0, 56; set @y0, 22; set @x1, 77; diff --git a/world/map/npc/018-3/mapflags.txt b/world/map/npc/018-3/mapflags.txt index 5979cf5b..6495e15c 100644 --- a/world/map/npc/018-3/mapflags.txt +++ b/world/map/npc/018-3/mapflags.txt @@ -1 +1 @@ -018-3.gat|mapflag|resave|018-2,88,32 +018-3|mapflag|resave|018-2,88,32 diff --git a/world/map/npc/018-3/sword.txt b/world/map/npc/018-3/sword.txt index bb5afa1d..83e9c6f2 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|400 +018-3,71,127,0|script|#DemonSword#_M|400 { if (getskilllv(SKILL_MAGIC)) goto L_message; diff --git a/world/map/npc/019-1/mapflags.txt b/world/map/npc/019-1/mapflags.txt index 24bd8599..888c4354 100644 --- a/world/map/npc/019-1/mapflags.txt +++ b/world/map/npc/019-1/mapflags.txt @@ -1 +1 @@ -019-1.gat|mapflag|resave|020-1,52,118 +019-1|mapflag|resave|020-1,52,118 diff --git a/world/map/npc/019-1/santa_helper.txt b/world/map/npc/019-1/santa_helper.txt index 7d4e864e..d5b5d3bc 100644 --- a/world/map/npc/019-1/santa_helper.txt +++ b/world/map/npc/019-1/santa_helper.txt @@ -2,7 +2,7 @@ // and extended by wushin to be included in the annual // quest made seasonal and adapted to new scripting standards by Jenalya -019-1.gat,74,75,0|script|Santa's Helper|105 +019-1,74,75,0|script|Santa's Helper|105 { callfunc "ClearVariables"; callfunc "XmasStates"; diff --git a/world/map/npc/019-1/snowman.txt b/world/map/npc/019-1/snowman.txt index c4b4a251..eb72c74a 100644 --- a/world/map/npc/019-1/snowman.txt +++ b/world/map/npc/019-1/snowman.txt @@ -1,7 +1,7 @@ // Author: accoring to git history probably Jaxad // quest made seasonal and adapted to new scripting standards by Jenalya -019-1.gat,77,44,0|script|Snowman|129 +019-1,77,44,0|script|Snowman|129 { callfunc "ClearVariables"; if (FLAGS & FLAG_SNOWMAN) goto L_Done; diff --git a/world/map/npc/019-3/mapflags.txt b/world/map/npc/019-3/mapflags.txt index 0a2dd566..665b004c 100644 --- a/world/map/npc/019-3/mapflags.txt +++ b/world/map/npc/019-3/mapflags.txt @@ -1 +1 @@ -019-3.gat|mapflag|resave|020-1,52,118 +019-3|mapflag|resave|020-1,52,118 diff --git a/world/map/npc/019-4/mapflags.txt b/world/map/npc/019-4/mapflags.txt index da582f7f..8b5e272c 100644 --- a/world/map/npc/019-4/mapflags.txt +++ b/world/map/npc/019-4/mapflags.txt @@ -1 +1 @@ -019-4.gat|mapflag|resave|020-1,52,118 +019-4|mapflag|resave|020-1,52,118 diff --git a/world/map/npc/020-1/KrickKrackKrock.txt b/world/map/npc/020-1/KrickKrackKrock.txt index cd0b7c3e..8ba67feb 100644 --- a/world/map/npc/020-1/KrickKrackKrock.txt +++ b/world/map/npc/020-1/KrickKrackKrock.txt @@ -3,7 +3,7 @@ //To enable: sed 's_^// __' -i npc/020-1/KrickKrackKrock.txt -// 020-1.gat,82,82,0|script|Criker|192 +// 020-1,82,82,0|script|Criker|192 // { // L_Main: // //Var diff --git a/world/map/npc/020-1/dock.txt b/world/map/npc/020-1/dock.txt index ce7807e8..46d7de73 100644 --- a/world/map/npc/020-1/dock.txt +++ b/world/map/npc/020-1/dock.txt @@ -1,5 +1,5 @@ // Ferry Sign -020-1.gat,81,76,0|script|Ferry Schedule#7|398 +020-1,81,76,0|script|Ferry Schedule#7|398 { callfunc "FerryManifest"; end; diff --git a/world/map/npc/020-1/mapflags.txt b/world/map/npc/020-1/mapflags.txt index 4044d492..dbaedb2e 100644 --- a/world/map/npc/020-1/mapflags.txt +++ b/world/map/npc/020-1/mapflags.txt @@ -1,2 +1,2 @@ -020-1.gat|mapflag|town -020-1.gat|mapflag|resave|020-1,52,118 +020-1|mapflag|town +020-1|mapflag|resave|020-1,52,118 diff --git a/world/map/npc/020-1/rockscissor.txt b/world/map/npc/020-1/rockscissor.txt index 1bfbf62c..9023b6d6 100644 --- a/world/map/npc/020-1/rockscissor.txt +++ b/world/map/npc/020-1/rockscissor.txt @@ -11,7 +11,7 @@ //To enable: sed 's_^// __' -i npc/020-1/rockscissor.txt -// 020-1.gat,74,78,0|script|Gobmel|189 +// 020-1,74,78,0|script|Gobmel|189 // { // //var // set @NPC_name$, "[Gobmel]"; diff --git a/world/map/npc/020-1/soul-menhir.txt b/world/map/npc/020-1/soul-menhir.txt index 5cd3c7e3..6066c2ea 100644 --- a/world/map/npc/020-1/soul-menhir.txt +++ b/world/map/npc/020-1/soul-menhir.txt @@ -1,9 +1,9 @@ // -020-1.gat,63,89,0|script|Soul Menhir#nivalis|346 +020-1,63,89,0|script|Soul Menhir#nivalis|346 { callfunc "ClearVariables"; - set @map$, "020-1.gat"; + set @map$, "020-1"; setarray @Xs, 62, 63, 64, 62, 64, 62, 64; setarray @Ys, 88, 88, 88, 89, 89, 90, 90; set @x, 0; diff --git a/world/map/npc/020-1/traveler.txt b/world/map/npc/020-1/traveler.txt index 65bacdbc..d873a57f 100644 --- a/world/map/npc/020-1/traveler.txt +++ b/world/map/npc/020-1/traveler.txt @@ -1,4 +1,4 @@ -020-1.gat,57,123,0|script|Knox the Traveler|103 +020-1,57,123,0|script|Knox the Traveler|103 { set @NpcName$, "Knox"; set @NpcTravelBit, $@nivalis_bit; diff --git a/world/map/npc/020-1/well.txt b/world/map/npc/020-1/well.txt index 9aa70d32..a4513536 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|400 +020-1,99,83,0|script|#Well|400 { set @Q_MASK, NIBBLE_4_MASK; set @Q_SHIFT, NIBBLE_4_SHIFT; @@ -98,7 +98,7 @@ S_Update_Var: return; } -020-2.gat,100,28,0|script|Miler|100 +020-2,100,28,0|script|Miler|100 { set @Q_MASK, NIBBLE_4_MASK; set @Q_SHIFT, NIBBLE_4_SHIFT; diff --git a/world/map/npc/020-2/baktar.txt b/world/map/npc/020-2/baktar.txt index cc6b7ef2..660ea92d 100644 --- a/world/map/npc/020-2/baktar.txt +++ b/world/map/npc/020-2/baktar.txt @@ -31,7 +31,7 @@ //# bit 0 knows the name/location of the opponent //# bit 1 killed the ugly opponent //#========================= -020-2.gat,70,61,0|script|Baktar|191 +020-2,70,61,0|script|Baktar|191 { set @npcname$, "[Baktar]"; diff --git a/world/map/npc/020-2/banker.txt b/world/map/npc/020-2/banker.txt index ac3b29df..3359501b 100644 --- a/world/map/npc/020-2/banker.txt +++ b/world/map/npc/020-2/banker.txt @@ -1,4 +1,4 @@ -020-2.gat,122,64,0|script|Ben|193 +020-2,122,64,0|script|Ben|193 { callfunc "ClearVariables"; set @npcname$, "Ben"; @@ -6,7 +6,7 @@ close; } -020-2.gat,127,63,0|script|Maria|190 +020-2,127,63,0|script|Maria|190 { mes "[Maria]"; mes "\"Hello!"; diff --git a/world/map/npc/020-2/furquest.txt b/world/map/npc/020-2/furquest.txt index d20e00c7..c03ffc41 100644 --- a/world/map/npc/020-2/furquest.txt +++ b/world/map/npc/020-2/furquest.txt @@ -2,7 +2,7 @@ // Script by Shaili and QOAL //################################################################################# -020-2.gat,24,26,0|script|Agostine Debug|137 +020-2,24,26,0|script|Agostine Debug|137 { mes "[Agostine Debug]"; mes "What do you want to do?"; @@ -38,7 +38,7 @@ OnInit: disablenpc "Agostine Debug"; end; } -020-2.gat,27,26,0|script|Agostine|137 +020-2,27,26,0|script|Agostine|137 { set @CUTFUR_EXP, 10; set @FINEDRESS_COTTON_CLOTHS, 20; diff --git a/world/map/npc/020-2/mapflags.txt b/world/map/npc/020-2/mapflags.txt index e39bcf84..3c7d918f 100644 --- a/world/map/npc/020-2/mapflags.txt +++ b/world/map/npc/020-2/mapflags.txt @@ -1,2 +1,2 @@ -020-2.gat|mapflag|town -020-2.gat|mapflag|resave|020-1,52,118 +020-2|mapflag|town +020-2|mapflag|resave|020-1,52,118 diff --git a/world/map/npc/020-2/shops.txt b/world/map/npc/020-2/shops.txt index 1c895902..9975ff3f 100644 --- a/world/map/npc/020-2/shops.txt +++ b/world/map/npc/020-2/shops.txt @@ -1,7 +1,7 @@ // Snow town shops // About the Area NPC -020-2.gat,75,28,0|script|Taylor|137 +020-2,75,28,0|script|Taylor|137 { mes "[Taylor]"; mes "\"While it can be dangerous up here in Kaizei, I take comfort that Nivalis is not surrounded by the Yeti like Thermin is. What a weird town.\""; @@ -14,12 +14,12 @@ close; } // Weapons shop -020-2.gat,25,65,0|shop|Bracco|135,IronArrow:*1,ShortBow:*4,Dagger:*1,LeatherShield:*1 +020-2,25,65,0|shop|Bracco|135,IronArrow:*1,ShortBow:*4,Dagger:*1,LeatherShield:*1 // Potions shop -020-2.gat,75,24,0|shop|Mede|103,CactusDrink:*1,CactusPotion:*1,IronPotion:*1,ConcentrationPotion:*1 +020-2,75,24,0|shop|Mede|103,CactusDrink:*1,CactusPotion:*1,IronPotion:*1,ConcentrationPotion:*1 // INN -020-2.gat,111,23,0|script|Kane|120 +020-2,111,23,0|script|Kane|120 { set @npcname$, "Kane the Inn Keeper"; set @cost, 100; diff --git a/world/map/npc/020-3/mapflags.txt b/world/map/npc/020-3/mapflags.txt index eadbab23..0f84b04c 100644 --- a/world/map/npc/020-3/mapflags.txt +++ b/world/map/npc/020-3/mapflags.txt @@ -1 +1 @@ -020-3.gat|mapflag|resave|020-1,52,118 +020-3|mapflag|resave|020-1,52,118 diff --git a/world/map/npc/021-3/mapflags.txt b/world/map/npc/021-3/mapflags.txt index 07afc1c8..d7155503 100644 --- a/world/map/npc/021-3/mapflags.txt +++ b/world/map/npc/021-3/mapflags.txt @@ -1 +1 @@ -021-3.gat|mapflag|resave|001-1,60,105 +021-3|mapflag|resave|001-1,60,105 diff --git a/world/map/npc/025-1/barrier.txt b/world/map/npc/025-1/barrier.txt index 8259c2ff..0b434ee4 100644 --- a/world/map/npc/025-1/barrier.txt +++ b/world/map/npc/025-1/barrier.txt @@ -1,6 +1,6 @@ // Authors: alastrim, Ali-g, Dark Mage -025-1.gat,42,79,0|script|#JuliaBarrier|45,1,1 +025-1,42,79,0|script|#JuliaBarrier|45,1,1 { if (Rossy_Quest > 14 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_Warp; if (Rossy_Quest <= 13) goto L_Block; @@ -8,7 +8,7 @@ goto L_Warp; L_Warp: - warp "025-3.gat", 112, 97; + warp "025-3", 112, 97; end; L_Block: diff --git a/world/map/npc/025-1/mapflags.txt b/world/map/npc/025-1/mapflags.txt index 779331b6..ec0bef1a 100644 --- a/world/map/npc/025-1/mapflags.txt +++ b/world/map/npc/025-1/mapflags.txt @@ -1 +1 @@ -025-1.gat|mapflag|resave|025-1,33,50 +025-1|mapflag|resave|025-1,33,50 diff --git a/world/map/npc/025-1/reset.txt b/world/map/npc/025-1/reset.txt index c1b38021..36e422b6 100644 --- a/world/map/npc/025-1/reset.txt +++ b/world/map/npc/025-1/reset.txt @@ -1,6 +1,6 @@ //To enable: sed 's_^// __' -i npc/025-1/reset.txt -// 025-1.gat,47,84,0|script|reset|145 +// 025-1,47,84,0|script|reset|145 // { // mes "Do you want to reset Rossy Quest?"; // menu diff --git a/world/map/npc/025-1/rossy.txt b/world/map/npc/025-1/rossy.txt index 412f3f48..bc51559e 100644 --- a/world/map/npc/025-1/rossy.txt +++ b/world/map/npc/025-1/rossy.txt @@ -1,6 +1,6 @@ // Authors: alastrim, Ali-g, Dark Mage -025-1.gat,80,88,0|script|Rossy|114 +025-1,80,88,0|script|Rossy|114 { set @child_number, 6; callfunc "XmasList"; diff --git a/world/map/npc/025-3/barriers.txt b/world/map/npc/025-3/barriers.txt index dac14128..c9c404fa 100644 --- a/world/map/npc/025-3/barriers.txt +++ b/world/map/npc/025-3/barriers.txt @@ -2,11 +2,11 @@ // -----------------------------------Warp to Cave 1 --------------------------------------- -025-3.gat,78,127,0|script|#WarpBattleCave1|45,1,1 +025-3,78,127,0|script|#WarpBattleCave1|45,1,1 { if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped; - if (getareausers("025-4.gat", 26, 63, 60, 97) >= 1 || $@battlecave1 > 0) + if (getareausers("025-4", 26, 63, 60, 97) >= 1 || $@battlecave1 > 0) goto L_SomeoneInside; if (cavefights & BATTLE_CAVE1) goto L_AlreadyDone; @@ -16,7 +16,7 @@ L_StartFight: set $@battlecave1, 1; - warp "025-4.gat", 41, 95; + warp "025-4", 41, 95; set $@cave1fighter$, strcharinfo(0); set $@cave1fighterdeaths, PC_DIE_COUNTER; set $@cave1start, gettimetick(2); @@ -50,7 +50,7 @@ OnTimer5000: goto L_AlreadyClean; if (attachrid(getcharid(3,$@cave1fighter$))==0) goto OnNoRid; - if (getareausers("025-4.gat", 26, 63, 60, 97) < 1) + if (getareausers("025-4", 26, 63, 60, 97) < 1) goto OnNoRid; if (PC_DIE_COUNTER > $@cave1fighterdeaths) goto L_CleaningDead; @@ -86,25 +86,25 @@ S_Cleaning: cleararray $@cave1_monsters_QTY[0], 0, 2; set $@cave1_waves, 0; set $@cave1_time, 0; - killmonster "025-4.gat", "#StartCaveFight1::OnMonsterDeath"; + killmonster "025-4", "#StartCaveFight1::OnMonsterDeath"; stopnpctimer; setnpctimer 0; return; L_BadAir: - warp "025-3.gat", 78, 129; + warp "025-3", 78, 129; message strcharinfo(0), "You can't stand the foul air inside the cave and run away!"; callsub S_Cleaning; end; L_Cleaning: - warp "025-3.gat", 78, 129; + warp "025-3", 78, 129; message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe...."; callsub S_Cleaning; end; L_CleaningDead: - warp "025-3.gat", 78, 129; + warp "025-3", 78, 129; message strcharinfo(0), "You were not strong enough to eliminate this power source."; callsub S_Cleaning; end; @@ -116,7 +116,7 @@ OnNoRid: OnGetout: if (attachrid(getcharid(3,$@cave1fighter$)) == 0) goto OnNoRid; - warp "025-3.gat", 78, 129; + warp "025-3", 78, 129; callsub S_Cleaning; end; @@ -129,11 +129,11 @@ L_AlreadyClean: // ---------------------------- Warp to Cave 2 ---------------------------- -025-3.gat,53,107,0|script|#WarpBattleCave2|45,1,1 +025-3,53,107,0|script|#WarpBattleCave2|45,1,1 { if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped; - if (getareausers("025-4.gat", 97, 62, 126, 96) >= 1 || $@battlecave2 > 0) + if (getareausers("025-4", 97, 62, 126, 96) >= 1 || $@battlecave2 > 0) goto L_SomeoneInside; if (cavefights & BATTLE_CAVE2) goto L_AlreadyDone; @@ -143,7 +143,7 @@ L_AlreadyClean: L_StartFight: set $@battlecave2, 1; - warp "025-4.gat", 110, 94; + warp "025-4", 110, 94; set $@cave2fighter$, strcharinfo(0); set $@cave2fighterdeaths, PC_DIE_COUNTER; set $@cave2start, gettimetick(2); @@ -177,7 +177,7 @@ OnTimer5000: goto L_AlreadyClean; if (attachrid(getcharid(3,$@cave2fighter$))==0) goto OnNoRid; - if (getareausers("025-4.gat", 97, 62, 126, 96) < 1) + if (getareausers("025-4", 97, 62, 126, 96) < 1) goto OnNoRid; if (PC_DIE_COUNTER > $@cave2fighterdeaths) goto L_CleaningDead; @@ -213,25 +213,25 @@ S_Cleaning: cleararray $@cave2_monsters_QTY[0], 0, 2; set $@cave2_waves, 0; set $@cave2_time, 0; - killmonster "025-4.gat", "#StartCaveFight2::OnMonsterDeath"; + killmonster "025-4", "#StartCaveFight2::OnMonsterDeath"; stopnpctimer; setnpctimer 0; return; L_BadAir: - warp "025-3.gat", 53, 109; + warp "025-3", 53, 109; message strcharinfo(0), "You can't stand the foul air inside the cave and run away!"; callsub S_Cleaning; end; L_Cleaning: - warp "025-3.gat", 53, 109; + warp "025-3", 53, 109; message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe...."; callsub S_Cleaning; end; L_CleaningDead: - warp "025-3.gat", 53, 109; + warp "025-3", 53, 109; message strcharinfo(0), "You were not strong enough to eliminate this power source."; callsub S_Cleaning; end; @@ -243,7 +243,7 @@ OnNoRid: OnGetout: if (attachrid(getcharid(3,$@cave2fighter$)) == 0) goto OnNoRid; - warp "025-3.gat", 53, 109; + warp "025-3", 53, 109; callsub S_Cleaning; end; @@ -255,11 +255,11 @@ L_AlreadyClean: // --------------------------------- Warp to Cave 3 ---------------------------------------- -025-3.gat,71,83,0|script|#WarpBattleCave3|45,1,1 +025-3,71,83,0|script|#WarpBattleCave3|45,1,1 { if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped; - if (getareausers("025-4.gat", 150, 84, 177, 117) >= 1 || $@battlecave3 > 0) + if (getareausers("025-4", 150, 84, 177, 117) >= 1 || $@battlecave3 > 0) goto L_SomeoneInside; if (cavefights & BATTLE_CAVE3) goto L_AlreadyDone; @@ -269,7 +269,7 @@ L_AlreadyClean: L_StartFight: set $@battlecave3, 1; - warp "025-4.gat", 168, 115; + warp "025-4", 168, 115; set $@cave3fighter$, strcharinfo(0); set $@cave3fighterdeaths, PC_DIE_COUNTER; set $@cave3start, gettimetick(2); @@ -303,7 +303,7 @@ OnTimer5000: goto L_AlreadyClean; if (attachrid(getcharid(3,$@cave3fighter$))==0) goto OnNoRid; - if (getareausers("025-4.gat", 150, 84, 177, 117) < 1) + if (getareausers("025-4", 150, 84, 177, 117) < 1) goto OnNoRid; if (cavefights & BATTLE_CAVE3) goto L_Win; @@ -339,25 +339,25 @@ S_Cleaning: cleararray $@cave3_monsters_QTY[0], 0, 2; set $@cave3_waves, 0; set $@cave3_time, 0; - killmonster "025-4.gat", "#StartCaveFight3::OnMonsterDeath"; + killmonster "025-4", "#StartCaveFight3::OnMonsterDeath"; stopnpctimer; setnpctimer 0; return; L_BadAir: - warp "025-3.gat", 71, 85; + warp "025-3", 71, 85; message strcharinfo(0), "You can't stand the foul air inside the cave and run away!"; callsub S_Cleaning; end; L_Cleaning: - warp "025-3.gat", 71, 85; + warp "025-3", 71, 85; message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe...."; callsub S_Cleaning; end; L_CleaningDead: - warp "025-3.gat", 71, 85; + warp "025-3", 71, 85; message strcharinfo(0), "You were not strong enough to eliminate this power source."; callsub S_Cleaning; end; @@ -369,7 +369,7 @@ OnNoRid: OnGetout: if (attachrid(getcharid(3,$@cave3fighter$)) == 0) goto OnNoRid; - warp "025-3.gat", 71, 85; + warp "025-3", 71, 85; callsub S_Cleaning; end; @@ -381,11 +381,11 @@ L_AlreadyClean: // --------------------------- Warp to Cave 4 -------------------------------------- -025-3.gat,80,83,0|script|#WarpBattleCave4|45,1,1 +025-3,80,83,0|script|#WarpBattleCave4|45,1,1 { if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped; - if (getareausers("025-4.gat", 28, 124, 57, 156) >= 1 || $@battlecave4 > 0) + if (getareausers("025-4", 28, 124, 57, 156) >= 1 || $@battlecave4 > 0) goto L_SomeoneInside; if (cavefights & BATTLE_CAVE4) goto L_AlreadyDone; @@ -395,7 +395,7 @@ L_AlreadyClean: L_StartFight: set $@battlecave4, 1; - warp "025-4.gat", 32, 154; + warp "025-4", 32, 154; set $@cave4fighter$, strcharinfo(0); set $@cave4fighterdeaths, PC_DIE_COUNTER; set $@cave4start, gettimetick(2); @@ -429,7 +429,7 @@ OnTimer5000: goto L_AlreadyClean; if (attachrid(getcharid(3,$@cave4fighter$))==0) goto OnNoRid; - if (getareausers("025-4.gat", 28, 124, 57, 156) < 1) + if (getareausers("025-4", 28, 124, 57, 156) < 1) goto OnNoRid; if (PC_DIE_COUNTER > $@cave4fighterdeaths) goto L_CleaningDead; @@ -465,25 +465,25 @@ S_Cleaning: cleararray $@cave4_monsters_QTY[0], 0, 3; set $@cave4_waves, 0; set $@cave4_time, 0; - killmonster "025-4.gat", "#StartCaveFight4::OnMonsterDeath"; + killmonster "025-4", "#StartCaveFight4::OnMonsterDeath"; stopnpctimer; setnpctimer 0; return; L_BadAir: - warp "025-3.gat", 80, 85; + warp "025-3", 80, 85; message strcharinfo(0), "You can't stand the foul air inside the cave and run away!"; callsub S_Cleaning; end; L_Cleaning: - warp "025-3.gat", 80, 85; + warp "025-3", 80, 85; message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe...."; callsub S_Cleaning; end; L_CleaningDead: - warp "025-3.gat", 80, 85; + warp "025-3", 80, 85; message strcharinfo(0), "You were not strong enough to eliminate this power source."; callsub S_Cleaning; end; @@ -495,7 +495,7 @@ OnNoRid: OnGetout: if (attachrid(getcharid(3,$@cave4fighter$)) == 0) goto OnNoRid; - warp "025-3.gat", 80, 85; + warp "025-3", 80, 85; callsub S_Cleaning; end; @@ -507,11 +507,11 @@ L_AlreadyClean: // --------------------------- Warp to Cave 5 ---------------------------------------- -025-3.gat,71,30,0|script|#WarpBattleCave5|45,1,1 +025-3,71,30,0|script|#WarpBattleCave5|45,1,1 { if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped; - if (getareausers("025-4.gat", 91, 131, 124, 160) >= 1 || $@battlecave5 > 0) + if (getareausers("025-4", 91, 131, 124, 160) >= 1 || $@battlecave5 > 0) goto L_SomeoneInside; if (cavefights & BATTLE_CAVE5) goto L_AlreadyDone; @@ -521,7 +521,7 @@ L_AlreadyClean: L_StartFight: set $@battlecave5, 1; - warp "025-4.gat", 100, 158; + warp "025-4", 100, 158; set $@cave5fighter$, strcharinfo(0); set $@cave5fighterdeaths, PC_DIE_COUNTER; set $@cave5start, gettimetick(2); @@ -555,7 +555,7 @@ OnTimer5000: goto L_AlreadyClean; if (attachrid(getcharid(3,$@cave5fighter$))==0) goto OnNoRid; - if (getareausers("025-4.gat", 91, 131, 124, 160) < 1) + if (getareausers("025-4", 91, 131, 124, 160) < 1) goto OnNoRid; if (PC_DIE_COUNTER > $@cave5fighterdeaths) goto L_CleaningDead; @@ -591,25 +591,25 @@ S_Cleaning: cleararray $@cave5_monsters_QTY[0], 0, 3; set $@cave5_waves, 0; set $@cave5_time, 0; - killmonster "025-4.gat", "#StartCaveFight5::OnMonsterDeath"; + killmonster "025-4", "#StartCaveFight5::OnMonsterDeath"; stopnpctimer; setnpctimer 0; return; L_BadAir: - warp "025-3.gat", 71, 32; + warp "025-3", 71, 32; message strcharinfo(0), "You can't stand the foul air inside the cave and run away!"; callsub S_Cleaning; end; L_Cleaning: - warp "025-3.gat", 71, 32; + warp "025-3", 71, 32; message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe...."; callsub S_Cleaning; end; L_CleaningDead: - warp "025-3.gat", 71, 32; + warp "025-3", 71, 32; message strcharinfo(0), "You were not strong enough to eliminate this power source."; callsub S_Cleaning; end; @@ -621,7 +621,7 @@ OnNoRid: OnGetout: if (attachrid(getcharid(3,$@cave5fighter$)) == 0) goto OnNoRid; - warp "025-3.gat", 71, 32; + warp "025-3", 71, 32; callsub S_Cleaning; end; @@ -633,11 +633,11 @@ L_AlreadyClean: // -------------------------------- Warp to Cave 6 ----------------------------------------- -025-3.gat,128,35,0|script|#WarpBattleCave6|45,1,1 +025-3,128,35,0|script|#WarpBattleCave6|45,1,1 { if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped; - if (getareausers("025-4.gat", 153, 143, 178, 174) >= 1 || $@battlecave6 > 0) + if (getareausers("025-4", 153, 143, 178, 174) >= 1 || $@battlecave6 > 0) goto L_SomeoneInside; if (cavefights & BATTLE_CAVE6) goto L_AlreadyDone; @@ -647,7 +647,7 @@ L_AlreadyClean: L_StartFight: set $@battlecave6, 1; - warp "025-4.gat", 159, 172; + warp "025-4", 159, 172; set $@cave6fighter$, strcharinfo(0); set $@cave6fighterdeaths, PC_DIE_COUNTER; set $@cave6start, gettimetick(2); @@ -681,7 +681,7 @@ OnTimer5000: goto L_AlreadyClean; if (attachrid(getcharid(3,$@cave6fighter$))==0) goto OnNoRid; - if (getareausers("025-4.gat", 153, 143, 178, 174) < 1) + if (getareausers("025-4", 153, 143, 178, 174) < 1) goto OnNoRid; if (PC_DIE_COUNTER > $@cave6fighterdeaths) goto L_CleaningDead; @@ -717,25 +717,25 @@ S_Cleaning: cleararray $@cave6_monsters_QTY[0], 0, 3; set $@cave6_waves, 0; set $@cave6_time, 0; - killmonster "025-4.gat", "#StartCaveFight6::OnMonsterDeath"; + killmonster "025-4", "#StartCaveFight6::OnMonsterDeath"; stopnpctimer; setnpctimer 0; return; L_BadAir: - warp "025-3.gat", 128, 37; + warp "025-3", 128, 37; message strcharinfo(0), "You can't stand the foul air inside the cave and run away!"; callsub S_Cleaning; end; L_Cleaning: - warp "025-3.gat", 128, 37; + warp "025-3", 128, 37; message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe...."; callsub S_Cleaning; end; L_CleaningDead: - warp "025-3.gat", 128, 37; + warp "025-3", 128, 37; message strcharinfo(0), "You were not strong enough to eliminate this power source."; callsub S_Cleaning; end; @@ -747,7 +747,7 @@ OnNoRid: OnGetout: if (attachrid(getcharid(3,$@cave6fighter$)) == 0) goto OnNoRid; - warp "025-3.gat", 128, 37; + warp "025-3", 128, 37; callsub S_Cleaning; end; @@ -759,11 +759,11 @@ L_AlreadyClean: // ---------------------------- Warp to Cave 7 ------------------------------------------ -025-3.gat,70,57,0|script|#WarpBattleCave7|45,1,1 +025-3,70,57,0|script|#WarpBattleCave7|45,1,1 { if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped; - if (getareausers("025-4.gat", 27, 185, 61, 219) >= 1 || $@battlecave7 > 0) + if (getareausers("025-4", 27, 185, 61, 219) >= 1 || $@battlecave7 > 0) goto L_SomeoneInside; if (cavefights & BATTLE_CAVE7) goto L_AlreadyDone; @@ -773,7 +773,7 @@ L_AlreadyClean: L_StartFight: set $@battlecave7, 1; - warp "025-4.gat", 42, 217; + warp "025-4", 42, 217; set $@cave7fighter$, strcharinfo(0); set $@cave7fighterdeaths, PC_DIE_COUNTER; set $@cave7start, gettimetick(2); @@ -807,7 +807,7 @@ OnTimer5000: goto L_AlreadyClean; if (attachrid(getcharid(3,$@cave7fighter$))==0) goto OnNoRid; - if (getareausers("025-4.gat", 27, 185, 61, 219) < 1) + if (getareausers("025-4", 27, 185, 61, 219) < 1) goto OnNoRid; if (PC_DIE_COUNTER > $@cave7fighterdeaths) goto L_CleaningDead; @@ -843,25 +843,25 @@ S_Cleaning: cleararray $@cave7_monsters_QTY[0], 0, 4; set $@cave7_waves, 0; set $@cave7_time, 0; - killmonster "025-4.gat", "#StartCaveFight7::OnMonsterDeath"; + killmonster "025-4", "#StartCaveFight7::OnMonsterDeath"; stopnpctimer; setnpctimer 0; return; L_BadAir: - warp "025-3.gat", 70, 59; + warp "025-3", 70, 59; message strcharinfo(0), "You can't stand the foul air inside the cave and run away!"; callsub S_Cleaning; end; L_Cleaning: - warp "025-3.gat", 70, 59; + warp "025-3", 70, 59; message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe...."; callsub S_Cleaning; end; L_CleaningDead: - warp "025-3.gat", 70, 59; + warp "025-3", 70, 59; message strcharinfo(0), "You were not strong enough to eliminate this power source."; callsub S_Cleaning; end; @@ -873,7 +873,7 @@ OnNoRid: OnGetout: if (attachrid(getcharid(3,$@cave7fighter$)) == 0) goto OnNoRid; - warp "025-3.gat", 70, 59; + warp "025-3", 70, 59; callsub S_Cleaning; end; @@ -885,11 +885,11 @@ L_AlreadyClean: // -----------------------------------------------Warp to Cave 8------------------------------------------------------------- -025-3.gat,138,92,0|script|#WarpBattleCave8|45,1,1 +025-3,138,92,0|script|#WarpBattleCave8|45,1,1 { if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped; - if (getareausers("025-4.gat", 90, 193, 119, 216) >= 1 || $@battlecave8 > 0) + if (getareausers("025-4", 90, 193, 119, 216) >= 1 || $@battlecave8 > 0) goto L_SomeoneInside; if (cavefights & BATTLE_CAVE8) goto L_AlreadyDone; @@ -899,7 +899,7 @@ L_AlreadyClean: L_StartFight: set $@battlecave8, 1; - warp "025-4.gat", 105, 214; + warp "025-4", 105, 214; set $@cave8fighter$, strcharinfo(0); set $@cave8fighterdeaths, PC_DIE_COUNTER; set $@cave8start, gettimetick(2); @@ -933,7 +933,7 @@ OnTimer5000: goto L_AlreadyClean; if (attachrid(getcharid(3,$@cave8fighter$))==0) goto OnNoRid; - if (getareausers("025-4.gat", 90, 193, 119, 216) < 1) + if (getareausers("025-4", 90, 193, 119, 216) < 1) goto OnNoRid; if (PC_DIE_COUNTER > $@cave8fighterdeaths) goto L_CleaningDead; @@ -969,25 +969,25 @@ S_Cleaning: cleararray $@cave8_monsters_QTY[0], 0, 4; set $@cave8_waves, 0; set $@cave8_time, 0; - killmonster "025-4.gat", "#StartCaveFight8::OnMonsterDeath"; + killmonster "025-4", "#StartCaveFight8::OnMonsterDeath"; stopnpctimer; setnpctimer 0; return; L_BadAir: - warp "025-3.gat", 138, 94; + warp "025-3", 138, 94; message strcharinfo(0), "You can't stand the foul air inside the cave and run away!"; callsub S_Cleaning; end; L_Cleaning: - warp "025-3.gat", 138, 94; + warp "025-3", 138, 94; message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe...."; callsub S_Cleaning; end; L_CleaningDead: - warp "025-3.gat", 138, 94; + warp "025-3", 138, 94; message strcharinfo(0), "You were not strong enough to eliminate this power source."; callsub S_Cleaning; end; @@ -999,7 +999,7 @@ OnNoRid: OnGetout: if (attachrid(getcharid(3,$@cave8fighter$)) == 0) goto OnNoRid; - warp "025-3.gat", 138, 94; + warp "025-3", 138, 94; callsub S_Cleaning; end; @@ -1011,11 +1011,11 @@ L_AlreadyClean: // ------------------------------ Warp to Cave 9 ---------------------------------------- -025-3.gat,138,160,0|script|#WarpBattleCave9|45,1,1 +025-3,138,160,0|script|#WarpBattleCave9|45,1,1 { if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped; - if (getareausers("025-4.gat", 144, 192, 173, 226) >= 1 || $@battlecave9 > 0) + if (getareausers("025-4", 144, 192, 173, 226) >= 1 || $@battlecave9 > 0) goto L_SomeoneInside; if (cavefights & BATTLE_CAVE9) goto L_AlreadyDone; @@ -1025,7 +1025,7 @@ L_AlreadyClean: L_StartFight: set $@battlecave9, 1; - warp "025-4.gat", 157, 222; + warp "025-4", 157, 222; set $@cave9fighter$, strcharinfo(0); set $@cave9fighterdeaths, PC_DIE_COUNTER; set $@cave9start, gettimetick(2); @@ -1059,7 +1059,7 @@ OnTimer5000: goto L_AlreadyClean; if (attachrid(getcharid(3,$@cave9fighter$))==0) goto OnNoRid; - if (getareausers("025-4.gat", 144, 192, 173, 226) < 1) + if (getareausers("025-4", 144, 192, 173, 226) < 1) goto OnNoRid; if (PC_DIE_COUNTER > $@cave9fighterdeaths) goto L_CleaningDead; @@ -1095,25 +1095,25 @@ S_Cleaning: cleararray $@cave9_monsters_QTY[0], 0, 4; set $@cave9_waves, 0; set $@cave9_time, 0; - killmonster "025-4.gat", "#StartCaveFight9::OnMonsterDeath"; + killmonster "025-4", "#StartCaveFight9::OnMonsterDeath"; stopnpctimer; setnpctimer 0; return; L_BadAir: - warp "025-3.gat", 138, 158; + warp "025-3", 138, 158; message strcharinfo(0), "You can't stand the foul air inside the cave and run away!"; callsub S_Cleaning; end; L_Cleaning: - warp "025-3.gat", 138, 158; + warp "025-3", 138, 158; message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe...."; callsub S_Cleaning; end; L_CleaningDead: - warp "025-3.gat", 138, 158; + warp "025-3", 138, 158; message strcharinfo(0), "You were not strong enough to eliminate this power source."; callsub S_Cleaning; end; @@ -1125,7 +1125,7 @@ OnNoRid: OnGetout: if (attachrid(getcharid(3,$@cave9fighter$)) == 0) goto OnNoRid; - warp "025-3.gat", 138, 158; + warp "025-3", 138, 158; callsub S_Cleaning; end; @@ -1137,7 +1137,7 @@ L_AlreadyClean: // ----------------------------- Warp to Boss Cave ------------------------------- -025-3.gat,77,170,0|script|#WarpBossCave|45,1,1 +025-3,77,170,0|script|#WarpBossCave|45,1,1 { if (Rossy_Quest > 16 || FLAGS & FLAG_ROSSI_COMPLETED) end; @@ -1164,7 +1164,7 @@ L_AlreadyClean: set @barrier_force, @barrier_force + 1; if (@barrier_force != 0) goto L_Hurt; - if (getareausers("025-4.gat", 142, 24, 172, 48) >= 1 || $@battlecave10 > 0) + if (getareausers("025-4", 142, 24, 172, 48) >= 1 || $@battlecave10 > 0) goto L_SomeoneInside; if (@barrier_force == 0) goto L_StartFight; @@ -1173,13 +1173,13 @@ L_AlreadyClean: L_Hurt: message strcharinfo(0), "As you try to enter, you bump into a magic barrier. Its force pushes you back, hurting you badly."; percentheal @barrier_force * 10, 0; - warp "025-3.gat", 77, 164; + warp "025-3", 77, 164; end; L_StartFight: message strcharinfo(0), "You go through the magic barrier without problems... you can hear screams that seem to be very close."; set $@battlecave10, 1; - warp "025-4.gat", 157, 44; + warp "025-4", 157, 44; set $@cave10fighter$, strcharinfo(0); set $@cave10fighterdeaths, PC_DIE_COUNTER; set $@cave10start, gettimetick(2); @@ -1198,7 +1198,7 @@ L_SomeoneInside: L_AlreadyHelped: message strcharinfo(0), "There is nothing more than corpses in this cave. You close your eyes and go straight to the place where Julia is hidden."; - warp "025-4.gat", 93, 33; + warp "025-4", 93, 33; end; OnTimer5000: @@ -1206,7 +1206,7 @@ OnTimer5000: goto L_AlreadyClean; if (attachrid(getcharid(3,$@cave10fighter$))==0) goto OnNoRid; - if (getareausers("025-4.gat", 142, 24, 172, 48) < 1) + if (getareausers("025-4", 142, 24, 172, 48) < 1) goto OnNoRid; if (PC_DIE_COUNTER > $@cave10fighterdeaths) goto L_CleaningDead; @@ -1243,26 +1243,26 @@ S_Cleaning: set $@cave10_boss_ID, 0; set $@cave10_waves, 0; set $@cave10_time, 0; - killmonster "025-4.gat", "#StartBossCaveFight::OnMonsterDeath"; - killmonster "025-4.gat", "#StartBossCaveFight::OnBossDeath"; + killmonster "025-4", "#StartBossCaveFight::OnMonsterDeath"; + killmonster "025-4", "#StartBossCaveFight::OnBossDeath"; stopnpctimer; setnpctimer 0; return; L_BadAir: - warp "025-4.gat", 93, 33; + warp "025-4", 93, 33; message strcharinfo(0), "You can't stand the foul air inside the cave and run as fast as you can to save Julia!"; callsub S_Cleaning; end; L_Cleaning: - warp "025-3.gat", 77, 168; + warp "025-3", 77, 168; message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe...."; callsub S_Cleaning; end; L_CleaningDead: - warp "025-3.gat", 77, 168; + warp "025-3", 77, 168; if ($@wave_cave10 < 5) message strcharinfo(0), "You were not strong enough to eliminate this power source."; if ($@wave_cave10 == 5) @@ -1277,14 +1277,14 @@ OnNoRid: OnGetout: if (attachrid(getcharid(3,$@cave10fighter$)) == 0) goto OnNoRid; - warp "025-3.gat", 77, 168; + warp "025-3", 77, 168; callsub S_Cleaning; end; OnWin: if (attachrid(getcharid(3,$@cave10fighter$)) == 0) goto OnNoRid; - warp "025-4.gat", 93, 33; + warp "025-4", 93, 33; callsub S_Cleaning; end; diff --git a/world/map/npc/025-3/mapflags.txt b/world/map/npc/025-3/mapflags.txt index aba49653..58e68ca5 100644 --- a/world/map/npc/025-3/mapflags.txt +++ b/world/map/npc/025-3/mapflags.txt @@ -1 +1 @@ -025-3.gat|mapflag|resave|025-1,33,50 +025-3|mapflag|resave|025-1,33,50 diff --git a/world/map/npc/025-4/battlecaves.txt b/world/map/npc/025-4/battlecaves.txt index 142f1282..c21fafbc 100644 --- a/world/map/npc/025-4/battlecaves.txt +++ b/world/map/npc/025-4/battlecaves.txt @@ -2,7 +2,7 @@ // --------------------------------- Cave 1 ----------------------------------- -025-4.gat,41,85,0|script|#StartCaveFight1|324 +025-4,41,85,0|script|#StartCaveFight1|324 { if ($@battlecave1 == 2 && $@cave1fighter$ == strcharinfo(0)) end; @@ -35,7 +35,7 @@ L_PlaceCenter: L_Summon: set $@cave1_loop, $@cave1_loop + 1; - areamonster "025-4.gat",26,63,60,97,"",$@cave1_monsters_IDS[$@cave1_loop],$@cave1_monsters_QTY[$@cave1_loop],"#StartCaveFight1::OnMonsterDeath"; + areamonster "025-4",26,63,60,97,"",$@cave1_monsters_IDS[$@cave1_loop],$@cave1_monsters_QTY[$@cave1_loop],"#StartCaveFight1::OnMonsterDeath"; if ($@cave1_loop <= getarraysize($@cave1_monsters_IDS)) goto L_Summon; set $@cave1_loop, 0; @@ -79,7 +79,7 @@ L_no_root: // --------------------- Cave 1 Checker ---------------------------- -025-4.gat,41,97,0|script|#CheckCaveFight1|45,1,1 +025-4,41,97,0|script|#CheckCaveFight1|45,1,1 { if (cavefights & BATTLE_CAVE1 || $@battlecave1 == 1) goto L_Done; @@ -94,7 +94,7 @@ L_Done: // --------------------------------- Cave 2 --------------------------------------- -025-4.gat,115,77,0|script|#StartCaveFight2|324 +025-4,115,77,0|script|#StartCaveFight2|324 { if ($@battlecave2 == 2 && $@cave2fighter$ == strcharinfo(0)) end; @@ -127,7 +127,7 @@ L_PlaceCenter: L_Summon: set $@cave2_loop, $@cave2_loop + 1; - areamonster "025-4.gat",97, 62, 126, 96,"",$@cave2_monsters_IDS[$@cave2_loop],$@cave2_monsters_QTY[$@cave2_loop],"#StartCaveFight2::OnMonsterDeath"; + areamonster "025-4",97, 62, 126, 96,"",$@cave2_monsters_IDS[$@cave2_loop],$@cave2_monsters_QTY[$@cave2_loop],"#StartCaveFight2::OnMonsterDeath"; if ($@cave2_loop <= getarraysize($@cave2_monsters_IDS)) goto L_Summon; set $@cave2_loop, 0; @@ -171,7 +171,7 @@ L_no_root: // --------------------- Cave 2 Checker ---------------------------- -025-4.gat,110,96,0|script|#CheckCaveFight2|45,1,1 +025-4,110,96,0|script|#CheckCaveFight2|45,1,1 { if (cavefights & BATTLE_CAVE2 || $@battlecave2 == 1) goto L_Done; @@ -184,7 +184,7 @@ L_Done: } // ------------------------------------ Cave 3 -------------------------------------- -025-4.gat,164,103,0|script|#StartCaveFight3|324 +025-4,164,103,0|script|#StartCaveFight3|324 { if ($@battlecave3 == 2 && $@cave3fighter$ == strcharinfo(0)) end; @@ -217,7 +217,7 @@ L_PlaceCenter: L_Summon: set $@cave3_loop, $@cave3_loop + 1; - areamonster "025-4.gat",150, 84, 177, 117,"",$@cave3_monsters_IDS[$@cave3_loop],$@cave3_monsters_QTY[$@cave3_loop],"#StartCaveFight3::OnMonsterDeath"; + areamonster "025-4",150, 84, 177, 117,"",$@cave3_monsters_IDS[$@cave3_loop],$@cave3_monsters_QTY[$@cave3_loop],"#StartCaveFight3::OnMonsterDeath"; if ($@cave3_loop <= getarraysize($@cave3_monsters_IDS)) goto L_Summon; set $@cave3_loop, 0; @@ -262,7 +262,7 @@ L_no_root: // --------------------- Cave 3 Checker ---------------------------- -025-4.gat,168,117,0|script|#CheckCaveFight3|45,1,1 +025-4,168,117,0|script|#CheckCaveFight3|45,1,1 { if (cavefights & BATTLE_CAVE3 || $@battlecave3 == 1) goto L_Done; @@ -275,7 +275,7 @@ L_Done: } // --------------------------- Cave 4 -------------------------------- -025-4.gat,39,143,0|script|#StartCaveFight4|324 +025-4,39,143,0|script|#StartCaveFight4|324 { if ($@battlecave4 == 2 && $@cave4fighter$ == strcharinfo(0)) end; @@ -308,7 +308,7 @@ L_PlaceCenter: L_Summon: set $@cave4_loop, $@cave4_loop + 1; - areamonster "025-4.gat",28, 124, 57, 156,"",$@cave4_monsters_IDS[$@cave4_loop],$@cave4_monsters_QTY[$@cave4_loop],"#StartCaveFight4::OnMonsterDeath"; + areamonster "025-4",28, 124, 57, 156,"",$@cave4_monsters_IDS[$@cave4_loop],$@cave4_monsters_QTY[$@cave4_loop],"#StartCaveFight4::OnMonsterDeath"; if ($@cave4_loop <= getarraysize($@cave4_monsters_IDS)) goto L_Summon; set $@cave4_loop, 0; @@ -355,7 +355,7 @@ L_no_root: // --------------------- Cave 4 Checker ---------------------------- -025-4.gat,32,156,0|script|#CheckCaveFight4|45,1,1 +025-4,32,156,0|script|#CheckCaveFight4|45,1,1 { if (cavefights & BATTLE_CAVE4 || $@battlecave4 == 1) goto L_Done; @@ -369,7 +369,7 @@ L_Done: // ---------------------------- Cave 5 ------------------------------ -025-4.gat,109,143,0|script|#StartCaveFight5|324 +025-4,109,143,0|script|#StartCaveFight5|324 { if ($@battlecave5 == 2 && $@cave5fighter$ == strcharinfo(0)) end; @@ -402,7 +402,7 @@ L_PlaceCenter: L_Summon: set $@cave5_loop, $@cave5_loop + 1; - areamonster "025-4.gat",91, 131, 124, 160,"",$@cave5_monsters_IDS[$@cave5_loop],$@cave5_monsters_QTY[$@cave5_loop],"#StartCaveFight5::OnMonsterDeath"; + areamonster "025-4",91, 131, 124, 160,"",$@cave5_monsters_IDS[$@cave5_loop],$@cave5_monsters_QTY[$@cave5_loop],"#StartCaveFight5::OnMonsterDeath"; if ($@cave5_loop <= getarraysize($@cave5_monsters_IDS)) goto L_Summon; set $@cave5_loop, 0; @@ -449,7 +449,7 @@ L_no_root: // --------------------- Cave 5 Checker ---------------------------- -025-4.gat,100,160,0|script|#CheckCaveFight5|45,1,1 +025-4,100,160,0|script|#CheckCaveFight5|45,1,1 { if (cavefights & BATTLE_CAVE5 || $@battlecave5 == 1) goto L_Done; @@ -463,7 +463,7 @@ L_Done: // -------------------------------- Cave 6 ----------------------------------------- -025-4.gat,162,162,0|script|#StartCaveFight6|324 +025-4,162,162,0|script|#StartCaveFight6|324 { if ($@battlecave6 == 2 && $@cave6fighter$ == strcharinfo(0)) end; @@ -496,7 +496,7 @@ L_PlaceCenter: L_Summon: set $@cave6_loop, $@cave6_loop + 1; - areamonster "025-4.gat",153, 143, 178, 174,"",$@cave6_monsters_IDS[$@cave6_loop],$@cave6_monsters_QTY[$@cave6_loop],"#StartCaveFight6::OnMonsterDeath"; + areamonster "025-4",153, 143, 178, 174,"",$@cave6_monsters_IDS[$@cave6_loop],$@cave6_monsters_QTY[$@cave6_loop],"#StartCaveFight6::OnMonsterDeath"; if ($@cave6_loop <= getarraysize($@cave6_monsters_IDS)) goto L_Summon; set $@cave6_loop, 0; @@ -543,7 +543,7 @@ L_no_root: // --------------------- Cave 6 Checker ---------------------------- -025-4.gat,159,174,0|script|#CheckCaveFight6|45,1,1 +025-4,159,174,0|script|#CheckCaveFight6|45,1,1 { if (cavefights & BATTLE_CAVE6 || $@battlecave6 == 1) goto L_Done; @@ -557,7 +557,7 @@ L_Done: // -------------------------------- Cave 7 ----------------------------------- -025-4.gat,44,202,0|script|#StartCaveFight7|324 +025-4,44,202,0|script|#StartCaveFight7|324 { if ($@battlecave7 == 2 && $@cave7fighter$ == strcharinfo(0)) end; @@ -590,7 +590,7 @@ L_PlaceCenter: L_Summon: set $@cave7_loop, $@cave7_loop + 1; - areamonster "025-4.gat",27, 185, 61, 219,"",$@cave7_monsters_IDS[$@cave7_loop],$@cave7_monsters_QTY[$@cave7_loop],"#StartCaveFight7::OnMonsterDeath"; + areamonster "025-4",27, 185, 61, 219,"",$@cave7_monsters_IDS[$@cave7_loop],$@cave7_monsters_QTY[$@cave7_loop],"#StartCaveFight7::OnMonsterDeath"; if ($@cave7_loop <= getarraysize($@cave7_monsters_IDS)) goto L_Summon; set $@cave7_loop, 0; @@ -639,7 +639,7 @@ L_no_root: // --------------------- Cave 7 Checker ---------------------------- -025-4.gat,42,219,0|script|#CheckCaveFight7|45,1,1 +025-4,42,219,0|script|#CheckCaveFight7|45,1,1 { if (cavefights & BATTLE_CAVE7 || $@battlecave7 == 1) goto L_Done; @@ -653,7 +653,7 @@ L_Done: // --------------------------- Cave 8 ------------------------------- -025-4.gat,105,210,0|script|#StartCaveFight8|324 +025-4,105,210,0|script|#StartCaveFight8|324 { if ($@battlecave8 == 2 && $@cave8fighter$ == strcharinfo(0)) end; @@ -686,7 +686,7 @@ L_PlaceCenter: L_Summon: set $@cave8_loop, $@cave8_loop + 1; - areamonster "025-4.gat",90, 193, 119, 216,"",$@cave8_monsters_IDS[$@cave8_loop],$@cave8_monsters_QTY[$@cave8_loop],"#StartCaveFight8::OnMonsterDeath"; + areamonster "025-4",90, 193, 119, 216,"",$@cave8_monsters_IDS[$@cave8_loop],$@cave8_monsters_QTY[$@cave8_loop],"#StartCaveFight8::OnMonsterDeath"; if ($@cave8_loop <= getarraysize($@cave8_monsters_IDS)) goto L_Summon; set $@cave8_loop, 0; @@ -735,7 +735,7 @@ L_no_root: // --------------------- Cave 8 Checker ---------------------------- -025-4.gat,105,216,0|script|#CheckCaveFight8|45,1,1 +025-4,105,216,0|script|#CheckCaveFight8|45,1,1 { if (cavefights & BATTLE_CAVE8 || $@battlecave8 == 1) goto L_Done; @@ -749,7 +749,7 @@ L_Done: // --------------------------- Cave 9 ------------------------------- -025-4.gat,157,220,0|script|#StartCaveFight9|324 +025-4,157,220,0|script|#StartCaveFight9|324 { if ($@battlecave9 == 2 && $@cave9fighter$ == strcharinfo(0)) end; @@ -782,7 +782,7 @@ L_PlaceCenter: L_Summon: set $@cave9_loop, $@cave9_loop + 1; - areamonster "025-4.gat",144, 192, 173, 226,"",$@cave9_monsters_IDS[$@cave9_loop],$@cave9_monsters_QTY[$@cave9_loop],"#StartCaveFight9::OnMonsterDeath"; + areamonster "025-4",144, 192, 173, 226,"",$@cave9_monsters_IDS[$@cave9_loop],$@cave9_monsters_QTY[$@cave9_loop],"#StartCaveFight9::OnMonsterDeath"; if ($@cave9_loop <= getarraysize($@cave9_monsters_IDS)) goto L_Summon; set $@cave9_loop, 0; @@ -831,7 +831,7 @@ L_no_root: // --------------------- Cave 9 Checker ---------------------------- -025-4.gat,157,226,0|script|#CheckCaveFight9|45,1,1 +025-4,157,226,0|script|#CheckCaveFight9|45,1,1 { if (cavefights & BATTLE_CAVE9 || $@battlecave9 == 1) goto L_Done; @@ -845,7 +845,7 @@ L_Done: // --------------------- Boss Cave ---------------------------- -025-4.gat,157,30,0|script|#StartBossCaveFight|325 +025-4,157,30,0|script|#StartBossCaveFight|325 { if ($@battlecave10 == 2 && $@cave10fighter$ == strcharinfo(0)) end; @@ -873,7 +873,7 @@ L_PlaceCenter: L_Summon: set $@cave10_loop, $@cave10_loop + 1; - areamonster "025-4.gat",142, 24, 172, 48,"",$@cave10_monsters_IDS[$@cave10_loop],$@cave10_monsters_QTY[$@cave10_loop],"#StartBossCaveFight::OnMonsterDeath"; + areamonster "025-4",142, 24, 172, 48,"",$@cave10_monsters_IDS[$@cave10_loop],$@cave10_monsters_QTY[$@cave10_loop],"#StartBossCaveFight::OnMonsterDeath"; if ($@cave10_loop <= getarraysize($@cave10_monsters_IDS)) goto L_Summon; set $@cave10_loop, 0; @@ -881,7 +881,7 @@ L_Summon: L_SummonBoss: if (attachrid(getcharid(3,$@cave10fighter$)) == 0) goto L_Abort; - areamonster "025-4.gat",142, 24, 172, 48,"",$@cave10_boss_ID,1,"#StartBossCaveFight::OnBossDeath"; + areamonster "025-4",142, 24, 172, 48,"",$@cave10_boss_ID,1,"#StartBossCaveFight::OnBossDeath"; stopnpctimer; end; @@ -949,7 +949,7 @@ L_no_root: // --------------------- Boss Cave Checker ---------------------------- -025-4.gat,157,48,0|script|#CheckCaveFightBoss|45,1,1 +025-4,157,48,0|script|#CheckCaveFightBoss|45,1,1 { if (Rossy_Quest >= 17) goto L_Done; @@ -966,7 +966,7 @@ L_Julia: end; L_Done: - warp "025-3.gat", 77, 168; + warp "025-3", 77, 168; end; L_Out: @@ -976,7 +976,7 @@ L_Out: // --------------------- Julia Cave Checker Outside ---------------------------- -025-4.gat,157,24,0|script|#CheckJuliaCaveOutside|45,1,1 +025-4,157,24,0|script|#CheckJuliaCaveOutside|45,1,1 { if (Rossy_Quest > 15) goto L_Done; @@ -991,7 +991,7 @@ L_Done: // --------------------- Julia Cave Checker Inside ---------------------------- -025-4.gat,93,35,0|script|#CheckJuliaCaveInside|45,1,1 +025-4,93,35,0|script|#CheckJuliaCaveInside|45,1,1 { if (Rossy_Quest >= 17) goto L_Done; @@ -1008,7 +1008,7 @@ L_Cheat: L_Done: message strcharinfo(0), "As you go back to the cave you close your eyes, terrified of the bloody battle you just fought in this place, and feel your way back to the entrance of the cave."; - warp "025-3.gat", 77, 168; + warp "025-3", 77, 168; end; L_Save: diff --git a/world/map/npc/025-4/clauquer.txt b/world/map/npc/025-4/clauquer.txt index 5a805f63..b29a60de 100644 --- a/world/map/npc/025-4/clauquer.txt +++ b/world/map/npc/025-4/clauquer.txt @@ -1,6 +1,6 @@ // Authors: alastrim, Ali-g, Dark Mage -025-4.gat,30,30,0|script|Clauquer|169 +025-4,30,30,0|script|Clauquer|169 { if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_Rescued; if (Rossy_Quest == 15) goto L_Hmmm; diff --git a/world/map/npc/025-4/julia.txt b/world/map/npc/025-4/julia.txt index bed94c0c..929b3b14 100644 --- a/world/map/npc/025-4/julia.txt +++ b/world/map/npc/025-4/julia.txt @@ -1,6 +1,6 @@ // Authors: alastrim, Ali-g, Dark Mage -025-4.gat,89,21,0|script|Julia|114 +025-4,89,21,0|script|Julia|114 { set @Reward_EXP, 5000; diff --git a/world/map/npc/025-4/mapflags.txt b/world/map/npc/025-4/mapflags.txt index bc862ed8..ba5835ac 100644 --- a/world/map/npc/025-4/mapflags.txt +++ b/world/map/npc/025-4/mapflags.txt @@ -1,2 +1,2 @@ -025-4.gat|mapflag|nosave|025-1,33,50 -025-4.gat|mapflag|resave|025-1,33,50 +025-4|mapflag|nosave|025-1,33,50 +025-4|mapflag|resave|025-1,33,50 diff --git a/world/map/npc/026-1/mapflags.txt b/world/map/npc/026-1/mapflags.txt index 9f5b3a8f..137d6a1c 100644 --- a/world/map/npc/026-1/mapflags.txt +++ b/world/map/npc/026-1/mapflags.txt @@ -1 +1 @@ -026-1.gat|mapflag|resave|025-1,33,50 +026-1|mapflag|resave|025-1,33,50 diff --git a/world/map/npc/026-1/sign.txt b/world/map/npc/026-1/sign.txt index 5eb342fb..f0281b4f 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|400 +026-1,64,16,0|script|Sign|400 { mes "Hurnscald's Graveyard is north of here."; mes "BEWARE!"; diff --git a/world/map/npc/027-1/crypt.txt b/world/map/npc/027-1/crypt.txt index 37b1cecf..c6f6a63f 100644 --- a/world/map/npc/027-1/crypt.txt +++ b/world/map/npc/027-1/crypt.txt @@ -1,8 +1,8 @@ -027-1.gat,28,67,0|script|#CryptEntrance|45,0,0 +027-1,28,67,0|script|#CryptEntrance|45,0,0 { if (BaseLevel < 60) goto L_Weak; - warp "027-2.gat", 112, 110; + warp "027-2", 112, 110; end; L_Weak: diff --git a/world/map/npc/027-1/golbenez.txt b/world/map/npc/027-1/golbenez.txt index ea19db7b..cfa09fdb 100644 --- a/world/map/npc/027-1/golbenez.txt +++ b/world/map/npc/027-1/golbenez.txt @@ -1,4 +1,4 @@ -027-1.gat,68,89,0|script|#Golbenez#_M|204 +027-1,68,89,0|script|#Golbenez#_M|204 { set @fee, 666; @@ -21,7 +21,7 @@ L_Warp: if (Zeny < @fee) goto L_No_Money; set Zeny, Zeny - @fee; - warp "027-2.gat", 105, 44; + warp "027-2", 105, 44; close; L_No_Money: diff --git a/world/map/npc/027-1/graves.txt b/world/map/npc/027-1/graves.txt index cd2d137a..dee7df5d 100644 --- a/world/map/npc/027-1/graves.txt +++ b/world/map/npc/027-1/graves.txt @@ -2,7 +2,7 @@ function|script|GraveTooFar { - if (isin("027-1.gat",89,54,122,76)) + if (isin("027-1",89,54,122,76)) goto L_Return; mes "You are too far away to read the grave."; close; @@ -11,7 +11,7 @@ L_Return: return; } -027-1.gat,89,62,0|script|Grave#1|400 +027-1,89,62,0|script|Grave#1|400 { callfunc "GraveTooFar"; mes "~ FotherJ ~"; @@ -19,7 +19,7 @@ L_Return: close; } -027-1.gat,118,54,0|script|Grave#2|400 +027-1,118,54,0|script|Grave#2|400 { callfunc "GraveTooFar"; mes "~ Yosuhara ~"; @@ -27,7 +27,7 @@ L_Return: close; } -027-1.gat,111,62,0|script|Grave#3|400 +027-1,111,62,0|script|Grave#3|400 { callfunc "GraveTooFar"; mes "~ Feline Monstrosity ~"; @@ -35,7 +35,7 @@ L_Return: close; } -027-1.gat,112,76,0|script|Grave#4|400 +027-1,112,76,0|script|Grave#4|400 { callfunc "GraveTooFar"; mes "~ Superkoop ~"; @@ -43,7 +43,7 @@ L_Return: close; } -027-1.gat,120,76,0|script|Grave#5|400 +027-1,120,76,0|script|Grave#5|400 { callfunc "GraveTooFar"; mes "~ Aroleon ~"; @@ -51,7 +51,7 @@ L_Return: close; } -027-1.gat,100,68,0|script|Grave#6|400 +027-1,100,68,0|script|Grave#6|400 { callfunc "GraveTooFar"; mes "~ John P ~"; @@ -59,7 +59,7 @@ L_Return: close; } -027-1.gat,94,70,0|script|Grave#7|400 +027-1,94,70,0|script|Grave#7|400 { callfunc "GraveTooFar"; mes "~ Spit23 ~"; @@ -67,7 +67,7 @@ L_Return: close; } -027-1.gat,106,60,0|script|Grave#8|400 +027-1,106,60,0|script|Grave#8|400 { callfunc "GraveTooFar"; mes "~ Black Don ~"; @@ -75,7 +75,7 @@ L_Return: close; } -027-1.gat,92,54,0|script|Grave#9|400 +027-1,92,54,0|script|Grave#9|400 { callfunc "GraveTooFar"; mes "~ Jaxad0127 ~"; @@ -83,7 +83,7 @@ L_Return: close; } -027-1.gat,122,64,0|script|Grave#10|400 +027-1,122,64,0|script|Grave#10|400 { callfunc "GraveTooFar"; mes "~ Ces Vargavind ~"; @@ -91,7 +91,7 @@ L_Return: close; } -027-1.gat,102,62,0|script|Grave#11|400 +027-1,102,62,0|script|Grave#11|400 { callfunc "GraveTooFar"; mes "~ Crush ~"; @@ -99,7 +99,7 @@ L_Return: close; } -027-1.gat,104,76,0|script|Grave#12|400 +027-1,104,76,0|script|Grave#12|400 { callfunc "GraveTooFar"; mes "~ Freeyorp ~"; diff --git a/world/map/npc/027-1/mapflags.txt b/world/map/npc/027-1/mapflags.txt index 695e576c..ed13545d 100644 --- a/world/map/npc/027-1/mapflags.txt +++ b/world/map/npc/027-1/mapflags.txt @@ -1 +1 @@ -027-1.gat|mapflag|resave|025-1,33,50 +027-1|mapflag|resave|025-1,33,50 diff --git a/world/map/npc/027-1/traveler.txt b/world/map/npc/027-1/traveler.txt index d07e952e..ca8d8f47 100644 --- a/world/map/npc/027-1/traveler.txt +++ b/world/map/npc/027-1/traveler.txt @@ -2,7 +2,7 @@ // Author: Wombat, wushin // cost depending on level and adapted to new scripting guidelines: Jenalya -027-1.gat,83,84,0|script|Styx the Traveler|103 +027-1,83,84,0|script|Styx the Traveler|103 { set @NpcName$, "Styx"; set @NpcTravelBit, $@graveyard_bit; diff --git a/world/map/npc/027-2/alacrius.txt b/world/map/npc/027-2/alacrius.txt index 2ca331a4..d8025a2c 100644 --- a/world/map/npc/027-2/alacrius.txt +++ b/world/map/npc/027-2/alacrius.txt @@ -1,7 +1,7 @@ // Author: wushin //Starts Crypt Quest -027-2.gat,122,105,0|script|Alacrius|313 +027-2,122,105,0|script|Alacrius|313 { mes "[Alacrius]"; mes "\"Hello, I'm Alacrius. \""; diff --git a/world/map/npc/027-2/barman.txt b/world/map/npc/027-2/barman.txt index de367df3..6e6b2294 100644 --- a/world/map/npc/027-2/barman.txt +++ b/world/map/npc/027-2/barman.txt @@ -1,4 +1,4 @@ -027-2.gat,103,22,0|script|Bennet|310 +027-2,103,22,0|script|Bennet|310 { mes "[Bennet]"; mes "\"Hi there, stranger! My name is Bennet, the bartender here.\""; diff --git a/world/map/npc/027-2/caretaker.txt b/world/map/npc/027-2/caretaker.txt index b4e3eee5..58d77489 100644 --- a/world/map/npc/027-2/caretaker.txt +++ b/world/map/npc/027-2/caretaker.txt @@ -2,7 +2,7 @@ // TODO: add dialog/code for giving more letters // Airlia supports receiving an infinate number of letters -027-2.gat,24,25,0|script|Caretaker|159 +027-2,24,25,0|script|Caretaker|159 { set @halloween_npc_id, $@halloween_npc_caretaker; callfunc "TrickOrTreat"; @@ -109,7 +109,7 @@ L_Give_New_Letter_Real: L_Close: close; } -027-2.gat,28,22,0|script|Joan|409 +027-2,28,22,0|script|Joan|409 { mes "[Joan]"; mes "..."; diff --git a/world/map/npc/027-2/cerhan.txt b/world/map/npc/027-2/cerhan.txt index 3abe2e2f..d2ca3e65 100644 --- a/world/map/npc/027-2/cerhan.txt +++ b/world/map/npc/027-2/cerhan.txt @@ -1,6 +1,6 @@ // Author: Jenalya -027-2.gat,70,77,0|script|Cerhan|311 +027-2,70,77,0|script|Cerhan|311 { mes "[Cerhan]"; mes "\"Ah, hello! It's good to see another normal human at this strange place!\""; diff --git a/world/map/npc/027-2/crying_child.txt b/world/map/npc/027-2/crying_child.txt index 7428cb1f..4a1254ec 100644 --- a/world/map/npc/027-2/crying_child.txt +++ b/world/map/npc/027-2/crying_child.txt @@ -2,7 +2,7 @@ // love triangle quest, involved npcs: Reid's Ghost, Hamond, Savaric, Aldred, Golbenez // Jenalya: some changes about variables (setting to zero if only used locally, naming) -027-2.gat,50,92,0|script|Aldred|314 +027-2,50,92,0|script|Aldred|314 { // Crying Child subquest // Variable states: diff --git a/world/map/npc/027-2/diary.txt b/world/map/npc/027-2/diary.txt index 4fb2716d..e660e992 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|400 +027-2,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-2/door.txt b/world/map/npc/027-2/door.txt index 146b4940..8452d118 100644 --- a/world/map/npc/027-2/door.txt +++ b/world/map/npc/027-2/door.txt @@ -1,4 +1,4 @@ -027-2.gat,25,100,0|script|#DoorIn|45,1,1 +027-2,25,100,0|script|#DoorIn|45,1,1 { set @Graveyard_Inn_MASK, NIBBLE_0_MASK; set @Graveyard_Inn_SHIFT, NIBBLE_0_SHIFT; @@ -10,14 +10,14 @@ end; L_Warp: - warp "027-2.gat", 27, 99; + warp "027-2", 27, 99; set @reid, 0; end; } // TODO replace this with a plain warp -027-2.gat,26,99,0|script|#DoorOut-gyinn|45,1,1 +027-2,26,99,0|script|#DoorOut-gyinn|45,1,1 { - warp "027-2.gat", 23, 98; + warp "027-2", 23, 98; end; } diff --git a/world/map/npc/027-2/evil_guard.txt b/world/map/npc/027-2/evil_guard.txt index aa4ee55e..d035295c 100644 --- a/world/map/npc/027-2/evil_guard.txt +++ b/world/map/npc/027-2/evil_guard.txt @@ -1,4 +1,4 @@ -027-2.gat,100,43,0|script|Blackwin|316 +027-2,100,43,0|script|Blackwin|316 { mes "..."; next; @@ -12,7 +12,7 @@ close; } -027-2.gat,112,37,0|script|Forwin|316 +027-2,112,37,0|script|Forwin|316 { mes "[Evil Guard]"; mes "\"" + strcharinfo(0) + "...\""; diff --git a/world/map/npc/027-2/golbenez.txt b/world/map/npc/027-2/golbenez.txt index 2f93ea33..c257ed39 100644 --- a/world/map/npc/027-2/golbenez.txt +++ b/world/map/npc/027-2/golbenez.txt @@ -9,7 +9,7 @@ // state 6: wants jackOsouls, random chance of 1/50 to success, small amount of exp for fail // state 7: done -027-2.gat,39,91,0|script|Golbenez|307 +027-2,39,91,0|script|Golbenez|307 { set @Graveyard_Inn_MASK, NIBBLE_4_MASK; set @Graveyard_Inn_SHIFT, NIBBLE_4_SHIFT; diff --git a/world/map/npc/027-2/gy_inn_shops.txt b/world/map/npc/027-2/gy_inn_shops.txt index aed37d09..8808755d 100644 --- a/world/map/npc/027-2/gy_inn_shops.txt +++ b/world/map/npc/027-2/gy_inn_shops.txt @@ -7,12 +7,12 @@ // banker: function -027-2.gat,75,22,0|shop|Chef#graveyard|300,ZombieNachos:*1,LadyFingers:*1,JellAhh:*1,Snapple:*1 -027-2.gat,90,36,0|shop|Estrilda|301,BeetleJuice:*1,GutBuster:*1,BloodWine:*1 -027-2.gat,93,22,0|shop|Umfrey|302,BoneArrows:*1,ShockSweet:*1 -027-2.gat,56,99,0|shop|Leofwin|304,CactusDrink:*1,CactusPotion:*1,BugLeg:*1,SmallMushroom:*1,IronPotion:*1,ConcentrationPotion:*1,HardSpike:*1,DarkCrystal:*1,Root:*1,WispPowder:*1,SpectrePowder:*1,PoltergeistPowder:*1 +027-2,75,22,0|shop|Chef#graveyard|300,ZombieNachos:*1,LadyFingers:*1,JellAhh:*1,Snapple:*1 +027-2,90,36,0|shop|Estrilda|301,BeetleJuice:*1,GutBuster:*1,BloodWine:*1 +027-2,93,22,0|shop|Umfrey|302,BoneArrows:*1,ShockSweet:*1 +027-2,56,99,0|shop|Leofwin|304,CactusDrink:*1,CactusPotion:*1,BugLeg:*1,SmallMushroom:*1,IronPotion:*1,ConcentrationPotion:*1,HardSpike:*1,DarkCrystal:*1,Root:*1,WispPowder:*1,SpectrePowder:*1,PoltergeistPowder:*1 -027-2.gat,106,22,0|script|Edwin|309 +027-2,106,22,0|script|Edwin|309 { set @npcname$, "Edwin"; @@ -24,7 +24,7 @@ } // Inn -027-2.gat,107,39,0|script|Barbara Grey|320 +027-2,107,39,0|script|Barbara Grey|320 { set @npcname$, "Barbara Grey"; set @cost, 1000; @@ -38,7 +38,7 @@ } // Bank and Storage -027-2.gat,88,22,0|script|J.P. Morbid|321 +027-2,88,22,0|script|J.P. Morbid|321 { callfunc "ClearVariables"; set @npcname$, "J.P. Morbid"; diff --git a/world/map/npc/027-2/headless_man.txt b/world/map/npc/027-2/headless_man.txt index 9bc60192..7345b535 100644 --- a/world/map/npc/027-2/headless_man.txt +++ b/world/map/npc/027-2/headless_man.txt @@ -5,7 +5,7 @@ // state 2: items delivered, return for reward and followup story // state 3: quest completed -027-2.gat,22,76,0|script|Thurstan|318 +027-2,22,76,0|script|Thurstan|318 { if (Sex == 0) set @madamsir$, "Madam"; if (Sex == 1) set @madamsir$, "Sir"; diff --git a/world/map/npc/027-2/husband.txt b/world/map/npc/027-2/husband.txt index 01524a84..e62b5097 100644 --- a/world/map/npc/027-2/husband.txt +++ b/world/map/npc/027-2/husband.txt @@ -9,7 +9,7 @@ // state 6: is set in reid, gives as reward a special bowler hat // state 7: done -027-2.gat,22,84,0|script|Hamond|319 +027-2,22,84,0|script|Hamond|319 { set @Graveyard_Inn_MASK, NIBBLE_3_MASK; set @Graveyard_Inn_SHIFT, NIBBLE_3_SHIFT; diff --git a/world/map/npc/027-2/innkeeper.txt b/world/map/npc/027-2/innkeeper.txt index a1b4c7a5..adc4a75d 100644 --- a/world/map/npc/027-2/innkeeper.txt +++ b/world/map/npc/027-2/innkeeper.txt @@ -13,7 +13,7 @@ // state 10: she spoke with hamond and savaric, gives reward mylarin dust (needed for a crafting quest in thermin) // state 11: done, can ask about mylarin dust again -027-2.gat,104,39,0|script|Reid's Ghost|315 +027-2,104,39,0|script|Reid's Ghost|315 { set @Graveyard_Inn_MASK, NIBBLE_0_MASK; set @Graveyard_Inn_SHIFT, NIBBLE_0_SHIFT; diff --git a/world/map/npc/027-2/lover.txt b/world/map/npc/027-2/lover.txt index 17714b71..5488b8e7 100644 --- a/world/map/npc/027-2/lover.txt +++ b/world/map/npc/027-2/lover.txt @@ -9,7 +9,7 @@ // state 6: waiting for youl, if @golbanez >= 7 got it, giving sorcerer robe // state 7: done -027-2.gat,43,73,0|script|Savaric|317 +027-2,43,73,0|script|Savaric|317 { set @Graveyard_Inn_MASK, NIBBLE_1_MASK; set @Graveyard_Inn_SHIFT, NIBBLE_1_SHIFT; diff --git a/world/map/npc/027-2/mapflags.txt b/world/map/npc/027-2/mapflags.txt index 5e0579c5..09b5d28a 100644 --- a/world/map/npc/027-2/mapflags.txt +++ b/world/map/npc/027-2/mapflags.txt @@ -1 +1 @@ -027-2.gat|mapflag|resave|025-1,33,50 +027-2|mapflag|resave|025-1,33,50 diff --git a/world/map/npc/027-2/testnpcs.txt b/world/map/npc/027-2/testnpcs.txt index bed6f3be..0d79ef88 100644 --- a/world/map/npc/027-2/testnpcs.txt +++ b/world/map/npc/027-2/testnpcs.txt @@ -1,6 +1,6 @@ //several NPCs in the Reid's Inn -027-2.gat,80,34,0|script|Lovers|303 +027-2,80,34,0|script|Lovers|303 { mes "You see a man and a woman holding each other very tight."; next; @@ -12,7 +12,7 @@ close; } -027-2.gat,75,29,0|script|Archibald|306 +027-2,75,29,0|script|Archibald|306 { //the broken grammar is intentional mes "[Archibald]"; @@ -22,7 +22,7 @@ close; } -027-2.gat,77,40,0|script|Darnel|308 +027-2,77,40,0|script|Darnel|308 { set @drunker, rand(4); if (@drunker == 0) goto L_0; @@ -52,7 +52,7 @@ L_Close: close; } -027-2.gat,110,23,0|script|Nigel|312 +027-2,110,23,0|script|Nigel|312 { mes "[Nigel]"; mes "\"Ohh... My head is killing me! I have to stop " diff --git a/world/map/npc/027-2/thurston.txt b/world/map/npc/027-2/thurston.txt index 3dfcffd7..ce72104c 100644 --- a/world/map/npc/027-2/thurston.txt +++ b/world/map/npc/027-2/thurston.txt @@ -1,6 +1,6 @@ // Vampire Bat Wings Daily -027-2.gat,100,105,0|script|Thurston|302 +027-2,100,105,0|script|Thurston|302 { set @dq_level, 60; set @dq_cost, 45; diff --git a/world/map/npc/027-2/werewolf.txt b/world/map/npc/027-2/werewolf.txt index 94790afd..1ecb403c 100644 --- a/world/map/npc/027-2/werewolf.txt +++ b/world/map/npc/027-2/werewolf.txt @@ -1,6 +1,6 @@ // author: Jenalya -027-2.gat,118,23,0|script|Wolfgang|305 +027-2,118,23,0|script|Wolfgang|305 { set @Graveyard_Inn_MASK, NIBBLE_5_MASK; set @Graveyard_Inn_SHIFT, NIBBLE_5_SHIFT; diff --git a/world/map/npc/027-3/casket_traps.txt b/world/map/npc/027-3/casket_traps.txt index 7b8a1e70..7ad40ce8 100644 --- a/world/map/npc/027-3/casket_traps.txt +++ b/world/map/npc/027-3/casket_traps.txt @@ -1,4 +1,4 @@ -027-3.gat,32,96,0|script|#casket1|35,1,1 +027-3,32,96,0|script|#casket1|35,1,1 { end; @@ -8,7 +8,7 @@ OnTouch: specialeffect 302; end; } -027-3.gat,38,86,0|script|#casket2|35,1,1 +027-3,38,86,0|script|#casket2|35,1,1 { end; @@ -18,7 +18,7 @@ OnTouch: specialeffect 302; end; } -027-3.gat,46,76,0|script|#casket3|35,1,1 +027-3,46,76,0|script|#casket3|35,1,1 { end; @@ -28,7 +28,7 @@ OnTouch: specialeffect 302; end; } -027-3.gat,38,57,0|script|#casket4|35,1,1 +027-3,38,57,0|script|#casket4|35,1,1 { end; @@ -38,7 +38,7 @@ OnTouch: specialeffect 302; end; } -027-3.gat,22,44,0|script|#casket5|35,1,1 +027-3,22,44,0|script|#casket5|35,1,1 { end; @@ -48,7 +48,7 @@ OnTouch: specialeffect 302; end; } -027-3.gat,48,43,0|script|#casket6|35,1,1 +027-3,48,43,0|script|#casket6|35,1,1 { end; @@ -58,7 +58,7 @@ OnTouch: specialeffect 302; end; } -027-3.gat,86,30,0|script|#casket7|35,1,1 +027-3,86,30,0|script|#casket7|35,1,1 { end; @@ -68,7 +68,7 @@ OnTouch: specialeffect 302; end; } -027-3.gat,108,45,0|script|#casket8|35,1,1 +027-3,108,45,0|script|#casket8|35,1,1 { end; diff --git a/world/map/npc/027-3/general_krukan_door.txt b/world/map/npc/027-3/general_krukan_door.txt index 86a6342f..1e7a69cb 100644 --- a/world/map/npc/027-3/general_krukan_door.txt +++ b/world/map/npc/027-3/general_krukan_door.txt @@ -1,13 +1,13 @@ // Mini-Boss // General Krukun -027-3.gat,82,88,0|script|#GeneralDoor1|35,1,0 +027-3,82,88,0|script|#GeneralDoor1|35,1,0 { if ( (countitem("CryptKey") < 10) && ($@CRYPT_FIGHT1 != 0) ) goto L_NoKeys; delitem "CryptKey", 10; - warp "027-6.gat",39,60; + warp "027-6",39,60; goto L_Close; L_NoKeys: diff --git a/world/map/npc/027-3/mapflags.txt b/world/map/npc/027-3/mapflags.txt index f035c3e7..2f250a0f 100644 --- a/world/map/npc/027-3/mapflags.txt +++ b/world/map/npc/027-3/mapflags.txt @@ -1 +1 @@ -027-3.gat|mapflag|resave|027-2,105,94 +027-3|mapflag|resave|027-2,105,94 diff --git a/world/map/npc/027-3/monsters.txt b/world/map/npc/027-3/monsters.txt index 96edc6be..6664d033 100644 --- a/world/map/npc/027-3/monsters.txt +++ b/world/map/npc/027-3/monsters.txt @@ -1,12 +1,12 @@ // 027-3 Graveyard zombies and fallens // they need to be in an extra file because of the crying child quest -027-3.gat,21,76,51,100|monster|Zombie|1036,2,300000ms,120000ms,specialMob027-3::On1036 -027-3.gat,21,30,51,63|monster|Zombie|1036,2,200000ms,10000ms,specialMob027-3::On1036 -027-3.gat,67,29,129,64|monster|Zombie|1036,3,140000ms,30000ms,specialMob027-3::On1036 -027-3.gat,101,65,128,93|monster|Fallen|1045,3,120000ms,30000ms,specialMob027-3::On1045 +027-3,21,76,51,100|monster|Zombie|1036,2,300000ms,120000ms,specialMob027-3::On1036 +027-3,21,30,51,63|monster|Zombie|1036,2,200000ms,10000ms,specialMob027-3::On1036 +027-3,67,29,129,64|monster|Zombie|1036,3,140000ms,30000ms,specialMob027-3::On1036 +027-3,101,65,128,93|monster|Fallen|1045,3,120000ms,30000ms,specialMob027-3::On1045 -027-3.gat,0,0,0|script|specialMob027-3|-1 +027-3,0,0,0|script|specialMob027-3|-1 { end; diff --git a/world/map/npc/027-4/casket_traps.txt b/world/map/npc/027-4/casket_traps.txt index 350fe347..1106aa6d 100644 --- a/world/map/npc/027-4/casket_traps.txt +++ b/world/map/npc/027-4/casket_traps.txt @@ -1,4 +1,4 @@ -027-4.gat,60,23,0|script|#casket9|35,1,1 +027-4,60,23,0|script|#casket9|35,1,1 { end; @@ -8,7 +8,7 @@ OnTouch: specialeffect 302; end; } -027-4.gat,42,23,0|script|#casket10|35,1,1 +027-4,42,23,0|script|#casket10|35,1,1 { end; @@ -18,7 +18,7 @@ OnTouch: specialeffect 302; end; } -027-4.gat,42,47,0|script|#casket11|35,1,1 +027-4,42,47,0|script|#casket11|35,1,1 { end; @@ -28,7 +28,7 @@ OnTouch: specialeffect 302; end; } -027-4.gat,90,47,0|script|#casket12|35,1,1 +027-4,90,47,0|script|#casket12|35,1,1 { end; @@ -38,7 +38,7 @@ OnTouch: specialeffect 302; end; } -027-4.gat,101,48,0|script|#casket13|35,1,1 +027-4,101,48,0|script|#casket13|35,1,1 { end; @@ -48,7 +48,7 @@ OnTouch: specialeffect 302; end; } -027-4.gat,115,17,0|script|#casket14|35,1,1 +027-4,115,17,0|script|#casket14|35,1,1 { end; @@ -58,7 +58,7 @@ OnTouch: specialeffect 302; end; } -027-4.gat,99,76,0|script|#casket15|35,1,1 +027-4,99,76,0|script|#casket15|35,1,1 { end; @@ -68,7 +68,7 @@ OnTouch: specialeffect 302; end; } -027-4.gat,22,23,0|script|#casket16|35,1,1 +027-4,22,23,0|script|#casket16|35,1,1 { end; diff --git a/world/map/npc/027-4/general_razha_door.txt b/world/map/npc/027-4/general_razha_door.txt index f1729837..1b2cd1a4 100644 --- a/world/map/npc/027-4/general_razha_door.txt +++ b/world/map/npc/027-4/general_razha_door.txt @@ -1,13 +1,13 @@ // Mini-Boss // General Razha -027-4.gat,73,76,0|script|#GeneralDoor2|35,1,0 +027-4,73,76,0|script|#GeneralDoor2|35,1,0 { if ( (countitem("CryptKey") < 10) && ($@CRYPT_FIGHT2 != 0) ) goto L_NoKeys; delitem "CryptKey", 10; - warp "027-7.gat",39,60; + warp "027-7",39,60; goto L_Close; L_NoKeys: diff --git a/world/map/npc/027-4/mapflags.txt b/world/map/npc/027-4/mapflags.txt index 51154f40..650dfc60 100644 --- a/world/map/npc/027-4/mapflags.txt +++ b/world/map/npc/027-4/mapflags.txt @@ -1 +1 @@ -027-4.gat|mapflag|resave|027-2,105,94 +027-4|mapflag|resave|027-2,105,94 diff --git a/world/map/npc/027-4/monsters.txt b/world/map/npc/027-4/monsters.txt index 2ed72f87..7c071bc5 100644 --- a/world/map/npc/027-4/monsters.txt +++ b/world/map/npc/027-4/monsters.txt @@ -1,13 +1,13 @@ // 027-4 Graveyard zombies and fallens // they need to be in an extra file because of the crying child quest -027-4.gat,39,84,38,22|monster|Fallen|1045,3,60000ms,8000ms,specialMob027-4::On1045 -027-4.gat,27,57,15,22|monster|Zombie|1036,2,60000ms,8000ms,specialMob027-4::On1036 -027-4.gat,108,77,39,14|monster|Fallen|1045,3,60000ms,8000ms,specialMob027-4::On1045 -027-4.gat,61,37,38,30|monster|Zombie|1036,2,60000ms,8000ms,specialMob027-4::On1036 -027-4.gat,101,36,38,30|monster|Zombie|1036,2,60000ms,8000ms,specialMob027-4::On1036 +027-4,39,84,38,22|monster|Fallen|1045,3,60000ms,8000ms,specialMob027-4::On1045 +027-4,27,57,15,22|monster|Zombie|1036,2,60000ms,8000ms,specialMob027-4::On1036 +027-4,108,77,39,14|monster|Fallen|1045,3,60000ms,8000ms,specialMob027-4::On1045 +027-4,61,37,38,30|monster|Zombie|1036,2,60000ms,8000ms,specialMob027-4::On1036 +027-4,101,36,38,30|monster|Zombie|1036,2,60000ms,8000ms,specialMob027-4::On1036 -027-4.gat,0,0,0|script|specialMob027-4|-1 +027-4,0,0,0|script|specialMob027-4|-1 { end; diff --git a/world/map/npc/027-5/casket_traps.txt b/world/map/npc/027-5/casket_traps.txt index 33d3ae56..659cad99 100644 --- a/world/map/npc/027-5/casket_traps.txt +++ b/world/map/npc/027-5/casket_traps.txt @@ -1,4 +1,4 @@ -027-5.gat,60,34,0|script|#casket17|35,1,1 +027-5,60,34,0|script|#casket17|35,1,1 { end; @@ -8,7 +8,7 @@ OnTouch: specialeffect 302; end; } -027-5.gat,34,50,0|script|#casket18|35,1,1 +027-5,34,50,0|script|#casket18|35,1,1 { end; @@ -18,7 +18,7 @@ OnTouch: specialeffect 302; end; } -027-5.gat,49,76,0|script|#casket19|35,1,1 +027-5,49,76,0|script|#casket19|35,1,1 { end; @@ -28,7 +28,7 @@ OnTouch: specialeffect 302; end; } -027-5.gat,60,89,0|script|#casket20|35,1,1 +027-5,60,89,0|script|#casket20|35,1,1 { end; @@ -38,7 +38,7 @@ OnTouch: specialeffect 302; end; } -027-5.gat,90,90,0|script|#casket21|35,1,1 +027-5,90,90,0|script|#casket21|35,1,1 { end; @@ -48,7 +48,7 @@ OnTouch: specialeffect 302; end; } -027-5.gat,92,76,0|script|#casket22|35,1,1 +027-5,92,76,0|script|#casket22|35,1,1 { end; @@ -58,7 +58,7 @@ OnTouch: specialeffect 302; end; } -027-5.gat,117,61,0|script|#casket23|35,1,1 +027-5,117,61,0|script|#casket23|35,1,1 { end; @@ -68,7 +68,7 @@ OnTouch: specialeffect 302; end; } -027-5.gat,94,48,0|script|#casket24|35,1,1 +027-5,94,48,0|script|#casket24|35,1,1 { end; diff --git a/world/map/npc/027-5/general_terogan_door.txt b/world/map/npc/027-5/general_terogan_door.txt index 306ace35..8d403d36 100644 --- a/world/map/npc/027-5/general_terogan_door.txt +++ b/world/map/npc/027-5/general_terogan_door.txt @@ -1,13 +1,13 @@ // Mini-Boss // General Terogan -027-5.gat,70,25,0|script|#GeneralDoor3|35,1,0 +027-5,70,25,0|script|#GeneralDoor3|35,1,0 { if ( (countitem("CryptKey") < 10) && ($@CRYPT_FIGHT3 != 0) ) goto L_NoKeys; delitem "CryptKey", 10; - warp "027-8.gat",39,60; + warp "027-8",39,60; goto L_Close; L_NoKeys: diff --git a/world/map/npc/027-5/mapflags.txt b/world/map/npc/027-5/mapflags.txt index 49e0bd57..63182718 100644 --- a/world/map/npc/027-5/mapflags.txt +++ b/world/map/npc/027-5/mapflags.txt @@ -1 +1 @@ -027-5.gat|mapflag|resave|027-2,105,94 +027-5|mapflag|resave|027-2,105,94 diff --git a/world/map/npc/027-6/casket_traps.txt b/world/map/npc/027-6/casket_traps.txt index 004fb9a7..aaed6904 100644 --- a/world/map/npc/027-6/casket_traps.txt +++ b/world/map/npc/027-6/casket_traps.txt @@ -1,4 +1,4 @@ -027-6.gat,32,39,0|script|#casket25|35,1,1 +027-6,32,39,0|script|#casket25|35,1,1 { end; @@ -8,7 +8,7 @@ OnTouch: specialeffect 302; end; } -027-6.gat,27,48,0|script|#casket26|35,1,1 +027-6,27,48,0|script|#casket26|35,1,1 { end; @@ -18,7 +18,7 @@ OnTouch: specialeffect 302; end; } -027-6.gat,52,50,0|script|#casket27|35,1,1 +027-6,52,50,0|script|#casket27|35,1,1 { end; @@ -28,7 +28,7 @@ OnTouch: specialeffect 302; end; } -027-6.gat,45,48,0|script|#casket28|35,1,1 +027-6,45,48,0|script|#casket28|35,1,1 { end; @@ -38,7 +38,7 @@ OnTouch: specialeffect 302; end; } -027-6.gat,47,30,0|script|#casket29|35,1,1 +027-6,47,30,0|script|#casket29|35,1,1 { end; @@ -48,7 +48,7 @@ OnTouch: specialeffect 302; end; } -027-6.gat,33,31,0|script|#casket30|35,1,1 +027-6,33,31,0|script|#casket30|35,1,1 { end; @@ -58,7 +58,7 @@ OnTouch: specialeffect 302; end; } -027-6.gat,52,40,0|script|#casket31|35,1,1 +027-6,52,40,0|script|#casket31|35,1,1 { end; diff --git a/world/map/npc/027-6/general_krukan.txt b/world/map/npc/027-6/general_krukan.txt index 2ac4a018..637befc8 100644 --- a/world/map/npc/027-6/general_krukan.txt +++ b/world/map/npc/027-6/general_krukan.txt @@ -2,7 +2,7 @@ // Based off Cindy Fight // General Krukan Fight -027-6.gat,39,25,0|script|General Krukan|400 +027-6,39,25,0|script|General Krukan|400 { if ($@CRYPT_FIGHT1 != 0) end; @@ -57,9 +57,9 @@ L_Ritual: set $@CRYPT_FIGHT1, 1; set $@CRYPT_FIGHT1_WAVE, 0; set $@CRYPT_FIGHT1_SUMMONS_COUNT, 2; - set $@CRYPT_FIGHT1_PLAYER_COUNT, getmapusers("027-6.gat"); - areamonster "027-6.gat", 0, 0, 79, 84, "", 1043, 1, "General Krukan::OnPetDeath"; - areamonster "027-6.gat", 0, 0, 79, 84, "", 1044, 1, "General Krukan::OnPetDeath"; + set $@CRYPT_FIGHT1_PLAYER_COUNT, getmapusers("027-6"); + areamonster "027-6", 0, 0, 79, 84, "", 1043, 1, "General Krukan::OnPetDeath"; + areamonster "027-6", 0, 0, 79, 84, "", 1044, 1, "General Krukan::OnPetDeath"; initnpctimer; goto L_Announce; @@ -86,7 +86,7 @@ OnTimer5000: L_Return_1: set $@CRYPT_FIGHT1_PLAYER_COUNT, 0; - areatimer "027-6.gat", 0, 0, 79, 84, 10, "General Krukan::OnTick"; + areatimer "027-6", 0, 0, 79, 84, 10, "General Krukan::OnTick"; end; L_CryptLogic: @@ -96,7 +96,7 @@ L_CryptLogic: if ($@CRYPT_FIGHT1_PLAYER_COUNT <= 0) goto L_CleanUpLosers; set $@CRYPT_FIGHT1_SUMMONS_ROUND_TIMER, $@CRYPT_FIGHT1_SUMMONS_ROUND_TIMER + 5; // Advance 5 seconds - if (mobcount("027-6.gat", "General Krukan::OnPetDeath") < 0) + if (mobcount("027-6", "General Krukan::OnPetDeath") < 0) goto L_NextWave; if ($@CRYPT_FIGHT1_SUMMONS_ROUND_TIMER + $@CRYPT_FIGHT1_ROUND_PEN >= 120) goto L_NextWave; @@ -121,31 +121,31 @@ L_NextWave: L_SummonNuke: set $@CRYPT_FIGHT1_SUMMONS_COUNT, $@CRYPT_FIGHT1_SUMMONS_COUNT + $@CRYPT_FIGHT1_WAVE*2 + $@CRYPT_FIGHT1_PLAYER_COUNT*4; - areamonster "027-6.gat", 0, 0, 79, 84, "", 1043, $@CRYPT_FIGHT1_WAVE*2 + $@CRYPT_FIGHT1_PLAYER_COUNT*4, "General Krukan::OnPetDeath"; + areamonster "027-6", 0, 0, 79, 84, "", 1043, $@CRYPT_FIGHT1_WAVE*2 + $@CRYPT_FIGHT1_PLAYER_COUNT*4, "General Krukan::OnPetDeath"; goto L_Announce; L_WeakSummons: set $@CRYPT_FIGHT1_SUMMONS_NUMBER, (5 + (1 * $@CRYPT_FIGHT1_WAVE) + (2 * $@CRYPT_FIGHT1_PLAYER_COUNT))/2; set $@CRYPT_FIGHT1_SUMMONS_COUNT, $@CRYPT_FIGHT1_SUMMONS_COUNT + ($@CRYPT_FIGHT1_SUMMONS_NUMBER/2) + ($@CRYPT_FIGHT1_SUMMONS_NUMBER/2); - areamonster "027-6.gat", 0, 0, 79, 84, "", 1043, ($@CRYPT_FIGHT1_SUMMONS_NUMBER/2), "General Krukan::OnPetDeath"; - areamonster "027-6.gat", 0, 0, 79, 84, "", 1044, ($@CRYPT_FIGHT1_SUMMONS_NUMBER/2), "General Krukan::OnPetDeath"; + areamonster "027-6", 0, 0, 79, 84, "", 1043, ($@CRYPT_FIGHT1_SUMMONS_NUMBER/2), "General Krukan::OnPetDeath"; + areamonster "027-6", 0, 0, 79, 84, "", 1044, ($@CRYPT_FIGHT1_SUMMONS_NUMBER/2), "General Krukan::OnPetDeath"; goto L_Announce; L_StrongSummons: set $@CRYPT_FIGHT1_SUMMONS_NUMBER, (5 + (1 * $@CRYPT_FIGHT1_WAVE) + (2 * $@CRYPT_FIGHT1_PLAYER_COUNT))/2; set $@CRYPT_FIGHT1_SUMMONS_COUNT, $@CRYPT_FIGHT1_SUMMONS_COUNT + ($@CRYPT_FIGHT1_SUMMONS_NUMBER/2) + ($@CRYPT_FIGHT1_SUMMONS_NUMBER/2); - areamonster "027-6.gat", 0, 0, 79, 84, "", 1036, ($@CRYPT_FIGHT1_SUMMONS_NUMBER/2), "General Krukan::OnPetDeath"; - areamonster "027-6.gat", 0, 0, 79, 84, "", 1045, ($@CRYPT_FIGHT1_SUMMONS_NUMBER/2), "General Krukan::OnPetDeath"; + areamonster "027-6", 0, 0, 79, 84, "", 1036, ($@CRYPT_FIGHT1_SUMMONS_NUMBER/2), "General Krukan::OnPetDeath"; + areamonster "027-6", 0, 0, 79, 84, "", 1045, ($@CRYPT_FIGHT1_SUMMONS_NUMBER/2), "General Krukan::OnPetDeath"; goto L_Announce; L_BossSummons: set $@CRYPT_FIGHT1_SUMMONS_NUMBER, (5 + (1 * $@CRYPT_FIGHT1_WAVE) + (2 * $@CRYPT_FIGHT1_PLAYER_COUNT))/2; set $@CRYPT_FIGHT1_SUMMONS_COUNT, $@CRYPT_FIGHT1_SUMMONS_COUNT + ($@CRYPT_FIGHT1_SUMMONS_NUMBER/2) + ($@CRYPT_FIGHT1_SUMMONS_NUMBER/2); - areamonster "027-6.gat", 0, 0, 79, 84, "", 1036, ($@CRYPT_FIGHT1_SUMMONS_NUMBER/2), "General Krukan::OnPetDeath"; - areamonster "027-6.gat", 0, 0, 79, 84, "", 1045, ($@CRYPT_FIGHT1_SUMMONS_NUMBER/2), "General Krukan::OnPetDeath"; - areamonster "027-6.gat", 0, 0, 79, 84, "", 1127, 1, "General Krukan::OnPetDeath"; + areamonster "027-6", 0, 0, 79, 84, "", 1036, ($@CRYPT_FIGHT1_SUMMONS_NUMBER/2), "General Krukan::OnPetDeath"; + areamonster "027-6", 0, 0, 79, 84, "", 1045, ($@CRYPT_FIGHT1_SUMMONS_NUMBER/2), "General Krukan::OnPetDeath"; + areamonster "027-6", 0, 0, 79, 84, "", 1127, 1, "General Krukan::OnPetDeath"; set $@CRYPT_FIGHT1_SUMMONS_COUNT, $@CRYPT_FIGHT1_SUMMONS_COUNT + 1; goto L_Announce; @@ -153,8 +153,8 @@ L_Announce: set $@msg$, $@CRYPT_FIGHT1_MESSAGES$[$@CRYPT_FIGHT1_WAVE]; if ($@msg$ == "") goto L_Return_1; - mapannounce "027-6.gat", $@msg$, 0; - mapannounce "027-3.gat", $@msg$, 0; + mapannounce "027-6", $@msg$, 0; + mapannounce "027-3", $@msg$, 0; set $@msg$, ""; goto L_Return_1; @@ -176,13 +176,13 @@ L_CleanUpLosers: set $@CRYPT_FIGHT1_SUMMONS_COUNT, 0; set $@CRYPT_FIGHT1_ROUND_PEN, 0; set $@CRYPT_FIGHT1_SUMMONS_NUMBER, 0; - killmonster "027-6.gat", "General Krukan::OnPetDeath"; + killmonster "027-6", "General Krukan::OnPetDeath"; stopnpctimer; setnpctimer 0; end; L_CleanUp: - areatimer "027-6.gat", 0, 0, 79, 84, 10, "General Krukan::OnReward"; + areatimer "027-6", 0, 0, 79, 84, 10, "General Krukan::OnReward"; set $@CRYPT_FIGHT1, 0; set $@CRYPT_FIGHT1_PLAYER_COUNT, 0; set $@CRYPT_FIGHT1_WAVE, 0; @@ -190,7 +190,7 @@ L_CleanUp: set $@CRYPT_FIGHT1_SUMMONS_COUNT, 0; set $@CRYPT_FIGHT1_ROUND_PEN, 0; set $@CRYPT_FIGHT1_SUMMONS_NUMBER, 0; - killmonster "027-6.gat", "General Krukan::OnPetDeath"; + killmonster "027-6", "General Krukan::OnPetDeath"; stopnpctimer; setnpctimer 0; end; diff --git a/world/map/npc/027-6/general_krukan_exitdoor.txt b/world/map/npc/027-6/general_krukan_exitdoor.txt index dee6e896..89d3a6d9 100644 --- a/world/map/npc/027-6/general_krukan_exitdoor.txt +++ b/world/map/npc/027-6/general_krukan_exitdoor.txt @@ -1,11 +1,11 @@ // Mini-Boss // General Krukan exit -027-6.gat,38,61,0|script|#GeneralExit1|35,6,0 +027-6,38,61,0|script|#GeneralExit1|35,6,0 { if ($@CRYPT_FIGHT1 == 1) goto L_Block; - warp "027-3.gat",82,89; + warp "027-3",82,89; end; L_Block: diff --git a/world/map/npc/027-6/mapflags.txt b/world/map/npc/027-6/mapflags.txt index a1404da7..1defed7b 100644 --- a/world/map/npc/027-6/mapflags.txt +++ b/world/map/npc/027-6/mapflags.txt @@ -1,2 +1,2 @@ -027-6.gat|mapflag|nosave|027-3,82,90 -027-6.gat|mapflag|resave|027-3,82,90 +027-6|mapflag|nosave|027-3,82,90 +027-6|mapflag|resave|027-3,82,90 diff --git a/world/map/npc/027-7/general_razha.txt b/world/map/npc/027-7/general_razha.txt index 755aa610..9a99e8b8 100644 --- a/world/map/npc/027-7/general_razha.txt +++ b/world/map/npc/027-7/general_razha.txt @@ -2,7 +2,7 @@ // Based off Cindy Fight // General Razha Fight -027-7.gat,39,25,0|script|General Razha|400 +027-7,39,25,0|script|General Razha|400 { if ($@CRYPT_FIGHT2 != 0) end; @@ -57,9 +57,9 @@ L_Ritual: set $@CRYPT_FIGHT2, 1; set $@CRYPT_FIGHT2_WAVE, 0; set $@CRYPT_FIGHT2_SUMMONS_COUNT, 2; - set $@CRYPT_FIGHT2_PLAYER_COUNT, getmapusers("027-7.gat"); - areamonster "027-7.gat", 0, 0, 79, 84, "", 1036, 1, "General Razha::OnPetDeath"; - areamonster "027-7.gat", 0, 0, 79, 84, "", 1124, 1, "General Razha::OnPetDeath"; + set $@CRYPT_FIGHT2_PLAYER_COUNT, getmapusers("027-7"); + areamonster "027-7", 0, 0, 79, 84, "", 1036, 1, "General Razha::OnPetDeath"; + areamonster "027-7", 0, 0, 79, 84, "", 1124, 1, "General Razha::OnPetDeath"; initnpctimer; goto L_Announce; @@ -86,7 +86,7 @@ OnTimer5000: L_Return_1: set $@CRYPT_FIGHT2_PLAYER_COUNT, 0; - areatimer "027-7.gat", 0, 0, 79, 84, 10, "General Razha::OnTick"; + areatimer "027-7", 0, 0, 79, 84, 10, "General Razha::OnTick"; end; L_CryptLogic: @@ -96,7 +96,7 @@ L_CryptLogic: if ($@CRYPT_FIGHT2_PLAYER_COUNT <= 0) goto L_CleanUpLosers; set $@CRYPT_FIGHT2_SUMMONS_ROUND_TIMER, $@CRYPT_FIGHT2_SUMMONS_ROUND_TIMER + 5; // Advance 5 seconds - if (mobcount("027-7.gat", "General Razha::OnPetDeath") < 0) + if (mobcount("027-7", "General Razha::OnPetDeath") < 0) goto L_NextWave; if ($@CRYPT_FIGHT2_SUMMONS_ROUND_TIMER + $@CRYPT_FIGHT2_ROUND_PEN >= 120) goto L_NextWave; @@ -121,31 +121,31 @@ L_NextWave: L_SummonNuke: set $@CRYPT_FIGHT2_SUMMONS_COUNT, $@CRYPT_FIGHT2_SUMMONS_COUNT + $@CRYPT_FIGHT2_WAVE*2 + $@CRYPT_FIGHT2_PLAYER_COUNT*4; - areamonster "027-7.gat", 0, 0, 79, 84, "", 1036, $@CRYPT_FIGHT2_WAVE*2 + $@CRYPT_FIGHT2_PLAYER_COUNT*4, "General Razha::OnPetDeath"; + areamonster "027-7", 0, 0, 79, 84, "", 1036, $@CRYPT_FIGHT2_WAVE*2 + $@CRYPT_FIGHT2_PLAYER_COUNT*4, "General Razha::OnPetDeath"; goto L_Announce; L_WeakSummons: set $@CRYPT_FIGHT2_SUMMONS_NUMBER, (5 + (1 * $@CRYPT_FIGHT2_WAVE) + (2 * $@CRYPT_FIGHT2_PLAYER_COUNT))/2; set $@CRYPT_FIGHT2_SUMMONS_COUNT, $@CRYPT_FIGHT2_SUMMONS_COUNT + ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2) + ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2); - areamonster "027-7.gat", 0, 0, 79, 84, "", 1036, ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2), "General Razha::OnPetDeath"; - areamonster "027-7.gat", 0, 0, 79, 84, "", 1045, ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2), "General Razha::OnPetDeath"; + areamonster "027-7", 0, 0, 79, 84, "", 1036, ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2), "General Razha::OnPetDeath"; + areamonster "027-7", 0, 0, 79, 84, "", 1045, ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2), "General Razha::OnPetDeath"; goto L_Announce; L_StrongSummons: set $@CRYPT_FIGHT2_SUMMONS_NUMBER, (5 + (1 * $@CRYPT_FIGHT2_WAVE) + (2 * $@CRYPT_FIGHT2_PLAYER_COUNT))/2; set $@CRYPT_FIGHT2_SUMMONS_COUNT, $@CRYPT_FIGHT2_SUMMONS_COUNT + ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2) + ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2); - areamonster "027-7.gat", 0, 0, 79, 84, "", 1036, ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2), "General Razha::OnPetDeath"; - areamonster "027-7.gat", 0, 0, 79, 84, "", 1124, ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2), "General Razha::OnPetDeath"; + areamonster "027-7", 0, 0, 79, 84, "", 1036, ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2), "General Razha::OnPetDeath"; + areamonster "027-7", 0, 0, 79, 84, "", 1124, ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2), "General Razha::OnPetDeath"; goto L_Announce; L_BossSummons: set $@CRYPT_FIGHT2_SUMMONS_NUMBER, (5 + (1 * $@CRYPT_FIGHT2_WAVE) + (2 * $@CRYPT_FIGHT2_PLAYER_COUNT))/2; set $@CRYPT_FIGHT2_SUMMONS_COUNT, $@CRYPT_FIGHT2_SUMMONS_COUNT + ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2) + ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2); - areamonster "027-7.gat", 0, 0, 79, 84, "", 1036, ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2), "General Razha::OnPetDeath"; - areamonster "027-7.gat", 0, 0, 79, 84, "", 1124, ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2), "General Razha::OnPetDeath"; - areamonster "027-7.gat", 0, 0, 79, 84, "", 1128, 1, "General Razha::OnPetDeath"; + areamonster "027-7", 0, 0, 79, 84, "", 1036, ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2), "General Razha::OnPetDeath"; + areamonster "027-7", 0, 0, 79, 84, "", 1124, ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2), "General Razha::OnPetDeath"; + areamonster "027-7", 0, 0, 79, 84, "", 1128, 1, "General Razha::OnPetDeath"; set $@CRYPT_FIGHT2_SUMMONS_COUNT, $@CRYPT_FIGHT2_SUMMONS_COUNT + 1; goto L_Announce; @@ -153,8 +153,8 @@ L_Announce: set $@msg$, $@CRYPT_FIGHT2_MESSAGES$[$@CRYPT_FIGHT2_WAVE]; if ($@msg$ == "") goto L_Return_1; - mapannounce "027-7.gat", $@msg$, 0; - mapannounce "027-4.gat", $@msg$, 0; + mapannounce "027-7", $@msg$, 0; + mapannounce "027-4", $@msg$, 0; set $@msg$, ""; goto L_Return_1; @@ -169,8 +169,8 @@ OnPetDeath: end; L_CleanUpLosers: - mapannounce "027-7.gat", "General Razha:* Oh where did you all go, I was beginning to have fun here.", 0; - mapannounce "027-4.gat", "The battle is lost.", 0; + mapannounce "027-7", "General Razha:* Oh where did you all go, I was beginning to have fun here.", 0; + mapannounce "027-4", "The battle is lost.", 0; set $@CRYPT_FIGHT2, 0; set $@CRYPT_FIGHT2_PLAYER_COUNT, 0; set $@CRYPT_FIGHT2_WAVE, 0; @@ -178,15 +178,15 @@ L_CleanUpLosers: set $@CRYPT_FIGHT2_SUMMONS_COUNT, 0; set $@CRYPT_FIGHT2_ROUND_PEN, 0; set $@CRYPT_FIGHT2_SUMMONS_NUMBER, 0; - killmonster "027-7.gat", "General Razha::OnPetDeath"; + killmonster "027-7", "General Razha::OnPetDeath"; stopnpctimer; setnpctimer 0; end; L_CleanUp: - mapannounce "027-7.gat", "General Razha:* How in all hells could that happen? I am lost forever.", 0; - mapannounce "027-4.gat", "General Razha is defeated.", 0; - areatimer "027-7.gat", 0, 0, 79, 84, 10, "General Razha::OnReward"; + mapannounce "027-7", "General Razha:* How in all hells could that happen? I am lost forever.", 0; + mapannounce "027-4", "General Razha is defeated.", 0; + areatimer "027-7", 0, 0, 79, 84, 10, "General Razha::OnReward"; set $@CRYPT_FIGHT2, 0; set $@CRYPT_FIGHT2_PLAYER_COUNT, 0; set $@CRYPT_FIGHT2_WAVE, 0; @@ -194,7 +194,7 @@ L_CleanUp: set $@CRYPT_FIGHT2_SUMMONS_COUNT, 0; set $@CRYPT_FIGHT2_ROUND_PEN, 0; set $@CRYPT_FIGHT2_SUMMONS_NUMBER, 0; - killmonster "027-7.gat", "General Razha::OnPetDeath"; + killmonster "027-7", "General Razha::OnPetDeath"; stopnpctimer; setnpctimer 0; end; diff --git a/world/map/npc/027-7/general_razha_exitdoor.txt b/world/map/npc/027-7/general_razha_exitdoor.txt index 97468895..5389a74b 100644 --- a/world/map/npc/027-7/general_razha_exitdoor.txt +++ b/world/map/npc/027-7/general_razha_exitdoor.txt @@ -1,11 +1,11 @@ // Mini-Boss // General Razha -027-7.gat,36,61,0|script|#GeneralExit2|35,6,0 +027-7,36,61,0|script|#GeneralExit2|35,6,0 { if ($@CRYPT_FIGHT2 != 0) goto L_Block; - warp "027-4.gat",73,77; + warp "027-4",73,77; end; L_Block: diff --git a/world/map/npc/027-7/mapflags.txt b/world/map/npc/027-7/mapflags.txt index 012a5cf5..d592dbdc 100644 --- a/world/map/npc/027-7/mapflags.txt +++ b/world/map/npc/027-7/mapflags.txt @@ -1,2 +1,2 @@ -027-7.gat|mapflag|nosave|027-4,73,78 -027-7.gat|mapflag|resave|027-4,73,78 +027-7|mapflag|nosave|027-4,73,78 +027-7|mapflag|resave|027-4,73,78 diff --git a/world/map/npc/027-8/general_terogan.txt b/world/map/npc/027-8/general_terogan.txt index 669a1597..1d2b2165 100644 --- a/world/map/npc/027-8/general_terogan.txt +++ b/world/map/npc/027-8/general_terogan.txt @@ -2,7 +2,7 @@ // Based off Cindy Fight // General Terogan Fight -027-8.gat,39,24,0|script|General Terogan#Main|400 +027-8,39,24,0|script|General Terogan#Main|400 { if ($@CRYPT_FIGHT3 != 0) end; @@ -75,9 +75,9 @@ L_RitualLeft: set $@CRYPT_FIGHT3, 1; set $@CRYPT_FIGHT3_WAVE, 0; set $@CRYPT_FIGHT3_SUMMONS_COUNT, 2; - set $@CRYPT_FIGHT3_PLAYER_COUNT, getmapusers("027-8.gat"); - areamonster "027-8.gat", 43, 39, 58, 60, "", 1124, 1, "General Terogan#Main::OnPetDeath"; - areamonster "027-8.gat", 20, 39, 35, 60, "", 1075, 1, "General Terogan#Main::OnPetDeath"; + set $@CRYPT_FIGHT3_PLAYER_COUNT, getmapusers("027-8"); + areamonster "027-8", 43, 39, 58, 60, "", 1124, 1, "General Terogan#Main::OnPetDeath"; + areamonster "027-8", 20, 39, 35, 60, "", 1075, 1, "General Terogan#Main::OnPetDeath"; initnpctimer; warp "027-8", 27, 43; @@ -108,9 +108,9 @@ L_RitualRight: set $@CRYPT_FIGHT3, 1; set $@CRYPT_FIGHT3_WAVE, 0; set $@CRYPT_FIGHT3_SUMMONS_COUNT, 2; - set $@CRYPT_FIGHT3_PLAYER_COUNT, getmapusers("027-8.gat"); - areamonster "027-8.gat", 43, 39, 58, 60, "", 1124, 1, "General Terogan#Main::OnPetDeath"; - areamonster "027-8.gat", 20, 39, 35, 60, "", 1075, 1, "General Terogan#Main::OnPetDeath"; + set $@CRYPT_FIGHT3_PLAYER_COUNT, getmapusers("027-8"); + areamonster "027-8", 43, 39, 58, 60, "", 1124, 1, "General Terogan#Main::OnPetDeath"; + areamonster "027-8", 20, 39, 35, 60, "", 1075, 1, "General Terogan#Main::OnPetDeath"; initnpctimer; goto L_Announce; @@ -141,7 +141,7 @@ OnTimer5000: L_Return_1: set $@CRYPT_FIGHT3_PLAYER_COUNT, 0; - areatimer "027-8.gat", 0, 0, 79, 84, 10, "General Terogan#Main::OnTick"; + areatimer "027-8", 0, 0, 79, 84, 10, "General Terogan#Main::OnTick"; end; L_CryptLogic: @@ -149,10 +149,10 @@ L_CryptLogic: if ($@CRYPT_FIGHT3_ROUND_PEN > 60) set $@CRYPT_FIGHT3_ROUND_PEN, 60; if ($@CRYPT_FIGHT3_PLAYER_COUNT <= 0) goto L_CleanUpLosers; - if getareausers("027-8.gat", 20, 39, 35, 60, 1) < 1 goto L_Failure; - if getareausers("027-8.gat", 43, 39, 58, 60, 1) < 1 goto L_Failure; + if getareausers("027-8", 20, 39, 35, 60, 1) < 1 goto L_Failure; + if getareausers("027-8", 43, 39, 58, 60, 1) < 1 goto L_Failure; set $@CRYPT_FIGHT3_SUMMONS_ROUND_TIMER, $@CRYPT_FIGHT3_SUMMONS_ROUND_TIMER + 5; // Advance 5 seconds - if (mobcount("027-8.gat", "General Terogan#Main::OnPetDeath") < 0) + if (mobcount("027-8", "General Terogan#Main::OnPetDeath") < 0) goto L_NextWave; if ($@CRYPT_FIGHT3_SUMMONS_ROUND_TIMER + $@CRYPT_FIGHT3_ROUND_PEN >= 120) goto L_NextWave; @@ -177,40 +177,40 @@ L_NextWave: L_SummonNuke: set $@CRYPT_FIGHT3_SUMMONS_COUNT, $@CRYPT_FIGHT3_SUMMONS_COUNT + $@CRYPT_FIGHT3_WAVE*2 + $@CRYPT_FIGHT3_PLAYER_COUNT*4; - areamonster "027-8.gat", 0, 0, 79, 84, "", 1124, $@CRYPT_FIGHT3_WAVE*2 + $@CRYPT_FIGHT3_PLAYER_COUNT*4, "General Terogan#Main::OnPetDeath"; + areamonster "027-8", 0, 0, 79, 84, "", 1124, $@CRYPT_FIGHT3_WAVE*2 + $@CRYPT_FIGHT3_PLAYER_COUNT*4, "General Terogan#Main::OnPetDeath"; goto L_Announce; L_WeakSummons: set $@CRYPT_FIGHT3_SUMMONS_NUMBER, (5 + (1 * $@CRYPT_FIGHT3_WAVE) + (2 * $@CRYPT_FIGHT3_PLAYER_COUNT))/2; set $@CRYPT_FIGHT3_SUMMONS_COUNT, $@CRYPT_FIGHT3_SUMMONS_COUNT + ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2) + ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2); - areamonster "027-8.gat", 43, 39, 58, 60, "", 1124, ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2), "General Terogan#Main::OnPetDeath"; - areamonster "027-8.gat", 20, 39, 35, 60, "", 1074, ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2), "General Terogan#Main::OnPetDeath"; + areamonster "027-8", 43, 39, 58, 60, "", 1124, ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2), "General Terogan#Main::OnPetDeath"; + areamonster "027-8", 20, 39, 35, 60, "", 1074, ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2), "General Terogan#Main::OnPetDeath"; goto L_Announce; L_StrongSummons: set $@CRYPT_FIGHT3_SUMMONS_NUMBER, (5 + (1 * $@CRYPT_FIGHT3_WAVE) + (2 * $@CRYPT_FIGHT3_PLAYER_COUNT))/2; set $@CRYPT_FIGHT3_SUMMONS_COUNT, $@CRYPT_FIGHT3_SUMMONS_COUNT + (2 * ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2)); - areamonster "027-8.gat", 43, 39, 58, 60, "", 1124, ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2), "General Terogan#Main::OnPetDeath"; - areamonster "027-8.gat", 20, 39, 35, 60, "", 1075, ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2), "General Terogan#Main::OnPetDeath"; + areamonster "027-8", 43, 39, 58, 60, "", 1124, ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2), "General Terogan#Main::OnPetDeath"; + areamonster "027-8", 20, 39, 35, 60, "", 1075, ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2), "General Terogan#Main::OnPetDeath"; goto L_Announce; L_BossSummons: set $@CRYPT_FIGHT3_SUMMONS_NUMBER, (5 + (1 * $@CRYPT_FIGHT3_WAVE) + (2 * $@CRYPT_FIGHT3_PLAYER_COUNT))/2; set $@CRYPT_FIGHT3_SUMMONS_COUNT, $@CRYPT_FIGHT3_SUMMONS_COUNT + (2 * ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2)) + 2; - areamonster "027-8.gat", 43, 39, 58, 60, "", 1124, ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2), "General Terogan#Main::OnPetDeath"; - areamonster "027-8.gat", 20, 39, 35, 60, "", 1075, ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2), "General Terogan#Main::OnPetDeath"; - areamonster "027-8.gat", 43, 39, 58, 60, "", 1129, 1, "General Terogan#Main::OnPetDeath"; - areamonster "027-8.gat", 20, 39, 35, 60, "", 1129, 1, "General Terogan#Main::OnPetDeath"; + areamonster "027-8", 43, 39, 58, 60, "", 1124, ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2), "General Terogan#Main::OnPetDeath"; + areamonster "027-8", 20, 39, 35, 60, "", 1075, ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2), "General Terogan#Main::OnPetDeath"; + areamonster "027-8", 43, 39, 58, 60, "", 1129, 1, "General Terogan#Main::OnPetDeath"; + areamonster "027-8", 20, 39, 35, 60, "", 1129, 1, "General Terogan#Main::OnPetDeath"; goto L_Announce; L_Announce: set $@msg$, $@CRYPT_FIGHT3_MESSAGES$[$@CRYPT_FIGHT3_WAVE]; if ($@msg$ == "") goto L_Return_1; - mapannounce "027-8.gat", $@msg$, 0; - mapannounce "027-5.gat", $@msg$, 0; + mapannounce "027-8", $@msg$, 0; + mapannounce "027-5", $@msg$, 0; set $@msg$, ""; goto L_Return_1; @@ -228,12 +228,12 @@ OnPetDeath: L_Failure: if $@CRYPT_FAIL_ANNOUNCED goto L_NextWave; set $@CRYPT_FAIL_ANNOUNCED, 1; - mapannounce "027-8.gat", "Looks like your neighbour team to is finished off, this is your death sentence!", 0; + mapannounce "027-8", "Looks like your neighbour team to is finished off, this is your death sentence!", 0; set $@CRYPT_FIGHT3_WAVE, 23; goto L_NextWave; L_CleanUpLosers: - mapannounce "027-8.gat", "General Terogan:* You just proved you cannot even coordinate a simple task. Come back when you are prepared", 0; + mapannounce "027-8", "General Terogan:* You just proved you cannot even coordinate a simple task. Come back when you are prepared", 0; set $@CRYPT_FIGHT3, 0; set $@CRYPT_FIGHT3_PLAYER_COUNT, 0; set $@CRYPT_FIGHT3_WAVE, 0; @@ -242,14 +242,14 @@ L_CleanUpLosers: set $@CRYPT_FIGHT3_ROUND_PEN, 0; set $@CRYPT_FIGHT3_SUMMONS_NUMBER, 0; set $@CRYPT_FAIL_ANNOUNCED, 0; - killmonster "027-8.gat", "General Terogan#Main::OnPetDeath"; + killmonster "027-8", "General Terogan#Main::OnPetDeath"; stopnpctimer; setnpctimer 0; end; L_CleanUp: - mapannounce "027-8.gat", "General Terogan: You might have won this battle, but you will never defeat me!", 0; - areatimer "027-8.gat", 0, 0, 79, 84, 10, "General Terogan#Main::OnReward"; + mapannounce "027-8", "General Terogan: You might have won this battle, but you will never defeat me!", 0; + areatimer "027-8", 0, 0, 79, 84, 10, "General Terogan#Main::OnReward"; set $@CRYPT_FIGHT3, 0; set $@CRYPT_FIGHT3_PLAYER_COUNT, 0; set $@CRYPT_FIGHT3_WAVE, 0; @@ -258,7 +258,7 @@ L_CleanUp: set $@CRYPT_FIGHT3_ROUND_PEN, 0; set $@CRYPT_FIGHT3_SUMMONS_NUMBER, 0; set $@CRYPT_FAIL_ANNOUNCED, 0; - killmonster "027-8.gat", "General Terogan#Main::OnPetDeath"; + killmonster "027-8", "General Terogan#Main::OnPetDeath"; stopnpctimer; setnpctimer 0; end; @@ -299,7 +299,7 @@ OnInit: end; } -027-8.gat,27,41,0|script|General Terogan#Exit1|400 +027-8,27,41,0|script|General Terogan#Exit1|400 { if ($@CRYPT_FIGHT3 != 0) message strcharinfo(0), "You are way too busy to check this book right now"; @@ -310,7 +310,7 @@ OnInit: warp "027-8", 38, 29; end; } -027-8.gat,51,41,0|script|General Terogan#Exit2|400 +027-8,51,41,0|script|General Terogan#Exit2|400 { if ($@CRYPT_FIGHT3 != 0) message strcharinfo(0), "You are way too busy to check this book right now"; diff --git a/world/map/npc/027-8/general_terogan_exitdoor.txt b/world/map/npc/027-8/general_terogan_exitdoor.txt index 3be3bdb1..6f0e01f0 100644 --- a/world/map/npc/027-8/general_terogan_exitdoor.txt +++ b/world/map/npc/027-8/general_terogan_exitdoor.txt @@ -1,11 +1,11 @@ // Mini-Boss // General Krukun -027-8.gat,38,61,0|script|#GeneralExit3|35,3,0 +027-8,38,61,0|script|#GeneralExit3|35,3,0 { if ($@CRYPT_FIGHT3 != 0) goto L_Block; - warp "027-5.gat",70,26; + warp "027-5",70,26; end; L_Block: diff --git a/world/map/npc/027-8/mapflags.txt b/world/map/npc/027-8/mapflags.txt index 969ec6f4..e1aa73b1 100644 --- a/world/map/npc/027-8/mapflags.txt +++ b/world/map/npc/027-8/mapflags.txt @@ -1,2 +1,2 @@ -027-8.gat|mapflag|nosave|027-5,70,27 -027-8.gat|mapflag|resave|027-5,70,27 +027-8|mapflag|nosave|027-5,70,27 +027-8|mapflag|resave|027-5,70,27 diff --git a/world/map/npc/028-1/mapflags.txt b/world/map/npc/028-1/mapflags.txt index 1bc5647d..f1de8f33 100644 --- a/world/map/npc/028-1/mapflags.txt +++ b/world/map/npc/028-1/mapflags.txt @@ -1 +1 @@ -028-1.gat|mapflag|nosave|009-1,53,40 +028-1|mapflag|nosave|009-1,53,40 diff --git a/world/map/npc/028-3/mapflags.txt b/world/map/npc/028-3/mapflags.txt index 131f100f..4fe56202 100644 --- a/world/map/npc/028-3/mapflags.txt +++ b/world/map/npc/028-3/mapflags.txt @@ -1 +1 @@ -028-3.gat|mapflag|nosave|009-1,53,40 +028-3|mapflag|nosave|009-1,53,40 diff --git a/world/map/npc/029-1/aahna.txt b/world/map/npc/029-1/aahna.txt index 1b1c4489..e9da0d20 100644 --- a/world/map/npc/029-1/aahna.txt +++ b/world/map/npc/029-1/aahna.txt @@ -1,7 +1,7 @@ // Aahna // Author: Wushin // Npc -029-1.gat,71,52,0|script|Aahna|404 +029-1,71,52,0|script|Aahna|404 { setarray @npc_loc, 71, 52, 3; callfunc "PCtoNPCRange"; diff --git a/world/map/npc/029-1/barrier.txt b/world/map/npc/029-1/barrier.txt index 4446ac6c..1e5281a4 100644 --- a/world/map/npc/029-1/barrier.txt +++ b/world/map/npc/029-1/barrier.txt @@ -1,8 +1,8 @@ -029-1.gat,69,61,0|script|#CandorBarrier|45,0,0 +029-1,69,61,0|script|#CandorBarrier|45,0,0 { if ($@FIGHT_CAVE_STATUS == 1) goto L_Block; if (BaseLevel < 40) goto L_Block; - warp "029-3.gat", 49, 53; + warp "029-3", 49, 53; end; L_Block: @@ -10,7 +10,7 @@ L_Block: end; } -029-1.gat,69,61,0|script|#CandorAnnouncer|127 +029-1,69,61,0|script|#CandorAnnouncer|127 { end; OnCommandTalk: diff --git a/world/map/npc/029-1/dock.txt b/world/map/npc/029-1/dock.txt index 7430971c..61f8a242 100644 --- a/world/map/npc/029-1/dock.txt +++ b/world/map/npc/029-1/dock.txt @@ -1,19 +1,19 @@ // The ferry dock // Ferry Sign -029-1.gat,43,104,0|script|Ferry Schedule#8|397 +029-1,43,104,0|script|Ferry Schedule#8|397 { callfunc "FerryManifest"; end; } -029-1.gat,51,118,0|script|Candor Koga|395,8,8 +029-1,51,118,0|script|Candor Koga|395,8,8 { callfunc "BoardCandorFerry"; close; } -029-1.gat,55,110,0|script|#CandorDock|127 +029-1,55,110,0|script|#CandorDock|127 { end; OnCommandArrive: diff --git a/world/map/npc/029-1/ferry_master.txt b/world/map/npc/029-1/ferry_master.txt index 3163e6b2..4586a3f8 100644 --- a/world/map/npc/029-1/ferry_master.txt +++ b/world/map/npc/029-1/ferry_master.txt @@ -1,6 +1,6 @@ // -029-1.gat,45,107,0|script|Ferry Master#candor|138 +029-1,45,107,0|script|Ferry Master#candor|138 { mes "[Ferry Master]"; mes "\"Hello! Do you need something?\""; diff --git a/world/map/npc/029-1/hasan.txt b/world/map/npc/029-1/hasan.txt index 6006cff3..cf5298f5 100644 --- a/world/map/npc/029-1/hasan.txt +++ b/world/map/npc/029-1/hasan.txt @@ -6,7 +6,7 @@ // They respond by asking play for help // Hasan tells them to but out of it. -029-1.gat,35,33,0|script|Scared Man|160 +029-1,35,33,0|script|Scared Man|160 { setarray @npc_loc, 35, 33, 4; callfunc "PCtoNPCRange"; @@ -24,7 +24,7 @@ L_TutDone: L_End: end; } -029-1.gat,33,33,0|script|Hasan|189,3,3 +029-1,33,33,0|script|Hasan|189,3,3 { setarray @npc_loc, 33, 33, 4; callfunc "PCtoNPCRange"; @@ -156,7 +156,7 @@ OnTouch: end; goto L_Main; } -029-1.gat,0,0,0|script|#ScorpionTrigger|35 +029-1,0,0,0|script|#ScorpionTrigger|35 { end; @@ -164,7 +164,7 @@ OnCommandHasanSpawn: goto L_Summon; L_Summon: - monster "029-1.gat",33,33,"WeakScorpion",1046,1, "#ScorpionTrigger::OnScorpionDeath"; + monster "029-1",33,33,"WeakScorpion",1046,1, "#ScorpionTrigger::OnScorpionDeath"; initnpctimer; end; @@ -203,7 +203,7 @@ L_MessageDeath: goto L_Clean; L_Clean: - killmonster "029-1.gat", "#ScorpionTrigger::OnScorpionDeath"; + killmonster "029-1", "#ScorpionTrigger::OnScorpionDeath"; set $@ScorpionFighter, 0; set $@ScorpionTimer, 0; set $@ScorpDeath, 0; diff --git a/world/map/npc/029-1/hideandseek.txt b/world/map/npc/029-1/hideandseek.txt index 4a4476ff..31653f95 100644 --- a/world/map/npc/029-1/hideandseek.txt +++ b/world/map/npc/029-1/hideandseek.txt @@ -36,7 +36,7 @@ function|script|CountHideNSeek set @hidden_kid_cnt, (@hidden_kid_cnt + 1); return; } -029-1.gat,64,90,0|script|AyashaDebug|258 +029-1,64,90,0|script|AyashaDebug|258 { mes "[Ayasha Debug]"; menu @@ -75,7 +75,7 @@ OnInit: disablenpc "AyashaDebug"; end; } -029-1.gat,62,90,0|script|Ayasha|258 +029-1,62,90,0|script|Ayasha|258 { set @child_number, 0; callfunc "XmasList"; @@ -145,7 +145,7 @@ L_Close: close; } -029-1.gat,50,105,0|script|Latif|262 +029-1,50,105,0|script|Latif|262 { set @child_number, 1; callfunc "XmasList"; @@ -208,7 +208,7 @@ L_Close: close; } -029-1.gat,48,67,0|script|Charda|260 +029-1,48,67,0|script|Charda|260 { set @child_number, 2; callfunc "XmasList"; @@ -259,7 +259,7 @@ L_Close: close; } -029-1.gat,100,36,0|script|Faris|259 +029-1,100,36,0|script|Faris|259 { set @child_number, 3; callfunc "XmasList"; @@ -311,7 +311,7 @@ L_Close: close; } -029-1.gat,28,52,0|script|Rasin|263 +029-1,28,52,0|script|Rasin|263 { set @child_number, 4; callfunc "XmasList"; @@ -354,7 +354,7 @@ L_Close: close; } -029-1.gat,79,99,0|script|Ghada|265 +029-1,79,99,0|script|Ghada|265 { set @child_number, 5; callfunc "XmasList"; diff --git a/world/map/npc/029-1/kaan.txt b/world/map/npc/029-1/kaan.txt index 0dabb802..1c3cf0bb 100644 --- a/world/map/npc/029-1/kaan.txt +++ b/world/map/npc/029-1/kaan.txt @@ -1,7 +1,7 @@ // This file is part of the Tutorial // Author: Jenalya -029-1.gat,46,95,0|script|Kaan|160 +029-1,46,95,0|script|Kaan|160 { setarray @npc_loc, 46, 97, 4; callfunc "PCtoNPCRange"; diff --git a/world/map/npc/029-1/liana.txt b/world/map/npc/029-1/liana.txt index dd95cc0c..c0eacba6 100644 --- a/world/map/npc/029-1/liana.txt +++ b/world/map/npc/029-1/liana.txt @@ -1,6 +1,6 @@ // Talk NPCs to help make trek interesting between Tutorial and Bazaar. -029-1.gat,62,96,0|script|Liana|205 +029-1,62,96,0|script|Liana|205 { setarray @npc_loc, 62, 96, 4; callfunc "PCtoNPCRange"; diff --git a/world/map/npc/029-1/mapflags.txt b/world/map/npc/029-1/mapflags.txt index 2f352ae3..3eb8d0f9 100644 --- a/world/map/npc/029-1/mapflags.txt +++ b/world/map/npc/029-1/mapflags.txt @@ -1 +1 @@ -029-1.gat|mapflag|resave|029-1,39,102 +029-1|mapflag|resave|029-1,39,102 diff --git a/world/map/npc/029-1/monster_guide.txt b/world/map/npc/029-1/monster_guide.txt index 705dce05..205ff4df 100644 --- a/world/map/npc/029-1/monster_guide.txt +++ b/world/map/npc/029-1/monster_guide.txt @@ -1,6 +1,6 @@ // -029-1.gat,45,97,0|script|Aidan|102 +029-1,45,97,0|script|Aidan|102 { if (MPQUEST == 0) goto L_Register; diff --git a/world/map/npc/029-1/rewards_master.txt b/world/map/npc/029-1/rewards_master.txt index cf8a1c1d..acfafc58 100644 --- a/world/map/npc/029-1/rewards_master.txt +++ b/world/map/npc/029-1/rewards_master.txt @@ -1,6 +1,6 @@ // -029-1.gat,47,97,0|script|Ishi|106 +029-1,47,97,0|script|Ishi|106 { if (MPQUEST == 0) goto L_Register; if (tvis == 0) set tvis, 1; diff --git a/world/map/npc/029-1/soul-menhir.txt b/world/map/npc/029-1/soul-menhir.txt index adabfff1..d38f5e85 100644 --- a/world/map/npc/029-1/soul-menhir.txt +++ b/world/map/npc/029-1/soul-menhir.txt @@ -1,9 +1,9 @@ // -029-1.gat,39,101,0|script|Soul Menhir#candor|344 +029-1,39,101,0|script|Soul Menhir#candor|344 { callfunc "ClearVariables"; - set @map$, "029-1.gat"; + set @map$, "029-1"; setarray @Xs, 38, 39, 40, 38, 40, 38, 39, 40; setarray @Ys, 100, 100, 100, 101, 101, 102, 102, 102; set @x, 0; diff --git a/world/map/npc/029-1/traveler.txt b/world/map/npc/029-1/traveler.txt index 13377fbf..1d7f354a 100644 --- a/world/map/npc/029-1/traveler.txt +++ b/world/map/npc/029-1/traveler.txt @@ -2,7 +2,7 @@ // Author: Wombat, wushin // cost depending on level and adapted to new scripting guidelines: Jenalya -029-1.gat,69,68,0|script|Knitra the Traveler|103 +029-1,69,68,0|script|Knitra the Traveler|103 { set @NpcName$, "Knitra"; set @NpcTravelBit, $@candor_bit; diff --git a/world/map/npc/029-1/tutorial.txt b/world/map/npc/029-1/tutorial.txt index 6a3df4ff..ddaea587 100644 --- a/world/map/npc/029-1/tutorial.txt +++ b/world/map/npc/029-1/tutorial.txt @@ -25,7 +25,7 @@ function|script|SetTutorialMask set @tutorial_tmp, 0; return; } -029-2.gat,21,26,0|script|TutDebug|154 +029-2,21,26,0|script|TutDebug|154 { mes "[TutDebug]"; mes "Reset?"; @@ -57,7 +57,7 @@ OnInit: disablenpc "TutDebug"; end; } -029-1.gat,32,99,0|script|#tutorialoutside|45,0,0 +029-1,32,99,0|script|#tutorialoutside|45,0,0 { callfunc "TutorialState"; if (@tutorial >= 8) @@ -70,6 +70,6 @@ L_ResetTutorial: goto L_Warp; L_Warp: - warp "029-2.gat", 114, 92; + warp "029-2", 114, 92; end; } diff --git a/world/map/npc/029-1/valon.txt b/world/map/npc/029-1/valon.txt index 0ce62c79..49bb6c5d 100644 --- a/world/map/npc/029-1/valon.txt +++ b/world/map/npc/029-1/valon.txt @@ -47,7 +47,7 @@ function|script|ValonProgress message strcharinfo(0), $@ValonMobName$[@valon_mob] + ": " + @valon_count + "/" + $@ValonMobCnt[@valon_mob]; return; } -029-1.gat,74,86,0|script|ValonDebug|156 +029-1,74,86,0|script|ValonDebug|156 { mes "[Valon Debug]"; mes "Reset?"; @@ -69,7 +69,7 @@ OnInit: disablenpc "ValonDebug"; end; } -029-1.gat,72,86,0|script|Valon|156 +029-1,72,86,0|script|Valon|156 { setarray @npc_loc, 72, 86, 4; callfunc "PCtoNPCRange"; diff --git a/world/map/npc/029-1/vincent.txt b/world/map/npc/029-1/vincent.txt index 36ce4c2d..a9cf7291 100644 --- a/world/map/npc/029-1/vincent.txt +++ b/world/map/npc/029-1/vincent.txt @@ -1,6 +1,6 @@ // Variables used: nibble 2 of QUEST_SouthTulimshar -029-1.gat,108,108,0|script|Vincent Debug|113 +029-1,108,108,0|script|Vincent Debug|113 { mes "[Vincent Debug]"; mes "Reset?"; @@ -21,7 +21,7 @@ OnInit: disablenpc "Vincent Debug"; end; } -029-1.gat,107,110,0|script|Vincent|113 +029-1,107,110,0|script|Vincent|113 { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/029-1/zegas.txt b/world/map/npc/029-1/zegas.txt index 8ecc55e4..f9cefcbd 100644 --- a/world/map/npc/029-1/zegas.txt +++ b/world/map/npc/029-1/zegas.txt @@ -1,7 +1,7 @@ // Barrels // Author: Wushin // Npc -029-1.gat,45,85,0|script|Zegas|165 +029-1,45,85,0|script|Zegas|165 { setarray @npc_loc, 45, 85, 2; callfunc "PCtoNPCRange"; @@ -77,7 +77,7 @@ L_Thanks: L_Close: close; } -029-1.gat,47,86,0|script|ZegasDebug|165 +029-1,47,86,0|script|ZegasDebug|165 { mes "[Zegas Debug]"; mes "Reset ?"; diff --git a/world/map/npc/029-2/barrels.txt b/world/map/npc/029-2/barrels.txt index aba6ed58..4ff3e6de 100644 --- a/world/map/npc/029-2/barrels.txt +++ b/world/map/npc/029-2/barrels.txt @@ -1,6 +1,6 @@ // Barrels // Author: Wushin -029-2.gat,23,86,0|script|Barrel#0|400 +029-2,23,86,0|script|Barrel#0|400 { setarray @npc_loc, 23, 86, 2; set @barrel, 0; @@ -12,49 +12,49 @@ OnMaggotDeath: callfunc "MobPoints"; end; } -029-2.gat,28,86,0|script|Barrel#1|400 +029-2,28,86,0|script|Barrel#1|400 { setarray @npc_loc, 28, 86, 2; set @barrel, 1; callfunc "CheckBarrel"; end; } -029-2.gat,31,91,0|script|Barrel#2|400 +029-2,31,91,0|script|Barrel#2|400 { setarray @npc_loc, 31, 91, 2; set @barrel, 2; callfunc "CheckBarrel"; end; } -029-2.gat,36,85,0|script|Barrel#3|400 +029-2,36,85,0|script|Barrel#3|400 { setarray @npc_loc, 36, 85, 2; set @barrel, 3; callfunc "CheckBarrel"; end; } -029-2.gat,40,89,0|script|Barrel#4|400 +029-2,40,89,0|script|Barrel#4|400 { setarray @npc_loc, 40, 89, 2; set @barrel, 4; callfunc "CheckBarrel"; end; } -029-2.gat,38,91,0|script|Barrel#5|400 +029-2,38,91,0|script|Barrel#5|400 { setarray @npc_loc, 38, 91, 2; set @barrel, 5; callfunc "CheckBarrel"; end; } -029-2.gat,29,92,0|script|Barrel#6|400 +029-2,29,92,0|script|Barrel#6|400 { setarray @npc_loc, 29, 92, 2; set @barrel, 6; callfunc "CheckBarrel"; end; } -029-2.gat,24,91,0|script|Barrel#7|400 +029-2,24,91,0|script|Barrel#7|400 { setarray @npc_loc, 24, 91, 2; set @barrel, 7; diff --git a/world/map/npc/029-2/barrels_config.txt b/world/map/npc/029-2/barrels_config.txt index 5407a944..665903fb 100644 --- a/world/map/npc/029-2/barrels_config.txt +++ b/world/map/npc/029-2/barrels_config.txt @@ -1,6 +1,6 @@ // Barrels // Author: Wushin -029-2.gat,33,88,24,7|monster|HouseMaggot|1050,2,100000ms,30000ms,Barrel#0::OnMaggotDeath +029-2,33,88,24,7|monster|HouseMaggot|1050,2,100000ms,30000ms,Barrel#0::OnMaggotDeath -|script|#BarrelConfig|-1 { end; @@ -88,12 +88,12 @@ L_QuestReward: misceffect 33; set @barrel_tmp, 3; callfunc "SetBarrelMask"; - killmonster getmap() + ".gat", "Barrel#0::OnMaggotDeath"; + killmonster getmap() + "", "Barrel#0::OnMaggotDeath"; goto L_Return; L_Spawn: message strcharinfo(0), "Uck, More Maggots!"; - areamonster getmap() + ".gat", @npc_loc[0], @npc_loc[1], (@npc_loc[0] + 1), (@npc_loc[1] + 1), $@BarrelSpawnName$, $@BarrelSpawnId, $@BarrelSpawnCnt, "Barrel#0::OnMaggotDeath"; + areamonster getmap() + "", @npc_loc[0], @npc_loc[1], (@npc_loc[0] + 1), (@npc_loc[1] + 1), $@BarrelSpawnName$, $@BarrelSpawnId, $@BarrelSpawnCnt, "Barrel#0::OnMaggotDeath"; goto L_Return; L_Reward: diff --git a/world/map/npc/029-2/mapflags.txt b/world/map/npc/029-2/mapflags.txt index ef75b6c6..1de2d675 100644 --- a/world/map/npc/029-2/mapflags.txt +++ b/world/map/npc/029-2/mapflags.txt @@ -1,2 +1,2 @@ -029-2.gat|mapflag|nosave|029-2,22,24 -029-2.gat|mapflag|resave|029-2,22,24 +029-2|mapflag|nosave|029-2,22,24 +029-2|mapflag|resave|029-2,22,24 diff --git a/world/map/npc/029-2/sorfina.txt b/world/map/npc/029-2/sorfina.txt index 4f55ef76..0c0fef07 100644 --- a/world/map/npc/029-2/sorfina.txt +++ b/world/map/npc/029-2/sorfina.txt @@ -1,6 +1,6 @@ // This file is part of the Tutorial // Author: Jenalya -029-2.gat,27,27,0|script|Sorfina|154,0,1 +029-2,27,27,0|script|Sorfina|154,0,1 { setarray @npc_loc, 27, 27, 2; callfunc "PCtoNPCRange"; @@ -260,7 +260,7 @@ OnTouch: goto L_Start; } -029-2.gat,33,27,0|script|#Carpet|32767,1,1 +029-2,33,27,0|script|#Carpet|32767,1,1 { end; @@ -279,7 +279,7 @@ OnTouch: close; } -029-2.gat,29,23,0|script|Dresser#tutorial|400 +029-2,29,23,0|script|Dresser#tutorial|400 { setarray @npc_loc, 29, 23, 2; callfunc "PCtoNPCRange"; @@ -317,7 +317,7 @@ L_CloseDis: close; } -029-2.gat,44,31,0|script|#DoorOutTut1|45,0,0 +029-2,44,31,0|script|#DoorOutTut1|45,0,0 { end; @@ -325,14 +325,14 @@ OnTouch: callfunc "TutorialState"; if (@tutorial < 4) goto L_Block; - warp "029-2.gat", 112, 85; + warp "029-2", 112, 85; end; L_Block: message strcharinfo(0), "Sorfina: Wait a moment! You're not ready to leave."; end; } -029-2.gat,23,24,0|script|#GameRules1|32767,0,1 +029-2,23,24,0|script|#GameRules1|32767,0,1 { end; @@ -345,7 +345,7 @@ OnTouch: callfunc "GameRules"; close; } -029-2.gat,21,24,0|script|#GameRules2|32767,0,1 +029-2,21,24,0|script|#GameRules2|32767,0,1 { end; @@ -358,7 +358,7 @@ OnTouch: mes "If you're using another client, settings and controls may be different."; close; } -029-2.gat,22,26,0|script|#GameRules3|32767,1,0 +029-2,22,26,0|script|#GameRules3|32767,1,0 { if (TUT_var == 0) goto L_KnockBack; @@ -366,13 +366,13 @@ OnTouch: L_KnockBack: message strcharinfo(0), "Please Accept the Game rules"; - warp "029-2.gat", 22, 24; + warp "029-2", 22, 24; goto L_Close; L_Close: close; } -029-2.gat,24,24,0|script|#GameRules4|32767,0,1 +029-2,24,24,0|script|#GameRules4|32767,0,1 { if (TUT_var == 0) goto L_KnockBack; @@ -380,7 +380,7 @@ L_Close: L_KnockBack: message strcharinfo(0), "Please Accept the Game rules"; - warp "029-2.gat", 22, 24; + warp "029-2", 22, 24; goto L_Close; L_Close: diff --git a/world/map/npc/029-2/stat_reset.txt b/world/map/npc/029-2/stat_reset.txt index f3af6df6..896bbf6b 100644 --- a/world/map/npc/029-2/stat_reset.txt +++ b/world/map/npc/029-2/stat_reset.txt @@ -1,6 +1,6 @@ // -029-2.gat,98,92,0|script|Jessie|159 +029-2,98,92,0|script|Jessie|159 { setarray @npc_loc, 98, 91, 4; callfunc "PCtoNPCRange"; diff --git a/world/map/npc/029-2/tanisha.txt b/world/map/npc/029-2/tanisha.txt index 92ffccaf..450bc77c 100644 --- a/world/map/npc/029-2/tanisha.txt +++ b/world/map/npc/029-2/tanisha.txt @@ -2,14 +2,14 @@ // Authors: Jenalya, alastrim // Cleanup: o11c -029-2.gat,110,88,0|script|Tanisha|114 +029-2,110,88,0|script|Tanisha|114 { setarray @npc_loc, 110, 88, 4; callfunc "PCtoNPCRange"; if (@npc_check) goto L_Close; - if (isin("029-2.gat", 98, 84, 106, 89)) + if (isin("029-2", 98, 84, 106, 89)) goto L_Fighting; callfunc "TutorialState"; @@ -49,7 +49,7 @@ L_Next1: // since the check happens here, it is actually possible to have // more than $@Maggot_MaxHunters in the area at one time // but that's not a BIG problem - if (getareausers("029-2.gat", 98, 84, 106, 89) >= $@Maggot_MaxHunters) + if (getareausers("029-2", 98, 84, 106, 89) >= $@Maggot_MaxHunters) goto L_Crowded; next; goto L_Fight_Again; @@ -87,13 +87,13 @@ L_ContinueFight: callfunc "SetTutorialMask"; set @Maggot_Kills, 0; set @time, 0; - if (getareausers("029-2.gat", 98, 84, 106, 89) == 0) + if (getareausers("029-2", 98, 84, 106, 89) == 0) initnpctimer; - warp "029-2.gat", 101, 87; + warp "029-2", 101, 87; goto L_Summon; L_Summon: - areamonster "029-2.gat", 98, 84, 106, 89, "", 1002, 1, "Tanisha::OnMaggotDeath"; + areamonster "029-2", 98, 84, 106, 89, "", 1002, 1, "Tanisha::OnMaggotDeath"; end; L_Stats: @@ -191,7 +191,7 @@ L_Crowded: goto L_Close; L_Sleep: - warp "029-2.gat", 101, 87; + warp "029-2", 101, 87; mes "[Tanisha]"; mes "\"What are you doing in there?"; mes "Sleeping?"; @@ -199,7 +199,7 @@ L_Sleep: set @Maggot_Kills, 0; set @time, 0; close2; - if (getareausers("029-2.gat", 98, 84, 106, 89) == 0) + if (getareausers("029-2", 98, 84, 106, 89) == 0) goto L_CleanUp; end; @@ -215,7 +215,7 @@ L_Fail: "No, I need a rest.", L_Close; L_Next2: - if (getareausers("029-2.gat", 98, 84, 106, 89) >= $@Maggot_MaxHunters) + if (getareausers("029-2", 98, 84, 106, 89) >= $@Maggot_MaxHunters) goto L_Crowded; goto L_Fight_Again; @@ -225,17 +225,17 @@ L_Fighting: OnTimer1000: setnpctimer 0; - if (getareausers("029-2.gat", 98, 84, 106, 89) == 0) + if (getareausers("029-2", 98, 84, 106, 89) == 0) goto L_CleanUp; // This is needed because multiple players can be in the area at once - areatimer "029-2.gat", 98, 84, 106, 89, 0, "Tanisha::OnTick"; + areatimer "029-2", 98, 84, 106, 89, 0, "Tanisha::OnTick"; end; L_CleanUp: - killmonster "029-2.gat", "Tanisha::OnMaggotDeath"; + killmonster "029-2", "Tanisha::OnMaggotDeath"; set $@Maggot_Hunters, 0; stopnpctimer; - areamonster "029-2.gat", 98, 84, 106, 89, "", 1002, 1, "Tanisha::OnMaggotDeath"; + areamonster "029-2", 98, 84, 106, 89, "", 1002, 1, "Tanisha::OnMaggotDeath"; end; OnTick: @@ -257,17 +257,17 @@ OnMaggotDeath: message strcharinfo(0), "Tanisha: Ohh... Irrhk... Eeeeww... They just appear from nowhere!"; if (@Maggot_Kills == 3) message strcharinfo(0), "Tanisha: Yuck... I think I am getting sick."; - if (isin("029-2.gat", 98, 84, 106, 89)) + if (isin("029-2", 98, 84, 106, 89)) set @Maggot_Kills, @Maggot_Kills + 1; if (@Maggot_Kills < 5) goto L_Summon; // else, complete - warp "029-2.gat", 110, 88; + warp "029-2", 110, 88; set @tutorial_tmp, 7; callfunc "SetTutorialMask"; set @Maggot_Kills, 0; set @time, 0; - if (getareausers("029-2.gat", 98, 84, 106, 89) == 0) + if (getareausers("029-2", 98, 84, 106, 89) == 0) goto L_CleanUp; end; @@ -276,10 +276,10 @@ L_Close: OnInit: set $@Maggot_MaxHunters, 4; - areamonster "029-2.gat", 98, 84, 106, 89, "", 1002, 1, "Tanisha::OnMaggotDeath"; + areamonster "029-2", 98, 84, 106, 89, "", 1002, 1, "Tanisha::OnMaggotDeath"; end; } -029-2.gat,114,93,0|script|#DoorOutTut2|45,0,0 +029-2,114,93,0|script|#DoorOutTut2|45,0,0 { end; @@ -290,7 +290,7 @@ OnTouch: goto L_Block; L_Warp: - warp "029-1.gat", 32, 100; + warp "029-1", 32, 100; end; L_Block: diff --git a/world/map/npc/029-2/two_arms.txt b/world/map/npc/029-2/two_arms.txt index 012527b6..07fcf065 100644 --- a/world/map/npc/029-2/two_arms.txt +++ b/world/map/npc/029-2/two_arms.txt @@ -1,4 +1,4 @@ // Forge Shops -029-2.gat,99,25,0|shop|Rosen|311,SlingShot:*1,SlingBullet:*1,ShortBow:*4,Arrow:*2,IronArrow:*1 -029-2.gat,112,24,0|shop|Toichi|377,Knife:*1,SharpKnife:*1,Dagger:*1,LeatherShirt:*1,LeatherShield:*1 +029-2,99,25,0|shop|Rosen|311,SlingShot:*1,SlingBullet:*1,ShortBow:*4,Arrow:*2,IronArrow:*1 +029-2,112,24,0|shop|Toichi|377,Knife:*1,SharpKnife:*1,Dagger:*1,LeatherShirt:*1,LeatherShield:*1 diff --git a/world/map/npc/029-3/barrier.txt b/world/map/npc/029-3/barrier.txt index e1d2c399..e528b49e 100644 --- a/world/map/npc/029-3/barrier.txt +++ b/world/map/npc/029-3/barrier.txt @@ -1,7 +1,7 @@ -029-3.gat,49,54,0|script|#FightCaveBarrier|45,0,0 +029-3,49,54,0|script|#FightCaveBarrier|45,0,0 { if ($@FIGHT_CAVE_STATUS == 1) goto L_Block; - warp "029-1.gat", 69, 62; + warp "029-1", 69, 62; end; L_Block: diff --git a/world/map/npc/029-3/mapflags.txt b/world/map/npc/029-3/mapflags.txt index f7cfbcaf..81d4e7fb 100644 --- a/world/map/npc/029-3/mapflags.txt +++ b/world/map/npc/029-3/mapflags.txt @@ -1,2 +1,2 @@ -029-3.gat|mapflag|nosave|029-1,39,102 -029-3.gat|mapflag|resave|029-1,39,102 +029-3|mapflag|nosave|029-1,39,102 +029-3|mapflag|resave|029-1,39,102 diff --git a/world/map/npc/029-3/parua.txt b/world/map/npc/029-3/parua.txt index d2158a4a..d8e100fb 100644 --- a/world/map/npc/029-3/parua.txt +++ b/world/map/npc/029-3/parua.txt @@ -1,5 +1,5 @@ // Parua's fight -029-3.gat,50,25,0|script|Parua|183 +029-3,50,25,0|script|Parua|183 { set $@candor_npctalk$, "The dungeon is now ready for its next victims."; donpcevent "#CandorAnnouncer::OnCommandTalk"; @@ -33,7 +33,7 @@ L_Fine: goto L_Paying; L_Paying: - if (getmapusers("029-3.gat") < 5) + if (getmapusers("029-3") < 5) goto L_NotEnoughPlayers; if (Zeny < @FIGHT_CAVE_COST) goto L_NotEnough; @@ -47,12 +47,12 @@ L_Paying: goto L_StartFight; L_StartFight: - if (getmapusers("029-3.gat") < 5) + if (getmapusers("029-3") < 5) goto L_NotEnoughPlayers; npctalk "Let the battle begin!"; set $@FIGHT_CAVE_STATUS, 1; set $@FIGHT_CAVE_LEVEL, 1; - set $@FIGHT_CAVE_PLAYER_COUNT, getmapusers("029-3.gat"); + set $@FIGHT_CAVE_PLAYER_COUNT, getmapusers("029-3"); startnpctimer; goto L_Exit; @@ -80,7 +80,7 @@ L_TimeFightStart: // Do not charge the money if the fight or the announces were already started by someone else if ($@FIGHT_CAVE_STATUS != 0) goto L_AlreadyStarted; - if (getmapusers("029-3.gat") < 5) + if (getmapusers("029-3") < 5) goto L_NotEnoughPlayers; if (Zeny < @FIGHT_CAVE_COST + @FIGHT_CAVE_ANNOUNCE_COST) goto L_NotEnough_Announce; @@ -172,7 +172,7 @@ L_Stuck: "I changed my mind.", L_Exit; L_Warp: - warp "005-3.gat", 86, 34; + warp "005-3", 86, 34; goto L_Exit; L_Exit: @@ -189,7 +189,7 @@ OnTimer5000: L_Return_1: set $@FIGHT_CAVE_PLAYER_COUNT, 0; - areatimer "029-3.gat", 20, 20, 70, 60, 10, "Parua::OnTick"; + areatimer "029-3", 20, 20, 70, 60, 10, "Parua::OnTick"; end; L_CaveLogic: @@ -199,7 +199,7 @@ L_CaveLogic: if ($@FIGHT_CAVE_PLAYER_COUNT <= 0) goto L_CleanUp; set $@FIGHT_CAVE_ROUND_TIMER, $@FIGHT_CAVE_ROUND_TIMER + 5; // Advance 5 seconds - if (mobcount("029-3.gat", "Parua::OnPetDeath") <= 0) + if (mobcount("029-3", "Parua::OnPetDeath") <= 0) goto L_NextRound; if ($@FIGHT_CAVE_ROUND_TIMER + $@FIGHT_CAVE_ROUND_PEN >= 120) goto L_NextRound; @@ -217,11 +217,11 @@ L_NextRound: goto L_CleanUp; set $@FIGHT_CAVE_POINTS, $@FIGHT_CAVE_LEVEL; - areatimer "029-3.gat", 20, 20, 70, 60, 10, "Parua::OnNewRound"; + areatimer "029-3", 20, 20, 70, 60, 10, "Parua::OnNewRound"; set $@candor_npctalk$, "The next round (level " + $@FIGHT_CAVE_LEVEL + ") is starting with " + $@FIGHT_CAVE_PLAYER_COUNT + " player(s) left alive."; donpcevent "#CandorAnnouncer::OnCommandTalk"; - mapannounce "029-3.gat", "Parua: The next round (level " + $@FIGHT_CAVE_LEVEL + ") is starting with " + $@FIGHT_CAVE_PLAYER_COUNT + " player(s) left alive." , 0; + mapannounce "029-3", "Parua: The next round (level " + $@FIGHT_CAVE_LEVEL + ") is starting with " + $@FIGHT_CAVE_PLAYER_COUNT + " player(s) left alive." , 0; set $@MOB_1_SUMMON, 0; set $@MOB_2_SUMMON, 0; @@ -253,7 +253,7 @@ L_Summon: goto L_Return_1; L_GlobalAnnounce: - set $@FIGHT_CAVE_PLAYER_COUNT, getmapusers("029-3.gat"); + set $@FIGHT_CAVE_PLAYER_COUNT, getmapusers("029-3"); if ($@FIGHT_CAVE_STATUS == 3) goto L_Five_Minutes; if ($@FIGHT_CAVE_STATUS == 4) @@ -292,37 +292,37 @@ L_Fifteen_Minutes: L_MOB1: set $@MOB_1_SUMMON, $@MOB_1_SUMMON + 1; set $@FIGHT_CAVE_POINTS, $@FIGHT_CAVE_POINTS - 243; - areamonster "029-3.gat", 20, 20, 70, 60, "", 1022, 1, "Parua::OnPetDeath"; + areamonster "029-3", 20, 20, 70, 60, "", 1022, 1, "Parua::OnPetDeath"; goto L_Summon; L_MOB2: set $@MOB_2_SUMMON, $@MOB_2_SUMMON + 1; set $@FIGHT_CAVE_POINTS, $@FIGHT_CAVE_POINTS - 81; - areamonster "029-3.gat", 20, 20, 70, 60, "", 1045, 1, "Parua::OnPetDeath"; + areamonster "029-3", 20, 20, 70, 60, "", 1045, 1, "Parua::OnPetDeath"; goto L_Summon; L_MOB3: set $@MOB_3_SUMMON, $@MOB_3_SUMMON + 1; set $@FIGHT_CAVE_POINTS, $@FIGHT_CAVE_POINTS - 27; - areamonster "029-3.gat", 20, 20, 70, 60, "", 1024, 1, "Parua::OnPetDeath"; + areamonster "029-3", 20, 20, 70, 60, "", 1024, 1, "Parua::OnPetDeath"; goto L_Summon; L_MOB4: set $@MOB_4_SUMMON, $@MOB_4_SUMMON + 1; set $@FIGHT_CAVE_POINTS, $@FIGHT_CAVE_POINTS - 9; - areamonster "029-3.gat", 20, 20, 70, 60, "", 1043, 1, "Parua::OnPetDeath"; + areamonster "029-3", 20, 20, 70, 60, "", 1043, 1, "Parua::OnPetDeath"; goto L_Summon; L_MOB5: set $@MOB_5_SUMMON, $@MOB_5_SUMMON + 1; set $@FIGHT_CAVE_POINTS, $@FIGHT_CAVE_POINTS - 3; - areamonster "029-3.gat", 20, 20, 70, 60, "", 1010, 1, "Parua::OnPetDeath"; + areamonster "029-3", 20, 20, 70, 60, "", 1010, 1, "Parua::OnPetDeath"; goto L_Summon; L_MOB6: set $@MOB_6_SUMMON, $@MOB_6_SUMMON + 1; set $@FIGHT_CAVE_POINTS, $@FIGHT_CAVE_POINTS - 1; - areamonster "029-3.gat", 20, 20, 70, 60, "", 1008, 1, "Parua::OnPetDeath"; + areamonster "029-3", 20, 20, 70, 60, "", 1008, 1, "Parua::OnPetDeath"; goto L_Summon; // Called on each player once every 5 seconds @@ -362,13 +362,13 @@ L_CleanUp: npctalk "Game Over"; set $@candor_npctalk$, "The dungeon is now ready for its next victims."; donpcevent "#CandorAnnouncer::OnCommandTalk"; - areatimer "029-3.gat", 20, 20, 70, 60, 10, "Parua::OnReward"; + areatimer "029-3", 20, 20, 70, 60, 10, "Parua::OnReward"; set $@FIGHT_CAVE_STATUS, 0; set $@FIGHT_CAVE_PAID, 0; set $@FIGHT_CAVE_PLAYER_COUNT, 0; set $@FIGHT_CAVE_LEVEL, 1; set $@FIGHT_CAVE_ROUND_TIMER, 0; - killmonster "029-3.gat", "Parua::OnPetDeath"; + killmonster "029-3", "Parua::OnPetDeath"; stopnpctimer; setnpctimer 0; end; diff --git a/world/map/npc/030-2/avalia.txt b/world/map/npc/030-2/avalia.txt index cce6121d..a23cacb7 100644 --- a/world/map/npc/030-2/avalia.txt +++ b/world/map/npc/030-2/avalia.txt @@ -1,7 +1,7 @@ // Annual Xmas // Author: cinderweb, wushin -030-2.gat,198,61,0|script|Avalia|356 +030-2,198,61,0|script|Avalia|356 { callfunc "XmasStates"; @@ -12,7 +12,7 @@ L_OffSeason: mes "[Avalia]"; mes "\"What are you doing in here? Get out!\""; - warp "030-2.gat",88,80; + warp "030-2",88,80; close; L_XmasMain: @@ -189,7 +189,7 @@ L_Close: close; } -030-2.gat,190,64,0|script|Milis|330 +030-2,190,64,0|script|Milis|330 { callfunc "XmasStates"; @@ -200,7 +200,7 @@ L_Close: L_OffSeason: mes "[Milis]"; mes "\"What are you doing in here, get out!\""; - warp "030-2.gat",88,80; + warp "030-2",88,80; close; L_XmasMain: diff --git a/world/map/npc/030-2/basic_npcs.txt b/world/map/npc/030-2/basic_npcs.txt index 9e78162f..6dae901f 100644 --- a/world/map/npc/030-2/basic_npcs.txt +++ b/world/map/npc/030-2/basic_npcs.txt @@ -3,7 +3,7 @@ // In the office -030-2.gat,37,81,0|script|Oswal|328 +030-2,37,81,0|script|Oswal|328 { mes "[Oswal]"; mes "\"Welcome. I hope you enjoy your visit in Santa's residence. You already saw the workshop where the Christmas presents are crafted, right?\""; @@ -13,14 +13,14 @@ close; } -030-2.gat,37,85,0|script|Taito|328 +030-2,37,85,0|script|Taito|328 { mes "[Taito]"; mes "\"Hello. I'm sorry, but I'm very busy at the moment and want to concentrate. If you have any questions, ask one of the other helpers.\""; close; } -030-2.gat,31,77,0|script|Rikhard|329 +030-2,31,77,0|script|Rikhard|329 { mes "[Rikhard]"; mes "\"I'm really glad that this year's Christmas preparations are going well. You know, last year nearly everything went wrong, so we all had to work really hard on that, and the everyday issues had to be neglected.\""; @@ -35,7 +35,7 @@ close; } -030-2.gat,31,85,0|script|Akseli|329 +030-2,31,85,0|script|Akseli|329 { mes "[Akseli]"; mes "\"Ah, a visitor! Do you enjoy your time in Santa's residence?\""; @@ -65,7 +65,7 @@ L_Close: // In the workshop -030-2.gat,78,34,0|script|Aaron|328 +030-2,78,34,0|script|Aaron|328 { mes "[Aaron]"; mes "\"Welcome to Santa's famous Christmas workshop. Feel free to have a look around and talk to the craftsmen.\""; @@ -74,7 +74,7 @@ L_Close: close; } -030-2.gat,154,33,0|script|Iivo|329 +030-2,154,33,0|script|Iivo|329 { mes "You see a helper cutting some leather pieces. He looks very focused on his work. Then he notices you."; mes "[Iivo]"; diff --git a/world/map/npc/030-2/bedding_helper.txt b/world/map/npc/030-2/bedding_helper.txt index c07105f0..8e35d4c2 100644 --- a/world/map/npc/030-2/bedding_helper.txt +++ b/world/map/npc/030-2/bedding_helper.txt @@ -3,7 +3,7 @@ // Osmo asks for some White Fur which is used for bedding some presents in the boxes // can be sabotaged by given Cloth instead -030-2.gat,37,77,0|script|Osmo|328 +030-2,37,77,0|script|Osmo|328 { callfunc "XmasStates"; diff --git a/world/map/npc/030-2/chief_helper.txt b/world/map/npc/030-2/chief_helper.txt index 0f361872..969d0272 100644 --- a/world/map/npc/030-2/chief_helper.txt +++ b/world/map/npc/030-2/chief_helper.txt @@ -2,7 +2,7 @@ // author: Jenalya, wushin // Warrick is the Chief of Santa's helpers -030-2.gat,127,42,0|script|Chief Warrick|329 +030-2,127,42,0|script|Chief Warrick|329 { callfunc "XmasStates"; diff --git a/world/map/npc/030-2/eljas.txt b/world/map/npc/030-2/eljas.txt index aaa9c29c..82bdb120 100644 --- a/world/map/npc/030-2/eljas.txt +++ b/world/map/npc/030-2/eljas.txt @@ -1,7 +1,7 @@ // Annual Xmas and Year round info // Author: Jenalya, wushin -030-2.gat,87,41,0|script|Eljas|328,5,1 +030-2,87,41,0|script|Eljas|328,5,1 { callfunc "XmasStates"; callfunc "ThrowOutTheBum"; diff --git a/world/map/npc/030-2/empty_boxes_helper.txt b/world/map/npc/030-2/empty_boxes_helper.txt index aabf07a2..fbc720f7 100644 --- a/world/map/npc/030-2/empty_boxes_helper.txt +++ b/world/map/npc/030-2/empty_boxes_helper.txt @@ -3,7 +3,7 @@ // Urmas asks for raw logs to make empty presents boxes // later he can be asked for those boxes to put toys in -030-2.gat,140,41,0|script|Urmas|328 +030-2,140,41,0|script|Urmas|328 { callfunc "XmasStates"; diff --git a/world/map/npc/030-2/glitter_helper.txt b/world/map/npc/030-2/glitter_helper.txt index e0637675..b04e3b2a 100644 --- a/world/map/npc/030-2/glitter_helper.txt +++ b/world/map/npc/030-2/glitter_helper.txt @@ -3,7 +3,7 @@ // Veneri asks for Diamond Powder and Ruby Powder for decoration // can be sabotaged with Red Powder and Yellow Powder, Saboteur can make that out of Wisp and Spectre Powder -030-2.gat,31,81,0|script|Veneri|328 +030-2,31,81,0|script|Veneri|328 { callfunc "XmasStates"; diff --git a/world/map/npc/030-2/guards.txt b/world/map/npc/030-2/guards.txt index 3fdc1ffa..54a17465 100644 --- a/world/map/npc/030-2/guards.txt +++ b/world/map/npc/030-2/guards.txt @@ -1,6 +1,6 @@ // Annual Xmas Bouncers -030-2.gat,85,43,0|script|Valjas|330 +030-2,85,43,0|script|Valjas|330 { callfunc "XmasStates"; callfunc "ThrowOutTheBum"; @@ -9,7 +9,7 @@ close; } -030-2.gat,89,43,0|script|Halas|330 +030-2,89,43,0|script|Halas|330 { callfunc "XmasStates"; callfunc "ThrowOutTheBum"; @@ -18,7 +18,7 @@ close; } -030-2.gat,89,84,0|script|Kilis|330,5,2 +030-2,89,84,0|script|Kilis|330,5,2 { callfunc "XmasStates"; callfunc "ThrowOutTheBum"; diff --git a/world/map/npc/030-2/mapflags.txt b/world/map/npc/030-2/mapflags.txt index ea9d797f..17712898 100644 --- a/world/map/npc/030-2/mapflags.txt +++ b/world/map/npc/030-2/mapflags.txt @@ -1 +1 @@ -030-2.gat|mapflag|resave|020-1,52,118 +030-2|mapflag|resave|020-1,52,118 diff --git a/world/map/npc/030-2/present_helper.txt b/world/map/npc/030-2/present_helper.txt index 0a027ca0..2a265245 100644 --- a/world/map/npc/030-2/present_helper.txt +++ b/world/map/npc/030-2/present_helper.txt @@ -2,7 +2,7 @@ // Author: wushin // Present Reclamation -030-2.gat,47,82,0|script|Jonathan|328 +030-2,47,82,0|script|Jonathan|328 { callfunc "XmasStates"; diff --git a/world/map/npc/030-2/roasted_acorns_helper.txt b/world/map/npc/030-2/roasted_acorns_helper.txt index f942c118..5d835d8d 100644 --- a/world/map/npc/030-2/roasted_acorns_helper.txt +++ b/world/map/npc/030-2/roasted_acorns_helper.txt @@ -1,7 +1,7 @@ // Annual Xmas // author: Jenalya, wushin -030-2.gat,89,23,0|script|Verneri|334 +030-2,89,23,0|script|Verneri|334 { callfunc "XmasStates"; diff --git a/world/map/npc/030-2/shipping_helper.txt b/world/map/npc/030-2/shipping_helper.txt index e7f7b2f0..7c588cb6 100644 --- a/world/map/npc/030-2/shipping_helper.txt +++ b/world/map/npc/030-2/shipping_helper.txt @@ -1,21 +1,21 @@ // Annual Xmas // Author: Jenalya, wushin -030-2.gat,30,88,0|script|Mo|328 +030-2,30,88,0|script|Mo|328 { set $@npc_name$, "Mo"; callfunc "helpersPacking"; close; } -030-2.gat,33,88,0|script|Lorrie|329 +030-2,33,88,0|script|Lorrie|329 { set $@npc_name$, "Lorrie"; callfunc "helpersPacking"; close; } -030-2.gat,37,88,0|script|Curlee|329 +030-2,37,88,0|script|Curlee|329 { set $@npc_name$, "Curlee"; callfunc "helpersPacking"; diff --git a/world/map/npc/030-2/storage_helper.txt b/world/map/npc/030-2/storage_helper.txt index 1767ceaf..d1c3f357 100644 --- a/world/map/npc/030-2/storage_helper.txt +++ b/world/map/npc/030-2/storage_helper.txt @@ -1,7 +1,7 @@ // Annual Christmas // author: Jenalya, wushin -030-2.gat,25,35,0|script|Vellamo|328 +030-2,25,35,0|script|Vellamo|328 { set @halloween_npc_id, $@halloween_npc_vellamo; callfunc "TrickOrTreat"; @@ -50,7 +50,7 @@ L_Close: close; } -030-2.gat,33,29,0|script|Ismo|329 +030-2,33,29,0|script|Ismo|329 { callfunc "XmasStates"; diff --git a/world/map/npc/030-2/wrapping_paper_helper.txt b/world/map/npc/030-2/wrapping_paper_helper.txt index 75198417..3ac10b12 100644 --- a/world/map/npc/030-2/wrapping_paper_helper.txt +++ b/world/map/npc/030-2/wrapping_paper_helper.txt @@ -3,7 +3,7 @@ // also for some dyes to make them colorful // later he can be asked for those papers to wrap boxes -030-2.gat,140,31,0|script|Reino|328 +030-2,140,31,0|script|Reino|328 { callfunc "XmasStates"; diff --git a/world/map/npc/030-3/mapflags.txt b/world/map/npc/030-3/mapflags.txt index b0c77c3f..ea20b58f 100644 --- a/world/map/npc/030-3/mapflags.txt +++ b/world/map/npc/030-3/mapflags.txt @@ -1 +1 @@ -030-3.gat|mapflag|resave|020-1,52,118 +030-3|mapflag|resave|020-1,52,118 diff --git a/world/map/npc/030-3/orum_homunculus.txt b/world/map/npc/030-3/orum_homunculus.txt index 4da1c618..b580476a 100644 --- a/world/map/npc/030-3/orum_homunculus.txt +++ b/world/map/npc/030-3/orum_homunculus.txt @@ -1,7 +1,7 @@ // Annual Xmas // Authors: Wushin, Chayenne -019-3.gat,79,30,0|script|#OrumTelepathy1|45,3,3 +019-3,79,30,0|script|#OrumTelepathy1|45,3,3 { callfunc "XmasStates"; @@ -24,7 +24,7 @@ L_End: end; } -019-3.gat,104,67,0|script|#OrumTelepathy2|45,1,1 +019-3,104,67,0|script|#OrumTelepathy2|45,1,1 { callfunc "XmasStates"; @@ -47,7 +47,7 @@ L_End: end; } -019-3.gat,102,95,0|script|#OrumTelepathy3|45,3,3 +019-3,102,95,0|script|#OrumTelepathy3|45,3,3 { callfunc "XmasStates"; @@ -70,7 +70,7 @@ L_End: end; } -019-3.gat,81,61,0|script|#OrumTelepathy4|45,3,3 +019-3,81,61,0|script|#OrumTelepathy4|45,3,3 { callfunc "XmasStates"; @@ -93,7 +93,7 @@ L_End: end; } -030-3.gat,49,53,0|script|#OrumTelepathy5|45,1,1 +030-3,49,53,0|script|#OrumTelepathy5|45,1,1 { callfunc "XmasStates"; @@ -116,7 +116,7 @@ L_End: end; } -030-3.gat,48,73,0|script|#OrumTelepathy6|45,1,1 +030-3,48,73,0|script|#OrumTelepathy6|45,1,1 { callfunc "XmasStates"; @@ -139,7 +139,7 @@ L_End: end; } -030-3.gat,95,66,0|script|#OrumTelepathy7|45,1,1 +030-3,95,66,0|script|#OrumTelepathy7|45,1,1 { callfunc "XmasStates"; @@ -162,7 +162,7 @@ L_End: end; } -030-3.gat,100,49,0|script|Orum's Homunculus|385 +030-3,100,49,0|script|Orum's Homunculus|385 { callfunc "XmasStates"; diff --git a/world/map/npc/030-4/mana_battery.txt b/world/map/npc/030-4/mana_battery.txt index 6034af84..18507bc9 100644 --- a/world/map/npc/030-4/mana_battery.txt +++ b/world/map/npc/030-4/mana_battery.txt @@ -21,7 +21,7 @@ //TODO Add an icreasing particle effect to the chest, move it half a tile right // and make it one of those lab tables from the slime quests -030-4.gat,32,21,0|script|AniManOMat|400 +030-4,32,21,0|script|AniManOMat|400 { set $@XmasBattleStatusClone, 0; callfunc "XmasStates"; @@ -129,8 +129,8 @@ L_Start: set $@XmasBattleStatus, @xmas_battle_status; set $@XmasBattleStatusClone, $@XmasBattleStatus; set $@XmasBossRound, 0; - set $@XmasBossPlayerCount, getmapusers("030-4.gat"); - areamonster "030-4.gat", 20, 21, 40, 40, "", 1114, 1, "AniManOMat::OnGuardDeath"; + set $@XmasBossPlayerCount, getmapusers("030-4"); + areamonster "030-4", 20, 21, 40, 40, "", 1114, 1, "AniManOMat::OnGuardDeath"; initnpctimer; goto L_Close; @@ -197,14 +197,14 @@ OnTimer5000: L_Return_1: set $@XmasBossPlayerCount, 0; - areatimer "030-4.gat", 0, 0, 60, 60, 10, "AniManOMat::OnTick"; + areatimer "030-4", 0, 0, 60, 60, 10, "AniManOMat::OnTick"; end; L_CaveLogic: if ($@XmasBossPlayerCount < 1) goto L_AllDead; set $@BombTimer, $@BombTimer + 5; // Advance 5 seconds - if ((mobcount("030-4.gat", "AniManOMat::OnGuardDeath") + 1) == 0) + if ((mobcount("030-4", "AniManOMat::OnGuardDeath") + 1) == 0) goto L_NextWave; if ($@BombTimer >= 120) goto L_NextWave; @@ -214,14 +214,14 @@ L_NextWave: set $@BombTimer, 0; set $@DangerCellNumber, rand(8); set $@XmasBossRound, $@XmasBossRound + 1; - if (($@XmasBossRound > 10) && ((mobcount("030-4.gat", "AniManOMat::OnGuardDeath") + 1) == 0)) + if (($@XmasBossRound > 10) && ((mobcount("030-4", "AniManOMat::OnGuardDeath") + 1) == 0)) goto L_Finished; // Break/LastChance(s) if (($@XmasBossRound > 10) && ($@XmasBossRound <= 16)) goto L_Return_1; //KillerWaves if ($@XmasBossRound > 16) - areamonster "030-4.gat", 0, 0, 50, 50, "", 1114, $@XmasBossRound*2 + $@XmasBossPlayerCount*3, "AniManOMat::OnGuardDeath"; + areamonster "030-4", 0, 0, 50, 50, "", 1114, $@XmasBossRound*2 + $@XmasBossPlayerCount*3, "AniManOMat::OnGuardDeath"; //Normal Waves 1 to 10 // Guard Amount doubles if on hard mode set $@GuardAmount, 1 + (6 + ($@XmasBossRound) + (2 * $@XmasBossPlayerCount)) / 7; @@ -231,34 +231,34 @@ L_NextWave: set $@GuardAmount, 15; //Obliatory Guard Of Honour in the Southern Hallway - areamonster "030-4.gat", 30, 43, 39, 49, "", 1114, $@GuardAmount, "AniManOMat::OnGuardDeath"; + areamonster "030-4", 30, 43, 39, 49, "", 1114, $@GuardAmount, "AniManOMat::OnGuardDeath"; //CopperSlimes, I love Copper Slimes anywhere anytime - areamonster "030-4.gat", 20, 21, 49, 49, "", 1098, rand(2,7), "AniManOMat::OnGuardDeath"; + areamonster "030-4", 20, 21, 49, 49, "", 1098, rand(2,7), "AniManOMat::OnGuardDeath"; //IceSkulls for hard mode in room 3 and 4 if ($@XmasBattleStatus == 2 || $@XmasBattleStatus == 4) - areamonster "030-4.gat", 20, 32, 28, 39, "", 1085, $@SkullAmount / 2, "AniManOMat::OnGuardDeath"; + areamonster "030-4", 20, 32, 28, 39, "", 1085, $@SkullAmount / 2, "AniManOMat::OnGuardDeath"; if ($@XmasBattleStatus == 2 || $@XmasBattleStatus == 4) - areamonster "030-4.gat", 41, 32, 49, 39, "", 1085, $@SkullAmount / 2 + 1, "AniManOMat::OnGuardDeath"; + areamonster "030-4", 41, 32, 49, 39, "", 1085, $@SkullAmount / 2 + 1, "AniManOMat::OnGuardDeath"; //Angry Sea Slimes for Easy Mode in Nice Version in Room 3,4,5,6 if ($@XmasBattleStatus == 1) - areamonster "030-4.gat", 20, 32, 28, 49, "", 1109, $@SkullAmount, "AniManOMat::OnGuardDeath"; + areamonster "030-4", 20, 32, 28, 49, "", 1109, $@SkullAmount, "AniManOMat::OnGuardDeath"; if ($@XmasBattleStatus == 1) - areamonster "030-4.gat", 41, 32, 49, 49, "", 1109, $@SkullAmount, "AniManOMat::OnGuardDeath"; + areamonster "030-4", 41, 32, 49, 49, "", 1109, $@SkullAmount, "AniManOMat::OnGuardDeath"; //Candied Slimes for Nice Mode in Rooms 1 and 2 if ($@XmasBattleStatus == 1 || $@XmasBattleStatus == 2) - areamonster "030-4.gat", 20, 21, 28, 28, "", 1111, ($@XmasBossRound / 2) + 1, "AniManOMat::OnGuardDeath"; + areamonster "030-4", 20, 21, 28, 28, "", 1111, ($@XmasBossRound / 2) + 1, "AniManOMat::OnGuardDeath"; if ($@XmasBattleStatus == 1 || $@XmasBattleStatus == 2) - areamonster "030-4.gat", 41, 21, 49, 28, "", 1111, ($@XmasBossRound / 2) + 2, "AniManOMat::OnGuardDeath"; + areamonster "030-4", 41, 21, 49, 28, "", 1111, ($@XmasBossRound / 2) + 2, "AniManOMat::OnGuardDeath"; //Bluepars for Easy mode in Naughty Variant in Rooms 3,4,5,6 if ($@XmasBattleStatus == 3) - areamonster "030-4.gat", 20, 32, 28, 49, "", 1107, $@SkullAmount, "AniManOMat::OnGuardDeath"; + areamonster "030-4", 20, 32, 28, 49, "", 1107, $@SkullAmount, "AniManOMat::OnGuardDeath"; if ($@XmasBattleStatus == 3) - areamonster "030-4.gat", 41, 32, 49, 49, "", 1107, $@SkullAmount, "AniManOMat::OnGuardDeath"; + areamonster "030-4", 41, 32, 49, 49, "", 1107, $@SkullAmount, "AniManOMat::OnGuardDeath"; // Wicked Mushrooms for Naughty Mode in Rooms 1 and 2 if ($@XmasBattleStatus == 3 || $@XmasBattleStatus == 4) - areamonster "030-4.gat", 20, 21, 28, 28, "", 1106, $@XmasBossRound + ($@XmasBossRound / 2), "AniManOMat::OnGuardDeath"; + areamonster "030-4", 20, 21, 28, 28, "", 1106, $@XmasBossRound + ($@XmasBossRound / 2), "AniManOMat::OnGuardDeath"; if ($@XmasBattleStatus == 3 || $@XmasBattleStatus == 4) - areamonster "030-4.gat", 41, 21, 49, 28, "", 1106, $@XmasBossRound + ($@XmasBossRound / 2), "AniManOMat::OnGuardDeath"; + areamonster "030-4", 41, 21, 49, 28, "", 1106, $@XmasBossRound + ($@XmasBossRound / 2), "AniManOMat::OnGuardDeath"; set $@msgnumber, (2 * $@XmasBossRound) + (($@XmasBattleStatus - 1) >> 1); set $@msg$, $@XmasBossMes$[ $@msgnumber ]; @@ -270,7 +270,7 @@ L_NextWave: OnTick: if (isdead()) end; set $@XmasBossPlayerCount, $@XmasBossPlayerCount + 1; - if(isin("030-4.gat", $@DangerCellX1[$@DangerCellNumber], $@DangerCellY1[$@DangerCellNumber], $@DangerCellX2[$@DangerCellNumber], $@DangerCellY2[$@DangerCellNumber])) + if(isin("030-4", $@DangerCellX1[$@DangerCellNumber], $@DangerCellY1[$@DangerCellNumber], $@DangerCellX2[$@DangerCellNumber], $@DangerCellY2[$@DangerCellNumber])) goto L_DangerCell; end; @@ -294,13 +294,13 @@ L_Finished: goto L_CleanUp; L_CleanUp: - areatimer "030-4.gat", 0, 0, 50, 50, 10, "AniManOMat::OnReward"; + areatimer "030-4", 0, 0, 50, 50, 10, "AniManOMat::OnReward"; set $@XmasBossPlayerCount, 0; set $@XmasBossRound, 0; set $@BombTimer, 0; set $@GuardAmount, 0; set $@SkullAmount, 0; - killmonster "030-4.gat", "AniManOMat::OnGuardDeath"; + killmonster "030-4", "AniManOMat::OnGuardDeath"; stopnpctimer; donpcevent "#XmasChamberCooler::OnCommandCoolDown"; end; @@ -338,14 +338,14 @@ L_EndNice: end; OnCommandChamberReset: - areatimer "030-4.gat", 0, 0, 50, 50, 10, "AniManOMat::OnReward"; + areatimer "030-4", 0, 0, 50, 50, 10, "AniManOMat::OnReward"; set $@XmasBattleStatus, 0; set $@XmasBossPlayerCount, 0; set $@XmasBossRound, 0; set $@BombTimer, 0; set $@GuardAmount, 0; set $@SkullAmount, 0; - killmonster "030-4.gat", "AniManOMat::OnGuardDeath"; + killmonster "030-4", "AniManOMat::OnGuardDeath"; stopnpctimer; setnpctimer 0; goto L_Restart; @@ -405,9 +405,9 @@ L_Restart: end; S_Announce: - mapannounce "030-4.gat", "Danger Cell Activated. Zone " + $@DangerCellNumber + " activated.", 0; - mapannounce "030-4.gat", $@msg$, 0; - mapannounce "030-2.gat", $@msg$, 0; + mapannounce "030-4", "Danger Cell Activated. Zone " + $@DangerCellNumber + " activated.", 0; + mapannounce "030-4", $@msg$, 0; + mapannounce "030-2", $@msg$, 0; set $@msg$, ""; return; @@ -438,7 +438,7 @@ S_ClearVariables: return; } -030-4.gat,0,0,0|script|#XmasChamberCooler|-1 +030-4,0,0,0|script|#XmasChamberCooler|-1 { end; OnCommandCoolDown: diff --git a/world/map/npc/030-4/mapflags.txt b/world/map/npc/030-4/mapflags.txt index 1374efb0..c95a8d5f 100644 --- a/world/map/npc/030-4/mapflags.txt +++ b/world/map/npc/030-4/mapflags.txt @@ -1,2 +1,2 @@ -030-4.gat|mapflag|nosave|030-2,151,25 -030-4.gat|mapflag|resave|030-2,151,25 +030-4|mapflag|nosave|030-2,151,25 +030-4|mapflag|resave|030-2,151,25 diff --git a/world/map/npc/031-1/angelaOutside.txt b/world/map/npc/031-1/angelaOutside.txt index bec0988b..17bfff00 100644 --- a/world/map/npc/031-1/angelaOutside.txt +++ b/world/map/npc/031-1/angelaOutside.txt @@ -4,7 +4,7 @@ // state2 and state3: Cindy is saved Angela invites you to visit them for giving a reward // state greater than 3: Angela invites and asks you to bring present boxes -031-1.gat,79,24,0|script|Angela|195 +031-1,79,24,0|script|Angela|195 { set @Q_Nivalis_state_MASK, NIBBLE_5_MASK; set @Q_Nivalis_state_SHIFT, NIBBLE_5_SHIFT; diff --git a/world/map/npc/031-1/dock.txt b/world/map/npc/031-1/dock.txt index 48d32d8e..37ec98ed 100644 --- a/world/map/npc/031-1/dock.txt +++ b/world/map/npc/031-1/dock.txt @@ -1,19 +1,19 @@ // The ferry dock // Ferry Sign -031-1.gat,95,107,0|script|Ferry Schedule#6|398 +031-1,95,107,0|script|Ferry Schedule#6|398 { callfunc "FerryManifest"; end; } -031-1.gat,110,108,0|script|Nivalis Koga|395,6,2 +031-1,110,108,0|script|Nivalis Koga|395,6,2 { callfunc "BoardFerry"; close; } -031-1.gat,100,100,0|script|#NivalisDock|127 +031-1,100,100,0|script|#NivalisDock|127 { end; diff --git a/world/map/npc/031-1/frozenbeard.txt b/world/map/npc/031-1/frozenbeard.txt index ba656244..94a20853 100644 --- a/world/map/npc/031-1/frozenbeard.txt +++ b/world/map/npc/031-1/frozenbeard.txt @@ -1,6 +1,6 @@ // -031-1.gat,96,113,0|script|Frozenbeard|138 +031-1,96,113,0|script|Frozenbeard|138 { mes "[Frozenbeard]"; diff --git a/world/map/npc/031-1/house.txt b/world/map/npc/031-1/house.txt index e9bd33c0..c64009ba 100644 --- a/world/map/npc/031-1/house.txt +++ b/world/map/npc/031-1/house.txt @@ -2,7 +2,7 @@ // player can enter, if Cindy is already saved and the player has been invited, quest status > 2 // author: Jenalya -031-1.gat,95,80,0|script|#Door|45,0,0 +031-1,95,80,0|script|#Door|45,0,0 { set @Q_Nivalis_state_MASK, NIBBLE_5_MASK; set @Q_Nivalis_state_SHIFT, NIBBLE_5_SHIFT; @@ -19,6 +19,6 @@ close; L_Warp: - warp "031-2.gat", 23, 28; + warp "031-2", 23, 28; end; } diff --git a/world/map/npc/031-1/mapflags.txt b/world/map/npc/031-1/mapflags.txt index 5b7ea1ea..9b4dcc26 100644 --- a/world/map/npc/031-1/mapflags.txt +++ b/world/map/npc/031-1/mapflags.txt @@ -1 +1 @@ -031-1.gat|mapflag|resave|020-1,52,118 +031-1|mapflag|resave|020-1,52,118 diff --git a/world/map/npc/031-2/angelaHouse.txt b/world/map/npc/031-2/angelaHouse.txt index 24759211..3fe6f023 100644 --- a/world/map/npc/031-2/angelaHouse.txt +++ b/world/map/npc/031-2/angelaHouse.txt @@ -3,7 +3,7 @@ // state3: it's your first visit, you can choose a reward // state4: you can do daily quests with white and yellow presents boxes -031-2.gat,29,28,0|script|Angela#house|196 +031-2,29,28,0|script|Angela#house|196 { set @Q_Nivalis_state_MASK, NIBBLE_5_MASK; set @Q_Nivalis_state_SHIFT, NIBBLE_5_SHIFT; diff --git a/world/map/npc/031-2/cindyHouse.txt b/world/map/npc/031-2/cindyHouse.txt index 34e84863..5a1c20cc 100644 --- a/world/map/npc/031-2/cindyHouse.txt +++ b/world/map/npc/031-2/cindyHouse.txt @@ -2,7 +2,7 @@ // state0,1,2: you shouldn't be able to reach this place // state3 and greater: Cindy is saved, she says one of some random phrases -031-2.gat,27,26,0|script|Cindy#house|197 +031-2,27,26,0|script|Cindy#house|197 { set @Q_Nivalis_state_MASK, NIBBLE_5_MASK; set @Q_Nivalis_state_SHIFT, NIBBLE_5_SHIFT; diff --git a/world/map/npc/031-2/mapflags.txt b/world/map/npc/031-2/mapflags.txt index d625ee96..e188a3e0 100644 --- a/world/map/npc/031-2/mapflags.txt +++ b/world/map/npc/031-2/mapflags.txt @@ -1 +1 @@ -031-2.gat|mapflag|resave|020-1,52,118 +031-2|mapflag|resave|020-1,52,118 diff --git a/world/map/npc/031-3/labyrinth.txt b/world/map/npc/031-3/labyrinth.txt index 465ba55a..2213624d 100644 --- a/world/map/npc/031-3/labyrinth.txt +++ b/world/map/npc/031-3/labyrinth.txt @@ -1,10 +1,10 @@ // Conditional warp for yeti cave // Authors: Jenalya -031-3.gat,46,24,0|script|#YetiBarrier-outside|45,0,0 +031-3,46,24,0|script|#YetiBarrier-outside|45,0,0 { if ($@FIGHT_YETI_STATUS == 1) goto L_Blocked; - warp "031-4.gat", 40, 70; + warp "031-4", 40, 70; end; L_Blocked: diff --git a/world/map/npc/031-3/mapflags.txt b/world/map/npc/031-3/mapflags.txt index 758e2feb..205f7580 100644 --- a/world/map/npc/031-3/mapflags.txt +++ b/world/map/npc/031-3/mapflags.txt @@ -1 +1 @@ -031-3.gat|mapflag|resave|020-1,52,118 +031-3|mapflag|resave|020-1,52,118 diff --git a/world/map/npc/031-4/barrier.txt b/world/map/npc/031-4/barrier.txt index 49157e6f..1d570c69 100644 --- a/world/map/npc/031-4/barrier.txt +++ b/world/map/npc/031-4/barrier.txt @@ -1,7 +1,7 @@ -031-4.gat,40,71,0|script|#YetiBarrier-inside|45,0,0 +031-4,40,71,0|script|#YetiBarrier-inside|45,0,0 { if ($@FIGHT_YETI_STATUS == 1) goto L_Block; - warp "031-3.gat", 46, 25; + warp "031-3", 46, 25; end; L_Block: diff --git a/world/map/npc/031-4/cindyCave.txt b/world/map/npc/031-4/cindyCave.txt index de9062fd..2bce44bf 100644 --- a/world/map/npc/031-4/cindyCave.txt +++ b/world/map/npc/031-4/cindyCave.txt @@ -4,7 +4,7 @@ // state2: Cindy is saved, she gives you a reward (wizard hat or wooden staff) // state3: and greater: Cindy is saved, she asks you to visit them -031-4.gat,42,42,0|script|Cindy|198 +031-4,42,42,0|script|Cindy|198 { if ($@FIGHT_YETI_STATUS != 0) goto L_Yeti; @@ -64,8 +64,8 @@ L_Try_Cage: set $@FIGHT_YETI_STATUS, 1; set $@FIGHT_YETI_WAVE, 0; set $@YETI_COUNT, 1; - set $@FIGHT_YETI_PLAYER_COUNT, getmapusers("031-4.gat"); - areamonster "031-4.gat", 0, 0, 95, 91, "", 1072, 1, "Cindy::OnPetDeath"; + set $@FIGHT_YETI_PLAYER_COUNT, getmapusers("031-4"); + areamonster "031-4", 0, 0, 95, 91, "", 1072, 1, "Cindy::OnPetDeath"; initnpctimer; goto L_Close; @@ -145,7 +145,7 @@ OnTimer5000: L_Return_1: set $@FIGHT_YETI_PLAYER_COUNT, 0; - areatimer "031-4.gat", 0, 0, 95, 91, 10, "Cindy::OnTick"; + areatimer "031-4", 0, 0, 95, 91, 10, "Cindy::OnTick"; end; L_CaveLogic: @@ -155,7 +155,7 @@ L_CaveLogic: if ($@FIGHT_YETI_PLAYER_COUNT <= 0) goto L_CleanUp; set $@FIGHT_YETI_ROUND_TIMER, $@FIGHT_YETI_ROUND_TIMER + 5; // Advance 5 seconds - if (mobcount("031-4.gat", "Cindy::OnPetDeath") < 0) + if (mobcount("031-4", "Cindy::OnPetDeath") < 0) goto L_NextWave; if ($@FIGHT_YETI_ROUND_TIMER + $@FIGHT_YETI_ROUND_PEN >= 120) goto L_NextWave; @@ -171,19 +171,19 @@ L_NextWave: && $@FIGHT_YETI_WAVE < 22) goto L_Return_1; if ($@FIGHT_YETI_WAVE > 22) - areamonster "031-4.gat", 0, 0, 95, 91, "", 1072, $@FIGHT_YETI_WAVE*2 + $@FIGHT_YETI_PLAYER_COUNT*5, "Cindy::OnPetDeath"; + areamonster "031-4", 0, 0, 95, 91, "", 1072, $@FIGHT_YETI_WAVE*2 + $@FIGHT_YETI_PLAYER_COUNT*5, "Cindy::OnPetDeath"; if ($@FIGHT_YETI_WAVE > 22) set $@YETI_COUNT, $@YETI_COUNT + $@FIGHT_YETI_WAVE*2 + $@FIGHT_YETI_PLAYER_COUNT*5; set $@FIGHT_YETI_NUMBER, (5 + (1 * $@FIGHT_YETI_WAVE) + (2 * $@FIGHT_YETI_PLAYER_COUNT))/4; set $@YETI_COUNT, $@YETI_COUNT + $@FIGHT_YETI_NUMBER; - areamonster "031-4.gat", 0, 0, 95, 91, "", 1072, $@FIGHT_YETI_NUMBER, "Cindy::OnPetDeath"; + areamonster "031-4", 0, 0, 95, 91, "", 1072, $@FIGHT_YETI_NUMBER, "Cindy::OnPetDeath"; set $@msg$, $@FIGHT_YETI_MESSAGES$[$@FIGHT_YETI_WAVE]; if ($@msg$ == "") goto L_Return_1; - mapannounce "031-4.gat", $@msg$, 0; - mapannounce "031-3.gat", $@msg$, 0; + mapannounce "031-4", $@msg$, 0; + mapannounce "031-3", $@msg$, 0; set $@msg$, ""; goto L_Return_1; @@ -198,7 +198,7 @@ OnPetDeath: end; L_CleanUp: - areatimer "031-4.gat", 0, 0, 95, 91, 10, "Cindy::OnReward"; + areatimer "031-4", 0, 0, 95, 91, 10, "Cindy::OnReward"; set $@FIGHT_YETI_STATUS, 0; set $@FIGHT_YETI_PLAYER_COUNT, 0; set $@FIGHT_YETI_WAVE, 0; @@ -206,7 +206,7 @@ L_CleanUp: set $@YETI_COUNT, 0; set $@FIGHT_YETI_ROUND_PEN, 0; set $@FIGHT_YETI_NUMBER, 0; - killmonster "031-4.gat", "Cindy::OnPetDeath"; + killmonster "031-4", "Cindy::OnPetDeath"; stopnpctimer; setnpctimer 0; end; diff --git a/world/map/npc/031-4/mapflags.txt b/world/map/npc/031-4/mapflags.txt index fa397650..11b07dc8 100644 --- a/world/map/npc/031-4/mapflags.txt +++ b/world/map/npc/031-4/mapflags.txt @@ -1,2 +1,2 @@ -031-4.gat|mapflag|nosave|031-3,46,26 -031-4.gat|mapflag|resave|031-3,46,26 +031-4|mapflag|nosave|031-3,46,26 +031-4|mapflag|resave|031-3,46,26 diff --git a/world/map/npc/032-3/mapflags.txt b/world/map/npc/032-3/mapflags.txt index d619bf99..b7e94a3e 100644 --- a/world/map/npc/032-3/mapflags.txt +++ b/world/map/npc/032-3/mapflags.txt @@ -1 +1 @@ -032-3.gat|mapflag|resave|006-1,36,18 +032-3|mapflag|resave|006-1,36,18 diff --git a/world/map/npc/033-1/backDoor.txt b/world/map/npc/033-1/backDoor.txt index 425e4db5..2740841b 100644 --- a/world/map/npc/033-1/backDoor.txt +++ b/world/map/npc/033-1/backDoor.txt @@ -1,10 +1,10 @@ -033-1.gat,86,28,0|script|#KimarrBackDoor|45,0,0 +033-1,86,28,0|script|#KimarrBackDoor|45,0,0 { if ($@Fluffy_Hunting == 0) goto L_Warp; end; L_Warp: - warp "033-1.gat", 77, 30; + warp "033-1", 77, 30; end; } diff --git a/world/map/npc/033-1/birrod.txt b/world/map/npc/033-1/birrod.txt index d24c6387..19586e51 100644 --- a/world/map/npc/033-1/birrod.txt +++ b/world/map/npc/033-1/birrod.txt @@ -1,4 +1,4 @@ -033-1.gat,72,27,0|script|Birrod|217 +033-1,72,27,0|script|Birrod|217 { set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT); diff --git a/world/map/npc/033-1/kimarr.txt b/world/map/npc/033-1/kimarr.txt index 776f22bd..f51eae66 100644 --- a/world/map/npc/033-1/kimarr.txt +++ b/world/map/npc/033-1/kimarr.txt @@ -32,7 +32,7 @@ // that's the only reason I didn't make that one a local variable like it really is -033-1.gat,74,32,0|script|Kimarr|218 +033-1,74,32,0|script|Kimarr|218 { set @halloween_npc_id, $@halloween_npc_kimarr; callfunc "TrickOrTreat"; @@ -166,7 +166,7 @@ L_Game: set $@Fluffy_Time, 180; set $@Fluffy_Min, 1 + (BaseLevel*7)/10; - warp "033-1.gat", 79, 34; + warp "033-1", 79, 34; initnpctimer; goto L_Close; @@ -190,13 +190,13 @@ L_Action: if (attachrid($@Fluffy_FighterID) == 0) goto L_GotOut; // Checking if player is still in the map or used a towel or spell to get out - if (getareausers("033-1.gat", 79, 28, 88, 42) == 0) + if (getareausers("033-1", 79, 28, 88, 42) == 0) goto L_GotOut; if (PC_DIE_COUNTER > $@Fluffy_PC_Deaths) goto L_Died; // Checking if there is more than 1 player in the fight area - if (getareausers("033-1.gat", 79, 28, 88, 42) > 1) - areatimer "033-1.gat", 79, 28, 88, 42, 10, "Kimarr::OnTooMany"; + if (getareausers("033-1", 79, 28, 88, 42) > 1) + areatimer "033-1", 79, 28, 88, 42, 10, "Kimarr::OnTooMany"; if ($@Fluffy_Time == 180) npctalk strcharinfo(0) + ", you have 3 minutes."; @@ -230,11 +230,11 @@ OnTooMany: if (getcharid(3) == $@Fluffy_FighterID) end; npctalk "Hey " + strcharinfo(0) + "! What are you doing there? This hunt is for " + $@Fluffy_Fighter$ + " alone!"; - warp "033-1.gat", 77, 34; + warp "033-1", 77, 34; end; L_Died: - warp "033-1.gat", 77, 34; + warp "033-1", 77, 34; message strcharinfo(0), "You are dead."; npctalk "Oh no! " + $@Fluffy_Fighter$ + " got overwhelmed!"; callsub S_Clean; @@ -245,10 +245,10 @@ L_TimeOver: goto L_MaybeRecordScore; L_CheckDrops: - set @Fluffy_RedApple, getareadropitem("033-1.gat", 79, 29, 88, 42, "RedApple", 1); - set @Fluffy_XmasCake, getareadropitem("033-1.gat", 79, 29, 88, 42, "XmasCake", 1); - set @Fluffy_Cake, getareadropitem("033-1.gat", 79, 29, 88, 42, "Cake", 1); - set @Fluffy_GreenApple, getareadropitem("033-1.gat", 79, 29, 88, 42, "GreenApple", 1); + set @Fluffy_RedApple, getareadropitem("033-1", 79, 29, 88, 42, "RedApple", 1); + set @Fluffy_XmasCake, getareadropitem("033-1", 79, 29, 88, 42, "XmasCake", 1); + set @Fluffy_Cake, getareadropitem("033-1", 79, 29, 88, 42, "Cake", 1); + set @Fluffy_GreenApple, getareadropitem("033-1", 79, 29, 88, 42, "GreenApple", 1); if (@Fluffy_RedApple || @Fluffy_XmasCake || @Fluffy_Cake || @Fluffy_GreenApple) goto L_BeginHunting; goto L_ContinueTimer; @@ -265,15 +265,15 @@ L_BeginHunting: goto L_SpawnFluffies; L_SpawnFluffies: - areamonster "033-1.gat", 79, 29, 88, 42, "", 1089, $@Fluffy_Spawn, "Kimarr::OnFluffyDeath"; + areamonster "033-1", 79, 29, 88, 42, "", 1089, $@Fluffy_Spawn, "Kimarr::OnFluffyDeath"; set $@Fluffy_Extra, 5 * @Fluffy_XmasCake + 3 * @Fluffy_Cake + 12 * ($@Fluffy_Alive + $@Fluffy_Spawn) + 7 * BaseLevel; if ((BaseLevel > 40) && (rand($@Fluffy_Extra) > 500)) // Ice Goblin - areamonster "033-1.gat", 79, 29, 88, 42, "", 1058, 1, "Kimarr::OnIceGoblinDeath"; + areamonster "033-1", 79, 29, 88, 42, "", 1058, 1, "Kimarr::OnIceGoblinDeath"; if ((BaseLevel > 60) && (rand($@Fluffy_Extra) > 550)) // Wolvern - areamonster "033-1.gat", 79, 29, 88, 42, "", 1090, 1, "Kimarr::OnWolvernDeath"; + areamonster "033-1", 79, 29, 88, 42, "", 1090, 1, "Kimarr::OnWolvernDeath"; if ((BaseLevel > 70) && (rand($@Fluffy_Extra) > 600)) // Yeti - areamonster "033-1.gat", 79, 29, 88, 42, "", 1072, 1, "Kimarr::OnYetiDeath"; + areamonster "033-1", 79, 29, 88, 42, "", 1072, 1, "Kimarr::OnYetiDeath"; set $@Fluffy_Extra, 0; set @Fluffy_RedApple, 0; @@ -321,13 +321,13 @@ OnFluffyDeath: L_Punish: if (@MobID == 1089) - areamonster "033-1.gat", 79, 29, 88, 42, "", 1089, 1, "Kimarr::OnFluffyDeath"; + areamonster "033-1", 79, 29, 88, 42, "", 1089, 1, "Kimarr::OnFluffyDeath"; if (@MobID == 1058) - areamonster "033-1.gat", 79, 29, 88, 42, "", 1058, 1, "Kimarr::OnIceGoblinDeath"; + areamonster "033-1", 79, 29, 88, 42, "", 1058, 1, "Kimarr::OnIceGoblinDeath"; if (@MobID == 1090) - areamonster "033-1.gat", 79, 29, 88, 42, "", 1090, 1, "Kimarr::OnWolvernDeath"; + areamonster "033-1", 79, 29, 88, 42, "", 1090, 1, "Kimarr::OnWolvernDeath"; if (@MobID == 1072) - areamonster "033-1.gat", 79, 29, 88, 42, "", 1072, 1, "Kimarr::OnYetiDeath"; + areamonster "033-1", 79, 29, 88, 42, "", 1072, 1, "Kimarr::OnYetiDeath"; npctalk strcharinfo(0) + "! This hunt is for " + $@Fluffy_Fighter$ + " alone!"; percentheal -100, 0; @@ -348,15 +348,15 @@ S_Clean: set $@Fluffy_Kills, 0; set $@Fluffy_Spawn, 0; set $@Fluffy_Alive, 0; - killmonster "033-1.gat", "Kimarr::OnIceGoblinDeath"; - killmonster "033-1.gat", "Kimarr::OnWolvernDeath"; - killmonster "033-1.gat", "Kimarr::OnYetiDeath"; - killmonster "033-1.gat", "Kimarr::OnFluffyDeath"; + killmonster "033-1", "Kimarr::OnIceGoblinDeath"; + killmonster "033-1", "Kimarr::OnWolvernDeath"; + killmonster "033-1", "Kimarr::OnYetiDeath"; + killmonster "033-1", "Kimarr::OnFluffyDeath"; set @state, 0; return; L_MaybeRecordScore: - warp "033-1.gat", 77, 34; + warp "033-1", 77, 34; if ($@Fluffy_Kills < $@Fluffy_Min) goto L_NotGoodEnough; set @rank, 0; diff --git a/world/map/npc/033-1/mapflags.txt b/world/map/npc/033-1/mapflags.txt index 5535662f..08a33311 100644 --- a/world/map/npc/033-1/mapflags.txt +++ b/world/map/npc/033-1/mapflags.txt @@ -1 +1 @@ -033-1.gat|mapflag|resave|033-1,67,33 +033-1|mapflag|resave|033-1,67,33 diff --git a/world/map/npc/033-1/traveler.txt b/world/map/npc/033-1/traveler.txt index c89a8985..681a4100 100644 --- a/world/map/npc/033-1/traveler.txt +++ b/world/map/npc/033-1/traveler.txt @@ -2,7 +2,7 @@ // Author: Wombat, wushin // cost depending on level and adapted to new scripting guidelines: Jenalya -033-1.gat,63,30,0|script|Khoenan the Traveler|103 +033-1,63,30,0|script|Khoenan the Traveler|103 { set @NpcName$, "Khoenan"; set @NpcTravelBit, $@barbarians_bit; diff --git a/world/map/npc/033-1/yerrnk.txt b/world/map/npc/033-1/yerrnk.txt index f69f3aac..f64fccc8 100644 --- a/world/map/npc/033-1/yerrnk.txt +++ b/world/map/npc/033-1/yerrnk.txt @@ -1,4 +1,4 @@ -033-1.gat,66,28,0|script|Yerrnk|216 +033-1,66,28,0|script|Yerrnk|216 { set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT); diff --git a/world/map/npc/034-1/ambushs.txt b/world/map/npc/034-1/ambushs.txt index 9296ec29..9abc4481 100644 --- a/world/map/npc/034-1/ambushs.txt +++ b/world/map/npc/034-1/ambushs.txt @@ -1,7 +1,7 @@ // This file belongs to the wolvern hunting quest given by 033-1/birrod.txt // Author: Jenalya, cody, PjotrOrial -034-1.gat,118,59,0|script|#Ambush0Trigger|32767,2,2 +034-1,118,59,0|script|#Ambush0Trigger|32767,2,2 { set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT); if (@state != 4) @@ -21,7 +21,7 @@ end; } -034-1.gat,118,59,0|script|#Ambush0|32767 +034-1,118,59,0|script|#Ambush0|32767 { end; @@ -30,7 +30,7 @@ OnAmbush: goto L_Clean; set $@Ambush0_Spawn, 3 + rand(2); message strcharinfo(0), "An ambush!"; - areamonster "034-1.gat", 115, 56, 121, 62, "", 1090, $@Ambush0_Spawn, "#Ambush0::OnWolvernDeath"; + areamonster "034-1", 115, 56, 121, 62, "", 1090, $@Ambush0_Spawn, "#Ambush0::OnWolvernDeath"; set @ambushs034, @ambushs034 | $@Q_Barbarians_Ambush0_flag; end; @@ -61,7 +61,7 @@ L_Count: } -034-1.gat,94,91,0|script|#Ambush1Trigger|32767,2,2 +034-1,94,91,0|script|#Ambush1Trigger|32767,2,2 { set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT); if (@state != 4) @@ -81,7 +81,7 @@ L_Count: end; } -034-1.gat,94,91,0|script|#Ambush1|32767 +034-1,94,91,0|script|#Ambush1|32767 { end; @@ -90,7 +90,7 @@ OnAmbush: goto L_Clean; set $@Ambush1_Spawn, 3 + rand(2); message strcharinfo(0), "An ambush!"; - areamonster "034-1.gat", 91, 88, 97, 94, "", 1090, $@Ambush1_Spawn, "#Ambush1::OnWolvernDeath"; + areamonster "034-1", 91, 88, 97, 94, "", 1090, $@Ambush1_Spawn, "#Ambush1::OnWolvernDeath"; set @ambushs034, @ambushs034 | $@Q_Barbarians_Ambush1_flag; end; @@ -121,7 +121,7 @@ L_Count: } -034-1.gat,122,35,0|script|#Ambush2Trigger|32767,2,2 +034-1,122,35,0|script|#Ambush2Trigger|32767,2,2 { set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT); if (@state != 4) @@ -141,7 +141,7 @@ L_Count: end; } -034-1.gat,122,35,0|script|#Ambush2|32767 +034-1,122,35,0|script|#Ambush2|32767 { end; @@ -150,7 +150,7 @@ OnAmbush: goto L_Clean; set $@Ambush2_Spawn, 3 + rand(2); message strcharinfo(0), "An ambush!"; - areamonster "034-1.gat", 119, 32, 125, 38, "", 1090, $@Ambush2_Spawn, "#Ambush2::OnWolvernDeath"; + areamonster "034-1", 119, 32, 125, 38, "", 1090, $@Ambush2_Spawn, "#Ambush2::OnWolvernDeath"; set @ambushs034, @ambushs034 | $@Q_Barbarians_Ambush2_flag; end; @@ -181,7 +181,7 @@ L_Count: } -034-1.gat,83,44,0|script|#Ambush3Trigger|32767,2,2 +034-1,83,44,0|script|#Ambush3Trigger|32767,2,2 { set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT); if (@state != 4) @@ -201,7 +201,7 @@ L_Count: end; } -034-1.gat,83,44,0|script|#Ambush3|32767 +034-1,83,44,0|script|#Ambush3|32767 { end; @@ -210,7 +210,7 @@ OnAmbush: goto L_Clean; set $@Ambush3_Spawn, 3 + rand(2); message strcharinfo(0), "An ambush!"; - areamonster "034-1.gat", 80, 41, 86, 47, "", 1090, $@Ambush3_Spawn, "#Ambush3::OnWolvernDeath"; + areamonster "034-1", 80, 41, 86, 47, "", 1090, $@Ambush3_Spawn, "#Ambush3::OnWolvernDeath"; set @ambushs034, @ambushs034 | $@Q_Barbarians_Ambush3_flag; end; @@ -241,7 +241,7 @@ L_Count: } -034-1.gat,74,28,0|script|#Ambush4Trigger|32767,2,2 +034-1,74,28,0|script|#Ambush4Trigger|32767,2,2 { set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT); if (@state != 4) @@ -261,7 +261,7 @@ L_Count: end; } -034-1.gat,74,28,0|script|#Ambush4|32767 +034-1,74,28,0|script|#Ambush4|32767 { end; @@ -270,7 +270,7 @@ OnAmbush: goto L_Clean; set $@Ambush4_Spawn, 3 + rand(2); message strcharinfo(0), "An ambush!"; - areamonster "034-1.gat", 71, 25, 77, 31, "", 1090, $@Ambush4_Spawn, "#Ambush4::OnWolvernDeath"; + areamonster "034-1", 71, 25, 77, 31, "", 1090, $@Ambush4_Spawn, "#Ambush4::OnWolvernDeath"; set @ambushs034, @ambushs034 | $@Q_Barbarians_Ambush4_flag; end; @@ -301,7 +301,7 @@ L_Count: } -034-1.gat,26,44,0|script|#Ambush5Trigger|32767,2,2 +034-1,26,44,0|script|#Ambush5Trigger|32767,2,2 { set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT); if (@state != 4) @@ -321,7 +321,7 @@ L_Count: end; } -034-1.gat,26,44,0|script|#Ambush5|32767 +034-1,26,44,0|script|#Ambush5|32767 { end; @@ -330,7 +330,7 @@ OnAmbush: goto L_Clean; set $@Ambush5_Spawn, 3 + rand(2); message strcharinfo(0), "An ambush!"; - areamonster "034-1.gat", 23, 41, 29, 47, "", 1090, $@Ambush5_Spawn, "#Ambush5::OnWolvernDeath"; + areamonster "034-1", 23, 41, 29, 47, "", 1090, $@Ambush5_Spawn, "#Ambush5::OnWolvernDeath"; set @ambushs034, @ambushs034 | $@Q_Barbarians_Ambush5_flag; end; @@ -361,7 +361,7 @@ L_Count: } -034-1.gat,50,47,0|script|#Ambush6Trigger|32767,2,2 +034-1,50,47,0|script|#Ambush6Trigger|32767,2,2 { set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT); if (@state != 4) @@ -381,7 +381,7 @@ L_Count: end; } -034-1.gat,50,47,0|script|#Ambush6|32767 +034-1,50,47,0|script|#Ambush6|32767 { end; @@ -390,7 +390,7 @@ OnAmbush: goto L_Clean; set $@Ambush6_Spawn, 3 + rand(2); message strcharinfo(0), "An ambush!"; - areamonster "034-1.gat", 47, 44, 53, 50, "", 1090, $@Ambush6_Spawn, "#Ambush6::OnWolvernDeath"; + areamonster "034-1", 47, 44, 53, 50, "", 1090, $@Ambush6_Spawn, "#Ambush6::OnWolvernDeath"; set @ambushs034, @ambushs034 | $@Q_Barbarians_Ambush6_flag; end; @@ -421,7 +421,7 @@ L_Count: } -034-1.gat,36,62,0|script|#Ambush7Trigger|32767,2,2 +034-1,36,62,0|script|#Ambush7Trigger|32767,2,2 { set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT); if (@state != 4) @@ -441,7 +441,7 @@ L_Count: end; } -034-1.gat,36,62,0|script|#Ambush7|32767 +034-1,36,62,0|script|#Ambush7|32767 { end; @@ -450,7 +450,7 @@ OnAmbush: goto L_Clean; set $@Ambush7_Spawn, 3 + rand(2); message strcharinfo(0), "An ambush!"; - areamonster "034-1.gat", 33, 59, 39, 65, "", 1090, $@Ambush7_Spawn, "#Ambush7::OnWolvernDeath"; + areamonster "034-1", 33, 59, 39, 65, "", 1090, $@Ambush7_Spawn, "#Ambush7::OnWolvernDeath"; set @ambushs034, @ambushs034 | $@Q_Barbarians_Ambush7_flag; end; @@ -481,7 +481,7 @@ L_Count: } -034-1.gat,26,95,0|script|#Ambush8Trigger|32767,2,2 +034-1,26,95,0|script|#Ambush8Trigger|32767,2,2 { set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT); if (@state != 4) @@ -501,7 +501,7 @@ L_Count: end; } -034-1.gat,26,95,0|script|#Ambush8|32767 +034-1,26,95,0|script|#Ambush8|32767 { end; @@ -510,7 +510,7 @@ OnAmbush: goto L_Clean; set $@Ambush8_Spawn, 3 + rand(2); message strcharinfo(0), "An ambush!"; - areamonster "034-1.gat", 23, 92, 29, 98, "", 1090, $@Ambush8_Spawn, "#Ambush8::OnWolvernDeath"; + areamonster "034-1", 23, 92, 29, 98, "", 1090, $@Ambush8_Spawn, "#Ambush8::OnWolvernDeath"; set @ambushs034, @ambushs034 | $@Q_Barbarians_Ambush8_flag; end; @@ -541,7 +541,7 @@ L_Count: } -034-1.gat,56,91,0|script|#Ambush9Trigger|32767,2,2 +034-1,56,91,0|script|#Ambush9Trigger|32767,2,2 { set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT); if (@state != 4) @@ -561,7 +561,7 @@ L_Count: end; } -034-1.gat,56,91,0|script|#Ambush9|32767 +034-1,56,91,0|script|#Ambush9|32767 { end; @@ -570,7 +570,7 @@ OnAmbush: goto L_Clean; set $@Ambush9_Spawn, 3 + rand(2); message strcharinfo(0), "An ambush!"; - areamonster "034-1.gat", 53, 88, 59, 94, "", 1090, $@Ambush9_Spawn, "#Ambush9::OnWolvernDeath"; + areamonster "034-1", 53, 88, 59, 94, "", 1090, $@Ambush9_Spawn, "#Ambush9::OnWolvernDeath"; set @ambushs034, @ambushs034 | $@Q_Barbarians_Ambush9_flag; end; @@ -601,7 +601,7 @@ L_Count: } -034-1.gat,65,66,0|script|#Ambush10Trigger|32767,2,2 +034-1,65,66,0|script|#Ambush10Trigger|32767,2,2 { set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT); if (@state != 4) @@ -621,7 +621,7 @@ L_Count: end; } -034-1.gat,65,66,0|script|#Ambush10|32767 +034-1,65,66,0|script|#Ambush10|32767 { end; @@ -630,7 +630,7 @@ OnAmbush: goto L_Clean; set $@Ambush10_Spawn, 3 + rand(2); message strcharinfo(0), "An ambush!"; - areamonster "034-1.gat", 62, 63, 68, 69, "", 1090, $@Ambush10_Spawn, "#Ambush10::OnWolvernDeath"; + areamonster "034-1", 62, 63, 68, 69, "", 1090, $@Ambush10_Spawn, "#Ambush10::OnWolvernDeath"; set @ambushs034, @ambushs034 | $@Q_Barbarians_Ambush10_flag; end; @@ -661,7 +661,7 @@ L_Count: } -034-1.gat,86,68,0|script|#Ambush11Trigger|32767,2,2 +034-1,86,68,0|script|#Ambush11Trigger|32767,2,2 { set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT); if (@state != 4) @@ -681,7 +681,7 @@ L_Count: end; } -034-1.gat,86,68,0|script|#Ambush11|32767 +034-1,86,68,0|script|#Ambush11|32767 { end; @@ -690,7 +690,7 @@ OnAmbush: goto L_Clean; set $@Ambush11_Spawn, 3 + rand(2); message strcharinfo(0), "An ambush!"; - areamonster "034-1.gat", 83, 65, 89, 71, "", 1090, $@Ambush11_Spawn, "#Ambush11::OnWolvernDeath"; + areamonster "034-1", 83, 65, 89, 71, "", 1090, $@Ambush11_Spawn, "#Ambush11::OnWolvernDeath"; set @ambushs034, @ambushs034 | $@Q_Barbarians_Ambush11_flag; end; @@ -721,7 +721,7 @@ L_Count: } -034-1.gat,101,79,0|script|#Ambush12Trigger|32767,2,2 +034-1,101,79,0|script|#Ambush12Trigger|32767,2,2 { set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT); if (@state != 4) @@ -741,7 +741,7 @@ L_Count: end; } -034-1.gat,101,79,0|script|#Ambush12|32767 +034-1,101,79,0|script|#Ambush12|32767 { end; @@ -750,7 +750,7 @@ OnAmbush: goto L_Clean; set $@Ambush12_Spawn, 3 + rand(2); message strcharinfo(0), "An ambush!"; - areamonster "034-1.gat", 98, 76, 104, 82, "", 1090, $@Ambush12_Spawn, "#Ambush12::OnWolvernDeath"; + areamonster "034-1", 98, 76, 104, 82, "", 1090, $@Ambush12_Spawn, "#Ambush12::OnWolvernDeath"; set @ambushs034, @ambushs034 | $@Q_Barbarians_Ambush12_flag; end; @@ -781,7 +781,7 @@ L_Count: } -034-1.gat,124,88,0|script|#Ambush13Trigger|32767,2,2 +034-1,124,88,0|script|#Ambush13Trigger|32767,2,2 { set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT); if (@state != 4) @@ -801,7 +801,7 @@ L_Count: end; } -034-1.gat,124,88,0|script|#Ambush13|32767 +034-1,124,88,0|script|#Ambush13|32767 { end; @@ -810,7 +810,7 @@ OnAmbush: goto L_Clean; set $@Ambush13_Spawn, 3 + rand(2); message strcharinfo(0), "An ambush!"; - areamonster "034-1.gat", 121, 85, 127, 91, "", 1090, $@Ambush13_Spawn, "#Ambush13::OnWolvernDeath"; + areamonster "034-1", 121, 85, 127, 91, "", 1090, $@Ambush13_Spawn, "#Ambush13::OnWolvernDeath"; set @ambushs034, @ambushs034 | $@Q_Barbarians_Ambush13_flag; end; @@ -841,7 +841,7 @@ L_Count: } -034-1.gat,117,103,0|script|#Ambush14Trigger|32767,2,2 +034-1,117,103,0|script|#Ambush14Trigger|32767,2,2 { set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT); if (@state != 4) @@ -861,7 +861,7 @@ L_Count: end; } -034-1.gat,117,103,0|script|#Ambush14|32767 +034-1,117,103,0|script|#Ambush14|32767 { end; @@ -870,7 +870,7 @@ OnAmbush: goto L_Clean; set $@Ambush14_Spawn, 3 + rand(2); message strcharinfo(0), "An ambush!"; - areamonster "034-1.gat", 114, 100, 120, 106, "", 1090, $@Ambush14_Spawn, "#Ambush14::OnWolvernDeath"; + areamonster "034-1", 114, 100, 120, 106, "", 1090, $@Ambush14_Spawn, "#Ambush14::OnWolvernDeath"; set @ambushs034, @ambushs034 | $@Q_Barbarians_Ambush14_flag; end; diff --git a/world/map/npc/034-1/mapflags.txt b/world/map/npc/034-1/mapflags.txt index c142d6d6..35e50a76 100644 --- a/world/map/npc/034-1/mapflags.txt +++ b/world/map/npc/034-1/mapflags.txt @@ -1 +1 @@ -034-1.gat|mapflag|resave|033-1,67,33 +034-1|mapflag|resave|033-1,67,33 diff --git a/world/map/npc/034-1/yetiSpawn.txt b/world/map/npc/034-1/yetiSpawn.txt index 72c331e6..81d76ddd 100644 --- a/world/map/npc/034-1/yetiSpawn.txt +++ b/world/map/npc/034-1/yetiSpawn.txt @@ -1,7 +1,7 @@ // This file belongs to the yeti hunting quest given by 033-1/yerrnk.txt // Author: Jenalya -034-1.gat,79,98,0|script|#Yerrnk_YetiTrigger|32767,1,3 +034-1,79,98,0|script|#Yerrnk_YetiTrigger|32767,1,3 { set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT); if (@state != 7) @@ -15,7 +15,7 @@ end; } -034-1.gat,78,98,0|script|#Yerrnk_Yeti|32767 +034-1,78,98,0|script|#Yerrnk_Yeti|32767 { end; @@ -24,7 +24,7 @@ OnYeti: goto L_Abort; message strcharinfo(0), "There is the Yeti!"; - areamonster "034-1.gat", 67, 93, 74, 102, "", 1072, 1, "#Yerrnk_Yeti::OnYetiDeath"; + areamonster "034-1", 67, 93, 74, 102, "", 1072, 1, "#Yerrnk_Yeti::OnYetiDeath"; end; L_Abort: diff --git a/world/map/npc/034-2/mapflags.txt b/world/map/npc/034-2/mapflags.txt index 7721f6a7..b5c4f28f 100644 --- a/world/map/npc/034-2/mapflags.txt +++ b/world/map/npc/034-2/mapflags.txt @@ -1 +1 @@ -034-2.gat|mapflag|resave|033-1,67,33 +034-2|mapflag|resave|033-1,67,33 diff --git a/world/map/npc/035-2/casino.txt b/world/map/npc/035-2/casino.txt index 47351085..91971cfa 100644 --- a/world/map/npc/035-2/casino.txt +++ b/world/map/npc/035-2/casino.txt @@ -1,11 +1,11 @@ // Casino -035-2.gat,34,37,0|script|Slots#4|400 +035-2,34,37,0|script|Slots#4|400 { callfunc "SlotMachine"; close; } -035-2.gat,36,37,0|script|Slots#5|400 +035-2,36,37,0|script|Slots#5|400 { callfunc "SlotMachine"; close; diff --git a/world/map/npc/035-2/emblems.txt b/world/map/npc/035-2/emblems.txt index 9e888fd4..c5ba04c6 100644 --- a/world/map/npc/035-2/emblems.txt +++ b/world/map/npc/035-2/emblems.txt @@ -1,40 +1,40 @@ -035-2.gat,28,27,0|script|#k1city1e|410 +035-2,28,27,0|script|#k1city1e|410 { end; OnInit: disablenpc "#k1city1e"; end; } -035-2.gat,28,27,0|script|#k1city1d|411 +035-2,28,27,0|script|#k1city1d|411 { end; } -035-2.gat,30,27,0|script|#k1city2e|412 +035-2,30,27,0|script|#k1city2e|412 { end; OnInit: disablenpc "#k1city2e"; end; } -035-2.gat,30,27,0|script|#k1city2d|413 +035-2,30,27,0|script|#k1city2d|413 { end; } -035-2.gat,32,27,0|script|#k1city3e|414 +035-2,32,27,0|script|#k1city3e|414 { end; OnInit: disablenpc "#k1city3e"; end; } -035-2.gat,32,27,0|script|#k1city3d|415 +035-2,32,27,0|script|#k1city3d|415 { end; } -035-2.gat,32,27,0|script|#k1sound|127 +035-2,32,27,0|script|#k1sound|127 { end; OnCommandDing: diff --git a/world/map/npc/035-2/koga.txt b/world/map/npc/035-2/koga.txt index 616de0f3..d54e3e27 100644 --- a/world/map/npc/035-2/koga.txt +++ b/world/map/npc/035-2/koga.txt @@ -1,6 +1,6 @@ // Dock -035-2.gat,39,29,0|script|#KogaExit|45,0,1 +035-2,39,29,0|script|#KogaExit|45,0,1 { mes "Disembark the ferry for "+$@MainDocks$[$@MainCurrentDock]+"?"; menu @@ -17,15 +17,15 @@ L_Leave: goto L_Close; L_Tulimshar: - warp "001-1.gat", 63, 73; + warp "001-1", 63, 73; goto L_Close; L_Hurnscald: - warp "008-1.gat", 137, 64; + warp "008-1", 137, 64; goto L_Close; L_Nivalis: - warp "031-1.gat", 95, 109; + warp "031-1", 95, 109; goto L_Close; L_Close: diff --git a/world/map/npc/035-2/mapflags.txt b/world/map/npc/035-2/mapflags.txt index 048307fd..2866ca80 100644 --- a/world/map/npc/035-2/mapflags.txt +++ b/world/map/npc/035-2/mapflags.txt @@ -1,2 +1,2 @@ -035-2.gat|mapflag|town -035-2.gat|mapflag|resave|035-2,20,21 +035-2|mapflag|town +035-2|mapflag|resave|035-2,20,21 diff --git a/world/map/npc/035-2/shops.txt b/world/map/npc/035-2/shops.txt index 7d7d656a..85bd3e2b 100644 --- a/world/map/npc/035-2/shops.txt +++ b/world/map/npc/035-2/shops.txt @@ -1,8 +1,8 @@ // -035-2.gat,23,38,0|shop|Cooky|213,Beer:*1,Orange:*1,CasinoCoins:*1 +035-2,23,38,0|shop|Cooky|213,Beer:*1,Orange:*1,CasinoCoins:*1 -035-2.gat,23,35,0|script|Bunkmaster Phict|212 +035-2,23,35,0|script|Bunkmaster Phict|212 { set @npcname$, "Bunkmaster Phict"; set @cost, 100; diff --git a/world/map/npc/036-2/casino.txt b/world/map/npc/036-2/casino.txt index bfd56a67..5658aea6 100644 --- a/world/map/npc/036-2/casino.txt +++ b/world/map/npc/036-2/casino.txt @@ -1,11 +1,11 @@ // Casino -036-2.gat,34,37,0|script|Slots#6|400 +036-2,34,37,0|script|Slots#6|400 { callfunc "SlotMachine"; close; } -036-2.gat,36,37,0|script|Slots#7|400 +036-2,36,37,0|script|Slots#7|400 { callfunc "SlotMachine"; close; diff --git a/world/map/npc/036-2/emblems.txt b/world/map/npc/036-2/emblems.txt index 1c8bad11..1ffcc995 100644 --- a/world/map/npc/036-2/emblems.txt +++ b/world/map/npc/036-2/emblems.txt @@ -1,28 +1,28 @@ -036-2.gat,29,27,0|script|#k2city1e|412 +036-2,29,27,0|script|#k2city1e|412 { end; OnInit: disablenpc "#k2city1e"; end; } -036-2.gat,29,27,0|script|#k2city1d|413 +036-2,29,27,0|script|#k2city1d|413 { end; } -036-2.gat,31,27,0|script|#k2city2e|416 +036-2,31,27,0|script|#k2city2e|416 { end; OnInit: disablenpc "#k2city2e"; end; } -036-2.gat,31,27,0|script|#k2city2d|417 +036-2,31,27,0|script|#k2city2d|417 { end; } -036-2.gat,32,27,0|script|#k2sound|127 +036-2,32,27,0|script|#k2sound|127 { end; OnCommandDing: diff --git a/world/map/npc/036-2/koga-candor.txt b/world/map/npc/036-2/koga-candor.txt index 3b9fd932..8aee6be3 100644 --- a/world/map/npc/036-2/koga-candor.txt +++ b/world/map/npc/036-2/koga-candor.txt @@ -1,6 +1,6 @@ // Dock -036-2.gat,39,29,0|script|#KogaCandorExit|45,0,1 +036-2,39,29,0|script|#KogaCandorExit|45,0,1 { mes "Disembark the ferry for "+$@CandorDocks$[$@CandorCurrentDock]+"?"; menu @@ -15,11 +15,11 @@ L_Leave: goto L_Close; L_Hurnscald: - warp "008-1.gat", 137, 75; + warp "008-1", 137, 75; goto L_Close; L_Candor: - warp "029-1.gat", 46, 109; + warp "029-1", 46, 109; goto L_Close; L_Close: diff --git a/world/map/npc/036-2/mapflags.txt b/world/map/npc/036-2/mapflags.txt index da3ae23a..a21839b0 100644 --- a/world/map/npc/036-2/mapflags.txt +++ b/world/map/npc/036-2/mapflags.txt @@ -1,2 +1,2 @@ -036-2.gat|mapflag|town -036-2.gat|mapflag|resave|036-2,20,21 +036-2|mapflag|town +036-2|mapflag|resave|036-2,20,21 diff --git a/world/map/npc/036-2/shops.txt b/world/map/npc/036-2/shops.txt index 33dd286e..eadfc02b 100644 --- a/world/map/npc/036-2/shops.txt +++ b/world/map/npc/036-2/shops.txt @@ -1,9 +1,9 @@ // -036-2.gat,23,38,0|shop|Chef Armand|211,Beer:*1,Steak:*2,CasinoCoins:*1 -036-2.gat,35,22,0|shop|Gunney|138,Arrow:*4,IronArrow:*2 +036-2,23,38,0|shop|Chef Armand|211,Beer:*1,Steak:*2,CasinoCoins:*1 +036-2,35,22,0|shop|Gunney|138,Arrow:*4,IronArrow:*2 -036-2.gat,23,35,0|script|Bunkmaster Daban|212 +036-2,23,35,0|script|Bunkmaster Daban|212 { set @npcname$, "Bunkmaster Daban"; set @cost, 100; diff --git a/world/map/npc/043-3/mapflags.txt b/world/map/npc/043-3/mapflags.txt index d9d20660..b44307a2 100644 --- a/world/map/npc/043-3/mapflags.txt +++ b/world/map/npc/043-3/mapflags.txt @@ -1 +1 @@ -043-3.gat|mapflag|resave|002-3,72,66 +043-3|mapflag|resave|002-3,72,66 diff --git a/world/map/npc/043-4/mapflags.txt b/world/map/npc/043-4/mapflags.txt index 15e2030b..9acc0b8a 100644 --- a/world/map/npc/043-4/mapflags.txt +++ b/world/map/npc/043-4/mapflags.txt @@ -1 +1 @@ -043-4.gat|mapflag|resave|002-3,72,66 +043-4|mapflag|resave|002-3,72,66 diff --git a/world/map/npc/045-1/mapflags.txt b/world/map/npc/045-1/mapflags.txt index 5349fac2..c3cbf1da 100644 --- a/world/map/npc/045-1/mapflags.txt +++ b/world/map/npc/045-1/mapflags.txt @@ -1 +1 @@ -045-1.gat|mapflag|resave|017-1,170,25 +045-1|mapflag|resave|017-1,170,25 diff --git a/world/map/npc/046-1/mapflags.txt b/world/map/npc/046-1/mapflags.txt index 1316df77..8e5720df 100644 --- a/world/map/npc/046-1/mapflags.txt +++ b/world/map/npc/046-1/mapflags.txt @@ -1 +1 @@ -046-1.gat|mapflag|resave|046-1,92,48 +046-1|mapflag|resave|046-1,92,48 diff --git a/world/map/npc/046-3/mapflags.txt b/world/map/npc/046-3/mapflags.txt index fd179962..941f4c1a 100644 --- a/world/map/npc/046-3/mapflags.txt +++ b/world/map/npc/046-3/mapflags.txt @@ -1 +1 @@ -046-3.gat|mapflag|resave|046-1,92,48 +046-3|mapflag|resave|046-1,92,48 diff --git a/world/map/npc/047-1/mapflags.txt b/world/map/npc/047-1/mapflags.txt index 62eb9809..12a7c9cb 100644 --- a/world/map/npc/047-1/mapflags.txt +++ b/world/map/npc/047-1/mapflags.txt @@ -1 +1 @@ -047-1.gat|mapflag|resave|048-2,26,46 +047-1|mapflag|resave|048-2,26,46 diff --git a/world/map/npc/047-3/mapflags.txt b/world/map/npc/047-3/mapflags.txt index 3cab7365..b3562bf7 100644 --- a/world/map/npc/047-3/mapflags.txt +++ b/world/map/npc/047-3/mapflags.txt @@ -1 +1 @@ -047-3.gat|mapflag|resave|047-1,145,20 +047-3|mapflag|resave|047-1,145,20 diff --git a/world/map/npc/048-2/helperAccused.txt b/world/map/npc/048-2/helperAccused.txt index ec9b7da4..92043705 100644 --- a/world/map/npc/048-2/helperAccused.txt +++ b/world/map/npc/048-2/helperAccused.txt @@ -4,7 +4,7 @@ // Peetu is the person who caused the accident // involved investigation subquest -048-2.gat,25,135,0|script|Peetu|366 +048-2,25,135,0|script|Peetu|366 { set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); diff --git a/world/map/npc/048-2/helperBookpages1.txt b/world/map/npc/048-2/helperBookpages1.txt index 27ff12d8..519c6279 100644 --- a/world/map/npc/048-2/helperBookpages1.txt +++ b/world/map/npc/048-2/helperBookpages1.txt @@ -4,7 +4,7 @@ // Ensio is one of the helpers working on sorting the bookpages, can take bookpages // can give second hint about the visitor in investigation subquest -048-2.gat,104,86,0|script|Ensio|365 +048-2,104,86,0|script|Ensio|365 { set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); set @bookpages, ((QUEST_BlueSage & $@Q_BlueSageBookPages_MASK) >> $@Q_BlueSageBookPages_SHIFT); diff --git a/world/map/npc/048-2/helperBookpages2.txt b/world/map/npc/048-2/helperBookpages2.txt index 79be8539..0b37e060 100644 --- a/world/map/npc/048-2/helperBookpages2.txt +++ b/world/map/npc/048-2/helperBookpages2.txt @@ -4,7 +4,7 @@ // Henriikka is one of the helpers working on sorting the bookpages, sends the player to Ensio // can be questioned as part of the investigation subquest, but doesn't give hints -048-2.gat,94,86,0|script|Henriikka|363 +048-2,94,86,0|script|Henriikka|363 { set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); set @bookpages, ((QUEST_BlueSage & $@Q_BlueSageBookPages_MASK) >> $@Q_BlueSageBookPages_SHIFT); diff --git a/world/map/npc/048-2/helperBookpages3.txt b/world/map/npc/048-2/helperBookpages3.txt index a4733060..20d173e6 100644 --- a/world/map/npc/048-2/helperBookpages3.txt +++ b/world/map/npc/048-2/helperBookpages3.txt @@ -4,7 +4,7 @@ // Teuvo is one of the helpers working on sorting the bookpages // can give second hint about Peetu in investigation subquest -048-2.gat,99,87,0|script|Teuvo|366 +048-2,99,87,0|script|Teuvo|366 { set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); set @bookpages, ((QUEST_BlueSage & $@Q_BlueSageBookPages_MASK) >> $@Q_BlueSageBookPages_SHIFT); diff --git a/world/map/npc/048-2/helperChief.txt b/world/map/npc/048-2/helperChief.txt index a7fb2073..30fc12ce 100644 --- a/world/map/npc/048-2/helperChief.txt +++ b/world/map/npc/048-2/helperChief.txt @@ -4,7 +4,7 @@ // Chief of the Blue Sage helpers // involved in investigation subquest -048-2.gat,146,26,0|script|Oskari|365 +048-2,146,26,0|script|Oskari|365 { set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); diff --git a/world/map/npc/048-2/helperCleaning1.txt b/world/map/npc/048-2/helperCleaning1.txt index 0bcea8d4..d60aa16f 100644 --- a/world/map/npc/048-2/helperCleaning1.txt +++ b/world/map/npc/048-2/helperCleaning1.txt @@ -4,7 +4,7 @@ // Pyry works on cleaning the library, can start the slime subquest // can give second hint about helper in investigation subquest -048-2.gat,117,106,0|script|Pyry|365 +048-2,117,106,0|script|Pyry|365 { set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT); set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); diff --git a/world/map/npc/048-2/helperCleaning2.txt b/world/map/npc/048-2/helperCleaning2.txt index 1e39b184..40339364 100644 --- a/world/map/npc/048-2/helperCleaning2.txt +++ b/world/map/npc/048-2/helperCleaning2.txt @@ -4,7 +4,7 @@ // Nea works on cleaning the library // can give second hint about helper in investigation subquest -048-2.gat,123,87,0|script|Nea|363 +048-2,123,87,0|script|Nea|363 { set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT); set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); diff --git a/world/map/npc/048-2/helperCleaning3.txt b/world/map/npc/048-2/helperCleaning3.txt index 44a3ca07..d1ed35a5 100644 --- a/world/map/npc/048-2/helperCleaning3.txt +++ b/world/map/npc/048-2/helperCleaning3.txt @@ -4,7 +4,7 @@ // Arvo works on cleaning the library // can give second hint about the visitor in investigation subquest -048-2.gat,139,99,0|script|Arvo|366 +048-2,139,99,0|script|Arvo|366 { set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT); set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); diff --git a/world/map/npc/048-2/helperCleaning4.txt b/world/map/npc/048-2/helperCleaning4.txt index a11feae1..6b795b84 100644 --- a/world/map/npc/048-2/helperCleaning4.txt +++ b/world/map/npc/048-2/helperCleaning4.txt @@ -4,7 +4,7 @@ // Kristian works on cleaning the library // can give second hint about the visitor in investigation subquest -048-2.gat,131,119,0|script|Kristian|366 +048-2,131,119,0|script|Kristian|366 { set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT); set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); diff --git a/world/map/npc/048-2/helperCleaning5.txt b/world/map/npc/048-2/helperCleaning5.txt index 6470298e..9af27425 100644 --- a/world/map/npc/048-2/helperCleaning5.txt +++ b/world/map/npc/048-2/helperCleaning5.txt @@ -4,7 +4,7 @@ // Mirjami is searching for some cleaning supplies // can give second hint about visitor in investigation subquest -048-2.gat,100,125,0|script|Mirjami|363 +048-2,100,125,0|script|Mirjami|363 { set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT); diff --git a/world/map/npc/048-2/helperJanitor.txt b/world/map/npc/048-2/helperJanitor.txt index f62e9c0b..0d0d884b 100644 --- a/world/map/npc/048-2/helperJanitor.txt +++ b/world/map/npc/048-2/helperJanitor.txt @@ -4,7 +4,7 @@ // Elias is the janitor of the mansion // part of investigation subquest, gives initial hint on the visitor with the mask -048-2.gat,40,41,0|script|Elias|365 +048-2,40,41,0|script|Elias|365 { set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); diff --git a/world/map/npc/048-2/helperMInk.txt b/world/map/npc/048-2/helperMInk.txt index 592df111..220ef484 100644 --- a/world/map/npc/048-2/helperMInk.txt +++ b/world/map/npc/048-2/helperMInk.txt @@ -4,7 +4,7 @@ // Eevert asks for material to create inks for the illustrations in the new books // can give second hint about Peetu in investigation subquest -048-2.gat,95,103,0|script|Eevert|365 +048-2,95,103,0|script|Eevert|365 { set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); set @water_amount, 5; diff --git a/world/map/npc/048-2/helperMReed.txt b/world/map/npc/048-2/helperMReed.txt index 7fef1486..50ac45c0 100644 --- a/world/map/npc/048-2/helperMReed.txt +++ b/world/map/npc/048-2/helperMReed.txt @@ -4,7 +4,7 @@ // Kullervo asks for Reed Bundles to create paper for repairing the books // can give second hint about both Peetu and visitor in investigation subquest -048-2.gat,104,78,0|script|Kullervo|366 +048-2,104,78,0|script|Kullervo|366 { set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); set @reed_amount, 20; diff --git a/world/map/npc/048-2/helperMSilk.txt b/world/map/npc/048-2/helperMSilk.txt index 8b6b08a6..d2db14a5 100644 --- a/world/map/npc/048-2/helperMSilk.txt +++ b/world/map/npc/048-2/helperMSilk.txt @@ -4,7 +4,7 @@ // Janika asks for Silk Cocoons for repairing the books // can give second hint about visitor in investigation subquest -048-2.gat,104,103,0|script|Janika|363 +048-2,104,103,0|script|Janika|363 { set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); set @silk_amount, 80; diff --git a/world/map/npc/048-2/helperMYetiClaw.txt b/world/map/npc/048-2/helperMYetiClaw.txt index 9d830439..c32b0b1e 100644 --- a/world/map/npc/048-2/helperMYetiClaw.txt +++ b/world/map/npc/048-2/helperMYetiClaw.txt @@ -4,7 +4,7 @@ // Santeri asks for Yeti Claws to make glue for repairing the books // can give second hint about Peetu in investigation subquest -048-2.gat,97,78,0|script|Santeri|366 +048-2,97,78,0|script|Santeri|366 { set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); set @claw_amount, 8; diff --git a/world/map/npc/048-2/helperResting1.txt b/world/map/npc/048-2/helperResting1.txt index e1425bc2..87983bc8 100644 --- a/world/map/npc/048-2/helperResting1.txt +++ b/world/map/npc/048-2/helperResting1.txt @@ -4,7 +4,7 @@ // Lenita is one of the helpers working on sorting the bookpages, but is currently having a break // can give second hint about the visitor in investigation subquest -048-2.gat,36,26,0|script|Lenita|363 +048-2,36,26,0|script|Lenita|363 { set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); set @bookpages, ((QUEST_BlueSage & $@Q_BlueSageBookPages_MASK) >> $@Q_BlueSageBookPages_SHIFT); diff --git a/world/map/npc/048-2/helperResting2.txt b/world/map/npc/048-2/helperResting2.txt index 26ff2db6..eb68e554 100644 --- a/world/map/npc/048-2/helperResting2.txt +++ b/world/map/npc/048-2/helperResting2.txt @@ -4,7 +4,7 @@ // Miro is one of the helpers cleaning up the library, but it currently having a break // can give second hint about the Peetu in investigation subquest -048-2.gat,35,27,0|script|Miro|366 +048-2,35,27,0|script|Miro|366 { set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT); diff --git a/world/map/npc/048-2/mapflags.txt b/world/map/npc/048-2/mapflags.txt index 4e972a11..7059a80b 100644 --- a/world/map/npc/048-2/mapflags.txt +++ b/world/map/npc/048-2/mapflags.txt @@ -1 +1 @@ -048-2.gat|mapflag|resave|048-2,26,46 +048-2|mapflag|resave|048-2,26,46 diff --git a/world/map/npc/048-2/sageNikolai.txt b/world/map/npc/048-2/sageNikolai.txt index b396dbd9..dc85d5f8 100644 --- a/world/map/npc/048-2/sageNikolai.txt +++ b/world/map/npc/048-2/sageNikolai.txt @@ -3,7 +3,7 @@ // see bluesageConfig for detailed quest description // Sage Nikolai gives hints about the different subquests and rewards -048-2.gat,98,106,0|script|Nikolai|362 +048-2,98,106,0|script|Nikolai|362 { set @halloween_npc_id, $@halloween_npc_nikolai; callfunc "TrickOrTreat"; @@ -287,7 +287,7 @@ L_Close: close; } -//048-2.gat,100,106,0|script|Debug|160 +//048-2,100,106,0|script|Debug|160 //{ // set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); // set @bookpages, ((QUEST_BlueSage & $@Q_BlueSageBookPages_MASK) >> $@Q_BlueSageBookPages_SHIFT); diff --git a/world/map/npc/048-2/slimes.txt b/world/map/npc/048-2/slimes.txt index dceaad7a..99a1b7e3 100644 --- a/world/map/npc/048-2/slimes.txt +++ b/world/map/npc/048-2/slimes.txt @@ -13,11 +13,11 @@ // @spawnSlimeX: Number of slimes killed by the character that triggered the spawn // white slimes -048-2.gat,181,95,0|script|#Slime0Trigger|32767,2,2 +048-2,181,95,0|script|#Slime0Trigger|32767,2,2 { set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT); - if (mobcount("048-2.gat", "#Slime0::OnSlimeDeath") < 0) // returns -1 if no monsters + if (mobcount("048-2", "#Slime0::OnSlimeDeath") < 0) // returns -1 if no monsters set $@BlueSageSlime0_Spawn, 0; // if finished or haven't started yet or spawn already active or spawn already done, do nothing @@ -46,7 +46,7 @@ L_End: end; } -048-2.gat,181,95,0|script|#Slime0|32767 +048-2,181,95,0|script|#Slime0|32767 { end; @@ -54,13 +54,13 @@ OnSpawn: if (attachrid($@Slime0VictimID) == 0) goto L_Clean; set $@BlueSageSlime0_Spawn, $@BlueSageSlime0_Amount; - areamonster "048-2.gat", 178, 92, 184, 98, "", 1093, $@BlueSageSlime0_Spawn, "#Slime0::OnSlimeDeath"; + areamonster "048-2", 178, 92, 184, 98, "", 1093, $@BlueSageSlime0_Spawn, "#Slime0::OnSlimeDeath"; message strcharinfo(0), "You notice a group of slimes emerging from the debris among the shelves."; end; OnSlimeDeath: set $@BlueSageSlime0_Spawn, $@BlueSageSlime0_Spawn - 1; - if (mobcount("048-2.gat", "#Slime0::OnSlimeDeath") < 0) // returns -1 if no monsters + if (mobcount("048-2", "#Slime0::OnSlimeDeath") < 0) // returns -1 if no monsters set $@BlueSageSlime0_Spawn, 0; if ($@Slime0VictimID == getcharid(3)) @@ -102,11 +102,11 @@ L_ClearedPoint: // white slimes -048-2.gat,164,123,0|script|#Slime1Trigger|32767,2,2 +048-2,164,123,0|script|#Slime1Trigger|32767,2,2 { set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT); - if (mobcount("048-2.gat", "#Slime1::OnSlimeDeath") < 0) // returns -1 if no monsters + if (mobcount("048-2", "#Slime1::OnSlimeDeath") < 0) // returns -1 if no monsters set $@BlueSageSlime1_Spawn, 0; // if finished or haven't started yet or spawn already active or spawn already done, do nothing @@ -135,7 +135,7 @@ L_End: end; } -048-2.gat,164,123,0|script|#Slime1|32767 +048-2,164,123,0|script|#Slime1|32767 { end; @@ -143,13 +143,13 @@ OnSpawn: if (attachrid($@Slime1VictimID) == 0) goto L_Clean; set $@BlueSageSlime1_Spawn, $@BlueSageSlime1_Amount; - areamonster "048-2.gat", 161, 120, 167, 126, "", 1093, $@BlueSageSlime1_Spawn, "#Slime1::OnSlimeDeath"; + areamonster "048-2", 161, 120, 167, 126, "", 1093, $@BlueSageSlime1_Spawn, "#Slime1::OnSlimeDeath"; message strcharinfo(0), "You notice a group of slimes emerging from the debris among the shelves."; end; OnSlimeDeath: set $@BlueSageSlime1_Spawn, $@BlueSageSlime1_Spawn - 1; - if (mobcount("048-2.gat", "#Slime1::OnSlimeDeath") < 0) // returns -1 if no monsters + if (mobcount("048-2", "#Slime1::OnSlimeDeath") < 0) // returns -1 if no monsters set $@BlueSageSlime1_Spawn, 0; if ($@Slime1VictimID == getcharid(3)) @@ -191,11 +191,11 @@ L_ClearedPoint: // white slimes -048-2.gat,198,115,0|script|#Slime2Trigger|32767,2,2 +048-2,198,115,0|script|#Slime2Trigger|32767,2,2 { set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT); - if (mobcount("048-2.gat", "#Slime2::OnSlimeDeath") < 0) // returns -1 if no monsters + if (mobcount("048-2", "#Slime2::OnSlimeDeath") < 0) // returns -1 if no monsters set $@BlueSageSlime2_Spawn, 0; // if finished or haven't started yet or spawn already active or spawn already done, do nothing @@ -224,7 +224,7 @@ L_End: end; } -048-2.gat,198,115,0|script|#Slime2|32767 +048-2,198,115,0|script|#Slime2|32767 { end; @@ -232,13 +232,13 @@ OnSpawn: if (attachrid($@Slime2VictimID) == 0) goto L_Clean; set $@BlueSageSlime2_Spawn, $@BlueSageSlime2_Amount; - areamonster "048-2.gat", 195, 112, 201, 118, "", 1093, $@BlueSageSlime2_Spawn, "#Slime2::OnSlimeDeath"; + areamonster "048-2", 195, 112, 201, 118, "", 1093, $@BlueSageSlime2_Spawn, "#Slime2::OnSlimeDeath"; message strcharinfo(0), "You notice a group of slimes emerging from the debris among the shelves."; end; OnSlimeDeath: set $@BlueSageSlime2_Spawn, $@BlueSageSlime2_Spawn - 1; - if (mobcount("048-2.gat", "#Slime2::OnSlimeDeath") < 0) // returns -1 if no monsters + if (mobcount("048-2", "#Slime2::OnSlimeDeath") < 0) // returns -1 if no monsters set $@BlueSageSlime2_Spawn, 0; if ($@Slime2VictimID == getcharid(3)) @@ -280,11 +280,11 @@ L_ClearedPoint: // white slimes -048-2.gat,167,79,0|script|#Slime3Trigger|32767,2,2 +048-2,167,79,0|script|#Slime3Trigger|32767,2,2 { set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT); - if (mobcount("048-2.gat", "#Slime3::OnSlimeDeath") < 0) // returns -1 if no monsters + if (mobcount("048-2", "#Slime3::OnSlimeDeath") < 0) // returns -1 if no monsters set $@BlueSageSlime3_Spawn, 0; // if finished or haven't started yet or spawn already active or spawn already done, do nothing @@ -313,7 +313,7 @@ L_End: end; } -048-2.gat,167,79,0|script|#Slime3|32767 +048-2,167,79,0|script|#Slime3|32767 { end; @@ -321,13 +321,13 @@ OnSpawn: if (attachrid($@Slime3VictimID) == 0) goto L_Clean; set $@BlueSageSlime3_Spawn, $@BlueSageSlime3_Amount; - areamonster "048-2.gat", 164, 76, 170, 82, "", 1093, $@BlueSageSlime3_Spawn, "#Slime3::OnSlimeDeath"; + areamonster "048-2", 164, 76, 170, 82, "", 1093, $@BlueSageSlime3_Spawn, "#Slime3::OnSlimeDeath"; message strcharinfo(0), "You notice a group of slimes emerging from the debris among the shelves."; end; OnSlimeDeath: set $@BlueSageSlime3_Spawn, $@BlueSageSlime3_Spawn - 1; - if (mobcount("048-2.gat", "#Slime3::OnSlimeDeath") < 0) // returns -1 if no monsters + if (mobcount("048-2", "#Slime3::OnSlimeDeath") < 0) // returns -1 if no monsters set $@BlueSageSlime3_Spawn, 0; if ($@Slime3VictimID == getcharid(3)) @@ -369,11 +369,11 @@ L_ClearedPoint: // blue slimes -048-2.gat,192,86,0|script|#Slime4Trigger|32767,2,2 +048-2,192,86,0|script|#Slime4Trigger|32767,2,2 { set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT); - if (mobcount("048-2.gat", "#Slime4::OnSlimeDeath") < 0) // returns -1 if no monsters + if (mobcount("048-2", "#Slime4::OnSlimeDeath") < 0) // returns -1 if no monsters set $@BlueSageSlime4_Spawn, 0; // if finished or haven't started yet or spawn already active or spawn already done, do nothing @@ -402,7 +402,7 @@ L_End: end; } -048-2.gat,192,86,0|script|#Slime4|32767 +048-2,192,86,0|script|#Slime4|32767 { end; @@ -410,13 +410,13 @@ OnSpawn: if (attachrid($@Slime4VictimID) == 0) goto L_Clean; set $@BlueSageSlime4_Spawn, $@BlueSageSlime4_Amount; - areamonster "048-2.gat", 189, 83, 195, 89, "", 1091, $@BlueSageSlime4_Spawn, "#Slime4::OnSlimeDeath"; + areamonster "048-2", 189, 83, 195, 89, "", 1091, $@BlueSageSlime4_Spawn, "#Slime4::OnSlimeDeath"; message strcharinfo(0), "You notice a group of slimes emerging from the debris among the shelves."; end; OnSlimeDeath: set $@BlueSageSlime4_Spawn, $@BlueSageSlime4_Spawn - 1; - if (mobcount("048-2.gat", "#Slime4::OnSlimeDeath") < 0) // returns -1 if no monsters + if (mobcount("048-2", "#Slime4::OnSlimeDeath") < 0) // returns -1 if no monsters set $@BlueSageSlime4_Spawn, 0; if ($@Slime4VictimID == getcharid(3)) @@ -458,11 +458,11 @@ L_ClearedPoint: // blue slimes -048-2.gat,183,110,0|script|#Slime5Trigger|32767,2,2 +048-2,183,110,0|script|#Slime5Trigger|32767,2,2 { set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT); - if (mobcount("048-2.gat", "#Slime5::OnSlimeDeath") < 0) // returns -1 if no monsters + if (mobcount("048-2", "#Slime5::OnSlimeDeath") < 0) // returns -1 if no monsters set $@BlueSageSlime5_Spawn, 0; // if finished or haven't started yet or spawn already active or spawn already done, do nothing @@ -491,7 +491,7 @@ L_End: end; } -048-2.gat,183,110,0|script|#Slime5|32767 +048-2,183,110,0|script|#Slime5|32767 { end; @@ -499,13 +499,13 @@ OnSpawn: if (attachrid($@Slime5VictimID) == 0) goto L_Clean; set $@BlueSageSlime5_Spawn, $@BlueSageSlime5_Amount; - areamonster "048-2.gat", 180, 107, 186, 113, "", 1091, $@BlueSageSlime5_Spawn, "#Slime5::OnSlimeDeath"; + areamonster "048-2", 180, 107, 186, 113, "", 1091, $@BlueSageSlime5_Spawn, "#Slime5::OnSlimeDeath"; message strcharinfo(0), "You notice a group of slimes emerging from the debris among the shelves."; end; OnSlimeDeath: set $@BlueSageSlime5_Spawn, $@BlueSageSlime5_Spawn - 1; - if (mobcount("048-2.gat", "#Slime5::OnSlimeDeath") < 0) // returns -1 if no monsters + if (mobcount("048-2", "#Slime5::OnSlimeDeath") < 0) // returns -1 if no monsters set $@BlueSageSlime5_Spawn, 0; if ($@Slime5VictimID == getcharid(3)) @@ -547,11 +547,11 @@ L_ClearedPoint: // blue slimes -048-2.gat,164,102,0|script|#Slime6Trigger|32767,2,2 +048-2,164,102,0|script|#Slime6Trigger|32767,2,2 { set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT); - if (mobcount("048-2.gat", "#Slime6::OnSlimeDeath") < 0) // returns -1 if no monsters + if (mobcount("048-2", "#Slime6::OnSlimeDeath") < 0) // returns -1 if no monsters set $@BlueSageSlime6_Spawn, 0; // if finished or haven't started yet or spawn already active or spawn already done, do nothing @@ -580,7 +580,7 @@ L_End: end; } -048-2.gat,164,102,0|script|#Slime6|32767 +048-2,164,102,0|script|#Slime6|32767 { end; @@ -588,13 +588,13 @@ OnSpawn: if (attachrid($@Slime6VictimID) == 0) goto L_Clean; set $@BlueSageSlime6_Spawn, $@BlueSageSlime6_Amount; - areamonster "048-2.gat", 161, 99, 167, 105, "", 1091, $@BlueSageSlime6_Spawn, "#Slime6::OnSlimeDeath"; + areamonster "048-2", 161, 99, 167, 105, "", 1091, $@BlueSageSlime6_Spawn, "#Slime6::OnSlimeDeath"; message strcharinfo(0), "You notice a group of slimes emerging from the debris among the shelves."; end; OnSlimeDeath: set $@BlueSageSlime6_Spawn, $@BlueSageSlime6_Spawn - 1; - if (mobcount("048-2.gat", "#Slime6::OnSlimeDeath") < 0) // returns -1 if no monsters + if (mobcount("048-2", "#Slime6::OnSlimeDeath") < 0) // returns -1 if no monsters set $@BlueSageSlime6_Spawn, 0; if ($@Slime6VictimID == getcharid(3)) diff --git a/world/map/npc/048-2/traveler.txt b/world/map/npc/048-2/traveler.txt index 89f3ac58..4d8af7fe 100644 --- a/world/map/npc/048-2/traveler.txt +++ b/world/map/npc/048-2/traveler.txt @@ -2,7 +2,7 @@ // Author: Wombat, wushin // cost depending on level and adapted to new scripting guidelines: Jenalya -048-2.gat,23,46,0|script|Drake the Traveler|103 +048-2,23,46,0|script|Drake the Traveler|103 { set @NpcName$, "Drake"; set @NpcTravelBit, $@blue_sage_bit; diff --git a/world/map/npc/048-2/visitors.txt b/world/map/npc/048-2/visitors.txt index 4fc4b4ca..742782f2 100644 --- a/world/map/npc/048-2/visitors.txt +++ b/world/map/npc/048-2/visitors.txt @@ -2,7 +2,7 @@ // author: Jenalya // visitors that came to see the library and are now disappointed -048-2.gat,46,44,0|script|Connor|150 +048-2,46,44,0|script|Connor|150 { mes "[Connor]"; mes "\"Oh, hello. There was a big accident in the library! Most of the books were damaged or destroyed!\""; @@ -14,7 +14,7 @@ close; } -048-2.gat,28,30,0|script|Parcival|153 +048-2,28,30,0|script|Parcival|153 { mes "[Parcival]"; mes "\"Hello young one. Did you also come here to see the library?\""; diff --git a/world/map/npc/051-1/desert.txt b/world/map/npc/051-1/desert.txt index b2b4ad77..10164b36 100644 --- a/world/map/npc/051-1/desert.txt +++ b/world/map/npc/051-1/desert.txt @@ -8,7 +8,7 @@ // 2: Players collected enough souls and gave the souls to the waterfall //----------------------------------------------------------------------------- -051-1.gat,142,39,0|script|Bones|367 +051-1,142,39,0|script|Bones|367 { mes "You find a ruined paper next to these bones."; mes "It says..."; @@ -22,7 +22,7 @@ } -051-1.gat,170,24,0|script|Cursed Waterfall|400 +051-1,170,24,0|script|Cursed Waterfall|400 { set $@illia_num_sealed_souls, 7; set @step, 3; @@ -40,7 +40,7 @@ OnTimer1000: end; OnTimer4750: - mapannounce "051-1.gat", "You hear a loud scream coming from the wind... Something terrifying raised out there.", 0; + mapannounce "051-1", "You hear a loud scream coming from the wind... Something terrifying raised out there.", 0; end; OnTimer6500: @@ -79,9 +79,9 @@ L_GiveTask: set $@SoulEaters3_count, 0; set $@SoulEaters4_count, 0; // Spawn 7 additional soul snakes in the north building, as a bait. - areamonster "051-1.gat", 125, 14, 143, 18, "", 1096, 7, "IlliaDMobs051-1::On1096"; + areamonster "051-1", 125, 14, 143, 18, "", 1096, 7, "IlliaDMobs051-1::On1096"; // Same with 5, in the island - areamonster "051-1.gat", 138, 34, 145, 41, "", 1096, 5, "IlliaDMobs051-1::On1096"; + areamonster "051-1", 138, 34, 145, 41, "", 1096, 5, "IlliaDMobs051-1::On1096"; // Start timed messages initnpctimer; goto L_Close; @@ -110,12 +110,12 @@ L_CheckSouls: set $@illia_max_time, $@illia_max_time + 540; // Clean all spawned monsters - killmonster "051-1.gat", "IlliaDMobs051-1::On1096"; - killmonster "051-1.gat", "#SoulEaters0::OnSoulEaterDeath"; - killmonster "051-1.gat", "#SoulEaters1::OnSoulEaterDeath"; - killmonster "051-1.gat", "#SoulEaters2::OnSoulEaterDeath"; - killmonster "051-1.gat", "#SoulEaters3::OnSoulEaterDeath"; - killmonster "051-1.gat", "#SoulEaters4::OnSoulEaterDeath"; + killmonster "051-1", "IlliaDMobs051-1::On1096"; + killmonster "051-1", "#SoulEaters0::OnSoulEaterDeath"; + killmonster "051-1", "#SoulEaters1::OnSoulEaterDeath"; + killmonster "051-1", "#SoulEaters2::OnSoulEaterDeath"; + killmonster "051-1", "#SoulEaters3::OnSoulEaterDeath"; + killmonster "051-1", "#SoulEaters4::OnSoulEaterDeath"; mes "\"Goooood... Tasty souuuuuls...\""; @@ -133,7 +133,7 @@ L_NotEnough: goto L_Close; L_Warp: - warp "052-1.gat", 23, 52; + warp "052-1", 23, 52; // Count the player who reached the island. set $@illia_players_in_luvia_territory, $@illia_players_in_luvia_territory + 1; goto L_Close; diff --git a/world/map/npc/051-1/desertmonsters.txt b/world/map/npc/051-1/desertmonsters.txt index 9ab901c9..310566ce 100644 --- a/world/map/npc/051-1/desertmonsters.txt +++ b/world/map/npc/051-1/desertmonsters.txt @@ -1,7 +1,7 @@ -051-1.gat,134,36,67,49|monster|SoulSnake|1096,12,100000ms,30000ms,IlliaDMobs051-1::On1096 +051-1,134,36,67,49|monster|SoulSnake|1096,12,100000ms,30000ms,IlliaDMobs051-1::On1096 // The soul snakes release a Sealed Soul at random, once the soul collecting is started -051-1.gat,0,0,0|script|IlliaDMobs051-1|-1 +051-1,0,0,0|script|IlliaDMobs051-1|-1 { end; @@ -17,7 +17,7 @@ On1096: // Soul eater spawns. They will eat a Sealed Soul when killed, and when the soul collecting is started. // Spawn in the island -051-1.gat,142,38,0|script|#SoulEaters0Trigger|32767,3,3 +051-1,142,38,0|script|#SoulEaters0Trigger|32767,3,3 { if ($@illia_progress != 3 || $@illia_level_3_progress != 1) end; @@ -27,13 +27,13 @@ On1096: end; } -051-1.gat,142,38,0|script|#SoulEaters0|32767 +051-1,142,38,0|script|#SoulEaters0|32767 { end; OnSpawn: set $@SoulEaters0_count, 5; - areamonster "051-1.gat", 139, 34, 145, 41, "", 1097, $@SoulEaters0_count, "#SoulEaters0::OnSoulEaterDeath"; + areamonster "051-1", 139, 34, 145, 41, "", 1097, $@SoulEaters0_count, "#SoulEaters0::OnSoulEaterDeath"; end; OnSoulEaterDeath: @@ -48,7 +48,7 @@ OnSoulEaterDeath: } // Spawn inside the north building -051-1.gat,134,16,0|script|#SoulEaters1Trigger|32767,9,2 +051-1,134,16,0|script|#SoulEaters1Trigger|32767,9,2 { if ($@illia_progress != 3 || $@illia_level_3_progress != 1) end; @@ -58,13 +58,13 @@ OnSoulEaterDeath: end; } -051-1.gat,134,16,0|script|#SoulEaters1|32767 +051-1,134,16,0|script|#SoulEaters1|32767 { end; OnSpawn: set $@SoulEaters1_count, 7; - areamonster "051-1.gat", 125, 14, 143, 18, "", 1097, $@SoulEaters1_count, "#SoulEaters1::OnSoulEaterDeath"; + areamonster "051-1", 125, 14, 143, 18, "", 1097, $@SoulEaters1_count, "#SoulEaters1::OnSoulEaterDeath"; end; OnSoulEaterDeath: @@ -79,7 +79,7 @@ OnSoulEaterDeath: } // Spawn in the south grass area -051-1.gat,137,55,0|script|#SoulEaters2Trigger|32767,5,4 +051-1,137,55,0|script|#SoulEaters2Trigger|32767,5,4 { if ($@illia_progress != 3 || $@illia_level_3_progress != 1) end; @@ -89,13 +89,13 @@ OnSoulEaterDeath: end; } -051-1.gat,137,55,0|script|#SoulEaters2|32767 +051-1,137,55,0|script|#SoulEaters2|32767 { end; OnSpawn: set $@SoulEaters2_count, 4; - areamonster "051-1.gat", 134, 54, 139, 58, "", 1097, $@SoulEaters2_count, "#SoulEaters2::OnSoulEaterDeath"; + areamonster "051-1", 134, 54, 139, 58, "", 1097, $@SoulEaters2_count, "#SoulEaters2::OnSoulEaterDeath"; end; OnSoulEaterDeath: @@ -110,7 +110,7 @@ OnSoulEaterDeath: } // Spawn near the eastern cliff -051-1.gat,155,35,0|script|#SoulEaters3Trigger|32767,4,7 +051-1,155,35,0|script|#SoulEaters3Trigger|32767,4,7 { if ($@illia_progress != 3 || $@illia_level_3_progress != 1) end; @@ -120,13 +120,13 @@ OnSoulEaterDeath: end; } -051-1.gat,155,35,0|script|#SoulEaters3|32767 +051-1,155,35,0|script|#SoulEaters3|32767 { end; OnSpawn: set $@SoulEaters3_count, 4; - areamonster "051-1.gat", 151, 29, 160, 45, "", 1097, $@SoulEaters3_count, "#SoulEaters3::OnSoulEaterDeath"; + areamonster "051-1", 151, 29, 160, 45, "", 1097, $@SoulEaters3_count, "#SoulEaters3::OnSoulEaterDeath"; end; OnSoulEaterDeath: @@ -141,7 +141,7 @@ OnSoulEaterDeath: } // Spawn near the western cliff -051-1.gat,120,38,0|script|#SoulEaters4Trigger|32767,6,9 +051-1,120,38,0|script|#SoulEaters4Trigger|32767,6,9 { if ($@illia_progress != 3 || $@illia_level_3_progress != 1) end; @@ -151,13 +151,13 @@ OnSoulEaterDeath: end; } -051-1.gat,120,38,0|script|#SoulEaters4|32767 +051-1,120,38,0|script|#SoulEaters4|32767 { end; OnSpawn: set $@SoulEaters4_count, 4; - areamonster "051-1.gat", 116, 29, 127, 50, "", 1097, $@SoulEaters4_count, "#SoulEaters4::OnSoulEaterDeath"; + areamonster "051-1", 116, 29, 127, 50, "", 1097, $@SoulEaters4_count, "#SoulEaters4::OnSoulEaterDeath"; end; OnSoulEaterDeath: diff --git a/world/map/npc/051-1/forest.txt b/world/map/npc/051-1/forest.txt index a594d231..b0ff78af 100644 --- a/world/map/npc/051-1/forest.txt +++ b/world/map/npc/051-1/forest.txt @@ -9,11 +9,11 @@ // 3: Players unlocked the door //----------------------------------------------------------------------------- -051-1.gat,64,46,0|script|Strange Stone|400 +051-1,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; + if (isin("051-1", 65,45, 67,48) == 0) end; if (strcharinfo(0) != $@ILLIA_HERO$) goto L_HandleHelper; if ($@illia_level_1_progress == 0) goto L_GiveTask; if ($@illia_level_1_progress == 1) goto L_TaskNotComplete; @@ -61,7 +61,7 @@ L_TaskComplete: } // Warp from the forest, to the cave -051-1.gat,66,44,0|script|#ToCave|32767,1,1 +051-1,66,44,0|script|#ToCave|32767,1,1 { set @step, 1; if ($@illia_progress < @step) goto L_ShouldNotBeHere; @@ -83,7 +83,7 @@ L_SeeStone: end; L_Warp: - warp "051-3.gat", 24, 60; + warp "051-3", 24, 60; end; } diff --git a/world/map/npc/051-1/forestmonsters.txt b/world/map/npc/051-1/forestmonsters.txt index 89ed60a9..4942cf2b 100644 --- a/world/map/npc/051-1/forestmonsters.txt +++ b/world/map/npc/051-1/forestmonsters.txt @@ -1,6 +1,6 @@ -051-1.gat,52,32,10,8|monster|GreenSlime|1005,20,100000ms,30000ms,IlliaFMobs051-1::On1005 +051-1,52,32,10,8|monster|GreenSlime|1005,20,100000ms,30000ms,IlliaFMobs051-1::On1005 -051-1.gat,0,0,0|script|IlliaFMobs051-1|-1 +051-1,0,0,0|script|IlliaFMobs051-1|-1 { end; diff --git a/world/map/npc/051-1/janitor.txt b/world/map/npc/051-1/janitor.txt index c1e23f76..f0b8b771 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,1,1,0|script|#IlliaJanitor1|127 { end; @@ -10,18 +10,18 @@ OnCommandClean: } // Desert janitor -051-1.gat,1,1,0|script|#IlliaJanitor3|127 +051-1,1,1,0|script|#IlliaJanitor3|127 { end; OnCommandClean: - killmonster "051-1.gat", "IlliaDMobs051-1::On1096"; + killmonster "051-1", "IlliaDMobs051-1::On1096"; // Kill the soul eaters that were spawned - killmonster "051-1.gat", "#SoulEaters0::OnSoulEaterDeath"; - killmonster "051-1.gat", "#SoulEaters1::OnSoulEaterDeath"; - killmonster "051-1.gat", "#SoulEaters2::OnSoulEaterDeath"; - killmonster "051-1.gat", "#SoulEaters3::OnSoulEaterDeath"; - killmonster "051-1.gat", "#SoulEaters4::OnSoulEaterDeath"; + killmonster "051-1", "#SoulEaters0::OnSoulEaterDeath"; + killmonster "051-1", "#SoulEaters1::OnSoulEaterDeath"; + killmonster "051-1", "#SoulEaters2::OnSoulEaterDeath"; + killmonster "051-1", "#SoulEaters3::OnSoulEaterDeath"; + killmonster "051-1", "#SoulEaters4::OnSoulEaterDeath"; end; } diff --git a/world/map/npc/051-1/mapflags.txt b/world/map/npc/051-1/mapflags.txt index 99864a1d..a75ad03b 100644 --- a/world/map/npc/051-1/mapflags.txt +++ b/world/map/npc/051-1/mapflags.txt @@ -1,2 +1,2 @@ -051-1.gat|mapflag|nosave|007-1,86,76 -051-1.gat|mapflag|resave|007-1,86,76 +051-1|mapflag|nosave|007-1,86,76 +051-1|mapflag|resave|007-1,86,76 diff --git a/world/map/npc/051-3/ambush.txt b/world/map/npc/051-3/ambush.txt index 72ec3922..63b9775f 100644 --- a/world/map/npc/051-3/ambush.txt +++ b/world/map/npc/051-3/ambush.txt @@ -10,13 +10,13 @@ // 4: Key of the door found, to leave the cave //----------------------------------------------------------------------------- -051-3.gat,40,52,0|script|#WayBlockedTrigger|32767,2,2 +051-3,40,52,0|script|#WayBlockedTrigger|32767,2,2 { message strcharinfo(0), "There is no way I can pass here. Let's find another way."; end; } -051-3.gat,31,70,0|script|#AmbushReadyTrigger|32767,2,2 +051-3,31,70,0|script|#AmbushReadyTrigger|32767,2,2 { set @step, 2; if ($@illia_progress < @step) goto L_ShouldNotBeHere; @@ -34,7 +34,7 @@ L_ShouldNotBeHere: } -051-3.gat,31,93,0|script|#BanditAmbushTrigger|32767,3,3 +051-3,31,93,0|script|#BanditAmbushTrigger|32767,3,3 { set @step, 2; if ($@illia_progress < @step) goto L_ShouldNotBeHere; @@ -52,7 +52,7 @@ L_ShouldNotBeHere: end; } -051-3.gat,1,1,0|script|#BndtTl|127 +051-3,1,1,0|script|#BndtTl|127 { end; @@ -68,12 +68,12 @@ OnTimer1000: end; OnTimer9000: - areawarp "051-3.gat", 22, 45, 42, 97, "051-3.gat", 101, 13; + areawarp "051-3", 22, 45, 42, 97, "051-3", 101, 13; end; OnTimer11000: - areatimer "051-3.gat", 22, 12, 102, 97, 500, "#BndtTl::OnOuch"; - areatimer "051-3.gat", 22, 12, 102, 97, 3000, "#BndtTl::OnA"; + areatimer "051-3", 22, 12, 102, 97, 500, "#BndtTl::OnOuch"; + areatimer "051-3", 22, 12, 102, 97, 3000, "#BndtTl::OnA"; stopnpctimer; setnpctimer 0; end; @@ -102,7 +102,7 @@ L_CaptureHero: // put the health at 40%. percentheal 100, 0; percentheal -60, 0; - warp "051-3.gat", 69, 109; + warp "051-3", 69, 109; message strcharinfo(0), "Meh... Where am I?"; end; @@ -113,7 +113,7 @@ L_CaptureHelper1: // put the health at 40%. percentheal 100, 0; percentheal -60, 0; - warp "051-3.gat", 64, 102; + warp "051-3", 64, 102; message strcharinfo(0), "Meh... Where am I?"; end; @@ -124,7 +124,7 @@ L_CaptureHelper2: // put the health at 40%. percentheal 100, 0; percentheal -60, 0; - warp "051-3.gat", 62, 102; + warp "051-3", 62, 102; message strcharinfo(0), "Meh... Where am I?"; end; @@ -135,13 +135,13 @@ L_CaptureHelper3: // put the health at 40%. percentheal 100, 0; percentheal -60, 0; - warp "051-3.gat", 58, 102; + warp "051-3", 58, 102; message strcharinfo(0), "Meh... Where am I?"; end; } -051-3.gat,29,94,0|script|Sneaky Bandit|127 +051-3,29,94,0|script|Sneaky Bandit|127 { end; @@ -161,7 +161,7 @@ OnTimer3600: } -051-3.gat,33,95,0|script|Another Sneaky Bandit|127 +051-3,33,95,0|script|Another Sneaky Bandit|127 { end; diff --git a/world/map/npc/051-3/jailslimes.txt b/world/map/npc/051-3/jailslimes.txt index 48a70de9..d153097a 100644 --- a/world/map/npc/051-3/jailslimes.txt +++ b/world/map/npc/051-3/jailslimes.txt @@ -1,10 +1,10 @@ // Separate spawns for the copper slimes in the 4 jails -051-3.gat,57,104,1,1|monster|CopperSlime|1098,1,60000ms,30000ms,IlliaCMobs051-3::On1098 -051-3.gat,62,104,1,1|monster|CopperSlime|1098,1,60000ms,30000ms,IlliaCMobs051-3::On1098 -051-3.gat,63,104,1,1|monster|CopperSlime|1098,1,60000ms,30000ms,IlliaCMobs051-3::On1098 -051-3.gat,70,111,1,1|monster|CopperSlime|1098,1,60000ms,30000ms,IlliaCMobs051-3::On1098 +051-3,57,104,1,1|monster|CopperSlime|1098,1,60000ms,30000ms,IlliaCMobs051-3::On1098 +051-3,62,104,1,1|monster|CopperSlime|1098,1,60000ms,30000ms,IlliaCMobs051-3::On1098 +051-3,63,104,1,1|monster|CopperSlime|1098,1,60000ms,30000ms,IlliaCMobs051-3::On1098 +051-3,70,111,1,1|monster|CopperSlime|1098,1,60000ms,30000ms,IlliaCMobs051-3::On1098 -051-3.gat,0,0,0|script|IlliaCMobs051-3|-1 +051-3,0,0,0|script|IlliaCMobs051-3|-1 { end; diff --git a/world/map/npc/051-3/janitor.txt b/world/map/npc/051-3/janitor.txt index c33d791b..905fe4dd 100644 --- a/world/map/npc/051-3/janitor.txt +++ b/world/map/npc/051-3/janitor.txt @@ -1,11 +1,11 @@ // Bandit cave janitor -051-3.gat,1,1,0|script|#IlliaJanitor2|127 +051-3,1,1,0|script|#IlliaJanitor2|127 { end; OnCommandClean: // Kill all remaining bandits spawned during the "reinforcements" event - killmonster "051-1.gat", "Door::OnB"; + killmonster "051-1", "Door::OnB"; end; } diff --git a/world/map/npc/051-3/locks.txt b/world/map/npc/051-3/locks.txt index f0fcb9d7..4fdde75d 100644 --- a/world/map/npc/051-3/locks.txt +++ b/world/map/npc/051-3/locks.txt @@ -1,6 +1,6 @@ -051-3.gat,69,107,0|script|Jail Lock 1|400 +051-3,69,107,0|script|Jail Lock 1|400 { - if (isin("051-3.gat", 69, 108, 73, 111)) goto L_Do_Lock_Picking; + if (isin("051-3", 69, 108, 73, 111)) goto L_Do_Lock_Picking; end; L_Do_Lock_Picking: @@ -11,15 +11,15 @@ L_Do_Lock_Picking: L_OpenDoor: set @lock_picking_success, 0; - warp "051-3.gat", 69, 104; + warp "051-3", 69, 104; message strcharinfo(0), "Ok, let's get out of here now."; set $@illia_level_2_progress, 2; close; } -051-3.gat,64,100,0|script|Jail Lock 2|400 +051-3,64,100,0|script|Jail Lock 2|400 { - if (isin("051-3.gat", 64, 101, 66, 104)) goto L_Do_Lock_Picking; + if (isin("051-3", 64, 101, 66, 104)) goto L_Do_Lock_Picking; end; L_Do_Lock_Picking: @@ -30,13 +30,13 @@ L_Do_Lock_Picking: L_OpenDoor: set @lock_picking_success, 0; - warp "051-3.gat", 64, 97; + warp "051-3", 64, 97; close; } -051-3.gat,62,100,0|script|Jail Lock 3|400 +051-3,62,100,0|script|Jail Lock 3|400 { - if (isin("051-3.gat", 61, 101, 62, 104)) goto L_Do_Lock_Picking; + if (isin("051-3", 61, 101, 62, 104)) goto L_Do_Lock_Picking; end; L_Do_Lock_Picking: @@ -47,13 +47,13 @@ L_Do_Lock_Picking: L_OpenDoor: set @lock_picking_success, 0; - warp "051-3.gat", 62, 97; + warp "051-3", 62, 97; close; } -051-3.gat,58,100,0|script|Jail Lock 4|400 +051-3,58,100,0|script|Jail Lock 4|400 { - if (isin("051-3.gat", 57, 101, 58, 104)) goto L_Do_Lock_Picking; + if (isin("051-3", 57, 101, 58, 104)) goto L_Do_Lock_Picking; end; L_Do_Lock_Picking: @@ -64,6 +64,6 @@ L_Do_Lock_Picking: L_OpenDoor: set @lock_picking_success, 0; - warp "051-3.gat", 58, 97; + warp "051-3", 58, 97; close; } diff --git a/world/map/npc/051-3/mapflags.txt b/world/map/npc/051-3/mapflags.txt index d2cdb656..19836e59 100644 --- a/world/map/npc/051-3/mapflags.txt +++ b/world/map/npc/051-3/mapflags.txt @@ -1,2 +1,2 @@ -051-3.gat|mapflag|nosave|007-1,86,76 -051-3.gat|mapflag|resave|007-1,86,76 +051-3|mapflag|nosave|007-1,86,76 +051-3|mapflag|resave|007-1,86,76 diff --git a/world/map/npc/051-3/reinforcements.txt b/world/map/npc/051-3/reinforcements.txt index 66db7451..e52242cd 100644 --- a/world/map/npc/051-3/reinforcements.txt +++ b/world/map/npc/051-3/reinforcements.txt @@ -1,4 +1,4 @@ -051-3.gat,47,30,0|script|#BndtRnfrcmtsTrigger|32767,2,3 +051-3,47,30,0|script|#BndtRnfrcmtsTrigger|32767,2,3 { set @step, 2; if ($@illia_progress < @step) goto L_ShouldNotBeHere; @@ -14,7 +14,7 @@ L_ShouldNotBeHere: end; } -051-3.gat,37,24,0|script|Door|400 +051-3,37,24,0|script|Door|400 { set @step, 2; if ($@illia_progress < @step) goto L_ShouldNotBeHere; @@ -38,18 +38,18 @@ L_KeyNotFound: L_Warp: mes "You place the key in the door and open the lock."; - warp "051-1.gat", 118, 55; + warp "051-1", 118, 55; close; OnRnfrcmts: set $@illia_level_2_progress, 3; // Spawn 20 bandits - areamonster "051-3.gat", 29, 25, 48, 39, "", 1064, 18, "Door::OnB"; + areamonster "051-3", 29, 25, 48, 39, "", 1064, 18, "Door::OnB"; // Spawn 4 bandit lords - areamonster "051-3.gat", 29, 25, 48, 39, "", 1065, 3, "Door::OnB"; + areamonster "051-3", 29, 25, 48, 39, "", 1065, 3, "Door::OnB"; initnpctimer; - mapannounce "051-3.gat", "Bandit Lords:* Do not let them escape!!" , 0; - areatimer "051-3.gat", 25, 20, 80, 85, 10, "Door::OnDRnfrcmts"; + mapannounce "051-3", "Bandit Lords:* Do not let them escape!!" , 0; + areatimer "051-3", 25, 20, 80, 85, 10, "Door::OnDRnfrcmts"; end; OnB: @@ -63,7 +63,7 @@ OnTimer2000: setnpctimer 0; if ($@illia_level_2_progress != 3 || $@illia_progress != 2) end; - if (mobcount("051-3.gat", "Door::OnB") < 0) + if (mobcount("051-3", "Door::OnB") < 0) goto L_OpenDoor; end; @@ -72,7 +72,7 @@ L_OpenDoor: set $@illia_progress, 3; callfunc "UpdateIlliaProgress"; set $@illia_max_time, $@illia_max_time + 300; - areatimer "051-3.gat", 25, 20, 80, 85, 10, "Door::OnKeyFound"; + areatimer "051-3", 25, 20, 80, 85, 10, "Door::OnKeyFound"; stopnpctimer; setnpctimer 0; end; diff --git a/world/map/npc/052-1/channelling.txt b/world/map/npc/052-1/channelling.txt index d9c7b826..b5c36dae 100644 --- a/world/map/npc/052-1/channelling.txt +++ b/world/map/npc/052-1/channelling.txt @@ -8,7 +8,7 @@ // 2: Channelling completed //----------------------------------------------------------------------------- -052-1.gat,25,44,0|script|#EnchantDoorTrigger|32767,3,4 +052-1,25,44,0|script|#EnchantDoorTrigger|32767,3,4 { set @step, 4; if ($@illia_progress < @step) goto L_ShouldNotBeHere; @@ -26,13 +26,13 @@ L_ShouldNotBeHere: } -052-1.gat,57,29,0|script|#Enchanted Door|369,1,1 +052-1,57,29,0|script|#Enchanted Door|369,1,1 { if ($@illia_level_4_progress != 2) goto L_PushBack; end; L_PushBack: - warp "052-1.gat", 57, 34; + warp "052-1", 57, 34; percentheal -20, 0; message strcharinfo(0), "You are pushed back violently. There is probably some way to break this barrier."; mes "You are pushed back violently."; @@ -40,7 +40,7 @@ L_PushBack: close; OnCommandDS: - areamonster "052-1.gat", 56, 30, 60, 31, "", 1101, 2 + rand(3), "#Enchanted Door::OnSpawn"; + areamonster "052-1", 56, 30, 60, 31, "", 1101, 2 + rand(3), "#Enchanted Door::OnSpawn"; misceffect FX_EVIL_SUMMON; end; @@ -49,13 +49,13 @@ OnSpawn: } -052-1.gat,57,29,0|script|#Enchanted Door2|400,1,1 +052-1,57,29,0|script|#Enchanted Door2|400,1,1 { if ($@illia_level_4_progress == 2) goto L_Warp; end; L_Warp: - warp "052-2.gat", 33, 40; + warp "052-2", 33, 40; end; OnCommandDestroy: @@ -64,7 +64,7 @@ OnCommandDestroy: } -052-1.gat,51,38,0|script|Engravings|400 +052-1,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; @@ -94,7 +94,7 @@ L_SuggestChannelling: function|script|StartChannelling { - if (isat("052-1.gat",53,38) == 0) + if (isat("052-1",53,38) == 0) end; if ($@illia_level_4_progress > 0) end; @@ -130,12 +130,12 @@ function|script|StartChannelling } -052-1.gat,53,38,0|script|#Power Circle|368 +052-1,53,38,0|script|#Power Circle|368 { set @step, 4; if ($@illia_progress < @step) goto L_ShouldNotBeHere; - if (isat("052-1.gat",53,38) == 0) + if (isat("052-1",53,38) == 0) goto L_Hint; end; @@ -185,19 +185,19 @@ S_ItemSpawn: set $@illia_item_spawn_x, $@illia_small_lazurites[$@illia_item_spawn_i*2]; set $@illia_item_spawn_y, $@illia_small_lazurites[($@illia_item_spawn_i*2)+1]; if (rand(10) > 0) - makeitem 873, rand(4,7), "052-1.gat", $@illia_item_spawn_x, $@illia_item_spawn_y; + makeitem 873, rand(4,7), "052-1", $@illia_item_spawn_x, $@illia_item_spawn_y; set $@illia_item_spawn_i, rand(getarraysize($@illia_regular_lazurites)/2); set $@illia_item_spawn_x, $@illia_regular_lazurites[$@illia_item_spawn_i*2]; set $@illia_item_spawn_y, $@illia_regular_lazurites[($@illia_item_spawn_i*2)+1]; if (rand(8) > 0) - makeitem 874, rand(3,4), "052-1.gat", $@illia_item_spawn_x, $@illia_item_spawn_y; + makeitem 874, rand(3,4), "052-1", $@illia_item_spawn_x, $@illia_item_spawn_y; set $@illia_item_spawn_i, rand(getarraysize($@illia_large_lazurites)/2); set $@illia_item_spawn_x, $@illia_large_lazurites[$@illia_item_spawn_i*2]; set $@illia_item_spawn_y, $@illia_large_lazurites[($@illia_item_spawn_i*2)+1]; if (rand(4) > 0) - makeitem 875, rand(1,2), "052-1.gat", $@illia_item_spawn_x, $@illia_item_spawn_y; + makeitem 875, rand(1,2), "052-1", $@illia_item_spawn_x, $@illia_item_spawn_y; set $@illia_item_spawn_i, 0; set $@illia_item_spawn_x, 0; @@ -212,9 +212,9 @@ L_Return: S_CheckChannelling: // Remove stones inside the circle set $@illia_magic_power, $@illia_magic_power + - getareadropitem("052-1.gat", 52, 37, 54, 39, 873, 1)*$@illia_lazurites_power[0] + - getareadropitem("052-1.gat", 52, 37, 54, 39, 874, 1)*$@illia_lazurites_power[1] + - getareadropitem("052-1.gat", 52, 37, 54, 39, 875, 1)*$@illia_lazurites_power[2]; + getareadropitem("052-1", 52, 37, 54, 39, 873, 1)*$@illia_lazurites_power[0] + + getareadropitem("052-1", 52, 37, 54, 39, 874, 1)*$@illia_lazurites_power[1] + + getareadropitem("052-1", 52, 37, 54, 39, 875, 1)*$@illia_lazurites_power[2]; // magic power fades over time set $@illia_magic_power, $@illia_magic_power - $@illia_magic_power_loss; @@ -235,7 +235,7 @@ S_CheckChannelling: if (isdead()) goto L_ChannellingDead; - if (isat("052-1.gat",53,38) == 0) + if (isat("052-1",53,38) == 0) goto L_ChannellingMoved; // check the magic power if ($@illia_magic_power <= 0) @@ -257,7 +257,7 @@ S_CheckChannelling: set $@illia_channelling_status_msg$, $@illia_char_channelling$ + ": Damn! It faded a little."; if ($@illia_channelling_status_msg$ != "") - areatimer "052-1.gat", 1, 1, 100, 80, 0, "#Power Circle::OnMPSC"; + areatimer "052-1", 1, 1, 100, 80, 0, "#Power Circle::OnMPSC"; return; @@ -296,7 +296,7 @@ L_ChannellingMoved: // kill the player as part of the process: the magic process drained his life. // But only if he is still in the island (otherwise, he probably got warped // and does not need being killed) - if (isin("052-1.gat",1,1,100,80) == 0) + if (isin("052-1",1,1,100,80) == 0) goto L_ChannellingFail; percentheal -100, 0; misceffect FX_MAGIC_DARK_EXPLOSION, strcharinfo(0); diff --git a/world/map/npc/052-1/janitor.txt b/world/map/npc/052-1/janitor.txt index d0067d6e..dbbd54dc 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,1,1,0|script|#IlliaJanitor4|127 { end; @@ -10,9 +10,9 @@ OnCommandClean: killmonster "052-1", "All"; // Delete the magic stones that are still laying around. // FIXME Syntax error happens if not setting a variable... - set $@dummy_var, getareadropitem("052-1.gat", 1, 1, 98, 78, 873, 1) + - getareadropitem("052-1.gat", 1, 1, 98, 78, 874, 1) + - getareadropitem("052-1.gat", 1, 1, 98, 78, 875, 1); + set $@dummy_var, getareadropitem("052-1", 1, 1, 98, 78, 873, 1) + + getareadropitem("052-1", 1, 1, 98, 78, 874, 1) + + getareadropitem("052-1", 1, 1, 98, 78, 875, 1); set $@dummy_var, 0; end; diff --git a/world/map/npc/052-1/mapflags.txt b/world/map/npc/052-1/mapflags.txt index da874ac2..1813a7cd 100644 --- a/world/map/npc/052-1/mapflags.txt +++ b/world/map/npc/052-1/mapflags.txt @@ -1,2 +1,2 @@ -052-1.gat|mapflag|nosave|007-1,86,76 -052-1.gat|mapflag|resave|007-1,86,76 +052-1|mapflag|nosave|007-1,86,76 +052-1|mapflag|resave|007-1,86,76 diff --git a/world/map/npc/052-2/chest.txt b/world/map/npc/052-2/chest.txt index 1297e5c0..7ba0d2df 100644 --- a/world/map/npc/052-2/chest.txt +++ b/world/map/npc/052-2/chest.txt @@ -12,7 +12,7 @@ // 3: player choosed to leave the room //----------------------------------------------------------------------------- -052-2.gat,136,73,0|script|Chest#illia|111 +052-2,136,73,0|script|Chest#illia|111 { set @step, 8; if ($@illia_progress < @step) goto L_ShouldNotBeHere; @@ -117,7 +117,7 @@ L_AskLeaving: next; // Force the hero to leave last, as this event triggers the end of the quest // as well as some dialogs from Valia, when the hero returns. - if (strcharinfo(0) == $@ILLIA_HERO$ && getareausers("052-2.gat", 19, 8, 137, 88) > 1) + if (strcharinfo(0) == $@ILLIA_HERO$ && getareausers("052-2", 19, 8, 137, 88) > 1) goto L_WaitHelpersLeave; goto L_PrepareLeaving; @@ -160,7 +160,7 @@ OnFx: end; OnRing: - warp "007-1.gat", 85 + rand(0,2), 75 + rand(0,2); + warp "007-1", 85 + rand(0,2), 75 + rand(0,2); if (strcharinfo(0) == $@ILLIA_HERO$) goto L_ScheduleEnd; end; diff --git a/world/map/npc/052-2/janitor.txt b/world/map/npc/052-2/janitor.txt index d78c4bba..7435f005 100644 --- a/world/map/npc/052-2/janitor.txt +++ b/world/map/npc/052-2/janitor.txt @@ -1,36 +1,36 @@ // Lobby janitor -052-2.gat,1,1,0|script|#IlliaJanitor5|127 +052-2,1,1,0|script|#IlliaJanitor5|127 { end; OnCommandClean: // For security, kill all. - killmonster "052-2.gat", "All"; + killmonster "052-2", "All"; npcwarp 1, 1, "Luvia?"; end; } // Storage janitor -052-2.gat,1,1,0|script|#IlliaJanitor6|127 +052-2,1,1,0|script|#IlliaJanitor6|127 { end; OnCommandClean: - killmonster "052-2.gat", "#ItemsInvoker::OnDeath"; + killmonster "052-2", "#ItemsInvoker::OnDeath"; npcwarp 1, 1, "#ItemsInvoker"; end; } // Final boss janitor -052-2.gat,1,1,0|script|#IlliaJanitor7|127 +052-2,1,1,0|script|#IlliaJanitor7|127 { end; OnCommandClean: - killmonster "052-2.gat", "#LuviaDaemon::OnDeath"; - killmonster "052-2.gat", "#LuviaDaemon::OnWGD"; + killmonster "052-2", "#LuviaDaemon::OnDeath"; + killmonster "052-2", "#LuviaDaemon::OnWGD"; npcwarp 83, 28, "#LuviaDaemon"; npcwarp 88, 15, "Luvia"; end; diff --git a/world/map/npc/052-2/lobby.txt b/world/map/npc/052-2/lobby.txt index 71dde1f7..50eb472f 100644 --- a/world/map/npc/052-2/lobby.txt +++ b/world/map/npc/052-2/lobby.txt @@ -14,7 +14,7 @@ // 8: Witch guards defeated. Door is open. //----------------------------------------------------------------------------- -052-2.gat,40,19,0|script|#InnDoorTrigger|32767,2,2 +052-2,40,19,0|script|#InnDoorTrigger|32767,2,2 { set @step, 5; if ($@illia_progress < @step) goto L_ShouldNotBeHere; @@ -23,7 +23,7 @@ end; L_Warp: - warp "052-2.gat", 23, 71; + warp "052-2", 23, 71; message strcharinfo(0), "This place is full of dust... *coughs*"; end; @@ -33,7 +33,7 @@ L_ShouldNotBeHere: } -052-2.gat,33,40,0|script|#EntranceTrigger|32767,4,2 +052-2,33,40,0|script|#EntranceTrigger|32767,4,2 { set @step, 5; if ($@illia_progress < @step) goto L_ShouldNotBeHere; @@ -50,7 +50,7 @@ L_ShouldNotBeHere: end; } -052-2.gat,1,1,0|script|#LuviaShadow|127 +052-2,1,1,0|script|#LuviaShadow|127 { end; @@ -103,7 +103,7 @@ OnNN: } -052-2.gat,1,1,0|script|#MysteriousVoice|127 +052-2,1,1,0|script|#MysteriousVoice|127 { end; @@ -149,7 +149,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,1,1,0|script|?|127 { end; @@ -159,10 +159,10 @@ OnCommandTalk: } -052-2.gat,1,1,0|script|Luvia?|371,2,2 +052-2,1,1,0|script|Luvia?|371,2,2 { if ($@illia_level_5_progress != 3) end; - if (isin("052-2.gat", 37,36, 41,39)) goto L_HandleTalk; + if (isin("052-2", 37,36, 41,39)) goto L_HandleTalk; // Notify too far mes "You see a strange and frightening, yet beautiful woman."; if (strcharinfo(0) == $@ILLIA_HERO$) @@ -235,7 +235,7 @@ OnTimer24500: npctalk "Demonotis!"; misceffect FX_EVIL_SUMMON; callsub S_GetHeroRect; - areamonster "052-2.gat", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 20 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::OnDSDeath"; + areamonster "052-2", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 20 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::OnDSDeath"; callsub S_ClearHeroRect; end; @@ -245,7 +245,7 @@ OnTimer44000: npctalk "Demonotis!"; misceffect FX_EVIL_SUMMON; callsub S_GetHeroRect; - areamonster "052-2.gat", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 28 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::OnDSDeath"; + areamonster "052-2", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 28 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::OnDSDeath"; callsub S_ClearHeroRect; end; @@ -255,7 +255,7 @@ OnTimer77000: npctalk "Demonotis!"; misceffect FX_EVIL_SUMMON; callsub S_GetHeroRect; - areamonster "052-2.gat", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 42 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::OnDSDeath"; + areamonster "052-2", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 42 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::OnDSDeath"; callsub S_ClearHeroRect; // That was the last spawn: reset the timer to start the CheckInvoke loop. set $@illia_level_5_progress, 5; @@ -288,7 +288,7 @@ OnTimer18500: misceffect FX_EVIL_SUMMON; misceffect FX_MAGIC_DARK_EXPLOSION; callsub S_GetHeroRect; - areamonster "052-2.gat", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1103, 8 + (16 - 480/(30+$Illia_Luvia_Harvest))/3, "Luvia?::OnWGDeath"; + areamonster "052-2", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1103, 8 + (16 - 480/(30+$Illia_Luvia_Harvest))/3, "Luvia?::OnWGDeath"; callsub S_ClearHeroRect; end; @@ -308,19 +308,19 @@ OnTimer2000: end; setnpctimer 0; // Mock players randomly (more or less once every 40 secs) and if still enough mobs running after them - if ($@illia_level_5_progress == 5 && rand(20) == 0 && (mobcount("052-2.gat", "Luvia?::OnDSDeath") > 20)) + if ($@illia_level_5_progress == 5 && rand(20) == 0 && (mobcount("052-2", "Luvia?::OnDSDeath") > 20)) npctalk "Ahaha! Run... Run!"; - if ($@illia_level_5_progress == 5 && (mobcount("052-2.gat", "Luvia?::OnDSDeath") < 0)) + if ($@illia_level_5_progress == 5 && (mobcount("052-2", "Luvia?::OnDSDeath") < 0)) goto L_AllWavesClear; - if ($@illia_level_5_progress == 7 && (mobcount("052-2.gat", "Luvia?::OnWGDeath") < 0)) + if ($@illia_level_5_progress == 7 && (mobcount("052-2", "Luvia?::OnWGDeath") < 0)) goto L_AllWavesClear; end; L_Clear: stopnpctimer; setnpctimer 0; - killmonster "052-2.gat", "Luvia?::OnDSDeath"; - killmonster "052-2.gat", "Luvia?::OnWGDeath"; + killmonster "052-2", "Luvia?::OnDSDeath"; + killmonster "052-2", "Luvia?::OnWGDeath"; end; L_AllWavesClear: @@ -337,13 +337,13 @@ L_ChaseLuvia: set $@illia_progress, 6; callfunc "UpdateIlliaProgress"; set $@illia_max_time, $@illia_max_time + 360; - areatimer "052-2.gat", 19, 18, 48, 43, 2000, "#LuviaShadow::OnNN"; + areatimer "052-2", 19, 18, 48, 43, 2000, "#LuviaShadow::OnNN"; end; S_GetHeroRect: if (!(attachrid($@ILLIA_HERO_ID))) goto L_Clear; - if(!(isin("052-2.gat", 20, 21, 47, 43))) + if(!(isin("052-2", 20, 21, 47, 43))) goto L_Clear; set $@illia_lobby_x, getx(); diff --git a/world/map/npc/052-2/mapflags.txt b/world/map/npc/052-2/mapflags.txt index 2cb3e637..efccaddd 100644 --- a/world/map/npc/052-2/mapflags.txt +++ b/world/map/npc/052-2/mapflags.txt @@ -1,2 +1,2 @@ -052-2.gat|mapflag|nosave|007-1,86,76 -052-2.gat|mapflag|resave|007-1,86,76 +052-2|mapflag|nosave|007-1,86,76 +052-2|mapflag|resave|007-1,86,76 diff --git a/world/map/npc/052-2/partyroom.txt b/world/map/npc/052-2/partyroom.txt index ba636c9d..ce9c9f7d 100644 --- a/world/map/npc/052-2/partyroom.txt +++ b/world/map/npc/052-2/partyroom.txt @@ -9,7 +9,7 @@ // 3: Luvia is defeated //----------------------------------------------------------------------------- -052-2.gat,88,19,0|script|#TriggerDialog|32767,3,2 +052-2,88,19,0|script|#TriggerDialog|32767,3,2 { set @step, 7; if ($@illia_progress < @step) goto L_ShouldNotBeHere; @@ -29,7 +29,7 @@ L_ShouldNotBeHere: // A trigger whose only purpose is to place Luvia npcs back in place. // (even though the Janitor 7 will have done this job) -052-2.gat,77,48,0|script|#TriggerPlaceLuvia|32767,1,1 +052-2,77,48,0|script|#TriggerPlaceLuvia|32767,1,1 { if (strcharinfo(0) != $@ILLIA_HERO$) end; if ($@illia_progress == 7 && $@illia_level_7_progress == 0) goto L_PlaceLuvia; @@ -42,7 +42,7 @@ L_PlaceLuvia: } -052-2.gat,88,15,0|script|Luvia|371 +052-2,88,15,0|script|Luvia|371 { set @step, 7; if ($@illia_progress < @step) goto L_ShouldNotBeHere; @@ -83,7 +83,7 @@ OnTimer15000: } -052-2.gat,88,15,0|script|#LuviaDaemon|127 +052-2,88,15,0|script|#LuviaDaemon|127 { end; @@ -99,7 +99,7 @@ OnTimer2000: // Kill any mob existing on the map // That's to terminate any attempt at players mass-summoning mobs // and hide in a corner of the map. - killmonster "052-2.gat", "All"; + killmonster "052-2", "All"; npcwarp 1, 1, "Luvia"; end; @@ -141,7 +141,7 @@ OnTimer5500: enablenpc "#LuviaDaemon"; misceffect FX_EVIL_SUMMON; misceffect FX_CHANNELLING_CAST; - monster "052-2.gat", $@illia_luvia_x, $@illia_luvia_y, "", 1102, 1, "#LuviaDaemon::OnDeath"; + monster "052-2", $@illia_luvia_x, $@illia_luvia_y, "", 1102, 1, "#LuviaDaemon::OnDeath"; set $@illia_luvia_x, 0; set $@illia_luvia_y, 0; end; @@ -180,9 +180,9 @@ S_SpawnWitchGuard: npcwarp getx(), gety(), "#LuviaDaemon"; misceffect FX_EVIL_SUMMON; misceffect FX_GROUND_SPAWN; - monster "052-2.gat", getx(), gety(), "", 1103, 1, "#LuviaDaemon::OnWGD"; + monster "052-2", getx(), gety(), "", 1103, 1, "#LuviaDaemon::OnWGD"; detachrid; - areatimer "052-2.gat", 73, 11, 115, 49, 0, "#LuviaDaemon::OnWGS"; + areatimer "052-2", 73, 11, 115, 49, 0, "#LuviaDaemon::OnWGS"; return; OnTimer30000: @@ -198,7 +198,7 @@ OnTimer30000: L_TriggerTrance: set $@illia_level_7_progress, 3; set $@illia_luvia_trance_delay, 0; - areatimer "052-2.gat", 73, 11, 115, 49, 0, "#LuviaDaemon::OnTT"; + areatimer "052-2", 73, 11, 115, 49, 0, "#LuviaDaemon::OnTT"; setnpctimer 0; end; @@ -213,13 +213,13 @@ OnDeath: if ($@illia_progress != 7) end; set $@illia_level_7_progress, 4; - killmonster "052-2.gat", "#LuviaDaemon::OnWGD"; - mapannounce "052-2.gat", "Luvia:* How? By mere humans! But we will see again! Enjoy your victory while it lasts, " + $@ILLIA_HERO$ + "!!", 0; + killmonster "052-2", "#LuviaDaemon::OnWGD"; + mapannounce "052-2", "Luvia:* How? By mere humans! But we will see again! Enjoy your victory while it lasts, " + $@ILLIA_HERO$ + "!!", 0; set $@illia_bp, $Illia_Luvia_Harvest * 16 / 10 + 120; - areatimer "052-2.gat", 73, 11, 115, 49, 0, "#LuviaDaemon::OnBP"; + areatimer "052-2", 73, 11, 115, 49, 0, "#LuviaDaemon::OnBP"; - areatimer "052-2.gat", 73, 11, 115, 49, 2000, "#LuviaDaemon::OnW00t"; + areatimer "052-2", 73, 11, 115, 49, 2000, "#LuviaDaemon::OnW00t"; set $@illia_progress, 8; callfunc "UpdateIlliaProgress"; @@ -272,12 +272,12 @@ OnW00t: } // Warp from the party room, to the chest room -052-2.gat,88,12,0|script|#ToLuviaRoomDoor|32767,1,2 +052-2,88,12,0|script|#ToLuviaRoomDoor|32767,1,2 { set @step, 7; if ($@illia_progress < @step) goto L_ShouldNotBeHere; if ($@illia_level_7_progress < 4) end; - warp "052-2.gat", 133, 84; + warp "052-2", 133, 84; end; L_ShouldNotBeHere: diff --git a/world/map/npc/052-2/storage.txt b/world/map/npc/052-2/storage.txt index c9cdfd0f..62f9cd46 100644 --- a/world/map/npc/052-2/storage.txt +++ b/world/map/npc/052-2/storage.txt @@ -8,7 +8,7 @@ // 2: All spawns are done and the players killed all mobs //----------------------------------------------------------------------------- -052-2.gat,23,69,0|script|#TriggerItemsInvoker|32767,1,0 +052-2,23,69,0|script|#TriggerItemsInvoker|32767,1,0 { set @step, 6; if ($@illia_progress < @step) goto L_ShouldNotBeHere; @@ -27,7 +27,7 @@ L_StartItemInvoker: } -052-2.gat,1,1,0|script|#ItemsInvoker|127 +052-2,1,1,0|script|#ItemsInvoker|127 { end; @@ -42,7 +42,7 @@ OnCommandStart: set $@illia_storage_max_items, 20; set $@illia_storage_deviation, (8 + ($Illia_Luvia_Harvest*70)/100)*3; initnpctimer; - areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::OnStart"; + areatimer "052-2", 19, 60, 35, 78, 10, "#ItemsInvoker::OnStart"; end; OnStart: @@ -64,7 +64,7 @@ OnTimer1000: OnTimer1500: // See the note above. enablenpc "#ItemsInvoker"; - areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::OnItem"; + areatimer "052-2", 19, 60, 35, 78, 10, "#ItemsInvoker::OnItem"; misceffect FX_GROUND_SPAWN; end; @@ -102,26 +102,26 @@ L_ItemSpawn: if (@r > 98) goto L_MakeSpecialItem; // Normal item - makeitem $@illia_storage_items[rand(getarraysize($@illia_storage_items))], rand(2, 8), "052-2.gat", $@item_invoke_x, $@item_invoke_y; + makeitem $@illia_storage_items[rand(getarraysize($@illia_storage_items))], rand(2, 8), "052-2", $@item_invoke_x, $@item_invoke_y; set $@illia_storage_max_items, $@illia_storage_max_items - 1; set @r, 0; end; L_MakeSpecialMonster: - monster "052-2.gat", $@item_invoke_x, $@item_invoke_y, "", 1103, 1, "#ItemsInvoker::OnDeath"; - areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::OnWtf"; + monster "052-2", $@item_invoke_x, $@item_invoke_y, "", 1103, 1, "#ItemsInvoker::OnDeath"; + areatimer "052-2", 19, 60, 35, 78, 10, "#ItemsInvoker::OnWtf"; set $@illia_storage_max_items, $@illia_storage_max_items - 1; end; L_MakeMonster: - monster "052-2.gat", $@item_invoke_x, $@item_invoke_y, "", 1101, rand(1, 3), "#ItemsInvoker::OnDeath"; + monster "052-2", $@item_invoke_x, $@item_invoke_y, "", 1101, rand(1, 3), "#ItemsInvoker::OnDeath"; set $@illia_storage_max_items, $@illia_storage_max_items - 1; set @r, 0; end; L_MakeSpecialItem: - makeitem $@illia_storage_special_items[rand(getarraysize($@illia_storage_special_items))], rand(2, 4), "052-2.gat", $@item_invoke_x, $@item_invoke_y; - areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::OnWow"; + makeitem $@illia_storage_special_items[rand(getarraysize($@illia_storage_special_items))], rand(2, 4), "052-2", $@item_invoke_x, $@item_invoke_y; + areatimer "052-2", 19, 60, 35, 78, 10, "#ItemsInvoker::OnWow"; set $@illia_storage_max_items, $@illia_storage_max_items - 1; set @r, 0; end; @@ -129,7 +129,7 @@ L_MakeSpecialItem: L_CheckMobs: if ($@illia_progress != 6) goto L_Clear; - if (mobcount("052-2.gat", "#ItemsInvoker::OnDeath") < 0) + if (mobcount("052-2", "#ItemsInvoker::OnDeath") < 0) goto L_Stop; setnpctimer 0; end; @@ -139,7 +139,7 @@ L_Clear: setnpctimer 0; set $@illia_storage_deviation, 0; set $@illia_storage_max_items, 0; - killmonster "052-2.gat", "#ItemsInvoker::OnDeath"; + killmonster "052-2", "#ItemsInvoker::OnDeath"; end; L_Stop: @@ -152,7 +152,7 @@ L_Stop: set $@illia_progress, 7; callfunc "UpdateIlliaProgress"; set $@illia_max_time, $@illia_max_time + 900; - areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::OnStop"; + areatimer "052-2", 19, 60, 35, 78, 10, "#ItemsInvoker::OnStop"; end; OnDeath: @@ -172,7 +172,7 @@ OnWow: } -052-2.gat,35,68,0|script|#ToPartyRoom|32767,1,1 +052-2,35,68,0|script|#ToPartyRoom|32767,1,1 { set @step, 6; if ($@illia_progress < @step) goto L_ShouldNotBeHere; @@ -181,7 +181,7 @@ OnWow: end; L_Warp: - warp "052-2.gat", 73, 48; + warp "052-2", 73, 48; end; L_ShouldNotBeHere: diff --git a/world/map/npc/055-1/flowerpentagram4.txt b/world/map/npc/055-1/flowerpentagram4.txt index b0996bb3..1fdd64cf 100644 --- a/world/map/npc/055-1/flowerpentagram4.txt +++ b/world/map/npc/055-1/flowerpentagram4.txt @@ -1,6 +1,6 @@ // Author: Jenalya -055-1.gat,141,89,0|script|#FlowerPentagram4|400 +055-1,141,89,0|script|#FlowerPentagram4|400 { if (OrumQuest >= 31) goto L_PlacedFifthFlower; @@ -17,7 +17,7 @@ L_FourthFlower: "Leave.", L_Close; L_PlaceTheFlower: - if (isin("055-1.gat", 140, 88, 142, 90)) + if (isin("055-1", 140, 88, 142, 90)) goto L_Place; mes "This isn't working, you're too far away."; @@ -25,14 +25,14 @@ L_PlaceTheFlower: L_Place: set @localMonsterCount, - mobcount("055-1.gat", "#FlowerPentagram4::OnSquirrelDeath") + - mobcount("055-1.gat", "#FlowerPentagram4::OnMushroomDeath") + - mobcount("055-1.gat", "#FlowerPentagram4::OnBlueparDeath") + - mobcount("055-1.gat", "#FlowerPentagram4::OnMoubooDeath") + - mobcount("055-1.gat", "#FlowerPentagram4::OnScorpionDeath") + - mobcount("055-1.gat", "#FlowerPentagram4::OnRScorpionDeath") + - mobcount("055-1.gat", "#FlowerPentagram4::OnAScorpionDeath") + - mobcount("055-1.gat", "#FlowerPentagram4::OnBScorpionDeath") + + mobcount("055-1", "#FlowerPentagram4::OnSquirrelDeath") + + mobcount("055-1", "#FlowerPentagram4::OnMushroomDeath") + + mobcount("055-1", "#FlowerPentagram4::OnBlueparDeath") + + mobcount("055-1", "#FlowerPentagram4::OnMoubooDeath") + + mobcount("055-1", "#FlowerPentagram4::OnScorpionDeath") + + mobcount("055-1", "#FlowerPentagram4::OnRScorpionDeath") + + mobcount("055-1", "#FlowerPentagram4::OnAScorpionDeath") + + mobcount("055-1", "#FlowerPentagram4::OnBScorpionDeath") + 8; // the mobcount function has an offset of -1, so we add 8 to have the actual amount of monsters if (@localMonsterCount > 4) goto L_MonstersAlive; @@ -44,14 +44,14 @@ L_Place: mes "As expected, you feel the magical tension building up. They're coming."; set OrumQuest, 27; close2; - areamonster "055-1.gat", 133, 87, 144, 99, "", 1105, 1, "#FlowerPentagram4::OnSquirrelDeath"; - areamonster "055-1.gat", 133, 87, 144, 99, "", 1106, 1, "#FlowerPentagram4::OnMushroomDeath"; - areamonster "055-1.gat", 133, 87, 144, 99, "", 1107, 2, "#FlowerPentagram4::OnBlueparDeath"; - areamonster "055-1.gat", 133, 87, 144, 99, "", 1104, 2, "#FlowerPentagram4::OnMoubooDeath"; - areamonster "055-1.gat", 133, 87, 144, 99, "", 1003, 2, "#FlowerPentagram4::OnScorpionDeath"; - areamonster "055-1.gat", 133, 87, 144, 99, "", 1004, 2, "#FlowerPentagram4::OnRScorpionDeath"; - areamonster "055-1.gat", 133, 87, 144, 99, "", 1057, 2, "#FlowerPentagram4::OnAScorpionDeath"; - areamonster "055-1.gat", 133, 87, 144, 99, "", 1009, 1, "#FlowerPentagram4::OnBScorpionDeath"; + areamonster "055-1", 133, 87, 144, 99, "", 1105, 1, "#FlowerPentagram4::OnSquirrelDeath"; + areamonster "055-1", 133, 87, 144, 99, "", 1106, 1, "#FlowerPentagram4::OnMushroomDeath"; + areamonster "055-1", 133, 87, 144, 99, "", 1107, 2, "#FlowerPentagram4::OnBlueparDeath"; + areamonster "055-1", 133, 87, 144, 99, "", 1104, 2, "#FlowerPentagram4::OnMoubooDeath"; + areamonster "055-1", 133, 87, 144, 99, "", 1003, 2, "#FlowerPentagram4::OnScorpionDeath"; + areamonster "055-1", 133, 87, 144, 99, "", 1004, 2, "#FlowerPentagram4::OnRScorpionDeath"; + areamonster "055-1", 133, 87, 144, 99, "", 1057, 2, "#FlowerPentagram4::OnAScorpionDeath"; + areamonster "055-1", 133, 87, 144, 99, "", 1009, 1, "#FlowerPentagram4::OnBScorpionDeath"; set @value, 15; callfunc "QuestSagathaAnnoy"; set @value, 0; diff --git a/world/map/npc/055-1/mapflags.txt b/world/map/npc/055-1/mapflags.txt index f2f6b2ec..31c2f835 100644 --- a/world/map/npc/055-1/mapflags.txt +++ b/world/map/npc/055-1/mapflags.txt @@ -1 +1 @@ -055-1.gat|mapflag|resave|055-1,133,61 +055-1|mapflag|resave|055-1,133,61 diff --git a/world/map/npc/055-1/pumpkins.txt b/world/map/npc/055-1/pumpkins.txt index 391cf96f..f0b9741c 100644 --- a/world/map/npc/055-1/pumpkins.txt +++ b/world/map/npc/055-1/pumpkins.txt @@ -1,10 +1,10 @@ // Pumpkin mobs for the seasonal halloween event with Oscar -055-1.gat,48,25,16,8|monster|Pumpkin|1063,12,10000ms,5000ms,PumpkinMob055-1::On1063 -055-1.gat,139,29,5,7|monster|Pumpkin|1063,7,10000ms,5000ms,PumpkinMob055-1::On1063 -055-1.gat,132,24,6,4|monster|Pumpkin|1063,4,10000ms,5000ms,PumpkinMob055-1::On1063 +055-1,48,25,16,8|monster|Pumpkin|1063,12,10000ms,5000ms,PumpkinMob055-1::On1063 +055-1,139,29,5,7|monster|Pumpkin|1063,7,10000ms,5000ms,PumpkinMob055-1::On1063 +055-1,132,24,6,4|monster|Pumpkin|1063,4,10000ms,5000ms,PumpkinMob055-1::On1063 -055-1.gat,0,0,0|script|PumpkinMob055-1|-1 +055-1,0,0,0|script|PumpkinMob055-1|-1 { end; diff --git a/world/map/npc/055-1/traveler.txt b/world/map/npc/055-1/traveler.txt index cc5db3c3..0277fbd4 100644 --- a/world/map/npc/055-1/traveler.txt +++ b/world/map/npc/055-1/traveler.txt @@ -2,7 +2,7 @@ // Author: Wombat, wushin // cost depending on level and adapted to new scripting guidelines: Jenalya -055-1.gat,135,60,0|script|Sherman the Traveler|103 +055-1,135,60,0|script|Sherman the Traveler|103 { set @NpcName$, "Sherman"; set @NpcTravelBit, $@hurns_farms_bit; diff --git a/world/map/npc/055-3/mapflags.txt b/world/map/npc/055-3/mapflags.txt index 203e5d2e..3d62e240 100644 --- a/world/map/npc/055-3/mapflags.txt +++ b/world/map/npc/055-3/mapflags.txt @@ -1 +1 @@ -055-3.gat|mapflag|resave|055-1,133,61 +055-3|mapflag|resave|055-1,133,61 diff --git a/world/map/npc/056-2/barrier.txt b/world/map/npc/056-2/barrier.txt index 1cbe2b94..a607ded7 100644 --- a/world/map/npc/056-2/barrier.txt +++ b/world/map/npc/056-2/barrier.txt @@ -1,10 +1,10 @@ -056-2.gat,23,33,0|script|#Barrier|45,0,0 +056-2,23,33,0|script|#Barrier|45,0,0 { if (Mirak_Bantime > gettimetick(2)) goto L_Block; if (BaseLevel < 25) goto L_Weak; - warp "056-2.gat", 63, 35; + warp "056-2", 63, 35; end; L_Block: diff --git a/world/map/npc/056-2/mapflags.txt b/world/map/npc/056-2/mapflags.txt index 90524dd8..02af4171 100644 --- a/world/map/npc/056-2/mapflags.txt +++ b/world/map/npc/056-2/mapflags.txt @@ -1,2 +1,2 @@ -056-2.gat|mapflag|nosave|017-1,107,70 -056-2.gat|mapflag|resave|017-1,107,70 +056-2|mapflag|nosave|017-1,107,70 +056-2|mapflag|resave|017-1,107,70 diff --git a/world/map/npc/056-2/mirak.txt b/world/map/npc/056-2/mirak.txt index bfa1d132..93dca520 100644 --- a/world/map/npc/056-2/mirak.txt +++ b/world/map/npc/056-2/mirak.txt @@ -1,4 +1,4 @@ -056-2.gat,67,24,0|script|Mirak|372 +056-2,67,24,0|script|Mirak|372 { // Variables to set: // @dq_cost - The number of points this quest uses diff --git a/world/map/npc/056-2/notes.txt b/world/map/npc/056-2/notes.txt index a223c29a..f48ced08 100644 --- a/world/map/npc/056-2/notes.txt +++ b/world/map/npc/056-2/notes.txt @@ -1,4 +1,4 @@ -056-2.gat,77,34,0|script|Warning#mirak|400 +056-2,77,34,0|script|Warning#mirak|400 { mes "Turn around. Do not come any closer!"; mes "Go back upstairs and leave! I don't want to see anybody!"; @@ -6,7 +6,7 @@ mes "- Mirak"; close; } -056-2.gat,29,30,0|script|Note#mirak|400 +056-2,29,30,0|script|Note#mirak|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."; diff --git a/world/map/npc/057-1/mapflags.txt b/world/map/npc/057-1/mapflags.txt index 408f5186..245bb2fa 100644 --- a/world/map/npc/057-1/mapflags.txt +++ b/world/map/npc/057-1/mapflags.txt @@ -1 +1 @@ -057-1.gat|mapflag|resave|055-1,133,61 +057-1|mapflag|resave|055-1,133,61 diff --git a/world/map/npc/annuals/fathertime.txt b/world/map/npc/annuals/fathertime.txt index 4bc624a8..53912f86 100644 --- a/world/map/npc/annuals/fathertime.txt +++ b/world/map/npc/annuals/fathertime.txt @@ -1,6 +1,6 @@ // Annual Timer // One timer to check to enable all holiday events -017-9.gat,26,28,0|script|#HolidayConfig|-1 +017-9,26,28,0|script|#HolidayConfig|-1 { end; @@ -20,7 +20,7 @@ OnTimer20000: initnpctimer; end; } -017-9.gat,31,24,0|script|HolidayDebug#1|105 +017-9,31,24,0|script|HolidayDebug#1|105 { if(getgmlevel() < 40) goto L_End; diff --git a/world/map/npc/annuals/tree_beard.txt b/world/map/npc/annuals/tree_beard.txt index 394a1a1b..6ef89de4 100644 --- a/world/map/npc/annuals/tree_beard.txt +++ b/world/map/npc/annuals/tree_beard.txt @@ -1,69 +1,69 @@ // Annual Environment changes -020-1.gat,90,78,0|script|#GhostTreeOne|133 +020-1,90,78,0|script|#GhostTreeOne|133 { callfunc "HalloweenTree"; close; } -020-1.gat,90,78,0|script|#Tree|380 +020-1,90,78,0|script|#Tree|380 { end; } -020-1.gat,90,78,0|script|#XmasTree|379 +020-1,90,78,0|script|#XmasTree|379 { end; } -020-1.gat,90,79,0|script|Present#1|386 +020-1,90,79,0|script|Present#1|386 { callfunc "XmasStates"; callfunc "XmasMainItemReward"; close; } -009-1.gat,54,38,0|script|#GhostTreeTwo|133 +009-1,54,38,0|script|#GhostTreeTwo|133 { callfunc "HalloweenTree"; close; } -009-1.gat,54,38,0|script|#TreeNoSnow|394 +009-1,54,38,0|script|#TreeNoSnow|394 { end; } -009-1.gat,54,38,0|script|#XmasTreeNoSnow|381 +009-1,54,38,0|script|#XmasTreeNoSnow|381 { end; } -009-1.gat,54,39,0|script|Present#2|386 +009-1,54,39,0|script|Present#2|386 { callfunc "XmasStates"; callfunc "XmasMainItemReward"; close; } -001-1.gat,58,75,0|script|#GhostTreeThree|133 +001-1,58,75,0|script|#GhostTreeThree|133 { callfunc "HalloweenTree"; close; } -001-1.gat,58,75,0|script|#PalmTree|384 +001-1,58,75,0|script|#PalmTree|384 { end; } -001-1.gat,58,76,0|script|Present#3|386 +001-1,58,76,0|script|Present#3|386 { callfunc "XmasStates"; callfunc "XmasMainItemReward"; close; } -001-1.gat,58,75,0|script|#XmasPalmTree|383 +001-1,58,75,0|script|#XmasPalmTree|383 { end; } diff --git a/world/map/npc/botcheck/mapflags.txt b/world/map/npc/botcheck/mapflags.txt index cce971d6..9f7777da 100644 --- a/world/map/npc/botcheck/mapflags.txt +++ b/world/map/npc/botcheck/mapflags.txt @@ -1,2 +1,2 @@ -botcheck.gat|mapflag|resave|botcheck.gat,37,37 -botcheck.gat|mapflag|nosave|botcheck.gat,37,37 +botcheck|mapflag|resave|botcheck,37,37 +botcheck|mapflag|nosave|botcheck,37,37 diff --git a/world/map/npc/functions/debug.txt b/world/map/npc/functions/debug.txt index 384805b1..be8d4fb4 100755 --- a/world/map/npc/functions/debug.txt +++ b/world/map/npc/functions/debug.txt @@ -916,7 +916,7 @@ L_Close: } -029-2.gat,30,26,0|script|Debug#0|154 +029-2,30,26,0|script|Debug#0|154 { callfunc "Debug"; end; @@ -926,7 +926,7 @@ OnInit: end; } -001-1.gat,53,47,0|script|Debug#1|154 +001-1,53,47,0|script|Debug#1|154 { callfunc "Debug"; end; @@ -936,7 +936,7 @@ OnInit: end; } -009-1.gat,52,33,0|script|Debug#2|154 +009-1,52,33,0|script|Debug#2|154 { callfunc "Debug"; end; @@ -946,7 +946,7 @@ OnInit: end; } -020-1.gat,75,85,0|script|Debug#3|154 +020-1,75,85,0|script|Debug#3|154 { callfunc "Debug"; end; @@ -956,7 +956,7 @@ OnInit: end; } -017-9.gat,21,24,0|script|Debug#4|154 +017-9,21,24,0|script|Debug#4|154 { callfunc "Debug"; end; @@ -966,7 +966,7 @@ OnInit: end; } -027-2.gat,125,103,0|script|Debug#5|154 +027-2,125,103,0|script|Debug#5|154 { callfunc "Debug"; end; diff --git a/world/map/npc/functions/default_npc_checks.txt b/world/map/npc/functions/default_npc_checks.txt index 67815ab1..446cf961 100644 --- a/world/map/npc/functions/default_npc_checks.txt +++ b/world/map/npc/functions/default_npc_checks.txt @@ -7,7 +7,7 @@ function|script|PCtoNPCRange { set @npc_check, 0; - set @Nmap$, getmap() + ".gat"; + set @Nmap$, getmap() + ""; set @Nx1, (@npc_loc[0] - @npc_loc[2]); set @Ny1, (@npc_loc[1] - @npc_loc[2]); set @Nx2, (@npc_loc[0] + @npc_loc[2]); diff --git a/world/map/npc/functions/ferry.txt b/world/map/npc/functions/ferry.txt index 48372f56..54c79aa2 100644 --- a/world/map/npc/functions/ferry.txt +++ b/world/map/npc/functions/ferry.txt @@ -1,6 +1,6 @@ // The ferry system -017-9.gat,27,28,0|script|#FerryConfig|-1 +017-9,27,28,0|script|#FerryConfig|-1 { end; diff --git a/world/map/npc/functions/global_event_handler.txt b/world/map/npc/functions/global_event_handler.txt index f05e3b62..cf331060 100644 --- a/world/map/npc/functions/global_event_handler.txt +++ b/world/map/npc/functions/global_event_handler.txt @@ -1,4 +1,4 @@ -017-9.gat,0,0,0|script|#GlobalHandler|-1 +017-9,0,0,0|script|#GlobalHandler|-1 { end; diff --git a/world/map/npc/functions/gm_island.txt b/world/map/npc/functions/gm_island.txt index 7d3954e1..5efe105e 100644 --- a/world/map/npc/functions/gm_island.txt +++ b/world/map/npc/functions/gm_island.txt @@ -42,22 +42,22 @@ L_GmStop: L_Return: return; } -017-9.gat,32,21,0|script|Gm Event Debug|368 +017-9,32,21,0|script|Gm Event Debug|368 { callfunc "GmDebug"; close; } -001-1.gat,49,68,0|script|Gm Event#1|368,0,0 +001-1,49,68,0|script|Gm Event#1|368,0,0 { callfunc "GmWarp"; end; } -009-1.gat,46,30,0|script|Gm Event#2|368,0,0 +009-1,46,30,0|script|Gm Event#2|368,0,0 { callfunc "GmWarp"; end; } -020-1.gat,67,89,0|script|Gm Event#3|368,0,0 +020-1,67,89,0|script|Gm Event#3|368,0,0 { callfunc "GmWarp"; end; diff --git a/world/map/npc/functions/travelers.txt b/world/map/npc/functions/travelers.txt index f8ce6bf7..a1db712e 100644 --- a/world/map/npc/functions/travelers.txt +++ b/world/map/npc/functions/travelers.txt @@ -6,7 +6,7 @@ // Costs Zeny // Contains all warp points to find -017-9.gat,27,28,0|script|#TravelConfig|-1 +017-9,27,28,0|script|#TravelConfig|-1 { end; @@ -130,7 +130,7 @@ L_TravelPlayer: L_TravelGraveyard: set @NextLocationBit, $@graveyard_bit; set @NextLocationCost, (@Cost * $@graveyard_cost); - set @NextLocationMap$, "027-1.gat"; + set @NextLocationMap$, "027-1"; set @NextLocationX, 84; set @NextLocationY, 86; goto L_TravelChecks; @@ -138,7 +138,7 @@ L_TravelGraveyard: L_TravelMagicHouse: set @NextLocationBit, $@magic_house_bit; set @NextLocationCost, (@Cost * $@magic_house_cost); - set @NextLocationMap$, "013-1.gat"; + set @NextLocationMap$, "013-1"; set @NextLocationX, 120; set @NextLocationY, 93; goto L_TravelChecks; @@ -146,7 +146,7 @@ L_TravelMagicHouse: L_TravelTerranite: set @NextLocationBit, $@terranite_cave_bit; set @NextLocationCost, (@Cost * $@terranite_cave_cost); - set @NextLocationMap$, "012-3.gat"; + set @NextLocationMap$, "012-3"; set @NextLocationX, 445; set @NextLocationY, 65; goto L_TravelChecks; @@ -154,7 +154,7 @@ L_TravelTerranite: L_TravelTulimshar: set @NextLocationBit, $@tulimshar_bit; set @NextLocationCost, (@Cost * $@tulimshar_cost); - set @NextLocationMap$, "002-1.gat"; + set @NextLocationMap$, "002-1"; set @NextLocationX, 60; set @NextLocationY, 42; goto L_TravelChecks; @@ -162,7 +162,7 @@ L_TravelTulimshar: L_TravelBlueSage: set @NextLocationBit, $@blue_sage_bit; set @NextLocationCost, (@Cost * $@blue_sage_cost); - set @NextLocationMap$, "048-2.gat"; + set @NextLocationMap$, "048-2"; set @NextLocationX, 26; set @NextLocationY, 47; goto L_TravelChecks; @@ -170,7 +170,7 @@ L_TravelBlueSage: L_TravelHurnscald: set @NextLocationBit, $@hurnscald_bit; set @NextLocationCost, (@Cost * $@hurnscald_cost); - set @NextLocationMap$, "008-1.gat"; + set @NextLocationMap$, "008-1"; set @NextLocationX, 79; set @NextLocationY, 84; goto L_TravelChecks; @@ -178,7 +178,7 @@ L_TravelHurnscald: L_TravelNivalis: set @NextLocationBit, $@nivalis_bit; set @NextLocationCost, (@Cost * $@nivalis_cost); - set @NextLocationMap$, "020-1.gat"; + set @NextLocationMap$, "020-1"; set @NextLocationX, 53; set @NextLocationY, 122; goto L_TravelChecks; @@ -186,7 +186,7 @@ L_TravelNivalis: L_TravelPachua: set @NextLocationBit, $@pachua_bit; set @NextLocationCost, (@Cost * $@pachua_cost); - set @NextLocationMap$, "006-1.gat"; + set @NextLocationMap$, "006-1"; set @NextLocationX, 28; set @NextLocationY, 97; goto L_TravelChecks; @@ -194,7 +194,7 @@ L_TravelPachua: L_TravelBarbarians: set @NextLocationBit, $@barbarians_bit; set @NextLocationCost, (@Cost * $@barbarians_cost); - set @NextLocationMap$, "033-1.gat"; + set @NextLocationMap$, "033-1"; set @NextLocationX, 66; set @NextLocationY, 33; goto L_TravelChecks; @@ -202,7 +202,7 @@ L_TravelBarbarians: L_TravelHurnsFarms: set @NextLocationBit, $@hurns_farms_bit; set @NextLocationCost, (@Cost * $@hurns_farms_cost); - set @NextLocationMap$, "055-1.gat"; + set @NextLocationMap$, "055-1"; set @NextLocationX, 135; set @NextLocationY, 60; goto L_TravelChecks; @@ -210,7 +210,7 @@ L_TravelHurnsFarms: L_TravelCandor: set @NextLocationBit, $@candor_bit; set @NextLocationCost, (@Cost * $@candor_cost); - set @NextLocationMap$, "029-1.gat"; + set @NextLocationMap$, "029-1"; set @NextLocationX, 69; set @NextLocationY, 69; goto L_TravelChecks; diff --git a/world/map/npc/functions/undead_debug.txt b/world/map/npc/functions/undead_debug.txt index 992cbc97..b0466f65 100644 --- a/world/map/npc/functions/undead_debug.txt +++ b/world/map/npc/functions/undead_debug.txt @@ -82,7 +82,7 @@ L_Close: } // Debug for Krukan -027-3.gat,84,89,0|script|UndeadDebug3|155 +027-3,84,89,0|script|UndeadDebug3|155 { set @undeaddebug, 3; callfunc "UndeadDebug"; @@ -94,7 +94,7 @@ OnInit: } // Debug for Razha -027-4.gat,76,79,0|script|UndeadDebug4|155 +027-4,76,79,0|script|UndeadDebug4|155 { set @undeaddebug, 4; callfunc "UndeadDebug"; @@ -106,7 +106,7 @@ OnInit: } // Debug for Terogan -027-5.gat,72,26,0|script|UndeadDebug5|155 +027-5,72,26,0|script|UndeadDebug5|155 { set @undeaddebug, 5; callfunc "UndeadDebug"; diff --git a/world/map/npc/items/check_wand.txt b/world/map/npc/items/check_wand.txt index 8e0107b1..43190a85 100644 --- a/world/map/npc/items/check_wand.txt +++ b/world/map/npc/items/check_wand.txt @@ -2,7 +2,7 @@ // Author: Wushin function|script|WandMana { - if(isin("009-7.gat", $@fightclub_x1, $@fightclub_y1, $@fightclub_x2, $@fightclub_y2) && ((@Duel_Fighter != 1) || ($@Duel_NoMagic == 1))) + if(isin("009-7", $@fightclub_x1, $@fightclub_y1, $@fightclub_x2, $@fightclub_y2) && ((@Duel_Fighter != 1) || ($@Duel_NoMagic == 1))) goto L_Return; callfunc "CheckWand"; set @WandCost, (@Wand * (BaseLevel / 15) + 2); diff --git a/world/map/npc/items/purification_potion.txt b/world/map/npc/items/purification_potion.txt index 9a7bdcc7..67e8321b 100644 --- a/world/map/npc/items/purification_potion.txt +++ b/world/map/npc/items/purification_potion.txt @@ -2,7 +2,7 @@ function|script|usePurificationPotion { - if (isat("011-1.gat", 88,67)) + if (isat("011-1", 88,67)) goto L_Wyara_Pond; goto L_NoUse; diff --git a/world/map/npc/items/unequipcb.txt b/world/map/npc/items/unequipcb.txt index c033c80f..1d269d3a 100644 --- a/world/map/npc/items/unequipcb.txt +++ b/world/map/npc/items/unequipcb.txt @@ -2,7 +2,7 @@ // on any map because of the -1 at the end. // Note: the client (I think) has a display bug if this is called // during the intial connection's equip hook -017-9.gat,0,0,0|script|UnequipCB|-1 +017-9,0,0,0|script|UnequipCB|-1 { end; diff --git a/world/map/npc/items/warpTowels.txt b/world/map/npc/items/warpTowels.txt index 585112ff..32a52aff 100644 --- a/world/map/npc/items/warpTowels.txt +++ b/world/map/npc/items/warpTowels.txt @@ -3,9 +3,9 @@ function|script|WarpTowel { if (TowelLastUsed > (gettimetick(2) - 1800)) goto L_DontPanic; - if (isin("botcheck.gat",25,27,51,47)) + if (isin("botcheck",25,27,51,47)) goto L_Prison; - if (getmapflag(getmap(), MF_NOSAVE) || isin("009-7.gat",$@fightclub_x1,$@fightclub_y1,$@fightclub_x2,$@fightclub_y2)) + if (getmapflag(getmap(), MF_NOSAVE) || isin("009-7",$@fightclub_x1,$@fightclub_y1,$@fightclub_x2,$@fightclub_y2)) goto L_Forbid; callfunc "MultiWarpTowel"; @@ -36,70 +36,70 @@ function|script|WarpTowel L_White: // Koga - set @NextLocationMap$, "035-2.gat"; + set @NextLocationMap$, "035-2"; set @NextLocationX, 20; set @NextLocationY, 21; goto L_WarpPlayer; L_Red: // Barbarians - set @NextLocationMap$, "033-1.gat"; + set @NextLocationMap$, "033-1"; set @NextLocationX, 66; set @NextLocationY, 33; goto L_WarpPlayer; L_Green: // Candor - set @NextLocationMap$, "029-1.gat"; + set @NextLocationMap$, "029-1"; set @NextLocationX, 69; set @NextLocationY, 69; goto L_WarpPlayer; L_Blue: // Blue Sages - set @NextLocationMap$, "048-2.gat"; + set @NextLocationMap$, "048-2"; set @NextLocationX, 26; set @NextLocationY, 47; goto L_WarpPlayer; L_Yellow: // Tulimshar Mines - set @NextLocationMap$, "002-2.gat"; + set @NextLocationMap$, "002-2"; set @NextLocationX, 27; set @NextLocationY, 28; goto L_WarpPlayer; L_Purple: // Dimonds Inn - set @NextLocationMap$, "010-1.gat"; + set @NextLocationMap$, "010-1"; set @NextLocationX, 27; set @NextLocationY, 97; goto L_WarpPlayer; L_Orange: // Graveyard - set @NextLocationMap$, "027-1.gat"; + set @NextLocationMap$, "027-1"; set @NextLocationX, 70; set @NextLocationY, 100; goto L_WarpPlayer; L_Pink: // Terranite Cave - set @NextLocationMap$, "012-3.gat"; + set @NextLocationMap$, "012-3"; set @NextLocationX, 448; set @NextLocationY, 66; goto L_WarpPlayer; L_Teal: // Mana Seed - set @NextLocationMap$, "012-3.gat"; + set @NextLocationMap$, "012-3"; set @NextLocationX, 64; set @NextLocationY, 130; goto L_WarpPlayer; L_Lime: // Pachua - set @NextLocationMap$, "006-1.gat"; + set @NextLocationMap$, "006-1"; set @NextLocationX, 28; set @NextLocationY, 97; goto L_WarpPlayer; |