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 equalizer support and partial fast-charge (dominating) support #32

Browse Source
This commit is contained in:
NG (Graham)
2025-09-07 15:50:56 -04:00
parent 35c6f136f6
commit 4639778eeb
6 changed files with 457 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -418,10 +418,16 @@ impl <C: Clone + Send> super::ConfigProvider<C> for CubeConfig {
z: point.z,
}
}, point.percent_per_second)).collect();
let equalizer = super::Point {
x: conf.equalizer.x,
y: conf.equalizer.y,
z: conf.equalizer.z,
};
let map_conf = super::MapConfig {
spawns,
bases,
capture_points,
equalizer,
};
(map.into_conf(), map_conf)
}).collect()

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

@@ -361,6 +361,7 @@ pub struct MapConfig {
pub spawns: std::collections::HashMap<u8, Vec<Point>>, // team -> points
pub bases: std::collections::HashMap<u8, (Sphere, f32)>, // team -> (base, capture speed)
pub capture_points: Vec<(Sphere, f32)>, // (capture point, capture speed)
pub equalizer: Point,
}
#[derive(Clone, Debug)]
@@ -404,9 +405,13 @@ impl BattleArenaResolver {
base_machine_map: base_data.robot_map,
equalizer_model: equalizer_data.robot_map,
equalizer_health: self.data.equalizer_health as i64,
equalizer_trigger_time_seconds: vec![10, 10, 10, 10, 10], // TODO
equalizer_trigger_time_seconds: if let Some(trigger_time) = self.data.equalizer_trigger_time_s {
vec![trigger_time; 5]
} else {
Vec::default()
},
equalizer_warning_seconds: self.data.equalizer_warning_s as i64, // TODO
equalizer_duration_seconds: vec![20, 20, 20, 20, 20], // TODO
equalizer_duration_seconds: vec![self.data.equalizer_duration_s; 5],
capture_time_seconds_per_player: vec![30, 20, 10, 5, 1], // TODO
num_segments: self.data.num_segments as i32,
heal_escalation_time_seconds: 5, // Unused?