Update entry structure in skill DBs

2 files changed, 48 insertions, 21 deletions

diff --git a/db/pre-re/skill_db.conf b/db/pre-re/skill_db.conf
index d777bc864..446df3c86 100644
--- a/db/pre-re/skill_db.conf
+++ b/db/pre-re/skill_db.conf
@@ -43,7 +43,7 @@
 	Description: "Skill Description"            (string)  (optional but recommended)
 	Range: Skill Range                          (int) (optional, defaults to 0) (can be grouped by Levels)
 	                                            Note: Range < 5 is considered Melee range.
-	Hit: Hit Type                               (int) (optional, default "BDT_NORMAL")
+	Hit: Hit Type                               (int) (optional, default "BDT_NORMAL") (can be grouped by Levels)
 	                                            Types - "BDT_SKILL", "BDT_MULTIHIT" or "BDT_NORMAL"
 	SkillType: {                                (bool, defaults to "Passive")
 		Passive: true/false                     (boolean, defaults to false)
@@ -78,7 +78,7 @@
 		HiddenTrap: true/false                  (boolean, defaults to false)
 		IsCombo: true/false                     (boolean, defaults to false)
 	}
-	AttackType: "Attack Type"                   (string, defaults to "None")
+	AttackType: "Attack Type"                   (string, defaults to "None") (can be grouped by Levels)
 	                                            Types: "None", "Weapon", "Magic" or "Misc"
 	Element: "Element Type"                     (string) (Optional field - Default "Ele_Neutral")
 	                                            (can be grouped by Levels)
@@ -103,8 +103,8 @@
 	                                            Note: when positive, damage is increased by hits,
 	                                            negative values just show number of hits without
 	                                            increasing total damage.
-	InterruptCast: Cast Interruption            (bool, defaults to false)
-	CastDefRate: Cast Defense Reduction         (int, defaults to 0)
+	InterruptCast: Cast Interruption            (bool, defaults to false) (can be grouped by Levels)
+	CastDefRate: Cast Defense Reduction         (int, defaults to 0) (can be grouped by Levels)
 	SkillInstances: Skill instances             (int, defaults to 0) (can be grouped by Levels)
 	                                            Notes: max amount of skill instances to place on the ground when
 	                                            player_land_skill_limit/monster_land_skill_limit is enabled. For skills
@@ -140,6 +140,8 @@
 		SPRateCost: SP % Cost                   (int, defaults to 0) (can be grouped by Levels)
 		                                        Note: If positive, it is a percent of your current sp,
 		                                        otherwise it is a percent of your max sp.
