end general erfc point loss experiment | 429

poco0317 · Jul 15, 2020 · 7c221af · 7c221af
1 parent ccaf31a
commit 7c221af
Show file tree

Hide file tree

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

diff --git a/src/Etterna/MinaCalc/MinaCalc.cpp b/src/Etterna/MinaCalc/MinaCalc.cpp
@@ -415,7 +415,8 @@ CalcInternal(float& gotpoints,
 			const auto pts = static_cast<float>(calc.itv_points.at(hi).at(i));
 			calc.debugValues.at(hi)[2][Pts].at(i) = pts;
 			if (x < (*v).at(i)) {
-				const auto lostpoints = hit_the_road(x, (*v).at(i));
+				const auto lostpoints =
+				  (pts - (pts * fastpow(x / (*v).at(i), powindromemordniwop)));
 				gotpoints -= lostpoints;
 				calc.debugValues.at(hi)[2][PtLoss].at(i) = abs(lostpoints);
 			}
@@ -425,7 +426,8 @@ CalcInternal(float& gotpoints,
 			if (x < (*v).at(i)) {
 				const auto pts =
 				  static_cast<float>(calc.itv_points.at(hi).at(i));
-				gotpoints -= hit_the_road(x, (*v).at(i));
+				gotpoints -=
+				  (pts - (pts * fastpow(x / (*v).at(i), powindromemordniwop)));
 			}
 		}
 	}
@@ -496,7 +498,7 @@ Calc::InitializeHands(const std::vector<NoteInfo>& NoteInfo,
 /* pbm = point buffer multiplier, or basically starting with a max points some
  * degree above the actual max points as a cheap hack to water down some of the
  * absurd scaling hs/js/cj had. Note: do not set these values below 1 */
-static const float tech_pbm = 1.025F;
+static const float tech_pbm = 1.F;
 static const float jack_pbm = 1.015F;
 static const float stream_pbm = 1.01F;
 static const float bad_newbie_skillsets_pbm = 1.05F;
@@ -557,12 +559,12 @@ Calc::Chisel(float player_skill,
 						CalcInternal(
 						  gotpoints, player_skill, ss, stamina, *this, hi);
 					}
-					/*if (ss == Skill_Technical) {
+					if (ss == Skill_Technical) {
 						gotpoints -= fastsqrt(min(
 						  max_slap_dash_jack_cap_hack_tech_hat,
-						  jackloss(player_skill * 0.6F, *this, hi, stamina) *
-							0.75F));
-					}*/
+						  jackloss(player_skill * 0.75F, *this, hi, stamina) *
+							0.85F));
+					}
 				}
 			}
 		} while (gotpoints < reqpoints);

diff --git a/src/Etterna/MinaCalc/SequencingHelpers.h b/src/Etterna/MinaCalc/SequencingHelpers.h
@@ -10,7 +10,7 @@ static const float s_init = -5.F;
 static const float ms_init = 5000.F;
 
 // global multiplier to standardize baselines
-static const float finalscaler = 3.632F * 1.025F;
+static const float finalscaler = 3.632F * 1.06F;
 
 inline auto
 column_count(const unsigned& notes) -> 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.82F, 0.925F, 0.93F, 0.8F, 0.85F
+	0.F, 0.93F, 0.885F, 0.82F, 0.925F, 0.88F, 0.8F, 0.83F
 };
 
 static const std::string calc_params_xml = "Save/calc params.xml";