dampen wrr for js | 422

etternagame · Jul 12, 2020 · 74eed96 · 74eed96
1 parent aac8702
commit 74eed96
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/Etterna/Globals/MinaCalc.cpp b/src/Etterna/Globals/MinaCalc.cpp
@@ -607,7 +607,7 @@ Calc::InitAdjDiff(Calc& calc, const int& hi)
 		TheThing2,
 		WideRangeBalance,
 		WideRangeJumptrill,
-		WideRangeRoll,
+		// WideRangeRoll,
 		OHTrill,
 		VOHTrill,
 		RanMan,
@@ -717,6 +717,11 @@ Calc::InitAdjDiff(Calc& calc, const int& hi)
 					*adj_diff /=
 					  fastsqrt(calc.doot.at(hi).at(OHJumpMod).at(i) * 0.95F);
 
+					*adj_diff *=
+					  min(1.F,
+						  fastsqrt(calc.doot.at(hi).at(WideRangeRoll).at(i) +
+								   0.1F));
+
 					auto a = *adj_diff;
 					auto b = calc.soap.at(hi).at(NPSBase).at(i) *
 							 tp_mods[Skill_Handstream];
@@ -837,7 +842,7 @@ MinaSDCalcDebug(const vector<NoteInfo>& NoteInfo,
 	}
 }
 
-int mina_calc_version = 421;
+int mina_calc_version = 422;
 auto
 GetCalcVersion() -> int
 {

diff --git a/src/Etterna/Globals/MinaCalc/UlbuAcolytes.h b/src/Etterna/Globals/MinaCalc/UlbuAcolytes.h
@@ -12,7 +12,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.89F, 0.82F, 0.925F, 0.98F, 0.8F, 0.84F
+	0.F, 0.93F, 0.885F, 0.82F, 0.925F, 0.98F, 0.8F, 0.84F
 };
 
 static const std::string calc_params_xml = "Save/calc params.xml";