From 622537266bb785847dd5eb7439bdbe2203a1b75e Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Sun, 10 Jun 2007 01:33:26 +0000 Subject: * Updated (and added) item_trade entries. (Converted from Aegis.) * Updated several Prontera NPCs. - Updated Prontera town NPCs, and Prontera Library. - Updated the Prontera Milk Merchant. - Updated the inn dialogs slightly, and corrected information for Prontera. - Added Gaebolg Family Curse quest. - Commented out old Clothes_dyer npc. * Updated Rachel's guide's while loop to be a bit nicer looking. * Added the ability to redeem lottery tickets before max donation is met. * Changed conflicting warps to the "Adoption" room in the church. * Fixed a bug in Kiel Hyre warps and quest. * Updated Dandelion Request quest for Gaebolg compatibility. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10736 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/quests/quests_rachel.txt | 111 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 105 insertions(+), 6 deletions(-) (limited to 'npc/quests/quests_rachel.txt') diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt index 782cdcee7..695d279c0 100644 --- a/npc/quests/quests_rachel.txt +++ b/npc/quests/quests_rachel.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -36,6 +36,7 @@ //= 1.0 First version, needs testing. [L0ne_W0lf] //= 1.1 Some slight optimization. [L0ne_W0lf] //= 1.2 Fixed Man Stuck in Ice only giving 1 Freezing Snow Powder. [L0ne_W0lf] +//= 1.3 Added hte ability to redeem lottery tickets before donation max is met. [L0ne_W0lf] //============================================================ // Lost Child Quest (Prerequisite to High Priest quest) @@ -5447,7 +5448,98 @@ L_End: ra_temin,170,46,3 script Panno#rachel 920,{ cutin "ra_fano03",2; - if (ra_tem_q == 10) { + if (ra_tem_q < 2) { + mes "[Priestess Panno]"; + mes "Greetings."; + mes "May Freya fill"; + mes "your days with joy."; + mes "Laughter. And prosperity."; + next; + switch(select("Redeem Lottery Tickets:Temple Information:Hey, what's happening?")) { + case 1: + cutin "ra_fano03",2; + mes "[Priestess Panno]"; + mes "Fine. You really"; + mes "want to exchange your"; + mes "Lottery Tickets? It's my job"; + mes "to ask and make sure, you"; + mes "know, in case you were saving"; + mes "them for some weird reason."; + next; + if (select("Yes:No") == 1) { + case 1: + set .@now_weight,MaxWeight-Weight; + if (.@now_weight < 300) { + cutin "ra_fano02",2; + mes "[Priestess Panno]"; + mes "You're carrying too much"; + mes "right now. What are you"; + mes "going to do if I give you"; + mes "something large, unwieldy"; + mes "and heavy? Put your junk"; + mes "away in Storage first."; + goto L_End; + } + goto L_Lottery; + } + cutin "ra_fano03",2; + mes "[Priestess Panno]";; + mes "You can redeem your"; + mes "Lottery Tickets at any"; + mes "time, so please visit"; + mes "me at your leisure."; + mes "Go with Freya."; + goto L_End; + + case 2: + cutin "ra_fano01",2; + mes "[Priestess Panno]"; + mes "The Chapel is located"; + mes "over the wall behind me."; + mes "Our pope's office and chambers"; + mes "are upstairs. You can only go"; + mes "there if you have special"; + mes "authorization."; + next; + mes "["+strcharinfo(0)+"]"; + mes "......"; + mes "........."; + next; + mes "[Priestess Panno]"; + mes "............"; + mes "........."; + mes "......"; + next; + mes "["+strcharinfo(0)+"]"; + mes "...?"; + next; + cutin "ra_fano02",2; + mes "[Priestess Panno]"; + mes "You come to a temple"; + mes "to pray, not to look"; + mes "around. Or chit-chat"; + mes "with the priestesses"; + mes "like me. Don't forget it."; + next; + cutin "ra_fano03",2; + mes "[Priestess Panno]"; + mes "The offices for the High"; + mes "Priests are located on each"; + mes "side of the hallway. However,"; + mes "you can only enter if you've"; + mes "been permitted beforehand."; + goto L_End; + + case 3: + mes "[Priestess Panno]"; + mes "......................"; + mes "No chit-chat"; + mes "inside the temple."; + goto L_End; + } + } + + else if (ra_tem_q == 10) { mes "[Priestess Panno]"; mes "Good day."; next; @@ -5785,10 +5877,17 @@ L_Lottery: mes "You..."; mes "Don't have any Lottery"; mes "Tickets to redeem"; - mes "We're not distributing"; - mes "them now, but maybe you"; - mes "can ask your friends for one."; - next; + if ($rachel_donate > 9999) { + mes "We're not distributing"; + mes "them now, but maybe you"; + mes "can ask your friends for one."; + } + else { + mes "You can obtain them from"; + mes "Priestess Nemma at the temple"; + mes "entrance after you donate zeny."; + } + next; cutin "ra_fano03",2; mes "[Priestess Panno]"; mes "May Freya be with you."; -- cgit v1.2.3-60-g2f50