games/ComfyFactorio
games/ComfyFactorio
1
0
Fork 0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-01-26 03:52:22 +02:00
Code Issues Releases Activity

Merge pull request #310 from ComfyFactory/towny_fixes

Browse Source 
Towny fixes
This commit is contained in:
Gerkiz 2022-09-22 22:16:57 +02:00 committed by GitHub
commit 19936ca41e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maps/scrap_towny_ffa/main.lua
View File

@ -92,6 +92,11 @@ end
local function init_score_board(player) local function init_score_board(player)
local ffatable = Table.get_table() local ffatable = Table.get_table()
local saved_frame = ffatable.score_gui_frame[player.index]
if saved_frame and saved_frame.valid then
return
end
local flow = mod_gui.get_frame_flow(player) local flow = mod_gui.get_frame_flow(player)
local frame = flow.add {type = 'frame', style = mod_gui.frame_style, caption = 'Town survival', direction = 'vertical'} local frame = flow.add {type = 'frame', style = mod_gui.frame_style, caption = 'Town survival', direction = 'vertical'}
frame.style.vertically_stretchable = false frame.style.vertically_stretchable = false

2
modules/scrap_towny_ffa/building.lua
View File

@ -269,7 +269,7 @@ function Public.near_another_town(force_name, position, surface, radius)
if entity_force_name ~= nil then if entity_force_name ~= nil then
if entity_force_name ~= force_name then if entity_force_name ~= force_name then
if blacklist_entity_types[e.type] ~= true then if blacklist_entity_types[e.type] ~= true then
log('XDB prevent_entity, e.type:' .. e.type) -- log('XDB prevent_entity, e.type:' .. e.type)
fail = true fail = true
break break
end end