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

null free roam maps by default

Browse Source
This commit is contained in:
jake 2023-11-11 21:25:06 -07:00 committed by andy
parent c5c96863a8
commit b5572ccc53
4 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
maps/src/maps.rs
View File

@ -376,3 +376,12 @@ pub fn generate_free_roam_maps(room_mode: RoomMode, event: Holiday) -> Maps {
map_variants,
}
}
pub fn null_free_roam_maps(_room_mode: RoomMode, _event: Holiday) -> Maps {
Maps {
enemy_data: Default::default(),
object_data: Default::default(),
map_variants: Default::default(),
}
}

4
src/bin/main.rs
View File

@ -8,6 +8,7 @@ use elseware::patch::{PatchServerState, generate_patch_tree, load_config, load_m
use elseware::ship::ship::ShipServerStateBuilder;
use maps::Holiday;
use maps::maps::generate_free_roam_maps;
use entity::gateway::{EntityGateway, InMemoryGateway};
use entity::account::{NewUserAccountEntity, NewUserSettingsEntity};
use entity::character::NewCharacterEntity;
@ -369,6 +370,7 @@ fn main() {
.standard_quest_builder(Box::new(quests::load_standard_quests))
.government_quest_builder(Box::new(quests::load_government_quests))
.drop_table_builder(Box::new(StandardDropTable::new))
.map_builder(Box::new(generate_free_roam_maps))
.gateway(entity_gateway.clone())
.build();
let sub_ship_state = ship_state.clone();
@ -388,6 +390,7 @@ fn main() {
.standard_quest_builder(Box::new(quests::load_standard_quests))
.government_quest_builder(Box::new(quests::load_government_quests))
.drop_table_builder(Box::new(StandardDropTable::new))
.map_builder(Box::new(generate_free_roam_maps))
.gateway(entity_gateway.clone())
.build();
let sub_ship_state = ship_state.clone();
@ -406,6 +409,7 @@ fn main() {
.standard_quest_builder(Box::new(quests::load_standard_quests))
.government_quest_builder(Box::new(quests::load_government_quests))
.drop_table_builder(Box::new(StandardDropTable::new))
.map_builder(Box::new(generate_free_roam_maps))
.gateway(entity_gateway.clone())
.build();
let sub_ship_state = ship_state.clone();

2
src/bin/ship.rs
View File

@ -3,6 +3,7 @@ use entity::gateway::postgres::PostgresGateway;
use elseware::ship::ship::ShipServerStateBuilder;
use networking::interserver::AuthToken;
use drops::StandardDropTable;
use maps::maps::generate_free_roam_maps;
fn main() {
let colors = fern::colors::ColoredLevelConfig::new()
@ -47,6 +48,7 @@ fn main() {
.standard_quest_builder(Box::new(quests::load_standard_quests))
.government_quest_builder(Box::new(quests::load_government_quests))
.drop_table_builder(Box::new(StandardDropTable::new))
.map_builder(Box::new(generate_free_roam_maps))
.build();
let shipgate_ip = std::env::var("SHIPGATE_IP").unwrap().parse().unwrap();

4
src/ship/ship.rs
View File

@ -30,7 +30,7 @@ use maps::room::{RoomMode, Episode, Difficulty};
use quests::{QuestList, QuestLoadError};
use maps::Holiday;
use maps::area::MapAreaError;
use maps::maps::{Maps, MapsError, generate_free_roam_maps};
use maps::maps::{Maps, MapsError, null_free_roam_maps};
use crate::ship::packet::handler;
use shops::{WeaponShop, ToolShop, ArmorShop};
use trade::TradeState;
@ -436,7 +436,7 @@ impl<EG: EntityGateway + Clone + 'static> ShipServerStateBuilder<EG> {
shops: ItemShops::default(),
blocks: Blocks(blocks),
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(Box::new(null_free_roam_maps))),
drop_table_builder: Arc::new(self.drop_table_builder.unwrap_or(Box::new(null_drop_table))),
standard_quest_builder: Arc::new(self.standard_quest_builder.unwrap_or(Box::new(|_| Ok(QuestList::new())))),
government_quest_builder: Arc::new(self.government_quest_builder.unwrap_or(Box::new(|_| Ok(QuestList::new())))),