jake/elseware
1
0
Fork 0
Code Issues 63 Pull Requests 1 Projects Releases Wiki Activity

misc formatting

Browse Source
This commit is contained in:
jake 2020-08-04 19:50:58 -06:00
parent ed1324b811
commit 5637f49364
3 changed files with 56 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/entity/character.rs
View File

@ -63,7 +63,6 @@ impl Into<u8> for CharacterClass {
} }
#[derive(Copy, Clone, Hash, PartialEq, Eq, derive_more::Display)] #[derive(Copy, Clone, Hash, PartialEq, Eq, derive_more::Display)]
pub enum SectionID { pub enum SectionID {
Viridia, Viridia,

16
src/ship/packet/handler/lobby.rs
View File

@ -63,14 +63,14 @@ pub fn send_player_to_lobby(id: ClientId,
} }
pub async fn change_lobby<EG: EntityGateway>(id: ClientId, pub async fn change_lobby<EG: EntityGateway>(id: ClientId,
requested_lobby: u32, requested_lobby: u32,
client_location: &mut ClientLocation, client_location: &mut ClientLocation,
clients: &Clients, clients: &Clients,
item_manager: &mut ItemManager, item_manager: &mut ItemManager,
level_table: &CharacterLevelTable, level_table: &CharacterLevelTable,
ship_rooms: &mut Rooms, ship_rooms: &mut Rooms,
entity_gateway: &mut EG) entity_gateway: &mut EG)
-> Result<Vec<(ClientId, SendShipPacket)>, ShipError> { -> Result<Vec<(ClientId, SendShipPacket)>, ShipError> {
let client = clients.get(&id).ok_or(ShipError::ClientNotFound(id))?; let client = clients.get(&id).ok_or(ShipError::ClientNotFound(id))?;
let prev_area = client_location.get_area(id).map_err(|err| -> ClientLocationError {err.into()})?; let prev_area = client_location.get_area(id).map_err(|err| -> ClientLocationError {err.into()})?;
match prev_area { match prev_area {

59
src/ship/packet/handler/message.rs
View File

@ -175,18 +175,55 @@ pub fn update_player_position(id: ClientId,
.ok_or_else(|| ShipError::InvalidRoom(room_id.0 as u32))?; .ok_or_else(|| ShipError::InvalidRoom(room_id.0 as u32))?;
match &message.msg { match &message.msg {
GameMessage::PlayerChangedMap(p) => {client.x = p.x; client.y = p.y; client.z = p.z;}, GameMessage::PlayerChangedMap(p) => {
GameMessage::PlayerChangedMap2(p) => {client.area = MapArea::from_value(&room.mode.episode(), p.map_area).ok();}, client.x = p.x;
GameMessage::TellOtherPlayerMyLocation(p) => {client.x = p.x; client.y = p.y; client.z = p.z; client.area = MapArea::from_value(&room.mode.episode(), p.map_area).ok();}, client.y = p.y;
GameMessage::PlayerWarpingToFloor(p) => {client.area = MapArea::from_value(&room.mode.episode(), p.area as u16).ok();}, client.z = p.z;
GameMessage::PlayerTeleported(p) => {client.x = p.x; client.y = p.y; client.z = p.z;}, },
GameMessage::PlayerStopped(p) => {client.x = p.x; client.y = p.y; client.z = p.z;}, GameMessage::PlayerChangedMap2(p) => {
GameMessage::PlayerLoadedIn(p) => {client.x = p.x; client.y = p.y; client.z = p.z;}, client.area = room.map_areas.get_area_map(p.map_area).ok().cloned();
GameMessage::PlayerWalking(p) => {client.x = p.x; client.z = p.z;}, },
GameMessage::PlayerRunning(p) => {client.x = p.x; client.z = p.z;}, GameMessage::TellOtherPlayerMyLocation(p) => {
GameMessage::PlayerWarped(p) => {client.x = p.x; client.y = p.y;}, client.x = p.x;
client.y = p.y;
client.z = p.z;
client.area = room.map_areas.get_area_map(p.map_area).ok().cloned();
},
GameMessage::PlayerWarpingToFloor(p) => {
client.area = room.map_areas.get_area_map(p.area as u16).ok().cloned();
},
GameMessage::PlayerTeleported(p) => {
client.x = p.x;
client.y = p.y;
client.z = p.z;
},
GameMessage::PlayerStopped(p) => {
client.x = p.x;
client.y = p.y;
client.z = p.z;
},
GameMessage::PlayerLoadedIn(p) => {
client.x = p.x;
client.y = p.y;
client.z = p.z;
},
GameMessage::PlayerWalking(p) => {
client.x = p.x;
client.z = p.z;
},
GameMessage::PlayerRunning(p) => {
client.x = p.x;
client.z = p.z;
},
GameMessage::PlayerWarped(p) => {
client.x = p.x;
client.y = p.y;
},
// GameMessage::PlayerChangedFloor(p) => {client.area = MapArea::from_value(&room.mode.episode(), p.map).ok();}, // GameMessage::PlayerChangedFloor(p) => {client.area = MapArea::from_value(&room.mode.episode(), p.map).ok();},
GameMessage::InitializeSpeechNpc(p) => {client.x = p.x; client.z = p.z;} GameMessage::InitializeSpeechNpc(p) => {
client.x = p.x;
client.z = p.z;
}
_ => {}, _ => {},
} }
} else {} } else {}