define ship roles via added modules and allow multiple weapons

bin/test/data/config/modules.toml

@@ -34,5 +34,48 @@ threat_cost = 3.0
 fill_color = "#FF4040"
 glyph = "W"
 
-[module.combat]
+[module.weapon]
 multiplied_damage_formula = "1.2"
+
+[[module]]
+id = "laser_cannon"
+surface_mask = ["O"]
+materials = [{item = "iron_ingot", amount = 1}]
+player_production_level = 1
+production_time_seconds = 5
+threat_cost = 5.0
+fill_color = "#FF8040"
+glyph = "L"
+
+[module.weapon]
+damage_formula = "2"
+attack_range_formula = "5"
+attack_rate_formula = "2.0"
+
+[[module]]
+id = "salvage_bay_module"
+surface_mask = ["OO"]
+materials = [{item = "iron_ingot", amount = 2}]
+player_production_level = 1
+production_time_seconds = 5
+threat_cost = 0.0
+fill_color = "#AACC44"
+glyph = "Sv"
+
+[module.salvage]
+collection_range_formula = "50"
+cargo_capacity_formula = "10"
+
+[[module]]
+id = "repair_tool_module"
+surface_mask = ["O"]
+materials = [{item = "circuit_board", amount = 2}]
+player_production_level = 1
+production_time_seconds = 5
+threat_cost = 0.0
+fill_color = "#66CCFF"
+glyph = "Rp"
+
+[module.repair]
+repair_rate_formula = "5 + x"
+repair_range_formula = "80"

bin/test/data/config/ships.toml

@@ -2,6 +2,7 @@
 id = "interceptor"
 available_from_start = true
 layout = ["XOX", "OOO", "XOX"]
+default_modules = [{type = "laser_cannon", x = 1, y = 1, rotation = "east"}]
 
 [ship.schematic]
 materials = [{item = "iron_ingot", amount = 3}, {item = "circuit_board", amount = 1}]
@@ -24,11 +25,6 @@ max_rotation_speed_formula  = "100000"
 [ship.sensor]
 sensor_range_formula = "200"
 
-[ship.combat]
-damage_formula = "10 + 2*x"
-attack_range_formula = "150"
-attack_rate_formula = "2.0"
-
 [ship.loot]
 scrap_drop = 2
 
@@ -37,6 +33,7 @@ scrap_drop = 2
 id = "destroyer"
 available_from_start = true
 layout = ["XOOX", "OOOO", "XOOX"]
+default_modules = [{type = "laser_cannon", x = 1, y = 1, rotation = "east"}]
 
 [ship.schematic]
 materials = [{item = "iron_ingot", amount = 5}, {item = "circuit_board", amount = 2}]
@@ -59,11 +56,6 @@ max_rotation_speed_formula  = "100000"
 [ship.sensor]
 sensor_range_formula = "300"
 
-[ship.combat]
-damage_formula = "12 + 2*x"
-attack_range_formula = "250"
-attack_rate_formula = "1.0"
-
 [ship.loot]
 scrap_drop = 4
 
@@ -94,10 +86,6 @@ max_rotation_speed_formula  = "100000"
 [ship.sensor]
 sensor_range_formula = "250"
 
-[ship.salvage]
-collection_range = 50
-cargo_capacity = 10
-
 [ship.loot]
 scrap_drop = 2
 
@@ -128,9 +116,5 @@ max_rotation_speed_formula  = "100000"
 [ship.sensor]
 sensor_range_formula = "250"
 
-[ship.repair]
-repair_rate_formula = "5 + x"
-repair_range_formula = "80"
-
 [ship.loot]
 scrap_drop = 2