bunch of small fixes #127

Merged
jake merged 30 commits from make_actually_work into master 2023-01-30 22:07:38 -05:00
Showing only changes of commit 1fb0abce09 - Show all commits

View File

@ -22,6 +22,8 @@ pub enum ApplyItemError {
ItemNotEquipped, ItemNotEquipped,
#[error("could not use item invalid item")] #[error("could not use item invalid item")]
InvalidItem, InvalidItem,
#[error("invalid tool")]
InvalidTool,
#[error("gateway error {0}")] #[error("gateway error {0}")]
GatewayError(#[from] GatewayError), GatewayError(#[from] GatewayError),
@ -311,7 +313,11 @@ where
} }
ToolType::JackOLantern => jack_o_lantern(), ToolType::JackOLantern => jack_o_lantern(),
// TODO: rest of these // TODO: rest of these
_ => Err(ApplyItemError::InvalidItem.into()) _ => Err(anyhow::Error::from(ApplyItemError::InvalidTool))
.with_context(|| {
format!("invalid tool {:?}", tool)
})
} }
} }