From 04a016590175b5807bcbf6737dbee2ae2f515a69 Mon Sep 17 00:00:00 2001 From: j-tkay Date: Mon, 3 Jun 2013 11:53:52 +0000 Subject: [PATCH] Fixed bugreport:7686 - quests_dicastes.txt: Fixed variable. - quests_13_1.txt: Fixed invalid event label. git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17343 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/quests/quests_13_1.txt | 17 +++++++++-------- npc/re/quests/quests_dicastes.txt | 27 ++++++++++++++------------- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt index 54424e7c6f..e67c1e0b6c 100644 --- a/npc/quests/quests_13_1.txt +++ b/npc/quests/quests_13_1.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 2.8 +//= 2.9 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -48,6 +48,7 @@ //= 2.7 Updated EXP rewards. //= 2.7a Added 'consumeitem' command. [Euphy] //= 2.8 Some optimization, and moved an Izlude NPC. [Euphy] +//= 2.9 Fixed an invalid event label. [Joseph] //============================================================ // Onward to the New World @@ -10032,7 +10033,7 @@ mid_camp,206,286,3 script Expedition Messenger 997,{ if ((ep13_1_edq == 3) && (countitem(11012) > 0)) { mes "[Expedition Messenger]"; mes "Welcome, I've been waiting for you."; - mes "You must be" + strcharinfo(0) + ". Nice to meet you."; + mes "You must be " + strcharinfo(0) + ". Nice to meet you."; next; mes "[Expedition Messenger]"; mes "Let me check something quicly. You received the report directly from the commander, didn't you? May I see it?"; @@ -10042,7 +10043,7 @@ mid_camp,206,286,3 script Expedition Messenger 997,{ mes "........."; next; mes "[Expedition Messenger]"; - mes "Excellent. Thank you. Then we'll go back to the mainland and let the leaders know that you,"+ strcharinfo(0) + ", have departed."; + mes "Excellent. Thank you. Then we'll go back to the mainland and let the leaders know that you, "+ strcharinfo(0) + ", have departed."; next; mes "[Expedition Messenger]"; mes "Guys, it's time to go."; @@ -10092,7 +10093,7 @@ mid_camp,206,286,3 script Expedition Messenger 997,{ mes "Argh... You..."; next; mes "[Expedition Messenger]"; - mes "*Cough* Oh, thank god!" + strcharinfo(0) + ", please take the report and run!"; + mes "*Cough* Oh, thank god! " + strcharinfo(0) + ", please take the report and run!"; next; mes "[???]"; mes "No... Noooo!"; @@ -10100,7 +10101,7 @@ mid_camp,206,286,3 script Expedition Messenger 997,{ specialeffect2 EF_SOULBREAKER; specialeffect2 EF_SONICBLOWHIT; mes "[Expedition Messenger]"; - mes "Argh..." + strcharinfo(0) + ", are you alright? The report... The report..."; + mes "Argh... " + strcharinfo(0) + ", are you alright? The report... The report..."; next; delitem 11012,1; //Expedition_Report set ep13_1_edq,4; @@ -10145,7 +10146,7 @@ mid_camp,206,286,3 script Expedition Messenger 997,{ mes "Argh... You..."; next; mes "[Expedition Messenger]"; - mes "*Cough* Oh, thank god!" + strcharinfo(0) + ", please take the report and run!"; + mes "*Cough* Oh, thank god! " + strcharinfo(0) + ", please take the report and run!"; next; mes "[???]"; mes "No... Noooo!"; @@ -10153,7 +10154,7 @@ mid_camp,206,286,3 script Expedition Messenger 997,{ specialeffect2 EF_SOULBREAKER; specialeffect2 EF_SONICBLOWHIT; mes "[Expedition Messenger]"; - mes "Argh..." + strcharinfo(0) + ", are you alright? The report... The report..."; + mes "Argh... " + strcharinfo(0) + ", are you alright? The report... The report..."; next; mes "[Expedition Agent]"; mes "We lost the report. The pages are blowing away!"; @@ -10165,7 +10166,7 @@ mid_camp,206,286,3 script Expedition Messenger 997,{ mes "Haha, I may have failed to take the report, but it's better destroyed than in your hands!"; cutin "ep13_shadow_edq",255; next; - donpcevent "Expedition Messenger#3::OnMessenger#edq3"; + donpcevent "Expedition Messenger#3::OnDisable"; mes "[Expedition Agent]"; mes "Are you alright? What about the report... ?"; next; diff --git a/npc/re/quests/quests_dicastes.txt b/npc/re/quests/quests_dicastes.txt index 7692d33247..def3455969 100644 --- a/npc/re/quests/quests_dicastes.txt +++ b/npc/re/quests/quests_dicastes.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Gennosuke Kouga, Muad_Dib //===== Current Version: ===================================== -//= 1.9a +//= 2.0 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -29,6 +29,7 @@ //= 1.8b Updated "Calyon" NPC and fixed a check. [Euphy] //= 1.9 Updated "Fish Tails" with RE coordinates. //= 1.9a Minor fix. [Joseph] +//= 2.0 Fixed variables. [Joseph] //============================================================ // Entrance @@ -781,18 +782,18 @@ dic_in01,43,273,1 script Transport Dept. 1 Mgr 449,{ next; mes "[Transport Dept. 1 Manager]"; set .@s$, "Quantity check finished. Ahhh, you going to rest? Then why don't you visit the famous pub of the Capital? They have no yummy food though...."; - que_dic(1,12137,30000,7143,4,.@s); - que_dic(1,12138,25000,744,5,.@s); - que_dic(1,12139,47500,748,1,.@s); - que_dic(1,12140,27500,736,15,.@s); - que_dic(1,12141,27000,746,10,.@s); - que_dic(1,12142,27500,740,15,.@s); - que_dic(1,12143,21600,925,50,.@s); - que_dic(1,12144,21400,965,50,.@s); - que_dic(1,12145,20900,964,20,.@s); - que_dic(1,12146,22400,911,30,.@s); - que_dic(1,12147,20800,910,40,.@s); - mes "Um......What do you want me to do?"; + que_dic(1,12137,30000,7143,4,.@s$); + que_dic(1,12138,25000,744,5,.@s$); + que_dic(1,12139,47500,748,1,.@s$); + que_dic(1,12140,27500,736,15,.@s$); + que_dic(1,12141,27000,746,10,.@s$); + que_dic(1,12142,27500,740,15,.@s$); + que_dic(1,12143,21600,925,50,.@s$); + que_dic(1,12144,21400,965,50,.@s$); + que_dic(1,12145,20900,964,20,.@s$); + que_dic(1,12146,22400,911,30,.@s$); + que_dic(1,12147,20800,910,40,.@s$); + mes "Um...... What do you want me to do?"; next; mes "[Transport Dept. 1 Manager]"; mes "....";