games/FactorioScenarioMultiplayerSpawn
games/FactorioScenarioMultiplayerSpawn
1
0
Fork 0
mirror of https://github.com/Oarcinae/FactorioScenarioMultiplayerSpawn.git synced 2025-02-07 13:07:58 +02:00
Code Issues Releases Activity

Updating settings for radians to degrees to just use new settings completely to avoid migration issues.

Browse Source
This commit is contained in:
Oarcinae 2024-10-19 13:21:35 -04:00
parent 3f3bf00c2d
commit 53b2a2df4f
4 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/config_parser.lua
View File

@ -70,8 +70,8 @@ OCFG_KEYS =
["resource_placement_circle_SUBHEADER"] = {mod_key = "" , ocfg_keys = {""}, type = "subheader", text = {"oarc-settings-section-subheader-resource-placement-circular"}},
["resource_placement.distance_to_edge"] = {mod_key = "oarc-mod-resource-placement-distance-to-edge" , ocfg_keys = {"resource_placement", "distance_to_edge"}, type = "integer"},
["resource_placement.angle_offset"] = {mod_key = "oarc-mod-resource-placement-angle-offset" , ocfg_keys = {"resource_placement", "angle_offset"}, type = "integer"},
["resource_placement.angle_final"] = {mod_key = "oarc-mod-resource-placement-angle-final" , ocfg_keys = {"resource_placement", "angle_final"}, type = "integer"},
["resource_placement.angle_offset"] = {mod_key = "oarc-mod-resource-placement-degrees-offset" , ocfg_keys = {"resource_placement", "angle_offset"}, type = "integer"},
["resource_placement.angle_final"] = {mod_key = "oarc-mod-resource-placement-degrees-final" , ocfg_keys = {"resource_placement", "angle_final"}, type = "integer"},
["resource_placement_square_SUBHEADER"] = {mod_key = "" , ocfg_keys = {""}, type = "subheader", text = {"oarc-settings-section-subheader-resource-placement-square"}},
["resource_placement.vertical_offset"] = {mod_key = "oarc-mod-resource-placement-vertical-offset" , ocfg_keys = {"resource_placement", "vertical_offset"}, type = "integer"},

8
locale/en/locale-mod-settings.cfg
View File

@ -54,8 +54,8 @@ oarc-mod-spawn-general-shape=Spawn area shape
oarc-mod-resource-placement-enabled=Starting resource auto placement
oarc-mod-resource-placement-distance-to-edge=Starting resource distance to edge
oarc-mod-resource-placement-angle-offset=Starting resource angle offset
oarc-mod-resource-placement-angle-final=Starting resource angle final
oarc-mod-resource-placement-degrees-offset=Starting resource angle offset
oarc-mod-resource-placement-degrees-final=Starting resource angle final
oarc-mod-resource-placement-vertical-offset=Starting resource vertical offset
oarc-mod-resource-placement-horizontal-offset=Starting resource horizontal offset
oarc-mod-resource-placement-linear-spacing=Starting resource linear spacing
@ -115,8 +115,8 @@ oarc-mod-spawn-general-shape=This is the shape of the spawn area.
oarc-mod-resource-placement-enabled=You should leave this enabled unless you are manually specifying resource placements in the custom scenario!
oarc-mod-resource-placement-distance-to-edge=This is the distance from the edge of the spawn area that resources will be placed. Only applicable for circle/octagon shaped spawns.
oarc-mod-resource-placement-angle-offset=This is the starting angle offset (in degrees) for the resource placement. At what angle (in degrees) do resources start. 0 = east. 90 = south. Resources are placed clockwise starting at this angle. Only applicable for circle/octagon shaped spawns.
oarc-mod-resource-placement-angle-final=This is the final angle offset (in degrees) for the resource placement. At what angle (in degrees) do resources end. 0 = east. 90 = south. Resources are placed clockwise ending at this angle. Only applicable for circle/octagon shaped spawns.
oarc-mod-resource-placement-degrees-offset=This is the starting angle offset (in degrees) for the resource placement. At what angle (in degrees) do resources start. 0 = east. 90 = south. Resources are placed clockwise starting at this angle. Only applicable for circle/octagon shaped spawns.
oarc-mod-resource-placement-degrees-final=This is the final angle offset (in degrees) for the resource placement. At what angle (in degrees) do resources end. 0 = east. 90 = south. Resources are placed clockwise ending at this angle. Only applicable for circle/octagon shaped spawns.
oarc-mod-resource-placement-vertical-offset=This is the vertical offset (in tiles) for the resource placement from the top-left of the spawn. Only applicable for square shaped spawns.
oarc-mod-resource-placement-horizontal-offset=This is the horizontal offset (in tiles) for the resource placement from the top-left of the spawn. Only applicable for square shaped spawns.
oarc-mod-resource-placement-linear-spacing=This is the linear spacing (in tiles) between resources. Only applicable for square shaped spawns.

10
migrations/oarc-mod_V2.0.4.lua
View File

@ -5,13 +5,3 @@ end
if game.forces["enemy-medium"] then
game.merge_forces("enemy-medium", "enemy")
end
--If angle offset and angle final are the same as the default radian values, migrate them?
if (settings.global["oarc-mod-resource-placement-angle-offset"].value == 2) and
(settings.global["oarc-mod-resource-placement-angle-final"].value == 4) then
settings.global["oarc-mod-resource-placement-angle-offset"] = { value = 120 }
settings.global["oarc-mod-resource-placement-angle-final"] = { value = 240 }
global.ocfg.resource_placement.angle_offset = 120
global.ocfg.resource_placement.angle_final = 240
log("Migrated resource placement angle offset and final from default radian values to degrees")
end

4
settings.lua
View File

@ -346,7 +346,7 @@ data:extend({
},
{
type = "int-setting",
name = "oarc-mod-resource-placement-angle-offset",
name = "oarc-mod-resource-placement-degrees-offset",
setting_type = "runtime-global",
default_value = 120,
minimum_value = 0,
@ -355,7 +355,7 @@ data:extend({
},
{
type = "int-setting",
name = "oarc-mod-resource-placement-angle-final",
name = "oarc-mod-resource-placement-degrees-final",
setting_type = "runtime-global",
default_value = 240,
minimum_value = 0,