summaryrefslogtreecommitdiff
path: root/npc/jobs/valkyrie.txt
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2014-11-03 08:15:05 -0200
committershennetsind <ind@henn.et>2014-11-03 08:15:05 -0200
commitbee4c9d36f4a27e39cc76dc5d6c5f876ed44a678 (patch)
tree79f9aec5171e8aed2d701bf67167f260e05f41db /npc/jobs/valkyrie.txt
parent239d480487e24294975f35ed55f210837ad1088e (diff)
parentce3f4bfbe016ea69c855146667ba9bd9e0e2e221 (diff)
downloadhercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.gz
hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.bz2
hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.xz
hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.zip
Merge branch 'master' of github.com:HerculesWS/Hercules
Signed-off-by: shennetsind <ind@henn.et> Conflicts: src/map/battle.c
Diffstat (limited to 'npc/jobs/valkyrie.txt')
-rw-r--r--npc/jobs/valkyrie.txt18
1 files changed, 9 insertions, 9 deletions
diff --git a/npc/jobs/valkyrie.txt b/npc/jobs/valkyrie.txt
index 0aa4c4e3f..0439033b9 100644
--- a/npc/jobs/valkyrie.txt
+++ b/npc/jobs/valkyrie.txt
@@ -64,7 +64,7 @@ valkyrie,48,86,4 script Valkyrie# 4_F_VALKYRIE,{
mes "begin an entirely new life.";
mes "Honor to the warriors!";
next;
- if (Weight > 0 || Zeny > 0 || checkcart() != 0 || checkfalcon() != 0 || checkriding() != 0) {
+ if (Weight > 0 || Zeny > 0 || checkcart() || checkfalcon() || checkmount()) {
mes "[Valkyrie]";
mes "There are a few things you must";
mes "do before we start. You must";
@@ -143,12 +143,12 @@ valkyrie,48,86,4 script Valkyrie# 4_F_VALKYRIE,{
mes "One...";
mes "Two......";
mes "And Three.";
- set ADVJOB, Class+Job_Novice_High; //memo the target 3rd Job ID
- if(ADVJOB == Job_Lord_Knight2) set ADVJOB,Job_Lord_Knight;
- if(ADVJOB == Job_Paladin2) set ADVJOB,Job_Paladin;
+ ADVJOB = Class+Job_Novice_High; //memo the target 3rd Job ID
+ if(ADVJOB == Job_Lord_Knight2) ADVJOB = Job_Lord_Knight;
+ if(ADVJOB == Job_Paladin2) ADVJOB = Job_Paladin;
jobchange Job_Novice_High;
resetlvl(1);
- set MISC_QUEST,MISC_QUEST | 1024; //<-reset Skill Reset Event
+ MISC_QUEST |= 1024; //<-reset Skill Reset Event
skill 142,1,0;
skill 143,1,0;
completequest 1000;
@@ -232,7 +232,7 @@ yuno_in02,88,164,5 script Metheus Sylphe#Library 2_M_SAGE_B,{
if (select("Donate.:Cancel.") == 1) {
if (Zeny >= 1285000) {
Zeny -= 1285000;
- set valkyrie_Q,1;
+ valkyrie_Q = 1;
mes "[Metheus Sylphe]";
mes "Thank you, your donation will be used for a good cause. You may";
mes "now go in and read the book.";
@@ -324,8 +324,8 @@ yuno_in02,93,207,1 script Book of Ymir HIDDEN_NPC,{
mes "So, I am leaving this record in hope that someone in the future";
mes "can confirm that Valkyrie and Valhalla actually exist...";
next;
- set valkyrie_Q,2;
- if(checkquest(1000) == -1) {
+ valkyrie_Q = 2;
+ if(!questprogress(1000)) {
setquest 1000;
}
mes "[The Book of Ymir]";
@@ -352,7 +352,7 @@ yuno_in05,49,43,1 script Heart of Ymir HIDDEN_NPC,{
valkyrie,44,33,5 script Teleporter 4_F_TELEPORTER,{
if (Upper != 1) {
- set .@karma_d,rand(1,10);
+ .@karma_d = rand(1,10);
if (.@karma_d > 4) {
mes "[Teleporter]";
mes "Congratulations.";