derive GameEvent parsing

This commit is contained in:
Robin Appelman 2023-03-11 22:39:31 +01:00
commit f5957059d8
10 changed files with 116 additions and 121 deletions

View file

@ -65,13 +65,13 @@ impl GlobalData for ChatMessages {
GameEvent::SayTeam(message) => self.0.push(BareChatMessage {
time,
subject,
message: message.to_string(),
message: message.text.to_string(),
chat_type: ChatType::Team,
}),
GameEvent::Say(message) => self.0.push(BareChatMessage {
time,
subject,
message: message.to_string(),
message: message.text.to_string(),
chat_type: ChatType::All,
}),
_ => {}

View file

@ -52,7 +52,7 @@ impl EventHandler for ClassStatsHandler {
| RawEventType::KillAssist
| RawEventType::Damage
| RawEventType::Spawned
| RawEventType::ChangedRole
| RawEventType::RoleChange
| RawEventType::RoundWin
| RawEventType::RoundStart
)
@ -76,7 +76,7 @@ impl EventHandler for ClassStatsHandler {
GameEvent::RoundWin(_) => {
self.active = false;
}
GameEvent::Kill(kill) if self.active => {
GameEvent::Killed(kill) if self.active => {
if let Ok(target) = kill.target.id() {
let subject_class = self.data.get(&subject).map(|data| data.class);
let target_data = self.data_mut(target);

View file

@ -213,7 +213,7 @@ impl GlobalData for LobbySettingsHandler {
return;
}
if let GameEvent::Say(msg) = event {
if let Err(e) = self.try_handle(msg) {
if let Err(e) = self.try_handle(msg.text) {
*self = LobbySettingsHandler::Err(e)
}
}

View file

@ -65,11 +65,11 @@ impl PlayerSpecificData for MedicStatsBuilder {
matches!(
ty,
RawEventType::ChargeDeployed
| RawEventType::ChargeEnd
| RawEventType::ChargeEnded
| RawEventType::ChargeReady
| RawEventType::UberAdvantageLost
| RawEventType::AdvantageLost
| RawEventType::MedicDeath
| RawEventType::FirstHealAfterSpawn
| RawEventType::FirstHeal
)
}