Add extra rules for danger ore (#1348)

features/gui/info.lua

@@ -36,6 +36,7 @@ local map_name_key = 1
 local map_description_key = 2
 local map_extra_info_key = 3
 local new_info_key = 4
+local extra_rules_key = 5
 
 local rewarded_players = {}
 local primitives = {map_extra_info_lock = nil, info_edited = nil}
@@ -44,7 +45,8 @@ local editable_info = {
     [map_name_key] = config_mapinfo.map_name_key,
     [map_description_key] = config_mapinfo.map_description_key,
     [map_extra_info_key] = config_mapinfo.map_extra_info_key,
-    [new_info_key] = config_mapinfo.new_info_key
+    [new_info_key] = config_mapinfo.new_info_key,
+    [extra_rules_key] = {}
 }
 
 Global.register({rewarded_players = rewarded_players, editable_info = editable_info, primitives = primitives},
@@ -262,14 +264,27 @@ local pages = {
             parent_style.left_padding = 0
             parent_style.top_padding = 1
 
-            parent = parent.add {type = 'flow', direction = 'vertical'}
+            parent = parent.add {
+                type = 'scroll-pane',
+                vertical_scroll_policy = 'auto-and-reserve-space',
+                horizontal_scroll_policy = 'never'
+            }
             parent_style = parent.style
-            parent_style.vertically_stretchable = false
-            parent_style.width = 600
+            parent_style.right_padding = 8
+            parent_style.left_padding = 8
+            parent_style.vertically_stretchable = true
 
             header_label(parent, {'info.rules_header'})
 
             centered_label(parent, {'info.rules_text'})
+
+            local rules = editable_info[extra_rules_key]
+            for _, rule in pairs(rules) do
+                parent.add({type = 'flow'}).style.height = 16
+                centered_label(parent, rule)
+            end
+
+            parent.add({type = 'flow'}).style.height = 24
         end
     },
     {
@@ -759,4 +774,9 @@ function Public.set_new_info(value)
     editable_info[new_info_key] = value
 end
 
+function Public.add_extra_rule(rule)
+    local rules = editable_info[extra_rules_key]
+    table.insert(rules, rule)
+end
+
 return Public

locale/en/redmew_gui.cfg

@@ -15,7 +15,8 @@ links_patreon=Contribute to our Patreon to receive special perks and help mainta
 links_saves=Download our maps, start and finish state, from our website.
 links_factoriomaps=View our past maps as a Google Map.
 rules_header=Rules
-rules_text=Have fun and play nice. Remember we are all just here to have fun so let’s keep it that way.\n\nNo hateful content or personal attacks.\n\nIf you suspect someone is griefing, notify the admin team by using /report or by clicking the report button next to the player in the player list.
+rules_text=Have fun and play nice. Remember we are all just here to have fun so let's keep it that way.\n\nNo hateful content or personal attacks.\n\nIf you suspect someone is griefing, notify the admin team by using /report or by clicking the report button next to the player in the player list.
+rules_text_danger_ore=If another player's build needs to be modified or removed, there needs to be a team discussion or vote/poll before the modification or removal.\n\nA team discussion or vote/poll is not necessary if the player who built it is online and agrees to the modification or removal.\n\nMap wide module changing and belt upgrading must be voted on as a team before the changing or upgrading.\n\nIn the instance of a team vote/poll, the majority wins.\n\nOnly 1 or 2 players online are not enough for a team discussion or vote/poll. Yet, modification or removal of a build may be necessary to keep the base running smoothly. A message should be left on the in-game chat stating they are modifying or removing a build, and why it needs to be done. Simply stating your design or build is better or looks nicer isn't enough.
 map_info_button=Map Info
 map_info_header=Map Information
 map_name_label=Map name:

map_gen/maps/danger_ores/presets/danger_bobangels_ores.lua

@@ -50,6 +50,8 @@ ScenarioInfo.set_new_info([[
  - Rail signals and train stations now allowed on ore.
 ]])
 
+ScenarioInfo.add_extra_rule({'info.rules_text_danger_ore'})
+
 local map = require 'map_gen.maps.danger_ores.modules.map'
 local main_ores_config = require 'map_gen.maps.danger_ores.config.bobangels_ores'
 local resource_patches = require 'map_gen.maps.danger_ores.modules.resource_patches'

map_gen/maps/danger_ores/presets/danger_bobs_ores.lua

@@ -50,6 +50,8 @@ ScenarioInfo.set_new_info([[
  - Rail signals and train stations now allowed on ore.
 ]])
 
+ScenarioInfo.add_extra_rule({'info.rules_text_danger_ore'})
+
 local map = require 'map_gen.maps.danger_ores.modules.map'
 local main_ores_config = require 'map_gen.maps.danger_ores.config.bob_ores'
 local resource_patches = require 'map_gen.maps.danger_ores.modules.resource_patches'

map_gen/maps/danger_ores/presets/danger_ore.lua

@@ -47,6 +47,8 @@ ScenarioInfo.set_new_info([[
  - Rail signals and train stations now allowed on ore.
 ]])
 
+ScenarioInfo.add_extra_rule({'info.rules_text_danger_ore'})
+
 local map = require 'map_gen.maps.danger_ores.modules.map'
 local main_ores_config = require 'map_gen.maps.danger_ores.config.vanilla_ores'
 local resource_patches = require 'map_gen.maps.danger_ores.modules.resource_patches'

map_gen/maps/danger_ores/presets/danger_ore_3way_beltboxes_ore_only.lua

@@ -51,6 +51,8 @@ ScenarioInfo.set_new_info([[
  - Rail signals and train stations now allowed on ore.
 ]])
 
+ScenarioInfo.add_extra_rule({'info.rules_text_danger_ore'})
+
 global.config.redmew_qol.loaders = false
 
 local map = require 'map_gen.maps.danger_ores.modules.map'

map_gen/maps/danger_ores/presets/danger_ore_chessboard.lua

@@ -51,6 +51,8 @@ ScenarioInfo.set_new_info([[
  - Rail signals and train stations now allowed on ore.
 ]])
 
+ScenarioInfo.add_extra_rule({'info.rules_text_danger_ore'})
+
 local map = require 'map_gen.maps.danger_ores.modules.map'
 local main_ores_config = require 'map_gen.maps.danger_ores.config.vanilla_ores'
 local resource_patches = require 'map_gen.maps.danger_ores.modules.resource_patches'

map_gen/maps/danger_ores/presets/danger_ore_chessboard_beltboxes_ore_only.lua

@@ -5,7 +5,7 @@ local b = require 'map_gen.shared.builders'
 local Config = require 'config'
 
 local ScenarioInfo = require 'features.gui.info'
-ScenarioInfo.set_map_name('Danger Ore Chessboard Beltboxes (ore only')
+ScenarioInfo.set_map_name('Danger Ore Chessboard Beltboxes (ore only)')
 ScenarioInfo.set_map_description([[
 Clear the ore to expand the base,
 focus mining efforts on specific sectors to ensure
@@ -51,6 +51,8 @@ ScenarioInfo.set_new_info([[
  - Rail signals and train stations now allowed on ore.
 ]])
 
+ScenarioInfo.add_extra_rule({'info.rules_text_danger_ore'})
+
 global.config.redmew_qol.loaders = false
 
 local map = require 'map_gen.maps.danger_ores.modules.map'

map_gen/maps/danger_ores/presets/danger_ore_chessboard_uniform.lua

@@ -51,6 +51,8 @@ ScenarioInfo.set_new_info([[
  - Rail signals and train stations now allowed on ore.
 ]])
 
+ScenarioInfo.add_extra_rule({'info.rules_text_danger_ore'})
+
 local map = require 'map_gen.maps.danger_ores.modules.map'
 local main_ores_config = require 'map_gen.maps.danger_ores.config.vanilla_ores'
 local resource_patches = require 'map_gen.maps.danger_ores.modules.resource_patches'

map_gen/maps/danger_ores/presets/danger_ore_chessboard_uniform_beltboxes_ore_only.lua

@@ -5,7 +5,7 @@ local b = require 'map_gen.shared.builders'
 local Config = require 'config'
 
 local ScenarioInfo = require 'features.gui.info'
-ScenarioInfo.set_map_name('Danger Ore Chessboard Uniform Beltboxes (ore only')
+ScenarioInfo.set_map_name('Danger Ore Chessboard Uniform Beltboxes (ore only)')
 ScenarioInfo.set_map_description([[
 Clear the ore to expand the base,
 focus mining efforts on specific sectors to ensure
@@ -51,6 +51,8 @@ ScenarioInfo.set_new_info([[
  - Rail signals and train stations now allowed on ore.
 ]])
 
+ScenarioInfo.add_extra_rule({'info.rules_text_danger_ore'})
+
 global.config.redmew_qol.loaders = false
 
 local map = require 'map_gen.maps.danger_ores.modules.map'

map_gen/maps/danger_ores/presets/danger_ore_circles.lua

@@ -51,6 +51,8 @@ ScenarioInfo.set_new_info([[
  - Rail signals and train stations now allowed on ore.
 ]])
 
+ScenarioInfo.add_extra_rule({'info.rules_text_danger_ore'})
+
 local map = require 'map_gen.maps.danger_ores.modules.map'
 local main_ores_config = require 'map_gen.maps.danger_ores.config.vanilla_ores'
 local resource_patches = require 'map_gen.maps.danger_ores.modules.resource_patches'

map_gen/maps/danger_ores/presets/danger_ore_circles_beltboxes_ore_only.lua

@@ -51,6 +51,8 @@ ScenarioInfo.set_new_info([[
  - Rail signals and train stations now allowed on ore.
 ]])
 
+ScenarioInfo.add_extra_rule({'info.rules_text_danger_ore'})
+
 global.config.redmew_qol.loaders = false
 
 local map = require 'map_gen.maps.danger_ores.modules.map'

map_gen/maps/danger_ores/presets/danger_ore_deadlock_beltboxes.lua

@@ -51,6 +51,8 @@ ScenarioInfo.set_new_info([[
  - Rail signals and train stations now allowed on ore.
 ]])
 
+ScenarioInfo.add_extra_rule({'info.rules_text_danger_ore'})
+
 global.config.redmew_qol.loaders = false
 
 local map = require 'map_gen.maps.danger_ores.modules.map'

map_gen/maps/danger_ores/presets/danger_ore_deadlock_beltboxes_ore_only.lua

@@ -51,6 +51,8 @@ ScenarioInfo.set_new_info([[
  - Rail signals and train stations now allowed on ore.
 ]])
 
+ScenarioInfo.add_extra_rule({'info.rules_text_danger_ore'})
+
 global.config.redmew_qol.loaders = false
 
 local map = require 'map_gen.maps.danger_ores.modules.map'

map_gen/maps/danger_ores/presets/danger_ore_extra.lua

@@ -51,6 +51,8 @@ ScenarioInfo.set_new_info([[
  - Rail signals and train stations now allowed on ore.
 ]])
 
+ScenarioInfo.add_extra_rule({'info.rules_text_danger_ore'})
+
 local map = require 'map_gen.maps.danger_ores.modules.map'
 local main_ores_config = require 'map_gen.maps.danger_ores.config.vanilla_ores'
 local resource_patches = require 'map_gen.maps.danger_ores.modules.resource_patches'

map_gen/maps/danger_ores/presets/danger_ore_gradient.lua

@@ -51,6 +51,8 @@ ScenarioInfo.set_new_info([[
  - Rail signals and train stations now allowed on ore.
 ]])
 
+ScenarioInfo.add_extra_rule({'info.rules_text_danger_ore'})
+
 local map = require 'map_gen.maps.danger_ores.modules.map'
 local main_ores_config = require 'map_gen.maps.danger_ores.config.vanilla_gradient_ores'
 local resource_patches = require 'map_gen.maps.danger_ores.modules.resource_patches'

map_gen/maps/danger_ores/presets/danger_ore_gradient_beltboxes_ore_only.lua

@@ -51,6 +51,8 @@ ScenarioInfo.set_new_info([[
  - Rail signals and train stations now allowed on ore.
 ]])
 
+ScenarioInfo.add_extra_rule({'info.rules_text_danger_ore'})
+
 global.config.redmew_qol.loaders = false
 
 local map = require 'map_gen.maps.danger_ores.modules.map'

map_gen/maps/danger_ores/presets/danger_ore_hub_spiral.lua

@@ -51,6 +51,8 @@ ScenarioInfo.set_new_info([[
  - Rail signals and train stations now allowed on ore.
 ]])
 
+ScenarioInfo.add_extra_rule({'info.rules_text_danger_ore'})
+
 local map = require 'map_gen.maps.danger_ores.modules.map'
 local main_ores_config = require 'map_gen.maps.danger_ores.config.vanilla_ores'
 local resource_patches = require 'map_gen.maps.danger_ores.modules.resource_patches'

map_gen/maps/danger_ores/presets/danger_ore_hub_spiral_beltboxes_ore_only.lua

@@ -51,6 +51,8 @@ ScenarioInfo.set_new_info([[
  - Rail signals and train stations now allowed on ore.
 ]])
 
+ScenarioInfo.add_extra_rule({'info.rules_text_danger_ore'})
+
 global.config.redmew_qol.loaders = false
 
 local map = require 'map_gen.maps.danger_ores.modules.map'

map_gen/maps/danger_ores/presets/danger_ore_landfill.lua

@@ -51,6 +51,8 @@ ScenarioInfo.set_new_info([[
  - Rail signals and train stations now allowed on ore.
 ]])
 
+ScenarioInfo.add_extra_rule({'info.rules_text_danger_ore'})
+
 local map = require 'map_gen.maps.danger_ores.modules.map'
 local main_ores_config = require 'map_gen.maps.danger_ores.config.vanilla_ores_landfill'
 local resource_patches = require 'map_gen.maps.danger_ores.modules.resource_patches'

map_gen/maps/danger_ores/presets/danger_ore_landfill_beltboxes_ore_only.lua

@@ -51,6 +51,8 @@ ScenarioInfo.set_new_info([[
  - Rail signals and train stations now allowed on ore.
 ]])
 
+ScenarioInfo.add_extra_rule({'info.rules_text_danger_ore'})
+
 global.config.redmew_qol.loaders = false
 
 local map = require 'map_gen.maps.danger_ores.modules.map'

map_gen/maps/danger_ores/presets/danger_ore_normal_science.lua

@@ -51,6 +51,8 @@ ScenarioInfo.set_new_info([[
  - Rail signals and train stations now allowed on ore.
 ]])
 
+ScenarioInfo.add_extra_rule({'info.rules_text_danger_ore'})
+
 local map = require 'map_gen.maps.danger_ores.modules.map'
 local main_ores_config = require 'map_gen.maps.danger_ores.config.vanilla_ores'
 local resource_patches = require 'map_gen.maps.danger_ores.modules.resource_patches'

map_gen/maps/danger_ores/presets/danger_ore_one_direction.lua

@@ -51,6 +51,8 @@ ScenarioInfo.set_new_info([[
  - Rail signals and train stations now allowed on ore.
 ]])
 
+ScenarioInfo.add_extra_rule({'info.rules_text_danger_ore'})
+
 local map = require 'map_gen.maps.danger_ores.modules.map'
 local main_ores_config = require 'map_gen.maps.danger_ores.config.vanilla_ores_one_direction'
 local resource_patches = require 'map_gen.maps.danger_ores.modules.resource_patches'

map_gen/maps/danger_ores/presets/danger_ore_one_direction_beltboxes.lua

@@ -51,6 +51,8 @@ ScenarioInfo.set_new_info([[
  - Rail signals and train stations now allowed on ore.
 ]])
 
+ScenarioInfo.add_extra_rule({'info.rules_text_danger_ore'})
+
 global.config.redmew_qol.loaders = false
 
 local map = require 'map_gen.maps.danger_ores.modules.map'

map_gen/maps/danger_ores/presets/danger_ore_one_direction_beltboxes_ore_only.lua

@@ -51,6 +51,8 @@ ScenarioInfo.set_new_info([[
  - Rail signals and train stations now allowed on ore.
 ]])
 
+ScenarioInfo.add_extra_rule({'info.rules_text_danger_ore'})
+
 global.config.redmew_qol.loaders = false
 
 local map = require 'map_gen.maps.danger_ores.modules.map'

map_gen/maps/danger_ores/presets/danger_ore_patches.lua

@@ -51,6 +51,8 @@ ScenarioInfo.set_new_info([[
  - Rail signals and train stations now allowed on ore.
 ]])
 
+ScenarioInfo.add_extra_rule({'info.rules_text_danger_ore'})
+
 local map = require 'map_gen.maps.danger_ores.modules.map'
 local main_ores_config = require 'map_gen.maps.danger_ores.config.coal'
 local resource_patches = require 'map_gen.maps.danger_ores.modules.resource_patches'

map_gen/maps/danger_ores/presets/danger_ore_patches_beltboxes_ore_only.lua

@@ -51,6 +51,8 @@ ScenarioInfo.set_new_info([[
  - Rail signals and train stations now allowed on ore.
 ]])
 
+ScenarioInfo.add_extra_rule({'info.rules_text_danger_ore'})
+
 global.config.redmew_qol.loaders = false
 
 local map = require 'map_gen.maps.danger_ores.modules.map'

map_gen/maps/danger_ores/presets/danger_ore_patches_beltboxes_ore_only_restricted.lua

@@ -51,6 +51,8 @@ ScenarioInfo.set_new_info([[
  - Rail signals and train stations now allowed on ore.
 ]])
 
+ScenarioInfo.add_extra_rule({'info.rules_text_danger_ore'})
+
 global.config.redmew_qol.loaders = false
 
 local map = require 'map_gen.maps.danger_ores.modules.map'

map_gen/maps/danger_ores/presets/danger_ore_spiral.lua

@@ -51,6 +51,8 @@ ScenarioInfo.set_new_info([[
  - Rail signals and train stations now allowed on ore.
 ]])
 
+ScenarioInfo.add_extra_rule({'info.rules_text_danger_ore'})
+
 local map = require 'map_gen.maps.danger_ores.modules.map'
 local main_ores_config = require 'map_gen.maps.danger_ores.config.vanilla_ores_landfill'
 local resource_patches = require 'map_gen.maps.danger_ores.modules.resource_patches'

map_gen/maps/danger_ores/presets/danger_ore_spiral_beltboxes_ore_only.lua

@@ -51,6 +51,8 @@ ScenarioInfo.set_new_info([[
  - Rail signals and train stations now allowed on ore.
 ]])
 
+ScenarioInfo.add_extra_rule({'info.rules_text_danger_ore'})
+
 global.config.redmew_qol.loaders = false
 
 local map = require 'map_gen.maps.danger_ores.modules.map'

map_gen/maps/danger_ores/presets/danger_ore_split.lua

@@ -51,6 +51,8 @@ ScenarioInfo.set_new_info([[
  - Rail signals and train stations now allowed on ore.
 ]])
 
+ScenarioInfo.add_extra_rule({'info.rules_text_danger_ore'})
+
 local map = require 'map_gen.maps.danger_ores.modules.map'
 local main_ores_config = require 'map_gen.maps.danger_ores.config.vanilla_ores'
 local resource_patches = require 'map_gen.maps.danger_ores.modules.resource_patches'

map_gen/maps/danger_ores/presets/danger_ore_split_beltboxes_ore_only.lua

@@ -51,6 +51,8 @@ ScenarioInfo.set_new_info([[
  - Rail signals and train stations now allowed on ore.
 ]])
 
+ScenarioInfo.add_extra_rule({'info.rules_text_danger_ore'})
+
 global.config.redmew_qol.loaders = false
 
 local map = require 'map_gen.maps.danger_ores.modules.map'

map_gen/maps/danger_ores/presets/danger_ore_xmas_tree_beltboxes_ore_only.lua

@@ -51,6 +51,8 @@ ScenarioInfo.set_new_info([[
  - Rail signals and train stations now allowed on ore.
 ]])
 
+ScenarioInfo.add_extra_rule({'info.rules_text_danger_ore'})
+
 global.config.redmew_qol.loaders = false
 
 local map = require 'map_gen.maps.danger_ores.modules.map'

map_gen/maps/danger_ores/presets/terraforming_danger_ore.lua

@@ -51,6 +51,8 @@ ScenarioInfo.set_new_info([[
  - Rail signals and train stations now allowed on ore.
 ]])
 
+ScenarioInfo.add_extra_rule({'info.rules_text_danger_ore'})
+
 local map = require 'map_gen.maps.danger_ores.modules.map'
 local main_ores_config = require 'map_gen.maps.danger_ores.config.vanilla_ores'
 local resource_patches = require 'map_gen.maps.danger_ores.modules.resource_patches'