Further upkeep fixes #227

SMUnlimited · Feb 25, 2024 · 110881c · 110881c
1 parent cd22baf
commit 110881c
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/common.eai b/common.eai
@@ -8078,16 +8078,12 @@ endfunction
 
 //===========================================================================
 function CheckUpkeepAllowed takes integer food returns nothing
-  local integer mines = GetMinesOwned()
   local integer i = 0
   loop
     exitwhen i >= UPKEEP_NUM
     set last_upkeep_allowed[i] = UPKEEP_UNDECIDED
     if food > upkeep_border[i] then
       set upkeep_allowed[i] = UPKEEP_ALLOWED
-    elseif mines < upkeep_mines_needed[i] then
-      set upkeep_allowed[i] = UPKEEP_NOT_ALLOWED
-      set upkeep_time[i] = -1
     else
       set upkeep_allowed[i] = UPKEEP_UNDECIDED
     endif
@@ -8097,13 +8093,17 @@ endfunction
 
 //===========================================================================
 function ApplyUpkeepCheck takes integer afford_food, integer food, integer food_cost, integer cost_qty, integer need_qty returns integer
+  local integer mines = GetMinesOwned()
   local integer i = 0
   loop
     exitwhen i >= UPKEEP_NUM
     if food + food_cost * cost_qty > upkeep_border[i] then
       if upkeep_allowed[i] == UPKEEP_UNDECIDED then
         if total_gold > upkeep_resistance[i] then
           set upkeep_allowed[i] = UPKEEP_ALLOWED
+        elseif mines < upkeep_mines_needed[i] then
+          set upkeep_time[i] = -1
+          set upkeep_allowed[i] = UPKEEP_NOT_ALLOWED
         else
           set upkeep_allowed[i] = UPKEEP_NOT_ALLOWED
         endif