Compare commits
No commits in common. "6ef5ea66816314061e3bd54e32730ce4e09fdb99" and "7144ede73fefb4c89879e91486b41f031e2a393a" have entirely different histories.
6ef5ea6681
...
7144ede73f
@ -521,7 +521,7 @@ pub enum MagCellError {
|
|||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
pub enum MagModifier {
|
pub enum MagModifier {
|
||||||
FeedMag {
|
FeedMag{
|
||||||
food: ItemEntityId,
|
food: ItemEntityId,
|
||||||
},
|
},
|
||||||
BankMag, // when putting a mag in the bank it truncates the values which has applications when raising degenerate mags
|
BankMag, // when putting a mag in the bank it truncates the values which has applications when raising degenerate mags
|
||||||
|
@ -266,8 +266,6 @@ async fn new_character<EG: EntityGateway + Clone>(entity_gateway: &mut EG, user:
|
|||||||
character_id: character.id,
|
character_id: character.id,
|
||||||
}).await?;
|
}).await?;
|
||||||
|
|
||||||
entity_gateway.change_mag_owner(&mag.id, &character).await?;
|
|
||||||
|
|
||||||
let mut monomates = Vec::new();
|
let mut monomates = Vec::new();
|
||||||
for _ in 0..4usize {
|
for _ in 0..4usize {
|
||||||
let monomate = entity_gateway.create_item(
|
let monomate = entity_gateway.create_item(
|
||||||
|
@ -22,8 +22,6 @@ 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),
|
||||||
|
|
||||||
@ -313,11 +311,7 @@ where
|
|||||||
}
|
}
|
||||||
ToolType::JackOLantern => jack_o_lantern(),
|
ToolType::JackOLantern => jack_o_lantern(),
|
||||||
// TODO: rest of these
|
// TODO: rest of these
|
||||||
_ => Err(anyhow::Error::from(ApplyItemError::InvalidTool))
|
_ => Err(ApplyItemError::InvalidItem.into())
|
||||||
.with_context(|| {
|
|
||||||
format!("invalid tool {:?}", tool)
|
|
||||||
})
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user