Merge pull request #3279 from guilherme-gm/rebalance-bard-dancer

2-2 jobs skill rebalance - Bard/Dancer (2018 Patch/Renewal)
HerculesWS · Jun 30, 2024 · e79c535 · e79c535
2 parents 0d49cdd + 95942f0
commit e79c535
Show file tree

Hide file tree

Showing 22 changed files with 1,239 additions and 585 deletions.
diff --git a/db/constants.conf b/db/constants.conf
@@ -1271,7 +1271,7 @@ constants_db: {
 	SC_QD_SHOT_READY:                 684
 	SC_HOWLING_MINE:                  685
 	SC_BIND_TRAP:                     686
-	
+
 	// Star Emperor
 	SC_SUNSTANCE:                     687
 	SC_STARSTANCE:                    688
@@ -1307,7 +1307,7 @@ constants_db: {
 	SC_SOULDIVISION:                  716
 
 	SC_ACTIVE_MONSTER_TRANSFORM:      717
-	
+
 	SC_FIRE_EXPANSION_TEAR_GAS_SOB:   718
 
 	SC_TAROTCARD_ATK_PERC:            719
@@ -1316,7 +1316,10 @@ constants_db: {
 	SC_GOSPEL_ATK_PERC:               722
 
 	SC_NO_SWITCH_WEAPON:              723
-
+
+	SC_ENSEMBLEFATIGUE:               724
+	SC_ADAPTATION:                    725
+
 	comment__: "Emotes"
 	e_gasp:         0
 	e_what:         1
@@ -4307,6 +4310,21 @@ constants_db: {
 	SI_DEFENDER:                                  62
 	SI_AUTOSPELL:                                 65
 	SI_SPEARQUICKEN:                              68
+	SI_WHISTLE:                                   70
+	SI_ASSASSINCROSS:                             71
+	SI_POEMBRAGI:                                 72
+	SI_APPLEIDUN:                                 73
+	SI_HUMMING:                                   74
+	SI_DONTFORGETME:                              75
+	SI_FORTUNEKISS:                               76
+	SI_SERVICEFORYOU:                             77
+	SI_RICHMANKIM:                                78
+	SI_ETERNALCHAOS:                              79
+	SI_DRUMBATTLEFIELD:                           80
+	SI_RINGNIBELUNGEN:                            81
+	SI_ROKISWEIL:                                 82
+	SI_INTOABYSS:                                 83
+	SI_SIEGFRIED:                                 84
 	SI_EXPLOSIONSPIRITS:                          86
 	SI_STEELBODY:                                 87
 	SI_EXTREMITYFIST:                             88
@@ -4926,6 +4944,8 @@ constants_db: {
 	SI_USE_SKILL_SP_SPA:                         1062
 	SI_USE_SKILL_SP_SHA:                         1063
 	SI_SP_SHA:                                   1064
+	SI_ENSEMBLEFATIGUE:                          1088
+	SI_ADAPTATION:                               1089
 	SI_SOULCURSE:                                1125
 	SI_MADOGEAR:                                 1149
 }
diff --git a/db/pre-re/sc_config.conf b/db/pre-re/sc_config.conf
@@ -6450,3 +6450,29 @@ SC_NO_SWITCH_WEAPON: {
 	}
 	Icon: "SI_NOEQUIPWEAPON"
 }
+
+SC_ENSEMBLEFATIGUE: {
+	Visible: true
+	Flags: {
+		NoSave: true
+		NoDispelReset: true
+		NoBBReset: true
+		NoClearanceReset: true
+		Debuff: true
+	}
+	CalcFlags: {
+		Speed: true
+		Aspd: true
+	}
+	Icon: "SI_ENSEMBLEFATIGUE"
+}
+
+SC_ADAPTATION: {
+	Visible: true
+	Flags: {
+		Buff: true
+		NoMadoReset: true
+		NoMagicBlocked: true
+	}
+	Icon: "SI_ADAPTATION"
+}
diff --git a/db/pre-re/skill_db.conf b/db/pre-re/skill_db.conf
@@ -9150,7 +9150,7 @@ skill_db: (
 	DamageType: {
 		NoDamage: true
 	}
-	SkillData2: 5000
+	SkillData2: 5_000 // Time near start/end of performance where it is not possible to cancel (in miliseconds)
 	CoolDown: 0
 	Requirements: {
 		SPCost: 1
@@ -9651,8 +9651,8 @@ skill_db: (
 	DamageType: {
 		NoDamage: true
 	}
-	SkillData1: 60000
-	SkillData2: 20000
+	SkillData1: 60_000 // Duration of the performance (in miliseconds)
+	SkillData2: 20_000 // Duration of SC_WHISTLE when unit leaves the performance area (in miliseconds)
 	CoolDown: 0
 	Requirements: {
 		SPCost: {
@@ -9702,8 +9702,8 @@ skill_db: (
 	DamageType: {
 		NoDamage: true
 	}
-	SkillData1: 120000
-	SkillData2: 20000
+	SkillData1: 120_000 // Duration of the performance (in miliseconds)
+	SkillData2: 20_000  // Duration of SC_ASSNCROS when unit leaves the performance area (in miliseconds)
 	CoolDown: 0
 	Requirements: {
 		SPCost: {
@@ -9753,8 +9753,8 @@ skill_db: (
 	DamageType: {
 		NoDamage: true
 	}
-	SkillData1: 180000
-	SkillData2: 20000
+	SkillData1: 180_000 // Duration of the performance (in miliseconds)
+	SkillData2: 20_000  // Duration of SC_POEMBRAGI when unit leaves the performance area (in miliseconds)
 	CoolDown: 0
 	Requirements: {
 		SPCost: {
@@ -9804,8 +9804,8 @@ skill_db: (
 	DamageType: {
 		NoDamage: true
 	}
-	SkillData1: 180000
-	SkillData2: 20000
+	SkillData1: 180_000 // Duration of the performance (in miliseconds)
+	SkillData2: 20_000  // Duration of SC_APPLEIDUN when unit leaves the performance area (in miliseconds)
 	CoolDown: 0
 	Requirements: {
 		SPCost: {
@@ -9980,8 +9980,8 @@ skill_db: (
 	DamageType: {
 		NoDamage: true
 	}
-	SkillData1: 60000
-	SkillData2: 20000
+	SkillData1: 60_000 // Duration of the performance (in miliseconds)
+	SkillData2: 20_000 // Duration of SC_HUMMING when unit leaves the performance area (in miliseconds)
 	CoolDown: 0
 	Requirements: {
 		SPCost: {

diff --git a/db/re/map_zone_db.conf b/db/re/map_zone_db.conf
@@ -116,6 +116,11 @@ zones: (
 		WM_SATURDAY_NIGHT_FEVER: "PLAYER"
 		SO_ARRULLO: "PLAYER"
 		CG_HERMODE: "PLAYER"
+		BA_DISSONANCE: "PLAYER"
+		DC_UGLYDANCE: "PLAYER"
+		DC_DONTFORGETME: "PLAYER"
+		BD_ETERNALCHAOS: "PLAYER"
+		BD_ROKISWEIL: "PLAYER"
 	}
 
 	disabled_items: {
@@ -514,6 +519,11 @@ zones: (
 		SC_MANHOLE: "PLAYER"
 		WM_POEMOFNETHERWORLD: "PLAYER"
 		GN_WALLOFTHORN: "PLAYER"
+		BA_DISSONANCE: "PLAYER"
+		DC_UGLYDANCE: "PLAYER"
+		DC_DONTFORGETME: "PLAYER"
+		BD_ETERNALCHAOS: "PLAYER"
+		BD_ROKISWEIL: "PLAYER"
 	}
 
 	disabled_items: {