Propageted the AegisName fix to scripts and pre-re database

This commit just propagates the AegisName changes to the pre-re database
and to the (re) scripts.

Two issues are fixed as a side-effect:

- The ghost_palace script was referring the non-existing constant(s):
  Thanatos_Two-Handed_Staff == (Thanatos_Two) - (Handed_Staff) == 0.
  Paired with the script engine's inability to differentiate between
  constants and player variables, that produced a very subtle issue.
- The item RAG203 is sold by a NPC (Rebellion Weapon Vending). Due to a
  pair of swapped AegisName constants (RAG203 and RAG203_), the slotted
  version was sold by the NPC instead of hte non-slotted one (the issue
  was actually fixed in the previous commit, although the description of
  the fix is here - these two commits are only split for legibility
  purposes but they're to be considered indivisible).

Signed-off-by: Haru <haru@dotalux.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/npc/re/events/halloween_2013.txt b/npc/re/events/halloween_2013.txt
index 6f16d437c..acfd60f9f 100644
--- a/npc/re/events/halloween_2013.txt
+++ b/npc/re/events/halloween_2013.txt
@@ -267,7 +267,7 @@ L_Explain:
 
 niflheim,181,173,5	script	Chef Candycon#2013HE	4_M_NFDEADSWDMAN,{
 	if (eve_bs == 1) {
-		if (countitem(Organic_Pumpkin) * 3 + countitem(Inorganic_Pumpkin) >= 30) {
+		if (countitem(ORGANIC_PUMPKIN) * 3 + countitem(INORGANIC_PUMPKIN) >= 30) {
 			mes "[Chef Candycon]";
 			mes "Clang~Clang~!";
 			next;
@@ -400,16 +400,16 @@ L_GivePumpkin:
 		mes "Eeh~~ You have no use for those pumpkins~~";
 		close;
 	}
-	if (countitem(Organic_Pumpkin) * 3 + countitem(Inorganic_Pumpkin) < 30) {
+	if (countitem(ORGANIC_PUMPKIN) * 3 + countitem(INORGANIC_PUMPKIN) < 30) {
 		mes "[Chef Candycon]";
 		mes "Ooops where is pumpkin? escaped again?";
 		mes "Oh, boy...no... you should go to get them again...";
 		close;
 	}
-	if (countitem(Inorganic_Pumpkin))
-		delitem Inorganic_Pumpkin,countitem(Inorganic_Pumpkin);
-	if (countitem(Organic_Pumpkin))
-		delitem Organic_Pumpkin,countitem(Organic_Pumpkin);
+	if (countitem(INORGANIC_PUMPKIN))
+		delitem INORGANIC_PUMPKIN, countitem(INORGANIC_PUMPKIN);
+	if (countitem(ORGANIC_PUMPKIN))
+		delitem ORGANIC_PUMPKIN, countitem(ORGANIC_PUMPKIN);
 	eve_bs = 2;
 	getitem HALLOWEEN_G_BOX,1;
 	erasequest 11378;