+ UpdateParty event
This commit is contained in:
@@ -29,6 +29,11 @@ pub struct Items {
|
||||
pub value: photon_messages::Items,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq)]
|
||||
pub struct Party {
|
||||
pub player_names: Vec<String>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq)]
|
||||
pub enum Event {
|
||||
MainPlayerAppeared(Player),
|
||||
@@ -40,4 +45,5 @@ pub enum Event {
|
||||
LeaveCombat(Player),
|
||||
UpdateFame(Fame),
|
||||
UpdateItems(Items),
|
||||
UpdateParty(Party),
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ pub mod convert;
|
||||
pub mod world;
|
||||
pub mod id_cache;
|
||||
|
||||
mod party;
|
||||
mod unconsumed_messages;
|
||||
mod player;
|
||||
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
use crate::photon_messages::messages;
|
||||
|
||||
use super::events;
|
||||
|
||||
use log::*;
|
||||
|
||||
#[derive(Debug, PartialEq, Default)]
|
||||
struct Item {
|
||||
name: String,
|
||||
id: u32,
|
||||
}
|
||||
|
||||
#[derive(Debug, PartialEq, Default)]
|
||||
pub struct Party {
|
||||
main_player_name: Option<String>,
|
||||
items: Vec<Item>,
|
||||
}
|
||||
|
||||
impl Party {
|
||||
pub fn set_main_player_name(&mut self, name: &str) {
|
||||
self.main_player_name = Some(name.to_owned());
|
||||
}
|
||||
|
||||
pub fn player_left(&mut self, left: messages::PartyPlayerLeft) -> Option<events::Event> {
|
||||
let main_player_name = self.main_player_name.as_ref()?;
|
||||
let party_item = self.items.iter().find(|i| i.id == into_id(&left.party_structure))?;
|
||||
if &party_item.name == main_player_name {
|
||||
return self.disbanded();
|
||||
}
|
||||
|
||||
let index = self.items.iter().position(|i| i.id == into_id(&left.party_structure))?;
|
||||
self.items.remove(index);
|
||||
|
||||
self.game_event()
|
||||
}
|
||||
|
||||
pub fn single_player_joined(&mut self, joined: messages::PartyPlayerJoined) -> Option<events::Event> {
|
||||
self.items.push(Item{name: joined.name.clone(), id: into_id(&joined.party_structure)});
|
||||
|
||||
self.game_event()
|
||||
}
|
||||
|
||||
pub fn joined(&mut self, joined: messages::PartyJoined) -> Option<events::Event> {
|
||||
let structures_and_names = joined
|
||||
.party_structures
|
||||
.iter()
|
||||
.zip(joined.character_names.iter());
|
||||
|
||||
self.items = structures_and_names
|
||||
.map(|(structure, name)| Item {
|
||||
name: name.clone(),
|
||||
id: into_id(&structure),
|
||||
})
|
||||
.collect();
|
||||
|
||||
self.game_event()
|
||||
}
|
||||
|
||||
pub fn disbanded(&mut self) -> Option<events::Event> {
|
||||
self.items = vec![];
|
||||
self.game_event()
|
||||
}
|
||||
|
||||
fn game_event(&self) -> Option<events::Event> {
|
||||
let names : Vec<String> = self.items.iter().map(|i| i.name.clone()).collect();
|
||||
let evt = Some(events::Event::UpdateParty(events::Party{player_names: names}));
|
||||
|
||||
info!("Party changed: {:?}", evt);
|
||||
evt
|
||||
}
|
||||
}
|
||||
|
||||
fn into_id(party_structure: &[u32]) -> u32 {
|
||||
party_structure.into_iter().fold(0, |acc, x| acc + x)
|
||||
}
|
||||
@@ -10,6 +10,7 @@ use super::events;
|
||||
use super::convert;
|
||||
use super::convert::EventList;
|
||||
use super::id_cache;
|
||||
use super::party::{Party};
|
||||
use super::player::{StaticId, DynamicId};
|
||||
use super::unconsumed_messages::UnconsumedMessages;
|
||||
|
||||
@@ -18,6 +19,7 @@ pub struct World {
|
||||
cache: id_cache::IdCache,
|
||||
unconsumed_messages: UnconsumedMessages,
|
||||
main_player_id: Option<StaticId>,
|
||||
party: Party
|
||||
}
|
||||
|
||||
impl World {
|
||||
@@ -60,7 +62,7 @@ impl World {
|
||||
if self.main_player_id.is_none() {
|
||||
result.push(events::Event::ZoneChange)
|
||||
}
|
||||
|
||||
self.party.set_main_player_name(&msg.character_name);
|
||||
result.push(self.get_intermediate(static_id, msg)?.into());
|
||||
|
||||
|
||||
@@ -107,7 +109,53 @@ impl World {
|
||||
self.unconsumed_messages.add(
|
||||
photon_messages::messages::Message::CharacterEquipmentChanged(msg), id);
|
||||
None
|
||||
}
|
||||
},
|
||||
photon_messages::Message::PartyInvitation(_) => {
|
||||
None
|
||||
},
|
||||
photon_messages::Message::PartyJoined(msg) => {
|
||||
let evt = self.party.joined(msg)?;
|
||||
Some(vec![evt])
|
||||
},
|
||||
photon_messages::Message::PartyDisbanded(_) => {
|
||||
let evt = self.party.disbanded()?;
|
||||
Some(vec![evt])
|
||||
},
|
||||
photon_messages::Message::PartyPlayerJoined(msg) => {
|
||||
let evt = self.party.single_player_joined(msg)?;
|
||||
Some(vec![evt])
|
||||
},
|
||||
photon_messages::Message::PartyChangedOrder(_) => {
|
||||
None
|
||||
},
|
||||
photon_messages::Message::PartyPlayerLeft(msg) => {
|
||||
let evt = self.party.player_left(msg)?;
|
||||
Some(vec![evt])
|
||||
},
|
||||
photon_messages::Message::PartyLeaderChanged(_) => {
|
||||
None
|
||||
},
|
||||
photon_messages::Message::PartyLootSettingChangedPlayer(_) => {
|
||||
None
|
||||
},
|
||||
photon_messages::Message::PartySilverGained(_) => {
|
||||
None
|
||||
},
|
||||
photon_messages::Message::PartyPlayerUpdated(_) => {
|
||||
None
|
||||
},
|
||||
photon_messages::Message::PartyInvitationPlayerBusy(_) => {
|
||||
None
|
||||
},
|
||||
photon_messages::Message::PartyMarkedObjectsUpdated(_) => {
|
||||
None
|
||||
},
|
||||
photon_messages::Message::PartyOnClusterPartyJoined(_) => {
|
||||
None
|
||||
},
|
||||
photon_messages::Message::PartySetRoleFlag(_) => {
|
||||
None
|
||||
},
|
||||
}
|
||||
}
|
||||
fn assign_dynamic_id(&mut self, id: DynamicId, name: &str) {
|
||||
|
||||
Reference in New Issue
Block a user