balance tech, added back minijack, balance, chaos | 505

jameskr97 · Nov 4, 2022 · 735668b · 735668b
1 parent 6f51da8
commit 735668b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/Chaos.h b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/Chaos.h
@@ -11,9 +11,9 @@ struct ChaosMod
 
 #pragma region params
 
-	float min_mod = 0.95F;
-	float max_mod = 1.045F;
-	float base = -0.075F;
+	float min_mod = 0.88F;
+	float max_mod = 1.07F;
+	float base = -0.088F;
 
 	const std::vector<std::pair<std::string, float*>> _params{
 		{ "min_mod", &min_mod },

diff --git a/src/Etterna/MinaCalc/Dependent/HD_Sequencers/RMSequencing.h b/src/Etterna/MinaCalc/Dependent/HD_Sequencers/RMSequencing.h
@@ -2,7 +2,7 @@
 #include "../HD_MetaSequencing.h"
 #include "../../UlbuAcolytes.h"
 
-static const float rma_diff_scaler = 1.07F * basescalers[Skill_Technical];
+static const float rma_diff_scaler = 1.06F * basescalers[Skill_Technical];
 
 enum rm_behavior
 {

diff --git a/src/Etterna/MinaCalc/MinaCalc.cpp b/src/Etterna/MinaCalc/MinaCalc.cpp
@@ -804,17 +804,17 @@ Calc::InitAdjDiff(Calc& calc, const int& hand)
 	  {
 		OHTrill,
 		VOHTrill,
-		// Balance,
+		Balance,
 		Roll,
 		// OHJumpMod,
-		// Chaos,
+		Chaos,
 		WideRangeJumptrill,
 		WideRangeJJ,
 		WideRangeBalance,
 		WideRangeRoll,
 		FlamJam,
 		// RanMan,
-		// Minijack,
+		Minijack,
 		// WideRangeAnchor,
 		TheThing,
 		TheThing2,
@@ -908,7 +908,7 @@ Calc::InitAdjDiff(Calc& calc, const int& hand)
 					  calc.init_base_diff_vals.at(hand).at(TechBase).at(i) *
 					  pmod_product_cur_interval.at(ss) * basescalers.at(ss) /
 					  max<float>(
-						fastpow(calc.pmod_vals.at(hand).at(CJ).at(i), 2.F),
+						fastpow(calc.pmod_vals.at(hand).at(CJ).at(i)+0.05F, 2.F),
 						1.F);
 					*adj_diff *=
 					  fastsqrt(calc.pmod_vals.at(hand).at(OHJumpMod).at(i));
@@ -1016,7 +1016,7 @@ MinaSDCalcDebug(
 	}
 }
 
-int mina_calc_version = 504;
+int mina_calc_version = 505;
 auto
 GetCalcVersion() -> int
 {