Update resource needs when popping requests

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "aise"
-version = "2.21.2"
+version = "2.21.3"
 authors = ["Markus Heikkinen <ittevien@gmail.com>"]
 
 [lib]

src/ai.rs

@@ -164,6 +164,21 @@ impl PlayerAi {
         }
     }
 
+    /// spent_money is true when the ai actually built something, false on failures
+    pub fn remove_resource_need(&self, cost: &Cost, spent_money: bool) {
+        unsafe {
+            (*self.0).mineral_need = (*self.0).mineral_need.saturating_sub(cost.minerals);
+            (*self.0).gas_need = (*self.0).gas_need.saturating_sub(cost.supply);
+            (*self.0).supply_need = (*self.0).supply_need.saturating_sub(cost.supply);
+            if spent_money {
+                (*self.0).minerals_available =
+                    (*self.0).minerals_available.saturating_sub(cost.minerals);
+                (*self.0).gas_available = (*self.0).gas_available.saturating_sub(cost.gas);
+                (*self.0).supply_available = (*self.0).supply_available.saturating_sub(cost.supply);
+            }
+        }
+    }
+
     pub fn pop_request(&self) {
         let requests;
         let new_count;
@@ -264,6 +279,14 @@ pub struct Cost {
     pub races: RaceFlags,
 }
 
+pub fn request_cost(request: &bw::AiSpendingRequest) -> Cost {
+    match request.ty {
+        5 => upgrade_cost(UpgradeId(request.id)),
+        6 => tech_cost(TechId(request.id)),
+        _ => unit_cost(UnitId(request.id)),
+    }
+}
+
 pub fn unit_cost(unit: UnitId) -> Cost {
     let dual_birth = unit.flags() & 0x400 != 0;
     Cost {

src/ai_spending.rs

@@ -19,8 +19,8 @@ pub unsafe fn frame_hook(ai_mode: &[AiMode; 8]) {
         let player_ai = PlayerAi::get(player);
         while let Some(request) = player_ai.first_request() {
             let can = can_satisfy_request(game, player, &request, ai_mode);
+            let mut handled = false;
             if can {
-                let mut handled = false;
                 // Handle building morphs since preplaced colonies don't check for requests
                 // (Since their order switches to idle because they don't have a town on frame 0)
                 // Could handle other requests as well, but no need at the moment.
@@ -31,6 +31,8 @@ pub unsafe fn frame_hook(ai_mode: &[AiMode; 8]) {
                     break;
                 }
             }
+            let cost = ai::request_cost(&request);
+            player_ai.remove_resource_need(&cost, handled);
             player_ai.pop_request()
         }
     }