summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAtlantisRO <atlas@atlantis-ro.net>2017-03-16 14:16:00 -0700
committerHaru <haru@dotalux.com>2017-09-17 17:48:17 +0200
commite25ce3fabf4d73f943aa62b6d5d9d778d488c260 (patch)
treed8f2da34ec41f57b8c55fd25ce52fcbba8f54dee
parent2b5309e5e393cf3f5fb7678c7e7690aec0511f21 (diff)
downloadhercules-e25ce3fabf4d73f943aa62b6d5d9d778d488c260.tar.gz
hercules-e25ce3fabf4d73f943aa62b6d5d9d778d488c260.tar.bz2
hercules-e25ce3fabf4d73f943aa62b6d5d9d778d488c260.tar.xz
hercules-e25ce3fabf4d73f943aa62b6d5d9d778d488c260.zip
Added Constant SEX_ANY (2) for Male and Female genders.
Replaced Number 1 in Gender for Constant "SEX_MALE" on item_db.conf Signed-off-by: Ragno <ragno@atlantis-ro.net>
-rw-r--r--db/constants.conf9
-rw-r--r--db/pre-re/item_db.conf74
-rw-r--r--db/re/item_db.conf94
-rw-r--r--doc/item_db.txt9
4 files changed, 96 insertions, 90 deletions
diff --git a/db/constants.conf b/db/constants.conf
index d4f6c8f0d..bc06eed72 100644
--- a/db/constants.conf
+++ b/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
diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index 8b9ad1446..d4ae22c32 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -80,7 +80,7 @@ item_db: (
}
Job: Job mask (alternate format, int, defaults to all jobs = 0xFFFFFFFF)
Upper: Upper mask (int, defaults to any = 0x3f)
- Gender: Gender (int, defaults to both = 2)
+ Gender: Gender (string, defaults to "SEX_ANY")
Loc: Equip location (int, required value for equipment)
WeaponLv: Weapon Level (int, defaults to 0)
EquipLv: Equip required level (int, defaults to 0)
@@ -18516,7 +18516,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 1
EquipLv: 2
@@ -18535,7 +18535,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 1
EquipLv: 2
@@ -18554,7 +18554,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 2
EquipLv: 14
@@ -18573,7 +18573,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 2
EquipLv: 14
@@ -18592,7 +18592,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 2
EquipLv: 14
@@ -18611,7 +18611,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 2
EquipLv: 14
@@ -18629,7 +18629,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 3
EquipLv: 27
@@ -18648,7 +18648,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 3
EquipLv: 27
@@ -18667,7 +18667,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 3
EquipLv: 27
@@ -18687,7 +18687,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 3
EquipLv: 27
@@ -18707,7 +18707,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 3
EquipLv: 27
@@ -18726,7 +18726,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 3
EquipLv: 27
@@ -18744,7 +18744,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 4
EquipLv: 70
@@ -18770,7 +18770,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 3
EquipLv: 27
@@ -18789,7 +18789,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 3
EquipLv: 27
@@ -18808,7 +18808,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 3
EquipLv: 27
@@ -18827,7 +18827,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 3
EquipLv: 27
@@ -18846,7 +18846,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 4
EquipLv: 65
@@ -18870,7 +18870,7 @@ item_db: (
Bard: true
}
Upper: 2
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 3
EquipLv: 70
@@ -18894,7 +18894,7 @@ item_db: (
Bard: true
}
Upper: 2
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 4
EquipLv: 70
@@ -18917,7 +18917,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 1
Refine: false
@@ -18946,7 +18946,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 4
EquipLv: 65
@@ -18967,7 +18967,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 3
EquipLv: 80
@@ -18998,7 +18998,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 3
EquipLv: 80
@@ -19032,7 +19032,7 @@ item_db: (
Bard: true
}
Upper: 2
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 3
EquipLv: 70
@@ -19058,7 +19058,7 @@ item_db: (
Bard: true
}
Upper: 2
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 4
EquipLv: 60
@@ -19085,7 +19085,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 4
EquipLv: 80
@@ -19121,7 +19121,7 @@ item_db: (
Bard: true
}
Upper: 2
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 4
Refine: false
@@ -19153,7 +19153,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 3
EquipLv: 1
@@ -21522,7 +21522,7 @@ item_db: (
All: true
Novice: false
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 256
EquipLv: 45
ViewSprite: 45
@@ -27167,7 +27167,7 @@ item_db: (
AegisName: "Bridegroom_Ring"
Name: "Wedding Ring"
Type: 5
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 136
Refine: false
Trade: {
@@ -39588,7 +39588,7 @@ item_db: (
All: true
Novice: false
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 769
EquipLv: 30
ViewSprite: 214
@@ -39963,7 +39963,7 @@ item_db: (
All: true
Novice: false
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 256
EquipLv: 45
ViewSprite: 45
@@ -43510,7 +43510,7 @@ item_db: (
Type: 5
Weight: 100
Def: 2
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 256
Refine: false
ViewSprite: 362
@@ -50700,7 +50700,7 @@ item_db: (
Blacksmith: true
}
Upper: 8
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 256
EquipLv: 100
ViewSprite: 626
@@ -50759,7 +50759,7 @@ item_db: (
Bard: true
}
Upper: 8
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 256
EquipLv: 100
ViewSprite: 628
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index a032489f9..a612b8679 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -80,7 +80,7 @@ item_db: (
}
Job: Job mask (alternate format, int, defaults to all jobs = 0xFFFFFFFF)
Upper: Upper mask (int, defaults to any = 0x3f)
- Gender: Gender (int, defaults to both = 2)
+ Gender: Gender (string, defaults to "SEX_ANY")
Loc: Equip location (int, required value for equipment)
WeaponLv: Weapon Level (int, defaults to 0)
EquipLv: Equip required level (int, defaults to 0)
@@ -21497,7 +21497,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 4
EquipLv: 160
@@ -21520,7 +21520,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 1
EquipLv: 2
@@ -21539,7 +21539,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 1
EquipLv: 2
@@ -21558,7 +21558,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 2
EquipLv: 14
@@ -21577,7 +21577,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 2
EquipLv: 14
@@ -21596,7 +21596,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 2
EquipLv: 14
@@ -21615,7 +21615,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 2
EquipLv: 14
@@ -21633,7 +21633,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 3
EquipLv: 27
@@ -21652,7 +21652,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 3
EquipLv: 27
@@ -21671,7 +21671,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 3
EquipLv: 27
@@ -21691,7 +21691,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 3
EquipLv: 27
@@ -21711,7 +21711,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 3
EquipLv: 27
@@ -21730,7 +21730,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 3
EquipLv: 27
@@ -21748,7 +21748,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 4
EquipLv: 70
@@ -21774,7 +21774,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 3
EquipLv: 27
@@ -21793,7 +21793,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 3
EquipLv: 27
@@ -21812,7 +21812,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 3
EquipLv: 27
@@ -21831,7 +21831,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 3
EquipLv: 27
@@ -21850,7 +21850,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 4
EquipLv: 65
@@ -21874,7 +21874,7 @@ item_db: (
Bard: true
}
Upper: 58
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 3
EquipLv: 70
@@ -21898,7 +21898,7 @@ item_db: (
Bard: true
}
Upper: 58
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 4
EquipLv: 70
@@ -21921,7 +21921,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 1
Refine: false
@@ -21950,7 +21950,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 4
EquipLv: 65
@@ -21971,7 +21971,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 3
EquipLv: 80
@@ -22003,7 +22003,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 3
EquipLv: 80
@@ -22038,7 +22038,7 @@ item_db: (
Bard: true
}
Upper: 58
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 3
EquipLv: 70
@@ -22064,7 +22064,7 @@ item_db: (
Bard: true
}
Upper: 58
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 4
EquipLv: 60
@@ -22090,7 +22090,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 4
EquipLv: 80
@@ -22126,7 +22126,7 @@ item_db: (
Bard: true
}
Upper: 58
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 4
Refine: false
@@ -22158,7 +22158,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 3
Refine: false
@@ -22195,7 +22195,7 @@ item_db: (
Bard: true
}
Upper: 56
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 3
EquipLv: 102
@@ -22219,7 +22219,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 3
EquipLv: 60
@@ -22245,7 +22245,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 3
EquipLv: 40
@@ -22280,7 +22280,7 @@ item_db: (
Bard: true
}
Upper: 56
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 4
EquipLv: 120
@@ -22310,7 +22310,7 @@ item_db: (
Bard: true
}
Upper: 56
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 3
EquipLv: 130
@@ -22333,7 +22333,7 @@ item_db: (
Bard: true
}
Upper: 56
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 4
EquipLv: 130
@@ -22356,7 +22356,7 @@ item_db: (
Bard: true
}
Upper: 56
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 3
EquipLv: 100
@@ -22380,7 +22380,7 @@ item_db: (
Bard: true
}
Upper: 56
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 3
EquipLv: 120
@@ -22404,7 +22404,7 @@ item_db: (
Bard: true
}
Upper: 56
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 4
EquipLv: 100
@@ -22431,7 +22431,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 3
EquipLv: 70
@@ -22453,7 +22453,7 @@ item_db: (
Job: {
Bard: true
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 2
WeaponLv: 4
EquipLv: 130
@@ -26798,7 +26798,7 @@ item_db: (
All: true
Novice: false
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 256
EquipLv: 45
ViewSprite: 45
@@ -41195,7 +41195,7 @@ item_db: (
Bard: true
}
Upper: 56
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 136
EquipLv: 130
Refine: false
@@ -55427,7 +55427,7 @@ item_db: (
All: true
Novice: false
}
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 256
EquipLv: 45
ViewSprite: 45
@@ -67902,7 +67902,7 @@ item_db: (
Bard: true
}
Upper: 56
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 256
EquipLv: 100
ViewSprite: 1126
@@ -132199,7 +132199,7 @@ item_db: (
Weight: 200
Def: 3
Slots: 1
- Gender: 1
+ Gender: "SEX_MALE"
Loc: 256
ViewSprite: 746
Script: <"
diff --git a/doc/item_db.txt b/doc/item_db.txt
index 04f05fb4e..8a33f9c35 100644
--- a/doc/item_db.txt
+++ b/doc/item_db.txt
@@ -59,7 +59,7 @@ item_db: (
}
Job: Job mask (alternate synxtax, int, defaults to all jobs = 0xFFFFFFFF)
Upper: Upper mask (int, defaults to any = 0x3f)
- Gender: Gender (int, defaults to both = 2)
+ Gender: Gender (string, defaults to "SEX_ANY")
Loc: Equip location (int, required value for equipment)
WeaponLv: Weapon Level (int, defaults to 0)
EquipLv: Equip required level (int, defaults to 0)
@@ -200,7 +200,12 @@ Upper: Equippable upper-types. Uses the following bitmasks:
mode. When no value is specified, all classes (mask 0x3f) are able to
equip the item.
-Gender: Gender restriction. 0 is female, 1 is male, 2 for both (default value).
+Gender: Gender restriction.
+ Available genders:
+ SEX_FEMALE: 0
+ SEX_MALE: 1
+ SEX_ANY: 2
+ When not specified, becomes "SEX_ANY".
Loc: Equipment's placement. A value needs to be specified if the item is an
equipment piece. Values are: