Remove schematic upgrades and module and ship levels

bin/test/data/config/modules.toml

@@ -3,136 +3,126 @@ id = "armor_plate"
 unlock_at_station_level = -1
 surface_mask = ["OO"]
 materials = [{item = "iron_ingot", amount = 2}]
-player_production_level = 1
 production_time_seconds = 3
 fill_color = "#808080"
 glyph = "A"
 
 [module.health]
-multiplied_hp_formula = "1.5"
+multiplied_hp = 1.5
 
 [[module]]
 id = "sensor_booster"
 unlock_at_station_level = -1
 surface_mask = ["O"]
 materials = [{item = "circuit_board", amount = 1}]
-player_production_level = 1
 production_time_seconds = 2
 fill_color = "#40A0FF"
 glyph = "S"
 
 [module.sensor]
-added_sensor_range_m_formula = "100"
+added_sensor_range_m = 100
 
 [[module]]
 id = "weapon_upgrade"
 unlock_at_station_level = -1
 surface_mask = ["O"]
 materials = [{item = "iron_ingot", amount = 1}, {item = "circuit_board", amount = 1}]
-player_production_level = 1
 production_time_seconds = 4
 fill_color = "#FF4040"
 glyph = "W"
 
 [module.weapon]
-multiplied_damage_formula = "1.2"
+multiplied_damage = 1.2
 
 [[module]]
 id = "laser_cannon"
 unlock_at_station_level = -1
 surface_mask = ["O"]
 materials = [{item = "iron_ingot", amount = 1}]
-player_production_level = 1
 production_time_seconds = 5
 fill_color = "#FF8040"
 glyph = "L"
 
 [module.weapon]
-damage_formula = "2"
-attack_range_m_formula = "50"
-attack_rate_hz_formula = "2.0"
+damage = 2
+attack_range_m = 50
+attack_rate_hz = 2.0
 
 [[module]]
 id = "salvager"
 unlock_at_station_level = -1
 surface_mask = ["OO"]
 materials = [{item = "iron_ingot", amount = 2}]
-player_production_level = 1
 production_time_seconds = 5
 fill_color = "#AACC44"
 glyph = "Sv"
 
 [module.salvage]
-collection_range_m_formula = "500"
-cargo_capacity_formula = "10"
-collection_rate_hz_formula = "0.5"
+collection_range_m = 500
+cargo_capacity = 10
+collection_rate_hz = 0.5
 
 [[module]]
 id = "repair_tool"
 unlock_at_station_level = -1
 surface_mask = ["O"]
 materials = [{item = "circuit_board", amount = 2}]
-player_production_level = 1
 production_time_seconds = 5
 fill_color = "#66CCFF"
 glyph = "Rp"
 
 [module.repair]
-repair_rate_hz_formula = "1"
-repair_amount_hp_formula = "5 + x"
-repair_range_m_formula = "800"
+repair_rate_hz = 1
+repair_amount_hp = 6
+repair_range_m = 800
 
 [[module]]
 id = "weapon_primer"
 unlock_at_station_level = -1
 surface_mask = ["O"]
 materials = [{item = "iron_ingot", amount = 1}]
-player_production_level = 1
 production_time_seconds = 4
 fill_color = "#FF4040"
 glyph = "Wp"
 
 [module.weapon]
-multiplied_attack_rate_hz_formula = "1.2"
+multiplied_attack_rate_hz = 1.2
 
 [[module]]
 id = "weapon_stabilizer"
 unlock_at_station_level = -1
 surface_mask = ["O"]
 materials = [{item = "iron_ingot", amount = 1}]
-player_production_level = 1
 production_time_seconds = 4
 fill_color = "#FF4040"
 glyph = "Ws"
 
 [module.weapon]
-multiplied_attack_range_m_formula = "1.5"
-multiplied_attack_rate_hz_formula = "0.8"
+multiplied_attack_range_m = 1.5
+multiplied_attack_rate_hz = 0.8
 
 [[module]]
 id = "afterburner"
 unlock_at_station_level = -1
 surface_mask = ["O"]
 materials = [{item = "iron_ingot", amount = 1}]
-player_production_level = 1
 production_time_seconds = 2
 fill_color = "#40A0FF"
 glyph = "Ab"
 
 [module.movement]
-multiplied_speed_mps_formula = "1.6"
-added_main_acceleration_mpss_formula = "60"
+multiplied_speed_mps = 1.6
+added_main_acceleration_mpss = 60
 
 [[module]]
 id = "maneuvering_thrusters"
 unlock_at_station_level = -1
 surface_mask = ["O"]
 materials = [{item = "iron_ingot", amount = 1}]
