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>

3 files changed, 85 insertions, 85 deletions

diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index 4e77704da..836020da8 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -50556,7 +50556,7 @@ item_db: (
 /*
 {
 	Id: 5744
-	AegisName: "Capricon_Crown"
+	AegisName: "Capricorn_Crown"
 	Name: "Capricon Crown"
 	Type: 5
 	Buy: 20
@@ -50575,7 +50575,7 @@ item_db: (
 /*
 {
 	Id: 5745
-	AegisName: "Capricon_Diadem"
+	AegisName: "Capricorn_Diadem"
 	Name: "Capricon Diadem"
 	Type: 5
 	Buy: 20
@@ -56986,7 +56986,7 @@ item_db: (
 },
 {
 	Id: 7062
-	AegisName: "Broken_Turtle_Shell"
+	AegisName: "Turtle_Shell_"
 	Name: "Broken Turtle Shell"
 	Type: 3
 	Buy: 280
@@ -72932,7 +72932,7 @@ item_db: (
 },
 {
 	Id: 12416
-	AegisName: "LUcky_Egg_C3"
+	AegisName: "Lucky_Egg_C3"
 	Name: "Lucky Egg C3"
 	Type: 2
 	Buy: 20
@@ -81769,7 +81769,7 @@ item_db: (
 },
 {
 	Id: 13521
-	AegisName: "Garment_Card_Scroll_Box"
+	AegisName: "Hood_Card_Scroll_Box"
 	Name: "Garment Card Pet Egg Scroll Box"
 	Type: 18
 	Buy: 20
@@ -81778,7 +81778,7 @@ item_db: (
 },
 {
 	Id: 13522
-	AegisName: "Shield_Card_Scroll_Box"
+	AegisName: "Hood_Card_Scroll_Box2"
 	Name: "Shield Card Pet Egg Scroll Box"
 	Type: 18
 	Buy: 20
@@ -85919,7 +85919,7 @@ item_db: (
 },
 {
 	Id: 13896
-	AegisName: "Mimic_Scroll_Box5"
+	AegisName: "Mimic_Summon_Box5"
 	Name: "Mimic Summoning 5 Box"
 	Type: 18
 	Buy: 20
@@ -85947,7 +85947,7 @@ item_db: (
 },
 {
 	Id: 13898
-	AegisName: "Alice_Scroll_Box5"
+	AegisName: "Alice_Summon_Box5"
 	Name: "Alice Summoning 5 Box"
 	Type: 18
 	Buy: 20
@@ -85961,7 +85961,7 @@ item_db: (
 },
 {
 	Id: 13899
-	AegisName: "Mimic_Scroll_Box10"
+	AegisName: "Mimic_Summon_Box10"
 	Name: "Mimic Summoning 10 Box"
 	Type: 18
 	Buy: 20
@@ -85989,7 +85989,7 @@ item_db: (
 },
 {
 	Id: 13901
-	AegisName: "Alice_Scroll_Box10"
+	AegisName: "Alice_Summon_Box10"
 	Name: "Alice Summoning 10 Box"
 	Type: 18
 	Buy: 20
@@ -92024,7 +92024,7 @@ item_db: (
 /*
 {
 	Id: 14230
-	AegisName: "Note_Headphones_Box"
+	AegisName: "Headphone_Box"
 	Name: "Note Headphones Box"
 	Type: 18
 	Weight: 10
@@ -92034,7 +92034,7 @@ item_db: (
 /*
 {
 	Id: 14231
-	AegisName: "Novice_Breastplate_Boxes"
+	AegisName: "Novice_Box"
 	Name: "Novice Breastplate Boxes"
 	Type: 18
 	Weight: 10
@@ -92083,7 +92083,7 @@ item_db: (
 },
 {
 	Id: 14236
-	AegisName: "Steamed_Tongue_Box_20"
+	AegisName: "Str_Dish_Box60"
 	Name: "Steamed Tongue 20 Box"
 	Type: 18
 	Buy: 20
@@ -92092,7 +92092,7 @@ item_db: (
 },
 {
 	Id: 14237
-	AegisName: "Steamed_Desert_Scorpions_Box_20"
+	AegisName: "Agi_Dish_Box60"
 	Name: "Steamed Desert Scorpions Box(20)"
 	Type: 18
 	Buy: 20
@@ -92101,7 +92101,7 @@ item_db: (
 },
 {
 	Id: 14238
-	AegisName: "Stew_Of_Immortality_Box_20"
+	AegisName: "Int_Dish_Box60"
 	Name: "Immortal Stew 20 Box"
 	Type: 18
 	Buy: 20
@@ -92110,7 +92110,7 @@ item_db: (
 },
 {
 	Id: 14239
-	AegisName: "Dragon_Breath_Cocktail_Box_20"
+	AegisName: "Dex_Dish_Box60"
 	Name: "Dragon Breath Cocktail 20 Box"
 	Type: 18
 	Buy: 20
@@ -92119,7 +92119,7 @@ item_db: (
 },
 {
 	Id: 14240
-	AegisName: "Hwergelmir's_Tonic_Box_20"
+	AegisName: "Luk_Dish_Box60"
 	Name: "Hwergelmir's Tonic 20 Box"
 	Type: 18
 	Buy: 20
@@ -92128,7 +92128,7 @@ item_db: (
 },
 {
 	Id: 14241
-	AegisName: "Nine_Tail_Dish_Box_20"
+	AegisName: "Vit_Dish_Box60"
 	Name: "Nine Tail Dish 20 Box"
 	Type: 18
 	Buy: 20
@@ -92513,7 +92513,7 @@ item_db: (
 },
 {
 	Id: 14274
-	AegisName: "Amplification_10_Scroll_Box2"
+	AegisName: "F_Magic_Scroll_Box"
 	Name: "Mystical Amplification Scroll 10 Box"
 	Type: 18
 	Buy: 20
@@ -92522,7 +92522,7 @@ item_db: (
 },
 {
 	Id: 14275
-	AegisName: "Amplification_30_Scroll_Box2"
+	AegisName: "F_Magic_Scroll_Box30"
 	Name: "Mystical Amplification Scroll 30 Box"
 	Type: 18
 	Buy: 20
@@ -92531,7 +92531,7 @@ item_db: (
 },
 {
 	Id: 14276
-	AegisName: "Amplification_50_Scroll_Box2"
+	AegisName: "F_Magic_Scroll_Box50"
 	Name: "Mystical Amplification Scroll 50 Box"
 	Type: 18
 	Buy: 20
@@ -92540,7 +92540,7 @@ item_db: (
 },
 {
 	Id: 14277
-	AegisName: "Quagmire_10_Scroll_Box2"
+	AegisName: "F_Quagmire_Scroll_Box"
 	Name: "Quagmire Scroll 10 Box"
 	Type: 18
 	Buy: 20
@@ -92549,7 +92549,7 @@ item_db: (
 },
 {
 	Id: 14278
-	AegisName: "Quagmire_30_Scroll_Box2"
+	AegisName: "F_Quagmire_Scroll_Box30"
 	Name: "Quagmire Scroll 30 Box"
 	Type: 18
 	Buy: 20
@@ -92558,7 +92558,7 @@ item_db: (
 },
 {
 	Id: 14279
-	AegisName: "Quagmire_50_Scroll_Box2"
+	AegisName: "F_Quagmire_Scroll_Box50"
 	Name: "Quagmire Scroll 50 Box"
 	Type: 18
 	Buy: 20
@@ -92606,7 +92606,7 @@ item_db: (
 /*
 {
 	Id: 14284
-	AegisName: "Muffler_Box"
+	AegisName: "Muffler_C_Box"
 	Name: "Muffler Box"
 	Type: 18
 	Buy: 20
@@ -92617,7 +92617,7 @@ item_db: (
 /*
 {
 	Id: 14285
-	AegisName: "Balkiriah_Shield_Box"
+	AegisName: "Valkyrja's_Shield_C_Box"
 	Name: "Balkiriah Shield Box"
 	Type: 18
 	Buy: 20
@@ -92628,7 +92628,7 @@ item_db: (
 /*
 {
 	Id: 14286
-	AegisName: "Skull_Ring_Box"
+	AegisName: "Skul_Ring_C_Box"
 	Name: "Skull Ring Box"
 	Type: 18
 	Buy: 20
@@ -92638,7 +92638,7 @@ item_db: (
 */
 {
 	Id: 14287
-	AegisName: "Baricade_Repair_Kit"
+	AegisName: "S_Barricade_Repair_Kit"
 	Name: "Barricade Repair Kit"
 	Type: 18
 	Buy: 20
@@ -92652,7 +92652,7 @@ item_db: (
 },
 {
 	Id: 14288
-	AegisName: "Guardian_Stone_Repair_Kit"
+	AegisName: "S_Gstone_Repair_Kit"
 	Name: "Guardian Stone Repair Kit"
 	Type: 18
 	Buy: 20
@@ -92731,7 +92731,7 @@ item_db: (
 /*
 {
 	Id: 14294
-	AegisName: "Mercenary_Contract_Box5"
+	AegisName: "Mercenary_Contract_5Box"
 	Name: "Mercenary Contract Box 5ea"
 	Type: 2
 	Weight: 10
@@ -92741,7 +92741,7 @@ item_db: (
 /*
 {
 	Id: 14295
-	AegisName: "Mercenary_Contract_Box10"
+	AegisName: "Mercenary_Contract_10Bo"
 	Name: "Mercenary Contract Box 10ea"
 	Type: 2
 	Weight: 10
@@ -92820,7 +92820,7 @@ item_db: (
 },
 {
 	Id: 14314
-	AegisName: "PhreeoniS_Box"
+	AegisName: "Phreeoni_Scroll_Box"
 	Name: "Phreeoni Scroll Box"
 	Type: 2
 	Weight: 10
@@ -95110,7 +95110,7 @@ item_db: (
 */
 {
 	Id: 16304
-	AegisName: "Evil_Incarnation"
+	AegisName: "Evil_Incarnation_Disable"
 	Name: "Evil Incarnation"
 	Type: 2
 	Buy: 20
@@ -95968,7 +95968,7 @@ item_db: (
 },
 {
 	Id: 19507
-	AegisName: "Clear_Sun"
+	AegisName: "Fine_Sun"
 	Name: "Clear Sun"
 	Type: 5
 	Loc: 1024
diff --git a/db/pre-re/item_group.conf b/db/pre-re/item_group.conf
index 63f6efcb0..6681abf7c 100644
--- a/db/pre-re/item_group.conf
+++ b/db/pre-re/item_group.conf
@@ -3892,7 +3892,7 @@ Splendid_Box2: (
 /* currently unsupported or unknown ('Mysterious_Egg')
 Mysterious_Egg: (
 	("Lucky_Egg_C2",3),
-	("LUcky_Egg_C3",3),
+	("Lucky_Egg_C3",3),
 	("Lucky_Egg_C4",3),
 	("Lucky_Egg_C5",3),
 	("Lucky_Egg_C6",3),
diff --git a/db/pre-re/item_packages.conf b/db/pre-re/item_packages.conf
index 3c952e258..808addc58 100644
--- a/db/pre-re/item_packages.conf
+++ b/db/pre-re/item_packages.conf
@@ -4745,8 +4745,8 @@ July7_Scroll: {
 		Named: true
 		Rate: 1
 	}
-//unsupported/unknown item 'Hair_Of_The_Strong'
-//	Hair_Of_The_Strong: {
+//unsupported/unknown item 'C_Hair_Of_The_Strong'
+//	C_Hair_Of_The_Strong: {
 //		Random: 1
 //		Announce: true
 //		Named: true
@@ -5283,7 +5283,7 @@ Buddah_Scroll: {
 		Rate: 1
 	}
 }
-Evil_Incarnation: {
+Evil_Incarnation_Disable: {
 	Dead_Tree_Branch_Box2: {
 		Random: 1
 		Named: true
@@ -5791,8 +5791,8 @@ Premium_Reset_Stone_Box: {
 		Random: 0
 	}
 }
-/* unsupported/unknown item 'FPr_Reset_Stone_Box'
-FPr_Reset_Stone_Box: {
+/* unsupported/unknown item 'FPremium_Reset_Stone_Box'
+FPremium_Reset_Stone_Box: {
 	Premium_Reset_Stone: {
 		Random: 0
 	}
@@ -5881,8 +5881,8 @@ Majestic_Devil_Scroll: {
 	}
 }
 */
-/* unsupported/unknown item 'Life_Ribbon_Box'
-Life_Ribbon_Box: {
+/* unsupported/unknown item 'Ribbon_Of_Life_Box'
+Ribbon_Of_Life_Box: {
 //unsupported/unknown item 'Life_Ribbon'
 //	Life_Ribbon: {
 //		Random: 0
@@ -5890,8 +5890,8 @@ Life_Ribbon_Box: {
 //	}
 }
 */
-/* unsupported/unknown item 'Life_Ribbon_Box2'
-Life_Ribbon_Box2: {
+/* unsupported/unknown item 'Ribbon_Of_Life_Box2'
+Ribbon_Of_Life_Box2: {
 //unsupported/unknown item 'Life_Ribbon'
 //	Life_Ribbon: {
 //		Random: 0
@@ -5900,8 +5900,8 @@ Life_Ribbon_Box2: {
 //	}
 }
 */
-/* unsupported/unknown item 'Life_Ribbon_Box3'
-Life_Ribbon_Box3: {
+/* unsupported/unknown item 'Ribbon_Of_Life_Box3'
+Ribbon_Of_Life_Box3: {
 //unsupported/unknown item 'Life_Ribbon'
 //	Life_Ribbon: {
 //		Random: 0
@@ -6896,8 +6896,8 @@ Pisces_Diadem_Scroll: {
 		Named: true
 		Rate: 130
 	}
-//unsupported/unknown item 'Life_Ribbon_Box3'
-//	Life_Ribbon_Box3: {
+//unsupported/unknown item 'Ribbon_Of_Life_Box3'
+//	Ribbon_Of_Life_Box3: {
 //		Random: 1
 //		Named: true
 //		Rate: 160
@@ -6920,8 +6920,8 @@ Pisces_Diadem_Scroll: {
 	}
 }
 */
-/* unsupported/unknown item 'Pisces_Diadem_Box'
-Pisces_Diadem_Box: {
+/* unsupported/unknown item 'Pisces_Diadem_Box2'
+Pisces_Diadem_Box2: {
 //unsupported/unknown item 'Pisces_Diadem_Scroll'
 //	Pisces_Diadem_Scroll: {
 //		Random: 0
@@ -7105,8 +7105,8 @@ Energetic_Pisces_Box: {
 //	}
 }
 */
-/* unsupported/unknown item 'Aries_Scroll'
-Aries_Scroll: {
+/* unsupported/unknown item 'Aries_Scroll_'
+Aries_Scroll_: {
 //unsupported/unknown item 'Freyja_Boots'
 //	Freyja_Boots: {
 //		Random: 1
@@ -7173,53 +7173,53 @@ Aries_Scroll: {
 */
 /* unsupported/unknown item 'Aries_Scroll_Box'
 Aries_Scroll_Box: {
-//unsupported/unknown item 'Aries_Scroll'
-//	Aries_Scroll: {
+//unsupported/unknown item 'Aries_Scroll_'
+//	Aries_Scroll_: {
 //		Random: 0
 //		Named: true
 //	}
-//unsupported/unknown item 'Aries_Scroll'
-//	Aries_Scroll: {
+//unsupported/unknown item 'Aries_Scroll_'
+//	Aries_Scroll_: {
 //		Random: 0
 //		Named: true
 //	}
-//unsupported/unknown item 'Aries_Scroll'
-//	Aries_Scroll: {
+//unsupported/unknown item 'Aries_Scroll_'
+//	Aries_Scroll_: {
 //		Random: 0
 //		Named: true
 //	}
-//unsupported/unknown item 'Aries_Scroll'
-//	Aries_Scroll: {
+//unsupported/unknown item 'Aries_Scroll_'
+//	Aries_Scroll_: {
 //		Random: 0
 //		Named: true
 //	}
-//unsupported/unknown item 'Aries_Scroll'
-//	Aries_Scroll: {
+//unsupported/unknown item 'Aries_Scroll_'
+//	Aries_Scroll_: {
 //		Random: 0
 //		Named: true
 //	}
-//unsupported/unknown item 'Aries_Scroll'
-//	Aries_Scroll: {
+//unsupported/unknown item 'Aries_Scroll_'
+//	Aries_Scroll_: {
 //		Random: 0
 //		Named: true
 //	}
-//unsupported/unknown item 'Aries_Scroll'
-//	Aries_Scroll: {
+//unsupported/unknown item 'Aries_Scroll_'
+//	Aries_Scroll_: {
 //		Random: 0
 //		Named: true
 //	}
-//unsupported/unknown item 'Aries_Scroll'
-//	Aries_Scroll: {
+//unsupported/unknown item 'Aries_Scroll_'
+//	Aries_Scroll_: {
 //		Random: 0
 //		Named: true
 //	}
-//unsupported/unknown item 'Aries_Scroll'
-//	Aries_Scroll: {
+//unsupported/unknown item 'Aries_Scroll_'
+//	Aries_Scroll_: {
 //		Random: 0
 //		Named: true
 //	}
-//unsupported/unknown item 'Aries_Scroll'
-//	Aries_Scroll: {
+//unsupported/unknown item 'Aries_Scroll_'
+//	Aries_Scroll_: {
 //		Random: 0
 //		Named: true
 //	}
@@ -8305,8 +8305,8 @@ RWC_Super_Scroll: {
 //		Announce: true
 //		Rate: 250
 //	}
-//unsupported/unknown item 'Hair_Of_The_Strong'
-//	Hair_Of_The_Strong: {
+//unsupported/unknown item 'C_Hair_Of_The_Strong'
+//	C_Hair_Of_The_Strong: {
 //		Random: 1
 //		Announce: true
 //		Rate: 100
@@ -8362,8 +8362,8 @@ RWC_Super_Scroll: {
 //	}
 }
 */
-/* unsupported/unknown item 'Leo_Scroll'
-Leo_Scroll: {
+/* unsupported/unknown item 'Leo_Scroll3'
+Leo_Scroll3: {
 	Fallen_Bishop_Card: {
 		Random: 1
 		Announce: true
@@ -8493,8 +8493,8 @@ Ms_Virgo_Scroll: {
 		Announce: true
 		Rate: 300
 	}
-//unsupported/unknown item 'Life_Ribbon_Box3'
-//	Life_Ribbon_Box3: {
+//unsupported/unknown item 'Ribbon_Of_Life_Box3'
+//	Ribbon_Of_Life_Box3: {
 //		Random: 1
 //		Rate: 800
 //	}
@@ -9571,7 +9571,7 @@ Wind_Type_Scroll: {
 //	}
 }
 */
-LUcky_Egg_C3: {
+Lucky_Egg_C3: {
 	Magic_Card_Album: {
 		Random: 1
 		Announce: true
@@ -11717,8 +11717,8 @@ Tw_Yellow_Scroll: {
 //		Random: 1
 //		Rate: 450
 //	}
-//unsupported/unknown item 'Life_Ribbon_Box3'
-//	Life_Ribbon_Box3: {
+//unsupported/unknown item 'Ribbon_Of_Life_Box3'
+//	Ribbon_Of_Life_Box3: {
 //		Random: 1
 //		Rate: 1000
 //	}
@@ -12033,8 +12033,8 @@ Tw_Yellow_Scroll: {
 		Announce: true
 		Rate: 25
 	}
-//unsupported/unknown item 'Devil_Whisper'
-//	Devil_Whisper: {
+//unsupported/unknown item 'Evil_Whisper'
+//	Evil_Whisper: {
 //		Random: 1
 //		Announce: true
 //		Rate: 40
@@ -12395,8 +12395,8 @@ Tw_Yellow_Scroll: {
 //		Announce: true
 //		Rate: 150
 //	}
-//unsupported/unknown item 'Little_Feather_Hat'
-//	Little_Feather_Hat: {
+//unsupported/unknown item 'Little_Fhat'
+//	Little_Fhat: {
 //		Random: 1
 //		Announce: true
 //		Rate: 100