Updated Documentation

4 files changed, 175 insertions, 42 deletions

diff --git a/db/item_db2.conf b/db/item_db2.conf
index e1fafa9fd..ec38f5f90 100644
--- a/db/item_db2.conf
+++ b/db/item_db2.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2015  Hercules Dev Team
+//= Copyright (C) 2014-2016  Hercules Dev Team
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
@@ -46,7 +46,39 @@ item_db: (
 	Def: Defense                  (int, defaults to 0)
 	Range: Attack Range           (int, defaults to 0)
 	Slots: Slots                  (int, defaults to 0)
-	Job: Job mask                 (int, defaults to all jobs = 0xFFFFFFFF)
+	Job: {                        (defaults to all job)
+		All: true/false               (boolean, defaults to false)
+		Novice: true/false            (boolean, defaults to false)
+		Swordsman: true/false         (boolean, defaults to false)
+		Magician: true/false          (boolean, defaults to false)
+		Archer: true/false            (boolean, defaults to false)
+		Acolyte: true/false           (boolean, defaults to false)
+		Merchant: true/false          (boolean, defaults to false)
+		Thief: true/false             (boolean, defaults to false)
+		Knight: true/false            (boolean, defaults to false)
+		Priest: true/false            (boolean, defaults to false)
+		Wizard: true/false            (boolean, defaults to false)
+		Blacksmith: true/false        (boolean, defaults to false)
+		Hunter: true/false            (boolean, defaults to false)
+		Assassin: true/false          (boolean, defaults to false)
+		Crusader: true/false          (boolean, defaults to false)
+		Monk: true/false              (boolean, defaults to false)
+		Sage: true/false              (boolean, defaults to false)
+		Rogue: true/false             (boolean, defaults to false)
+		Alchemist: true/false         (boolean, defaults to false)
+		Bard: true/false              (boolean, defaults to false)
+		Taekwon: true/false           (boolean, defaults to false)
+		Star_Gladiator: true/false    (boolean, defaults to false)
+		Soul_Linker: true/false       (boolean, defaults to false)
+		Gungslinger: true/false       (boolean, defaults to false)
+		Ninja: true/false             (boolean, defaults to false)
+		Gangsi: true/false            (boolean, defaults to false)
+		Death_Knight: true/false      (boolean, defaults to false)
+		Dark_Collector: true/false    (boolean, defaults to false)
+		Kagerou: true/false           (boolean, defaults to false)
+		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)
 	Gender: Gender                (int, defaults to both = 2)
 	Loc: Equip location           (int, required value for equipment)
diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index e2f82d34a..0956c5800 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -46,7 +46,39 @@ item_db: (
 	Def: Defense                  (int, defaults to 0)
 	Range: Attack Range           (int, defaults to 0)
 	Slots: Slots                  (int, defaults to 0)
-	Job: Job mask                 (int, defaults to all jobs = 0xFFFFFFFF)
+	Job: {                        (defaults to all job)
+		All: true/false               (boolean, defaults to false)
+		Novice: true/false            (boolean, defaults to false)
+		Swordsman: true/false         (boolean, defaults to false)
+		Magician: true/false          (boolean, defaults to false)
+		Archer: true/false            (boolean, defaults to false)
+		Acolyte: true/false           (boolean, defaults to false)
+		Merchant: true/false          (boolean, defaults to false)
+		Thief: true/false             (boolean, defaults to false)
+		Knight: true/false            (boolean, defaults to false)
+		Priest: true/false            (boolean, defaults to false)
+		Wizard: true/false            (boolean, defaults to false)
+		Blacksmith: true/false        (boolean, defaults to false)
+		Hunter: true/false            (boolean, defaults to false)
+		Assassin: true/false          (boolean, defaults to false)
+		Crusader: true/false          (boolean, defaults to false)
+		Monk: true/false              (boolean, defaults to false)
+		Sage: true/false              (boolean, defaults to false)
+		Rogue: true/false             (boolean, defaults to false)
+		Alchemist: true/false         (boolean, defaults to false)
+		Bard: true/false              (boolean, defaults to false)
+		Taekwon: true/false           (boolean, defaults to false)
+		Star_Gladiator: true/false    (boolean, defaults to false)
+		Soul_Linker: true/false       (boolean, defaults to false)
+		Gungslinger: true/false       (boolean, defaults to false)
+		Ninja: true/false             (boolean, defaults to false)
+		Gangsi: true/false            (boolean, defaults to false)
+		Death_Knight: true/false      (boolean, defaults to false)
+		Dark_Collector: true/false    (boolean, defaults to false)
+		Kagerou: true/false           (boolean, defaults to false)
+		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)
 	Gender: Gender                (int, defaults to both = 2)
 	Loc: Equip location           (int, required value for equipment)
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 793d7e316..064be5e07 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2015  Hercules Dev Team
+//= Copyright (C) 2014-2016  Hercules Dev Team
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
@@ -46,7 +46,39 @@ item_db: (
 	Def: Defense                  (int, defaults to 0)
 	Range: Attack Range           (int, defaults to 0)
 	Slots: Slots                  (int, defaults to 0)
-	Job: Job mask                 (int, defaults to all jobs = 0xFFFFFFFF)
+	Job: {                        (defaults to all job)
+		All: true/false               (boolean, defaults to false)
+		Novice: true/false            (boolean, defaults to false)
+		Swordsman: true/false         (boolean, defaults to false)
+		Magician: true/false          (boolean, defaults to false)
+		Archer: true/false            (boolean, defaults to false)
+		Acolyte: true/false           (boolean, defaults to false)
+		Merchant: true/false          (boolean, defaults to false)
+		Thief: true/false             (boolean, defaults to false)
+		Knight: true/false            (boolean, defaults to false)
+		Priest: true/false            (boolean, defaults to false)
+		Wizard: true/false            (boolean, defaults to false)
+		Blacksmith: true/false        (boolean, defaults to false)
+		Hunter: true/false            (boolean, defaults to false)
+		Assassin: true/false          (boolean, defaults to false)
+		Crusader: true/false          (boolean, defaults to false)
+		Monk: true/false              (boolean, defaults to false)
+		Sage: true/false              (boolean, defaults to false)
+		Rogue: true/false             (boolean, defaults to false)
+		Alchemist: true/false         (boolean, defaults to false)
+		Bard: true/false              (boolean, defaults to false)
+		Taekwon: true/false           (boolean, defaults to false)
+		Star_Gladiator: true/false    (boolean, defaults to false)
+		Soul_Linker: true/false       (boolean, defaults to false)
+		Gungslinger: true/false       (boolean, defaults to false)
+		Ninja: true/false             (boolean, defaults to false)
+		Gangsi: true/false            (boolean, defaults to false)
+		Death_Knight: true/false      (boolean, defaults to false)
+		Dark_Collector: true/false    (boolean, defaults to false)
+		Kagerou: true/false           (boolean, defaults to false)
+		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)
 	Gender: Gender                (int, defaults to both = 2)
 	Loc: Equip location           (int, required value for equipment)
diff --git a/doc/item_db.txt b/doc/item_db.txt
index 087725025..3a31bb77c 100644
--- a/doc/item_db.txt
+++ b/doc/item_db.txt
@@ -24,7 +24,39 @@ item_db: (
 	Def: Defense                  (int, defaults to 0)
 	Range: Attack Range           (int, defaults to 0)
 	Slots: Slots                  (int, defaults to 0)
-	Job: Job mask                 (int, defaults to all jobs = 0xFFFFFFFF)
+	Job: {                        (defaults to all job)
+		All: true/false               (boolean, defaults to false)
+		Novice: true/false            (boolean, defaults to false)
+		Swordsman: true/false         (boolean, defaults to false)
+		Magician: true/false          (boolean, defaults to false)
+		Archer: true/false            (boolean, defaults to false)
+		Acolyte: true/false           (boolean, defaults to false)
+		Merchant: true/false          (boolean, defaults to false)
+		Thief: true/false             (boolean, defaults to false)
+		Knight: true/false            (boolean, defaults to false)
+		Priest: true/false            (boolean, defaults to false)
+		Wizard: true/false            (boolean, defaults to false)
+		Blacksmith: true/false        (boolean, defaults to false)
+		Hunter: true/false            (boolean, defaults to false)
+		Assassin: true/false          (boolean, defaults to false)
+		Crusader: true/false          (boolean, defaults to false)
+		Monk: true/false              (boolean, defaults to false)
+		Sage: true/false              (boolean, defaults to false)
+		Rogue: true/false             (boolean, defaults to false)
+		Alchemist: true/false         (boolean, defaults to false)
+		Bard: true/false              (boolean, defaults to false)
+		Gungslinger: true/false       (boolean, defaults to false)
+		Ninja: true/false             (boolean, defaults to false)
+		Taekwon: true/false           (boolean, defaults to false)
+		Star_Gladiator: true/false    (boolean, defaults to false)
+		Soul_Linker: true/false       (boolean, defaults to false)
+		Gangsi: true/false            (boolean, defaults to false)
+		Death_Knight: true/false      (boolean, defaults to false)
+		Dark_Collector: true/false    (boolean, defaults to false)
+		Kagerou: true/false           (boolean, defaults to false)
+		Rebellion: true/false         (boolean, defaults to false)
+	}
+	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)
 	Loc: Equip location           (int, required value for equipment)
@@ -109,42 +141,47 @@ Range: Weapon's attack range. When not specified, becomes 0.
 
 Slots: Amount of slots the item possesses. When not specified, becomes 0.
 
-Job: Equippable jobs. Uses the following bitmask table:
-
-	(S.) Novice    (2^00): 0x00000001
-	Swordman       (2^01): 0x00000002
-	Magician       (2^02): 0x00000004
-	Archer         (2^03): 0x00000008
-	Acolyte        (2^04): 0x00000010
-	Merchant       (2^05): 0x00000020
-	Thief          (2^06): 0x00000040
-	Knight         (2^07): 0x00000080
-	Priest         (2^08): 0x00000100
-	Wizard         (2^09): 0x00000200
-	Blacksmith     (2^10): 0x00000400
-	Hunter         (2^11): 0x00000800
-	Assassin       (2^12): 0x00001000
-	Unused         (2^13): 0x00002000
-	Crusader       (2^14): 0x00004000
-	Monk           (2^15): 0x00008000
-	Sage           (2^16): 0x00010000
-	Rogue          (2^17): 0x00020000
-	Alchemist      (2^18): 0x00040000
-	Bard/Dancer    (2^19): 0x00080000
-	Unused         (2^20): 0x00100000
-	Taekwon        (2^21): 0x00200000
-	Star Gladiator (2^22): 0x00400000
-	Soul Linker    (2^23): 0x00800000
-	Gunslinger     (2^24): 0x01000000
-	Ninja          (2^25): 0x02000000
-	Gangsi         (2^26): 0x04000000
-	Death Knight   (2^27): 0x08000000
-	Dark Collector (2^28): 0x10000000
-	Kagerou/Oboro  (2^29): 0x20000000
-	Rebellion      (2^30): 0x40000000
-	Some other commonly used values:
-	All except novice:     0xFFFFFFFE
-	All (default value):   0xFFFFFFFF
+Job:  Job restrictions. If this block is omitted, item can be equipped by all class
+		All the settings in this group are boolean values,
+		Default value is false (restriction not set) for any missing setting.
+
+	Alternate Format:
+		Equippable jobs. Uses the following bitmask table:
+
+		(S.) Novice    (2^00): 0x00000001
+		Swordman       (2^01): 0x00000002
+		Magician       (2^02): 0x00000004
+		Archer         (2^03): 0x00000008
+		Acolyte        (2^04): 0x00000010
+		Merchant       (2^05): 0x00000020
+		Thief          (2^06): 0x00000040
+		Knight         (2^07): 0x00000080
+		Priest         (2^08): 0x00000100
+		Wizard         (2^09): 0x00000200
+		Blacksmith     (2^10): 0x00000400
+		Hunter         (2^11): 0x00000800
+		Assassin       (2^12): 0x00001000
+		Unused         (2^13): 0x00002000
+		Crusader       (2^14): 0x00004000
+		Monk           (2^15): 0x00008000
+		Sage           (2^16): 0x00010000
+		Rogue          (2^17): 0x00020000
+		Alchemist      (2^18): 0x00040000
+		Bard/Dancer    (2^19): 0x00080000
+		Unused         (2^20): 0x00100000
+		Taekwon        (2^21): 0x00200000
+		Star Gladiator (2^22): 0x00400000
+		Soul Linker    (2^23): 0x00800000
+		Gunslinger     (2^24): 0x01000000
+		Ninja          (2^25): 0x02000000
+		Gangsi         (2^26): 0x04000000
+		Death Knight   (2^27): 0x08000000
+		Dark Collector (2^28): 0x10000000
+		Kagerou/Oboro  (2^29): 0x20000000
+		Rebellion      (2^30): 0x40000000
+		Some other commonly used values:
+		All except novice:     0xFFFFFFFE
+		All (default value):   0xFFFFFFFF
 
 Upper: Equippable upper-types. Uses the following bitmasks:
 	Normal jobs:      0x01 (1)