Show average turns with decimal places, fix Vietnamese bronze apple t…

…ranslation, upgrade Gradle to 8.2.0
Fate-Grand-Automata · Dec 27, 2023 · 593420a · 593420a
1 parent 73afabd
commit 593420a
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 13 deletions.
diff --git a/app/src/main/java/io/github/fate_grand_automata/ui/exit/BattleExit.kt b/app/src/main/java/io/github/fate_grand_automata/ui/exit/BattleExit.kt
@@ -393,7 +393,7 @@ fun PreviewBattleExitContent() {
                     averageTimePerRun = 75.seconds,
                     minTurnsPerRun = 3,
                     maxTurnsPerRun = 4,
-                    averageTurnsPerRun = 6
+                    averageTurnsPerRun = 3.45678
                 ),
                 refillEnabled = true
             )

diff --git a/app/src/main/res/values-b+zh+CN/localized.xml b/app/src/main/res/values-b+zh+CN/localized.xml
@@ -256,7 +256,7 @@ Order Change"</string>
     <string name="times_withdrew">"已撤退 %d 次"</string>
     <string name="avg_time_per_run">"平均一场时间：%s"</string>
     <string name="turns_count">"回合 %d"</string>
-    <string name="turns_stats">"回合: %1$d（最少）, %2$d（平均）, %3$d（最多）"</string>
+    <string name="turns_stats">"回合: %1$d（最少）, %2$.02f（平均）, %3$d（最多）"</string>
     <string name="picked_exp_stacks">"已挑选 %d 堆种火，共挑选 %d 枚种火"</string>
     <string name="no_embers_found">"无法在屏幕上找到种火，请确保经验卡的筛选已打开"</string>
     <string name="root_failed">"Root权限获取失败"</string>

diff --git a/app/src/main/res/values-b+zh+TW/localized.xml b/app/src/main/res/values-b+zh+TW/localized.xml
@@ -244,7 +244,7 @@
     <string name="times_withdrew">已撤退 %d 次</string>
     <string name="avg_time_per_run">平均一場時間：%s</string>
     <string name="turns_count">回合 %d</string>
-    <string name="turns_stats">回合：%1$d（最少）, %2$d（平均）, %3$d（最多）</string>
+    <string name="turns_stats">回合：%1$d（最少）, %2$.02f（平均）, %3$d（最多）</string>
     <string name="picked_exp_stacks">已挑選 %d 堆種火，總共挑選 %d 枚金種火</string>
 
     <string name="p_mats">追縱掉落素材</string>

diff --git a/app/src/main/res/values-ja/localized.xml b/app/src/main/res/values-ja/localized.xml
@@ -261,7 +261,7 @@
     <string name="times_withdrew">"%d 回撤退しました"</string>
     <string name="avg_time_per_run">"1回あたりの平均時間: %s"</string>
     <string name="turns_count">"ターン数: %d"</string>
-    <string name="turns_stats">"ターン数: %1$d (最小), %2$d (平均), %3$d (最大)"</string>
+    <string name="turns_stats">"ターン数: %1$d (最小), %2$.02f (平均), %3$d (最大)"</string>
     <string name="picked_exp_stacks">"%d 個の種火を選び受け取りました。"</string>
     <string name="no_embers_found">"画面上に「種火」が見つかりません。サーヴァント(経験値)のフィルタリングを確認してください。"</string>
     <string name="root_failed">"ルート権限の取得に失敗"</string>

diff --git a/app/src/main/res/values-ko/localized.xml b/app/src/main/res/values-ko/localized.xml
@@ -253,7 +253,7 @@
     <string name="times_withdrew">"%d번 철수함"</string>
     <string name="avg_time_per_run">"반복 평균 시간: %s"</string>
     <string name="turns_count">"턴: %d"</string>
-    <string name="turns_stats">"턴: %1$d (최단), %2$d (평균), %3$d (최장)"</string>
+    <string name="turns_stats">"턴: %1$d (최단), %2$.02f (평균), %3$d (최장)"</string>
     <string name="picked_exp_stacks">"%d개의 종화 묶음 획득"</string>
     <string name="no_embers_found">"화면에서 종화를 찾을 수 없습니다. 종화를 필터하지 않았는지 확인바랍니다."</string>
     <string name="root_failed">"루트 권한을 얻는데 실패했습니다."</string>

diff --git a/app/src/main/res/values-vi/localized.xml b/app/src/main/res/values-vi/localized.xml
@@ -173,7 +173,7 @@ Sao chép hoặc đổi tên nó nếu bạn muốn giữ nó."</string>
     <string name="card_priority">"Ưu tiên thẻ"</string>
     <string name="p_refill_type_gold">"Vàng"</string>
     <string name="p_refill_type_silver">"Bạc"</string>
