From 180c626bef428190edbcd8a8a6d1ef1ef03ce808 Mon Sep 17 00:00:00 2001 From: Lupus Date: Fri, 6 Jul 2007 05:17:37 +0000 Subject: fixed Kiel quest bug, fixed item names in db, according to the quest and ragnainfo.net wiki git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10857 54d463be-8e91-2dee-dedb-b68131a5f0ec --- db/Changelog.txt | 2 ++ db/item_db.txt | 30 +++++++++++++++--------------- npc/Changelog.txt | 2 ++ npc/quests/Kiel_Hyre_Quest.txt | 29 ++++++++++++++++------------- 4 files changed, 35 insertions(+), 28 deletions(-) diff --git a/db/Changelog.txt b/db/Changelog.txt index 5b89fa745..9673dfa75 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -48,6 +48,8 @@ 13107 Western_Outlaw Need correct HIT and ASPD Rate ---- ======================== +07/06 + * Updated messed Kiel_Hyre_Quest.txt item names, accordinly [Lupus] 07/05 * Updated the SC constant listing in db/const.txt [Skotlex] 07/04 diff --git a/db/item_db.txt b/db/item_db.txt index 915fb491a..216775ccb 100644 --- a/db/item_db.txt +++ b/db/item_db.txt @@ -2453,29 +2453,29 @@ 7484,Warrior_Symbol,Symbol of a Brave Warrior,3,,0,10,,,,,,0,2,,,,,,{},{},{} 7485,2nd_Floor_Pass,Cloud General,3,,0,10,,,,,,0,2,,,,,,{},{},{} 7486,3rd_Floor_Pass,Wind General,3,,0,10,,,,,,0,2,,,,,,{},{},{} -7487,Tavern_Wine,Pub Liquor,3,,0,0,,,,,,0,2,,,,,,{},{},{} -7488,Delivery_Box,Delivery Box,3,,0,0,,,,,,0,2,,,,,,{},{},{} -7489,Villa_Spare_Key,Spare Key to the Outhouse,3,,0,0,,,,,,0,2,,,,,,{},{},{} -7490,Kyll_Hire_Letter,Letter to Elie,3,,0,0,,,,,,0,2,,,,,,{},{},{} -7491,Iron_Box,Iron_Box,3,,0,0,,,,,,0,2,,,,,,{},{},{} +7487,Tavern_Wine,Culinary Wine,3,,0,0,,,,,,0,2,,,,,,{},{},{} +7488,Delivery_Box,Delivery Package,3,,0,0,,,,,,0,2,,,,,,{},{},{} +7489,Villa_Spare_Key,Cottage Key,3,,0,0,,,,,,0,2,,,,,,{},{},{} +7490,Kyll_Hire_Letter,Letter to Elly,3,,0,0,,,,,,0,2,,,,,,{},{},{} +7491,Iron_Box,Steel Box,3,,0,0,,,,,,0,2,,,,,,{},{},{} 7492,Yellow_Key_Card,Yellow Keycard,3,,0,0,,,,,,0,2,,,,,,{},{},{} 7493,Golden_Key,Golden Key,3,,0,0,,,,,,0,2,,,,,,{},{},{} -7494,Kiel_Button,Exquisite Button,3,,0,0,,,,,,0,2,,,,,,{},{},{} +7494,Kiel_Button,Luxurious Button,3,,0,0,,,,,,0,2,,,,,,{},{},{} 7495,Blue_Key_Card,Blue Keycard,3,,0,0,,,,,,0,2,,,,,,{},{},{} -7496,Red_Key_Card,Red_Keycard,3,,0,0,,,,,,0,2,,,,,,{},{},{} -7497,Steel_Piece,Piece of Metal,3,,0,0,,,,,,0,2,,,,,,{},{},{} -7498,Rosimier_Key,Key to Losimier's_House,3,,0,0,,,,,,0,2,,,,,,{},{},{} +7496,Red_Key_Card,Red Keycard,3,,0,0,,,,,,0,2,,,,,,{},{},{} +7497,Steel_Piece,Metal Fragment,3,,0,0,,,,,,0,2,,,,,,{},{},{} +7498,Rosimier_Key,Key to Losimier's House,3,,0,0,,,,,,0,2,,,,,,{},{},{} 7499,Family_Portrait,Portrait of a Family,3,,0,0,,,,,,0,2,,,,,,{},{},{} 7500,Elysia_Portrait,Portrait of a Lady,3,,0,0,,,,,,0,2,,,,,,{},{},{} 7501,Kyll_Hyre_Letter2,K.H's Letter,3,,0,0,,,,,,0,2,,,,,,{},{},{} -7502,Pieco_Memo_Of_James,James's Memo,3,,0,0,,,,,,0,2,,,,,,{},{},{} -7503,Man_Portrait,Portrait of a Guy,3,,0,0,,,,,,0,2,,,,,,{},{},{} -7504,Toy_Motor,Power Source,3,,0,0,,,,,,0,2,,,,,,{},{},{} +7502,Pieco_Memo_Of_James,James's Note,3,,0,0,,,,,,0,2,,,,,,{},{},{} +7503,Man_Portrait,Man's Portrait,3,,0,0,,,,,,0,2,,,,,,{},{},{} +7504,Toy_Motor,Power Device,3,,0,0,,,,,,0,2,,,,,,{},{},{} 7505,Toy_Key,Toy Key,3,,0,0,,,,,,0,2,,,,,,{},{},{} 7506,Black_Key_Card,Black Keycard,3,,0,0,,,,,,0,2,,,,,,{},{},{} -7507,Sturdy_Iron_Piece,Hard Piece of Steel,3,842,,10,,,,,,0,2,,,,,,{},{},{} -7508,Elysia_Ring,Elisia's Ring,3,,0,0,,,,,,0,2,,,,,,{},{},{} -7509,Fancy_Key_Card,Gorgeous Keycard,3,,0,0,,,,,,0,2,,,,,,{},{},{} +7507,Sturdy_Iron_Piece,Solid Iron Piece,3,842,,10,,,,,,0,2,,,,,,{},{},{} +7508,Elysia_Ring,Allysia's Ring,3,,0,0,,,,,,0,2,,,,,,{},{},{} +7509,Fancy_Key_Card,Luxurious Keycard,3,,0,0,,,,,,0,2,,,,,,{},{},{} 7510,Valhalla_Flower,Valhalla's Flower,3,200000,,10,,,,,,0,2,,,,,,{},{},{} 7511,Rune_Of_Darkness,Darkness Rune,3,2526,,10,,,,,,0,2,,,,,,{},{},{} 7512,Burnt_Parts,Burnt Pieces,3,1600,,10,,,,,,0,2,,,,,,{},{},{} diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 27c280905..4d180c234 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,5 +1,7 @@ Date Added ====== +2007/07/06 + * Fixed Kiel Hyre Quest (u could stuck) thx 2X-Siro [Lupus] 2007/07/04 * Removed respawn time on Byorgue [Playtester] 2007/07/01 diff --git a/npc/quests/Kiel_Hyre_Quest.txt b/npc/quests/Kiel_Hyre_Quest.txt index 2ec132327..da57b5785 100644 --- a/npc/quests/Kiel_Hyre_Quest.txt +++ b/npc/quests/Kiel_Hyre_Quest.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf (Script), DZeroX (Timer) //===== Current Version: ===================================== -//= 3.2b +//= 3.4 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -27,7 +27,7 @@ // Corrected Elly showing cutin but not text for some states of the quest (causing players to log off to continue). // Let fisherman talk to you when you have 10 fishes OR MORE. // Corrected not letting you enter the tombstone after finishing the quest. -//= 1.8 Elly now deletes the Iron_Box, and Kiel Hyre deletes the Pin. [L0ne_W0lf] +//= 1.8 Elly now deletes the Steel_box, and Kiel Hyre deletes the Pin. [L0ne_W0lf] //= More security on the 5th Big Door, now makes sure no one outside of who- //= acticated it initially can use it. Resets after 10 minutes to make it. //= Made it so that you need to be at least step 84 to activate the final door. @@ -66,6 +66,9 @@ //= 3.2 Fixed error with Allysia teling you to "Go away." maybe. [L0ne_W0lf] //= 3.2b Fixed some typos and grammar mistakes. [SinSloth] //= 3.3 Fixed the receiver log out bugs. [L0ne_W0lf] +//= 3.4 Fixed bug when u can't get a Yellow Keycard if u got the Blue one at first [Lupus] +//= Note: There are many condition checks that should be omitted in the future fixed item names in item_db.txt / txt resources according the quest +//= for items, should be used bitwise methods in a single variable. So let's fix the rest possible bugs (if they exist) and then optimize ^_- //============================================================ //============================================================================ // Kiel Hyre Quest/Robotic Lab Dungeon @@ -82,7 +85,7 @@ // - Accidentally progressed Elly's dialog while reading 'Letter to Elly'. Improvising. // - Possible missing dialog for some getitem weight checks. // - Possible missing dialog for "Test Tube" if you haven't read the second poem. -// - Possible missing dialog for Elly in Dromitory if you don't have "Grey Box" +// - Possible missing dialog for Elly in Dromitory if you don't have "Steel Box" // - Possible missing dialog for "Grave" if you don't have "Yellow Keycard" // - Not going to list ALL of the more usless NPCs. (Doors + Empty "Beautiful Ladies") // - Accidently progressed Kiel Hyre's dialog. Improvising. @@ -1733,14 +1736,14 @@ kh_school,178,180,5 script Elly 895,{ mes "^3355FFIt looks like Elly's^000000"; mes "^3355FFGolden Key might fit^000000"; mes "^3355FFinto the keyhole on the^000000"; - mes "^3355FFGrey Box you found inside^000000"; + mes "^3355FFSteel Box you found inside^000000"; mes "^3355FFKiel Hyre's Cottage.^000000"; next; mes "^3355FFYou successfully open the^000000"; - mes "^3355FFGrey Box with the Golden Key,^000000"; + mes "^3355FFSteel Box with the Golden Key,^000000"; mes "^3355FFand find a Blue Keycard, along^000000"; mes "^3355FFwith a folded note, inside the^000000"; - mes "^3355FFGrey Box. You quickly read^000000"; + mes "^3355FFSteel Box. You quickly read^000000"; mes "^3355FFthe note's contents...^000000"; next; mes "Dearest Elly,"; @@ -1769,7 +1772,7 @@ kh_school,178,180,5 script Elly 895,{ mes "Sorry about that,"; mes "Grandpa"; getitem 7495,1; //Blue_Keycard - delitem 7491,1; //Iron_Box + delitem 7491,1; //Steel_box set KielHyreQuest,36; close; } @@ -1779,7 +1782,7 @@ kh_school,178,180,5 script Elly 895,{ else if (KielHyreQuest >= 36) { mes "^3355FFThis is where you^000000"; mes "^3355FFdiscovered the note^000000"; - mes "^3355FFlocked inside the Grey Box.^000000"; + mes "^3355FFlocked inside the Steel Box.^000000"; mes "^3355FFThe following message was^000000"; mes "^3355FFwritten in the note by Elly's^000000"; mes "^3355FFgrandfather, Kiel Hyre.^000000"; @@ -2797,7 +2800,7 @@ kh_vila,115,186,0 script Drawer::DrawerKHQ1 111,{ mes "trusty Kafra Storage first.^000000"; close; } - if ((countitem(7492) < 1) && (KielHyreQuest < 36)) { + if ((countitem(7492) < 1) && (KielHyreQuest <= 36)) { mes "^3355FFYou find an old drawer^000000"; mes "^3355FFthat has been closed.^000000"; mes "^3355FFIf you open it, then you^000000"; @@ -3002,13 +3005,13 @@ kh_vila,181,138,0 script Bookshelf::BookshelfKHQ1 111,{ if (@KHFirstKeyhole == 2) && (@KHSecondKeyhole == 1) { mes "^3355FFThe safe opens with^000000"; mes "^3355FFa click and you see^000000"; - mes "^3355FFa Grey Box inside.^000000"; - mes "^3355FFYou take the Grey Box^000000"; + mes "^3355FFa Steel Box inside.^000000"; + mes "^3355FFYou take the Steel Box^000000"; mes "^3355FFwith you, hoping that^000000"; mes "^3355FFwill come in handy later.^000000"; delitem 7489,1; //Cottage Key delitem 7516,1; //Green_Keycard - getitem 7491,1; //Iron_Box + getitem 7491,1; //Steel_box close; } @@ -5109,7 +5112,7 @@ kh_mansion,22,28,4 script Kiel Hyre 903,{ delitem 7490,1; //Letter to Elly delitem 7492,1; //Yellow_Keycard delitem 7516,1; //Green_Keycard - delitem 7491,1; //Iron_Box + delitem 7491,1; //Steel_box delitem 7496,1; //Red_Keycard delitem 7497,1; //Metal_Fragment delitem 7504,1; //Power_Source -- cgit v1.2.3-70-g09d2