diff options
| author | Dastgir <dastgir@users.noreply.github.com> | 2016-08-09 06:35:31 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-09 06:35:31 +0530 |
| commit | 2731ce5374e14db47691e1b3f7d00773369de835 (patch) | |
| tree | a9777683fd30adaeea655d2447f2b7eca23e9bfa | |
| parent | 6f3629033c3879197b1ef0cff3dea4c7f909fe22 (diff) | |
| parent | fff97f21f78ded9a3a2e1b904075d4b645c775c0 (diff) | |
| download | hercules-2731ce5374e14db47691e1b3f7d00773369de835.tar.gz hercules-2731ce5374e14db47691e1b3f7d00773369de835.tar.bz2 hercules-2731ce5374e14db47691e1b3f7d00773369de835.tar.xz hercules-2731ce5374e14db47691e1b3f7d00773369de835.zip | |
Merge pull request #1392 from skyleo/script_fixes
Fixes to Doctor Quest, Crazy Uproar Quest, Kafra HQ's Potato Trader
| -rw-r--r-- | npc/cities/aldebaran.txt | 6 | ||||
| -rw-r--r-- | npc/quests/quests_louyang.txt | 1 | ||||
| -rw-r--r-- | npc/quests/skills/merchant_skills.txt | 6 |
3 files changed, 7 insertions, 6 deletions
diff --git a/npc/cities/aldebaran.txt b/npc/cities/aldebaran.txt index 7cd989574..e7ebe9141 100644 --- a/npc/cities/aldebaran.txt +++ b/npc/cities/aldebaran.txt @@ -36,7 +36,7 @@ //================= Description =========================================== //= Aldebaran Town NPCs //================= Current Version ======================================= -//= 2.3 +//= 2.4 //========================================================================= //== Aldebaran ============================================= @@ -1098,7 +1098,7 @@ aldeba_in,79,161,6 script Kafra#04 4_F_KAFRA3,{ .@list$ = ""; .@numitemchoices = 0; for (.@i = 0; .@i < getarraysize(.@choices) - 3; .@i += 3) { // Skip the last entry as it's handled separately - .@list$ += .@choices[i] + "- " + getitemname(.@choices[.@i+1]) + " " + .@choices[.@i+2] + " ea:"; + .@list$ += .@choices[.@i] + "- " + getitemname(.@choices[.@i+1]) + " " + .@choices[.@i+2] + " ea:"; ++.@numitemchoices; } .@list$ += .@choices[.@i] + "- " + .@ordinal$ + " Lottery Chance!:" + .@changepage$ +":Cancel"; @@ -1111,7 +1111,7 @@ aldeba_in,79,161,6 script Kafra#04 4_F_KAFRA3,{ continue; } RESRVPTS -= .@choices[.@chosen * 3]; - if (.@chosen < .@numitemchances) { + if (.@chosen < .@numitemchoices) { // Item mes "[Kafra]"; mes "Here you are."; diff --git a/npc/quests/quests_louyang.txt b/npc/quests/quests_louyang.txt index 21e56ee25..fad528368 100644 --- a/npc/quests/quests_louyang.txt +++ b/npc/quests/quests_louyang.txt @@ -1429,6 +1429,7 @@ lou_in02,265,69,5 script Doctor#lyang 4_F_CHNDOCTOR,{ mes "^3355FF10 Sprout^000000 and"; mes "^3355FF5 Honey Pot^000000."; ch_par = 17; + changequest 11056,11057; close; } else if (ch_par == 17) { diff --git a/npc/quests/skills/merchant_skills.txt b/npc/quests/skills/merchant_skills.txt index 8a187f70f..ee84bd837 100644 --- a/npc/quests/skills/merchant_skills.txt +++ b/npc/quests/skills/merchant_skills.txt @@ -36,7 +36,7 @@ //================= Description =========================================== //= Quests for skills: Crazy Uproar, Change Cart, Cart Revolution //================= Current Version ======================================= -//= 1.8 +//= 1.9 //========================================================================= alberta,83,96,5 script Necko 4W_M_02,7,7,{ @@ -65,7 +65,7 @@ alberta,83,96,5 script Necko 4W_M_02,7,7,{ mes "Ppyakikakikakakakakakakaka!!"; close; } - else if (JobLevel < 15) { + else if (BaseJob == Job_Merchant && JobLevel < 15) { mes "[Necko]"; mes "Oh, did you come because"; mes "you are infatuated with my voice?"; @@ -86,7 +86,7 @@ alberta,83,96,5 script Necko 4W_M_02,7,7,{ mes "Kyukwakakakakakakakakakaka!"; close; } - else if ((countitem(Scarlet_Jewel) > 6) && (countitem(Banana_Juice) > 0) && (countitem(Mushroom_Spore) > 49) && (JobLevel >= 15 || (BaseJob == Job_Blacksmith || BaseJob == Job_Alchemist))) { + else if ((countitem(Scarlet_Jewel) > 6) && (countitem(Banana_Juice) > 0) && (countitem(Mushroom_Spore) > 49)) { mes "[Necko]"; mes "Oh! You!"; mes "You are qualified to learn how to shout!"; |