Compare commits

...

2 Commits

Author SHA1 Message Date
andy 513ee408f7 more tech testing qol changes 3 years ago
andy 77068a79cf change char class for tech testing 3 years ago
  1. 15
      src/bin/main.rs
  2. 10
      src/ship/map/area.rs
  3. 6
      src/ship/packet/handler/message.rs

15
src/bin/main.rs

@ -7,7 +7,7 @@ use elseware::login::character::CharacterServerState;
use elseware::ship::ship::ShipServerStateBuilder;
use elseware::entity::account::{NewUserAccountEntity, NewUserSettingsEntity};
use elseware::entity::gateway::{EntityGateway, InMemoryGateway, PostgresGateway};
use elseware::entity::character::NewCharacterEntity;
use elseware::entity::character::{NewCharacterEntity, CharacterClass};
use elseware::entity::item::{NewItemEntity, ItemDetail, ItemLocation};
use elseware::common::interserver::AuthToken;
@ -69,9 +69,12 @@ fn main() {
entity_gateway.create_character(character).await.unwrap();
let mut character = NewCharacterEntity::new(fake_user.id);
character.slot = 2;
character.char_class = CharacterClass::HUnewearl;
character.name = "ItemRefactor".into();
character.exp = 80000000;
character.meseta = 999999;
character.techs.set_tech(elseware::entity::item::tech::Technique::Shifta, elseware::entity::character::TechLevel(3));
character.techs.set_tech(elseware::entity::item::tech::Technique::Deband, elseware::entity::character::TechLevel(3));
let character = entity_gateway.create_character(character).await.unwrap();
for _ in 0..3 {
@ -165,7 +168,7 @@ fn main() {
item::weapon::Weapon {
weapon: item::weapon::WeaponType::Vulcan,
grind: 5,
special: Some(item::weapon::WeaponSpecial::Charge),
special: Some(item::weapon::WeaponSpecial::Berserk),
attrs: [Some(item::weapon::WeaponAttribute{attr: item::weapon::Attribute::Hit, value: 100}),
Some(item::weapon::WeaponAttribute{attr: item::weapon::Attribute::Dark, value: 100}),
None,],
@ -291,8 +294,8 @@ fn main() {
NewItemEntity {
item: ItemDetail::Unit(
item::unit::Unit {
unit: item::unit::UnitType::PriestMind,
modifier: Some(item::unit::UnitModifier::Minus),
unit: item::unit::UnitType::HeavenlyPower,
modifier: None,
}
),
location: ItemLocation::Inventory {
@ -304,8 +307,8 @@ fn main() {
NewItemEntity {
item: ItemDetail::Unit(
item::unit::Unit {
unit: item::unit::UnitType::PriestMind,
modifier: Some(item::unit::UnitModifier::Minus),
unit: item::unit::UnitType::HeavenlyBattle,
modifier: None,
}
),
location: ItemLocation::Inventory {

10
src/ship/map/area.rs

@ -284,6 +284,16 @@ impl MapAreaLookup {
Episode::Four => MapAreaLookup::default_ep4_maps(),
}
}
pub fn from_changed_floor(&self, floor: u8) -> Option<MapArea> {
match floor {
20 => Some(MapArea::Forest1),
30 => Some(MapArea::Caves1),
40 => Some(MapArea::Mines1),
48 => Some(MapArea::Ruins1),
_ => None,
}
}
}

6
src/ship/packet/handler/message.rs

@ -228,12 +228,14 @@ pub fn update_player_position(id: ClientId,
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 = room.map_areas.from_changed_floor(p.data[0]);
},
GameMessage::InitializeSpeechNpc(p) => {
client.x = p.x;
client.z = p.z;
}
_ => {},
_ => {unreachable!()},
}
} else {}
let m = message.clone();

Loading…
Cancel
Save