continued jack tuning | 470

this looks so bad and so good its great
etternagame · Oct 26, 2021 · eafd0b5 · eafd0b5
1 parent 7923109
commit eafd0b5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/Etterna/MinaCalc/Dependent/HD_Sequencers/GenericSequencing.h b/src/Etterna/MinaCalc/Dependent/HD_Sequencers/GenericSequencing.h
@@ -172,9 +172,9 @@ struct Jack_Sequencing : public Finger_Sequencing
 			return _len_cap_ms;
 		}
 
-		static const auto avg_ms_mult = 0.F; // was 1.075F;
-		static const auto anchor_time_buffer_ms = 80.F;
-		static const auto min_ms = 85.F;
+		static const auto avg_ms_mult = 1.5F;
+		static const auto anchor_time_buffer_ms = 30.F;
+		static const auto min_ms = 95.F;
 
 		// get total ms
 		const auto total_ms = ms_from(_last, _start);
@@ -196,7 +196,7 @@ struct Jack_Sequencing : public Finger_Sequencing
 		// BAD TEMP HACK LUL
 		if (_len == 2) {
 			ms *= 1.1F;
-			ms = ms < 155.F ? 155.F : ms;
+			ms = ms < 180.F ? 180.F : ms;
 		}
 
 		ms = ms < min_ms ? min_ms : ms;

diff --git a/src/Etterna/MinaCalc/MinaCalc.cpp b/src/Etterna/MinaCalc/MinaCalc.cpp
@@ -989,7 +989,7 @@ MinaSDCalcDebug(
 	}
 }
 
-int mina_calc_version = 469;
+int mina_calc_version = 470;
 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, 0.89F, 0.8F, 0.83F
+	0.F, 0.93F, 0.885F, 0.84F, 0.93F, 1.F, 0.8F, 0.83F
 };
 
 static const std::string calc_params_xml = "Save/calc params.xml";
-Original file line number
+Diff line change
@@ Expand Up / @@ -989,7 +989,7 @@ MinaSDCalcDebug( @@
     	}
     }
-    int mina_calc_version = 469;
+    int mina_calc_version = 470;
     auto
     GetCalcVersion() -> int
     {
@@ Expand Down @@