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 capture points workins #30 (mars 1 only)

Browse Source
This commit is contained in:
NG (Graham)
2025-07-26 21:57:46 -04:00
parent c6bd9e110d
commit a0d6974a31
10 changed files with 451 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -391,14 +391,14 @@ impl <C: Clone + Send> super::ConfigProvider<C> for CubeConfig {
spawns.insert(point.team, list);
}
}
let bases = conf.bases.iter().map(|base| (base.team, super::Sphere {
let bases = conf.bases.iter().map(|base| (base.team, (super::Sphere {
radius: base.radius,
center: super::Point {
x: base.x,
y: base.y,
z: base.z,
},
})).collect();
}, base.percent_per_second))).collect();
let map_conf = super::MapConfig {
spawns,
bases,

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

@@ -347,5 +347,5 @@ pub struct Sphere {
#[derive(Clone, Debug)]
pub struct MapConfig {
pub spawns: std::collections::HashMap<u8, Vec<Point>>, // team -> points
pub bases: std::collections::HashMap<u8, Sphere>, // team -> base
pub bases: std::collections::HashMap<u8, (Sphere, f32)>, // team -> base
}