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

Add minimal robot factory functionality and arc archive support for #6

Browse Source
This commit is contained in:
NG (Graham)
2025-05-17 23:06:07 -04:00
parent 3f0c30f6c3
commit 3f1438c068
34 changed files with 869 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@ use serde::{Serialize, Deserialize};
use polariton::operation::{Typed, Dict};
use polariton::serdes::TypePrefix;
use super::super::{MovementCategoryData, MovementData, Cube, ItemCategory, ItemTier, BattleConfig, Settings, ChatConfig};
use super::super::{MovementCategoryData, MovementData, Cube, ItemCategory, ItemTier, BattleConfig, Settings, ChatConfig, FactoryConfig};
const CUBE_CONFIG_FILENAME: &str = "config.json";
@@ -16,6 +16,7 @@ pub struct CubeConfig {
lerp_value: f32,
battle: BattleConfig,
chat: ChatConfig,
factory: FactoryConfig,
settings: Settings,
}
@@ -28,6 +29,7 @@ impl CubeConfig {
}
}
#[async_trait::async_trait]
impl <C: Clone> super::ConfigProvider<C> for CubeConfig {
fn cube_list(&self) -> Typed<C> {
Typed::Dict(Dict {
@@ -271,4 +273,8 @@ impl <C: Clone> super::ConfigProvider<C> for CubeConfig {
}).collect(),
}
}
async fn factory(&self) -> Result<crate::factory::Factory, Box<dyn std::error::Error + 'static>> {
crate::factory::Factory::from_config(&self.factory).await
}
}

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

@@ -1,5 +1,6 @@
use polariton::operation::Typed;
#[async_trait::async_trait]
pub trait ConfigProvider<C: Clone> {
fn cube_list(&self) -> Typed<C>;
fn movement_list(&self) -> Typed<C>;
@@ -20,6 +21,7 @@ pub trait ConfigProvider<C: Clone> {
fn public_channels(&self) -> Typed<C>;
fn server_config(&self) -> ServerConfig;
fn garage_upgrades(&self) -> GarageUpgrades;
async fn factory(&self) -> Result<crate::factory::Factory, Box<dyn std::error::Error + 'static>>;
}
pub struct CompleteCampaignProvider {