summaryrefslogtreecommitdiff
path: root/npc/custom
diff options
context:
space:
mode:
Diffstat (limited to 'npc/custom')
-rw-r--r--npc/custom/WoE_Setter.txt2
-rw-r--r--npc/custom/eAAC_Scripts/banker.txt2
-rw-r--r--npc/custom/eAAC_Scripts/kafraExpress/global_functionsKE.txt2
-rw-r--r--npc/custom/eAAC_Scripts/kafraExpress/ke_bank.txt2
-rw-r--r--npc/custom/eAAC_Scripts/kafraExpress/ke_jobchange.txt8
-rw-r--r--npc/custom/eAAC_Scripts/kafraExpress/ke_jobswap.txt2
-rw-r--r--npc/custom/eAAC_Scripts/kafraExpress/ke_main.txt2
-rw-r--r--npc/custom/eAAC_Scripts/kafraExpress/ke_warp_dungeon.txt6
-rw-r--r--npc/custom/eAAC_Scripts/quest_warper.txt2
-rw-r--r--npc/custom/marriage.txt8
10 files changed, 18 insertions, 18 deletions
diff --git a/npc/custom/WoE_Setter.txt b/npc/custom/WoE_Setter.txt
index 9e5dc05c1..fdab6da98 100644
--- a/npc/custom/WoE_Setter.txt
+++ b/npc/custom/WoE_Setter.txt
@@ -125,7 +125,7 @@ L_Reset:
deletearray $sday[0],200;
deletearray $eday[0],200;
deletearray $woetime[0],200;
- deletearray $woetime2[0],200;
+ deletearray $woetime2[0],200;
mes "[Woe Setter]";
mes "They are all gone now, please remember to set new ones";
close;
diff --git a/npc/custom/eAAC_Scripts/banker.txt b/npc/custom/eAAC_Scripts/banker.txt
index f9111098f..93dcf5e66 100644
--- a/npc/custom/eAAC_Scripts/banker.txt
+++ b/npc/custom/eAAC_Scripts/banker.txt
@@ -368,7 +368,7 @@ prontera,155,188,3 script Zacariath Madhat 872,{
mes "ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ";
if (@totalzeny > @zenyamount || @totalzeny < 0) {
mes "TOTAL Zeny: "+@totalcoins+" - ^CC0000"+@totalzeny+"^000000";
- mes "Zeny Left: "+(@zenyamount-@totalzeny);
+ mes "Zeny Left: "+(@zenyamount-@totalzeny);
goto L_Overzeny;
}
mes "TOTAL: "+@totalcoins+" ^00CC00"+@totalzeny+"^000000";
diff --git a/npc/custom/eAAC_Scripts/kafraExpress/global_functionsKE.txt b/npc/custom/eAAC_Scripts/kafraExpress/global_functionsKE.txt
index 2b41f9190..16931e5ea 100644
--- a/npc/custom/eAAC_Scripts/kafraExpress/global_functionsKE.txt
+++ b/npc/custom/eAAC_Scripts/kafraExpress/global_functionsKE.txt
@@ -193,7 +193,7 @@ function script GF_getJobId {
}
if (@classId >= Job_Taekwon && @classId <= Job_Soul_Linker) {
//Currently has no alternates.
- return @classId;
+ return @classId;
}
if (@classId >= Job_Novice_High && @classId <= Job_Paladin2)
set @classId, @classId -Job_Novice_High;
diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_bank.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_bank.txt
index d5a4093cb..af90b37e7 100644
--- a/npc/custom/eAAC_Scripts/kafraExpress/ke_bank.txt
+++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_bank.txt
@@ -58,7 +58,7 @@ function script F_keBank {
}
switch (@kmenu) {
case 2: //Deposit
- input @amount;
+ input @amount;
if (@amount < $@kebk_minTransact) {
callfunc "F_keIntro", -1, "Sorry, the minimum transaction value is "+$@kebk_minTransact+"z.";
break;
diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_jobchange.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_jobchange.txt
index e720af3aa..5398f97f0 100644
--- a/npc/custom/eAAC_Scripts/kafraExpress/ke_jobchange.txt
+++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_jobchange.txt
@@ -144,7 +144,7 @@ function SF_to1stJob {
function SF_to2ndJob {
do {
- set @newjob, -1;
+ set @newjob, -1;
if (@type == EAJL_UPPER && $@kejc_upperPolicy && kej_class2) {
set @newjob, eaclass(kej_class2);
set @newjob, (@newjob&EAJ_UPPERMASK)|@type;
@@ -202,7 +202,7 @@ function SF_testChangeJob {
if (BaseLevel < getarg(1))
set @fail, @fail|2;
if (JobLevel < getarg(2))
- set @fail, @fail|4;
+ set @fail, @fail|4;
if (@fail > 0) {
if (@fail&1)
mes "You need "+getarg(0)+"z for the conversion process.";
@@ -334,10 +334,10 @@ function SF_changeJob {
if ($@kejc_announce)
announce strcharinfo(0)+" has been promoted to "+@jobStr$+"!",8;
set Zeny,Zeny-@cost;
- emotion e_grat;
+ emotion e_grat;
return 1;
default: //Cancel...
- return 0;
+ return 0;
}
}
diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_jobswap.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_jobswap.txt
index f1499b2e6..6d10ed043 100644
--- a/npc/custom/eAAC_Scripts/kafraExpress/ke_jobswap.txt
+++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_jobswap.txt
@@ -324,7 +324,7 @@ function SF_swapJob {
sc_end -1;
callfunc "F_keCharge",getarg(1),$@kejs_swapDiscount,1;
- emotion e_ok;
+ emotion e_ok;
return 1;
}
diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_main.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_main.txt
index a8f65a2b2..c42a072f2 100644
--- a/npc/custom/eAAC_Scripts/kafraExpress/ke_main.txt
+++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_main.txt
@@ -367,7 +367,7 @@ function script F_keCost {
if (@kafraPass) {
return getarg(0)*(100-getarg(1))/100;
}
- return getarg(0);
+ return getarg(0);
}
//F_keCharge(int cost, int discount%, bool appliesKP)
diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_warp_dungeon.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_warp_dungeon.txt
index 3b9c38fac..8cbf48a54 100644
--- a/npc/custom/eAAC_Scripts/kafraExpress/ke_warp_dungeon.txt
+++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_warp_dungeon.txt
@@ -937,7 +937,7 @@ function SF_hiddenTemple {
"- Entrance ("+@cost+"z/"+getmapusers("prt_maze01")+" "+$@ked_users$+")",
"- Level 2 ("+@cost2+"z/"+getmapusers("prt_maze02")+" "+$@ked_users$+")",
"- Level 3 ("+@cost3+"z/"+getmapusers("prt_maze03")+" "+$@ked_users$+")"
- );
+ );
} else {
set @submenu, select(
"- Cancel warp to the Laberynth Forest",
@@ -970,7 +970,7 @@ function SF_juperos {
"- Entrance ("+@cost+"z/"+getmapusers("juperos_01")+" "+$@ked_users$+")",
"- Level 2 ("+@cost2+"z/"+getmapusers("juperos_02")+" "+$@ked_users$+")",
"- Core ("+@cost3+"z/"+getmapusers("jupe_core")+" "+$@ked_users$+")"
- );
+ );
} else {
set @submenu, select(
"- Cancel warp to Juperos",
@@ -1031,7 +1031,7 @@ function SF_iceCave {
"- Entrance ("+@cost+"z/"+getmapusers("ice_dun01")+" "+$@ked_users$+")",
"- Level 2 ("+@cost2+"z/"+getmapusers("ice_dun02")+" "+$@ked_users$+")",
"- Level 3 ("+@cost3+"z/"+getmapusers("ice_dun03")+" "+$@ked_users$+")"
- );
+ );
} else {
set @submenu, select(
"- Cancel warp to the Ice Cave",
diff --git a/npc/custom/eAAC_Scripts/quest_warper.txt b/npc/custom/eAAC_Scripts/quest_warper.txt
index a9947ee3f..85919fa0f 100644
--- a/npc/custom/eAAC_Scripts/quest_warper.txt
+++ b/npc/custom/eAAC_Scripts/quest_warper.txt
@@ -744,7 +744,7 @@ function script QWS_MMarray {
set @Mmenuref[@Mj],@Mi;
set @Mj,@Mj+1;
}
- set @Mi,@Mi+1;
+ set @Mi,@Mi+1;
//----------------Town-Warp
if ($QW_TW_OFF == 0) set @Mmenulist$[@Mj],@pMmenuitems$[@Mi];
if ($QW_TW_OFF == 0) set @Mmenuref[@Mj],@Mi;
diff --git a/npc/custom/marriage.txt b/npc/custom/marriage.txt
index 0ca3fb069..dbfcd5794 100644
--- a/npc/custom/marriage.txt
+++ b/npc/custom/marriage.txt
@@ -440,7 +440,7 @@ prt_church,106,99,3 script Happy Marry 67,{
if (getpartnerid() > 0) {
mes "["+@name$+"]";
mes "Isn't marriage beautiful?";
- close;
+ close;
}
function SF_WedProgress;
@@ -512,7 +512,7 @@ function SF_Register {
set $wed_progress,1;
mes "["+@name$+"]";
mes "You are now registered as the groom.";
- mes "Tell your bride to register as soon as possible.";
+ mes "Tell your bride to register as soon as possible.";
emotion e_hmm;
initnpctimer;
close;
@@ -523,7 +523,7 @@ function SF_Register {
mes "You are now registered as the bride.";
mes "Tell your groom to register as soon as possible.";
emotion e_hmm;
- initnpctimer;
+ initnpctimer;
close;
default: //Cancel
mes "["+@name$+"]";
@@ -633,7 +633,7 @@ function SF_WedProgress {
mes "The bride, "+$wed_bride$+", has yet to retrieve the ring.";
break;
case 4:
- mes "The bride, "+$wed_bride$+", is waiting for the groom to retrieve the ring.";
+ mes "The bride, "+$wed_bride$+", is waiting for the groom to retrieve the ring.";
break;
case 5:
mes "We are just waiting for both "+$wed_groom$+" and "+$wed_bride$+" to be together to marry them.";
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-02 02:55:22 +0000