summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorIbrahem Hossam <ibrahem.h.basyone@gmail.com>2016-09-02 06:11:40 +0200
committerGitHub <noreply@github.com>2016-09-02 06:11:40 +0200
commit2d4789d60861e498e11aca0f22ebb61014c488f1 (patch)
tree09047a15b924c57743db521abba72a89d1e9980b /npc
parent5e8afffad33d14f39bcdc4e8dd57cd1a588e6ac0 (diff)
parentc8e27db9bc8e0a6b3e7926360f36753741a56272 (diff)
downloadhercules-2d4789d60861e498e11aca0f22ebb61014c488f1.tar.gz
hercules-2d4789d60861e498e11aca0f22ebb61014c488f1.tar.bz2
hercules-2d4789d60861e498e11aca0f22ebb61014c488f1.tar.xz
hercules-2d4789d60861e498e11aca0f22ebb61014c488f1.zip
Merge pull request #1414 from skyleo/minor_quest_fixes
Fixed Mixed Solution No.3 Arc never being assigned and repositioning
Diffstat (limited to 'npc')
-rw-r--r--npc/pre-re/jobs/1-1/mage.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/npc/pre-re/jobs/1-1/mage.txt b/npc/pre-re/jobs/1-1/mage.txt
index 3d1bfe4fc..47ae792fe 100644
--- a/npc/pre-re/jobs/1-1/mage.txt
+++ b/npc/pre-re/jobs/1-1/mage.txt
@@ -117,7 +117,7 @@ geffen_in,164,124,4 script Mage Guildsman 2_F_MAGICMASTER,{
mes "[Mage Guildsman]";
mes "Now it's time for";
mes "me to give you the test.";
- switch(rand(3)) {
+ switch(rand(0,3)) {
case 1:
mes "Make me a ^3355FFMixed Solution No. 1^000000";
mes "and bring it back to me.";
@@ -220,9 +220,6 @@ geffen_in,164,124,4 script Mage Guildsman 2_F_MAGICMASTER,{
mes "Congratulations!";
mes "You are now a Mage!";
next;
- callfunc "Job_Change",Job_Mage;
- callfunc "F_ClearJobVar";
- Zeny += 50;
if (questprogress(1005)) {
completequest 1005;
}
@@ -235,6 +232,9 @@ geffen_in,164,124,4 script Mage Guildsman 2_F_MAGICMASTER,{
else {
completequest 1008;
}
+ callfunc "Job_Change",Job_Mage;
+ callfunc "F_ClearJobVar";
+ Zeny += 50;
mes "[Mage Guildsman]";
mes "'Welcome to My World~'";
mes "Heh heh, I just wanted to say that. You know, it's a quote from a well-known movie~";