summaryrefslogtreecommitdiff
path: root/npc/cities
diff options
context:
space:
mode:
Diffstat (limited to 'npc/cities')
-rw-r--r--npc/cities/alberta.txt8
-rw-r--r--npc/cities/aldebaran.txt304
-rw-r--r--npc/cities/amatsu.txt8
-rw-r--r--npc/cities/ayothaya.txt2
-rw-r--r--npc/cities/comodo.txt4
-rw-r--r--npc/cities/geffen.txt6
-rw-r--r--npc/cities/gonryun.txt2
-rw-r--r--npc/cities/jawaii.txt12
-rw-r--r--npc/cities/lighthalzen.txt4
-rw-r--r--npc/cities/lutie.txt36
-rw-r--r--npc/cities/manuk.txt2
-rw-r--r--npc/cities/morocc.txt2
-rw-r--r--npc/cities/niflheim.txt21
-rw-r--r--npc/cities/payon.txt2
-rw-r--r--npc/cities/prontera.txt16
-rw-r--r--npc/cities/rachel.txt2
16 files changed, 166 insertions, 265 deletions
diff --git a/npc/cities/alberta.txt b/npc/cities/alberta.txt
index 232fb5da3..92e249135 100644
--- a/npc/cities/alberta.txt
+++ b/npc/cities/alberta.txt
@@ -277,7 +277,7 @@ alberta,195,151,2 script Paul 4_M_04,{
}
alberta,190,173,4 script Phelix 4_M_03,{
- set .@weight,MaxWeight-Weight;
+ .@weight = MaxWeight-Weight;
mes "[Phelix]";
if ((.@weight) < 10000) {
mes "Wait a moment!!";
@@ -297,7 +297,7 @@ alberta,190,173,4 script Phelix 4_M_03,{
next;
mes "[Phelix]";
mes "If you're interested in my offer, get me the stuff I mentioned.";
- set @event_zelopy,1;
+ @event_zelopy = 1;
close;
} else {
mes "Hmm.. you want to exchange jellopies for Red Potions or some Carrots eh? Well.. which one?";
@@ -314,7 +314,7 @@ alberta,190,173,4 script Phelix 4_M_03,{
mes "Hey! Weren't you listening?. I said 10 jellopies for 1 Red Potion.. are ya deaf?";
close;
} else {
- set .@max,countitem(909)/10;
+ .@max = countitem(909)/10;
mes "Hmm, not bad...";
mes "How many potions";
mes "do you want to get?";
@@ -365,7 +365,7 @@ alberta,190,173,4 script Phelix 4_M_03,{
mes "Hmm, look pansy ass, I said 3 jellopies for 1 Carrot.. got it?";
close;
} else {
- set .@max,countitem(909)/3;
+ .@max = countitem(909)/3;
mes "Not too bad pansy...";
mes "How many do you want?";
next;
diff --git a/npc/cities/aldebaran.txt b/npc/cities/aldebaran.txt
index 33acb60c2..494247912 100644
--- a/npc/cities/aldebaran.txt
+++ b/npc/cities/aldebaran.txt
@@ -779,7 +779,7 @@ aldeba_in,84,166,4 script Kafra Service#alde 4_F_KAFRA1,{
end;
}
else {
- set .@kafrapassmoney,countitem(1084)*2000;
+ .@kafrapassmoney = countitem(1084)*2000;
mes "[Kafra Pavianne]";
mes "Let's see...";
if (countitem(1084) == 1) {
@@ -1058,180 +1058,77 @@ aldeba_in,79,161,6 script Kafra#04 4_F_KAFRA3,{
next;
mes "[Kafra]";
mes "The amount of special reserve points that you have is: ^FF0000"+RESRVPTS+"^000000 pts. Please make a choice based on your point total.";
-M_Menu:
- next;
- menu "100- Potato 7 ea",M_1a, "200- Potato 15 ea",M_1b, "300- Potato 25 ea",M_1c, "400- Potato 35 ea",M_1d,
- "500- Potato 50 ea",M_1e, "600- Potato 60 ea",M_1f, "700- Potato 75 ea",M_1g, "800- Potato 85 ea",M_1h,
- "900- Potato 100 ea",M_1i, "1000- 1st Lottery Chance!",M_1j, "Next items",M_2, "Cancel",M_End;
-
- M_1a:
- if(RESRVPTS < 100) goto sL_LowPts1;
- mes "[Kafra]";
- mes "Here you are.";
- getitem 516, 7;
- set RESRVPTS, RESRVPTS - 100;
- close;
- M_1b:
- if(RESRVPTS < 200) goto sL_LowPts1;
- mes "[Kafra]";
- mes "Here you are.";
- getitem 516, 15;
- set RESRVPTS, RESRVPTS - 200;
- close;
- M_1c:
- if(RESRVPTS < 300) goto sL_LowPts1;
- mes "[Kafra]";
- mes "Here you are.";
- getitem 516, 25;
- set RESRVPTS, RESRVPTS - 300;
- close;
- M_1d:
- if(RESRVPTS < 400) goto sL_LowPts1;
- mes "[Kafra]";
- mes "Here you are.";
- getitem 516, 35;
- set RESRVPTS, RESRVPTS - 400;
- close;
- M_1e:
- if(RESRVPTS < 500) goto sL_LowPts1;
- mes "[Kafra]";
- mes "Here you are.";
- getitem 516, 50;
- set RESRVPTS, RESRVPTS - 500;
- close;
- M_1f:
- if(RESRVPTS < 600) goto sL_LowPts1;
- mes "[Kafra]";
- mes "Here you are.";
- getitem 516, 60;
- set RESRVPTS, RESRVPTS - 600;
- close;
- M_1g:
- if(RESRVPTS < 700) goto sL_LowPts1;
- mes "[Kafra]";
- mes "Here you are.";
- getitem 516, 75;
- set RESRVPTS, RESRVPTS - 700;
- close;
- M_1h:
- if(RESRVPTS < 800) goto sL_LowPts1;
- mes "[Kafra]";
- mes "Here you are.";
- getitem 516, 85;
- set RESRVPTS, RESRVPTS - 800;
- close;
- M_1i:
- if(RESRVPTS < 900) goto sL_LowPts1;
- mes "[Kafra]";
- mes "Here you are.";
- getitem 516, 100;
- set RESRVPTS, RESRVPTS - 900;
- close;
- M_1j:
- if(RESRVPTS < 1000) goto sL_LowPts1;
- set RESRVPTS, RESRVPTS - 1000;
- mes "[Kafra]";
- mes "^0000FF1st Lottery Opportunity!!^000000";
- set @Lotto, 1;
+ .@page = 1;
+ while (true) {
+ if (.@page == 1) {
+ // Points, Item ID, amount
+ setarray .@choices, 100, Sweet_Potato, 7,
+ 200, Sweet_Potato, 15,
+ 300, Sweet_Potato, 25,
+ 400, Sweet_Potato, 35,
+ 500, Sweet_Potato, 50,
+ 600, Sweet_Potato, 60,
+ 700, Sweet_Potato, 75,
+ 800, Sweet_Potato, 85,
+ 900, Sweet_Potato, 100,
+ 1000, null, 0;
+ .@ordinal$ = "1st";
+ .@changepage$ = "Next items";
+ } else { // .@page == 2
+ setarray .@choices, 1100, Sweet_Potato, 7,
+ 1300, Sweet_Potato, 15,
+ 1500, Sweet_Potato, 25,
+ 1700, Sweet_Potato, 35,
+ 1900, Sweet_Potato, 50,
+ 2100, Sweet_Potato, 60,
+ 2300, Sweet_Potato, 75,
+ 2500, Sweet_Potato, 85,
+ 2800, Sweet_Potato, 100,
+ 3000, null, 0;
+ .@ordinal$ = "2nd";
+ .@changepage$ = "Previous List";
+ }
+ .@list$ = "";
+ .@numitemchoices = 0;
+ for (.@i = 0; .@i < getarraysize(.@choices) - 3; .@i += 3) { // Skip the last entry as it's handled separately
+ .@list$ += .@choices[i] + "- " + getitemname(.@choices[.@i+1]) + " " + .@choices[.@i+2] + " ea:";
+ ++.@numitemchoices;
+ }
+ .@list$ += .@choices[.@i] + "- " + .@ordinal$ + " Lottery Chance!:" + .@changepage$ +":Cancel";
next;
- callfunc "F_Lottery";
- goto M_End;
-
- sL_LowPts1:
- mes "[Kafra]";
- mes "I'm sorry but you do not have enough reserve points for that selection.";
- goto M_Menu;
-
- M_2:
- menu "1100- Red Potion 7 ea",M_2a, "1300- Red Potion 15 ea",M_2b, "1500- Red Potion 25 ea",M_2c,
- "1700- Red Potion 35 ea",M_2d, "1900- Red Potion 50 ea",M_2e, "2100- Red Potion 60 ea",M_2f,
- "2300- Red Potion 75 ea",M_2g, "2500- Red Potion 85 ea",M_2h, "2800- Red Potion 100 ea",M_2i,
- "3000- 2nd Lotery Chance!",M_2j, "Previous List",M_Menu, "Cancel",M_End;
-
- M_2a:
- if(RESRVPTS < 1100) goto sL_LowPts2;
- mes "[Kafra]";
- mes "Here you are.";
- getitem 501, 7;
- set RESRVPTS, RESRVPTS - 1100;
- close;
- M_2b:
- if(RESRVPTS < 1300) goto sL_LowPts2;
- mes "[Kafra]";
- mes "Here you are.";
- getitem 501, 15;
- set RESRVPTS, RESRVPTS - 1300;
- close;
- M_2c:
- if(RESRVPTS < 1500) goto sL_LowPts2;
- mes "[Kafra]";
- mes "Here you are.";
- getitem 501, 25;
- set RESRVPTS, RESRVPTS - 1500;
- close;
- M_2d:
- if(RESRVPTS < 1700) goto sL_LowPts2;
- mes "[Kafra]";
- mes "Here you are.";
- getitem 501, 35;
- set RESRVPTS, RESRVPTS - 1700;
- close;
- M_2e:
- if(RESRVPTS < 1900) goto sL_LowPts2;
- mes "[Kafra]";
- mes "Here you are.";
- getitem 501, 50;
- set RESRVPTS, RESRVPTS - 1900;
- close;
- M_2f:
- if(RESRVPTS < 2100) goto sL_LowPts2;
- mes "[Kafra]";
- mes "Here you are.";
- getitem 501, 60;
- set RESRVPTS, RESRVPTS - 2100;
- close;
- M_2g:
- if(RESRVPTS < 2300) goto sL_LowPts2;
- mes "[Kafra]";
- mes "Here you are.";
- getitem 501, 75;
- set RESRVPTS, RESRVPTS - 2300;
- close;
- M_2h:
- if(RESRVPTS < 2500) goto sL_LowPts2;
- mes "[Kafra]";
- mes "Here you are.";
- getitem 501, 85;
- set RESRVPTS, RESRVPTS - 2500;
- close;
- M_2i:
- if(RESRVPTS < 2800) goto sL_LowPts2;
- mes "[Kafra]";
- mes "Here you are.";
- getitem 501, 100;
- set RESRVPTS, RESRVPTS - 2800;
- close;
- M_2j:
- if(RESRVPTS < 3000) goto sL_LowPts2;
- set RESRVPTS, RESRVPTS - 3000;
- mes "[Kafra]";
- mes "^0000FF2nd Lottery Opportunity!!^000000";
- set @Lotto, 2;
+ .@chosen = select(.@list$) - 1;
+ if (.@chosen <= .@numitemchoices) {
+ if (RESRVPTS < .@choices[.@chosen*3]) {
+ mes "[Kafra]";
+ mes "I'm sorry but you do not have enough reserve points for that selection.";
+ continue;
+ }
+ RESRVPTS -= .@choices[.@chosen * 3];
+ if (.@chosen < .@numitemchances) {
+ // Item
+ mes "[Kafra]";
+ mes "Here you are.";
+ getitem .@choices[.@chosen*3 + 1], .@choices[.@chosen*3 + 2];
+ close;
+ }
+ // Lottery chance
+ mes "^0000FF"+ .@ordinal$ + " Lottery Opportunity!!^000000";
+ @Lotto = .@page;
next;
callfunc "F_Lottery";
- goto M_End;
-
- sL_LowPts2:
- mes "[Kafra]";
- mes "I'm sorry but you do not have enough reserve points for that selection.";
- next;
- goto M_2;
+ break;
+ } else if (.@chosen == .@numitemchoices + 1) { // next/previous items
+ .@page = (.@page == 1 ? 2 : 1);
+ continue;
+ } else { // Cancel
+ break;
+ }
+ }
- M_End:
- mes "[Kafra]";
- mes "Please come back anytime when you have more reserve points.";
- cutin "",255;
- close;
+ mes "[Kafra]";
+ mes "Please come back anytime when you have more reserve points.";
+ cutin "",255;
+ close;
}
// Special Reserve 2 ----------------------------------------------
@@ -1244,44 +1141,45 @@ aldeba_in,88,161,3 script Kafra#05 4_F_KAFRA3,{
mes "[Kafra]";
mes "Would you like to use your points?";
next;
- menu "Yes I would.",-, "Maybe next time.",M_End;
-
+ if (select("Yes I would.","Maybe next time.") == 1) {
mes "[Kafra]";
mes "You have the following amount of special reserve points: ^5544FF"+RESRVPTS+"^000000.";
mes "Make a choice and test your luck!";
next;
- menu "5000pts = 1st Lottery Chance!",sM_1st, "7000pts = 2nd Lottery Chance!",sM_2nd, "10000pts = 3rd Lottery Chance!",sM_3rd, "Cancel",M_End;
-
- sM_1st:
- if(RESRVPTS < 5000) goto sL_NotEnuf;
- set RESRVPTS, RESRVPTS - 5000;
- set @Lotto, 3;
- callfunc "F_Lottery";
- goto M_End;
- sM_2nd:
- if(RESRVPTS < 7000) goto sL_NotEnuf;
- set RESRVPTS, RESRVPTS - 7000;
- set @Lotto, 4;
- callfunc "F_Lottery";
- goto M_End;
- sM_3rd:
- if(RESRVPTS < 10000) goto sL_NotEnuf;
- set RESRVPTS, RESRVPTS - 10000;
- set @Lotto, 5;
- callfunc "F_Lottery";
- goto M_End;
+ switch (select("5000pts = 1st Lottery Chance!","7000pts = 2nd Lottery Chance!","10000pts = 3rd Lottery Chance!","Cancel")) {
+ case 1: // 5000
+ .@points = 5000;
+ @Lotto = 3;
+ break;
+ case 2: // 7000
+ .@points = 7000;
+ @Lotto = 4;
+ break;
+ case 3: // 10000
+ .@points = 10000;
+ @Lotto = 5;
+ break;
+ case 4: // Cancel
+ .@points = 0;
+ break;
+ }
- sL_NotEnuf:
+ if (.@points) {
+ if (RESRVPTS < .@points) {
mes "[Kafra]";
mes "I'm sorry dear but you do not have enough points for this selection.";
cutin "",255;
close;
- M_End:
- mes "[Kafra]";
- mes "No problem. Collect more and more special reserve points by using the Kafra Services found throughout Rune Midgard.";
- mes "Thank you for using Kafra Corp. services.";
- cutin "",255;
- close;
+ }
+ RESRVPTS -= .@points;
+ callfunc "F_Lottery";
+ }
+ }
+ mes "[Kafra]";
+ mes "No problem. Collect more and more special reserve points by using the Kafra Services found throughout Rune Midgard.";
+ mes "Thank you for using Kafra Corp. services.";
+ cutin "",255;
+ close;
}
// Function F_Lottery ------------------------------------------------------------------------------------------
@@ -1296,7 +1194,7 @@ function script F_Lottery {
mes "How many times do you want the Lottery Machine to spin? You can choose up to 5 times.";
next;
input @input;
- if(@input < 1 || @input > 5) set @input, rand(1,5); //Lupus's fix
+ if(@input < 1 || @input > 5) @input = rand(1,5); //Lupus's fix
callsub sF_Spin;
mes "[Kafra]";
mes "Ok~ Let me check the results~ guess what it is?";
@@ -1369,8 +1267,8 @@ sF_Spin:
mes "[Lottery Machine]";
mes "(rumble~rumble~rumble~)...";
next;
- set @temp, rand(10);
- set @input, @input -1;
+ @temp = rand(10);
+ --@input;
if(@input <= 0) return;
goto sF_Spin;
}
diff --git a/npc/cities/amatsu.txt b/npc/cities/amatsu.txt
index 18ae79bdc..a79c30993 100644
--- a/npc/cities/amatsu.txt
+++ b/npc/cities/amatsu.txt
@@ -339,7 +339,7 @@ amatsu,287,266,3 script Jyaburo#ama 4_M_JPNOJI,{
// Legendary Tree
//============================================================
amatsu,269,221,1 script Propose Girl#ama 4_F_JPN,{
- set jap_tree,1;
+ jap_tree = 1;
mes "[Hutari Shioko]";
mes "It is a pleasure to meet you.";
mes "My name is Hutari Shioko.";
@@ -374,7 +374,7 @@ amatsu,269,221,1 script Propose Girl#ama 4_F_JPN,{
}
amatsu,243,202,3 script Drama Teacher#ama 4_F_JPNOBA2,{
- set jap_tree,2;
+ jap_tree = 2;
mes "[Garakame sensei]";
mes "This is a beautiful place";
mes "with everlasting cherry blossoms.";
@@ -423,7 +423,7 @@ amatsu,283,203,1 script Bonubonu#ama1 SEE_OTTER,{
}
amatsu,283,203,1 script Bonubonu#ama2 HIDDEN_NPC,{
- set jap_tree,3;
+ jap_tree = 3;
emotion e_swt2;
mes "[Bonubonu]";
mes "That tree on the hill is";
@@ -453,7 +453,7 @@ amatsu,283,203,1 script Bonubonu#ama2 HIDDEN_NPC,{
}
amatsu,274,178,7 script Veterinarian#ama 4_M_JOB_WIZARD,{
- set jap_tree,4;
+ jap_tree = 4;
mes "[Sakura Seiichi]";
mes "Ah... I'm not a weirdo so";
mes "don't panic. I'm just an ordinary";
diff --git a/npc/cities/ayothaya.txt b/npc/cities/ayothaya.txt
index a4e214582..a8a114d2d 100644
--- a/npc/cities/ayothaya.txt
+++ b/npc/cities/ayothaya.txt
@@ -122,7 +122,7 @@ ayothaya,189,120,3 script Young Man#Thang 4_M_THAIONGBAK,{
}
ayothaya,171,152,5 script Girl#Lalitha 4_F_THAIAYO,{
- set .@sit,rand(1,5);
+ .@sit = rand(1,5);
if (.@sit > 0 && .@sit < 3) {
mes "[Lalitha]";
mes "Hello!";
diff --git a/npc/cities/comodo.txt b/npc/cities/comodo.txt
index f8a3f967f..248af4e50 100644
--- a/npc/cities/comodo.txt
+++ b/npc/cities/comodo.txt
@@ -198,7 +198,7 @@ cmd_in02,174,126,4 script Loyar#cmd 4_M_01,{
}
cmd_in02,57,62,4 script Moo#cmd 4_M_MANAGER,{
- set mooz,rand(1,10);
+ mooz = rand(1,10);
if (mooz == 1) {
mes "[Moo]";
mes "Those cheating punks!";
@@ -338,7 +338,7 @@ cmd_fild07,52,280,4 script Hallosu#cmd 4W_SAILOR,{
}
cmd_fild07,299,83,4 script Zain#cmd 4W_SAILOR,{
- set .@n$,"["+strnpcinfo(1)+"]";
+ .@n$ = "["+strnpcinfo(1)+"]";
mes .@n$;
mes "Would you like to";
mes "board a ship on the";
diff --git a/npc/cities/geffen.txt b/npc/cities/geffen.txt
index 16702126f..a5d3e8354 100644
--- a/npc/cities/geffen.txt
+++ b/npc/cities/geffen.txt
@@ -274,7 +274,7 @@ OnTouch:
else
break;
}
- set .@Red_potion_hap,.@input * 500;
+ .@Red_potion_hap = .@input * 500;
if (Zeny < .@Red_potion_hap) {
mes "[Suspicious Guy]";
mes "Oh maaan~";
@@ -344,7 +344,7 @@ OnTouch:
else
break;
}
- set .@Main_gauche_hap,.@input * 9400;
+ .@Main_gauche_hap = .@input * 9400;
if (Zeny < .@Main_gauche_hap) {
mes "[Suspicious Guy]";
mes "Short on zeny?";
@@ -396,7 +396,7 @@ OnTouch:
else
break;
}
- set .@Hood__hap,.@input * 930;
+ .@Hood__hap = .@input * 930;
if (Zeny < .@Hood__hap) {
mes "[Suspicious Guy]";
mes "Oh nuts...";
diff --git a/npc/cities/gonryun.txt b/npc/cities/gonryun.txt
index 9c51dcd48..919d23e20 100644
--- a/npc/cities/gonryun.txt
+++ b/npc/cities/gonryun.txt
@@ -289,7 +289,7 @@ gon_in,73,82,5 script Ji Chung Zhe#gon 4_M_TWTEAMAN,{
close;
}
if (nakha == 3) {
- set cha,1;
+ cha = 1;
mes "[Ji Chung Zhe]";
mes "I am Ji Chung Zhe, a renown brewer";
mes "of teas. Everyday, I put all my";
diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt
index 1069cf01c..1cbd51fd5 100644
--- a/npc/cities/jawaii.txt
+++ b/npc/cities/jawaii.txt
@@ -837,7 +837,7 @@ jawaii_in,28,124,0 script Bartender#jaw 1_ETC_01,{
mes "like to drink?";
next;
if (Zeny < 99) {
- set .@r_jaw,rand(1,100);
+ .@r_jaw = rand(1,100);
mes "[Bartender]";
if (.@r_jaw > 29) {
mes "Hm, I'm sorry";
@@ -867,7 +867,7 @@ jawaii_in,28,124,0 script Bartender#jaw 1_ETC_01,{
while (1) {
switch(select("Follow Bartender's Recommendation.:I want a Gunslinger.:I want a Cobo.:I want a Bomb.:I want a Boogieman.")) {
case 1:
- set .@roof_jaw,.@roof_jaw+3;
+ .@roof_jaw += 3;
if (.@roof_jaw > 9) {
mes "[Bartender]";
mes "Hmmm...";
@@ -1106,7 +1106,7 @@ S_KillChar:
end;
}
if (Zeny > 99) Zeny -= 100;
- set .@roof_jaw,.@roof_jaw+getarg(0);
+ .@roof_jaw += getarg(0);
mes "[Bartender]";
mes "There you go.";
next;
@@ -1254,7 +1254,7 @@ prt_in,173,13,4 script Customer#SoloHan 4_M_04,{
mes "^3355FF* Gulp Gulp Gulp *^000000";
percentheal -10,0;
next;
- set .@jaw_roof,1;
+ .@jaw_roof = 1;
mes "[SoloHan]";
mes "So, what do you say?";
mes "Let's go somewhere";
@@ -1280,7 +1280,7 @@ prt_in,173,13,4 script Customer#SoloHan 4_M_04,{
mes "^3355FF* Gulp Gulp Gulp *^000000";
percentheal -10,0;
next;
- set .@jaw_roof,.@jaw_roof+2;
+ .@jaw_roof += 2;
mes "[SoloHan]";
if (.@jaw_roof > 8) {
mes "Whoa...";
@@ -1330,7 +1330,7 @@ prt_in,173,13,4 script Customer#SoloHan 4_M_04,{
close2;
end;
}
- set .@jaw_roof,.@jaw_roof+3;
+ .@jaw_roof += 3;
mes "[SoloHan]";
mes "Drink, drink!";
mes "That's not enough!";
diff --git a/npc/cities/lighthalzen.txt b/npc/cities/lighthalzen.txt
index 6768da33c..01a5c7404 100644
--- a/npc/cities/lighthalzen.txt
+++ b/npc/cities/lighthalzen.txt
@@ -564,7 +564,7 @@ lighthalzen,182,102,3 script Lucius#zen5 4_M_LGTGRAND,{
close;
}
Zeny -= .@input;
- set $donatedzeny,$donatedzeny + .@input;
+ $donatedzeny += .@input;
mes "[Lucius]";
mes "So far, I've received";
mes "a total of " + $donatedzeny + " zeny in";
@@ -580,7 +580,7 @@ lighthalzen,182,102,3 script Lucius#zen5 4_M_LGTGRAND,{
mes "this small gift as a token of";
mes "my gratitude, adventurer. Bless";
mes "you, youngster and take care.";
- set $donatedzeny,0;
+ $donatedzeny = 0;
getitem 603,1; //Old_Blue_Box
getitem 12016,1; //Speed_Up_Potion
}
diff --git a/npc/cities/lutie.txt b/npc/cities/lutie.txt
index def5e03ab..c7ad3a40c 100644
--- a/npc/cities/lutie.txt
+++ b/npc/cities/lutie.txt
@@ -115,7 +115,7 @@ xmas_in,167,173,4 script Duffle 4_F_05,{
mes "[Duffle]";
mes "Well then...";
mes "Merry Christmas!!";
- set xmas_npc,2;
+ xmas_npc = 2;
close;
}
else if (xmas_npc > 1) {
@@ -182,7 +182,7 @@ xmas_in,27,103,4 script Lenient Aunt 4_F_GODEMOM,{
mes "Now be a dear";
mes "and hurry up.";
mes "Come back quickly~";
- set xmas_npc,6;
+ xmas_npc = 6;
close;
case 6:
mes "[Thachentze]";
@@ -213,7 +213,7 @@ xmas_in,27,103,4 script Lenient Aunt 4_F_GODEMOM,{
mes "Let's see, let's see...";
mes "Thank you dear,Thank you.";
next;
- set xmas_npc,8;
+ xmas_npc = 8;
mes "^3355FFYou gave her the";
mes "roughest salt in the world.^000000";
next;
@@ -296,7 +296,7 @@ xmas,117,304,4 script Poze 4_M_06,{
next;
mes "[Poze]";
mes "But that's pretty much all I know. For the actual details, you should ask ^3355FFUncle Hairy Cantata^000000.";
- set xmas_npc,4;
+ xmas_npc = 4;
close;
} else {
mes "[Poze]";
@@ -381,7 +381,7 @@ xmas,176,236,4 script Uncle Hairy 4_M_05,{
next;
mes "[Cantata]";
mes "^3355FFThachentze^000000, that lovely pickle maker, knows more about it. So if you're curious, you should go talk to her. Alrighty then, Merry Christmas!";
- set xmas_npc,5;
+ xmas_npc = 5;
close;
} else {
mes "[Cantata]";
@@ -538,7 +538,7 @@ xmas,134,112,4 script Snowman 4_M_SNOWMAN,{
next;
mes "^3355FFSnowysnow is immersed in his deep thoughts, and seems^000000";
mes "^3355FFfixated on Poze's memento.^000000";
- set xmas_npc,3;
+ xmas_npc = 3;
close2;
cutin "",255;
end;
@@ -600,7 +600,7 @@ xmas,134,112,4 script Snowman 4_M_SNOWMAN,{
mes "[Snowysnow]";
mes "Yeah, she's a pickle expert, alright. Oh right, would you give this to her? I've been keeping the roughest salt in the world for her as a bit of a favor.";
next;
- set xmas_npc,7;
+ xmas_npc = 7;
mes "^3355FFSnowysnow gave you the roughest salt in the world^000000.";
next;
mes "[Snowysnow]";
@@ -655,11 +655,11 @@ xmas,134,112,4 script Snowman 4_M_SNOWMAN,{
mes "^3355FFYou gingerly stir";
mes "your hand around in";
mes "Snowysnow's magical gift bag^000000.";
- set .@snownow,rand(1,8);
+ .@snownow = rand(1,8);
next;
switch(.@snownow) {
case 1:
- set xmas_npc,11;
+ xmas_npc = 11;
getitem 529,5; // Candy
cutin "rutie_snownow02.bmp",2;
mes "[Snowysnow]";
@@ -668,7 +668,7 @@ xmas,134,112,4 script Snowman 4_M_SNOWMAN,{
mes "Congratulations!";
break;
case 2:
- set xmas_npc,11;
+ xmas_npc = 11;
getitem 529,10; // Candy
cutin "rutie_snownow02.bmp",2;
mes "[Snowysnow]";
@@ -676,7 +676,7 @@ xmas,134,112,4 script Snowman 4_M_SNOWMAN,{
mes "^3355FF10 Candy^000000!";
break;
case 3:
- set xmas_npc,11;
+ xmas_npc = 11;
getitem 530,5; // Candy_Striper
cutin "rutie_snownow02.bmp",2;
mes "[Snowysnow]";
@@ -684,7 +684,7 @@ xmas,134,112,4 script Snowman 4_M_SNOWMAN,{
mes "^3355FF5 Candy Cane^000000!";
break;
case 4:
- set xmas_npc,11;
+ xmas_npc = 11;
getitem 530,10; // Candy_Striper
cutin "rutie_snownow02.bmp",2;
mes "[Snowysnow]";
@@ -692,7 +692,7 @@ xmas,134,112,4 script Snowman 4_M_SNOWMAN,{
mes "^3355FF10 Candy Cane^000000!";
break;
case 5:
- set xmas_npc,11;
+ xmas_npc = 11;
getitem 539,1; // Piece_Of_Cake
cutin "rutie_snownow02.bmp",2;
mes "[Snowysnow]";
@@ -700,7 +700,7 @@ xmas,134,112,4 script Snowman 4_M_SNOWMAN,{
mes "^3355FF1 Piece Of Cake^000000!";
break;
case 6:
- set xmas_npc,11;
+ xmas_npc = 11;
getitem 539,2; // Piece_Of_Cake
cutin "rutie_snownow02.bmp",2;
mes "[Snowysnow]";
@@ -708,7 +708,7 @@ xmas,134,112,4 script Snowman 4_M_SNOWMAN,{
mes "^3355FF2 Piece Of Cake^000000!";
break;
case 7:
- set xmas_npc,11;
+ xmas_npc = 11;
getitem 538,5; // Well_Baked_Cookie
cutin "rutie_snownow02.bmp",2;
mes "[Snowysnow]";
@@ -716,7 +716,7 @@ xmas,134,112,4 script Snowman 4_M_SNOWMAN,{
mes "^3355FF5 Cookie^000000!";
break;
case 8:
- set xmas_npc,11;
+ xmas_npc = 11;
getitem 538,10; // Well_Baked_Cookie
cutin "rutie_snownow02.bmp",2;
mes "[Snowysnow]";
@@ -811,7 +811,7 @@ xmas,146,136,4 script Hashokii 4_M_PIERROT,{
next;
mes "[Hashokii]";
mes "Why don't you go meet those 2 children? They might tell you the story we've never got the chance to hear. Okay then, good luck~! Bye bye!";
- set xmas_npc,9;
+ xmas_npc = 9;
close;
} else {
mes "[Hashokii]";
@@ -917,7 +917,7 @@ xmas,208,168,4 script Little Girl 4_F_KID2,{
mes "[Marcell]";
mes "Oh, now I see . . . . .";
mes "You wanna learn all about Snowysnow because you want to become his friend! He'll be so happy to know that! Ooh! Maybe he'll give you a present! Good luck!";
- set xmas_npc,10;
+ xmas_npc = 10;
close;
case 10:
mes "[Marcell]";
diff --git a/npc/cities/manuk.txt b/npc/cities/manuk.txt
index 77c5306ed..b49be1920 100644
--- a/npc/cities/manuk.txt
+++ b/npc/cities/manuk.txt
@@ -219,7 +219,7 @@ manuk,286,147,3 script Piom#ep13_2_2 4_MAN_PIOM,{
}
manuk,183,185,5 script Piom#ep13_2_3 4_MAN_PIOM,{
- set tongyeok,Ring_Of_Wise_King;
+ tongyeok = Ring_Of_Wise_King;
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Piom]";
mes "Our lives exist for Saphas.";
diff --git a/npc/cities/morocc.txt b/npc/cities/morocc.txt
index cb5b608e9..e2ca328df 100644
--- a/npc/cities/morocc.txt
+++ b/npc/cities/morocc.txt
@@ -762,7 +762,7 @@ moc_fild16,195,281,4 script Assassin Guardian#1::SinGuard 4_M_MOC_SOLDIER,{
mes "Welcome.";
close;
}
- set .@temp, rand(1,4);
+ .@temp = rand(1,4);
if(.@temp == 1) mes "........";
if(.@temp == 2) mes "Hmmm..........";
if(.@temp == 3) mes "Hmmm... you shouldn't be here.....";
diff --git a/npc/cities/niflheim.txt b/npc/cities/niflheim.txt
index 4e6ba1f97..0bfa9a088 100644
--- a/npc/cities/niflheim.txt
+++ b/npc/cities/niflheim.txt
@@ -232,17 +232,20 @@ niflheim,350,258,1 script Cursed Spirit#nif 4_NFWISP,{
mes "lost to the ages~!";
emotion e_gg;
next;
- if (select("Clover:Klaatu:Klaytos") == 2)
- set .@spell,.@spell+1;
- if (select("Verit:Veritas:Verata") == 3)
- set .@spell,.@spell+1;
- if (select("Necktie:Necklace:Nero:^FFFFFFNictu!!!^000000") == 4)
- set .@spell,.@spell+1;
+ if (select("Clover:Klaatu:Klaytos") == 2) {
+ ++.@spell;
+ }
+ if (select("Verit:Veritas:Verata") == 3) {
+ ++.@spell;
+ }
+ if (select("Necktie:Necklace:Nero:^FFFFFFNictu!!!^000000") == 4) {
+ ++.@spell;
+ }
if (.@spell == 3) {
switch(rand(1,5)) {
case 1:
if (morison_meat < 15) {
- set morrison_meat,15;
+ morrison_meat = 15;
mes "[Ashe Bruce]";
mes "You... You broke the curse!";
mes "How did you know that spell?!";
@@ -262,7 +265,7 @@ niflheim,350,258,1 script Cursed Spirit#nif 4_NFWISP,{
close;
case 2:
if (thai_head == 1) {
- set thai_head,2;
+ thai_head = 2;
mes "[Ashe Bruce]";
mes "What's...";
mes "this feeling?";
@@ -285,7 +288,7 @@ niflheim,350,258,1 script Cursed Spirit#nif 4_NFWISP,{
close;
case 3:
if (thai_head == 8) {
- set thai_head,7;
+ thai_head = 7;
mes "[Ashe Bruce]";
mes "You... You broke the curse!";
mes "Who taught you that spell?!";
diff --git a/npc/cities/payon.txt b/npc/cities/payon.txt
index 3bbe52908..a5607b412 100644
--- a/npc/cities/payon.txt
+++ b/npc/cities/payon.txt
@@ -840,7 +840,7 @@ OnTouch:
close;
}
if (BaseLevel > 30) {
- set .@oldman_random,rand(1,2);
+ .@oldman_random = rand(1,2);
if (.@oldman_random == 1) {
mes "[Guard]";
mes "Hey...";
diff --git a/npc/cities/prontera.txt b/npc/cities/prontera.txt
index 792ddc972..43389ff67 100644
--- a/npc/cities/prontera.txt
+++ b/npc/cities/prontera.txt
@@ -135,7 +135,7 @@ prontera,216,70,2 script Strife#pront 1_M_02,{
mes "MAGNUM BREAK!";
next;
if (select("I wanna be strong too!:Um... Do you best.") == 1) {
- set event_prt_nov_dreamtalk,1;
+ event_prt_nov_dreamtalk = 1;
mes "[Strife]";
mes "Wow...!";
mes "That's so awesome!";
@@ -172,7 +172,7 @@ prontera,216,70,2 script Strife#pront 1_M_02,{
mes "that now, I gotta";
mes "train even harder!";
next;
- set event_prt_nov_dreamtalk,2;
+ event_prt_nov_dreamtalk = 2;
getitem 2501,1; //Hood
mes "[Strife]";
mes "This is, well, for you to help you get even stronger. I guess I want to thank you for being such a good example.";
@@ -305,7 +305,7 @@ prt_in,180,20,2 script Bartender#pront 1_M_PUBMASTER,{
mes "[Bartender]";
mes "I can't keep my business busy without my special menu 'Crunch Crunch Sour' and 'Savory Yum Yum'...*Sigh*";
next;
- set .@drink,1;
+ .@drink = 1;
while(.@drink) {
switch(select("'Cunch Crunch Sour'?:'Savory Yum Yum'?:Cancel.")) {
case 1:
@@ -330,7 +330,7 @@ prt_in,180,20,2 script Bartender#pront 1_M_PUBMASTER,{
mes "[Bartender]";
mes "Take care of yourself~.";
close2;
- set .@drink,0;
+ .@drink = 0;
break;
}
@@ -551,7 +551,7 @@ prt_church,103,76,0 script Garnet#pront 1_F_02,{
mes "[Garnet]";
mes "Go and ahead and ask if you have any questions about skills for Acolytes and Priests.";
next;
- set .@SkillChat,1;
+ .@SkillChat = 1;
while(.@SkillChat) {
switch(select("About Heal:About Cure:About Increase AGI:About Angelus:About Blessing:About Warp Portal:End Conversation")) {
case 1:
@@ -631,7 +631,7 @@ prt_church,103,76,0 script Garnet#pront 1_F_02,{
mes "Alright, I've";
mes "heard enough.";
close2;
- set .@SkillChat,0;
+ .@SkillChat = 0;
break;
}
}
@@ -648,7 +648,7 @@ prt_church,103,71,0 script Henson#pront 2_M_PHARMACIST,{
mes "[Henson]";
mes "Did you have any questions about Acolyte and Priest skills?";
next;
- set .@SkillChat,1;
+ .@SkillChat = 1;
while(.@SkillChat) {
switch(select("About Divine Protection:About Demon Bane:About Decrease AGI:About Signum Crusis :About Pneuma:About Ruwach:About Teleport:End conversation.")) {
case 1:
@@ -729,7 +729,7 @@ prt_church,103,71,0 script Henson#pront 2_M_PHARMACIST,{
mes "[Henson]";
mes "If you wish to understand more about an Acolyte or Priest skill, you are welcome to visit me at any time.";
close2;
- set .@SkillChat,0;
+ .@SkillChat = 0;
break;
}
}
diff --git a/npc/cities/rachel.txt b/npc/cities/rachel.txt
index b4beb95af..3538a439d 100644
--- a/npc/cities/rachel.txt
+++ b/npc/cities/rachel.txt
@@ -306,7 +306,7 @@ rachel,206,30,3 script Freya's Priest#play 4_F_TRAINEE,{
mes "item of yours can do...";
mes "Oh? Oh! That's wonderful!";
close2;
- set .@play,rand(1,10);
+ .@play = rand(1,10);
if (.@play < 3)
consumeitem 601; //Wing_Of_Fly
else if (.@play < 5)