Return loaded RM48U to depot by truck

Co-authored-by: Codex <codex@openai.com>
This commit is contained in:
2026-11-03 00:14:51 +03:00
parent d3378b37a2
commit bb931ab95c
8 changed files with 191 additions and 13 deletions
+6 -1
View File
@@ -1397,6 +1397,8 @@ pub struct Sam {
pub ground_rounds: u32,
/// Pending player request for one delivered ground round.
pub ground_request: bool,
pub ground_return: bool,
pub return_cargo: bool,
/// Separate typed rounds and returned S-400 air rounds held by a depot.
pub ground_stock: u32,
pub air_48n6_stock: u32,
@@ -1487,6 +1489,8 @@ impl Sam {
missiles: spec.missile.as_ref().map_or(0, |m| m.magazine),
ground_rounds: 0,
ground_request: false,
ground_return: false,
return_cargo: false,
ground_stock: 0,
air_48n6_stock: 0,
bursts: spec.gun.as_ref().map_or(0, |g| g.bursts),
@@ -1570,7 +1574,7 @@ impl Sam {
}
match self.kind {
SamKind::Depot => return format!("{text}: {} перезарядок, RM48U {}, снятых ПВО {}", self.cargo, self.ground_stock, self.air_48n6_stock),
SamKind::Tzm => return format!("{text}: на борту {}/2, RM48U {}, снятых ПВО {}{}", self.cargo, self.ground_stock, self.air_48n6_stock, if self.job.is_some() { ", в пути" } else { "" }),
SamKind::Tzm => return format!("{text}: на борту {}/2, RM48U {}, снятых ПВО {}{}", self.cargo, self.ground_stock, self.air_48n6_stock, if self.return_cargo { ", везёт RM48U на склад" } else if self.job.is_some() { ", в пути" } else { "" }),
SamKind::Ew => {
let state = if self.ew_on { "ГЛУШИТ" } else if self.ew_lock { "остывает" } else { "готова" };
return format!("{text}: {state}, нагрев {:.0}%", self.heat * 100.0);
@@ -1600,6 +1604,7 @@ impl Sam {
if let Some(m) = &spec.missile {
if self.kind == SamKind::S400 {
text += &format!(" ПВО {} · RM48U {} / {} ячеек", self.missiles, self.ground_rounds, self.cells());
if self.ground_return { text += " · ожидает вывоза RM48U"; }
} else {
text += &format!(" ракеты {}/{}", self.missiles, m.magazine);
}