From 22cfbc011ce19e96767861b60473fa3136177f10 Mon Sep 17 00:00:00 2001 From: mekolat Date: Sun, 1 Feb 2015 14:11:22 -0500 Subject: remove .gat from npcs --- world/map/npc/001-2/bank.txt | 2 +- world/map/npc/001-2/david.txt | 2 +- world/map/npc/001-2/fieri.txt | 2 +- world/map/npc/001-2/forge_shops.txt | 4 ++-- world/map/npc/001-2/government_building.txt | 4 ++-- world/map/npc/001-2/heathin.txt | 4 ++-- world/map/npc/001-2/jhedia.txt | 2 +- world/map/npc/001-2/manakins.txt | 14 +++++++------- world/map/npc/001-2/mapflags.txt | 4 ++-- world/map/npc/001-2/pauline.txt | 8 ++++---- world/map/npc/001-2/sandra.txt | 2 +- world/map/npc/001-2/tathin.txt | 2 +- world/map/npc/001-2/tondar.txt | 2 +- world/map/npc/001-2/wizards.txt | 20 ++++++++++---------- world/map/npc/001-2/yanis.txt | 2 +- 15 files changed, 37 insertions(+), 37 deletions(-) (limited to 'world/map/npc/001-2') 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); -- cgit v1.2.3-60-g2f50