Synchronized the AegisNames to the in-source ITEMID_ constants

Some missing items were copied to the pre-renewal database. In general,
when an item ID is hardcoded in source, it's preferable that the item
exists in both databases.

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

3 files changed, 34 insertions, 34 deletions

diff --git a/src/map/itemdb.h b/src/map/itemdb.h
index 16dca9e58..77e702638 100644
--- a/src/map/itemdb.h
+++ b/src/map/itemdb.h
@@ -65,7 +65,7 @@ enum item_itemid {
 	ITEMID_BRANCH_OF_DEAD_TREE   = 604,
 	ITEMID_ANODYNE               = 605,
 	ITEMID_ALOEBERA              = 606,
-	ITEMID_MAGNIFIER             = 611,
+	ITEMID_SPECTACLES            = 611,
 	ITEMID_POISON_BOTTLE         = 678,
 	ITEMID_EMPTY_BOTTLE          = 713,
 	ITEMID_EMPERIUM              = 714,
@@ -93,15 +93,15 @@ enum item_itemid {
 	ITEMID_IRON_ORE              = 1002,
 	ITEMID_PHRACON               = 1010,
 	ITEMID_EMVERETARCON          = 1011,
-	ITEMID_TRAP                  = 1065,
+	ITEMID_BOOBY_TRAP            = 1065,
 	ITEMID_PILEBUNCKER           = 1549,
 	ITEMID_ANGRA_MANYU           = 1599,
 	ITEMID_STRANGE_EMBRYO        = 6415,
 	ITEMID_FACE_PAINT            = 6120,
-	ITEMID_SCARLET_POINT         = 6360,
-	ITEMID_INDIGO_POINT          = 6361,
-	ITEMID_YELLOW_WISH_POINT     = 6362,
-	ITEMID_LIME_GREEN_POINT      = 6363,
+	ITEMID_SCARLET_PTS           = 6360,
+	ITEMID_INDIGO_PTS            = 6361,
+	ITEMID_YELLOW_WISH_PTS       = 6362,
+	ITEMID_LIME_GREEN_PTS        = 6363,
 	ITEMID_STONE                 = 7049,
 	ITEMID_FIRE_BOTTLE           = 7135,
 	ITEMID_ACID_BOTTLE           = 7136,
@@ -113,7 +113,7 @@ enum item_itemid {
 	ITEMID_TOKEN_OF_SIEGFRIED    = 7621,
 	ITEMID_GOLD_KEY77            = 7782,
 	ITEMID_SILVER_KEY77          = 7783,
-	ITEMID_TRAP_ALLOY            = 7940,
+	ITEMID_SPECIAL_ALLOY_TRAP    = 7940,
 	ITEMID_CATNIP_FRUIT          = 11602,
 	ITEMID_RED_POUCH_OF_SURPRISE = 12024,
 	ITEMID_BLOODY_DEAD_BRANCH    = 12103,
@@ -139,13 +139,13 @@ enum item_itemid {
 	ITEMID_MAGIC_CASTLE          = 12308,
 	ITEMID_BULGING_HEAD          = 12309,
 	ITEMID_THICK_MANUAL50        = 12312,
-	ITEMID_NOVICE_MAGNIFIER      = 12325,
-	ITEMID_ANCILLA               = 12333,
-	ITEMID_REPAIR_A              = 12392,
-	ITEMID_REPAIR_B              = 12393,
-	ITEMID_REPAIR_C              = 12394,
+	ITEMID_N_MAGNIFIER           = 12325,
+	ITEMID_ANSILA                = 12333,
+	ITEMID_REPAIRA               = 12392,
+	ITEMID_REPAIRB               = 12393,
+	ITEMID_REPAIRC               = 12394,
 	ITEMID_BLACK_THING           = 12435,
-	ITEMID_REINS_OF_MOUNT        = 12622,
+	ITEMID_BOARDING_HALTER       = 12622,
 	ITEMID_NOBLE_NAMEPLATE       = 12705,
 	ITEMID_DUN_TELE_SCROLL1      = 14527,
 	ITEMID_BATTLE_MANUAL25       = 14532,
@@ -550,7 +550,7 @@ struct item_data {
 #define itemdb_canrefine(n)   (!itemdb->search(n)->flag.no_refine)
 
 #define itemdb_is_rune(n)        (((n) >= ITEMID_NAUTHIZ && (n) <= ITEMID_HAGALAZ) || (n) == ITEMID_LUX_ANIMA)
-#define itemdb_is_element(n)     ((n) >= ITEMID_SCARLET_POINT && (n) <= ITEMID_LIME_GREEN_POINT)
+#define itemdb_is_element(n)     ((n) >= ITEMID_SCARLET_PTS && (n) <= ITEMID_LIME_GREEN_PTS)
 #define itemdb_is_spellbook(n)   ((n) >= ITEMID_MAGIC_BOOK_FB && (n) <= ITEMID_MAGIC_BOOK_DL)
 #define itemdb_is_poison(n)      ((n) >= ITEMID_POISON_PARALYSIS && (n) <= ITEMID_POISON_FATIGUE)
 #define itemid_isgemstone(n)     ((n) >= ITEMID_YELLOW_GEMSTONE && (n) <= ITEMID_BLUE_GEMSTONE)
diff --git a/src/map/pc.c b/src/map/pc.c
index bfd6c0ea5..674eeb90f 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -490,7 +490,7 @@ void pc_rental_expire(struct map_session_data *sd, int i) {
 
 	/* Soon to be dropped, we got plans to integrate it with item db */
 	switch( nameid ) {
-		case ITEMID_REINS_OF_MOUNT:
+		case ITEMID_BOARDING_HALTER:
 			status_change_end(&sd->bl,SC_ALL_RIDING,INVALID_TIMER);
 			break;
 		case ITEMID_LOVE_ANGEL:
@@ -4977,7 +4977,7 @@ int pc_useitem(struct map_session_data *sd,int n) {
 		return 0;
 
 	/* Items with delayed consume are not meant to work while in mounts except reins of mount(12622) */
-	if( sd->inventory_data[n]->flag.delay_consume && nameid != ITEMID_REINS_OF_MOUNT ) {
+	if (sd->inventory_data[n]->flag.delay_consume && nameid != ITEMID_BOARDING_HALTER) {
 		if( sd->sc.data[SC_ALL_RIDING] )
 			return 0;
 		else if( pc_issit(sd) )
@@ -5004,7 +5004,7 @@ int pc_useitem(struct map_session_data *sd,int n) {
 			} else {// not yet used item (all slots are initially empty)
 				sd->item_delay[i].nameid = nameid;
 			}
-			if (!(nameid == ITEMID_REINS_OF_MOUNT && pc_hasmount(sd)))
+			if (!(nameid == ITEMID_BOARDING_HALTER && pc_hasmount(sd)))
 				sd->item_delay[i].tick = tick + sd->inventory_data[n]->delay;
 		} else {// should not happen
 			ShowError("pc_useitem: Exceeded item delay array capacity! (nameid=%d, char_id=%d)\n", nameid, sd->status.char_id);
@@ -11674,9 +11674,9 @@ bool pc_db_checkid(unsigned int class_)
 int pc_have_magnifier(struct map_session_data *sd)
 {
 	int n;
-	n = pc->search_inventory(sd, ITEMID_MAGNIFIER);
+	n = pc->search_inventory(sd, ITEMID_SPECTACLES);
 	if (n == INDEX_NOT_FOUND)
-		n = pc->search_inventory(sd, ITEMID_NOVICE_MAGNIFIER);
+		n = pc->search_inventory(sd, ITEMID_N_MAGNIFIER);
 	return n;
 }
 
diff --git a/src/map/skill.c b/src/map/skill.c
index f824c55a7..b2d788b57 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -4699,7 +4699,7 @@ int skill_castend_damage_id(struct block_list* src, struct block_list *bl, uint1
 					if( !(sg->unit_id == UNT_USED_TRAPS || (sg->unit_id == UNT_ANKLESNARE && sg->val2 != 0 )) ) {
 						struct item item_tmp;
 						memset(&item_tmp,0,sizeof(item_tmp));
-						item_tmp.nameid = sg->item_id?sg->item_id:ITEMID_TRAP;
+						item_tmp.nameid = sg->item_id ? sg->item_id : ITEMID_BOOBY_TRAP;
 						item_tmp.identify = 1;
 						if( item_tmp.nameid )
 							map->addflooritem(bl, &item_tmp, 1, bl->m, bl->x, bl->y, 0, 0, 0, 0);
@@ -7677,7 +7677,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
 							// get back 1 trap
 							struct item item_tmp;
 							memset(&item_tmp,0,sizeof(item_tmp));
-							item_tmp.nameid = su->group->item_id?su->group->item_id:ITEMID_TRAP;
+							item_tmp.nameid = su->group->item_id ? su->group->item_id : ITEMID_BOOBY_TRAP;
 							item_tmp.identify = 1;
 							if (item_tmp.nameid && (flag=pc->additem(sd,&item_tmp,1,LOG_TYPE_SKILL)) != 0) {
 								clif->additem(sd,0,0,flag);
@@ -8554,7 +8554,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
 		case AB_ANCILLA:
 			if( sd ) {
 				clif->skill_nodamage(src,bl,skill_id,skill_lv,1);
-				skill->produce_mix(sd, skill_id, ITEMID_ANCILLA, 0, 0, 0, 1);
+				skill->produce_mix(sd, skill_id, ITEMID_ANSILA, 0, 0, 0, 1);
 			}
 			break;
 
@@ -11477,7 +11477,7 @@ struct skill_unit_group* skill_unitsetting(struct block_list *src, uint16 skill_
 		case RA_ICEBOUNDTRAP:
 			{
 				struct skill_condition req = skill->get_requirement(sd,skill_id,skill_lv);
-				ARR_FIND(0, MAX_SKILL_ITEM_REQUIRE, i, req.itemid[i] && (req.itemid[i] == ITEMID_TRAP || req.itemid[i] == ITEMID_TRAP_ALLOY));
+				ARR_FIND(0, MAX_SKILL_ITEM_REQUIRE, i, req.itemid[i] && (req.itemid[i] == ITEMID_BOOBY_TRAP || req.itemid[i] == ITEMID_SPECIAL_ALLOY_TRAP));
 				if( i != MAX_SKILL_ITEM_REQUIRE && req.itemid[i] )
 					req_item = req.itemid[i];
 				if( map_flag_gvg2(src->m) || map->list[src->m].flag.battleground )
@@ -13943,7 +13943,7 @@ int skill_check_condition_castbegin(struct map_session_data* sd, uint16 skill_id
 			{
 				int count = 0, i;
 				for( i = 0; i < MAX_INVENTORY; i ++ )
-					if( sd->status.inventory[i].nameid == ITEMID_ANCILLA )
+					if (sd->status.inventory[i].nameid == ITEMID_ANSILA)
 						count += sd->status.inventory[i].amount;
 				if( count >= 3 ) {
 					clif->skill_fail(sd, skill_id, USESKILL_FAIL_ANCILLA_NUMOVER, 0);
@@ -14576,7 +14576,7 @@ int skill_check_condition_castend(struct map_session_data* sd, uint16 skill_id,
 							cause = USESKILL_FAIL_BLUEJAMSTONE; break;
 						case ITEMID_HOLY_WATER:
 							cause = USESKILL_FAIL_HOLYWATER; break;
-						case ITEMID_ANCILLA:
+						case ITEMID_ANSILA:
 							cause = USESKILL_FAIL_ANCILLA; break;
 						case ITEMID_ACCELERATOR:
 						case ITEMID_HOVERING_BOOSTER:
@@ -14891,7 +14891,7 @@ struct skill_condition skill_get_requirement(struct map_session_data* sd, uint16
 			if ((item_index = pc->search_inventory(sd, req.itemid[i])) == INDEX_NOT_FOUND
 			  || sd->status.inventory[item_index].amount < req.amount[i]
 			) {
-				req.itemid[i] = ITEMID_TRAP_ALLOY;
+				req.itemid[i] = ITEMID_SPECIAL_ALLOY_TRAP;
 				req.amount[i] = 1;
 			}
 			break;
@@ -14918,14 +14918,14 @@ struct skill_condition skill_get_requirement(struct map_session_data* sd, uint16
 		switch(skill_lv) {
 			case 1:
 			case 2:
-				req.itemid[1] = ITEMID_REPAIR_A;
+				req.itemid[1] = ITEMID_REPAIRA;
 				break;
 			case 3:
 			case 4:
-				req.itemid[1] = ITEMID_REPAIR_B;
+				req.itemid[1] = ITEMID_REPAIRB;
 				break;
 			case 5:
-				req.itemid[1] = ITEMID_REPAIR_C;
+				req.itemid[1] = ITEMID_REPAIRC;
 				break;
 		}
 		req.amount[1] = 1;
@@ -16983,7 +16983,7 @@ int skill_unit_timer_sub(union DBKey key, struct DBData *data, va_list ap)
 					// revert unit back into a trap
 					struct item item_tmp;
 					memset(&item_tmp,0,sizeof(item_tmp));
-					item_tmp.nameid = group->item_id?group->item_id:ITEMID_TRAP;
+					item_tmp.nameid = group->item_id ? group->item_id : ITEMID_BOOBY_TRAP;
 					item_tmp.identify = 1;
 					map->addflooritem(bl, &item_tmp, 1, bl->m, bl->x, bl->y, 0, 0, 0, 0);
 				}
@@ -18157,16 +18157,16 @@ int skill_magicdecoy(struct map_session_data *sd, int nameid)
 	sd->menuskill_val = 0;
 
 	switch (nameid) {
-	case ITEMID_SCARLET_POINT:
+	case ITEMID_SCARLET_PTS:
 		class_ = MOBID_MAGICDECOY_FIRE;
 		break;
-	case ITEMID_INDIGO_POINT:
+	case ITEMID_INDIGO_PTS:
 		class_ = MOBID_MAGICDECOY_WATER;
 		break;
-	case ITEMID_LIME_GREEN_POINT:
+	case ITEMID_LIME_GREEN_PTS:
 		class_ = MOBID_MAGICDECOY_WIND;
 		break;
-	case ITEMID_YELLOW_WISH_POINT:
+	case ITEMID_YELLOW_WISH_PTS:
 		class_ = MOBID_MAGICDECOY_EARTH;
 		break;
 	}