Merge pull request #3290 from skyleo/atk-def-percent

Implement m(atk) / m(def) percent system
HerculesWS · Apr 30, 2024 · df806b3 · df806b3
2 parents bd0ae8d + 25e2d3c
commit df806b3
Show file tree

Hide file tree

Showing 13 changed files with 633 additions and 225 deletions.
diff --git a/db/constants.conf b/db/constants.conf
@@ -1307,6 +1307,10 @@ constants_db: {
 	SC_SOULDIVISION:                  716
 
 	SC_ACTIVE_MONSTER_TRANSFORM:      717
+	SC_TAROTCARD_ATK_PERC:            719
+	SC_TAROTCARD_MATK_PERC:           720
+	SC_TAROTCARD_DEF_PERC:            721
+	SC_GOSPEL_ATK_PERC:               722
 
 	comment__: "Emotes"
 	e_gasp:         0

diff --git a/db/pre-re/sc_config.conf b/db/pre-re/sc_config.conf
@@ -80,6 +80,10 @@ SC_TYPE: {
 		Range:             (bool, defaults to false)
 		Regen:             (bool, defaults to false)
 		Dye:               (bool, defaults to false)
+		AtkPerc:           (bool, defaults to false)
+		DefPerc:           (bool, defaults to false)
+		MatkPerc:          (bool, defaults to false)
+		MdefPerc:          (bool, defaults to false)
 		All:               (bool, defaults to false)
 	}
 	Icon:              (string, defaults to SI_BLANK) The status icon attached to the SC
@@ -92,10 +96,8 @@ SC_PROVOKE: {
 		NoBoss: true
 	}
 	CalcFlags: {
-		Batk: true
-		Watk: true
-		Def: true
-		Def2: true
+		AtkPerc: true
+		DefPerc: true
 	}
 	Icon: "SI_PROVOKE"
 	Skill: "SM_PROVOKE"
@@ -198,7 +200,7 @@ SC_ANGELUS: {
 		Buff: true
 	}
 	CalcFlags: {
-		Def2: true
+		DefPerc: true
 	}
 	Icon: "SI_ANGELUS"
 	Skill: "AL_ANGELUS"
@@ -459,7 +461,7 @@ SC_NOEQUIPWEAPON: {
 		Buff: true
 	}
 	CalcFlags: {
-		Watk: true
+		AtkPerc: true
 	}
 	Icon: "SI_NOEQUIPWEAPON"
 	Skill: "RG_STRIPWEAPON"
@@ -473,7 +475,7 @@ SC_NOEQUIPSHIELD: {
 		Buff: true
 	}
 	CalcFlags: {
-		Def: true
+		DefPerc: true
 	}
 	Icon: "SI_NOEQUIPSHIELD"
 	Skill: "RG_STRIPSHIELD"
@@ -756,11 +758,9 @@ SC_LKCONCENTRATION: {
 		Buff: true
 	}
 	CalcFlags: {
-		Batk: true
-		Watk: true
 		Hit: true
-		Def: true
-		Def2: true
+		AtkPerc: true
+		DefPerc: true
 	}
 	Icon: "SI_LKCONCENTRATION"
 	Skill: "LK_CONCENTRATION"
@@ -980,8 +980,8 @@ SC_JOINTBEAT: {
 		Debuff: true
 	}
 	CalcFlags: {
-		Batk: true
-		Def2: true
+		AtkPerc: true
+		DefPerc: true
 		Speed: true
 		Aspd: true
 	}
@@ -994,8 +994,8 @@ SC_MINDBREAKER: {
 		Buff: true
 	}
 	CalcFlags: {
-		Matk: true
-		Mdef2: true
+		MatkPerc: true
+		MdefPerc: true
 	}
 	Skill: "PF_MINDBREAKER"
 }
@@ -5389,7 +5389,7 @@ SC_MIRACLE: {
 }
 SC_POISON: {
 	CalcFlags: {
-		Def2: true
+		DefPerc: true
 		Regen: true
 	}
 	Icon: "SI_CLOUDKILL"
@@ -5532,10 +5532,8 @@ SC_ALMIGHTY: {
 }
 SC_SKE: {
 	CalcFlags: {
-		Batk: true
-		Watk: true
-		Def: true
-		Def2: true
+		AtkPerc: true
+		DefPerc: true
 	}
 	Icon: "SI_SKE"
 	Skill: "SL_SKE"
@@ -5568,8 +5566,7 @@ SC_SLEEP: {
 SC_CURSE: {
 	CalcFlags: {
 		Luk: true
-		Batk: true
-		Watk: true
+		AtkPerc: true
 		Speed: true
 	}
 	Skill: "NPC_CURSEATTACK"
@@ -5586,7 +5583,7 @@ SC_BLIND: {
 }
 SC_DPOISON: {
 	CalcFlags: {
-		Def2: true
+		DefPerc: true
 		Regen: true
 	}
 	Skill: "NPC_POISON"
@@ -5723,8 +5720,7 @@ SC_KNOWLEDGE: {
 }
 SC_FLING: {
 	CalcFlags: {
-		Def: true
-		Def2: true
+		DefPerc: true
 	}
 	Skill: "GS_FLING"
 }
@@ -5743,15 +5739,13 @@ SC_HLIF_CHANGE: {
 }
 SC_HAMI_BLOODLUST: {
 	CalcFlags: {
-		Batk: true
-		Watk: true
+		AtkPerc: true
 	}
 	Skill: "HAMI_BLOODLUST"
 }
 SC_HLIF_FLEET: {
 	CalcFlags: {
-		Batk: true
-		Watk: true
+		AtkPerc: true
 		Aspd: true
 	}
 	Skill: "HFLI_FLEET"
@@ -5902,8 +5896,7 @@ SC_INCMSPRATE: {
 }
 SC_INCATKRATE: {
 	CalcFlags: {
-		Batk: true
-		Watk: true
+		AtkPerc: true
 	}
 }
 SC_INCMATKRATE: {
@@ -6408,3 +6401,42 @@ SC_ACTIVE_MONSTER_TRANSFORM: {
 SC__FEINTBOMB_MASTER: {
 	Skill: "SC_FEINTBOMB"
 }
+SC_TAROTCARD_ATK_PERC: {
+	Flags: {
+		NoSave: true
+		NoClearanceReset: true
+		Debuff: true
+	}
+	CalcFlags: {
+		AtkPerc: true
+	}
+}
+SC_TAROTCARD_MATK_PERC: {
+	Flags: {
+		NoSave: true
+		NoClearanceReset: true
+		Debuff: true
+	}
+	CalcFlags: {
+		MatkPerc: true
+	}
+}
+SC_TAROTCARD_DEF_PERC: {
+	Flags: {
+		NoSave: true
+		NoClearanceReset: true
+		Debuff: true
+	}
+	CalcFlags: {
+		DefPerc: true
+	}
+}
+SC_GOSPEL_ATK_PERC: {
+	Flags: {
+		NoSave: true
+		Debuff: true
+	}
+	CalcFlags: {
+		AtkPerc: true
+	}
+}