+		MaxHPTrigger: Max HP % trigger          (int, defaults to 0) (can be grouped by Levels)
+		MaxSPTrigger: Max SP % trigger          (int, defaults to 0) (can be grouped by Levels)
 		ZenyCost: Zeny Cost                     (int, defaults to 0) (can be grouped by Levels)
 		WeaponTypes: {                          (bool or string, defaults to "All")
 			NoWeapon: true/false                (boolean, defaults to false)
@@ -215,7 +217,12 @@
 			ItemID or Aegis_Name : Amount       (int, defaults to 0) (can be grouped by Levels)
 			                                    Item example: "ID717" or "Blue_Gemstone".
 			                                    Notes: Items with amount 0 will not be consumed.
-			                                    Amount can also be grouped by levels.
+			Any: true/false                     (boolean, defaults to false) (can be grouped by Levels)
+		}
+		Equip: {
+			ItemID or Aegis_Name : Amount       (int, defaults to 1) (can be grouped by Levels)
+			                                    Item example: "ID1103" or "Sword__".
+			Any: true/false                     (boolean, defaults to false) (can be grouped by Levels)
 		}
 	}
 	Unit: {
@@ -223,16 +230,22 @@
 		Layout: Unit Layout                     (int, defaults to 0) (can be grouped by Levels)
 		Range: Unit Range                       (int, defaults to 0) (can be grouped by Levels)
 		Interval: Unit Interval                 (int, defaults to 0) (can be grouped by Levels)
-		Target: "Unit Target"                   (string, defaults to "None")
+		Target: "Unit Target"                   (string, defaults to "None") (can be grouped by Levels)
 		                                        Types:
 		                                        All             - affects everyone
 		                                        NotEnemy        - affects anyone who isn't an enemy
-		                                        Friend          - affects party, guildmates and neutral players
+		                                        NotParty        - affects anyone who isn't a party member
+		                                        NotGuild        - affects anyone who isn't a guild member or guild ally
+		                                        Friend          - same as NotEnemy
 		                                        Party           - affects party only
-		                                        Guild           - affects guild only
-		                                        Ally            - affects party and guildmates only
-		                                        Sameguild       - affects guild but not allies
+		                                        Guild           - affects guild members and guild allies
+		                                        Ally            - affects party members, guild members and guild allies
+		                                        Sameguild       - affects guild members but not guild allies
 		                                        Enemy           - affects enemies only
+		                                        Self            - affects only yourself
+		                                        GuildAlly       - affects guild allies but not guild members
+		                                        Neutral         - affects anyone who isn't a party member, guild member,
+		                                                          guild ally, enemy and not yourself
 		                                        None            - affects nobody
 		Flag: {
 			UF_DEFNOTENEMY: true/false          (boolean, defaults to false)
diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
index 21bb45f2d..ecca6e2e4 100644
--- a/db/re/skill_db.conf
+++ b/db/re/skill_db.conf
@@ -43,7 +43,7 @@
 	Description: "Skill Description"            (string)  (optional but recommended)
 	Range: Skill Range                          (int) (optional, defaults to 0) (can be grouped by Levels)
 	                                            Note: Range < 5 is considered Melee range.
-	Hit: Hit Type                               (int) (optional, default "BDT_NORMAL")
+	Hit: Hit Type                               (int) (optional, default "BDT_NORMAL") (can be grouped by Levels)
 	                                            Types - "BDT_SKILL", "BDT_MULTIHIT" or "BDT_NORMAL"
 	SkillType: {                                (bool, defaults to "Passive")
 		Passive: true/false                     (boolean, defaults to false)
@@ -78,7 +78,7 @@
 		HiddenTrap: true/false                  (boolean, defaults to false)
 		IsCombo: true/false                     (boolean, defaults to false)
 	}
-	AttackType: "Attack Type"                   (string, defaults to "None")
+	AttackType: "Attack Type"                   (string, defaults to "None") (can be grouped by Levels)
 	                                            Types: "None", "Weapon", "Magic" or "Misc"
 	Element: "Element Type"                     (string) (Optional field - Default "Ele_Neutral")
 	                                            (can be grouped by Levels)
@@ -103,8 +103,8 @@
 	                                            Note: when positive, damage is increased by hits,
 	                                            negative values just show number of hits without
 	                                            increasing total damage.
-	InterruptCast: Cast Interruption            (bool, defaults to false)
-	CastDefRate: Cast Defense Reduction         (int, defaults to 0)
+	InterruptCast: Cast Interruption            (bool, defaults to false) (can be grouped by Levels)
+	CastDefRate: Cast Defense Reduction         (int, defaults to 0) (can be grouped by Levels)
 	SkillInstances: Skill instances             (int, defaults to 0) (can be grouped by Levels)
 	                                            Notes: max amount of skill instances to place on the ground when
 	                                            player_land_skill_limit/monster_land_skill_limit is enabled. For skills
@@ -118,7 +118,8 @@
 	CoolDown: Skill Cooldown (in ms)            (int, defaults to 0) (can be grouped by Levels)
 	FixedCastTime: Fixed Cast Time (in ms)      (int, defaults to 0) (can be grouped by Levels)
 	                                            Note: when 0, uses 20% of cast time and less than
-	                                            0 means no fixed cast time.
+	                                            0 means no fixed cast time. Is only read if
+	                                            RENEWAL_CAST is defined.
 	CastTimeOptions: {
 		IgnoreDex: true/false                   (boolean, defaults to false)
 		IgnoreStatusEffect: true/false          (boolean, defaults to false)
@@ -142,6 +143,8 @@
 		SPRateCost: SP % Cost                   (int, defaults to 0) (can be grouped by Levels)
 		                                        Note: If positive, it is a percent of your current sp,
 		                                        otherwise it is a percent of your max sp.
+		MaxHPTrigger: Max HP % trigger          (int, defaults to 0) (can be grouped by Levels)
+		MaxSPTrigger: Max SP % trigger          (int, defaults to 0) (can be grouped by Levels)
 		ZenyCost: Zeny Cost                     (int, defaults to 0) (can be grouped by Levels)
 		WeaponTypes: {                          (bool or string, defaults to "All")
 			NoWeapon: true/false                (boolean, defaults to false)
@@ -217,7 +220,12 @@
 			ItemID or Aegis_Name : Amount       (int, defaults to 0) (can be grouped by Levels)
 			                                    Item example: "ID717" or "Blue_Gemstone".
 			                                    Notes: Items with amount 0 will not be consumed.
-			                                    Amount can also be grouped by levels.
+			Any: true/false                     (boolean, defaults to false) (can be grouped by Levels)
+		}
+		Equip: {
+			ItemID or Aegis_Name : Amount       (int, defaults to 1) (can be grouped by Levels)
+			                                    Item example: "ID1103" or "Sword__".
+			Any: true/false                     (boolean, defaults to false) (can be grouped by Levels)
 		}
 	}
 	Unit: {
@@ -225,16 +233,22 @@
 		Layout: Unit Layout                     (int, defaults to 0) (can be grouped by Levels)
 		Range: Unit Range                       (int, defaults to 0) (can be grouped by Levels)
 		Interval: Unit Interval                 (int, defaults to 0) (can be grouped by Levels)
-		Target: "Unit Target"                   (string, defaults to "None")
+		Target: "Unit Target"                   (string, defaults to "None") (can be grouped by Levels)
 		                                        Types:
 		                                        All             - affects everyone
 		                                        NotEnemy        - affects anyone who isn't an enemy
-		                                        Friend          - affects party, guildmates and neutral players
+		                                        NotParty        - affects anyone who isn't a party member
+		                                        NotGuild        - affects anyone who isn't a guild member or guild ally
+		                                        Friend          - same as NotEnemy
 		                                        Party           - affects party only
-		                                        Guild           - affects guild only
-		                                        Ally            - affects party and guildmates only
-		                                        Sameguild       - affects guild but not allies
+		                                        Guild           - affects guild members and guild allies
+		                                        Ally            - affects party members, guild members and guild allies
+		                                        Sameguild       - affects guild members but not guild allies
 		                                        Enemy           - affects enemies only
+		                                        Self            - affects only yourself
+		                                        GuildAlly       - affects guild allies but not guild members
+		                                        Neutral         - affects anyone who isn't a party member, guild member,
+		                                                          guild ally, enemy and not yourself
 		                                        None            - affects nobody
 		Flag: {
 			UF_DEFNOTENEMY: true/false          (boolean, defaults to false)