bonkmaykr/ojrc
1
0
Fork 0
mirror of https://git.ngram.ca/OpenJam/rc-servers synced 2026-08-23 23:08:52 +00:00
Code Activity

Get enemies spawning in singleplayer #23

Browse Source
This commit is contained in:
NG (Graham)
2025-05-30 23:03:02 -04:00
parent 1a7400d3d9
commit 50cc0cc3a9
19 changed files with 327 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
rc_core/src/persist/config/cubes_json.rs
View File

@@ -30,7 +30,7 @@ impl CubeConfig {
}
#[async_trait::async_trait]
impl <C: Clone> super::ConfigProvider<C> for CubeConfig {
impl <C: Clone + Send> super::ConfigProvider<C> for CubeConfig {
fn cube_list(&self) -> Typed<C> {
Typed::Dict(Dict {
key_ty: TypePrefix::Str,
@@ -303,4 +303,55 @@ impl <C: Clone> super::ConfigProvider<C> for CubeConfig {
started: chrono::Utc::now().timestamp(),
}
}
fn singleplayer_vehicles(&self) -> Vec<crate::persist::garage::PrefabVehicle> {
// FIXME don't use serializable types in traits
self.battle.singleplayer.vehicles.clone()
}
/*async fn prefab_vehicles(&self, user: &(dyn crate::persist::user::User<C> + Sync), factory: &crate::factory::Factory) -> Typed<C> {
let mut next_id = 0;
let mut id_map = Vec::with_capacity(self.battle.singleplayer.vehicles.len());
let mut debug_str_map = Vec::with_capacity(self.battle.singleplayer.vehicles.len());
for vehicle in self.battle.singleplayer.vehicles.clone().into_iter() {
let current_id = next_id;
let uuid_i64 = crate::persist::user::uuid_sanitize(crate::persist::user::i64_join((i32::MAX as u32, current_id)));
let uuid_str = crate::persist::user::i64_as_uuid_str(uuid_i64);
let prebuilt = match &vehicle.id {
crate::persist::PrefabId::Factory { factory: factory_id } => {
use rc_factory::VehicleFactoryAdapter;
let factory_vehicle = factory.vehicle(*factory_id).await
.expect("Failed to retrieve prefab vehicle from factory") // result
.expect("Prefab vehicle does not exist in factory"); // option
crate::data::robot_data::PrebuiltRobotInfo {
name: vehicle.name.unwrap_or(factory_vehicle.1.name),
class: vehicle.class,
category: "RE_robot_category0".to_owned(),
robot_data: factory_vehicle.0.cube_data,
colour_data: factory_vehicle.0.colour_data,
}
},
crate::persist::PrefabId::Database { garage } => {
let db_vehicle = user.garage_by_id(*garage).await
.expect("Prefab vehicle does not exist in main garage database");
crate::data::robot_data::PrebuiltRobotInfo {
name: vehicle.name.unwrap_or(db_vehicle.name.expect("Prefab vehicle name is required")),
class: vehicle.class,
category: "RE_robot_category0".to_owned(),
robot_data: db_vehicle.robot_data,
colour_data: db_vehicle.colour_data,
}
},
};
debug_str_map.push(format!("`{}` -> `{}`", uuid_str, prebuilt.name));
id_map.push((Typed::Str(uuid_str.into()), prebuilt.as_transmissible()));
next_id += 1;
}
log::debug!("Prefab mapping generated `<uuid>` -> `<name>`:\n\t{}", debug_str_map.join("\n\t"));
Typed::Dict(Dict {
key_ty: TypePrefix::Str, // str
val_ty: TypePrefix::HashMap, // hashmap
items: id_map,
})
}*/
}

2
rc_core/src/persist/config/traits.rs
View File

@@ -25,6 +25,8 @@ pub trait ConfigProvider<C: Clone> {
fn cubes(&self) -> &'_ std::collections::HashMap<String, crate::persist::Cube>;
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>;
}
pub struct CompleteCampaignProvider {