games/ComfyFactorio
games/ComfyFactorio
1
0
Fork 0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-03-25 21:29:06 +02:00
Code Issues Releases Activity

Merge branch 'develop' into develop

Browse Source
This commit is contained in:
hanakocz 2025-01-28 14:44:07 +01:00 committed by GitHub
commit f8930c981e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maps/desert_oasis.lua
View File

@ -438,6 +438,8 @@ local function deny_building(event)
if type_whitelist[entity.ghost_name] then
return
end
else
return
end
end
@ -533,6 +535,9 @@ local function on_player_changed_position(event)
if player.vehicle then
return
end
if script.active_mods['space-age'] and player.cargo_pod then
return
end
if safe_tiles[surface.get_tile(player.physical_position.x, player.physical_position.y).name] then
return

9
maps/journey/functions.lua
View File

@ -253,7 +253,7 @@ local function delete_nauvis_chunks(journey)
return
end
for _ = 1, 1, 1 do --1 chunk per action until 2.0.31! TODO: fix back to 12 when version released
for _ = 1, 12, 1 do
local chunk_position = journey.nauvis_chunk_positions[journey.size_of_nauvis_chunk_positions]
if chunk_position then
surface.delete_chunk(chunk_position)
@ -1575,13 +1575,10 @@ function Public.mothership_waiting_for_players(journey)
end
function Public.teleporters(journey, player)
if not player.character then
if not player.character or not player.character.valid then
return
end
if not player.character.valid then
return
end
if player.vehicle then
if player.character.vehicle then
return
end
local surface = player.physical_surface

2
maps/journey/unique_modifiers.lua
View File

@ -402,7 +402,7 @@ Public.volcanic = {
end,
on_player_changed_position = function (event)
local player = game.players[event.player_index]
if player.driving then
if player.driving or player.controller_type == defines.controllers.remote then
return
end
local surface = player.surface

2
modules/thirst.lua
View File

@ -87,7 +87,7 @@ local function sip(player)
end
local water_tiles = player.surface.count_tiles_filtered({
name = { 'water', 'deepwater', 'water-mud', 'water-shallow' },
area = { { player.position.x - 1, player.position.y - 1 }, { player.position.x + 1, player.position.y + 1 } }
area = { { player.physical_position.x - 1, player.physical_position.y - 1 }, { player.physical_position.x + 1, player.physical_position.y + 1 } }
})
if water_tiles > 0 then
this.hydration[player.index] = this.hydration[player.index] + 200