summaryrefslogtreecommitdiff
path: root/npc/merchants
diff options
context:
space:
mode:
Diffstat (limited to 'npc/merchants')
-rw-r--r--npc/merchants/coin_exchange.txt14
-rw-r--r--npc/merchants/elemental_trader.txt8
-rw-r--r--npc/merchants/enchan_arm.txt12
-rw-r--r--npc/merchants/milk_trader.txt2
-rw-r--r--npc/merchants/socket_enchant.txt2
5 files changed, 19 insertions, 19 deletions
diff --git a/npc/merchants/coin_exchange.txt b/npc/merchants/coin_exchange.txt
index 024cdf33e..b2c65f966 100644
--- a/npc/merchants/coin_exchange.txt
+++ b/npc/merchants/coin_exchange.txt
@@ -28,15 +28,15 @@
mes "What are you looking for?";
next;
if (strnpcinfo(1) == "Merchant of Manuk") {
- setarray .@Items[2],12342,12343,12348;
+ setarray .@items[2],12342,12343,12348;
set .@Book,11019; //Manuk_Selling_Item
- set .@Coin,6080; //Manuk_Coin
+ set .@coin,6080; //Manuk_Coin
set .@i, select("View item description:Manuk's Opportunity:Manuk's Courage:Manuk's Faith:Cancel");
}
else {
- setarray .@Items[2],12344,12345,12349;
+ setarray .@items[2],12344,12345,12349;
set .@Book,11018; //Splendide_Selling_Item
- set .@Coin,6081; //Splendide_Coin
+ set .@coin,6081; //Splendide_Coin
set .@i, select("View item description:Buy Pinguicula's Fruit Jam:Buy Luciola's Honey Jam:Buy Cornus' Tears:Do nothing");
}
mes .@n$;
@@ -47,11 +47,11 @@
end;
}
else if (.@i < 5) {
- mes "I can sell you 3 "+getitemname(.@Items[.@i])+" for ^3131FF1 coin^000000.";
+ mes "I can sell you 3 "+getitemname(.@items[.@i])+" for ^3131FF1 coin^000000.";
next;
switch(select("Purchase:Do not purchase")) {
case 1:
- if (countitem(.@Coin)) {
+ if (countitem(.@coin)) {
mes .@n$;
mes "Thank you for coming.";
delitem .@Coin,1;
@@ -84,4 +84,4 @@
}
}
man_in01,286,16,1 duplicate(merchant_13_2) Merchant of Manuk 4_MAN_PIOM
-spl_in01,110,326,5 duplicate(merchant_13_2) Merchant of Splendide 4_F_FAIRYKID4 \ No newline at end of file
+spl_in01,110,326,5 duplicate(merchant_13_2) Merchant of Splendide 4_F_FAIRYKID4
diff --git a/npc/merchants/elemental_trader.txt b/npc/merchants/elemental_trader.txt
index 518f782a9..a1f255743 100644
--- a/npc/merchants/elemental_trader.txt
+++ b/npc/merchants/elemental_trader.txt
@@ -79,8 +79,8 @@ ama_in02,61,27,7 script Alchemist#ama 4_M_ALCHE_B,{
mes "[Laspuchin Gregory]";
mes "Uh-huh, what did you bring?";
next;
- setarray .@Items[1],995,997,994,996;
- set .@i, .@Items[select("Mystic Frozen:Great Nature:Flame Heart:Rough Wind")];
+ setarray .@items[1],995,997,994,996;
+ set .@i, .@items[select("Mystic Frozen:Great Nature:Flame Heart:Rough Wind")];
mes "[Laspuchin Gregory]";
if (countitem(.@i) > 7) {
mes "I will take 8 of them and";
@@ -93,7 +93,7 @@ ama_in02,61,27,7 script Alchemist#ama 4_M_ALCHE_B,{
next;
set .@menu$, "";
for(set .@j,1; .@j<5; set .@j,.@j+1) {
- if (.@Items[.@j] != .@i) set .@menu$, .@menu$+getitemname(.@Items[.@j]);
+ if (.@items[.@j] != .@i) set .@menu$, .@menu$+getitemname(.@items[.@j]);
set .@menu$, .@menu$+":";
}
set .@menu$, .@menu$+"Cancel the trade";
@@ -130,7 +130,7 @@ ama_in02,61,27,7 script Alchemist#ama 4_M_ALCHE_B,{
}
else {
delitem .@i,8;
- getitem .@Items[.@j],1;
+ getitem .@items[.@j],1;
mes "Keheheh! You've chosen a good one!";
mes "Use it well...";
mes "Bring me other stones if you have them!";
diff --git a/npc/merchants/enchan_arm.txt b/npc/merchants/enchan_arm.txt
index a236722fe..2de5a6fe5 100644
--- a/npc/merchants/enchan_arm.txt
+++ b/npc/merchants/enchan_arm.txt
@@ -35,16 +35,16 @@ prontera,165,60,2 script Apprentice Craftsman 1_F_MERCHANT_01,{
next;
switch(select("Non Slotted Armor.:Slotted Armor.:High Grade Armor.:Maybe next time.")) {
case 1:
- setarray .@Items[0],2307,2309,2314,2316,2321,2325,2327,2328,2330,2332,2334,2335,2341,2344,2346,2348,2350,2337,2386,2394,2395,2396;
+ setarray .@items[0],2307,2309,2314,2316,2321,2325,2327,2328,2330,2332,2334,2335,2341,2344,2346,2348,2350,2337,2386,2394,2395,2396;
set .@j,50;
break;
case 2:
- setarray .@Items[0],2311,2318,2319,2320,2308,2310,2315,2317,2322,2324,2326,2331,2333,2336,2342,2345,2347,2349,2351;
+ setarray .@items[0],2311,2318,2319,2320,2308,2310,2315,2317,2322,2324,2326,2331,2333,2336,2342,2345,2347,2349,2351;
set .@j,55;
set .@k,1;
break;
case 3:
- setarray .@Items[0],2364,2365,2391,2374,2375,2376,2377,2378,2379,2380,2381,2382,2387,2388,2389,2390;
+ setarray .@items[0],2364,2365,2391,2374,2375,2376,2377,2378,2379,2380,2381,2382,2387,2388,2389,2390;
set .@j,60;
break;
case 4:
@@ -53,9 +53,9 @@ prontera,165,60,2 script Apprentice Craftsman 1_F_MERCHANT_01,{
close;
}
set .@menu$,"";
- for(set .@i,0; .@i<getarraysize(.@Items); set .@i,.@i+1)
- set .@menu$, .@menu$+getitemname(.@Items[.@i])+((.@k)?" [1]":"")+":";
- callsub S_EnchantArmor, .@Items[select(.@menu$)-1], .@j;
+ for(set .@i,0; .@i<getarraysize(.@items); set .@i,.@i+1)
+ set .@menu$, .@menu$+getitemname(.@items[.@i])+((.@k)?" [1]":"")+":";
+ callsub S_EnchantArmor, .@items[select(.@menu$)-1], .@j;
end;
}
mes "I am in charge of Enchanting Armors. Simply put, I've been studying ways to power-up armor.";
diff --git a/npc/merchants/milk_trader.txt b/npc/merchants/milk_trader.txt
index 23d144231..0fabb9876 100644
--- a/npc/merchants/milk_trader.txt
+++ b/npc/merchants/milk_trader.txt
@@ -49,7 +49,7 @@ prontera,73,140,0 script Milk Vendor 4_M_04,{
set .@bottles,countitem(713);
set .@total_weight,.@bottles * 50;
set .@total_cost,.@bottles * 15;
- if (Zeny < .@Total_cost) {
+ if (Zeny < .@total_cost) {
mes "[Milk Vendor]";
mes "Oh, whoa~!";
mes "You don't have enough";
diff --git a/npc/merchants/socket_enchant.txt b/npc/merchants/socket_enchant.txt
index 9d90e31aa..d76562783 100644
--- a/npc/merchants/socket_enchant.txt
+++ b/npc/merchants/socket_enchant.txt
@@ -18,7 +18,7 @@
//= 1.2 Fixed some typos and a nasty bug. [SinSloth]
//= 1.3 Fixed a wrong item ID with Sphinx Hat. [SinSloth]
//= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
-//= 1.5 Removed Ontouch trigger area from NPCs. [L0ne_W0lf]
+//= 1.5 Removed OnTouch trigger area from NPCs. [L0ne_W0lf]
//= 1.6 Replaced effect numerics with constants. [Samuray22]
//= 1.7 Adjusted prices on some armor and weapons. [L0ne_W0lf]
//= 1.8 Added missing Gae Bolg and Dragon Slayer. [Kisuka]
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-27 22:49:52 +0000