Remove num_cars & num_scripts

VirxEC · VirxEC · commit c5ce2026fb82 · 2024-10-10T14:24:39.000-04:00
diff --git a/tests/default.toml b/tests/default.toml
@@ -7,10 +7,6 @@ launcher = "steam"
 auto_start_bots = true
 
 [match]
-# Number of bots/players which will be spawned.
-num_cars = 0
-# Number of scripts which will be spawned.
-num_scripts = 0
 # What game mode the game should load.
 # Accepted values are "Soccer", "Hoops", "Dropshot", "Hockey", "Rumble", "Heatseeker", "Gridiron", "Knockout"
 game_mode = "Soccer"
diff --git a/tests/gamemodes/beach_ball.toml b/tests/gamemodes/beach_ball.toml
@@ -1,5 +1,4 @@
 [match]
-num_cars = 1
 game_mode = "Soccer"
 # Map set currently unknown
 game_map_upk = "Stadium_P"
diff --git a/tests/gamemodes/boomer_ball.toml b/tests/gamemodes/boomer_ball.toml
@@ -1,5 +1,4 @@
 [match]
-num_cars = 1
 game_mode = "Soccer"
 
 [mutators]
diff --git a/tests/gamemodes/default.toml b/tests/gamemodes/default.toml
@@ -1,6 +1,5 @@
 
 [match]
-num_cars = 1
 # What game mode the game should load.
 # Accepted values are "Soccer", "Hoops", "Dropshot", "Hockey", "Rumble", "Heatseeker", "Gridiron", "Knockout"
 game_mode = "Soccer"
diff --git a/tests/gamemodes/dropshot.toml b/tests/gamemodes/dropshot.toml
@@ -1,5 +1,4 @@
 [match]
-num_cars = 1
 game_mode = "Dropshot"
 game_map_upk = "ShatterShot_P"
 
diff --git a/tests/gamemodes/dropshot_rumble.toml b/tests/gamemodes/dropshot_rumble.toml
@@ -1,5 +1,4 @@
 [match]
-num_cars = 1
 game_mode = "Dropshot"
 game_map_upk = "ShatterShot_P"
 
diff --git a/tests/gamemodes/gforce_frenzy.toml b/tests/gamemodes/gforce_frenzy.toml
@@ -1,6 +1,5 @@
 
 [match]
-num_cars = 1
 game_mode = "Soccer"
 
 [mutators]
diff --git a/tests/gamemodes/ghost_hunt.toml b/tests/gamemodes/ghost_hunt.toml
@@ -1,5 +1,4 @@
 [match]
-num_cars = 1
 game_mode = "Soccer"
 game_map_upk = "Haunted_TrainStation_P"
 
diff --git a/tests/gamemodes/gotham_city_rumble.toml b/tests/gamemodes/gotham_city_rumble.toml
@@ -1,5 +1,4 @@
 [match]
-num_cars = 1
 game_mode = "Soccer"
 game_map_upk = "Park_Bman_P"
 
diff --git a/tests/gamemodes/gridiron.toml b/tests/gamemodes/gridiron.toml
@@ -1,5 +1,4 @@
 [match]
-num_cars = 1
 game_mode = "Gridiron"
 game_map_upk = "BB_P"
 
diff --git a/tests/gamemodes/haunted_heatseeker_2.toml b/tests/gamemodes/haunted_heatseeker_2.toml
@@ -1,5 +1,4 @@
 [match]
-num_cars = 1
 game_mode = "Heatseeker"
 game_map_upk = "Farm_HW_P"
 
diff --git a/tests/gamemodes/haunted_heatseeker_3.toml b/tests/gamemodes/haunted_heatseeker_3.toml
@@ -1,5 +1,4 @@
 [match]
-num_cars = 1
 game_mode = "Heatseeker"
 game_map_upk = "Trainstation_Spooky_P"
 
diff --git a/tests/gamemodes/heatseeker.toml b/tests/gamemodes/heatseeker.toml
@@ -1,5 +1,4 @@
 [match]
-num_cars = 1
 game_mode = "Heatseeker"
 
 [[cars]]
diff --git a/tests/gamemodes/heatseeker_ricochet.toml b/tests/gamemodes/heatseeker_ricochet.toml
@@ -1,5 +1,4 @@
 [match]
-num_cars = 1
 game_mode = "Heatseeker"
 # Hourglass - "Labs_PillarGlass_P"
 # Barricade - "Labs_PillarHeat_P"
diff --git a/tests/gamemodes/hoops.toml b/tests/gamemodes/hoops.toml
@@ -1,5 +1,4 @@
 [match]
-num_cars = 1
 game_mode = "Hoops"
 # DunkHouse - "HoopsStadium_P"
 # TheBlock - "HoopsStreet_P"
diff --git a/tests/gamemodes/knockout.toml b/tests/gamemodes/knockout.toml
@@ -1,5 +1,4 @@
 [match]
-num_cars = 1
 game_mode = "Knockout"
 # Quadron - "KO_Quadron_P"
 # Calavera - "KO_Calavera_P"
diff --git a/tests/gamemodes/labs.toml b/tests/gamemodes/labs.toml
@@ -1,5 +1,4 @@
 [match]
-num_cars = 1
 # Pillars - "Labs_CirclePillars_P"
 # Cosmic - "Labs_Cosmic_V4_P"
 # DoubleGoal - "Labs_DoubleGoal_V2_P"
