新增粉球“好兆头”支持

Tnze · Apr 14, 2024 · a2f3e91 · a2f3e91
1 parent 814f921
commit a2f3e91
Show file tree

Hide file tree

Showing 10 changed files with 93 additions and 74 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "ffxiv-best-craft",
     "private": true,
-    "version": "0.13.7",
+    "version": "0.14.0",
     "scripts": {
         "dev": "VITE_BESTCRAFT_TARGET=tauri vite",
         "build": "VITE_BESTCRAFT_TARGET=tauri vite build",

diff --git a/src-libs/src/lib.rs b/src-libs/src/lib.rs
@@ -90,17 +90,20 @@ pub fn simulate_one_step(
         });
     }
     if !matches!(action, Actions::FinalAppraisal | Actions::HeartAndSoul) {
-        status.condition = if force_success {
-            Condition::Normal
-        } else {
-            ConditionIterator::new(
-                status.recipe.conditions_flag as i32,
-                status.attributes.level as i32,
-            )
-            .collect::<Vec<_>>()
-            .choose_weighted(&mut rng, |c| c.1)
-            .unwrap()
-            .0
+        status.condition = match status.condition {
+            Condition::Good if force_success => Condition::Normal,
+            Condition::Poor if force_success => Condition::Excellent,
+            Condition::GoodOmen => Condition::Good,
+            _ => {
+                ConditionIterator::new(
+                    status.recipe.conditions_flag as i32,
+                    status.attributes.level as i32,
+                )
+                .collect::<Vec<_>>()
+                .choose_weighted(&mut rng, |c| c.1)
+                .unwrap()
+                .0
+            }
         };
     }
     Ok(SimulateOneStepResult { status, is_success })