Skip to content

fix for issue #114 #115

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
remiteeple wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix for issue #114 #115

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
64 changes: 33 additions & 31 deletions scripts/reviver.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,40 +44,42 @@ local function picker_revive_selected_ghosts(event)
local selected = player.selected
if player.controller_type ~= defines.controllers.ghost and selected then
local stack = player.cursor_stack
if stack.valid_for_read then
if selected.type == 'entity-ghost' and player.mod_settings['picker-revive-selected-ghosts-entity'].value then
if stack.type ~= 'rail-planner' and stack.prototype.place_result == game.entity_prototypes[selected.ghost_name] and pdata.next_revive_tick ~= event.tick then
local direction = selected.direction or defines.direction.north
local position = selected.position
-- API build_from_cursor to no do flip logic
if selected.ghost_type == 'underground-belt' then
if selected.belt_to_ground_type == 'output' then
direction = (direction + 4) % 8
end
local name = selected.ghost_name
local belt_type = selected.belt_to_ground_type
player.build_from_cursor {position = position, direction = direction}
local ent = player.surface.find_entity(name, position)
if ent then
if ent.belt_to_ground_type ~= belt_type then
ent.rotate()
if stack then
Copy link
Owner

@Nexela Nexela Jul 5, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

stack is a LuaItemStack it shouldn't ever be nil. Ill try to fire it up in the debugger and se whats happening

Copy link

@ExterminatorX99 ExterminatorX99 Dec 25, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The docs says it is nullable
https://lua-api.factorio.com/latest/LuaControl.html#LuaControl.cursor_stack

if stack.valid_for_read then
if selected.type == 'entity-ghost' and player.mod_settings['picker-revive-selected-ghosts-entity'].value then
if stack.type ~= 'rail-planner' and stack.prototype.place_result == game.entity_prototypes[selected.ghost_name] and pdata.next_revive_tick ~= event.tick then
local direction = selected.direction or defines.direction.north
local position = selected.position
-- API build_from_cursor to no do flip logic
if selected.ghost_type == 'underground-belt' then
if selected.belt_to_ground_type == 'output' then
direction = (direction + 4) % 8
end
local name = selected.ghost_name
local belt_type = selected.belt_to_ground_type
player.build_from_cursor {position = position, direction = direction}
local ent = player.surface.find_entity(name, position)
if ent then
if ent.belt_to_ground_type ~= belt_type then
ent.rotate()
end
end
elseif selected.ghost_type == 'pipe-to-ground' then
local name = selected.ghost_name
player.build_from_cursor {position = position, direction = direction}
local ent = player.surface.find_entity(name, position)
if ent and ent.direction ~= direction then
ent.direction = direction
end
else
player.build_from_cursor {position = position, direction = direction}
end
elseif selected.ghost_type == 'pipe-to-ground' then
local name = selected.ghost_name
player.build_from_cursor {position = position, direction = direction}
local ent = player.surface.find_entity(name, position)
if ent and ent.direction ~= direction then
ent.direction = direction
end
else
player.build_from_cursor {position = position, direction = direction}
end
end
elseif selected.type == 'tile-ghost' and player.mod_settings['picker-revive-selected-ghosts-tile'].vaue then
local tile = stack.prototype.place_as_tile_result
if tile and tile.result == game.tile_prototypes[selected.ghost_name] and pdata.next_revive_tick ~= event.tick then
player.build_from_cursor {position = selected.position, direction = selected.direction, terrain_building_size = 1}
elseif selected.type == 'tile-ghost' and player.mod_settings['picker-revive-selected-ghosts-tile'].vaue then
local tile = stack.prototype.place_as_tile_result
if tile and tile.result == game.tile_prototypes[selected.ghost_name] and pdata.next_revive_tick ~= event.tick then
player.build_from_cursor {position = selected.position, direction = selected.direction, terrain_building_size = 1}
end
end
end
end
Expand Down