Disable quality probability analysis for expert recipes & Adjust norm…

…al recipe condition probabilities
KonaeAkira · Dec 29, 2024 · 00c7838 · 00c7838
1 parent 76db94a
commit 00c7838
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 7 deletions.
diff --git a/game_data/build/main.rs b/game_data/build/main.rs
@@ -41,7 +41,7 @@ fn import_rlvl_records() -> Result<Vec<RecipeLevelRecord>, Box<dyn std::error::E
     );
     writeln!(writer, "[")?;
     for record in rlvl_records.iter() {
-        writeln!(writer, "RecipeLevel {{ progress_div: {}, quality_div: {}, progress_mod: {}, quality_mod: {} }},", record.progress_divider, record.quality_divider, record.progress_modifier, record.quality_modifier)?;
+        writeln!(writer, "RecipeLevel {{ progress_div: {}, quality_div: {}, progress_mod: {}, quality_mod: {}, conditions_flag: {} }},", record.progress_divider, record.quality_divider, record.progress_modifier, record.quality_modifier, record.conditions_flag)?;
     }
     writeln!(writer, "]")?;
     Ok(rlvl_records)

diff --git a/game_data/build/records.rs b/game_data/build/records.rs
@@ -151,4 +151,6 @@ pub struct RecipeLevelRecord {
     pub progress_modifier: u32,
     #[serde(rename = "QualityModifier")]
     pub quality_modifier: u32,
+    #[serde(rename = "ConditionsFlag")]
+    pub conditions_flag: u32,
 }
diff --git a/game_data/src/lib.rs b/game_data/src/lib.rs
@@ -35,6 +35,7 @@ pub struct RecipeLevel {
     pub quality_div: u16,
     pub progress_mod: u16,
     pub quality_mod: u16,
+    pub conditions_flag: u16,
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]

diff --git a/simulator/src/probabilities.rs b/simulator/src/probabilities.rs
@@ -3,9 +3,9 @@ use crate::{Action, Condition, Settings, SimulationState};
 const fn condition_probabilities(current_condition: Condition) -> &'static [(Condition, f32)] {
     match current_condition {
         Condition::Normal => &[
-            (Condition::Normal, 0.80),
-            (Condition::Good, 0.15),
-            (Condition::Excellent, 0.05),
+            (Condition::Normal, 0.86),
+            (Condition::Good, 0.12),
+            (Condition::Excellent, 0.02),
         ],
         Condition::Good => &[(Condition::Normal, 1.00)],
         Condition::Excellent => &[(Condition::Poor, 1.00)],

diff --git a/src/app.rs b/src/app.rs
@@ -391,6 +391,7 @@ impl MacroSolverApp {
             initial_quality,
             target_quality,
             &self.actions,
+            self.recipe_config.recipe.is_expert,
         ));
     }
 

diff --git a/src/widgets/analysis.rs b/src/widgets/analysis.rs
@@ -10,6 +10,7 @@ pub struct SolutionAnalysis<'a> {
     initial_quality: u16,
     target_quality: u16,
     actions: &'a [Action],
+    is_expert: bool,
 }
 
 impl<'a> SolutionAnalysis<'a> {
@@ -18,6 +19,7 @@ impl<'a> SolutionAnalysis<'a> {
         initial_quality: u16,
         target_quality: u16,
         actions: &'a [Action],
+        is_expert: bool,
     ) -> Self {
         Self {
             settings: Settings {
@@ -27,6 +29,7 @@ impl<'a> SolutionAnalysis<'a> {
             initial_quality,
             target_quality,
             actions,
+            is_expert,
         }
     }
 }
@@ -48,8 +51,10 @@ impl egui::Widget for SolutionAnalysis<'_> {
                 ui.horizontal(|ui| {
                     collapsed = util::collapse_button(ui, egui::Id::new("analysis_collapsed"));
                     ui.label(egui::RichText::new("Analysis").strong());
-                    if self.actions.is_empty() {
-                        ui.label("N/A");
+                    if self.is_expert {
+                        ui.label("N/A (Expert recipes not supported)");
+                    } else if self.actions.is_empty() {
+                        ui.label("N/A (No macro to analyze)");
                     } else {
                         ui.label(format!(
                             "{:.2}% chance to reach target Quality ({})",
@@ -58,7 +63,7 @@ impl egui::Widget for SolutionAnalysis<'_> {
                         ));
                     }
                 });
-                if collapsed {
+                if collapsed || self.is_expert {
                     return;
                 }
                 ui.separator();