summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/custom/itembind.txt13
-rw-r--r--npc/merchants/hair_dyer.txt8
-rw-r--r--npc/merchants/hair_style.txt12
-rw-r--r--npc/re/jobs/3-1/archbishop.txt4
-rw-r--r--npc/re/jobs/3-1/guillotine_cross.txt4
-rw-r--r--npc/re/quests/eden/91-99.txt4
6 files changed, 25 insertions, 20 deletions
diff --git a/npc/custom/itembind.txt b/npc/custom/itembind.txt
index f64225800..d39bfe802 100644
--- a/npc/custom/itembind.txt
+++ b/npc/custom/itembind.txt
@@ -33,11 +33,16 @@ prontera,144,174,4 script Bound Items 4_M_JP_MID,{
for(.@i = 0; .@i < @inventorylist_count; .@i++) {
//We only show the items that you allow to be bound
//Allows equipment (default) or non-rental item
- if( @inventorylist_bound[.@i] || @inventorylist_expire[.@i] )
+ if (@inventorylist_bound[.@i] || @inventorylist_expire[.@i])
continue;
- if(((.allowbind & 1) && (getiteminfo(@inventorylist_id[.@i],2) == (4|5))) ||
- ((.allowbind & 2) && (getiteminfo(@inventorylist_id[.@i],2) == (0|2|11|18))) ||
- ((.allowbind & 4) && (getiteminfo(@inventorylist_id[.@i],2) == (3|6|7|8|10)))
+ if (((.allowbind & 1) && (getiteminfo(@inventorylist_id[.@i], 2) == IT_WEAPON || getiteminfo(@inventorylist_id[.@i], 2) == IT_ARMOR)) ||
+ ((.allowbind & 2) &&
+ (getiteminfo(@inventorylist_id[.@i], 2) == IT_HEALING || getiteminfo(@inventorylist_id[.@i], 2) == IT_USABLE ||
+ getiteminfo(@inventorylist_id[.@i], 2) == IT_DELAYCONSUME || getiteminfo(@inventorylist_id[.@i], 2) == IT_CASH)) ||
+ ((.allowbind & 4) &&
+ (getiteminfo(@inventorylist_id[.@i], 2) == IT_ETC || getiteminfo(@inventorylist_id[.@i], 2) == IT_CARD ||
+ getiteminfo(@inventorylist_id[.@i], 2) == IT_PETEGG || getiteminfo(@inventorylist_id[.@i], 2) == IT_PETARMOR ||
+ getiteminfo(@inventorylist_id[.@i], 2) == IT_AMMO))
) {
set .@bindlist$, .@bindlist$ + ":" + getitemname(@inventorylist_id[.@i]) + " - " + @inventorylist_id[.@i];
set .@bindlist[.@j],.@i;
diff --git a/npc/merchants/hair_dyer.txt b/npc/merchants/hair_dyer.txt
index f1a6732e5..62916ac28 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 a2c090353..83db489ae 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/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt
index 8baccd876..03dc40319 100644
--- a/npc/re/jobs/3-1/archbishop.txt
+++ b/npc/re/jobs/3-1/archbishop.txt
@@ -64,7 +64,7 @@ prt_church,103,88,3 script Praying Minister#arch 1_M_PASTOR,{
mes "I'm going to make them ministers worthy of serving Odin.";
close;
}
- if ((BaseLevel == 99) && (JobLevel > 49)) {
+ if ((BaseLevel >= 99) && (JobLevel > 49)) {
if (job_arch == 0) {
if (SkillPoint) {
mes "You can't change jobs without using all your skill points. Please use all of your skill points before applying to change jobs~";
@@ -775,7 +775,7 @@ job3_arch01,29,34,3 script Valkyrie#arch 4_F_VALKYRIE2,{
mes "- and come for the challenge again. -";
close;
}
- if ((BaseLevel != 99) || (JobLevel < 50) || (BaseJob != Job_Priest)) {
+ if ((BaseLevel < 99) || (JobLevel < 50) || (BaseJob != Job_Priest)) {
warp "odin_tem02",282,263;
end;
}
diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt
index b08062603..c2796526b 100644
--- a/npc/re/jobs/3-1/guillotine_cross.txt
+++ b/npc/re/jobs/3-1/guillotine_cross.txt
@@ -37,7 +37,7 @@
que_job01,75,96,3 script Guild Member#3rdgc01 4_M_MOCASS1,{
if (job_3rd_gc == 0) {
if (Class == Job_Assassin || Class == Job_Assassin_Cross || Class == Job_Baby_Assassin) {
- if (BaseLevel == 99) {
+ if (BaseLevel >= 99) {
L_Mission:
mes "[Ahcart]";
mes "Finally, it's time...";
@@ -127,7 +127,7 @@ que_job01,75,96,3 script Guild Member#3rdgc01 4_M_MOCASS1,{
mes "You are not an assassin.";
close;
} else if (job_3rd_gc == 1) {
- if (BaseLevel == 99) goto L_Mission;
+ if (BaseLevel >= 99) goto L_Mission;
mes "[Ahcart]";
mes "If you become stronger and more skillful, then the assassin's guild will give you a special task.";
mes "Go for it.";
diff --git a/npc/re/quests/eden/91-99.txt b/npc/re/quests/eden/91-99.txt
index d310b4279..2c86f6091 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;
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-31 16:48:29 +0000