Skip to content

Fix #24 Prevent spawning drones from map view #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jobodd wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix #24 Prevent spawning drones from map view #26

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions script/construction_drone.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,13 @@ local get_prototype = function(name)
return prototype
end

local player_physical_position = function(player)
if player.controller_type == 7 then -- remote map view
return player.physical_position
else
return player.position
end
end

local get_beam_orientation = function(source_position, target_position)
-- Angle in rads
Expand Down Expand Up @@ -379,7 +386,7 @@ local make_path_request = function(drone_data, player, target)
local path_id = player.surface.request_path {
bounding_box = prototype.collision_box,
collision_mask = prototype.collision_mask,
start = player.position,
start = player_physical_position(player),
goal = target.position,
force = player.force,
radius = target.get_radius() + 4,
Expand Down Expand Up @@ -426,9 +433,10 @@ end


local make_player_drone = function(player)
-- make sure we spawn the drone from the player, not map view
local position = player.surface.find_non_colliding_position(
names.units.construction_drone,
player.position,
player_physical_position(player),
5,
0.5,
false
Expand Down