Browse Source

players can write and save their own infoboards

pbs
Andy Newjack 5 years ago
parent
commit
a55d3694d9
  1. 25
      src/entity/character.rs
  2. 11
      src/ship/character.rs
  3. 16
      src/ship/ship.rs

25
src/entity/character.rs

@ -2,7 +2,7 @@ use std::convert::{From, Into, TryFrom, TryInto};
use std::collections::HashMap; use std::collections::HashMap;
use libpso::character::character; use libpso::character::character;
use libpso::packet::ship::{UpdateConfig};
use libpso::packet::ship::{UpdateConfig, WriteInfoboard};
#[derive(Copy, Clone, Hash, PartialEq, Eq)] #[derive(Copy, Clone, Hash, PartialEq, Eq)]
pub enum CharacterClass { pub enum CharacterClass {
@ -224,6 +224,27 @@ impl CharacterConfig {
} }
} }
#[derive(Clone)]
pub struct CharacterInfoboard {
board: [u16; 172],
}
impl CharacterInfoboard {
fn new() -> CharacterInfoboard {
CharacterInfoboard {
board: [0; 172]
}
}
pub fn as_bytes(&mut self) -> [u16; 172] {
self.board
}
pub fn update_infoboard(&mut self, new_board: &WriteInfoboard) {
self.board = libpso::utf8_to_utf16_array!(new_board.message, 172);
}
}
#[derive(Clone)] #[derive(Clone)]
pub struct Character { pub struct Character {
@ -240,6 +261,7 @@ pub struct Character {
pub appearance: CharacterAppearance, pub appearance: CharacterAppearance,
pub techs: CharacterTechniques, pub techs: CharacterTechniques,
pub config: CharacterConfig, pub config: CharacterConfig,
pub info_board: CharacterInfoboard,
} }
impl std::default::Default for Character { impl std::default::Default for Character {
@ -255,6 +277,7 @@ impl std::default::Default for Character {
appearance: CharacterAppearance::default(), appearance: CharacterAppearance::default(),
techs: CharacterTechniques::new(), techs: CharacterTechniques::new(),
config: CharacterConfig::new(), config: CharacterConfig::new(),
info_board: CharacterInfoboard::new(),
} }
} }
} }

11
src/ship/character.rs

