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>

5 files changed, 13 insertions, 13 deletions

diff --git a/npc/custom/quests/bandit_beard.txt b/npc/custom/quests/bandit_beard.txt
index fa1e61eac..9f9e509f4 100644
--- a/npc/custom/quests/bandit_beard.txt
+++ b/npc/custom/quests/bandit_beard.txt
@@ -70,7 +70,7 @@ L_MAKE:
 	mes "[Bearded Man]";
 	mes "Let's make you your beard!";
 	next;
-	if(countitem(Flexible_String) < 1 || countitem(Animal's_Skin) < 1 ||	countitem(Black_Dyestuffs) < 1 || countitem(Granpa_Beard) < 1 ||
+	if(countitem(Flexible_String) < 1 || countitem(Animals_Skin) < 1 || countitem(Black_Dyestuffs) < 1 || countitem(Granpa_Beard) < 1 ||
 	countitem(Sticky_Mucus) < 100 || countitem(Counteragent) < 1 || countitem(Crystal_Jewel_) < 1) goto L_NOITEMS;
 	delitem 7200, 1;
 	delitem 919, 1;
diff --git a/npc/custom/quests/elvenear.txt b/npc/custom/quests/elvenear.txt
index dca4fdfd8..02e650e78 100644
--- a/npc/custom/quests/elvenear.txt
+++ b/npc/custom/quests/elvenear.txt
@@ -36,7 +36,7 @@ geffen,127,49,5	script	Elven Ears Quest	4_M_02,{
 		mes "[Elven Ears quest]";
 		mes "Good good, let me just check";
 		next;
-		if (countitem(Cat_Hairband)<1 || countitem(Elder_Pixie's_Beard)<20 || countitem(Animal's_Skin)<20) {
+		if (countitem(Cat_Hairband) < 1 || countitem(Elder_Pixies_Beard) < 20 || countitem(Animals_Skin) < 20) {
 			mes "[Elven Ears Quest]";
 			mes "You don't have the requirements.";
 			mes "Please come back another time...";
diff --git a/npc/custom/quests/event_6_new_hats.txt b/npc/custom/quests/event_6_new_hats.txt
index 593293a69..50110ff52 100644
--- a/npc/custom/quests/event_6_new_hats.txt
+++ b/npc/custom/quests/event_6_new_hats.txt
@@ -194,13 +194,13 @@ prt_in,53,56,5	script	Jac	1_M_PAY_ELDER,{
 				mes "Oh, dear. You need 10 Steels...";
 				close;
 			}
-			if (countitem(Bear's_Foot) < 200) {
+			if (countitem(Bears_Foot) < 200) {
 				mes "[Jac]";
 				mes "Oh, dear. You need 200 Bear Footskins...";
 				close;
 			}
 			delitem Steel,10;//Items: Steel,
-			delitem Bear's_Foot,200;	//Items: Bears Footskin,
+			delitem Bears_Foot,200; //Items: Bears Footskin,
 			mes "[Jac]";
 			mes "Wow!! Well done! Finally you have gathered all items needed! We will make the Panda Hat for you right away. Please Wait a Moment.";
 			next;
diff --git a/npc/custom/quests/may_hats.txt b/npc/custom/quests/may_hats.txt
index beea787a1..a1864f96f 100644
--- a/npc/custom/quests/may_hats.txt
+++ b/npc/custom/quests/may_hats.txt
@@ -62,10 +62,10 @@ gonryun,187,140,4	script	Yakima	4_F_EINWOMAN,{
 		next;
 		if (select("Yeah.", "Nay." != 1))
 			break;
-		if(countitem(Tiger_Mask) < 1 || countitem(Tiger_Footskin) < 10 || countitem(Tiger's_Skin) < 30 || countitem(Tiger_Skin_Panties) < 300) goto l_noitem;//Items: Tiger_Mask, Tiger_Skin, Tiger's_Footskin, Tiger_Panty,
+		if(countitem(Tiger_Mask) < 1 || countitem(Tiger_Footskin) < 10 || countitem(Tigers_Skin) < 30 || countitem(Tiger_Skin_Panties) < 300) goto l_noitem;//Items: Tiger_Mask, Tiger_Skin, Tiger_Footskin, Tiger_Panty,
 		delitem Tiger_Mask,1;//Items: Tiger_Mask,
-		delitem Tiger_Footskin,10;//Items: Tiger's_Footskin,
-		delitem Tiger's_Skin,30;//Items: Tiger_Skin,
+		delitem Tiger_Footskin,10;//Items: Tiger_Footskin,
+		delitem Tigers_Skin,30;//Items: Tiger_Skin,
 		delitem Tiger_Skin_Panties,300;//Items: Tiger_Panty,
 		getitem Lion_Mask,1;//Items: Lion_Mask,
 		mes "[Yakima]";
@@ -95,7 +95,7 @@ gonryun,187,140,4	script	Yakima	4_F_EINWOMAN,{
 		delitem Manteau_,2;//Items: Manteau_,
 		delitem Skul_Ring,3;//Items: Skull_Ring,
 		delitem Old_Manteau,10;//Items: Old_Manteau,
-		getitem Skeleton's_Cape,1;//Items: Skeleton_Manteau,
+		getitem Skeletons_Cape,1;//Items: Skeleton_Manteau,
 		mes "[Yakima]";
 		mes "Thank you very very much!";
 		mes callfunc("F_Bye");
diff --git a/npc/custom/quests/thq/THQS_Quests.txt b/npc/custom/quests/thq/THQS_Quests.txt
index bc81fb24b..c0eb1427a 100644
--- a/npc/custom/quests/thq/THQS_Quests.txt
+++ b/npc/custom/quests/thq/THQS_Quests.txt
@@ -228,7 +228,7 @@ N_QuestStart:
 ///////Job list 3///////
 //3-1;
 moc_fild04,208,322,6	script	Clark	1_M_YOUNGKNIGHT,{
-	if (three_qset == 1 && countitem(Elder_Pixie's_Beard) > 29) goto N_QuestComp;
+	if (three_qset == 1 && countitem(Elder_Pixies_Beard) > 29) goto N_QuestComp;
 	if (three_qset == 1) goto N_QuestStart;
 	mes "[Clark]";
 	mes "Love to chat, but I'm waiting for someone.";
@@ -456,7 +456,7 @@ N_QuestStart:
 ///////Job list 5///////
 //5-1;
 prt_maze01,18,184,6	script	Lithin#01	4_M_CRU_OLD,{
-	if (five_qset == 1 && countitem(Wild_Boar's_Mane) > 14) goto N_QuestComp;
+	if (five_qset == 1 && countitem(Wild_Boars_Mane) > 14) goto N_QuestComp;
 	if (five_qset == 1) goto N_QuestStart;
 	mes "[Lithin]";
 	mes "Well hello.";
@@ -975,7 +975,7 @@ N_QuestStart:
 }
 //10-2;
 pay_fild10,145,252,6	script	Man#02	2_M_DYEINGER,{
-	if (ten_qset == 2 && countitem(Tiger's_Skin) > 0) goto N_QuestComp;
+	if (ten_qset == 2 && countitem(Tigers_Skin) > 0) goto N_QuestComp;
 	if (ten_qset == 2) goto N_QuestStart;
 	mes "[Man]";
 	mes "Sorry I'm waiting for someone, you will have to come back later";
@@ -995,12 +995,12 @@ N_QuestStart:
 	mes "[Man]";
 	mes "Tony the Tiger is on Crack! He must be stoped, KILL HIM!";
 	mes " ";
-	mes "Bring me back 1 Tiger's_Skin!";
+	mes "Bring me back 1 Tiger's Skin!";
 	close;
 }
 //10-3;
 cmd_fild08,328,349,4	script	Caral	2_M_SWORDMASTER,{
-	if (ten_qset == 3 && countitem(Thin_N'_Long_Tongue) > 0) goto N_QuestComp;
+	if (ten_qset == 3 && countitem(Thin_N_Long_Tongue) > 0) goto N_QuestComp;
 	if (ten_qset == 3) goto N_QuestStart;
 	mes "[Caral]";
 	mes "Sorry I'm waiting for someone, you will have to come back later.";