From 8429b2fdb4b5d8d5b2a8851b47eeb19307d4b646 Mon Sep 17 00:00:00 2001 From: Lupus Date: Thu, 2 Nov 2006 11:01:17 +0000 Subject: merged from trunk to stable. Fixed item names in 2006 headgear quest, DTS warper typos git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9122 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 2 ++ npc/other/dts_warper.txt | 8 ++++---- npc/quests/newgears/2006_headgear.txt | 29 +++++++++++++++-------------- 3 files changed, 21 insertions(+), 18 deletions(-) (limited to 'npc') diff --git a/npc/Changelog.txt b/npc/Changelog.txt index ff90fa683..beaf5cc33 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -33,6 +33,8 @@ KarLaeda Date Added ====== +11/02 + * Fixed typos and item names in DTS warper, 2006 Headgear Quest [Lupus] 11/01 * Added entrance to Kiel Dungeon F2 [Playtester] * Training grounds: Now Kafra Tickets are given at correct NPC/Actions [Lupus] diff --git a/npc/other/dts_warper.txt b/npc/other/dts_warper.txt index 402f19675..898f882c4 100644 --- a/npc/other/dts_warper.txt +++ b/npc/other/dts_warper.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Evera //===== Current Version: ===================================== -//= 2.3b +//= 2.3c //===== Compatible With: ===================================== //= eAthena //===== Description: ========================================= @@ -70,7 +70,7 @@ //= Fixed bug that involved having both warpers enabled at the same time. [Evera] //= New $dtsday system and bug fix[Evera] //= 2.3a fixed 2 bugs with comparision [Lupus] -//= 2.3b corrected Glast warp coords [Lupus] +//= 2.3b corrected Glast warp coords [Lupus] 2.3c Bailand -> Bayalan //============================================================ //Yuno @@ -796,7 +796,7 @@ function script F_DTS_Warp { mes "or award Special Reserve Points"; mes "for this service. Now, please"; mes "choose your destination."; - setarray @dtswarpmap$[0],"Bailand, Level 4","Clock Tower, Basement 3"; + setarray @dtswarpmap$[0],"Byalan, Level 4","Clock Tower, Basement 3"; setarray @dtswarp$[0],@dtswarpmap$[0]+" -> 4,000z", @dtswarpmap$[1]+" -> 4,000z","Cancel"; if($dts&(1<<4)){ @@ -846,7 +846,7 @@ function script F_DTS_Warp { if (@dtswarpmap$[@num] == "Lava Dungeon, Level 2") warp "mag_dun02.gat",47,40; - if (@dtswarpmap$[@num] == "Bailand, Level 4") warp "iz_dun03.gat",32,63; + if (@dtswarpmap$[@num] == "Byalan, Level 4") warp "iz_dun03.gat",32,63; if (@dtswarpmap$[@num] == "Clock Tower, Basement 3") warp "alde_dun03.gat",277,178; diff --git a/npc/quests/newgears/2006_headgear.txt b/npc/quests/newgears/2006_headgear.txt index bae415406..650d05407 100644 --- a/npc/quests/newgears/2006_headgear.txt +++ b/npc/quests/newgears/2006_headgear.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= DiviniaRO members, cleaned by reddozen //===== Current Version: ===================================== -//= 1.0b +//= 1.0c //===== Compatible With: ===================================== //= SVN eA //===== Description: ========================================= @@ -14,6 +14,7 @@ //= 1.0a fixed typos, added missing names, more cleaned and //= standartized stuff a bit [Lupus] //= 1.0b fixed Helm of Valkyries ingredients +//= 1.0c corrected item names according to item_db [Lupus] //============================================================ @@ -166,8 +167,8 @@ hugel.gat,146,105,4 script Genirhimin 897,{ mes "1 Hode Card,"; mes "1 Elder Card,"; mes "1 Nightmare Terror Card,"; - mes "1000 Runes of Darkness and"; - mes "1000 Runes of Bloody Color."; + mes "1000 Darkness Runes and"; + mes "1000 Bloody Runes."; next; mes @npcname$; if ( (countitem(4219)<1) || (countitem(4114)<1) || (countitem(4177)<1) || (countitem(4259)<1) || (countitem(4212)<1) || (countitem(4073)<1) || (countitem(4112)<1) || (countitem(4081)<1) || (countitem(4251)<1) || (countitem(4166)<1) || (countitem(7511)<1000) || (countitem(7563)<1000) ) { @@ -257,7 +258,7 @@ payon.gat,135,231,5 script Chung-Wol-Mang 907,{ case 2: mes @npcname$; - mes "Okay, for the Lion Mask I need:"; + mes "Okay, for the Lion Masquerade I need:"; mes "1 Four-Leaf Clover,"; mes "500 Trunks,"; mes "10 Elastic Bands,"; @@ -294,7 +295,7 @@ payon.gat,135,231,5 script Chung-Wol-Mang 907,{ mes "500 Trunks,"; mes "10 Elastic Bands,"; mes "20 Skirts of Virgin,"; - mes "500 Transparent Clothes,"; + mes "500 Transparent Celestial Robes,"; mes "2 Ancient Lips and"; mes "100 Squid Inks."; next; @@ -357,10 +358,10 @@ payon.gat,137,123,5 script Hangaram 740,{ case 1: mes @npcname$; mes "^3355FFJudge Hat^000000"; - mes "7 Red Orbs,"; - mes "7 Blue Orbs,"; - mes "7 Yellow Orbs,"; - mes "7 Green Orbs,"; + mes "7 Red Bijou,"; + mes "7 Blue Bijou,"; + mes "7 Yellow Bijou,"; + mes "7 Green Bijou,"; mes "300 Shining Scales,"; next; mes "1 Black Dyestuff,"; @@ -427,10 +428,10 @@ payon.gat,137,123,5 script Hangaram 740,{ case 2: mes @npcname$; mes "^3355FFA-Yam Hat^000000"; - mes "7 Red Orbs,"; - mes "7 Blue Orbs,"; - mes "7 Yellow Orbs,"; - mes "7 Green Orbs,"; + mes "7 Red Bijou,"; + mes "7 Blue Bijou,"; + mes "7 Yellow Bijou,"; + mes "7 Green Bijou,"; mes "300 Shining Scales,"; next; mes "1 Scarlet Dyestuff,"; @@ -462,7 +463,7 @@ payon.gat,137,123,5 script Hangaram 740,{ next; mes @npcname$; - mes "We throw this ... Mmm.."; + mes "We throw this... Mmm.."; emotion 23; next; -- cgit v1.2.3-70-g09d2