Dead player is no longer in combat
This commit is contained in:
@@ -205,6 +205,23 @@ impl Leave {
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct Died {
|
||||
pub source: usize,
|
||||
pub target: usize,
|
||||
pub target_name: String
|
||||
}
|
||||
|
||||
impl Died {
|
||||
fn encode(val: Parameters) -> Option<Message> {
|
||||
let source = deserialize_number!(val, 0, "Died::source")?;
|
||||
let target = deserialize_number!(val, 1, "Died::target")?;
|
||||
let target_name = deserialize_string!(val, 3, "Died::target_name")?;
|
||||
|
||||
Some(Message::Died(Died{source, target, target_name}))
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub enum Message {
|
||||
Leave(Leave),
|
||||
@@ -212,7 +229,8 @@ pub enum Message {
|
||||
NewCharacter(NewCharacter),
|
||||
HealthUpdate(HealthUpdate),
|
||||
RegenerationHealthChanged(RegenerationHealthChanged),
|
||||
CharacterStats(CharacterStats)
|
||||
CharacterStats(CharacterStats),
|
||||
Died(Died)
|
||||
}
|
||||
|
||||
impl Packet {
|
||||
@@ -223,6 +241,7 @@ impl Packet {
|
||||
24 => NewCharacter::encode(self.parameters),
|
||||
63 => ChatSay::encode(self.parameters),
|
||||
79 => RegenerationHealthChanged::encode(self.parameters),
|
||||
149 => Died::encode(self.parameters),
|
||||
1001 => CharacterStats::encode(self.parameters),
|
||||
_ => None,
|
||||
}
|
||||
|
||||
+4
-1
@@ -122,8 +122,11 @@ fn register_message(meter: &mut meter::Meter, message: &game_protocol::Message)
|
||||
game_protocol::Message::RegenerationHealthChanged(msg) => {
|
||||
match msg.regeneration_rate {
|
||||
Some(_) => meter.register_combat_leave(msg.source).unwrap_or(()),
|
||||
None => meter.register_combat_enter(msg.source).unwrap_or(()), // TODO: handle death
|
||||
None => meter.register_combat_enter(msg.source).unwrap_or(()),
|
||||
}
|
||||
},
|
||||
game_protocol::Message::Died(msg) => {
|
||||
meter.register_combat_leave(msg.source).unwrap_or(())
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user