Mininmal fix to get capsules back; clicking cliffs with cliff explosives works again

Author: ahicks92

control.lua

@@ -3069,7 +3069,22 @@ local function kb_click_hand(event)
          CircuitNetworks.drag_wire_and_read(pindex)
       else
          local proto = stack.prototype
-         if proto.place_result or proto.place_as_tile_result then
+         local capsule_action = proto.capsule_action
+         if capsule_action then
+            -- Handle capsules and grenades
+            if capsule_action.type == "use-on-self" then
+               -- Use capsule on the player
+               player.use_from_cursor(player.position)
+            elseif capsule_action.type == "throw" then
+               -- Use smart aiming for throwable capsules
+               local target_pos = Combat.smart_aim_grenades_and_capsules(pindex, false)
+               if target_pos then player.use_from_cursor(target_pos) end
+            else
+               -- For other capsule types (artillery-remote, destroy-cliffs, etc.), use at cursor
+               local vp = Viewpoint.get_viewpoint(pindex)
+               player.use_from_cursor(vp:get_cursor_pos())
+            end
+         elseif proto.place_result or proto.place_as_tile_result then
             -- Item can be placed/built
             local vp = Viewpoint.get_viewpoint(pindex)
             BuildingTools.build_item_in_hand_with_params({

scripts/combat.lua

@@ -245,38 +245,23 @@ function mod.aim_gun_at_nearest_enemy(pindex, enemy_in)
    return true
 end
 
---Max ranges are determined by the game GUI, min ranges represent the minimum distance where you will not get damaged.
+---Get the throw range for a capsule or grenade.
+---Returns 0 for anything but a throwable attack, otherwise returns the range from attack parameters.
+---@param stack LuaItemStack
+---@return number min_range
+---@return number max_range
 function mod.get_grenade_or_capsule_range(stack)
-   local max_range = 20
-   local min_range = 0
-   if stack == nil or stack.valid_for_read == false then
-      return min_range, max_range
-   elseif stack.name == "grenade" then
-      max_range = 15
-      min_range = 7
-   elseif stack.name == "cluster-grenade" then
-      max_range = 20
-      min_range = 12
-   elseif stack.name == "poison-capsule" then
-      max_range = 25
-      min_range = 12
-   elseif stack.name == "slowdown-capsule" then
-      max_range = 25
-      min_range = 0
-   elseif stack.name == "cliff-explosives" then
-      max_range = 10
-      min_range = 0
-   elseif stack.name == "defender-capsule" then
-      max_range = 20
-      min_range = 0
-   elseif stack.name == "distractor-capsule" then
-      max_range = 25
-      min_range = 0
-   elseif stack.name == "destroyer-capsule" then
-      max_range = 20
-      min_range = 0
-   end
-   return min_range, max_range
+   if stack == nil or not stack.valid_for_read then return 0, 0 end
+
+   local capsule_action = stack.prototype.capsule_action
+   if not capsule_action then return 0, 0 end
+
+   if capsule_action.type ~= "throw" then return 0, 0 end
+
+   local attack_params = capsule_action.attack_parameters
+   if not attack_params then return 0, 0 end
+
+   return attack_params.min_range or 0, attack_params.range or 0
 end
 
 --[[