Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Merchant job quest bug fixes. Thanks to Barron-Monster.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10989 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
L0ne_W0lf
2007-08-12 22:24:30 +00:00
parent 954fc415c1
commit 5d42c795cc
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
npc/Changelog.txt
View File

@@ -1,6 +1,7 @@
Date Added
======
2007/08/12
* Rev. 10989 Merchant job quest bug fixes. Thanks to Barron-Monster. [L0ne_W0lf]
* Rev. 10987 More bug fixes to the 2-1 quests. Priest and Blacksmith specifically. [L0ne_w0lf]
* Rev. 10985 Bug fixes to the updated 2-1 job quests. [L0ne_W0lf]
- Testing and fixes courtesy of Barron-Monster and Samaury22.

7
npc/jobs/1-1/merchant.txt
View File

@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88; L0ne_W0lf
//===== Current Version: =====================================
//= 1.8
//= 1.9
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -21,6 +21,7 @@
//= 1.7 Updated to use Free Ticket for Kafra [Lupus]
//= 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]
//============================================================
alberta_in,53,43,6 script Merchant#mer 86,{
@@ -202,6 +203,7 @@ alberta_in,53,43,6 script Merchant#mer 86,{
next;
mes "[Chief Mahnsoo]";
mes "You'll have to find Java Dullihan, the Dyemaker, so that you can deliver the product he ordered.";
next;
if (job_merchant_q2 == 5) {
mes "[Chief Mahnsoo]";
mes "But he's a little forgetful, so give it to one of his students. Remember, the package's Serial Number is ^3355FF3012685^000000.";
@@ -503,6 +505,7 @@ alberta_in,28,29,2 script Merchant Guildsman#mer 83,{
else if (job_merchant_q == 8 || job_merchant_q == 7) {
mes "[Union Staff Kay]";
mes "Alright! Everything looks perfect! I'll report your success to the guildmaster. Now go talk to Chief Mahnsoo, yeah?";
close;
}
else if (job_merchant_q == 6 || job_merchant_q == 5) {
mes " [Union Staff Kay] ";
@@ -1060,7 +1063,7 @@ function script F_MercKafra {
mes "the Merchant Guild?";
mes "Oh, yes, please set";
mes "it down right over there...";
if (countitem(1081) == 1 || v[Merchant_Box_2] == 1 || countitem(1091) == 1) {
if (countitem(1081) == 1 || countitem(1082) == 1 || countitem(1091) == 1) {
mes "You must be really tired";
mes "after carrying it for so long!";
}

5
npc/kafras/kafras_dungeons.txt
View File

@@ -3,7 +3,7 @@
//===== By: ============================
//= eAthena Dev Team
//===== Current Version: =======================
//= 2.6
//= 2.7
//===== Compatible With: ============================
//= eAthena 1.0
//===== Description: ============================================
@@ -29,13 +29,14 @@
//= 2.6 Updated function calls with new arguments. [L0ne_W0lf]
//= Added unique Kafra Welcome message.
//= Removed Ant Hell Kafra Employees.
//= 2.7 Merchant quest in the Biliban kafra. (Barron-Monster) [L0ne_W0lf]
//===============================================================
//<============================= Byalan Island ============================>\\
izlu2dun,106,58,8 script Kafra Employee::kaf_izlu2dun 115,{
cutin "kafra_03",2;
if(BaseJob==Job_Novice && job_merchant_q3>0) callfunc "F_MercKafra"; //F_MercKafra found in merchant.txt
if(BaseJob==Job_Novice && job_merchant_q2>0) callfunc "F_MercKafra"; //F_MercKafra found in merchant.txt
mes "[Kafra Employee]";
mes "Welcome to the";
mes "Kafra Corporation.";