aperx/factorio-scenario-ExpCluster
1
0
Fork 0
mirror of https://github.com/PHIDIAS0303/ExpCluster.git synced 2025-12-31 04:51:40 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'patch/5.9.1'

Browse Source
This commit is contained in:
Cooldude2606
2019-08-22 21:04:58 +01:00
parent 7e06bfea13 db102a79ff
commit 30d63427d7
3 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/commands/bonus.lua
View File

@@ -43,17 +43,10 @@ Event.add(defines.events.on_player_respawned,function(event)
end end
end) end)
Event.add(defines.events.on_pre_player_died,function(event) Event.add(defines.events.on_player_died,function(event)
local player = Game.get_player_by_index(event.player_index) local player = Game.get_player_by_index(event.player_index)
if Roles.player_has_flag(player,'instance-respawn') then if Roles.player_has_flag(player,'instance-respawn') then
player.ticks_to_respawn = 120 player.ticks_to_respawn = 120
-- manually dispatch death event because it is not fired when ticks_to_respawn is set pre death
Event.dispatch{
name=defines.events.on_player_died,
tick=event.tick,
player_index=event.player_index,
cause = event.cause
}
end end
end) end)

10
modules/gui/rocket-info.lua
View File

@@ -364,11 +364,11 @@ local function generate_progress(player,frame)
local silo_name = silo_data.name local silo_name = silo_data.name
if not silo_data.entity or not silo_data.entity.valid then if not silo_data.entity or not silo_data.entity.valid then
force_silos[silo_name] = nil force_silos[silo_name] = nil
Gui.destory_if_valid(element['toggle-'..silo_name]) Gui.destroy_if_valid(element['toggle-'..silo_name])
Gui.destory_if_valid(element['launch-'..silo_name]) Gui.destroy_if_valid(element['launch-'..silo_name])
Gui.destory_if_valid(element['label-x-'..silo_name]) Gui.destroy_if_valid(element['label-x-'..silo_name])
Gui.destory_if_valid(element['label-y-'..silo_name]) Gui.destroy_if_valid(element['label-y-'..silo_name])
Gui.destory_if_valid(element[silo_name]) Gui.destroy_if_valid(element[silo_name])
elseif not element[silo_name] then elseif not element[silo_name] then
local entity = silo_data.entity local entity = silo_data.entity

8
modules/gui/warp-list.lua
View File

@@ -120,7 +120,7 @@ end)
local warps = Warps.get_all_warps() local warps = Warps.get_all_warps()
for warp_id,warp in pairs(warps) do for warp_id,warp in pairs(warps) do
local pos = warp.position local pos = warp.position
if (posx-pos.x)^2+(posy-pos.y)^2 < dist2 then if (px-pos.x)^2+(py-pos.y)^2 < dist2 then
local warp_name = Warps.get_warp_name(warp_id) local warp_name = Warps.get_warp_name(warp_id)
player.print{'warp-list.too-close',warp_name} player.print{'warp-list.too-close',warp_name}
return return
@@ -526,8 +526,10 @@ Event.add(defines.events.on_player_created,function(event)
end end
local force = player.force local force = player.force
local spawn_position = force.get_spawn_position(player.surface) if not Warps.forces[force.name] then
Warps.new_warp(force.name,player.surface,spawn_position,nil,'Spawn',true,true) local spawn_position = force.get_spawn_position(player.surface)
Warps.new_warp(force.name,player.surface,spawn_position,nil,'Spawn',true,true)
end
end) end)
local function maintain_tag(event) local function maintain_tag(event)