summaryrefslogtreecommitdiff
path: root/npc/custom/etc
diff options
context:
space:
mode:
Diffstat (limited to 'npc/custom/etc')
-rw-r--r--npc/custom/etc/airplane.txt196
-rw-r--r--npc/custom/etc/bank.txt26
-rw-r--r--npc/custom/etc/bank_kafra.txt16
-rw-r--r--npc/custom/etc/blackjack.txt8
-rw-r--r--npc/custom/etc/floating_rates.txt2
-rw-r--r--npc/custom/etc/lottery.txt40
-rw-r--r--npc/custom/etc/marriage.txt52
-rw-r--r--npc/custom/etc/monster_arena.txt34
-rw-r--r--npc/custom/etc/morroc_raceway.txt44
-rw-r--r--npc/custom/etc/mvp_arena.txt78
-rw-r--r--npc/custom/etc/penal_servitude.txt16
-rw-r--r--npc/custom/etc/quest_warper.txt222
-rw-r--r--npc/custom/etc/rpsroulette.txt12
-rw-r--r--npc/custom/etc/shifty_assassin.txt8
-rw-r--r--npc/custom/etc/stock_market.txt72
15 files changed, 402 insertions, 424 deletions
diff --git a/npc/custom/etc/airplane.txt b/npc/custom/etc/airplane.txt
index 637d38e61..fc79584fe 100644
--- a/npc/custom/etc/airplane.txt
+++ b/npc/custom/etc/airplane.txt
@@ -21,101 +21,101 @@ OnInit:
deletearray $locationsx[0],500;
deletearray $locationsy[0],500;
deletearray $alreadygoneto[0],500;
- setarray $locationsname$[0],"Airport";
- setarray $locationsname$[1],"Prontera";
- setarray $locationsname$[2],"Payon";
- setarray $locationsname$[3],"Aldebaran";
- setarray $locationsname$[4],"Alberta";
- setarray $locationsname$[5],"Geffen";
- setarray $locationsname$[6],"Morocc";
- setarray $locationsname$[7],"Glast Heim";
- setarray $locationsname$[8],"Umbala";
- setarray $locationsname$[9],"Comodo";
- setarray $locationsname$[10],"Amatsu";
- setarray $locationsname$[11],"Niflheim";
- setarray $locationsname$[12],"Lutie";
- setarray $locationsname$[13],"Louyang";
- setarray $locationsname$[14],"Gonryun";
- setarray $locationsname$[15],"Yuno";
- setarray $locationsname$[16],"Ant Hell";
- setarray $locationsname$[17],"Jawaii";
- setarray $locationsname$[18],"Orc Village";
- setarray $locationsname$[19],"Mjolnir Coal Mines";
- setarray $locationsname$[20],"Gefenia Ruins";
- setarray $locationsname$[21],"Ayothaya";
- setarray $locationsname$[22],"Lighthalzen";
- setarray $locationsname$[23],"Juperos";
- setarray $locationsmap$[0],"airport";
- setarray $locationsmap$[1],"prt_fild08";
- setarray $locationsmap$[2],"pay_fild08";
- setarray $locationsmap$[3],"mjolnir_12";
- setarray $locationsmap$[4],"pay_fild03";
- setarray $locationsmap$[5],"gef_fild00";
- setarray $locationsmap$[6],"moc_fild10";
- setarray $locationsmap$[7],"glast_01";
- setarray $locationsmap$[8],"umbala";
- setarray $locationsmap$[9],"comodo";
- setarray $locationsmap$[10],"amatsu";
- setarray $locationsmap$[11],"niflheim";
- setarray $locationsmap$[12],"xmas";
- setarray $locationsmap$[13],"louyang";
- setarray $locationsmap$[14],"gonryun";
- setarray $locationsmap$[15],"yuno";
- setarray $locationsmap$[16],"moc_fild04";
- setarray $locationsmap$[17],"jawaii";
- setarray $locationsmap$[18],"gef_fild10";
- setarray $locationsmap$[19],"mjolnir_02";
- setarray $locationsmap$[20],"gefenia01";
- setarray $locationsmap$[21],"ayothaya";
+ setarray $locationsname$[0],"Airport";
+ setarray $locationsname$[1],"Prontera";
+ setarray $locationsname$[2],"Payon";
+ setarray $locationsname$[3],"Aldebaran";
+ setarray $locationsname$[4],"Alberta";
+ setarray $locationsname$[5],"Geffen";
+ setarray $locationsname$[6],"Morocc";
+ setarray $locationsname$[7],"Glast Heim";
+ setarray $locationsname$[8],"Umbala";
+ setarray $locationsname$[9],"Comodo";
+ setarray $locationsname$[10],"Amatsu";
+ setarray $locationsname$[11],"Niflheim";
+ setarray $locationsname$[12],"Lutie";
+ setarray $locationsname$[13],"Louyang";
+ setarray $locationsname$[14],"Gonryun";
+ setarray $locationsname$[15],"Yuno";
+ setarray $locationsname$[16],"Ant Hell";
+ setarray $locationsname$[17],"Jawaii";
+ setarray $locationsname$[18],"Orc Village";
+ setarray $locationsname$[19],"Mjolnir Coal Mines";
+ setarray $locationsname$[20],"Gefenia Ruins";
+ setarray $locationsname$[21],"Ayothaya";
+ setarray $locationsname$[22],"Lighthalzen";
+ setarray $locationsname$[23],"Juperos";
+ setarray $locationsmap$[0],"airport";
+ setarray $locationsmap$[1],"prt_fild08";
+ setarray $locationsmap$[2],"pay_fild08";
+ setarray $locationsmap$[3],"mjolnir_12";
+ setarray $locationsmap$[4],"pay_fild03";
+ setarray $locationsmap$[5],"gef_fild00";
+ setarray $locationsmap$[6],"moc_fild10";
+ setarray $locationsmap$[7],"glast_01";
+ setarray $locationsmap$[8],"umbala";
+ setarray $locationsmap$[9],"comodo";
+ setarray $locationsmap$[10],"amatsu";
+ setarray $locationsmap$[11],"niflheim";
+ setarray $locationsmap$[12],"xmas";
+ setarray $locationsmap$[13],"louyang";
+ setarray $locationsmap$[14],"gonryun";
+ setarray $locationsmap$[15],"yuno";
+ setarray $locationsmap$[16],"moc_fild04";
+ setarray $locationsmap$[17],"jawaii";
+ setarray $locationsmap$[18],"gef_fild10";
+ setarray $locationsmap$[19],"mjolnir_02";
+ setarray $locationsmap$[20],"gefenia01";
+ setarray $locationsmap$[21],"ayothaya";
setarray $locationsmap$[22],"lighthalzen";
setarray $locationsmap$[23],"jupe_gate";
- setarray $locationsx[0],148;
- setarray $locationsx[1],206;
- setarray $locationsx[2],159;
- setarray $locationsx[3],62;
- setarray $locationsx[4],194;
- setarray $locationsx[5],50;
- setarray $locationsx[6],163;
- setarray $locationsx[7],196;
+ setarray $locationsx[0],148;
+ setarray $locationsx[1],206;
+ setarray $locationsx[2],159;
+ setarray $locationsx[3],62;
+ setarray $locationsx[4],194;
+ setarray $locationsx[5],50;
+ setarray $locationsx[6],163;
+ setarray $locationsx[7],196;
setarray $locationsx[8],187;
- setarray $locationsx[9],203;
+ setarray $locationsx[9],203;
setarray $locationsx[10],115;
setarray $locationsx[11],132;
setarray $locationsx[12],232;
- setarray $locationsx[13],36;
- setarray $locationsx[14],82;
+ setarray $locationsx[13],36;
+ setarray $locationsx[14],82;
setarray $locationsx[15],58;
setarray $locationsx[16],209;
- setarray $locationsx[17],248;
+ setarray $locationsx[17],248;
setarray $locationsx[18],158;
setarray $locationsx[19],76;
- setarray $locationsx[20],98;
+ setarray $locationsx[20],98;
setarray $locationsx[21],183;
setarray $locationsx[22],99;
setarray $locationsx[23],46;
- setarray $locationsy[0],45;
+ setarray $locationsy[0],45;
setarray $locationsy[1],280;
- setarray $locationsy[2],92;
+ setarray $locationsy[2],92;
setarray $locationsy[3],381;
setarray $locationsy[4],182;
setarray $locationsy[5],365;
setarray $locationsy[6],172;
setarray $locationsy[7],327;
setarray $locationsy[8],98;
- setarray $locationsy[9],76;
+ setarray $locationsy[9],76;
setarray $locationsy[10],79;
setarray $locationsy[11],241;
setarray $locationsy[12],308;
- setarray $locationsy[13],279;
- setarray $locationsy[14],96;
+ setarray $locationsy[13],279;
+ setarray $locationsy[14],96;
setarray $locationsy[15],194;
setarray $locationsy[16],326;
- setarray $locationsy[17],175;
+ setarray $locationsy[17],175;
setarray $locationsy[18],95;
setarray $locationsy[19],363;
- setarray $locationsy[20],21;
+ setarray $locationsy[20],21;
setarray $locationsy[21],104;
- setarray $locationsy[22],240;
+ setarray $locationsy[22],240;
setarray $locationsy[23],19;
goto resetgoneto;
end;
@@ -123,7 +123,7 @@ OnInit:
setrandomitin:
set $@settervariable,$@settervariable + 1;
setarray $locationn[$@settervariable],rand(0,getarraysize($locationsname$) - 1);
- if($alreadygoneto[$locationn[$@settervariable]]==1)set $@settervariable,$@settervariable - 1;
+ if($alreadygoneto[$locationn[$@settervariable]]==1)set $@settervariable,$@settervariable - 1;
if($alreadygoneto[$locationn[$@settervariable]]==1)goto setrandomitin;
setarray $alreadygoneto[$locationn[$@settervariable]], 1;
if($@settervariable<12)goto setrandomitin;
@@ -252,8 +252,8 @@ L_Nope:
Notime:
mes "^FF0000[Porter]^000000";
- if(sex==0) mes "Sorry, ma'am, but the plane currently isn't ported. However, you can view the airplane's hourly itinerary.";
- if(sex==1) mes "Sorry, sir, but the plane currently isn't ported. However, you can view the airplane's hourly itinerary.";
+ if(Sex==0) mes "Sorry, ma'am, but the plane currently isn't ported. However, you can view the airplane's hourly itinerary.";
+ if(Sex==1) mes "Sorry, sir, but the plane currently isn't ported. However, you can view the airplane's hourly itinerary.";
next;
menu "Yes, please.",Itin,"No thanks.",L_Nope;
close;
@@ -264,84 +264,84 @@ Itin:
callfunc "F_Itin";
}
-airport,153,43,5 script Airport Porter 774,{
+airport,153,43,5 script Airport Porter 4_M_TWBOY,{
callfunc "F_Porter",0;
}
-prt_fild08,206,279,5 script Porter#01 774,{
+prt_fild08,206,279,5 script Porter#01 4_M_TWBOY,{
callfunc "F_Porter",1;
}
-gef_fild00,50,364,5 script Porter#02 774,{
+gef_fild00,50,364,5 script Porter#02 4_M_TWBOY,{
callfunc "F_Porter",5;
}
-moc_fild10,163,173,5 script Porter#03 774,{
+moc_fild10,163,173,5 script Porter#03 4_M_TWBOY,{
callfunc "F_Porter",6;
}
-mjolnir_12,61,380,5 script Porter#04 774,{
+mjolnir_12,61,380,5 script Porter#04 4_M_TWBOY,{
callfunc "F_Porter",3;
}
-pay_fild08,159,91,5 script Porter#05 774,{
+pay_fild08,159,91,5 script Porter#05 4_M_TWBOY,{
callfunc "F_Porter",2;
}
-pay_fild03,194,181,5 script Porter#06 774,{
+pay_fild03,194,181,5 script Porter#06 4_M_TWBOY,{
callfunc "F_Porter",4;
}
-glast_01,196,326,1 script Porter#07 774,{
+glast_01,196,326,1 script Porter#07 4_M_TWBOY,{
callfunc "F_Porter",7;
}
-umbala,188,98,3 script Porter#08 774,{
+umbala,188,98,3 script Porter#08 4_M_TWBOY,{
callfunc "F_Porter",8;
}
-comodo,203,75,8 script Porter#09 774,{
+comodo,203,75,8 script Porter#09 4_M_TWBOY,{
callfunc "F_Porter",9;
}
-amatsu,115,78,8 script Porter#10 774,{
+amatsu,115,78,8 script Porter#10 4_M_TWBOY,{
callfunc "F_Porter",10;
}
-niflheim,132,242,5 script Porter#11 774,{
+niflheim,132,242,5 script Porter#11 4_M_TWBOY,{
callfunc "F_Porter",11;
}
-xmas,232,309,5 script Porter#12 774,{
+xmas,232,309,5 script Porter#12 4_M_TWBOY,{
callfunc "F_Porter",12;
}
-louyang,35,279,8 script Porter#13 774,{
+louyang,35,279,8 script Porter#13 4_M_TWBOY,{
callfunc "F_Porter",13;
}
-gonryun,82,95,7 script Porter#14 774,{
+gonryun,82,95,7 script Porter#14 4_M_TWBOY,{
callfunc "F_Porter",14;
}
-yuno,58,195,4 script Porter#15 774,{
+yuno,58,195,4 script Porter#15 4_M_TWBOY,{
callfunc "F_Porter",15;
}
-moc_fild04,210,326,2 script Porter#16 774,{
+moc_fild04,210,326,2 script Porter#16 4_M_TWBOY,{
callfunc "F_Porter",16;
}
-jawaii,247,174,7 script Porter#17 774,{
+jawaii,247,174,7 script Porter#17 4_M_TWBOY,{
callfunc "F_Porter",17;
}
-gef_fild10,159,95,2 script Porter#18 774,{
+gef_fild10,159,95,2 script Porter#18 4_M_TWBOY,{
callfunc "F_Porter",18;
}
-mjolnir_02,76,364,5 script Porter#19 774,{
+mjolnir_02,76,364,5 script Porter#19 4_M_TWBOY,{
callfunc "F_Porter",19;
}
-gefenia01,97,22,6 script Porter#20 774,{
+gefenia01,97,22,6 script Porter#20 4_M_TWBOY,{
callfunc "F_Porter",20;
}
-ayothaya,182,105,5 script Porter#21 774,{
+ayothaya,182,105,5 script Porter#21 4_M_TWBOY,{
callfunc "F_Porter",21;
}
-lighthalzen,99,241,4 script Porter#22 774,{
+lighthalzen,99,241,4 script Porter#22 4_M_TWBOY,{
callfunc "F_Porter",22;
}
-jupe_gate,46,18,7 script Porter#23 774,{
+jupe_gate,46,18,7 script Porter#23 4_M_TWBOY,{
callfunc "F_Porter",23;
}
-airport,141,43,5 script Itinerary Schedule 837,{
+airport,141,43,5 script Itinerary Schedule 2_BULLETIN_BOARD,{
mes "^FF0000[Itinerary]^000000";
callfunc "F_Itin";
}
-airplane,102,68,5 script Docker 852,{
+airplane,102,68,5 script Docker 4_M_EIN_SOLDIER,{
if($destination == 250) goto Nowhere;
mes "^FF0000[Airplane Attendant]^000000";
if($destination == 250)goto Notime;
@@ -363,8 +363,8 @@ Lnope:
Notime:
mes "^FF0000[Airplane Attendant]^000000";
- if(sex==0) mes "Sorry, ma'am, but the plane currently isn't docked. Please wait.";
- if(sex==1) mes "Sorry, sir, but the plane currently isn't docked. Please wait.";
+ if(Sex==0) mes "Sorry, ma'am, but the plane currently isn't docked. Please wait.";
+ if(Sex==1) mes "Sorry, sir, but the plane currently isn't docked. Please wait.";
close;
Nowhere:
diff --git a/npc/custom/etc/bank.txt b/npc/custom/etc/bank.txt
index 00ebc66c8..e6e75c9f3 100644
--- a/npc/custom/etc/bank.txt
+++ b/npc/custom/etc/bank.txt
@@ -1,19 +1,19 @@
//===== Hercules Script ======================================
-//= Banker Script
-//===== By: ==================================================
+//= Banker Script
+//===== By: ==================================================
//= Syrus22 (1.0)
-//===== Current Version: =====================================
+//===== Current Version: =====================================
//= 2.0
-//===== Description: =========================================
+//===== Description: =========================================
//= An account wide Banker to store Zeny
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= Syrus22 - There's an optional transaction fee at the top of
//= the script. To use it simply change the first set command
//= to set the cost variable to whatever you want the fee to be.
//= Version 2.0: Optimized and brought the script up to standard. [Jguy]
-//============================================================
+//============================================================
-prontera,132,217,5 script Banker 109,{
+prontera,132,217,5 script Banker 4_M_MANAGER,{
set @cost,500;
mes "[Banker]";
mes "Welcome to the First Bank of Prontera. How can I help you today?";
@@ -42,8 +42,8 @@ switch(select("I'd like to make a deposit.:I'd like to make a withdrawl.:What's
close;
}
else {
- set Zeny,Zeny - @deposit;
- set Zeny,Zeny - @cost;
+ Zeny -= @deposit;
+ Zeny -= @cost;
set #bankstorage,#bankstorage + @deposit;
mes "[Banker]";
mes "Thank you very much... Your zeny is in good hands.";
@@ -80,8 +80,8 @@ switch(select("I'd like to make a deposit.:I'd like to make a withdrawl.:What's
set #bankstorage,#bankstorage - @cost;
set @cost,0;
next;
- set Zeny,Zeny - @cost;
- set Zeny,Zeny + @withdrawl;
+ Zeny -= @cost;
+ Zeny += @withdrawl;
set #bankstorage,#bankstorage - @withdrawl;
mes "[Banker]";
mes "There's your Zeny. Have a good day.";
@@ -93,8 +93,8 @@ switch(select("I'd like to make a deposit.:I'd like to make a withdrawl.:What's
}
}
else {
- set Zeny,Zeny - @cost;
- set Zeny,Zeny + @withdrawl;
+ Zeny -= @cost;
+ Zeny += @withdrawl;
set #bankstorage,#bankstorage - @withdrawl;
mes "[Banker]";
mes "There's your Zeny. Have a good day.";
diff --git a/npc/custom/etc/bank_kafra.txt b/npc/custom/etc/bank_kafra.txt
index 12f35aff5..ea662499f 100644
--- a/npc/custom/etc/bank_kafra.txt
+++ b/npc/custom/etc/bank_kafra.txt
@@ -18,7 +18,7 @@
// 1.2a Corrected bad duplicate names. (bugreport:921) [Samuray22]
//============================================================
-- script Bank Clerk::bankg 833,{
+- script Bank Clerk::bankg 4_M_ZONDAOYAJI,{
mes"[Maniss]";
mes strcharinfo(0)+", welcome to the 2nd Bank of Prontera!";
@@ -47,8 +47,8 @@ L_NoIncomeToday:
if(input(@kafrabank) == 1) goto L_TOO_BIG_AMOUNT;
if(@kafrabank<1000) goto L_LESS_1000;
- if(@kafrabank>zeny) goto L_NOT_ENOUGH;
- set zeny,zeny-@kafrabank;
+ if(@kafrabank>Zeny) goto L_NOT_ENOUGH;
+ Zeny -= @kafrabank;
set #kafrabank,#kafrabank+@kafrabank;
mes"[Maniss]";
mes "You've made a deposit of ^135445" + @kafrabank + "z^000000.";
@@ -67,7 +67,7 @@ M_WITHDRAW:
if(@kafrabank<1) goto B_EXIT2;
if(@kafrabank>#kafrabank) goto L_NOT_ENOUGH;
set #kafrabank,#kafrabank-@kafrabank;
- set zeny,zeny+@kafrabank;
+ Zeny += @kafrabank;
mes"[Maniss]";
mes "Here is your ^135445" + @kafrabank + "z^000000, put your sign here...";
//we log these zeny operations into the log db
@@ -108,7 +108,7 @@ B_EXIT2:
close;
}
-prontera,131,190,1 duplicate(bankg) Bank Clerk#1-1 833
-geffen,125,73,3 duplicate(bankg) Bank Clerk#2-1 833
-izlude,145,107,1 duplicate(bankg) Bank Clerk#3-1 833
-morocc,147,84,7 duplicate(bankg) Bank Clerk#4-1 833
+prontera,131,190,1 duplicate(bankg) Bank Clerk#1-1 4_M_ZONDAOYAJI
+geffen,125,73,3 duplicate(bankg) Bank Clerk#2-1 4_M_ZONDAOYAJI
+izlude,145,107,1 duplicate(bankg) Bank Clerk#3-1 4_M_ZONDAOYAJI
+morocc,147,84,7 duplicate(bankg) Bank Clerk#4-1 4_M_ZONDAOYAJI
diff --git a/npc/custom/etc/blackjack.txt b/npc/custom/etc/blackjack.txt
index 15e74865c..ee1e7904b 100644
--- a/npc/custom/etc/blackjack.txt
+++ b/npc/custom/etc/blackjack.txt
@@ -12,10 +12,10 @@
//= Currently does not allow for "insurance", or "splitting"
//= of pairs.
//===== Additional Comments: =================================
-//=
+//=
//============================================================
-cmd_in02,188,89,1 script Black Jack Dealer 57,{
+cmd_in02,188,89,1 script Black Jack Dealer 1_M_LIBRARYMASTER,{
mes "[Dealer]";
mes "Hello there! Would you like to play a game of Black Jack?";
M_Menu:
@@ -233,12 +233,12 @@ sL_Win:
mes "[Dealer]";
mes "Congratulations, you've won!";
next;
- set Zeny, Zeny + @bet;
+ Zeny += @bet;
goto L_Play;
sL_Lose:
mes "[Dealer]";
mes "I'm sorry but you've lost.";
- set Zeny, Zeny - @bet;
+ Zeny -= @bet;
next;
goto L_Play;
sL_Push:
diff --git a/npc/custom/etc/floating_rates.txt b/npc/custom/etc/floating_rates.txt
index f499a4f9d..ff3b6e8fa 100644
--- a/npc/custom/etc/floating_rates.txt
+++ b/npc/custom/etc/floating_rates.txt
@@ -4,8 +4,6 @@
//= Lupus
//===== Current Version: =====================================
//= 1.0
-//===== Compatible With: =====================================
-//= Hercules
//===== Description: =========================================
//= It's a simply example of setbattleflag
//= This script will change your server rates from 1x to 1.5x every 6 hours
diff --git a/npc/custom/etc/lottery.txt b/npc/custom/etc/lottery.txt
index 1e35280a4..9d4c4df38 100644
--- a/npc/custom/etc/lottery.txt
+++ b/npc/custom/etc/lottery.txt
@@ -4,8 +4,6 @@
//= acky
//===== Current Version: =====================================
//= 1.2.1a
-//===== Compatible With: =====================================
-//= Hercules
//===== Description: =========================================
//= Daily lottery draw
//===== Additional Comments: =================================
@@ -65,9 +63,9 @@ Pick6:
// BROADCASTS DRAW
L_Broadcast:
- Announce "Lottery: Welcome to tonight's lotto draw!",8;
- Announce "The numbers are as follows: [" + $LW1 + "] [" + $LW2 + "] [" + $LW3 + "] [" + $LW4 + "] [" + $LW5 + "] [" + $LW6 + "]",8;
- Announce "Congratulations to the winners of tonight!",8;
+ announce "Lottery: Welcome to tonight's lotto draw!",8;
+ announce "The numbers are as follows: [" + $LW1 + "] [" + $LW2 + "] [" + $LW3 + "] [" + $LW4 + "] [" + $LW5 + "] [" + $LW6 + "]",8;
+ announce "Congratulations to the winners of tonight!",8;
// GENERATES DRAW ID CODE
L_GenID:
@@ -88,7 +86,7 @@ L_Rigged_Draw:
goto L_Broadcast;
}
-prontera,141,182,5 script Lottery 76,{
+prontera,141,182,5 script Lottery 1_F_ORIENT_02,{
L_Begin:
mes "[Lottery]";
mes "Winning Lotto Numbers ("+$LID2+"):";
@@ -108,8 +106,8 @@ L_Buy:
mes "The Jackpot is ^FF0000" + $L_Prize_Money + "z^000000.";
next;
menu "Buy Ticket",-,"Cancel",L_Cancel;
- if (zeny < $L_TicketPrice) goto L_NoZeny;
- set zeny,zeny-$L_TicketPrice;
+ if (Zeny < $L_TicketPrice) goto L_NoZeny;
+ Zeny -= $L_TicketPrice;
mes "[Lottery]";
mes "Would you like your numbers hand picked or computer generated?";
next;
@@ -294,8 +292,8 @@ LWinBig:
mes "You have matched all six numbers!";
mes "Jackpot!";
mes "You've won ^0000FF" + $L_Prize_Money + "z^000000.";
- set zeny,zeny+$L_Prize_Money;
- Announce "Lottery: " + strcharinfo(0) + " has won the JACKPOT of " + $L_Prize_Money + "z!",8;
+ Zeny += $L_Prize_Money;
+ announce "Lottery: " + strcharinfo(0) + " has won the JACKPOT of " + $L_Prize_Money + "z!",8;
set #LID,0;
close;
@@ -304,8 +302,8 @@ LWinSmall:
mes "[Lottery]";
mes "You have matched at least 4 numbers!";
mes "You've won ^0000FF" + $L_Prize_Money_Small + "z^000000.";
- set zeny,zeny+$L_Prize_Money_Small;
- Announce "Lottery: " + strcharinfo(0) + " has won a prize of " + $L_Prize_Money_Small + "z!",8;
+ Zeny += $L_Prize_Money_Small;
+ announce "Lottery: " + strcharinfo(0) + " has won a prize of " + $L_Prize_Money_Small + "z!",8;
set #LID,0;
close;
@@ -375,9 +373,9 @@ GMPick6:
// BROADCASTS DRAW
L_Broadcast:
- Announce "Lottery: Welcome to the special GM's lotto draw!",8;
- Announce "The numbers are as follows: [" + $LW1 + "] [" + $LW2 + "] [" + $LW3 + "] [" + $LW4 + "] [" + $LW5 + "] [" + $LW6 + "]",8;
- Announce "Congratulations to the winners!",8;
+ announce "Lottery: Welcome to the special GM's lotto draw!",8;
+ announce "The numbers are as follows: [" + $LW1 + "] [" + $LW2 + "] [" + $LW3 + "] [" + $LW4 + "] [" + $LW5 + "] [" + $LW6 + "]",8;
+ announce "Congratulations to the winners!",8;
// GENERATES DRAW ID CODE
L_GenID:
@@ -408,29 +406,29 @@ L_GM_Rig:
set $LR5,0;
set $LR6,0;
GMInput1:
- Input $LR1;
+ input $LR1;
if ($LR1 < 1 || $LR1 > 40) goto GMInput1;
mes $LR1;
GMInput2:
- Input $LR2;
+ input $LR2;
if ($LR2 < 1 || $LR2 > 40) goto GMInput2;
if ($LR2 == $LR1) goto GMInput2;
mes $LR2;
GMInput3:
- Input $LR3;
+ input $LR3;
if ($LR3 < 1 || $LR3 > 40) goto GMInput3;
if ($LR3 == $LR1) goto GMInput3;
if ($LR3 == $LR2) goto GMInput3;
mes $LR3;
GMInput4:
- Input $LR4;
+ input $LR4;
if ($LR4 < 1 || $LR4 > 40) goto GMInput4;
if ($LR4 == $LR1) goto GMInput4;
if ($LR4 == $LR2) goto GMInput4;
if ($LR4 == $LR3) goto GMInput4;
mes $LR4;
GMInput5:
- Input $LR5;
+ input $LR5;
if ($LR5 < 1 || $LR5 > 40) goto GMInput5;
if ($LR5 == $LR1) goto GMInput5;
if ($LR5 == $LR2) goto GMInput5;
@@ -438,7 +436,7 @@ GMInput5:
if ($LR5 == $LR4) goto GMInput5;
mes $LR5;
GMInput6:
- Input $LR6;
+ input $LR6;
if ($LR6 < 1 || $LR6 > 40) goto GMInput6;
if ($LR6 == $LR1) goto GMInput6;
if ($LR6 == $LR2) goto GMInput6;
diff --git a/npc/custom/etc/marriage.txt b/npc/custom/etc/marriage.txt
index 00f44193a..0d25be9d5 100644
--- a/npc/custom/etc/marriage.txt
+++ b/npc/custom/etc/marriage.txt
@@ -4,8 +4,6 @@
//= AppleGirl, Evera
//===== Current Version: =====================================
//= 2.9
-//===== Compatible With: =====================================
-//= Hercules
//===== Description: =========================================
//= Fully working wedding script for all kind of weddings
//===== Additional Comments: =================================
@@ -14,7 +12,7 @@
// 2.9 Somewhat iRO-official NPC names [DracoRPG]
//============================================================
-// Configuration Variables:
+// Configuration Variables:
- script marriage_init -1,{
OnInit:
set $@wed_allow, 0; //If 1, allows same sex marriages.
@@ -32,7 +30,7 @@ OnInit:
// Other Configuration:
// Line 61,62: Priest location, sprite and name.
-// Line 437,438: Registration location, sprite and name.
+// Line 437,438: Registration location, sprite and name.
// Line 813,814: Divorcing location, sprite and name.
// Variable Notes:
@@ -54,7 +52,7 @@ OnInit:
// $@divorcee id of the partner, who has to accept the divorce and pay.
//The Priest - official iRO sprite & in-dialog name (on-map name not confirmed)
-prt_church,100,123,4 script Vomars 60,{
+prt_church,100,123,4 script Vomars 1_M_PASTOR,{
set @name$,"Vomars";
function SF_wed_end;
@@ -394,19 +392,19 @@ OnTimer55000:
//Subfunction: Checks that the groom/bride is still wearing their stuff.
function SF_equip_check {
- if (sex && getequipid(2) != 7170) {
+ if (Sex && getequipid(2) != 7170) {
mes "["+@name$+"]";
mes "Child, what did you do with your "+getitemname(7170)+"?";
emotion e_dots;
return 0;
}
- if (sex == 0 && getequipid(2) != 2338) {
+ if (Sex == 0 && getequipid(2) != 2338) {
mes "["+@name$+"]";
mes "Child, you are supposed to wear a "+getitemname(2338)+" at all times during the ceremony...";
emotion e_dots;
return 0;
}
- if (sex == 0 && $@wed_veil && getequipid(1) != 2206) {
+ if (Sex == 0 && $@wed_veil && getequipid(1) != 2206) {
mes "["+@name$+"]";
mes "Child, you can't take off your "+getitemname(2206)+" yet....";
emotion e_dots;
@@ -435,7 +433,7 @@ OnInit:
}
//Registration & Status
-prt_church,106,99,3 script Happy Marry 67,{
+prt_church,106,99,3 script Happy Marry 1_F_02,{
set @name$,"Marry";
if (getpartnerid() > 0) {
mes "["+@name$+"]";
@@ -489,7 +487,7 @@ function SF_Register {
mes "Very well, whom would you like to register as?";
next;
set @submenu, select("Groom","Bride","Cancel");
- } else if (sex) { //Groom
+ } else if (Sex) { //Groom
mes "["+@name$+"]";
mes "Very well, will you register as the Groom?";
next;
@@ -543,13 +541,13 @@ function SF_WedProgress {
}
if (strcharinfo(0) == $wed_bride$) {
mes "["+@name$+"]";
- if ($wed_groom_progress > 0)
+ if ($wed_groom_progress > 0)
mes "The Priest will handle the rest of the ceremony.";
else
mes "Tell your groom to register, what is taking so long? Time is running out.";
close;
}
- if (($wed_groom_progress == 0) && (sex == 1 || $@wed_allow == 1)) {
+ if (($wed_groom_progress == 0) && (Sex == 1 || $@wed_allow == 1)) {
mes "["+@name$+"]";
mes $wed_bride$+" is waiting for the groom to register. Are you the one who came to register as groom?";
next;
@@ -558,7 +556,7 @@ function SF_WedProgress {
stopnpctimer;
set $wed_groom_progress,1;
mes "["+@name$+"]";
- mes "Very well, now go to the Priest to reaffirm your vows and the ceremony will begin.";
+ mes "Very well, now go to the Priest to reaffirm your vows and the ceremony will begin.";
emotion e_no1;
close2;
npctalk "Registration finished. "+$wed_groom$+" and "+$wed_bride$+", please reaffirm your vows with the Priest.";
@@ -571,7 +569,7 @@ function SF_WedProgress {
}
}
- if (($wed_bride_progress == 0) && (sex == 0 || $@wed_allow == 1)) {
+ if (($wed_bride_progress == 0) && (Sex == 0 || $@wed_allow == 1)) {
mes "["+@name$+"]";
mes $wed_groom$+" is waiting for the bride to register. Are you the one who came to register as the bride?";
next;
@@ -579,7 +577,7 @@ function SF_WedProgress {
SF_TryRegister(1);
stopnpctimer;
mes "["+@name$+"]";
- mes "Very well, now go to the Priest to reaffirm your vows and the ceremony will begin.";
+ mes "Very well, now go to the Priest to reaffirm your vows and the ceremony will begin.";
emotion e_no1;
close2;
npctalk "Registration finished. "+$wed_groom$+" and "+$wed_bride$+", please reaffirm your vows with the Priest.";
@@ -687,7 +685,7 @@ function SF_TryRegister {
emotion e_gasp;
close;
}
- if (sex)
+ if (Sex)
set @item, 7170;
else
set @item, 2338;
@@ -697,7 +695,7 @@ function SF_TryRegister {
mes "You should be wearing a "+getitemname(@item)+" if you want to get married.";
close;
}
- if (sex == 0 && $@wed_veil && getequipid(1) != 2206) {
+ if (Sex == 0 && $@wed_veil && getequipid(1) != 2206) {
mes "["+@name$+"]";
mes "Where is your "+getitemname(2206)+"? It's a necessary complement to your dress.";
close;
@@ -709,27 +707,27 @@ function SF_TryRegister {
}
if (@bride)
set @cost, $@wed_bride_reg;
- else
+ else
set @cost, $@wed_groom_reg;
if (Zeny < @cost) {
mes "["+@name$+"]";
mes "I am sorry, but you don't have enough to pay for the registration fee.";
- mes "Come back once you have collected "+@cost+"z.";
+ mes "Come back once you have collected "+@cost+"z.";
close;
}
- set Zeny,Zeny-@cost;
- sc_start SC_Wedding,3600000000,1; //Start Wedding Effect (SC_WEDDING)
+ Zeny -= @cost;
+ sc_start SC_WEDDING,3600000,1; //Start Wedding Effect (SC_WEDDING)
if (@bride) {
set $wed_bride_progress,1;
set $wed_bride$,strcharinfo(0);
- set $wed_bride_sex, sex;
+ set $wed_bride_sex, Sex;
if ($@wedding_effect == 1) //Store account id for effect.
set $wedding_effect_id, getcharid(3);
} else {
set $wed_groom_progress,1;
set $wed_groom$,strcharinfo(0);
- set $wed_groom_sex, sex;
+ set $wed_groom_sex, Sex;
if ($@wedding_effect == 2) //Store account id for effect.
set $wedding_effect_id, getcharid(3);
}
@@ -811,7 +809,7 @@ function SF_Procedure {
}
}
-prt_church,94,99,4 script Sister Lisa 79,{
+prt_church,94,99,4 script Sister Lisa 1_F_PRIEST,{
set @name$,"Lisa";
function SF_DivorceEnd;
@@ -866,7 +864,7 @@ prt_church,94,99,4 script Sister Lisa 79,{
mes "["+@name$+"]";
mes "You should think this through.";
close;
- }
+ }
mes "["+@name$+"]";
set $@divorcee,getpartnerid();
set $@divorcer$,strcharinfo(0);
@@ -879,7 +877,7 @@ prt_church,94,99,4 script Sister Lisa 79,{
end;
function SF_InProgress {
- if (strcharinfo(0) == $@divorcer$) {
+ if (strcharinfo(0) == $@divorcer$) {
mes "["+@name$+"]";
mes "...I am still waiting for your partner to confirm the divorce procedure.";
close;
@@ -913,7 +911,7 @@ function SF_InProgress {
emotion e_swt2;
close;
}
- set Zeny,Zeny-$@wed_divorce_fee;
+ Zeny -= $@wed_divorce_fee;
announce $@divorcer$+" has just divorced "+strcharinfo(0)+"...", 8;
mes "["+@name$+"]";
mes "Your divorce has been filed. You are no longer wed.";
diff --git a/npc/custom/etc/monster_arena.txt b/npc/custom/etc/monster_arena.txt
index 52ffa115b..82f764977 100644
--- a/npc/custom/etc/monster_arena.txt
+++ b/npc/custom/etc/monster_arena.txt
@@ -4,8 +4,6 @@
//= acky
//===== Current Version: =====================================
//= 1.2
-//===== Compatible With: =====================================
-//= Hercules
//===== Description: =========================================
//= Players train monsters and battle other players.
//= Experience can be earned and monsters upgraded.
@@ -24,7 +22,7 @@
//============================================================
// Entrance //
-prontera,158,193,6 script Monster Arena 702,{
+prontera,158,193,6 script Monster Arena 4_F_GON,{
mes "[Monster Arena]";
mes "Would you like to enter the Monster Arena?";
mes "Currently ^FF0000" + getmapusers("gon_test") + "^000000 players";
@@ -98,7 +96,7 @@ function script monstersummon {
}
// Referee //
-- script monsterreferee 61,{
+- script monsterreferee 1_M_PUBMASTER,{
if (@fighting == 1) end;
if (@battle == 1) goto L_Start;
end;
@@ -195,11 +193,11 @@ L_Exit:
mes "Alright";
close;
}
-gon_test,56,91,6 duplicate(monsterreferee) Referee#01 61
+gon_test,56,91,6 duplicate(monsterreferee) Referee#01 1_M_PUBMASTER
// Usher //
-gon_test,58,94,6 script Usher 86,{
+gon_test,58,94,6 script Usher 4_M_04,{
set @marena,1;
mes "[Usher]";
mes "What would you like to do?";
@@ -276,7 +274,7 @@ L_Cancel:
}
// Monster Trainer //
-gon_test,52,103,6 script Monster Trainer 87,{
+gon_test,52,103,6 script Monster Trainer 4_M_BARBER,{
mes "[Monster Trainer]";
if (#monster != 0) goto L_Mon;
@@ -290,8 +288,8 @@ gon_test,52,103,6 script Monster Trainer 87,{
next;
menu "Yes",-,"No",L_Exit;
- if (zeny < 1000) goto L_NoZeny;
- set zeny,zeny-1000;
+ if (Zeny < 1000) goto L_NoZeny;
+ Zeny -= 1000;
set #monster,10;
mes "[Monster Trainer]";
mes "Congratulations!";
@@ -329,7 +327,7 @@ L_Sell:
if (@sellexp > #monpoints) goto L_NoExp;
set #monpoints,#monpoints-@sellexp;
set @sellearn,100*@sellexp; // Price of exp
- set zeny,zeny+@sellearn;
+ Zeny += @sellearn;
mes "[Monster Trainer]";
mes "You earned ^0000FF" + @sellearn + "^000000z.";
close;
@@ -733,7 +731,7 @@ function script illegalkill {
}
// Healer //
-gon_test,55,103,6 script Nurse 90,{
+gon_test,55,103,6 script Nurse 4_F_01,{
if (@battle == 1 || #heal == 0) goto L_NoHeal;
if (#heal == 1 && @healing < 100) goto L_Heal; //Total healing required
set @fighting,0;
@@ -754,14 +752,14 @@ L_NoHeal:
}
// Warps players //
-gon_test,57,86,5 script Summon Pad 1::SummonPad 111,2,2,{
+gon_test,57,86,5 script Summon Pad 1::SummonPad HIDDEN_NPC,2,2,{
end;
OnTouch:
set @marena,1;
warp "gon_test",57,99;
}
-gon_test,43,87,5 duplicate(SummonPad) Summon Pad 2 111,2,2
-gon_test,72,87,5 duplicate(SummonPad) Summon Pad 3 111,2,2
+gon_test,43,87,5 duplicate(SummonPad) Summon Pad 2 HIDDEN_NPC,2,2
+gon_test,72,87,5 duplicate(SummonPad) Summon Pad 3 HIDDEN_NPC,2,2
@@ -769,7 +767,7 @@ gon_test,72,87,5 duplicate(SummonPad) Summon Pad 3 111,2,2
gon_test mapflag noskill
// Duel Arena //
-gon_test,58,103,5 script Duel Master#01 92,{
+gon_test,58,103,5 script Duel Master#01 4_F_03,{
if ($@duelist1$ == "") set @duel,0;
if ($@monster1 == "") set @duel,0;
set @marena,1;
@@ -861,7 +859,7 @@ L_NeedHeal:
}
// Duel Exit //
-gon_test,42,8,5 script Duel Master#02 92,{
+gon_test,42,8,5 script Duel Master#02 4_F_03,{
mes "[Duel Master]";
mes "Would you like to return?";
menu "Yes",L_Leave,"No",-;
@@ -893,5 +891,5 @@ L_Leave2:
goto L_Leave3;
}
-gon_test,49,5,5 duplicate(SummonPad) Summon Pad 4 111,2,2
-gon_test,55,8,6 duplicate(monsterreferee) Referee#02 61
+gon_test,49,5,5 duplicate(SummonPad) Summon Pad 4 HIDDEN_NPC,2,2
+gon_test,55,8,6 duplicate(monsterreferee) Referee#02 1_M_PUBMASTER
diff --git a/npc/custom/etc/morroc_raceway.txt b/npc/custom/etc/morroc_raceway.txt
index 34614538a..48ee8e47e 100644
--- a/npc/custom/etc/morroc_raceway.txt
+++ b/npc/custom/etc/morroc_raceway.txt
@@ -4,8 +4,6 @@
//= acky
//===== Current Version: =====================================
//= 1.3
-//===== Compatible With: =====================================
-//= Hercules
//===== Description: =========================================
//= Lets players race around Morroc (pvp_y_1-5)
//===== Additional Comments: =================================
@@ -21,7 +19,7 @@
//============================================================
//Warps you into race way
-morocc,166,105,6 script Race Girl#01 116,{
+morocc,166,105,6 script Race Girl#01 4_F_KAFRA2,{
mes "[Race Girl]";
mes "Would you like to visit ^0000FFMorroc Raceway^000000?";
next;
@@ -35,7 +33,7 @@ L_Warp:
}
//Warps you out of raceway
-pvp_y_1-5,169,265,5 script Race Girl#02 116,{
+pvp_y_1-5,169,265,5 script Race Girl#02 4_F_KAFRA2,{
mes "[Race Girl]";
mes "Welcome to Morroc Raceway!";
next;
@@ -58,7 +56,7 @@ L_Cancel:
}
//Counts down and starts race
-pvp_y_1-5,145,269,5 script Starter 733,{
+pvp_y_1-5,145,269,5 script Starter 4_M_JOB_KNIGHT1,{
if ($@race != 0) goto L_Started;
if ($@counting != 0) goto L_Started;
if ($@racecount == 1) goto L_Started;
@@ -112,7 +110,7 @@ OnInit:
}
//Checkpoint 1
-pvp_y_1-5,144,262,5 script Check Point 1 111,0,5,{
+pvp_y_1-5,144,262,5 script Check Point 1 HIDDEN_NPC,0,5,{
end;
OnTouch:
if (@raceid != $@raceid) goto L_Started;
@@ -130,7 +128,7 @@ L_Finished:
}
//Checkpoint 2
-pvp_y_1-5,73,247,5 script Check Point 2 111,6,6,{
+pvp_y_1-5,73,247,5 script Check Point 2 HIDDEN_NPC,6,6,{
end;
OnTouch:
if (@race != 1) goto L_Miss;
@@ -143,7 +141,7 @@ L_Miss:
}
//Checkpoint 3
-pvp_y_1-5,77,44,5 script Check Point 3 111,6,6,{
+pvp_y_1-5,77,44,5 script Check Point 3 HIDDEN_NPC,6,6,{
end;
OnTouch:
if (@race != 2) goto L_Miss;
@@ -156,7 +154,7 @@ L_Miss:
}
//Checkpoint 3
-pvp_y_1-5,249,60,5 script Check Point 4 111,6,6,{
+pvp_y_1-5,249,60,5 script Check Point 4 HIDDEN_NPC,6,6,{
end;
OnTouch:
if (@race != 3) goto L_Miss;
@@ -169,7 +167,7 @@ L_Miss:
}
//Checkpoint 4
-pvp_y_1-5,255,256,5 script Check Point 5 111,6,6,{
+pvp_y_1-5,255,256,5 script Check Point 5 HIDDEN_NPC,6,6,{
end;
OnTouch:
if (@race != 4) goto L_Miss;
@@ -182,7 +180,7 @@ L_Miss:
}
//Finish Line
-pvp_y_1-5,174,244,5 script Finish Line 111,6,6,{
+pvp_y_1-5,174,244,5 script Finish Line HIDDEN_NPC,6,6,{
end;
OnTouch:
if (@raceid != $@raceid) goto L_WrongRace;
@@ -200,39 +198,39 @@ L_WrongRace:
}
//Check Point Marker Flags
-pvp_y_1-5,144,267,4 script Check Point 1#01 722,{
+pvp_y_1-5,144,267,4 script Check Point 1#01 GUILD_FLAG,{
end;
}
-pvp_y_1-5,144,257,4 script Check Point 1#02 722,{
+pvp_y_1-5,144,257,4 script Check Point 1#02 GUILD_FLAG,{
end;
}
-pvp_y_1-5,70,252,3 script Check Point 2#01 722,{
+pvp_y_1-5,70,252,3 script Check Point 2#01 GUILD_FLAG,{
end;
}
-pvp_y_1-5,77,243,3 script Check Point 2#02 722,{
+pvp_y_1-5,77,243,3 script Check Point 2#02 GUILD_FLAG,{
end;
}
-pvp_y_1-5,81,48,1 script Check Point 3#01 722,{
+pvp_y_1-5,81,48,1 script Check Point 3#01 GUILD_FLAG,{
end;
}
-pvp_y_1-5,72,40,1 script Check Point 3#02 722,{
+pvp_y_1-5,72,40,1 script Check Point 3#02 GUILD_FLAG,{
end;
}
-pvp_y_1-5,244,65,7 script Check Point 4#01 722,{
+pvp_y_1-5,244,65,7 script Check Point 4#01 GUILD_FLAG,{
end;
}
-pvp_y_1-5,252,57,7 script Check Point 4#02 722,{
+pvp_y_1-5,252,57,7 script Check Point 4#02 GUILD_FLAG,{
end;
}
-pvp_y_1-5,259,260,5 script Check Point 5#01 722,{
+pvp_y_1-5,259,260,5 script Check Point 5#01 GUILD_FLAG,{
end;
}
-pvp_y_1-5,251,252,5 script Check Point 5#02 722,{
+pvp_y_1-5,251,252,5 script Check Point 5#02 GUILD_FLAG,{
end;
}
-pvp_y_1-5,174,249,4 script Finish Line#01 722,{
+pvp_y_1-5,174,249,4 script Finish Line#01 GUILD_FLAG,{
end;
}
-pvp_y_1-5,174,238,4 script Finish Line#02 722,{
+pvp_y_1-5,174,238,4 script Finish Line#02 GUILD_FLAG,{
end;
}
diff --git a/npc/custom/etc/mvp_arena.txt b/npc/custom/etc/mvp_arena.txt
index d95ed7621..3a1249274 100644
--- a/npc/custom/etc/mvp_arena.txt
+++ b/npc/custom/etc/mvp_arena.txt
@@ -4,8 +4,6 @@
//= Darkchild
//===== Current Version: =====================================
//= 1.4
-//===== Compatible With: =====================================
-//= Hercules
//===== Description: =========================================
//= Rooms containing 16 different MVPs
//===== Additional Comments: =================================
@@ -17,7 +15,7 @@
//============================================================
// Entrance
-prontera,154,197,3 script MVP Warper 768,{
+prontera,154,197,3 script MVP Warper 8_M_JPNMASTER,{
mes "[ ^0065DFMVP Warper^000000 ]";
mes "Would you like to enter";
mes "the MVP Arena?";
@@ -27,7 +25,7 @@ prontera,154,197,3 script MVP Warper 768,{
}
// Information
-quiz_00,49,31,4 script MVP Arena Guide 778,{
+quiz_00,49,31,4 script MVP Arena Guide 4_M_TWTEAMAN,{
mes "[ ^0065DFMVP Arena Guide^000000 ]";
mes "Welcome and behold this sacred place. Here you will find out if you truly have what it takes to call yourself a warrior.";
next;
@@ -66,10 +64,10 @@ function script Keeper {
warp "pvp_n_"+.@i+"-"+getarg(0),102,102;
close;
}
-quiz_00,56,31,4 script Alpha MVP 770,{ callfunc "Keeper",2; }
-quiz_00,58,31,4 script Beta MVP 773,{ callfunc "Keeper",3; }
-quiz_00,60,31,4 script Theta MVP 774,{ callfunc "Keeper",4; }
-quiz_00,62,31,4 script Epsilon MVP 776,{ callfunc "Keeper",5; }
+quiz_00,56,31,4 script Alpha MVP 4_F_TWGIRL,{ callfunc "Keeper",2; }
+quiz_00,58,31,4 script Beta MVP 4_F_TWMIDWOMAN,{ callfunc "Keeper",3; }
+quiz_00,60,31,4 script Theta MVP 4_M_TWBOY,{ callfunc "Keeper",4; }
+quiz_00,62,31,4 script Epsilon MVP 4_M_TWMIDMAN,{ callfunc "Keeper",5; }
// Protectors
function script Protector {
@@ -87,38 +85,38 @@ function script Protector {
end;
}
}
-pvp_n_1-2,100,100,4 script MVP-Protector#01 727,{ callfunc "Protector","pvp_n_2-2"; }
-pvp_n_2-2,100,100,4 script MVP-Protector#02 727,{ callfunc "Protector","pvp_n_3-2"; }
-pvp_n_3-2,100,100,4 script MVP-Protector#03 727,{ callfunc "Protector","pvp_n_4-2"; }
-pvp_n_4-2,100,100,4 script MVP-Protector#04 727,{ callfunc "Protector","pvp_n_5-2"; }
-pvp_n_5-2,100,100,4 script MVP-Protector#05 727,{ callfunc "Protector","pvp_n_6-2"; }
-pvp_n_6-2,100,100,4 script MVP-Protector#06 727,{ callfunc "Protector","pvp_n_7-2"; }
-pvp_n_7-2,100,100,4 script MVP-Protector#07 727,{ callfunc "Protector","pvp_n_8-2"; }
-pvp_n_8-2,100,100,4 script MVP-Protector#08 727,{ callfunc "Protector",""; }
-pvp_n_1-3,100,100,4 script MVP-Protector#09 727,{ callfunc "Protector","pvp_n_2-3"; }
-pvp_n_2-3,100,100,4 script MVP-Protector#10 727,{ callfunc "Protector","pvp_n_3-3"; }
-pvp_n_3-3,100,100,4 script MVP-Protector#11 727,{ callfunc "Protector","pvp_n_4-3"; }
-pvp_n_4-3,100,100,4 script MVP-Protector#12 727,{ callfunc "Protector","pvp_n_5-3"; }
-pvp_n_5-3,100,100,4 script MVP-Protector#13 727,{ callfunc "Protector","pvp_n_6-3"; }
-pvp_n_6-3,100,100,4 script MVP-Protector#14 727,{ callfunc "Protector","pvp_n_7-3"; }
-pvp_n_7-3,100,100,4 script MVP-Protector#15 727,{ callfunc "Protector","pvp_n_8-3"; }
-pvp_n_8-3,100,100,4 script MVP-Protector#16 727,{ callfunc "Protector",""; }
-pvp_n_1-4,100,100,4 script MVP-Protector#17 727,{ callfunc "Protector","pvp_n_2-4"; }
-pvp_n_2-4,100,100,4 script MVP-Protector#18 727,{ callfunc "Protector","pvp_n_3-4"; }
-pvp_n_3-4,100,100,4 script MVP-Protector#19 727,{ callfunc "Protector","pvp_n_4-4"; }
-pvp_n_4-4,100,100,4 script MVP-Protector#20 727,{ callfunc "Protector","pvp_n_5-4"; }
-pvp_n_5-4,100,100,4 script MVP-Protector#21 727,{ callfunc "Protector","pvp_n_6-4"; }
-pvp_n_6-4,100,100,4 script MVP-Protector#22 727,{ callfunc "Protector","pvp_n_7-4"; }
-pvp_n_7-4,100,100,4 script MVP-Protector#23 727,{ callfunc "Protector","pvp_n_8-4"; }
-pvp_n_8-4,100,100,4 script MVP-Protector#24 727,{ callfunc "Protector",""; }
-pvp_n_1-5,100,100,4 script MVP-Protector#25 727,{ callfunc "Protector","pvp_n_2-5"; }
-pvp_n_2-5,100,100,4 script MVP-Protector#26 727,{ callfunc "Protector","pvp_n_3-5"; }
-pvp_n_3-5,100,100,4 script MVP-Protector#27 727,{ callfunc "Protector","pvp_n_4-5"; }
-pvp_n_4-5,100,100,4 script MVP-Protector#28 727,{ callfunc "Protector","pvp_n_5-5"; }
-pvp_n_5-5,100,100,4 script MVP-Protector#29 727,{ callfunc "Protector","pvp_n_6-5"; }
-pvp_n_6-5,100,100,4 script MVP-Protector#30 727,{ callfunc "Protector","pvp_n_7-5"; }
-pvp_n_7-5,100,100,4 script MVP-Protector#31 727,{ callfunc "Protector","pvp_n_8-5"; }
-pvp_n_8-5,100,100,4 script MVP-Protector#32 727,{ callfunc "Protector",""; }
+pvp_n_1-2,100,100,4 script MVP-Protector#01 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_2-2"; }
+pvp_n_2-2,100,100,4 script MVP-Protector#02 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_3-2"; }
+pvp_n_3-2,100,100,4 script MVP-Protector#03 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_4-2"; }
+pvp_n_4-2,100,100,4 script MVP-Protector#04 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_5-2"; }
+pvp_n_5-2,100,100,4 script MVP-Protector#05 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_6-2"; }
+pvp_n_6-2,100,100,4 script MVP-Protector#06 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_7-2"; }
+pvp_n_7-2,100,100,4 script MVP-Protector#07 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_8-2"; }
+pvp_n_8-2,100,100,4 script MVP-Protector#08 4_F_JOB_HUNTER,{ callfunc "Protector",""; }
+pvp_n_1-3,100,100,4 script MVP-Protector#09 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_2-3"; }
+pvp_n_2-3,100,100,4 script MVP-Protector#10 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_3-3"; }
+pvp_n_3-3,100,100,4 script MVP-Protector#11 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_4-3"; }
+pvp_n_4-3,100,100,4 script MVP-Protector#12 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_5-3"; }
+pvp_n_5-3,100,100,4 script MVP-Protector#13 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_6-3"; }
+pvp_n_6-3,100,100,4 script MVP-Protector#14 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_7-3"; }
+pvp_n_7-3,100,100,4 script MVP-Protector#15 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_8-3"; }
+pvp_n_8-3,100,100,4 script MVP-Protector#16 4_F_JOB_HUNTER,{ callfunc "Protector",""; }
+pvp_n_1-4,100,100,4 script MVP-Protector#17 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_2-4"; }
+pvp_n_2-4,100,100,4 script MVP-Protector#18 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_3-4"; }
+pvp_n_3-4,100,100,4 script MVP-Protector#19 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_4-4"; }
+pvp_n_4-4,100,100,4 script MVP-Protector#20 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_5-4"; }
+pvp_n_5-4,100,100,4 script MVP-Protector#21 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_6-4"; }
+pvp_n_6-4,100,100,4 script MVP-Protector#22 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_7-4"; }
+pvp_n_7-4,100,100,4 script MVP-Protector#23 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_8-4"; }
+pvp_n_8-4,100,100,4 script MVP-Protector#24 4_F_JOB_HUNTER,{ callfunc "Protector",""; }
+pvp_n_1-5,100,100,4 script MVP-Protector#25 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_2-5"; }
+pvp_n_2-5,100,100,4 script MVP-Protector#26 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_3-5"; }
+pvp_n_3-5,100,100,4 script MVP-Protector#27 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_4-5"; }
+pvp_n_4-5,100,100,4 script MVP-Protector#28 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_5-5"; }
+pvp_n_5-5,100,100,4 script MVP-Protector#29 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_6-5"; }
+pvp_n_6-5,100,100,4 script MVP-Protector#30 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_7-5"; }
+pvp_n_7-5,100,100,4 script MVP-Protector#31 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_8-5"; }
+pvp_n_8-5,100,100,4 script MVP-Protector#32 4_F_JOB_HUNTER,{ callfunc "Protector",""; }
// Alpha
pvp_n_1-2,0,0,0,0 monster Eddga 1115,3,60000,66000
diff --git a/npc/custom/etc/penal_servitude.txt b/npc/custom/etc/penal_servitude.txt
index 414458cb9..e78833b66 100644
--- a/npc/custom/etc/penal_servitude.txt
+++ b/npc/custom/etc/penal_servitude.txt
@@ -1,11 +1,9 @@
//===== Hercules Script ======================================
-//= Penal Servitude
+//= Penal Servitude
//===== By: ==================================================
//= Lupus
//===== Current Version: =====================================
//= 1.2
-//===== Compatible With: =====================================
-//= Hercules
//===== Description: =========================================
//= A simple Penal Servitude Script.
//= It could cheer up your prisoners a bit.
@@ -16,10 +14,10 @@
// 1.2 Stricted the conditions a bit
//============================================================
-sec_pri,36,58,1 script Chief Warder 105,{
+sec_pri,36,58,1 script Chief Warder 8W_SOLDIER,{
mes "[Saddeus]";
emotion 1;
- if(sex) {
+ if(Sex) {
mes "Mr. Prisoner #"+BaseLevel+JobLevel+",";
} else {
mes "Ms. Prisoner #"+BaseLevel+JobLevel+",";
@@ -45,7 +43,7 @@ M_PAY:
M_PAYCASH:
if (@MUSTPAY>Zeny) goto L_NOCASH;
- set Zeny,Zeny-@MUSTPAY;
+ Zeny -= @MUSTPAY;
mes "[Saddeus]";
mes "OK, sing here and there.";
goto L_RELEASE;
@@ -122,14 +120,14 @@ L_W4:
close;
M_NO_THANKS:
- mes "[Saddeus]";
+ mes "[Saddeus]";
if (rand(2)) mes "Is today X-Mas time, huh?";
mes "Now shut up and back off!";
if (rand(2)) emotion 23;
- close;
+ close;
}
-sec_in02,137,57,1 script Overseer 708,{
+sec_in02,137,57,1 script Overseer 4_M_PAY_SOLDIER,{
mes "[Oliver]";
delitem 4002,countitem(4002);//Items: Fabre_Card,
diff --git a/npc/custom/etc/quest_warper.txt b/npc/custom/etc/quest_warper.txt
index 840325636..b9bfcf74f 100644
--- a/npc/custom/etc/quest_warper.txt
+++ b/npc/custom/etc/quest_warper.txt
@@ -4,8 +4,6 @@
//= DZeroX, Darkchild, Neouni
//===== Current Version: =====================================
//= 2.3
-//===== Compatible With: =====================================
-//= Hercules
//===== Description: =========================================
//= Warper that works only after locations are unlocked.
//===== Additional Comments: =================================
@@ -96,7 +94,7 @@ function script Q_Warpra {
case 10: goto L_GStorage;
case 11:
default:
- goto L_end;
+ goto L_End;
}
//=====================GM-Menu=Functions===========================
@@ -322,14 +320,14 @@ L_town:
freeloop(0);
set @TWMenu,select(.@menu$);
- if (@Tmenuref[@TWMenu-1] == 57005) goto L_end; // 57005='dead' in hex
+ if (@Tmenuref[@TWMenu-1] == 57005) goto L_End; // 57005='dead' in hex
if(Zeny<@pTprice[@Tmenuref[@TWMenu-1]]) callsub L_Short_on_zeny,0;
- set Zeny, Zeny-@pTprice[@Tmenuref[@TWMenu-1]];
+ Zeny -= @pTprice[@Tmenuref[@TWMenu-1]];
if ($QW_KPoint == 1) set RESRVPTS, RESRVPTS + (@pTprice[@Tmenuref[@TWMenu-1]]/16);
warp @pTmap$[@Tmenuref[@TWMenu-1]],@pTXcoords[@Tmenuref[@TWMenu-1]],@pTYcoords[@Tmenuref[@TWMenu-1]];
close2;
- set Zeny, Zeny+@pTprice[@Tmenuref[@TWMenu-1]];
+ Zeny += @pTprice[@Tmenuref[@TWMenu-1]];
end;
//=========================Dungeons================================
@@ -343,7 +341,7 @@ L_dungeon:
freeloop(0);
set @DWMenu,select(.@menu$);
- if (@Dmenuref[@DWMenu-1] == 57005) goto L_end; // 57005='dead' in hex
+ if (@Dmenuref[@DWMenu-1] == 57005) goto L_End; // 57005='dead' in hex
set @DwarpMenu, (@Dmenuref[@DWMenu-1]);
callfunc "QWS_DLarray";
@@ -357,17 +355,17 @@ L_dungeon:
freeloop(0);
set @DWLMenu,select(.@menu$);
- if (@DWLmenuref[@DWLMenu-1] == 57005) goto L_end; // 57005='dead' in hex
+ if (@DWLmenuref[@DWLMenu-1] == 57005) goto L_End; // 57005='dead' in hex
set @Darrayref, @DWLmenuref[@DWLMenu-1];
set @warpprice, @pDprice[@Dmenuref[@DWMenu-1]]+(getd(@pDfee$[@Dmenuref[@DWMenu-1]])*(@DDepth[@Darrayref]));
if(Zeny<@warpprice) callsub L_Short_on_zeny,1;
- set Zeny, Zeny-(@warpprice);
+ Zeny -= (@warpprice);
if ($QW_KPoint == 1) set RESRVPTS, RESRVPTS + (@warpprice/16);
warp @DGat$[@Darrayref],@DXcoords[@Darrayref],@DYcoords[@Darrayref];
close2;
- set Zeny, Zeny+@pTprice[@Tmenuref[@DWMenu-1]];
+ Zeny += @pTprice[@Tmenuref[@DWMenu-1]];
end;
//=============================Healing=============================
@@ -375,7 +373,7 @@ L_dungeon:
L_heal_Full:
set @healfee, $QW_HF_PRICE;
if(Zeny<@healfee) callsub L_Short_on_zeny,4;
- set Zeny, Zeny-@healfee;
+ Zeny -= @healfee;
if ($QW_KPoint == 1) set RESRVPTS, RESRVPTS + (@healfee/500);
next;
mes "[Warpra]";
@@ -389,28 +387,28 @@ L_heal_Part:
if (@healchoice == 1) callsub PHeal,1,1;
if (@healchoice == 2) callsub PHeal,1,0;
if (@healchoice == 3) callsub PHeal,0,1;
- goto L_end;
+ goto L_End;
PHeal:
next;
set @Hp, MaxHp-Hp;
set @Sp, MaxSp-Sp;
- set @HpPrice, @hp*$QW_HP_H_PRICE;
- set @SpPrice, @sp*$QW_HP_S_PRICE;
+ set @HpPrice, @Hp*$QW_HP_H_PRICE;
+ set @SpPrice, @Sp*$QW_HP_S_PRICE;
mes "[Warpra]";
if(getarg(0) == 1) mes ""+@HpPrice+" Zeny for "+@Hp+" health points";
if(getarg(1) == 1) mes ""+@SpPrice+" Zeny for "+@Sp+" skill points";
set @total, @HpPrice+@SpPrice;
mes "for a total of "+@total+" zeny";
- if (select("Heal me","Let me see the choices again")==2) goto L_heal_Part;
-
- if(getarg(0) == 1)set @HpPrice, (MaxHp-Hp)*$QW_HP_H_PRICE;
+ if (select("Heal me","Let me see the choices again")==2) goto L_heal_Part;
+
+ if(getarg(0) == 1)set @HpPrice, (MaxHp-Hp)*$QW_HP_H_PRICE;
if(getarg(1) == 1)set @SpPrice, (MaxSp-Sp)*$QW_HP_S_PRICE;
set @healfee, @HpPrice+@SpPrice;
if (getarg(0) == 1)&&(getarg(1) == 1)&&(Zeny<@healfee) goto Zeny_Short_Both;
if (getarg(0) == 1)&&(Zeny<@healfee) goto Zeny_short_HP;
if (getarg(1) == 1)&&(Zeny<@healfee) goto Zeny_short_SP;
- set Zeny, Zeny-@healfee;
+ Zeny -= @healfee;
if (getarg(0) == 1)&&(getarg(1) == 1) percentheal 100,100;
if (getarg(0) == 1) percentheal 100,0;
if (getarg(1) == 1) percentheal 0,100;
@@ -421,18 +419,18 @@ Zeny_Short_Both:
mes "[Warpra]";
mes "Choose another option, you can afford both.";
mes "I can heal as much as you can afford, too.";
- if (select("OK","Exit") == 2) goto L_end;
+ if (select("OK","Exit") == 2) goto L_End;
goto PHeal;
Zeny_short_HP:
mes "[Warpra]";
mes "Do you want me to partly heal your HP?";
- if (select("Yes","No") == 2) goto L_end;
+ if (select("Yes","No") == 2) goto L_End;
set @Hp, Zeny/$QW_HP_H_PRICE;
- set @HpPrice, @Hp*$QW_HP_H_PRICE;
- if (@Hp == 1) mes "You're not worth the effort.";
- if (@Hp == 1) goto L_end;
- set Zeny, Zeny-@HpPrice;
+ set @HpPrice, @Hp*$QW_HP_H_PRICE;
+ if (@Hp == 1) mes "You're not worth the effort.";
+ if (@Hp == 1) goto L_End;
+ Zeny -= @HpPrice;
heal @Hp,0;
close;
end;
@@ -440,12 +438,12 @@ Zeny_short_HP:
Zeny_short_SP:
mes "[Warpra]";
mes "Do you want me to partly heal your SP?";
- if (select("Yes","No") == 2) goto L_end;
+ if (select("Yes","No") == 2) goto L_End;
set @Sp, Zeny/$QW_HP_S_PRICE;
- set @SpPrice, @Sp*$QW_HP_S_PRICE;
- if (@Sp == 1) mes "You're not worth the effort.";
- if (@Sp == 1) goto L_end;
- set Zeny, Zeny-@SpPrice;
+ set @SpPrice, @Sp*$QW_HP_S_PRICE;
+ if (@Sp == 1) mes "You're not worth the effort.";
+ if (@Sp == 1) goto L_End;
+ Zeny -= @SpPrice;
heal 0,@Sp;
close;
end;
@@ -459,7 +457,7 @@ L_Storage:
if ($QW_S_PRICE == 60)&&(BaseJob == Job_Novice) set @fee, 30;
if ($QW_S_PRICE == 60)&&(BaseJob != Job_Novice) set @fee, 60;
if(Zeny<@fee) callsub L_Short_on_zeny,2;
- set Zeny, Zeny-@fee;
+ Zeny -= @fee;
if ($QW_KPoint == 1) set RESRVPTS, RESRVPTS + (@fee/5);
mes "[Warpra]";
@@ -493,16 +491,16 @@ L_GStorage:
end;
}
if (Zeny<$QW_GS_PRICE) callsub L_Short_on_zeny,3;
- set Zeny, Zeny-$QW_GS_PRICE;
+ Zeny -= $QW_GS_PRICE;
if ($QW_KPoint == 1) set RESRVPTS, RESRVPTS + ($QW_GS_PRICE/5);
next;
mes "[Warpra]";
- mes "Close this window and I will open the ^5533FF" + GetGuildName(@GID) + "^000000 storage.";
+ mes "Close this window and I will open the ^5533FF" + getguildname(@GID) + "^000000 storage.";
close2;
guildopenstorage;
end;
-L_end:
+L_End:
close;
end;
@@ -680,7 +678,7 @@ function script QWS_MMarray {
// QWS_Make_Town_Menu 0; // Use a free number (last used is 30, Eclage)
//
// Adding a warpra:
-// map,x,y,facing script Warpra#example 113,{
+// map,x,y,facing script Warpra#example 4_F_KAFRA5,{
// callfunc "QWS_Town_Warpra",<town number>,"Your Town";
// close;
// }
@@ -1024,7 +1022,7 @@ menu_item:
// QWS_Make_Dungeon_Menu 0; // Use a free number (last used is 28, Kiel Dungeon)
//
// Adding a warpra:
-// map,x,y,facing script Warpra Helper#example 112,{
+// map,x,y,facing script Warpra Helper#example 4_F_KAFRA6,{
// callfunc "QWS_Dungeon_Warpra",<dungeon number>,"Your Dungeon";
// close;
// }
@@ -1067,7 +1065,7 @@ function script QWS_Darray {
QWS_Make_Dungeon_Menu 1;
//----------------ANT HELL
- setarray @pDmenuitems$[@Di], "Ant Hell Dungeon";
+ setarray @pDmenuitems$[@Di], "Ant Hell Dungeon";
setarray @pDprice[@Di], $QW_BW_PRICE;
setarray @pDfee$[@Di], "$QW_BW_FEE";
setarray @DLevels[2], 2;
@@ -1614,79 +1612,79 @@ binget:
//============================Warpras==============================
- script Warpra#0 -1,{ callfunc "Q_Warpra",1; }
-alb2trea,73,101,4 duplicate(Warpra#0) Warpra#1 113
-ama_fild01,178,325,1 duplicate(Warpra#0) Warpra#2 113
-gef_fild10,71,339,4 duplicate(Warpra#0) Warpra#3 113
-izlu2dun,104,82,4 duplicate(Warpra#0) Warpra#4 113
-mjolnir_02,85,363,4 duplicate(Warpra#0) Warpra#5 113
-moc_fild04,207,331,4 duplicate(Warpra#0) Warpra#6 113
-moc_fild19,106,97,4 duplicate(Warpra#0) Warpra#7 113
-moc_ruins,64,166,4 duplicate(Warpra#0) Warpra#8 113
-niflheim,197,192,3 duplicate(Warpra#0) Warpra#9 113
-pay_arche,39,135,4 duplicate(Warpra#0) Warpra#10 113
-prt_fild05,273,215,4 duplicate(Warpra#0) Warpra#11 113
-tur_dun01,148,239,4 duplicate(Warpra#0) Warpra#12 113
-valkyrie,48,35,8 duplicate(Warpra#0) Warpra#13 113
-yuno_fild03,37,135,4 duplicate(Warpra#0) Warpra#14 113
-
-alberta,32,240,4 script Warpra#15 113,{ callfunc "QWS_Town_Warpra",1,"Alberta Town"; close; }
-aldebaran,146,118,4 script Warpra#16 113,{ callfunc "QWS_Town_Warpra",2,"Aldebaran Town"; close; }
-ayothaya,216,171,5 script Warpra#17 113,{ callfunc "QWS_Town_Warpra",4,"Ayotaya Town"; close; }
-amatsu,193,81,1 script Warpra#18 113,{ callfunc "QWS_Town_Warpra",3,"Amatsu Town"; close; }
-comodo,195,158,4 script Warpra#19 113,{ callfunc "QWS_Town_Warpra",5,"Comodo Town"; close; }
-einbroch,229,196,5 script Warpra#20 113,{ callfunc "QWS_Town_Warpra",7,"Einbroch Town"; close; }
-einbech,173,131,5 script Warpra#21 113,{ callfunc "QWS_Town_Warpra",6,"Einbech Town"; close; }
-geffen,116,66,4 script Warpra#22 113,{ callfunc "QWS_Town_Warpra",8,"Geffen Town"; close; }
-gonryun,152,130,4 script Warpra#23 113,{ callfunc "QWS_Town_Warpra",9,"Gonryun Town"; close; }
-hugel,90,127,5 script Warpra#24 113,{ callfunc "QWS_Town_Warpra",10,"Hugel Town"; close; }
-jawaii,107,182,5 script Warpra#25 113,{ callfunc "QWS_Town_Warpra",12,"Jawaii Town"; close; }
-izlude,132,116,4 script Warpra#26 113,{ callfunc "QWS_Town_Warpra",11,"Izlude Town"; close; }
-lighthalzen,153,100,5 script Warpra#27 113,{ callfunc "QWS_Town_Warpra",13,"Lighthalzen Town"; close; }
-louyang,211,106,4 script Warpra#28 113,{ callfunc "QWS_Town_Warpra",14,"Louyang Town"; close; }
-morocc,157,95,4 script Warpra#29 113,{ callfunc "QWS_Town_Warpra",16,"Morroc Town"; close; }
-nif_fild01,319,77,1 script Warpra#30 113,{ callfunc "QWS_Town_Warpra",17,"Niflheim Town"; close; }
-payon,183,110,4 script Warpra#31 113,{ callfunc "QWS_Town_Warpra",18,"Payon Town"; close; }
-prontera,147,172,5 script Warpra#32 113,{ callfunc "QWS_Town_Warpra",0,"Prontera Town"; close; }
-umbala,133,130,4 script Warpra#33 113,{ callfunc "QWS_Town_Warpra",19,"Umbala Town"; close; }
-xmas,151,136,4 script Warpra#34 113,{ callfunc "QWS_Town_Warpra",15,"Lutie Town"; close; }
-yuno,138,162,4 script Warpra#35 113,{ callfunc "QWS_Town_Warpra",20,"Yuno Town"; close; }
-brasilis,201,222,4 script Warpra#36 113,{ callfunc "QWS_Town_Warpra",21,"Brasilis Town"; close; }
-dicastes01,194,194,6 script Warpra#37 113,{ callfunc "QWS_Town_Warpra",22,"El Dicastes Town"; close; }
-manuk,262,177,4 script Warpra#38 113,{ callfunc "QWS_Town_Warpra",23,"Manuk Town"; close; }
-mora,110,100,4 script Warpra#39 113,{ callfunc "QWS_Town_Warpra",24,"Mora Town"; close; }
-moscovia,216,196,6 script Warpra#40 113,{ callfunc "QWS_Town_Warpra",25,"Moscovia Town"; close; }
-rachel,135,116,4 script Warpra#41 113,{ callfunc "QWS_Town_Warpra",26,"Rachel Town"; close; }
-splendide,205,153,4 script Warpra#42 113,{ callfunc "QWS_Town_Warpra",27,"Splendide Town"; close; }
-veins,214,123,4 script Warpra#43 113,{ callfunc "QWS_Town_Warpra",28,"Veins Town"; close; }
-dewata,194,178,6 script Warpra#44 113,{ callfunc "QWS_Town_Warpra",29,"Dewata Town"; close; }
-eclage,107,37,4 script Warpra#45 113,{ callfunc "QWS_Town_Warpra",30,"Eclage Town"; close; }
-
-abyss_02,274,266,1 script Warpra Helper#0 112,{ callfunc "QWS_Dungeon_Warpra",0,"Abyss Lake"; close; }
-ama_dun02,192,118,5 script Warpra Helper#1 112,{ callfunc "QWS_Dungeon_Warpra",1,"Amatsu Dungeon"; close; }
-anthell02,170,165,3 script Warpra Helper#2 112,{ callfunc "QWS_Dungeon_Warpra",2,"Ant Hell Dungeon"; close; }
-ayo_dun02,258,193,5 script Warpra Helper#3 112,{ callfunc "QWS_Dungeon_Warpra",3,"Ayotaya Dungeon"; close; }
-ein_dun02,292,282,1 script Warpra Helper#4 112,{ callfunc "QWS_Dungeon_Warpra",8,"Einbech Dungeon"; close; }
-iz_dun03,202,47,2 script Warpra Helper#5 112,{ callfunc "QWS_Dungeon_Warpra",4,"Byalan Dungeon"; close; }
-c_tower3,129,106,4 script Warpra Helper#6 112,{ callfunc "QWS_Dungeon_Warpra",5,"Clock Tower Dungeon"; close; }
-mjo_dun02,39,25,4 script Warpra Helper#7 112,{ callfunc "QWS_Dungeon_Warpra",6,"Coal Mine Dungeon"; close; }
-prt_sewb2,176,30,3 script Warpra Helper#8 112,{ callfunc "QWS_Dungeon_Warpra",7,"Culvert Dungeon"; close; }
-gefenia03,137,34,0 script Warpra Helper#9 112,{ callfunc "QWS_Dungeon_Warpra",9,"Gefenia Dungeon"; close; }
-gef_dun02,218,61,2 script Warpra Helper#10 112,{ callfunc "QWS_Dungeon_Warpra",10,"Gefen Dungeon"; close; }
-glast_01,371,308,3 script Warpra Helper#11 112,{ callfunc "QWS_Dungeon_Warpra",11,"Glast Heim Dungeon"; close; }
-gon_dun01,167,273,4 script Warpra Helper#12 112,{ callfunc "QWS_Dungeon_Warpra",12,"Gonryun Dungeon"; close; }
-juperos_02,127,154,5 script Warpra Helper#13 112,{ callfunc "QWS_Dungeon_Warpra",14,"Juperos Cave"; close; }
-kh_dun01,14,224,3 script Warpra Helper#14 112,{ callfunc "QWS_Dungeon_Warpra",28,"Kiel Dungeon"; close; }
-lhz_dun02,156,151,5 script Warpra Helper#15 112,{ callfunc "QWS_Dungeon_Warpra",15,"Lighthalzen Bio Lab"; close; }
-lou_dun02,168,264,4 script Warpra Helper#16 112,{ callfunc "QWS_Dungeon_Warpra",16,"Louyang Dungeon"; close; }
-mag_dun02,46,41,3 script Warpra Helper#17 112,{ callfunc "QWS_Dungeon_Warpra",17,"Magma Dungeon"; close; }
-odin_tem01,115,148,3 script Warpra Helper#18 112,{ callfunc "QWS_Dungeon_Warpra",18,"Odin Temple"; close; }
-orcsdun01,185,11,3 script Warpra Helper#19 112,{ callfunc "QWS_Dungeon_Warpra",19,"Orc Dungeon"; close; }
-pay_dun03,162,143,3 script Warpra Helper#20 112,{ callfunc "QWS_Dungeon_Warpra",20,"Payon Dungeon"; close; }
-moc_pryd02,101,95,3 script Warpra Helper#21 112,{ callfunc "QWS_Dungeon_Warpra",21,"Pyramides Dungeon"; close; }
-in_sphinx2,274,268,1 script Warpra Helper#22 112,{ callfunc "QWS_Dungeon_Warpra",22,"Sphinx Dungeon"; close; }
-tha_t07,111,162,3 script Warpra Helper#23 112,{ callfunc "QWS_Dungeon_Warpra",24,"Thanatos Tower"; close; }
-treasure02,104,40,3 script Warpra Helper#24 112,{ callfunc "QWS_Dungeon_Warpra",23,"Sunken Ship Dungeon"; close; }
-xmas_dun02,124,131,3 script Warpra Helper#25 112,{ callfunc "QWS_Dungeon_Warpra",25,"Toy Factory Dungeon"; close; }
-um_dun02,44,28,3 script Warpra Helper#26 112,{ callfunc "QWS_Dungeon_Warpra",27,"Umbala Dungeon"; close; }
-tur_dun02,162,23,3 script Warpra Helper#27 112,{ callfunc "QWS_Dungeon_Warpra",26,"Turtle Island Dungeon"; close; }
-prt_maze02,102,69,4 script Warpra Helper#28 112,{ callfunc "QWS_Dungeon_Warpra",13,"Hidden Dungeon"; close; } \ No newline at end of file
+alb2trea,73,101,4 duplicate(Warpra#0) Warpra#1 4_F_KAFRA5
+ama_fild01,178,325,1 duplicate(Warpra#0) Warpra#2 4_F_KAFRA5
+gef_fild10,71,339,4 duplicate(Warpra#0) Warpra#3 4_F_KAFRA5
+izlu2dun,104,82,4 duplicate(Warpra#0) Warpra#4 4_F_KAFRA5
+mjolnir_02,85,363,4 duplicate(Warpra#0) Warpra#5 4_F_KAFRA5
+moc_fild04,207,331,4 duplicate(Warpra#0) Warpra#6 4_F_KAFRA5
+moc_fild19,106,97,4 duplicate(Warpra#0) Warpra#7 4_F_KAFRA5
+moc_ruins,64,166,4 duplicate(Warpra#0) Warpra#8 4_F_KAFRA5
+niflheim,197,192,3 duplicate(Warpra#0) Warpra#9 4_F_KAFRA5
+pay_arche,39,135,4 duplicate(Warpra#0) Warpra#10 4_F_KAFRA5
+prt_fild05,273,215,4 duplicate(Warpra#0) Warpra#11 4_F_KAFRA5
+tur_dun01,148,239,4 duplicate(Warpra#0) Warpra#12 4_F_KAFRA5
+valkyrie,48,35,8 duplicate(Warpra#0) Warpra#13 4_F_KAFRA5
+yuno_fild03,37,135,4 duplicate(Warpra#0) Warpra#14 4_F_KAFRA5
+
+alberta,32,240,4 script Warpra#15 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",1,"Alberta Town"; close; }
+aldebaran,146,118,4 script Warpra#16 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",2,"Aldebaran Town"; close; }
+ayothaya,216,171,5 script Warpra#17 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",4,"Ayotaya Town"; close; }
+amatsu,193,81,1 script Warpra#18 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",3,"Amatsu Town"; close; }
+comodo,195,158,4 script Warpra#19 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",5,"Comodo Town"; close; }
+einbroch,229,196,5 script Warpra#20 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",7,"Einbroch Town"; close; }
+einbech,173,131,5 script Warpra#21 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",6,"Einbech Town"; close; }
+geffen,116,66,4 script Warpra#22 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",8,"Geffen Town"; close; }
+gonryun,152,130,4 script Warpra#23 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",9,"Gonryun Town"; close; }
+hugel,90,127,5 script Warpra#24 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",10,"Hugel Town"; close; }
+jawaii,107,182,5 script Warpra#25 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",12,"Jawaii Town"; close; }
+izlude,132,116,4 script Warpra#26 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",11,"Izlude Town"; close; }
+lighthalzen,153,100,5 script Warpra#27 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",13,"Lighthalzen Town"; close; }
+louyang,211,106,4 script Warpra#28 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",14,"Louyang Town"; close; }
+morocc,157,95,4 script Warpra#29 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",16,"Morroc Town"; close; }
+nif_fild01,319,77,1 script Warpra#30 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",17,"Niflheim Town"; close; }
+payon,183,110,4 script Warpra#31 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",18,"Payon Town"; close; }
+prontera,147,172,5 script Warpra#32 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",0,"Prontera Town"; close; }
+umbala,133,130,4 script Warpra#33 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",19,"Umbala Town"; close; }
+xmas,151,136,4 script Warpra#34 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",15,"Lutie Town"; close; }
+yuno,138,162,4 script Warpra#35 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",20,"Yuno Town"; close; }
+brasilis,201,222,4 script Warpra#36 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",21,"Brasilis Town"; close; }
+dicastes01,194,194,6 script Warpra#37 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",22,"El Dicastes Town"; close; }
+manuk,262,177,4 script Warpra#38 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",23,"Manuk Town"; close; }
+mora,110,100,4 script Warpra#39 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",24,"Mora Town"; close; }
+moscovia,216,196,6 script Warpra#40 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",25,"Moscovia Town"; close; }
+rachel,135,116,4 script Warpra#41 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",26,"Rachel Town"; close; }
+splendide,205,153,4 script Warpra#42 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",27,"Splendide Town"; close; }
+veins,214,123,4 script Warpra#43 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",28,"Veins Town"; close; }
+dewata,194,178,6 script Warpra#44 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",29,"Dewata Town"; close; }
+eclage,107,37,4 script Warpra#45 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",30,"Eclage Town"; close; }
+
+abyss_02,274,266,1 script Warpra Helper#0 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",0,"Abyss Lake"; close; }
+ama_dun02,192,118,5 script Warpra Helper#1 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",1,"Amatsu Dungeon"; close; }
+anthell02,170,165,3 script Warpra Helper#2 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",2,"Ant Hell Dungeon"; close; }
+ayo_dun02,258,193,5 script Warpra Helper#3 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",3,"Ayotaya Dungeon"; close; }
+ein_dun02,292,282,1 script Warpra Helper#4 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",8,"Einbech Dungeon"; close; }
+iz_dun03,202,47,2 script Warpra Helper#5 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",4,"Byalan Dungeon"; close; }
+c_tower3,129,106,4 script Warpra Helper#6 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",5,"Clock Tower Dungeon"; close; }
+mjo_dun02,39,25,4 script Warpra Helper#7 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",6,"Coal Mine Dungeon"; close; }
+prt_sewb2,176,30,3 script Warpra Helper#8 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",7,"Culvert Dungeon"; close; }
+gefenia03,137,34,0 script Warpra Helper#9 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",9,"Gefenia Dungeon"; close; }
+gef_dun02,218,61,2 script Warpra Helper#10 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",10,"Gefen Dungeon"; close; }
+glast_01,371,308,3 script Warpra Helper#11 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",11,"Glast Heim Dungeon"; close; }
+gon_dun01,167,273,4 script Warpra Helper#12 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",12,"Gonryun Dungeon"; close; }
+juperos_02,127,154,5 script Warpra Helper#13 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",14,"Juperos Cave"; close; }
+kh_dun01,14,224,3 script Warpra Helper#14 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",28,"Kiel Dungeon"; close; }
+lhz_dun02,156,151,5 script Warpra Helper#15 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",15,"Lighthalzen Bio Lab"; close; }
+lou_dun02,168,264,4 script Warpra Helper#16 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",16,"Louyang Dungeon"; close; }
+mag_dun02,46,41,3 script Warpra Helper#17 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",17,"Magma Dungeon"; close; }
+odin_tem01,115,148,3 script Warpra Helper#18 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",18,"Odin Temple"; close; }
+orcsdun01,185,11,3 script Warpra Helper#19 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",19,"Orc Dungeon"; close; }
+pay_dun03,162,143,3 script Warpra Helper#20 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",20,"Payon Dungeon"; close; }
+moc_pryd02,101,95,3 script Warpra Helper#21 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",21,"Pyramides Dungeon"; close; }
+in_sphinx2,274,268,1 script Warpra Helper#22 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",22,"Sphinx Dungeon"; close; }
+tha_t07,111,162,3 script Warpra Helper#23 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",24,"Thanatos Tower"; close; }
+treasure02,104,40,3 script Warpra Helper#24 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",23,"Sunken Ship Dungeon"; close; }
+xmas_dun02,124,131,3 script Warpra Helper#25 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",25,"Toy Factory Dungeon"; close; }
+um_dun02,44,28,3 script Warpra Helper#26 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",27,"Umbala Dungeon"; close; }
+tur_dun02,162,23,3 script Warpra Helper#27 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",26,"Turtle Island Dungeon"; close; }
+prt_maze02,102,69,4 script Warpra Helper#28 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",13,"Hidden Dungeon"; close; }
diff --git a/npc/custom/etc/rpsroulette.txt b/npc/custom/etc/rpsroulette.txt
index 87048a97b..22123580d 100644
--- a/npc/custom/etc/rpsroulette.txt
+++ b/npc/custom/etc/rpsroulette.txt
@@ -4,8 +4,6 @@
//= acky
//===== Current Version: =====================================
//= 1.2
-//===== Compatible With: =====================================
-//= Hercules
//===== Description: =========================================
//= Plays a hybrid Russian Roulette Rock Scissors Paper game.
//===== Additional Comments: =================================
@@ -13,12 +11,12 @@
//= 1.2 Fixes by Blackthunder and me [Poki#3]
//============================================================
-cmd_in02,182,126,2 script Crazy Boris 85,{
+cmd_in02,182,126,2 script Crazy Boris 4_M_03,{
mes "Crazy Boris";
set @counter,1;
mes "Hey you! Up for Rock Scissors Roulette?";
next;
- menu "Let me play.",PLAY,"Explain the rules.",RULES,"Leave",LEAVE;
+ menu "Let me play.",PLAY,"Explain the rules.",L_Rules,"Leave",LEAVE;
SAME:
mes "Draw! Again!";
next;
@@ -39,9 +37,9 @@ LOSE:
PLAY:
mes "Rock... Paper...";
set @opp,rand (1,3);
- menu "^0000FFROCK!",ROCK,"^FF0000SCISSORS!",SCISSORS,"^00FF00PAPER!^000000",PAPER;
+ menu "^0000FFROCK!",L_Rock,"^FF0000SCISSORS!",SCISSORS,"^00FF00PAPER!^000000",PAPER;
-ROCK:
+L_Rock:
if (@lastchoice == 1) set @opp,rand (1,3);
if (@opp == 1) emotion 11;
if (@opp == 2) emotion 10;
@@ -205,7 +203,7 @@ KILL:
next;
goto PRIZE;
-RULES:
+L_Rules:
mes "Ok here are the rules:";
mes "I have with me a ^FF00006^000000 chamber pistol with ^FF00001^000000 round. First we play ^FF0000Scissors ^00FF00Paper ^0000FFRock^000000. The loser pulls the trigger. The winner is whoever comes out best.";
mes "Beat me to win a prize.";
diff --git a/npc/custom/etc/shifty_assassin.txt b/npc/custom/etc/shifty_assassin.txt
index d0fe41d45..f01a328fb 100644
--- a/npc/custom/etc/shifty_assassin.txt
+++ b/npc/custom/etc/shifty_assassin.txt
@@ -4,8 +4,6 @@
//= acky
//===== Current Version: =====================================
//= 1.1.2
-//===== Compatible With: =====================================
-//= Hercules
//===== Description: =========================================
//= Players buy ninjas to assassinate other players
//===== Additional Comments: =================================
@@ -13,7 +11,7 @@
//= 1.1.2 Updated WoE Check. [Paradox924X]
//============================================================
-morocc,148,86,5 script Shifty Assassin 725,{
+morocc,148,86,5 script Shifty Assassin 4_F_JOB_ASSASSIN,{
set $ninja_price,250000;
// STARTS THE MENU //
@@ -50,14 +48,14 @@ M_Buy:
if ($ninja_avail < 1) goto NoNinjas;
if ($ninja_avail < @buy) goto NotEnoughNinjas;
set @price,@buy*$ninja_price;
- if (zeny < @price ) goto NoZeny;
+ if (Zeny < @price ) goto NoZeny;
mes "[Shifty Assassin]";
mes "That will cost you ^0000FF" + @price + " zeny^000000.";
next;
menu "Continue",-,"Cancel",M_Exit;
- set zeny,zeny-@price;
+ Zeny -= @price;
set #ninjas,#ninjas+@buy;
set $ninja_avail,$ninja_avail-@buy;
diff --git a/npc/custom/etc/stock_market.txt b/npc/custom/etc/stock_market.txt
index 26d368cdf..060228317 100644
--- a/npc/custom/etc/stock_market.txt
+++ b/npc/custom/etc/stock_market.txt
@@ -4,8 +4,6 @@
//= acky
//===== Current Version: =====================================
//= 1.3.1
-//===== Compatible With: =====================================
-//= Hercules
//===== Description: =========================================
//= NPC for a stock market game.
//===== Additional Comments: =================================
@@ -172,7 +170,7 @@ S_Fluc:
end;
}
-prontera,140,181,5 script Stock Market::stockmarket 109,{
+prontera,140,181,5 script Stock Market::stockmarket 4_M_MANAGER,{
// Ensures no trading when default prices have not been set //
set @stotal,$S1+$S2+$S3+$S4+$S5+$S6+$S7+$S8+$S9+$S10;
if (@stotal > 0) goto S_Start;
@@ -279,15 +277,15 @@ S_Sell:
set @sellamount,0;
input @sellamount;
if (@sellamount < 1) goto S_SellInv;
- if (zeny < $S_Trans) goto S_NoZeny;
- set zeny,zeny-$S_Trans;
+ if (Zeny < $S_Trans) goto S_NoZeny;
+ Zeny -= $S_Trans;
SELLS1:
if (@sellname$ != $S1N$) goto SELLS2;
if (@sellamount > #S1) goto S_SellTooHigh;
set @price,@sellamount*$S1;
set #S1,#S1-@sellamount;
- set zeny,zeny+@price;
+ Zeny += @price;
next;
mes "Sold " + @sellamount + " " + $S1N$ + " shares.";
mes "Earned ^0000FF"+@price+"z^000000.";
@@ -299,7 +297,7 @@ SELLS2:
if (@sellamount > #S2) goto S_SellTooHigh;
set @price,@sellamount*$S2;
set #S2,#S2-@sellamount;
- set zeny,zeny+@price;
+ Zeny += @price;
next;
mes "Sold " + @sellamount + " " + $S2N$ + " shares.";
mes "Earned ^0000FF"+@price+"z^000000.";
@@ -311,7 +309,7 @@ SELLS3:
if (@sellamount > #S3) goto S_SellTooHigh;
set @price,@sellamount*$S3;
set #S3,#S3-@sellamount;
- set zeny,zeny+@price;
+ Zeny += @price;
next;
mes "Sold " + @sellamount + " " + $S3N$ + " shares.";
mes "Earned ^0000FF"+@price+"z^000000.";
@@ -323,7 +321,7 @@ SELLS4:
if (@sellamount > #S4) goto S_SellTooHigh;
set @price,@sellamount*$S4;
set #S4,#S4-@sellamount;
- set zeny,zeny+@price;
+ Zeny += @price;
next;
mes "Sold " + @sellamount + " " + $S4N$ + " shares.";
mes "Earned ^0000FF"+@price+"z^000000.";
@@ -335,7 +333,7 @@ SELLS5:
if (@sellamount > #S5) goto S_SellTooHigh;
set @price,@sellamount*$S5;
set #S5,#S5-@sellamount;
- set zeny,zeny+@price;
+ Zeny += @price;
next;
mes "Sold " + @sellamount + " " + $S5N$ + " shares.";
mes "Earned ^0000FF"+@price+"z^000000.";
@@ -347,7 +345,7 @@ SELLS6:
if (@sellamount > #S6) goto S_SellTooHigh;
set @price,@sellamount*$S6;
set #S6,#S6-@sellamount;
- set zeny,zeny+@price;
+ Zeny += @price;
next;
mes "Sold " + @sellamount + " " + $S6N$ + " shares.";
mes "Earned ^0000FF"+@price+"z^000000.";
@@ -359,7 +357,7 @@ SELLS7:
if (@sellamount > #S7) goto S_SellTooHigh;
set @price,@sellamount*$S7;
set #S7,#S7-@sellamount;
- set zeny,zeny+@price;
+ Zeny += @price;
next;
mes "Sold " + @sellamount + " " + $S7N$ + " shares.";
mes "Earned ^0000FF"+@price+"z^000000.";
@@ -371,7 +369,7 @@ SELLS8:
if (@sellamount > #S8) goto S_SellTooHigh;
set @price,@sellamount*$S8;
set #S8,#S8-@sellamount;
- set zeny,zeny+@price;
+ Zeny += @price;
next;
mes "Sold " + @sellamount + " " + $S8N$ + " shares.";
mes "Earned ^0000FF"+@price+"z^000000.";
@@ -383,7 +381,7 @@ SELLS9:
if (@sellamount > #S9) goto S_SellTooHigh;
set @price,@sellamount*$S9;
set #S9,#S9-@sellamount;
- set zeny,zeny+@price;
+ Zeny += @price;
next;
mes "Sold " + @sellamount + " " + $S9N$ + " shares.";
mes "Earned ^0000FF"+@price+"z^000000.";
@@ -395,7 +393,7 @@ SELLS10:
if (@sellamount > #S10) goto S_SellTooHigh;
set @price,@sellamount*$S10;
set #S10,#S10-@sellamount;
- set zeny,zeny+@price;
+ Zeny += @price;
next;
mes "Sold " + @sellamount + " " + $S10N$ + " shares.";
mes "Earned ^0000FF"+@price+"z^000000.";
@@ -444,18 +442,18 @@ S_Buy:
// Checks valid number //
if (@buyamount < $S_BuyMin) goto S_TooLow;
if (@buyamount > $S_BuyMax) goto S_TooHigh;
- if (zeny < $S_Trans) goto S_NoZeny;
- set zeny,zeny-$S_Trans;
+ if (Zeny < $S_Trans) goto S_NoZeny;
+ Zeny -= $S_Trans;
// Purchases the shares //
PURS1:
if (@buyname$ != $S1N$) goto PURS2;
set @price,@buyamount*$S1;
- if (zeny < @price) goto S_NoZeny;
+ if (Zeny < @price) goto S_NoZeny;
set #S1,#S1+@buyamount;
set @price,@buyamount*$S1;
- set zeny,zeny-@price;
+ Zeny -= @price;
mes "Bought " + @buyamount + " " + $S1N$ + " shares.";
mes "Lost ^0000FF"+@price+"z^000000.";
next;
@@ -464,9 +462,9 @@ PURS1:
PURS2:
if (@buyname$ != $S2N$) goto PURS3;
set @price,@buyamount*$S2;
- if (zeny < @price) goto S_NoZeny;
+ if (Zeny < @price) goto S_NoZeny;
set #S2,#S2+@buyamount;
- set zeny,zeny-@price;
+ Zeny -= @price;
mes "Bought " + @buyamount + " " + $S2N$ + " shares.";
mes "Lost ^0000FF"+@price+"z^000000.";
next;
@@ -475,9 +473,9 @@ PURS2:
PURS3:
if (@buyname$ != $S3N$) goto PURS4;
set @price,@buyamount*$S3;
- if (zeny < @price) goto S_NoZeny;
+ if (Zeny < @price) goto S_NoZeny;
set #S3,#S3+@buyamount;
- set zeny,zeny-@price;
+ Zeny -= @price;
mes "Bought " + @buyamount + " " + $S3N$ + " shares.";
mes "Lost ^0000FF"+@price+"z^000000.";
next;
@@ -486,9 +484,9 @@ PURS3:
PURS4:
if (@buyname$ != $S4N$) goto PURS5;
set @price,@buyamount*$S4;
- if (zeny < @price) goto S_NoZeny;
+ if (Zeny < @price) goto S_NoZeny;
set #S4,#S4+@buyamount;
- set zeny,zeny-@price;
+ Zeny -= @price;
mes "Bought " + @buyamount + " " + $S4N$ + " shares.";
mes "Lost ^0000FF"+@price+"z^000000.";
next;
@@ -497,9 +495,9 @@ PURS4:
PURS5:
if (@buyname$ != $S5N$) goto PURS6;
set @price,@buyamount*$S5;
- if (zeny < @price) goto S_NoZeny;
+ if (Zeny < @price) goto S_NoZeny;
set #S5,#S5+@buyamount;
- set zeny,zeny-@price;
+ Zeny -= @price;
mes "Bought " + @buyamount + " " + $S5N$ + " shares.";
mes "Lost ^0000FF"+@price+"z^000000.";
next;
@@ -508,9 +506,9 @@ PURS5:
PURS6:
if (@buyname$ != $S6N$) goto PURS7;
set @price,@buyamount*$S6;
- if (zeny < @price) goto S_NoZeny;
+ if (Zeny < @price) goto S_NoZeny;
set #S6,#S6+@buyamount;
- set zeny,zeny-@price;
+ Zeny -= @price;
mes "Bought " + @buyamount + " " + $S6N$ + " shares.";
mes "Lost ^0000FF"+@price+"z^000000.";
next;
@@ -519,9 +517,9 @@ PURS6:
PURS7:
if (@buyname$ != $S7N$) goto PURS8;
set @price,@buyamount*$S7;
- if (zeny < @price) goto S_NoZeny;
+ if (Zeny < @price) goto S_NoZeny;
set #S7,#S7+@buyamount;
- set zeny,zeny-@price;
+ Zeny -= @price;
mes "Bought " + @buyamount + " " + $S7N$ + " shares.";
mes "Lost ^0000FF"+@price+"z^000000.";
next;
@@ -530,9 +528,9 @@ PURS7:
PURS8:
if (@buyname$ != $S8N$) goto PURS9;
set @price,@buyamount*$S8;
- if (zeny < @price) goto S_NoZeny;
+ if (Zeny < @price) goto S_NoZeny;
set #S8,#S8+@buyamount;
- set zeny,zeny-@price;
+ Zeny -= @price;
mes "Bought " + @buyamount + " " + $S8N$ + " shares.";
mes "Lost ^0000FF"+@price+"z^000000.";
next;
@@ -541,9 +539,9 @@ PURS8:
PURS9:
if (@buyname$ != $S9N$) goto PURS10;
set @price,@buyamount*$S9;
- if (zeny < @price) goto S_NoZeny;
+ if (Zeny < @price) goto S_NoZeny;
set #S9,#S9+@buyamount;
- set zeny,zeny-@price;
+ Zeny -= @price;
mes "Bought " + @buyamount + " " + $S9N$ + " shares.";
mes "Lost ^0000FF"+@price+"z^000000.";
next;
@@ -552,9 +550,9 @@ PURS9:
PURS10:
if (@buyname$ != $S10N$) goto PURS11;
set @price,@buyamount*$S10;
- if (zeny < @price) goto S_NoZeny;
+ if (Zeny < @price) goto S_NoZeny;
set #S10,#S10+@buyamount;
- set zeny,zeny-@price;
+ Zeny -= @price;
mes "Bought " + @buyamount + " " + $S10N$ + " shares.";
mes "Lost ^0000FF"+@price+"z^000000.";
next;
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-07 11:24:12 +0000