-    <string name="p_refill_type_bronze">"Đồng"</string>
+    <string name="p_refill_type_bronze">"Xanh"</string>
     <string name="p_refill_type_copper">"Đồng"</string>
     <string name="p_refill_type_sq">"SQ"</string>
     <string name="p_brave_chains_don_t_care">"không quan tâm"</string>
@@ -254,7 +254,7 @@ Vui lòng bật khả năng truy cập cho ứng dụng này từ cài đặt H
     <string name="times_withdrew">"Đã đầu hàng %d lần"</string>
     <string name="avg_time_per_run">"Thời gian trung bình mỗi lần chạy: %s"</string>
     <string name="turns_count">"Lượt: %d"</string>
-    <string name="turns_stats">"Lượt: %1$d (phút), %2$d (trung bình), %3$d (tối đa)"</string>
+    <string name="turns_stats">"Lượt: %1$d (phút), %2$.02f (trung bình), %3$d (tối đa)"</string>
     <string name="picked_exp_stacks">"Đã chọn %d EXP, tạo ra tổng số %d Embers vàng"</string>
     <string name="no_embers_found">"Không thể tìm thấy Embers trên màn hình. Đảm bảo rằng bạn đã lọc thẻ EXP."</string>
     <string name="root_failed">"Không thể truy cập quyền root"</string>

diff --git a/app/src/main/res/values/localized.xml b/app/src/main/res/values/localized.xml
@@ -255,7 +255,7 @@ Please turn on accessibility for this app from System settings. If it is already
     <string name="times_withdrew">"Withdrew %d times"</string>
     <string name="avg_time_per_run">"Average time per run: %s"</string>
     <string name="turns_count">"Turns: %d"</string>
-    <string name="turns_stats">"Turns: %1$d (min), %2$d (avg), %3$d (max)"</string>
+    <string name="turns_stats">"Turns: %1$d (min), %2$.02f (avg), %3$d (max)"</string>
     <string name="picked_exp_stacks">"Picked %d EXP stacks, resulting in a total amount of %d Gold embers"</string>
     <string name="no_embers_found">"Couldn't find Embers on screen. Make sure that you've filtered for EXP cards."</string>
     <string name="root_failed">"Failed to get root access"</string>

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -12,7 +12,7 @@ kotlin_verion = "1.9.10"
 hilt_version = "2.48.1"
 gson_version = "2.10.1"
 
-gradle_version = "8.1.2"
+gradle_version = "8.2.0"
 
 ben-manes_versions = "0.47.0"
 accompanist_version = "0.32.0"

diff --git a/scripts/src/main/java/io/github/fate_grand_automata/scripts/entrypoints/AutoBattle.kt b/scripts/src/main/java/io/github/fate_grand_automata/scripts/entrypoints/AutoBattle.kt
@@ -148,7 +148,7 @@ class AutoBattle @Inject constructor(
         val averageTimePerRun: Duration,
         val minTurnsPerRun: Int,
         val maxTurnsPerRun: Int,
-        val averageTurnsPerRun: Int
+        val averageTurnsPerRun: Double
     )
 
     private fun makeExitState(): ExitState {

diff --git a/scripts/src/main/java/io/github/fate_grand_automata/scripts/models/battle/BattleState.kt b/scripts/src/main/java/io/github/fate_grand_automata/scripts/models/battle/BattleState.kt
@@ -2,7 +2,6 @@ package io.github.fate_grand_automata.scripts.models.battle
 
 import io.github.lib_automata.dagger.ScriptScope
 import javax.inject.Inject
-import kotlin.math.roundToInt
 import kotlin.time.Duration
 import kotlin.time.TimeSource
 
@@ -27,7 +26,7 @@ class BattleState @Inject constructor() {
         private set
     var minTurnsPerRun = Int.MAX_VALUE
         private set
-    var averageTurnsPerRun = 0
+    var averageTurnsPerRun: Double = 0.0
         private set
 
     var runs = 0
@@ -43,7 +42,7 @@ class BattleState @Inject constructor() {
             totalTurns += runState.totalTurns
             maxTurnsPerRun = maxOf(maxTurnsPerRun, runState.totalTurns)
             minTurnsPerRun = minOf(minTurnsPerRun, runState.totalTurns)
-            averageTurnsPerRun = (totalTurns / runs.toDouble()).roundToInt()
+            averageTurnsPerRun = totalTurns / runs.toDouble()
 
             runState = RunState()
         }