summaryrefslogtreecommitdiff
path: root/npc/re/merchants
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2016-11-18 07:13:21 +0100
committerHaru <haru@dotalux.com>2016-11-20 18:10:45 +0100
commite384a7f2166026dc1c8cdfe49fc2fc105197ea02 (patch)
tree45853183b6760e267e8783bc0a50cba1199f54c9 /npc/re/merchants
parent0a4fdb4404900fb03726b98ecbe379f2d5da6bd0 (diff)
downloadhercules-e384a7f2166026dc1c8cdfe49fc2fc105197ea02.tar.gz
hercules-e384a7f2166026dc1c8cdfe49fc2fc105197ea02.tar.bz2
hercules-e384a7f2166026dc1c8cdfe49fc2fc105197ea02.tar.xz
hercules-e384a7f2166026dc1c8cdfe49fc2fc105197ea02.zip
Replaced some unsupported symbols in AegisNames (step 2)
This removes the remaining unsupported symbols (despite they being official names) in AegisNames: The apostrophe (`'`) sign is suppressed. The full replacement rules (cumulative with the step 1 commit) are thus: - Any apostrophe is suppressed. - Any non-`[A-Za-z0-9_]` character is replaced with an underscore (`_`). - If the replaced symbol is at a word boundary (beginning or end of the string, or next to another underscore), it is suppressed instead. - If the replacement causes an AegisName conflict, underscores are appended appropriately. Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'npc/re/merchants')
-rw-r--r--npc/re/merchants/coin_exchange.txt2
-rw-r--r--npc/re/merchants/enchan_mal.txt10
-rw-r--r--npc/re/merchants/flute.txt4
-rw-r--r--npc/re/merchants/shops.txt8
4 files changed, 12 insertions, 12 deletions
diff --git a/npc/re/merchants/coin_exchange.txt b/npc/re/merchants/coin_exchange.txt
index e5ee13ffb..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,
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 d8f7594b2..543d9cdc7 100644
--- a/npc/re/merchants/shops.txt
+++ b/npc/re/merchants/shops.txt
@@ -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;
}