js readjustment | 501

slight change to chordjack, hs, stamina
jameskr97 · Nov 1, 2022 · 884b50b · 884b50b
1 parent 330d279
commit 884b50b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/src/Etterna/MinaCalc/MinaCalc.cpp b/src/Etterna/MinaCalc/MinaCalc.cpp
@@ -539,7 +539,7 @@ Calc::InitializeHands(const std::vector<NoteInfo>& NoteInfo,
 constexpr float tech_pbm = 1.F;
 constexpr float jack_pbm = 1.0175F;
 constexpr float stream_pbm = 1.01F;
-constexpr float bad_newbie_skillsets_pbm = 1.05F;
+constexpr float bad_newbie_skillsets_pbm = 1.F;
 
 // each skillset should just be a separate calc function [todo]
 auto
@@ -746,11 +746,11 @@ Calc::InitAdjDiff(Calc& calc, const int& hand)
 	  // js
 	  {
 		JS,
-		OHJumpMod,
-		Chaos,
-		Balance,
-		TheThing,
-		TheThing2,
+		// OHJumpMod,
+		// Chaos,
+		// Balance,
+		// TheThing,
+		// TheThing2,
 		WideRangeBalance,
 		WideRangeJumptrill,
 		WideRangeJJ,
@@ -759,7 +759,7 @@ Calc::InitAdjDiff(Calc& calc, const int& hand)
 		VOHTrill,
 		// Roll,
 		RollJS,
-		RanMan,
+		// RanMan,
 		FlamJam,
 		// WideRangeAnchor,
 	  },
@@ -878,11 +878,6 @@ Calc::InitAdjDiff(Calc& calc, const int& hand)
 					*adj_diff /=
 					  fastsqrt(calc.pmod_vals.at(hand).at(OHJumpMod).at(i) * 0.95F);
 
-					*adj_diff *=
-					  min(1.F,
-						  fastsqrt(calc.pmod_vals.at(hand).at(WideRangeRoll).at(i) +
-								   0.1F));
-
 					auto a = *adj_diff;
 					auto b = calc.init_base_diff_vals.at(hand).at(NPSBase).at(i) *
 							 pmod_product_cur_interval[Skill_Handstream];
@@ -1020,7 +1015,7 @@ MinaSDCalcDebug(
 	}
 }
 
-int mina_calc_version = 500;
+int mina_calc_version = 501;
 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.92F, 0.895F, 0.84F, 0.93F, 1.02F, 1.08F, 0.9F
+	0.F, 0.92F, 0.76F, 0.79F, 0.93F, 1.02F, 1.02F, 0.9F
 };
 
 static const std::string calc_params_xml = "Save/calc params.xml";