summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-08-13 19:12:37 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-08-13 19:12:37 +0000
commitbd8608edbf57e8711d33d6637c1a02c63aab37d1 (patch)
treea27c72dbad151a5a189853674f7e6f510951ec6e
parentc9f14d0822260f761b2f6e8629c9eda911563bc4 (diff)
downloadhercules-bd8608edbf57e8711d33d6637c1a02c63aab37d1.tar.gz
hercules-bd8608edbf57e8711d33d6637c1a02c63aab37d1.tar.bz2
hercules-bd8608edbf57e8711d33d6637c1a02c63aab37d1.tar.xz
hercules-bd8608edbf57e8711d33d6637c1a02c63aab37d1.zip
* A few corrections to merchant and wizard job quests, care of Barron-Monster.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10997 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/Changelog.txt1
-rw-r--r--npc/jobs/1-1/merchant.txt4
-rw-r--r--npc/jobs/2-1/wizard.txt4
3 files changed, 7 insertions, 2 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 7abf13f89..b0b349c22 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,7 @@
Date Added
======
2007/08/13
+ * Rev. 10997 A few corrections to merchant and wizard job quests, care of Barron-Monster. [L0ne_W0lf]
* Fixed a wrong negative value checking in Schwartzvalt Trilogy quest. [SinSloth]
* Changed "item names" into item ID constants, added missing [] and fixed a bug in bs skill quest [Lupus]
2007/08/12
diff --git a/npc/jobs/1-1/merchant.txt b/npc/jobs/1-1/merchant.txt
index a5b256159..90b72325d 100644
--- a/npc/jobs/1-1/merchant.txt
+++ b/npc/jobs/1-1/merchant.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88; L0ne_W0lf
//===== Current Version: =====================================
-//= 1.9
+//= 1.9a
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -22,6 +22,7 @@
//= 1.8 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
//= No longer uses function "F_ToHigh"
//= 1.9 Bugfixes, thanks to Barron-Monster. [L0ne_W0lf]
+//= 1.9a Added a missing next; (Barron-Monster) [L0ne_W0lf]
//============================================================
alberta_in,53,43,6 script Merchant#mer 86,{
@@ -215,6 +216,7 @@ alberta_in,53,43,6 script Merchant#mer 86,{
}
else if (job_merchant_q2 == 7 || job_merchant_q2 == 8) {
mes "First, get the package from the storehouse, and then give it to the Kafra Employee stationed on Byalan Island. Her name is Blossom.";
+ nextl
if (job_merchant_q2 == 7) {
mes "[Chief Mahnsoo]";
mes "Remember, the package's Serial Number is ^3355FF3318702^000000.";
diff --git a/npc/jobs/2-1/wizard.txt b/npc/jobs/2-1/wizard.txt
index 46f2379b6..91cd0db8f 100644
--- a/npc/jobs/2-1/wizard.txt
+++ b/npc/jobs/2-1/wizard.txt
@@ -4,7 +4,7 @@
//= (Aegis) Translated by yoshiki, converted by kobra_k88
//= Further bugfixed and tested by Lupus
//===== Current Version: =====================================
-//= 2.5
+//= 2.5a
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -29,6 +29,7 @@
//= 2.3 Bigfoot monster summon corrected [Zairik]
//= 2.4 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
//= 2.5 Several bugfixes with the help of Barron-Monster. [L0ne_W0lf]
+//= 2.5a More bugfixes care of Barron-Monster. [L0ne_W0lf]
//============================================================
gef_tower,111,37,4 script Wizard Guildsman 70,{
@@ -547,6 +548,7 @@ gef_tower,102,24,2 script Gloomy Wizard 735,{
next;
mes "[Raulel]";
mes "*Cough* *cough* Then here go the questions!";
+L_AskQuestions:
next;
switch(rand(1,3)) {
case 1: