summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/merchants/hair_dyer.txt8
-rw-r--r--npc/merchants/hair_style.txt12
-rw-r--r--npc/re/quests/eden/91-99.txt4
3 files changed, 12 insertions, 12 deletions
diff --git a/npc/merchants/hair_dyer.txt b/npc/merchants/hair_dyer.txt
index db261c215..1a786b415 100644
--- a/npc/merchants/hair_dyer.txt
+++ b/npc/merchants/hair_dyer.txt
@@ -97,7 +97,7 @@ prt_in,243,168,4 script Jovovich 4_F_02,{
close;
}
- if (.@headpalette == getlook(VAR_HEADPALETTE)) {
+ if (.@headpalette == getlook(LOOK_HAIR_COLOR)) {
mes "[Hairdresser Jovovich]";
mes "Eh? But that's the hair color you already have. Please choose a different color.";
next;
@@ -130,7 +130,7 @@ prt_in,243,168,4 script Jovovich 4_F_02,{
case 8: delitem Scarlet_Dyestuffs,1; break;
}
Zeny -= 1000;
- setlook VAR_HEADPALETTE,.@headpalette;
+ setlook LOOK_HAIR_COLOR,.@headpalette;
.@choose_success = 1;
break;
}
@@ -275,7 +275,7 @@ lhz_in02,100,134,3 script Hair Dyer#lich 4_F_EINWOMAN,{
}
break;
}
- if (getlook(VAR_HEADPALETTE) == .@headpalette) {
+ if (getlook(LOOK_HAIR_COLOR) == .@headpalette) {
mes "[Rossa]";
mes "Hmm, your hair color";
mes "is still fine, so there's";
@@ -388,7 +388,7 @@ lhz_in02,100,134,3 script Hair Dyer#lich 4_F_EINWOMAN,{
else if (.@headpalette == 6) delitem White_Dyestuffs,1;
else if (.@headpalette == 7) delitem Black_Dyestuffs,1;
Zeny -= 1000;
- setlook VAR_HEADPALETTE,.@headpalette;
+ setlook LOOK_HAIR_COLOR,.@headpalette;
.@choose_success = 1;
break;
}
diff --git a/npc/merchants/hair_style.txt b/npc/merchants/hair_style.txt
index 7bfefadf4..2d61d02db 100644
--- a/npc/merchants/hair_style.txt
+++ b/npc/merchants/hair_style.txt
@@ -995,7 +995,7 @@ lhz_in02,100,143,3 script Hair Dresser#li 2_M_DYEINGER,{
mes "you soooooooo beautiful!";
close;
}
- else if (getlook(VAR_HEAD) == .@input) {
+ else if (getlook(LOOK_HAIR) == .@input) {
mes "[Prince Shammi]";
mes "Oh dear me, you're not";
mes "going to waste money for";
@@ -1017,7 +1017,7 @@ lhz_in02,100,143,3 script Hair Dresser#li 2_M_DYEINGER,{
next;
switch(select("Yes.:No.")) {
case 1:
- if (getlook(VAR_HEADPALETTE) == 0) {
+ if (getlook(LOOK_HAIR_COLOR) == 0) {
mes "[Prince Shammi]";
mes "Oh, Sweet Christmas,";
mes "I almost forgot! Would";
@@ -1072,8 +1072,8 @@ lhz_in02,100,143,3 script Hair Dresser#li 2_M_DYEINGER,{
delitem Long_Hair,100;
delitem Golden_Hair,100;
delitem Glossy_Hair,100;
- setlook VAR_HEAD,.@input;
- setlook VAR_HEADPALETTE,.@headpalette;
+ setlook LOOK_HAIR,.@input;
+ setlook LOOK_HAIR_COLOR,.@headpalette;
mes "[Prince Shammi]";
mes "Well, we're all finished!";
mes "And my, oh my, you look even";
@@ -1272,8 +1272,8 @@ lhz_in02,91,155,5 script Assistant Beautician#li 4_F_LGTGIRL,{
mes "^333333*Pant Pant Pant*^000000";
next;
Zeny -= 250000;
- setlook VAR_HEAD,.@style_r;
- setlook VAR_HEADPALETTE,.@color_r;
+ setlook LOOK_HAIR,.@style_r;
+ setlook LOOK_HAIR_COLOR,.@color_r;
mes "[Assistant Beautician]";
mes "Bwahahaha! Success!";
if (.@input == .@style_r) {
diff --git a/npc/re/quests/eden/91-99.txt b/npc/re/quests/eden/91-99.txt
index e5c82022d..7384c4f5c 100644
--- a/npc/re/quests/eden/91-99.txt
+++ b/npc/re/quests/eden/91-99.txt
@@ -206,11 +206,11 @@ L_Quest:
setquest .@quest2;
// Job Experience calculation.
- if (JobLevel > 50 && JobLevel < 56) .@jexp = 67000;
+ if (JobLevel < 56) .@jexp = 67000;
else if (JobLevel > 55 && JobLevel < 61) .@jexp = 94000;
else if (JobLevel > 60 && JobLevel < 66) .@jexp = 141000;
else if (JobLevel > 65 && JobLevel < 69) .@jexp = 212000;
- else if (JobLevel == 69) .@jexp = 311000;
+ else if (JobLevel >= 69) .@jexp = 311000;
getexp getarg(2),.@jexp;
close;