Make enemy and teammate count customizable

rc_core/src/persist/config/cubes_json.rs

@@ -304,9 +304,8 @@ impl <C: Clone + Send> super::ConfigProvider<C> for CubeConfig {
         }
     }
 
-    fn singleplayer_vehicles(&self) -> Vec<crate::persist::garage::PrefabVehicle> {
-        // FIXME don't use serializable types in traits
-        self.battle.singleplayer.vehicles.clone()
+    fn singleplayer_details(&self) -> super::SingleplayerConfig {
+        self.battle.singleplayer.into_singleplayer_conf()
     }
 
     /*async fn prefab_vehicles(&self, user: &(dyn crate::persist::user::User<C> + Sync), factory: &crate::factory::Factory) -> Typed<C> {

rc_core/src/persist/config/mod.rs

@@ -2,7 +2,7 @@ mod cubes_json;
 pub use cubes_json::CubeConfig;
 
 mod traits;
-pub use traits::{ConfigProvider, CompleteCampaignProvider, DevMessageProvider, ServerConfig, GarageUpgrades, GarageUpgradeIncrement, ChatSystemConfig, GameEventSequence, GameEvents, GameRotationStrategy, GameEvent, GameMap, GameVisibility, GameType};
+pub use traits::{ConfigProvider, CompleteCampaignProvider, DevMessageProvider, ServerConfig, GarageUpgrades, GarageUpgradeIncrement, ChatSystemConfig, GameEventSequence, GameEvents, GameRotationStrategy, GameEvent, GameMap, GameVisibility, GameType, SingleplayerConfig, VehicleInfo, VehicleDescriptor};
 
 pub type ConfigImpl = CubeConfig;
 

rc_core/src/persist/config/traits.rs

@@ -26,7 +26,7 @@ pub trait ConfigProvider<C: Clone> {
     fn chat_system_config(&self) -> ChatSystemConfig;
     fn gamemode_events(&self) -> GameEventSequence;
     // FIXME don't use serializable types in traits
-    fn singleplayer_vehicles(&self) -> Vec<crate::persist::garage::PrefabVehicle>;
+    fn singleplayer_details(&self) -> SingleplayerConfig;
 }
 
 pub struct CompleteCampaignProvider {
@@ -259,3 +259,32 @@ pub enum GameType {
     TeamDeathmatch,
     Campaign,
 }
+
+#[derive(Clone, Debug)]
+pub struct SingleplayerConfig {
+    pub max_teammates: u32,
+    pub max_enemies: u32,
+    pub vehicles: Vec<VehicleInfo>,
+}
+
+#[derive(Clone, Debug)]
+pub struct VehicleInfo {
+    pub name: Option<String>,
+    pub username: String,
+    pub id: VehicleDescriptor,
+}
+
+#[derive(Clone, Debug)]
+pub enum VehicleDescriptor {
+    Factory {
+        factory: u32,
+    },
+    Database {
+        garage: u32,
+    },
+    Raw {
+        cube_data: Vec<u8>,
+        colour_data: Vec<u8>,
+    }
+    // TODO File
+}