summaryrefslogtreecommitdiff
path: root/npc/re/merchants
diff options
context:
space:
mode:
Diffstat (limited to 'npc/re/merchants')
-rw-r--r--npc/re/merchants/coin_exchange.txt4
-rw-r--r--npc/re/merchants/enchan_mal.txt10
-rw-r--r--npc/re/merchants/flute.txt4
-rw-r--r--npc/re/merchants/shops.txt58
4 files changed, 38 insertions, 38 deletions
diff --git a/npc/re/merchants/coin_exchange.txt b/npc/re/merchants/coin_exchange.txt
index b714dd71d..be9f1dbee 100644
--- a/npc/re/merchants/coin_exchange.txt
+++ b/npc/re/merchants/coin_exchange.txt
@@ -1129,7 +1129,7 @@ ecl_in01,67,39,4 script Replication Expert Paltu 4_M_FAIRYKID4,{
Assassin_Mask_,
Elven_Ears,
Hahoe_Mask,
- Boy's_Cap;
+ Boys_Cap;
setarray .@costumes[0], C_Frog_Cap,
C_Centimental_Flower,
C_Magestic_Goat,
@@ -1139,7 +1139,7 @@ ecl_in01,67,39,4 script Replication Expert Paltu 4_M_FAIRYKID4,{
C_Assassin_Mask_,
C_Elven_Ears,
C_Hahoe_Mask,
- C_Boy's_Cap;
+ C_Boys_Cap;
if ((countitem(Splendide_Coin) >= 50) && (countitem(Crystal_Mirror) >= 4) && countitem(Angel_Magic_Power) && (countitem(Azure_Jewel) >= 10) && (countitem(Cardinal_Jewel) >= 10) && (countitem(Blue_Jewel) >= 10) && (countitem(Golden_Jewel) >= 10) && (countitem(Bluish_Green_Jewel) >= 10))
.@item_check =1;
diff --git a/npc/re/merchants/enchan_mal.txt b/npc/re/merchants/enchan_mal.txt
index 7be4eaa6f..864505b85 100644
--- a/npc/re/merchants/enchan_mal.txt
+++ b/npc/re/merchants/enchan_mal.txt
@@ -93,7 +93,7 @@ malangdo,213,167,4 script Mayomayo#mal 4_CAT_3COLOR,{
case 1224: callsub L_Socket,1,2; //Sword_Breaker
case 1225: callsub L_Socket,1,2; //Mail_Breaker
case 1227: callsub L_Socket,1,2; //Weeder_Knife
- case 1229: callsub L_Socket,1,2; //Mama's_Knife
+ case 1229: callsub L_Socket,1,2; //Mamas_Knife
case 1232: callsub L_Socket,1,2; //Assasin_Dagger
case 1233: callsub L_Socket,1,2; //Exercise
case 1235: callsub L_Socket,1,2; //Azoth
@@ -212,7 +212,7 @@ malangdo,213,167,4 script Mayomayo#mal 4_CAT_3COLOR,{
case 1466: callsub L_Socket,1,2; //Crescent_Scythe
case 1467: callsub L_Socket,1,2; //Bill_Guisarme
case 1468: callsub L_Socket,1,2; //Zephyrus
- case 1469: callsub L_Socket,1,2; //Longinus's_Spear
+ case 1469: callsub L_Socket,1,2; //Longinuss_Spear
case 1470: callsub L_Socket,1,2; //Brionac
case 1471: callsub L_Socket,1,2; //Hell_Fire
case 1474: callsub L_Socket,1,2; //Gae_Bolg
@@ -264,7 +264,7 @@ malangdo,213,167,4 script Mayomayo#mal 4_CAT_3COLOR,{
case 15: // Books
switch(@mal_equip_id) {
case 1557: callsub L_Socket,1,2; //Book_Of_The_Apocalypse
- case 1558: callsub L_Socket,1,2; //Girl's_Diary
+ case 1558: callsub L_Socket,1,2; //Girls_Diary
case 1559: callsub L_Socket,1,2; //Legacy_Of_Dragon
case 1561: callsub L_Socket,1,2; //Hardback
case 1562: callsub L_Socket,1,2; //Bible_Of_Battlefield
@@ -311,11 +311,11 @@ malangdo,213,167,4 script Mayomayo#mal 4_CAT_3COLOR,{
case 1963: callsub L_Socket,1,2; //Rapture_Rose
case 1964: callsub L_Socket,1,2; //Chemeti
case 1969: callsub L_Socket,1,2; //Bladed_Whip
- case 1970: callsub L_Socket,1,2; //Queen's_Whip
+ case 1970: callsub L_Socket,1,2; //Queens_Whip
case 1972: callsub L_Socket,1,2; //Electric_Eel
case 1973: callsub L_Socket,1,2; //Sea_Witch_Foot
case 1974: callsub L_Socket,1,2; //Carrot_Whip
- case 1976: callsub L_Socket,1,2; //Queen's_Whip_
+ case 1976: callsub L_Socket,1,2; //Queens_Whip_
case 1979: callsub L_Socket,1,2; //Stem_Of_Nepenthes
case 1984: callsub L_Socket,2,2; //Stem_Whip
case 1985: callsub L_Socket,4,2; //Rosebine
diff --git a/npc/re/merchants/flute.txt b/npc/re/merchants/flute.txt
index 6732035dc..98fd3789c 100644
--- a/npc/re/merchants/flute.txt
+++ b/npc/re/merchants/flute.txt
@@ -110,7 +110,7 @@ pay_arche,91,134,3 duplicate(fflute) Falcon Flute Trader#fft2 1_M_BARD
tur_dun01,89,170,5 script Expert Flute Crafter 1_M_ORIENT01,{
if (Class == Job_Ranger || Class == Job_Ranger_T || Class == Job_Baby_Ranger) {
- if (countitem(Wolf's_Flute)) {
+ if (countitem(Wolfs_Flute)) {
mes "[Expert Flute Crafter]";
mes "The Wolf Flute you have is crafted by myself, with wood.";
mes "You can come back here and find me if you lose your Wolf flute!";
@@ -137,7 +137,7 @@ tur_dun01,89,170,5 script Expert Flute Crafter 1_M_ORIENT01,{
mes "Hope you are ready to use it.";
delitem Bamboo_Cut,1;
Zeny -= 100000;
- getitem Wolf's_Flute,1;
+ getitem Wolfs_Flute,1;
close;
}
mes "[Expert Flute Crafter]";
diff --git a/npc/re/merchants/shops.txt b/npc/re/merchants/shops.txt
index 54155e8c4..543d9cdc7 100644
--- a/npc/re/merchants/shops.txt
+++ b/npc/re/merchants/shops.txt
@@ -547,42 +547,42 @@ OnInit:
prontera,92,209,4 trader Rebellion Weapon Vending 2_VENDING_MACHINE1,{
OnInit:
- sellitem Heaven's_Feather_and_Hell's_Fire;
- sellitem Altea_and_Ares;
- sellitem Color_Scope;
+ sellitem H_FEATHER_H_FIRE;
+ sellitem ALTAIR_ARES;
+ sellitem COLORSCOPE;
sellitem RAG203;
- sellitem Death_Fire;
- sellitem Rolling_Thunder;
- sellitem Peace_Breaker;
- sellitem Mini_Mei;
- sellitem Tempest;
- sellitem End_Of_The_Horizon;
- sellitem South_Cross;
+ sellitem DEATHFIRE;
+ sellitem R_THUNDER;
+ sellitem P_BREAKER;
+ sellitem MINIMAY;
+ sellitem TEMPEST;
+ sellitem END_OF_HORIZON;
+ sellitem Southern_Cross_R;
}
prontera,96,209,4 trader Rebellion Prop Vending 2_VENDING_MACHINE1,{
OnInit:
- sellitem Slug_Ammunition_L;
- sellitem Slug_Ammunition_M;
- sellitem Slug_Ammunition_H;
- sellitem Full_Metal_Jacket;
- sellitem Projection_Landmines;
+ sellitem Slug_Bullet_1;
+ sellitem Slug_Bullet_2;
+ sellitem Slug_Bullet_3;
+ sellitem Fullmetal_Jacket_Bullet;
+ sellitem Mine_Projectile;
sellitem Dragon_Tail_Missile;
sellitem Special_Alloy_Trap;
sellitem Bullet;
sellitem Silver_Bullet_;
sellitem Shell_Of_Blood_;
- sellitem Armor_Piercing_Bullet;
- sellitem Blazing_Bullet;
+ sellitem AP_Ammo;
+ sellitem Blaze_Bullet;
sellitem Freezing_Bullet;
- sellitem Lightning_Bullet;
- sellitem Magic_Stone_Bullet;
- sellitem Purifying_Bullet;
- sellitem Incendiary_Grenade;
- sellitem Lightning_Grenade;
- sellitem Poison_Grenade;
- sellitem Flash_Grenade;
- sellitem Cyro_Grenade;
+ sellitem Electric_Shock_Bullet;
+ sellitem Magical_Stone_Bullet;
+ sellitem Sanctified_Bullet;
+ sellitem Flare_Sphere_;
+ sellitem Lighting_Sphere_;
+ sellitem Poison_Sphere_;
+ sellitem Blind_Sphere_;
+ sellitem Freezing_Sphere_;
}
//== Morroc ===============================================
@@ -712,16 +712,16 @@ OnInit:
morocc,171,103,4 trader Item Collector#moc3 4_M_03,{
OnInit:
sellitem Scell;
- sellitem Monster's_Feed;
- sellitem Animal's_Skin;
+ sellitem Monsters_Feed;
+ sellitem Animals_Skin;
sellitem Bill_Of_Birds;
}
morocc,205,247,2 trader Item Collector#moc4 4_M_03,{
OnInit:
sellitem Scell;
- sellitem Monster's_Feed;
- sellitem Animal's_Skin;
+ sellitem Monsters_Feed;
+ sellitem Animals_Skin;
sellitem Bill_Of_Birds;
}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-08-17 15:40:20 +0000