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

room notes, etc #139

Merged
jake merged 12 commits from more_itemnotes into master 2023-02-18 21:01:46 -05:00
Conversation 0 Commits 12 Files Changed 20 +4 -4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 99baa03582 - Show all commits

8
src/ship/quests.rs
View File

@ -271,10 +271,10 @@ pub fn load_quests_path(mut quest_path: PathBuf) -> Result<QuestList, QuestLoadE
pub fn load_standard_quests(mode: RoomMode) -> Result<QuestList, QuestLoadError> { pub fn load_standard_quests(mode: RoomMode) -> Result<QuestList, QuestLoadError> {
match mode { match mode {
RoomMode::Single {episode, difficulty } => { RoomMode::Single {episode, .. } => {
load_quests_path(PathBuf::from_iter(["data", "quests", "bb", &episode.to_string(), "single", "quests.toml"])) load_quests_path(PathBuf::from_iter(["data", "quests", "bb", &episode.to_string(), "single", "quests.toml"]))
}, },
RoomMode::Multi {episode, difficulty } => { RoomMode::Multi {episode, .. } => {
load_quests_path(PathBuf::from_iter(["data", "quests", "bb", &episode.to_string(), "multi", "quests.toml"])) load_quests_path(PathBuf::from_iter(["data", "quests", "bb", &episode.to_string(), "multi", "quests.toml"]))
}, },
_ => { _ => {
@ -286,10 +286,10 @@ pub fn load_standard_quests(mode: RoomMode) -> Result<QuestList, QuestLoadError>
pub fn load_government_quests(mode: RoomMode) -> Result<QuestList, QuestLoadError> { pub fn load_government_quests(mode: RoomMode) -> Result<QuestList, QuestLoadError> {
match mode { match mode {
RoomMode::Single {episode, difficulty } => { RoomMode::Single {episode, .. } => {
load_quests_path(PathBuf::from_iter(["data", "quests", "bb", &episode.to_string(), "government", "quests.toml"])) load_quests_path(PathBuf::from_iter(["data", "quests", "bb", &episode.to_string(), "government", "quests.toml"]))
}, },
RoomMode::Multi {episode, difficulty } => { RoomMode::Multi {episode, .. } => {
load_quests_path(PathBuf::from_iter(["data", "quests", "bb", &episode.to_string(), "government", "quests.toml"])) load_quests_path(PathBuf::from_iter(["data", "quests", "bb", &episode.to_string(), "government", "quests.toml"]))
}, },
_ => { _ => {