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

don't load shops for real this time
Some checks failed
continuous-integration/drone/push Build is failing
Details
continuous-integration/drone/pr Build is passing
Details

Browse Source
This commit is contained in:
jake 2023-11-11 23:11:58 -07:00
parent 15c0ac50ee
commit ab0a844c8c
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ship/ship.rs
View File

@ -410,14 +410,13 @@ impl<EG: EntityGateway + Clone + 'static> ShipServerStateBuilder<EG> {
item_state: items::state::ItemState::default(), item_state: items::state::ItemState::default(),
ip: self.ip.unwrap_or_else(|| Ipv4Addr::new(127,0,0,1)), ip: self.ip.unwrap_or_else(|| Ipv4Addr::new(127,0,0,1)),
port: self.port.unwrap_or(SHIP_PORT), port: self.port.unwrap_or(SHIP_PORT),
#[allow(clippy::box_default)] // this lint leads to another which just doesn't work shops: Arc::new(self.shops.unwrap_or_else(|| Box::<StandardItemShops>::default())),
shops: Arc::new(self.shops.unwrap_or(Box::new(StandardItemShops::default()))),
blocks: Blocks(blocks), blocks: Blocks(blocks),
event: self.event.unwrap_or(Holiday::None), event: self.event.unwrap_or(Holiday::None),
map_builder: Arc::new(self.map_builder.unwrap_or(Box::new(generate_free_roam_maps))), map_builder: Arc::new(self.map_builder.unwrap_or_else(|| Box::new(generate_free_roam_maps))),
drop_table_builder: Arc::new(self.drop_table_builder.unwrap_or(Box::new(StandardDropTable::new))), drop_table_builder: Arc::new(self.drop_table_builder.unwrap_or_else(|| Box::new(StandardDropTable::new))),
standard_quest_builder: Arc::new(self.standard_quest_builder.unwrap_or(Box::new(load_standard_quests))), standard_quest_builder: Arc::new(self.standard_quest_builder.unwrap_or_else(|| Box::new(load_standard_quests))),
government_quest_builder: Arc::new(self.government_quest_builder.unwrap_or(Box::new(load_government_quests))), government_quest_builder: Arc::new(self.government_quest_builder.unwrap_or_else(|| Box::new(load_government_quests))),
auth_token: self.auth_token.unwrap_or_else(|| AuthToken("".into())), auth_token: self.auth_token.unwrap_or_else(|| AuthToken("".into())),
ship_list: Arc::new(RwLock::new(Vec::new())), ship_list: Arc::new(RwLock::new(Vec::new())),

12
tests/common.rs
View File

@ -36,10 +36,14 @@ impl DropTable for NullDropTable {
} }
} }
pub fn null_drop_table_builder(_episode: Episode, _difficult: Difficulty, _section_id: SectionID) -> Box<dyn DropTable + Send + Sync> {
Box::new(NullDropTable)
}
struct NullItemShops; struct NullItemShops;
#[async_trait::async_trait] #[async_trait::async_trait]
impl ItemShops for NullItemShops { impl ItemShops for NullItemShops {
async fn generate_weapon_list(&self, _difficulty: Difficulty, _section_id: SectionID, _char_level: usize) -> Option<Vec<WeaponShopItem>> { async fn generate_weapon_list(&self, _difficulty: Difficulty, _section_id: SectionID, _char_level: usize) -> Option<Vec<WeaponShopItem>> {
Some(Vec::new()) Some(Vec::new())
} }
@ -51,12 +55,6 @@ impl ItemShops for NullItemShops {
} }
} }
pub fn null_drop_table_builder(_episode: Episode, _difficult: Difficulty, _section_id: SectionID) -> Box<dyn DropTable + Send + Sync> {
Box::new(NullDropTable)
}
pub fn standard_ship_buildable<EG: EntityGateway + Clone>(gateway: EG) -> ShipServerStateBuilder<EG> { pub fn standard_ship_buildable<EG: EntityGateway + Clone>(gateway: EG) -> ShipServerStateBuilder<EG> {
ShipServerState::builder() ShipServerState::builder()
.gateway(gateway) .gateway(gateway)