From 99936e8b1487b5f922b00d82116e7b430d173333 Mon Sep 17 00:00:00 2001 From: samuray22 Date: Sun, 25 Nov 2007 21:48:50 +0000 Subject: * Fixed a Problem in Mage Quest. (bugreport:489) * Change a "+ name +" to "+ strcharinfo +" in a jawaii NPC. * Change to non-capital letters StarGladiator and SoulLinker Quests Name. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11805 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 3 +++ npc/cities/jawaii.txt | 5 +++-- npc/jobs/1-1/mage.txt | 5 +++-- 3 files changed, 9 insertions(+), 4 deletions(-) (limited to 'npc') diff --git a/npc/Changelog.txt b/npc/Changelog.txt index aee5127f2..f5cf67411 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,6 +1,9 @@ Date Added ====== 2007/11/25 + * Fixed a Problem in Mage Quest. (bugreport:489) [Samuray22] + * Change a "+ name +" to "+ strcharinfo +" in a jawaii NPC. + * Change to non-capital letters StarGladiator and SoulLinker Quests. * Rev. 11802 Updated Super Novice Quest with iRO dialog. [L0ne_W0lf] - Also restructured the NPCs significantly according to iRO's script. * Rev. 11801 Updated Novice Potion exhanger and juice maker. [L0ne_W0lf] diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt index 47faece1e..9a7635933 100644 --- a/npc/cities/jawaii.txt +++ b/npc/cities/jawaii.txt @@ -5,7 +5,7 @@ //= DNett123 (1.1 - 1.5) //= L0ne_w0lf //===== Current Version: ===================================== -//= 3.3 +//= 3.3a //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -31,6 +31,7 @@ //= 3.2 Reverted ispartneron() BACK to getpartnerid(). [L0ne_W0lf] //= None of the NPCs need the player's partner to be online. //= 3.3 Just a small fix up on the Bartender. [L0ne_W0lf] +//= 3.3a Just a little typo error. [Samuray22] //============================================================ // Jawaii //============================================================ @@ -1140,7 +1141,7 @@ jawaii_in,43,115,0 script Customer#jaw_1 97,{ next; mes "^3355FFHe ordered a JJ special for me.^000000"; next; - mes "["+ name +"]"; + mes "["+ strcharinfo(0) +"]"; mes "Damn...!"; mes "Damn! I will be"; mes "the one who laughs last!"; diff --git a/npc/jobs/1-1/mage.txt b/npc/jobs/1-1/mage.txt index 5c9d35655..3cb07c6a2 100644 --- a/npc/jobs/1-1/mage.txt +++ b/npc/jobs/1-1/mage.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88; L0ne_W0lf //===== Current Version: ===================================== -//= 1.7 +//= 1.7a //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -19,6 +19,7 @@ //= 1.6 Merged back JFunc, CHANGED NUMBERS TO CONSTANTS [Lupus] //= 1.7 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf] //= No longer uses function "F_ToHigh" +//= 1.7a Fixed a "If" in the quest. (bugreport:489) [Samuray22] //============================================================ geffen_in,164,124,4 script Mage Guildsman 123,{ @@ -164,7 +165,7 @@ geffen_in,164,124,4 script Mage Guildsman 123,{ close; } else { - if (job_magician_q == 1 && countitem(1071) == 0) || (job_magician_q == 2 && countitem(1085) == 0 || job_magician_q == 3 && countitem(1086) == 0 || job_magician_q == 4 && countitem(1087) == 0) { + if ((job_magician_q == 1 && countitem(1071) == 0) || (job_magician_q == 2 && countitem(1085) == 0) || (job_magician_q == 3 && countitem(1086) == 0) || (job_magician_q == 4 && countitem(1087) == 0)) { mes "Wait."; mes "This isn't the"; mes "Solution I asked for!"; -- cgit v1.2.3-70-g09d2