Disable area reclaim command (FAForever#6297)

Basilisk3 · Jul 6, 2024 · 7fa9c14 · 7fa9c14
1 parent 3e4d0af
commit 7fa9c14
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/lua/SimCallbacks.lua b/lua/SimCallbacks.lua
@@ -723,6 +723,10 @@ do
     ---@param data { Origin: number, Destination: Vector}
     ---@param selection Unit[]
     Callbacks.ExtendReclaimOrder = function(data, selection)
+        do  -- feature: area commands
+            return
+        end
+
         -- verify selection
         selection = SecureUnits(selection)
         if (not selection) or TableEmpty(selection) then
@@ -773,7 +777,8 @@ do
 
         local start = GetSystemTimeSecondsOnlyForProfileUse()
         import("/lua/sim/commands/area-reclaim-order.lua").AreaReclaimProps(selection, ps, pe, Width, true)
-        SPEW("Time taken for area reclaim order: ", 1000 * (GetSystemTimeSecondsOnlyForProfileUse() - start), "miliseconds")
+        SPEW("Time taken for area reclaim order: ", 1000 * (GetSystemTimeSecondsOnlyForProfileUse() - start),
+            "miliseconds")
     end
 
     ---@param data table
@@ -795,7 +800,7 @@ do
         end
 
         local target = lastCommand.target --[[@as Unit | Prop]]
-        
+
         local start = GetSystemTimeSecondsOnlyForProfileUse()
         import("/lua/sim/commands/area-attack-ground-order.lua").AreaAttackOrder(selection,
             { lastCommand.x, lastCommand.y, lastCommand.z }, data.Radius)

diff --git a/lua/ui/game/commandmode.lua b/lua/ui/game/commandmode.lua
@@ -547,10 +547,11 @@ end
 
 ---@param command UserCommand
 local function OnReclaimIssued(command)
-    -- Area reclaim dragger, command mode only
-    if command.Target.EntityId and modeData.name == "RULEUCC_Reclaim" then
-        import("/lua/ui/game/hotkeys/area-reclaim-order.lua").AreaReclaimOrder(command)
-    end
+    -- feature: area commands
+    -- -- Area reclaim dragger, command mode only
+    -- if command.Target.EntityId and modeData.name == "RULEUCC_Reclaim" then
+    --     import("/lua/ui/game/hotkeys/area-reclaim-order.lua").AreaReclaimOrder(command)
+    -- end
 end
 
 ---@param command UserCommand
@@ -564,6 +565,7 @@ end
 
 ---@param command UserCommand
 local function OnAttackIssued(command)
+    -- feature: area commands
     -- Area attack dragger, command mode only
     if command.Target.Type == 'Position' and modeData.name == "RULEUCC_Attack" then
         import("/lua/ui/game/hotkeys/area-attack-order.lua").AreaAttackOrder(command)