summaryrefslogtreecommitdiff
path: root/npc/re/jobs/1-1/merchant.txt
diff options
context:
space:
mode:
authormasao87 <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-08-05 11:19:56 +0000
committermasao87 <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-08-05 11:19:56 +0000
commit8c748978945b24f2b508d54c6068c7ee69a862ad (patch)
tree1df1f2150a53bbebe118e9524929580c6bf27461 /npc/re/jobs/1-1/merchant.txt
parentd6009fd28376933000516e149a60e8d62de51faa (diff)
downloadhercules-8c748978945b24f2b508d54c6068c7ee69a862ad.tar.gz
hercules-8c748978945b24f2b508d54c6068c7ee69a862ad.tar.bz2
hercules-8c748978945b24f2b508d54c6068c7ee69a862ad.tar.xz
hercules-8c748978945b24f2b508d54c6068c7ee69a862ad.zip
- Some little adjustments to the job change quests, also reverted some variables to the old job change files.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16582 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/re/jobs/1-1/merchant.txt')
-rw-r--r--npc/re/jobs/1-1/merchant.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/npc/re/jobs/1-1/merchant.txt b/npc/re/jobs/1-1/merchant.txt
index 5b0b3557c..c9ad936fd 100644
--- a/npc/re/jobs/1-1/merchant.txt
+++ b/npc/re/jobs/1-1/merchant.txt
@@ -14,7 +14,7 @@
//============================================================
alberta_in,53,43,6 script Merchant#mer 86,{
if (Upper == 1) {
- if ((Class == Job_Novice_High) && (FJOB == Job_Mechanic || FJOB == Job_Genetic)) {
+ if ((Class == Job_Novice_High) && (ADVJOB == Job_Whitesmith || ADVJOB == Job_Creator)) {
mes "[Chief Mahnsoo]";
mes "Long time no see!";
mes "Hey, you didn't quit";
@@ -70,7 +70,7 @@ alberta_in,53,43,6 script Merchant#mer 86,{
next;
mes "[Guildsman Mahnsoo]";
mes "Don't you think we need to learn some basic skills although we just deal with money?";
- close2;
+ close;
}
mes "[Guildsman Mahnsoo]";
mes "Good, I think you're fully ready for it seeing that your basic skill level is fulfilled.";
@@ -169,7 +169,7 @@ alberta_in,53,43,6 script Merchant#mer 86,{
}
alberta_in,28,29,2 script Merchant Guildsman 83,{
- if (MERCNT_Q == 0 || MERCNT_Q == 1 || MERCNT_Q == 2) {
+ if ((MERCNT_Q >= 0) && (MERCNT_Q <= 2)) {
mes "[Union Staff Kay]";
mes "I am sorry, but we don't make deliveries anymore.";
mes "Didn't Chief Mahnsoo tell you?";