-player_production_level = 1
 production_time_seconds = 2
 fill_color = "#40A0FF"
 glyph = "Mt"
 
 [module.movement]
-multiplied_speed_mps_formula = "1.2"
-added_maneuvering_acceleration_mpss_formula = "10"
+multiplied_speed_mps = 1.2
+added_maneuvering_acceleration_mpss = 10

bin/test/data/config/ships.toml

@@ -6,21 +6,20 @@ default_modules = [{type = "laser_cannon", x = 1, y = 1, rotation = "east"}]
 
 [ship.schematic]
 materials = [{item = "iron_ingot", amount = 3}, {item = "circuit_board", amount = 1}]
-player_production_level = 3
 production_time_seconds = 10
 
 [ship.health]
-hp_formula = "40 + 5*x"
+hp = 45
 
 [ship.movement]
-speed_mps_formula               = "2000 + 50*x"
-main_acceleration_mpss_formula         = "1000000"
-maneuvering_acceleration_mpss_formula  = "1000000"
-angular_acceleration_radpss_formula              = "100000"
-max_rotation_speed_radps_formula  = "100000"
+speed_mps = 2050
+main_acceleration_mpss = 1000000
+maneuvering_acceleration_mpss = 1000000
+angular_acceleration_radpss = 100000
+max_rotation_speed_radps = 100000
 
 [ship.sensor]
-sensor_range_m_formula = "2000"
+sensor_range_m = 2000
 
 
 [[ship]]
@@ -31,21 +30,20 @@ default_modules = [{type = "laser_cannon", x = 1, y = 1, rotation = "east"}]
 
 [ship.schematic]
 materials = [{item = "iron_ingot", amount = 5}, {item = "circuit_board", amount = 2}]
-player_production_level = 5
 production_time_seconds = 20
 
 [ship.health]
-hp_formula = "120 + 15*x"
+hp = 135
 
 [ship.movement]
-speed_mps_formula               = "1200"
-main_acceleration_mpss_formula         = "1000000"
-maneuvering_acceleration_mpss_formula  = "1000000"
-angular_acceleration_radpss_formula              = "100000"
-max_rotation_speed_radps_formula  = "100000"
+speed_mps = 1200
+main_acceleration_mpss = 1000000
+maneuvering_acceleration_mpss = 1000000
+angular_acceleration_radpss = 100000
+max_rotation_speed_radps = 100000
 
 [ship.sensor]
-sensor_range_m_formula = "3000"
+sensor_range_m = 3000
 
 
 [[ship]]
@@ -55,21 +53,20 @@ layout = ["OOO", "OOO"]
 
 [ship.schematic]
 materials = [{item = "iron_ingot", amount = 4}]
-player_production_level = 3
 production_time_seconds = 10
 
 [ship.health]
-hp_formula = "40 + 4*x"
+hp = 44
 
 [ship.movement]
-speed_mps_formula               = "1100"
-main_acceleration_mpss_formula         = "1000000"
-maneuvering_acceleration_mpss_formula  = "1000000"
-angular_acceleration_radpss_formula              = "100000"
-max_rotation_speed_radps_formula  = "100000"
+speed_mps = 1100
+main_acceleration_mpss = 1000000
+maneuvering_acceleration_mpss = 1000000
+angular_acceleration_radpss = 100000
+max_rotation_speed_radps = 100000
 
 [ship.sensor]
-sensor_range_m_formula = "2500"
+sensor_range_m = 2500
 
 
 [[ship]]
@@ -79,18 +76,17 @@ layout = ["XOX", "OOO", "XOX"]
 
 [ship.schematic]
 materials = [{item = "iron_ingot", amount = 4}, {item = "circuit_board", amount = 2}]
-player_production_level = 3
 production_time_seconds = 15
 
 [ship.health]
-hp_formula = "60 + 5*x"
+hp = 65
 
 [ship.movement]
-speed_mps_formula               = "1300"
-main_acceleration_mpss_formula         = "1000000"
-maneuvering_acceleration_mpss_formula  = "1000000"
-angular_acceleration_radpss_formula              = "100000"
-max_rotation_speed_radps_formula  = "100000"
+speed_mps = 1300
+main_acceleration_mpss = 1000000
+maneuvering_acceleration_mpss = 1000000
+angular_acceleration_radpss = 100000
+max_rotation_speed_radps = 100000
 
 [ship.sensor]
-sensor_range_m_formula = "2500"
+sensor_range_m = 2500

bin/test/data/config/world.toml

@@ -36,7 +36,6 @@ artifact_win_count      = 3
 
 [waves]
 threat_rate_formula = "x"
-ship_level_formula = "1 + x / 10"
 gap_min_seconds = 15
 gap_max_seconds = 45
 spawn_duration_seconds = 10