Merge branch 'main' into beta

Author: fribbels

public/locales/en_US/warpCalculatorTab.yaml

@@ -33,7 +33,7 @@ SuperimpositionLevels:
   S4: S4
   S5: S5
 IncomeOptions:
-  Label: "[v{{versionNumber}} ({{phaseNumber}}/2) | {{type}}]: "
+  Label: "[v{{versionNumber}} ({{phaseNumber}}/{{totalPhases}}) | {{type}}]: "
   Type:
     0: None
     1: F2P

src/lib/tabs/tabWarp/WarpCalculatorTab.tsx

@@ -67,7 +67,7 @@ function Inputs() {
 
         form.setFieldValue("passes", specialPasses.count + Math.floor(undyingStarlight.count / 20))
         break
-      
+
       case "GachaResult":
         const gachaResult = event.data
         const pityUpdate = gachaResult.pity_5
@@ -463,21 +463,21 @@ function generateIncomeOptions() {
     selectable: false,
     children: WarpIncomeOptions
       .filter((option) => option.type === type)
-      .flatMap((option) => {
+      .flatMap((option, idx, options) => {
         const results = [{
           value: option.id,
           title: option.type == WarpIncomeType.NONE
             ? t('Type.0')
             : (
               <Flex align='center' gap={3}>
-                <IncomeOptionLabel option={option}/>
+                <IncomeOptionLabel option={option} totalPhases={Math.max(...options.filter((o) => o.version === option.version).map((o) => o.phase))}/>
                 {`+${option.passes.toLocaleString(locale)}`}
                 <img style={{ height: 18 }} src={Assets.getPass()}/>
               </Flex>
             ),
         }]
 
-        if (option.phase == 2) {
+        if (options[idx +1]?.version != option.version) {
           results.push({
             title: <></>,
             value: option.id + 'divider',
@@ -495,7 +495,7 @@ function generateIncomeOptions() {
   return options
 }
 
-function IncomeOptionLabel(props: { option: WarpIncomeDefinition }) {
+function IncomeOptionLabel(props: { option: WarpIncomeDefinition, totalPhases: number }) {
   const t = i18next.getFixedT(null, 'warpCalculatorTab', 'IncomeOptions')
   return (
     <div style={{ marginRight: 2 }}>
@@ -504,6 +504,7 @@ function IncomeOptionLabel(props: { option: WarpIncomeDefinition }) {
           {
             versionNumber: props.option.version,
             phaseNumber: props.option.phase,
+            totalPhases: props.totalPhases,
             type: t(`Type.${props.option.type}`),
           },
         )

src/lib/tabs/tabWarp/warpCalculatorController.ts

@@ -55,7 +55,17 @@ export const WarpIncomeOptions: WarpIncomeDefinition[] = [
 
   ...generateOptions('3.6', 96, 64, 119, 76, 128, 84),
   ...generateOptions('3.7', 107, 82, 130, 94, 138, 102),
-  ...generateOptions('3.8', 109, 66, 141, 78, 149, 82),
+  ...[
+    generateOption('3.8', 1, WarpIncomeType.F2P, 66),
+    generateOption('3.8', 2, WarpIncomeType.F2P, 21),
+    generateOption('3.8', 3, WarpIncomeType.F2P, 22),
+    generateOption('3.8', 1, WarpIncomeType.EXPRESS, 78),
+    generateOption('3.8', 2, WarpIncomeType.EXPRESS, 32),
+    generateOption('3.8', 3, WarpIncomeType.EXPRESS, 31),
+    generateOption('3.8', 1, WarpIncomeType.BP_EXPRESS, 82),
+    generateOption('3.8', 2, WarpIncomeType.BP_EXPRESS, 36),
+    generateOption('3.8', 3, WarpIncomeType.BP_EXPRESS, 31),
+  ],
 ]
 
 export enum WarpStrategy {

src/types/resources.d.ts

@@ -6811,7 +6811,7 @@ interface Resources {
       "S5": "S5"
     },
     "IncomeOptions": {
-      "Label": "[v{{versionNumber}} ({{phaseNumber}}/2) | {{type}}]: ",
+      "Label": "[v{{versionNumber}} ({{phaseNumber}}/{{totalPhases}}) | {{type}}]: ",
       "Type": {
         "0": "None",
         "1": "F2P",