chordjack retuning and unsmoothening | 471

tiny global jack buff undense chordjacks suck and dense chordjacks suck less
etternagame · Oct 27, 2021 · 765bdcc · 765bdcc
1 parent 181796e
commit 765bdcc
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/CJDensity.h b/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/CJDensity.h
@@ -16,10 +16,10 @@ struct CJDensityMod
 	float max_mod = 1.15F;
 	float base = 0.F;
 
-	float single_scaler = 2.F;
-	float jump_scaler = 1.2F;
-	float hand_scaler = 0.95F;
-	float quad_scaler = 0.9F;
+	float single_scaler = 1.F;
+	float jump_scaler = 1.6F;
+	float hand_scaler = 0.9F;
+	float quad_scaler = 0.7F;
 
 	const std::vector<std::pair<std::string, float*>> _params{
 		{ "min_mod", &min_mod },

diff --git a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/CJOHAnchor.h b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/CJOHAnchor.h
@@ -13,15 +13,15 @@ struct CJOHAnchorMod
 
 #pragma region params
 
-	float min_mod = 1.F;
+	float min_mod = .9F;
 	float max_mod = 1.1F;
 
-	float anchor_len_weight = .5F;
-	float len_scaler = 0.1F;
+	float anchor_len_weight = 1.F;
+	float len_scaler = 0.175F;
 	float swap_scaler = 0.10775F;
 	float not_swap_scaler = 0.019F;
 
-	float base = .75F;
+	float base = .57F;
 
 	const std::vector<std::pair<std::string, float*>> _params{
 		{ "min_mod", &min_mod },

diff --git a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/CJOHJ.h b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/CJOHJ.h
@@ -13,7 +13,7 @@ struct CJOHJumpMod
 
 #pragma region params
 
-	float min_mod = 0.5F;
+	float min_mod = 0.75F;
 	float max_mod = 1.F;
 
 	float max_seq_weight = 0.65F;

diff --git a/src/Etterna/MinaCalc/MinaCalc.cpp b/src/Etterna/MinaCalc/MinaCalc.cpp
@@ -488,7 +488,8 @@ Calc::InitializeHands(const std::vector<NoteInfo>& NoteInfo,
 		InitAdjDiff(*this, hand);
 
 		// post pattern mod smoothing for cj
-		Smooth(base_adj_diff.at(hand).at(Skill_Chordjack), 1.F, numitv);
+		// (Chordjack related tuning done: this is disabled for now)
+		// Smooth(base_adj_diff.at(hand).at(Skill_Chordjack), 1.F, numitv);
 	}
 
 	// debug info loop
@@ -989,7 +990,7 @@ MinaSDCalcDebug(
 	}
 }
 
-int mina_calc_version = 470;
+int mina_calc_version = 471;
 auto
 GetCalcVersion() -> int
 {

diff --git a/src/Etterna/MinaCalc/UlbuAcolytes.h b/src/Etterna/MinaCalc/UlbuAcolytes.h
@@ -10,7 +10,7 @@
  * patterns have lower enps than streams, streams default to 1 and chordstreams
  * start lower, stam is a special case and may use normalizers again */
 static const std::array<float, NUM_Skillset> basescalers = {
-	0.F, 0.93F, 0.885F, 0.84F, 0.93F, 1.F, 0.8F, 0.83F
+	0.F, 0.93F, 0.885F, 0.84F, 0.93F, 1.02F, 0.75F, 0.83F
 };
 
 static const std::string calc_params_xml = "Save/calc params.xml";