Item DB: replace numbers with constants and split View into Subtype and ViewSprite

db/constants.conf

@@ -3772,14 +3772,14 @@ constants_db: {
 	UNITTYPE_HOM:  4
 	UNITTYPE_MER:  5
 	UNITTYPE_ELEM: 6
-	
+
 	comment__: "Unit AI Types"
 	AI_NONE:   0     //0: Normal mob.
 	AI_ATTACK: 1     //1: Standard summon, attacks mobs.
 	AI_SPHERE: 2     //2: Alchemist Marine Sphere
 	AI_FLORA:  3     //3: Alchemist Summon Flora
 	AI_ZANZOU: 4     //4: Summon Zanzou
-	
+
 	comment__: "Colors"
 	C_AQUA:        0x00FFFF
 	C_BLACK:       0x000000
@@ -3804,8 +3804,9 @@ constants_db: {
 	C_VIOLET:      0xEE82EE
 
 	comment__: "Genders"
-	SEX_FEMALE:	0
-	SEX_MALE:	1
+	SEX_FEMALE: 0
+	SEX_MALE:   1
+	SEX_ANY:    2
 
 	comment__: "Script Unit Data Types"
 	UDT_TYPE:             0

db/item_db2.conf

@@ -79,14 +79,15 @@ item_db: (
 		Rebellion: true/false         (boolean, defaults to false)
 	}
 	Job: Job mask                 (alternate format, int, defaults to all jobs = 0xFFFFFFFF)
-	Upper: Upper mask             (int, defaults to any = 0x3f)
+	Upper: Upper mask             (bitmask array, string or int, defaults to "ITEMUPPER_ALL")
 	Gender: Gender                (int, defaults to both = 2)
-	Loc: Equip location           (int, required value for equipment)
+	Loc: Equip location           (bitmask array, string or int, required value for equipment)
 	WeaponLv: Weapon Level        (int, defaults to 0)
 	EquipLv: Equip required level (int, defaults to 0)
 	EquipLv: [min, max]           (alternative syntax with min / max level)
 	Refine: Refineable            (boolean, defaults to true)
-	View: View ID                 (int, defaults to 0)
+	Subtype: Item Subtype         (int, defaults to 0)
+	ViewSprite: Sprite view ID    (int, defaults to 0)
 	BindOnEquip: true/false       (boolean, defaults to false)
 	ForceSerial: true/false       (boolean, defaults to false)
 	BuyingStore: true/false       (boolean, defaults to false)
@@ -199,7 +200,7 @@ item_db: (
 	Type: 5
 	Buy: 20
 	Weight: 100
-	Loc: 136
+	Loc: "EQP_ACC"
 	Refine: false
 	Script: <" bonus bAllStats,3; ">
 },
@@ -213,8 +214,8 @@ item_db: (
 	Buy: 20
 	Weight: 200
 	Def: 2
-	Loc: 256
-	View: 206
+	Loc: "EQP_HEAD_TOP"
+	ViewSprite: 206
 	Script: <" bonus2 bSubRace,RC_Demon,5; ">
 },
 */
@@ -227,8 +228,8 @@ item_db: (
 	Buy: 20
 	Weight: 100
 	Def: 3
-	Loc: 256
-	View: 20
+	Loc: "EQP_HEAD_TOP"
+	ViewSprite: 20
 	Script: <"
 		bonus bMdef,1;
 		bonus bLuk,1;
@@ -245,8 +246,8 @@ item_db: (
 	Type: 5
 	Buy: 10
 	Weight: 100
-	Loc: 256
-	View: 89
+	Loc: "EQP_HEAD_TOP"
+	ViewSprite: 89
 	Script: <" bonus bAllStats,3; ">
 },
 */
@@ -259,8 +260,8 @@ item_db: (
 	Buy: 0
 	Weight: 200
 	Def: 3
-	Loc: 256
-	View: 216
+	Loc: "EQP_HEAD_TOP"
+	ViewSprite: 216
 	Script: <" bonus2 bExpAddRace, RC_All, 50; ">
 },
 */
@@ -273,8 +274,8 @@ item_db: (
 	Buy: 20
 	Weight: 300
 	Def: 3
-	Loc: 256
-	View: 144
+	Loc: "EQP_HEAD_TOP"
+	ViewSprite: 144
 	Script: <" bonus bAllStats,3; ">
 },
 */
@@ -287,8 +288,8 @@ item_db: (
 	Buy: 20
 	Weight: 200
 	Def: 2
-	Loc: 256
-	View: 206
+	Loc: "EQP_HEAD_TOP"
+	ViewSprite: 206
 	Script: <"
 		bonus bAllStats,2;
 		bonus2 bSubRace,RC_Demon,5;
@@ -304,9 +305,9 @@ item_db: (
 	Type: 5
 	Buy: 20
 	Weight: 100
-	Loc: 1
+	Loc: "EQP_HEAD_LOW"
 	Refine: false
-	View: 49
+	ViewSprite: 49
 	Script: <"
 		bonus2 bResEff,Eff_Blind,3000;
 		bonus2 bAddMonsterDropItem,12130,30;
@@ -322,8 +323,8 @@ item_db: (
 	Buy: 20
 	Weight: 500
 	Def: 4
-	Loc: 256
-	View: 304
+	Loc: "EQP_HEAD_TOP"
+	ViewSprite: 304
 	Script: <" bonus bAllStats,2; ">
 },
 */
@@ -336,8 +337,8 @@ item_db: (
 	Buy: 20
 	Weight: 200
 	Def: 2
-	Loc: 256
-	View: 206
+	Loc: "EQP_HEAD_TOP"
+	ViewSprite: 206
 	Script: <"
 		bonus bAllStats,2;
 		bonus2 bSubRace,RC_Demon,5;
@@ -354,9 +355,9 @@ item_db: (
 	Buy: 20
 	Weight: 100
 	Def: 5
-	Loc: 1
+	Loc: "EQP_HEAD_LOW"
 	Refine: false
-	View: 25
+	ViewSprite: 25
 	Script: <" bonus2 bSubRace,RC_Brute,5; ">
 },
 */
@@ -547,7 +548,7 @@ item_db: (
 	Type: 5
 	Buy: 10
 	Def: 3
-	Loc: 136
+	Loc: "EQP_ACC"
 	Refine: false
 	Script: <"
 		bonus bAtkRate,3;
@@ -573,8 +574,8 @@ item_db: (
 	Type: 5
 	Buy: 20
 	Def: 5
-	Loc: 256
-	View: 206
+	Loc: "EQP_HEAD_TOP"
+	ViewSprite: 206
 	Script: <"
 		bonus bMdef,5;
 		bonus2 bAddMonsterDropItem,12192,2500;
@@ -613,7 +614,7 @@ item_db: (
 		All: true
 		Novice: false
 	}
-	Loc: 16
+	Loc: "EQP_ARMOR"
 	OnEquipScript: <" sc_start SC_WEDDING,-1,0; ">
 	OnUnequipScript: <" sc_end SC_WEDDING; ">
 },
@@ -631,7 +632,7 @@ item_db: (
 		Novice: false
 	}
 	Gender: 1
-	Loc: 16
+	Loc: "EQP_ARMOR"
 	OnEquipScript: <" sc_start SC_WEDDING,-1,0; ">
 	OnUnequipScript: <" sc_end SC_WEDDING; ">
 },