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_morocc.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'npc/quests/quests_morocc.txt') diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt index 563bfe814..6f3e877ae 100644 --- a/npc/quests/quests_morocc.txt +++ b/npc/quests/quests_morocc.txt @@ -2373,7 +2373,7 @@ OnTouch: mes "Hey, master! Do you"; mes "know this guy?"; next; - if(mao_curse == 24) + if(prt_curse == 24) { mes "[" + strcharinfo(0) + "]"; mes "I, um, I'm looking"; @@ -2841,7 +2841,7 @@ OnInit: end; OnTouch: - if(mao_request == 2 || mao_request == 24 || mao_request == 28 || mao_request == 29 || mao_request == 123 || mao_request == 126 || mao_request == 127 || mao_curse == 24) + if(mao_request == 2 || mao_request == 24 || mao_request == 28 || mao_request == 29 || mao_request == 123 || mao_request == 126 || mao_request == 127 || prt_curse == 24) { if(!$maobar_room) { @@ -2865,7 +2865,7 @@ OnTouch: donpcevent "Lin#2::OnEnter"; donpcevent "#mao_table::OnEnter"; } - else if(mao_curse == 24) donpcevent "Marjana::OnEnter"; + else if(prt_curse == 24) donpcevent "Marjana#poison::OnEnable"; mes "[Tao]"; mes "Ah, that place is protected"; mes "by security magic, so you'll"; @@ -2912,7 +2912,7 @@ OnStop: donpcevent "Lin#2::OnInit"; donpcevent "Kidd#1::OnInit"; donpcevent "Kidd#2::OnInit"; - donpcevent "Marjana::OnInit"; + donpcevent "Marjana#poison::OnInit"; donpcevent "#mao_table::OnInit"; donpcevent "#roombar1::OnInit"; stopnpctimer; @@ -2930,7 +2930,7 @@ OnTimer245000: donpcevent "Lin#2::OnInit"; donpcevent "Kidd#1::OnInit"; donpcevent "Kidd#2::OnInit"; - donpcevent "Marjana::OnInit"; + donpcevent "Marjana#poison::OnInit"; donpcevent "#mao_table::OnInit"; end; -- cgit v1.2.3-60-g2f50