This commit is contained in:
parent
5ba61cf461
commit
7e8a3174da
@ -4,7 +4,7 @@ use elseware::common::serverstate::{ClientId, ServerState};
|
||||
use elseware::entity::gateway::EntityGateway;
|
||||
use elseware::entity::account::{UserAccountEntity, NewUserAccountEntity, NewUserSettingsEntity};
|
||||
use elseware::entity::character::{CharacterEntity, NewCharacterEntity};
|
||||
use elseware::entity::item::{Meseta, BankName, BankIdentifier};
|
||||
use elseware::entity::item::{Meseta, BankIdentifier};
|
||||
use elseware::ship::ship::{ShipServerState, RecvShipPacket};
|
||||
use elseware::ship::room::Difficulty;
|
||||
|
||||
@ -16,7 +16,7 @@ use libpso::{utf8_to_array, utf8_to_utf16_array};
|
||||
|
||||
|
||||
//TODO: remove kb_conf_preset
|
||||
pub async fn new_user_character<EG: EntityGateway + Clone>(entity_gateway: &mut EG, username: &str, password: &str, kb_conf_preset: usize) -> (UserAccountEntity, CharacterEntity) {
|
||||
pub async fn new_user_character<EG: EntityGateway + Clone>(entity_gateway: &mut EG, username: &str, password: &str, _kb_conf_preset: usize) -> (UserAccountEntity, CharacterEntity) {
|
||||
let new_user = NewUserAccountEntity {
|
||||
email: format!("{}@pso.com", username),
|
||||
username: username.into(),
|
||||
|
@ -2,7 +2,7 @@ use elseware::common::serverstate::{ClientId, ServerState};
|
||||
use elseware::entity::gateway::{EntityGateway, InMemoryGateway};
|
||||
use elseware::ship::ship::{ShipServerState, RecvShipPacket};
|
||||
|
||||
use libpso::character::settings::{DEFAULT_KEYBOARD_CONFIG1, DEFAULT_KEYBOARD_CONFIG2, DEFAULT_KEYBOARD_CONFIG3, DEFAULT_KEYBOARD_CONFIG4};
|
||||
use libpso::character::settings::{DEFAULT_KEYBOARD_CONFIG1, DEFAULT_KEYBOARD_CONFIG4};
|
||||
use libpso::packet::ship::*;
|
||||
|
||||
#[path = "common.rs"]
|
||||
@ -35,7 +35,7 @@ async fn test_save_options() {
|
||||
async fn test_change_keyboard_mappings() {
|
||||
let mut entity_gateway = InMemoryGateway::default();
|
||||
|
||||
let (user1, char1) = new_user_character(&mut entity_gateway, "a1", "a", 2).await;
|
||||
let (user1, _char1) = new_user_character(&mut entity_gateway, "a1", "a", 2).await;
|
||||
|
||||
let mut ship = Box::new(ShipServerState::builder()
|
||||
.gateway(entity_gateway.clone())
|
||||
|
@ -3,7 +3,6 @@ use elseware::entity::gateway::{EntityGateway, InMemoryGateway};
|
||||
use elseware::common::leveltable::CharacterLevelTable;
|
||||
use elseware::ship::ship::{ShipServerState, SendShipPacket, RecvShipPacket};
|
||||
use elseware::ship::monster::MonsterType;
|
||||
use elseware::ship::location::RoomId;
|
||||
use elseware::ship::map::variant::{MapVariant, MapVariantMode};
|
||||
use elseware::ship::map::maps::Maps;
|
||||
use elseware::ship::map::area::MapArea;
|
||||
|
@ -1,11 +1,7 @@
|
||||
use elseware::common::serverstate::{ClientId, ServerState};
|
||||
use elseware::entity::gateway::{EntityGateway, InMemoryGateway};
|
||||
use elseware::entity::character::SectionID;
|
||||
use elseware::common::leveltable::CharacterLevelTable;
|
||||
use elseware::entity::gateway::InMemoryGateway;
|
||||
use elseware::ship::ship::{ShipServerState, SendShipPacket, RecvShipPacket};
|
||||
use elseware::ship::room::{Episode, Difficulty};
|
||||
use elseware::ship::monster::MonsterType;
|
||||
use elseware::ship::location::RoomId;
|
||||
use elseware::ship::drops::{DropTable, MonsterDropStats, MonsterDropType};
|
||||
use elseware::ship::drops::rare_drop_table::{RareDropTable, RareDropRate, RareDropItem};
|
||||
use elseware::ship::map::{Maps, MapVariant, MapArea, MapVariantMode, MapEnemy};
|
||||
|
@ -2,8 +2,6 @@ use elseware::common::serverstate::{ClientId, ServerState};
|
||||
use elseware::entity::gateway::{EntityGateway, InMemoryGateway};
|
||||
use elseware::entity::item;
|
||||
use elseware::ship::ship::{ShipServerState, RecvShipPacket};
|
||||
use elseware::entity::character::TechLevel;
|
||||
//use elseware::ship::items::{ClientItemId, ActiveItemEntityId, HeldItemType, FloorItemType};
|
||||
|
||||
use libpso::packet::ship::*;
|
||||
use libpso::packet::messages::*;
|
||||
|
@ -1,11 +1,8 @@
|
||||
use elseware::common::serverstate::{ClientId, ServerState};
|
||||
use elseware::entity::gateway::{EntityGateway, InMemoryGateway};
|
||||
use elseware::entity::item;
|
||||
use elseware::ship::ship::{ShipServerState, RecvShipPacket, SendShipPacket};
|
||||
use elseware::ship::location::RoomId;
|
||||
|
||||
use libpso::packet::ship::*;
|
||||
//use libpso::packet::messages::*;
|
||||
|
||||
#[path = "common.rs"]
|
||||
mod common;
|
||||
|
@ -1,7 +1,7 @@
|
||||
use elseware::common::serverstate::{ClientId, ServerState};
|
||||
use elseware::entity::gateway::{EntityGateway, InMemoryGateway};
|
||||
use elseware::entity::item;
|
||||
use elseware::ship::ship::{ShipServerState, RecvShipPacket, SendShipPacket, ShipError};
|
||||
use elseware::ship::ship::{ShipServerState, RecvShipPacket, SendShipPacket};
|
||||
use elseware::ship::room::Difficulty;
|
||||
use elseware::ship::items::state::ItemStateError;
|
||||
|
||||
|
@ -2,7 +2,7 @@ use std::convert::TryInto;
|
||||
use elseware::common::serverstate::{ClientId, ServerState};
|
||||
use elseware::entity::gateway::{EntityGateway, InMemoryGateway};
|
||||
use elseware::entity::item;
|
||||
use elseware::ship::ship::{ShipServerState, RecvShipPacket, SendShipPacket, ShipError};
|
||||
use elseware::ship::ship::{ShipServerState, RecvShipPacket, SendShipPacket};
|
||||
use elseware::entity::item::{Meseta, ItemEntity};
|
||||
use elseware::ship::packet::handler::trade::TradeError;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user