Merge pull request #4 from S-Asakoto/apr-15-tour-event

Apr 15 tour event
S-Asakoto · Apr 15, 2024 · 292d473 · 292d473
2 parents 1a784df + 559f3f4
commit 292d473
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/js/Globals.js b/js/Globals.js
@@ -336,11 +336,11 @@ const dictionary = {
         "ko": "특수 (휘슬 ×100)"
     },
     "BONUS_500": {
-        "zh-Hant": "2024-3-31 (哨子×200)",
-        "zh-Hans": "2024-3-31 (哨子×200)",
-        "en": "2024-3-31 (Whistle x200)",
-        "ja": "2024-3-31 (ホイッスル×200)",
-        "ko": "2024-3-31 (휘슬 ×200)"
+        "zh-Hant": "2024-4-15 (哨子×125)",
+        "zh-Hans": "2024-4-15 (哨子×125)",
+        "en": "2024-4-15 (Whistle x125)",
+        "ja": "2024-4-15 (ホイッスル×125)",
+        "ko": "2024-4-15 (휘슬 ×125)"
     },
     "BONUS_EXTRA_CLIMAX": {
         "zh-Hant": "特殊 (哨子×150)",

diff --git a/js/calc.js b/js/calc.js
@@ -256,7 +256,7 @@ function calcMusic(parameters, verbose) {
             bp += [0, 3, 6, 9, 12, 15, 18, 21, 121][daysRemaining];*/
         else {
             pass += [0, 50, 100, 150, 200, 250, 300, 400, 400][daysRemaining];
-            if (daysRemaining == 8) bp += [eventType == 3 ? 50 : 0, , 100, 200][loginBonus];
+            if (daysRemaining == 8) bp += [eventType == 3 ? 50 : 0, , 100, 125][loginBonus];
         }
 
         let ptsRemaining = targetPt - nowPt;
@@ -338,7 +338,7 @@ function calcMusic(parameters, verbose) {
             pt3 = (2250 + score3 / 5000 |0) * bp2 * bonus4 * fever |0,
             ptPerBP = (pt1 * 3 + pt3) / (bp1 * 3 + bp2);
 
-        bp += [0, 3, 6, 9, 12, 15, 18, 21, loginBonus == 3 ? 221 : loginBonus ? 121 : 24][daysRemaining];
+        bp += [0, 3, 6, 9, 12, 15, 18, 21, loginBonus == 3 ? 146 : loginBonus ? 121 : 24][daysRemaining];
 
         let ptsRemaining = targetPt - nowPt;
 
@@ -410,7 +410,7 @@ function calcMusic(parameters, verbose) {
             pt3 = (2250 + score3 / 5000 |0) * bp2 * bonus4 * fever |0,
             ptPerBP = (pt1 * 3 + pt3) / (bp1 * 3 + bp2) + pt2 * 10 / usePass;
 
-        bp += [0, 3, 6, 9, 12, 15, 18, 21, loginBonus == 3 ? 221 : loginBonus ? 121 : 24][daysRemaining];
+        bp += [0, 3, 6, 9, 12, 15, 18, 21, loginBonus == 3 ? 146 : loginBonus ? 121 : 24][daysRemaining];
 
         let ptsRemaining = targetPt - nowPt;
 

diff --git a/music.html b/music.html
@@ -197,6 +197,7 @@ <h6 class="card-header" data-toggle="collapse" data-target="#use_bp_2_input">
                                     <option value="100">100</option>
                                     <option value="500">500</option>
                                     <option value="1000">1,000</option>
+                                    <option value="2000">2,000</option>
                                 </select>
                             </div>
                             <button type="button" class="btn btn-secondary confirm" data-translate="CONFIRM">確定</button>