diff --git a/tests/gamemodes/nike_fc_showdown.toml b/tests/gamemodes/nike_fc_showdown.toml
@@ -1,6 +1,5 @@
 
 [match]
-num_cars = 1
 game_mode = "Soccer"
 game_map_upk = "swoosh_p"
 
diff --git a/tests/gamemodes/rumble.toml b/tests/gamemodes/rumble.toml
@@ -1,5 +1,4 @@
 [match]
-num_cars = 1
 game_mode = "Rumble"
 
 [[cars]]
diff --git a/tests/gamemodes/snowday.toml b/tests/gamemodes/snowday.toml
@@ -1,5 +1,4 @@
 [match]
-num_cars = 1
 game_mode = "Snowday"
 # DFHStadium (Snowy) - "Stadium_Winter_P"
 # Mannfield (Snowy) - "Park_Winter_P"
diff --git a/tests/gamemodes/speed_demon.toml b/tests/gamemodes/speed_demon.toml
@@ -1,5 +1,4 @@
 [match]
-num_cars = 1
 game_mode = "Soccer"
 
 [mutators]
diff --git a/tests/gamemodes/spike_rush.toml b/tests/gamemodes/spike_rush.toml
@@ -1,5 +1,4 @@
 [match]
-num_cars = 1
 game_mode = "Soccer"
 game_map_upk = "ThrowbackStadium_P"
 
diff --git a/tests/gamemodes/spooky_cube.toml b/tests/gamemodes/spooky_cube.toml
@@ -1,5 +1,4 @@
 [match]
-num_cars = 1
 game_mode = "Soccer"
 game_map_upk = "Farm_HW_P"
 
diff --git a/tests/gamemodes/spring_loaded.toml b/tests/gamemodes/spring_loaded.toml
@@ -1,5 +1,4 @@
 [match]
-num_cars = 1
 
 [mutators]
 rumble = "Spring_Loaded"
diff --git a/tests/gamemodes/super_cube.toml b/tests/gamemodes/super_cube.toml
@@ -1,5 +1,4 @@
 [match]
-num_cars = 1
 game_mode = "Soccer"
 
 [mutators]
diff --git a/tests/gamemodes/tactical_rumble.toml b/tests/gamemodes/tactical_rumble.toml
@@ -1,5 +1,4 @@
 [match]
-num_cars = 1
 game_mode = "Rumble"
 
 [mutators]
diff --git a/tests/gamemodes/winter_breakaway.toml b/tests/gamemodes/winter_breakaway.toml
@@ -1,5 +1,4 @@
 [match]
-num_cars = 1
 game_mode = "Hockey"
 game_map_upk = "ThrowbackHockey_p"
 
diff --git a/tests/heatseeker.toml b/tests/heatseeker.toml
@@ -2,7 +2,6 @@
 launcher = "steam"
 
 [match]
-num_cars = 1
 game_mode = "Heatseeker"
 game_map_upk = "Stadium_P"
 enable_rendering = true
diff --git a/tests/hivemind.toml b/tests/hivemind.toml
@@ -3,7 +3,6 @@ launcher = "steam"
 auto_start_bots = true
 
 [match]
-num_cars = 6
 game_mode = "Soccer"
 game_map_upk = "Stadium_P"
 
diff --git a/tests/hvn.toml b/tests/hvn.toml
@@ -3,9 +3,9 @@ launcher = "steam"
 auto_start_bots = true
 
 [match]
-num_cars = 2
 game_mode = "Soccer"
 game_map_upk = "Stadium_P"
+enable_state_setting = false
 
 [mutators]
 match_length = "Unlimited"
@@ -15,5 +15,5 @@ type = "human"
 team = 0
 
 [[cars]]
-config = "necto/bot.toml"
+config = "atba/atba.bot.toml"
 team = 1
diff --git a/tests/psy.toml b/tests/psy.toml
@@ -3,7 +3,6 @@ launcher = "steam"
 auto_start_bots = true
 
 [match]
-num_cars = 2
 game_mode = "Soccer"
 game_map_upk = "Stadium_P"
 
diff --git a/tests/render_test.toml b/tests/render_test.toml
@@ -2,8 +2,6 @@
 launcher = "steam"
 
 [match]
-num_cars = 1
-num_scripts = 1
 game_mode = "Soccer"
 game_map_upk = "Stadium_P"
 enable_rendering = true
diff --git a/tests/rlbot.toml b/tests/rlbot.toml
@@ -3,8 +3,6 @@ launcher = "steam"
 auto_start_bots = true
 
 [match]
-num_cars = 5
-num_scripts = 0
 game_mode = "Soccer"
 game_map_upk = "Stadium_P"
 skip_replays = false
@@ -26,7 +24,6 @@ rumble = "Spikes_Only"
 boost_strength = "OneAndAHalf"
 respawn_time = "One_Second"
 
-# Only num_cars configs will be used, in the order they are defined
 [[cars]]
 # The location of the configuration file for your agent here
 # The path is always relative to the folder that this file is in
diff --git a/tests/series.toml b/tests/series.toml
@@ -3,7 +3,6 @@ launcher = "steam"
 auto_start_bots = true
 
 [match]
-num_cars = 2
 game_mode = "Soccer"
 game_map_upk = "Stadium_P"
 enable_state_setting = true

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`[match]`
`2`		`-num_cars = 1`
`3`	`2`	`game_mode = "Soccer"`
`4`	`3`	`# Map set currently unknown`
`5`	`4`	`game_map_upk = "Stadium_P"`