games/ComfyFactorio
games/ComfyFactorio
1
0
Fork 0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-01-14 02:34:09 +02:00
Code Issues Releases Activity

Merge pull request #486 from ComfyFactory/journey_fixes

Browse Source 
Journey fixes for physical position
This commit is contained in:
hanakocz 2024-12-04 21:22:27 +01:00 committed by GitHub
commit 84eabe233c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
locale/en/journey.cfg
View File

@ -1,26 +1,26 @@
[journey]
map_info_main_caption=The Journey
map_info_sub_caption=v 1.9
map_info_text=The selectors in the mothership, allow you to choose a destination.\nWorlds can be rerolled by spending a satellite at the top selector.\nOnce enough players are on a selector, mothership will start traveling.\n\nA teleporter will be deployed, after reaching the target.\nIt is however, only capable of transfering the subjects body.\n\nWorlds will get more difficult with each jump, stacking the chosen modifiers.\nLaunch uranium fuel cells via rocket cargo, to advance to the next world.\nThe tooltips on the top buttons yield informations about the current world.\nIf the journey ends, an admin can fully reset the map via command "/journey-reset".\n\nHow far will the journey lead?
tooltip_satellite=Satellites stored: __1__ / __2__\nSatellites are used by Mothership to scout for alternative destinations.
tooltip_nuclear_fuel=Emergency Reactors working: __1__ / __2__\n30 Emergency Reactors are usually damaged by Mothership if the current colony is determined to be lost and Mothership has to leave in a hurry.\nIf teleporter is lost and there is no emergency power, the game is over and run resets.
tooltip_fuel=Fuel requirement to advance to next world:\n__1__\n\nNuclear Fuel Cells in Mothership Cargo:\n__2__
tooltip_delivery=Orbital Station Delivery: __1__ / __2__\nStation pays with one random starting item roll per time threshold.\nTimes: 120min, 240min, 480min, 960min, 1920min, 3840min\nCurrent time: __3__ minutes.
beacon_hp=HP: __1__/10000
teleporter=Personal Teleporter
chunks_delete=Deleting chunks.. __1__
mothership_format=[font=heading-1][color=255,155,155]<Mothership> [/color][/font][font=default-game][color=200,200,200]__1__[/color][/font]
world=World __1__ | __2__
world_tooltip=__1__\n\n__2__\nCapsules:\n__3__
tooltip_modifier=__1__ - __2__%\n
tooltip_capsule= __1__x [item=__2__]
tooltip_capsule2= __1__x [item=__2__]\n
message_rocket_launched=Launching a rocket with __1__x [item=__2__] at [gps=__3__,__4__,nauvis].
message_min_players=The minimal amount of players to vote for new world is set to __1__.
message_delivery_done=[img=item/__1__] Orbital Station delivery completed in __2__ minutes, granting __3__ loot rolls!
message_delivered=Delivered from Orbital Station: __2__x [img=item/__1__] added to capsule storage.
cmd_server_restarting=Server is restarting to apply updates to the scenario...Please reconnect in a minute.
[journey]
map_info_main_caption=The Journey
map_info_sub_caption=v 1.9
map_info_text=The selectors in the mothership, allow you to choose a destination.\nWorlds can be rerolled by spending a satellite at the top selector.\nOnce enough players are on a selector, mothership will start traveling.\n\nA teleporter will be deployed, after reaching the target.\nIt is however, only capable of transfering the subjects body.\n\nWorlds will get more difficult with each jump, stacking the chosen modifiers.\nLaunch uranium fuel cells via rocket cargo, to advance to the next world.\nThe tooltips on the top buttons yield informations about the current world.\nIf the journey ends, an admin can fully reset the map via command "/journey-reset".\n\nHow far will the journey lead?
tooltip_satellite=Satellites stored: __1__ / __2__\nSatellites are used by Mothership to scout for alternative destinations.
tooltip_nuclear_fuel=Emergency Reactors working: __1__ / __2__\n3 Emergency Reactors are usually damaged by Mothership if the current colony is determined to be lost and Mothership has to leave in a hurry.\nIf teleporter is lost and there is no emergency power, the game is over and run resets.
tooltip_fuel=Fuel requirement to advance to next world:\n__1__\n\nNuclear Fuel Cells in Mothership Cargo:\n__2__
tooltip_delivery=Orbital Station Delivery: __1__ / __2__\nStation pays with one random starting item roll per time threshold.\nTimes: 120min, 240min, 480min, 960min, 1920min, 3840min\nCurrent time: __3__ minutes.
beacon_hp=HP: __1__/10000
teleporter=Personal Teleporter
chunks_delete=Deleting chunks.. __1__
mothership_format=[font=heading-1][color=255,155,155]<Mothership> [/color][/font][font=default-game][color=200,200,200]__1__[/color][/font]
world=World __1__ | __2__
world_tooltip=__1__\n\n__2__\nCapsules:\n__3__
tooltip_modifier=__1__ - __2__%\n
tooltip_capsule= __1__x [item=__2__]
tooltip_capsule2= __1__x [item=__2__]\n
message_rocket_launched=Launching a rocket with __1__x [item=__2__] at [gps=__3__,__4__,nauvis].
message_min_players=The minimal amount of players to vote for new world is set to __1__.
message_delivery_done=[img=item/__1__] Orbital Station delivery completed in __2__ minutes, granting __3__ loot rolls!
message_delivered=Delivered from Orbital Station: __2__x [img=item/__1__] added to capsule storage.
cmd_server_restarting=Server is restarting to apply updates to the scenario...Please reconnect in a minute.

6
maps/journey/functions.lua
View File

@ -130,7 +130,7 @@ local function drop_player_items(journey, player)
end
local surface = player.surface
local spill_blockage = surface.create_entity { name = 'oil-refinery', position = journey.beacon_objective.position or player.position }
local spill_blockage = surface.create_entity { name = 'oil-refinery', position = journey.beacon_objective.position or player.physical_position }
for _, define in pairs({ defines.inventory.character_main, defines.inventory.character_guns, defines.inventory.character_ammo, defines.inventory.character_armor, defines.inventory.character_vehicle, defines.inventory.character_trash }) do
local inventory = character.get_inventory(define)
@ -138,7 +138,7 @@ local function drop_player_items(journey, player)
for i = 1, #inventory, 1 do
local slot = inventory[i]
if slot.valid and slot.valid_for_read then
surface.spill_item_stack({ position = player.position, stack = slot, enable_looted = true, allow_belts = false })
surface.spill_item_stack({ position = player.physical_position, stack = slot, enable_looted = true, allow_belts = false })
end
end
inventory.clear()
@ -1573,7 +1573,7 @@ function Public.teleporters(journey, player)
return
end
local surface = player.surface
local tile = surface.get_tile(player.position)
local tile = surface.get_tile(player.physical_position)
if tile.name ~= Constants.teleporter_tile and tile.hidden_tile ~= Constants.teleporter_tile then
return
end

4
maps/journey/unique_modifiers.lua
View File

@ -425,10 +425,10 @@ Public.volcanic = {
if surface.index ~= 1 then
return
end
if solid_tiles[surface.get_tile(player.position.x, player.position.y).name] then
if solid_tiles[surface.get_tile(player.physical_position.x, player.physical_position.y).name] then
return
end
surface.create_entity({ name = 'fire-flame', position = player.position })
surface.create_entity({ name = 'fire-flame', position = player.physical_position })
end,
on_world_start = function (journey)
local surface = game.surfaces.nauvis