inventory simulation for reach checks

Author: SiriusAshling

wotw_seedgen/src/common_item.rs

@@ -60,16 +60,21 @@ impl CommonItem {
                     operator: ArithmeticOperator::Add,
                     right: CommandInteger::Constant { value: amount },
                 } if fetch_identifier == uber_identifier && *amount >= 0 => {
+                    let amount = *amount as usize;
                     match *uber_identifier {
                         uber_identifier::SPIRIT_LIGHT => {
-                            vec![CommonItem::SpiritLight(*amount as usize)]
+                            vec![CommonItem::SpiritLight(amount)]
                         }
-                        uber_identifier::MAX_HEALTH if *amount == 5 => {
-                            vec![CommonItem::HealthFragment]
+                        uber_identifier::MAX_HEALTH => {
+                            vec![CommonItem::HealthFragment; amount / 5]
+                        }
+                        uber_identifier::GORLEK_ORE => {
+                            vec![CommonItem::GorlekOre; amount]
+                        }
+                        uber_identifier::KEYSTONES => vec![CommonItem::Keystone; amount],
+                        uber_identifier::SHARD_SLOTS => {
+                            vec![CommonItem::ShardSlot; amount]
                         }
-                        uber_identifier::GORLEK_ORE if *amount == 1 => vec![CommonItem::GorlekOre],
-                        uber_identifier::KEYSTONES if *amount == 1 => vec![CommonItem::Keystone],
-                        uber_identifier::SHARD_SLOTS if *amount == 1 => vec![CommonItem::ShardSlot],
 
                         _ => vec![],
                     }
@@ -88,7 +93,7 @@ impl CommonItem {
                         },
                     operator: ArithmeticOperator::Add,
                     right: CommandFloat::Constant { value },
-                } if *value == 0.5 => vec![CommonItem::EnergyFragment],
+                } => vec![CommonItem::EnergyFragment; (**value * 2.) as usize],
                 _ => vec![],
             },
             _ => vec![],

wotw_seedgen_cli/src/daemon/reach_check.rs

@@ -166,10 +166,11 @@ pub fn reach_check(
             .ok_or_else(|| format!("Unknown UberIdentifier {uber_identifier}"))?;
         match &data.default_value {
             UberStateValue::Boolean(_) => world.set_boolean(uber_identifier, *value > 0.5, &output),
+            // unlike set, modify is recognized as a common item and updates the player inventory
             UberStateValue::Integer(_) => {
-                world.set_integer(uber_identifier, (*value) as i32, &output)
+                world.modify_integer(uber_identifier, (*value) as i32, &output)
             }
-            UberStateValue::Float(_) => world.set_float(uber_identifier, value, &output),
+            UberStateValue::Float(_) => world.modify_float(uber_identifier, value, &output),
         }
     }