@ -82,6 +82,7 @@ pub struct FullCharacterBytesBuilder<'a> {
inventory: Option<&'a Inventory>, inventory: Option<&'a Inventory>,
key_config: Option<&'a [u8; 0x16C]>, key_config: Option<&'a [u8; 0x16C]>,
joystick_config: Option<&'a [u8; 0x38]>, joystick_config: Option<&'a [u8; 0x38]>,
info_board: Option<&'a [u16; 172]>,
} }
@ -94,6 +95,7 @@ impl<'a> FullCharacterBytesBuilder<'a> {
inventory: None, inventory: None,
key_config: None, key_config: None,
joystick_config: None, joystick_config: None,
info_board: None,
} }
} }
@ -139,6 +141,13 @@ impl<'a> FullCharacterBytesBuilder<'a> {
} }
} }
pub fn info_board(self, info_board: &'a [u16; 172]) -> FullCharacterBytesBuilder<'a> {
FullCharacterBytesBuilder {
info_board: Some(info_board),
..self
}
}
pub fn build(self) -> character::FullCharacter { pub fn build(self) -> character::FullCharacter {
let character = self.character.unwrap(); let character = self.character.unwrap();
let stats = self.stats.unwrap(); let stats = self.stats.unwrap();
@ -146,6 +155,7 @@ impl<'a> FullCharacterBytesBuilder<'a> {
let inventory = self.inventory.unwrap(); let inventory = self.inventory.unwrap();
let key_config = self.key_config.unwrap(); let key_config = self.key_config.unwrap();
let joystick_config = self.joystick_config.unwrap(); let joystick_config = self.joystick_config.unwrap();
let info_board = self.info_board.unwrap();
character::FullCharacter { character::FullCharacter {
character: CharacterBytesBuilder::new() character: CharacterBytesBuilder::new()
@ -163,6 +173,7 @@ impl<'a> FullCharacterBytesBuilder<'a> {
joystick_config: *joystick_config, joystick_config: *joystick_config,
..character::KeyTeamConfig::default() ..character::KeyTeamConfig::default()
}, },
info_board: *info_board,
..character::FullCharacter::default() ..character::FullCharacter::default()
} }
} }

16
src/ship/ship.rs

@ -44,6 +44,7 @@ pub enum RecvShipPacket {
CreateRoom(CreateRoom), CreateRoom(CreateRoom),
RoomNameRequest(RoomNameRequest), RoomNameRequest(RoomNameRequest),
UpdateConfig(UpdateConfig), UpdateConfig(UpdateConfig),
WriteInfoboard(WriteInfoboard),
} }
impl RecvServerPacket for RecvShipPacket { impl RecvServerPacket for RecvShipPacket {
@ -58,6 +59,7 @@ impl RecvServerPacket for RecvShipPacket {
0xC1 => Ok(RecvShipPacket::CreateRoom(CreateRoom::from_bytes(data)?)), 0xC1 => Ok(RecvShipPacket::CreateRoom(CreateRoom::from_bytes(data)?)),
0x8A => Ok(RecvShipPacket::RoomNameRequest(RoomNameRequest::from_bytes(data)?)), 0x8A => Ok(RecvShipPacket::RoomNameRequest(RoomNameRequest::from_bytes(data)?)),
0x7ED => Ok(RecvShipPacket::UpdateConfig(UpdateConfig::from_bytes(data)?)), 0x7ED => Ok(RecvShipPacket::UpdateConfig(UpdateConfig::from_bytes(data)?)),
0xD9 => Ok(RecvShipPacket::WriteInfoboard(WriteInfoboard::from_bytes(data)?)),
_ => Err(PacketParseError::WrongPacketForServerType(u16::from_le_bytes([data[2], data[3]]), data.to_vec())) _ => Err(PacketParseError::WrongPacketForServerType(u16::from_le_bytes([data[2], data[3]]), data.to_vec()))
} }
} }
@ -197,12 +199,13 @@ impl<EG: EntityGateway> ShipServerState<EG> {
let (level, stats) = self.level_table.get_stats_from_exp(client.character.char_class, client.character.exp); let (level, stats) = self.level_table.get_stats_from_exp(client.character.char_class, client.character.exp);
let fc = FullCharacterBytesBuilder::new() let fc = FullCharacterBytesBuilder::new()
.character(&client.character)
.character(&client.character.clone())
.stats(&stats) .stats(&stats)
.level(level) .level(level)
.inventory(&client.inventory) .inventory(&client.inventory)
.key_config(&client.settings.settings.key_config) .key_config(&client.settings.settings.key_config)
.joystick_config(&client.settings.settings.joystick_config) .joystick_config(&client.settings.settings.joystick_config)
.info_board(&client.character.info_board.as_bytes())
.build(); .build();
Ok(vec![ Ok(vec![
@ -407,6 +410,13 @@ impl<EG: EntityGateway> ShipServerState<EG> {
self.entity_gateway.set_character(&client.character); self.entity_gateway.set_character(&client.character);
Box::new(None.into_iter()) Box::new(None.into_iter())
} }
fn write_infoboard(&mut self, id: ClientId, new_infoboard: &WriteInfoboard) -> Box<dyn Iterator<Item = (ClientId, SendShipPacket)> + Send> {
let client = self.clients.get_mut(&id).ok_or(ShipError::ClientNotFound(id)).unwrap();
client.character.info_board.update_infoboard(new_infoboard);
self.entity_gateway.set_character(&client.character);
Box::new(None.into_iter())
}
} }
@ -463,6 +473,10 @@ impl<EG: EntityGateway> ServerState for ShipServerState<EG> {
RecvShipPacket::UpdateConfig(pkt) => { RecvShipPacket::UpdateConfig(pkt) => {
self.update_config(id, pkt) self.update_config(id, pkt)
}, },
RecvShipPacket::WriteInfoboard(pkt) => {
self.write_infoboard(id, pkt)
},
}) })
} }

Loading…
Cancel
Save