blasthavers/blastmud
2
1
Fork 1
Code Issues 2 Pull Requests Packages Projects 1 Releases Wiki Activity

Apply dodge penalty from armour.

Browse Source
This commit is contained in:
Condorra 2023-05-28 21:59:09 +10:00
parent c78dc64a7f
commit cf0d2f740b
5 changed files with 66 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
blastmud_game/src/message_handler/user_commands/remove.rs
View File

@ -19,8 +19,9 @@ use crate::{
},
services::{
comms::broadcast_to_room,
skills::calculate_total_stats_skills_for_user,
},
models::item::{Item, LocationActionType},
models::item::{Item, LocationActionType, BuffCause},
};
use async_trait::async_trait;
use std::time;
@ -132,6 +133,27 @@ impl QueueCommandHandler for QueueHandler {
let mut item_mut = (*item).clone();
item_mut.action_type = LocationActionType::Normal;
item_mut.action_type_started = None;
let poss_data = item.possession_type.as_ref()
.and_then(|pt| possession_data().get(&pt))
.ok_or_else(|| UserError(
"That item no longer exists in the game so can't be handled. Ask staff for help.".to_owned()))?;
let wear_data = poss_data.wear_data.as_ref().ok_or_else(
|| UserError("You seem to be wearing something that isn't clothes! Ask staff for help.".to_owned()))?;
if wear_data.dodge_penalty != 0.0 {
let mut player_item_mut = (*player_item).clone();
player_item_mut.temporary_buffs = player_item_mut.temporary_buffs.into_iter()
.filter(|buf| buf.cause !=
BuffCause::ByItem { item_code: item_mut.item_code.clone(),
item_type: item_mut.item_type.clone() })
.collect();
if let Some(ref usr) = ctx.user_dat {
calculate_total_stats_skills_for_user(&mut player_item_mut, usr);
}
ctx.trans.save_item_model(&player_item_mut).await?;
}
ctx.trans.save_item_model(&item_mut).await?;
Ok(())
}

31
blastmud_game/src/message_handler/user_commands/wear.rs
View File

@ -19,12 +19,18 @@ use crate::{
},
services::{
comms::broadcast_to_room,
skills::calculate_total_stats_skills_for_user,
},
models::item::{
LocationActionType,
Buff,
BuffCause,
BuffImpact,
SkillType,
},
models::item::LocationActionType,
};
use async_trait::async_trait;
use chrono::Utc;
use log::info;
use std::time;
pub struct QueueHandler;
@ -123,7 +129,6 @@ impl QueueCommandHandler for QueueHandler {
_ => tot,
}
);
info!("Thickness with item: {}", thickness);
if thickness > 12.0 {
user_error(format!(
"You're wearing too much on your {} already.",
@ -142,6 +147,26 @@ impl QueueCommandHandler for QueueHandler {
let mut item_mut = (*item).clone();
item_mut.action_type = LocationActionType::Worn;
item_mut.action_type_started = Some(Utc::now());
if wear_data.dodge_penalty != 0.0 {
let mut player_item_mut = (*player_item).clone();
player_item_mut.temporary_buffs.push(Buff {
description: "Dodge penalty".to_owned(),
cause: BuffCause::ByItem {
item_type: item_mut.item_type.clone(),
item_code: item_mut.item_code.clone(),
},
impacts: vec!(BuffImpact::ChangeSkill {
skill: SkillType::Dodge,
magnitude: -wear_data.dodge_penalty
})
});
if let Some(ref usr) = ctx.user_dat {
calculate_total_stats_skills_for_user(&mut player_item_mut, usr);
}
ctx.trans.save_item_model(&player_item_mut).await?;
}
ctx.trans.save_item_model(&item_mut).await?;
Ok(())
}

10
blastmud_game/src/models/item.rs
View File

@ -9,19 +9,19 @@ use crate::{
use super::session::Session;
use chrono::{DateTime, Utc};
#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, Ord, PartialOrd)]
#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, PartialOrd)]
pub enum BuffCause {
WaitingTask { task_code: String, task_type: String },
ByItem { item_code: String, item_type: String }
}
#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, Ord, PartialOrd)]
#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, PartialOrd)]
pub enum BuffImpact {
ChangeStat { stat: StatType, magnitude: i16 },
ChangeSkill { skill: SkillType, magnitude: i16 }
ChangeStat { stat: StatType, magnitude: f64 },
ChangeSkill { skill: SkillType, magnitude: f64 }
}
#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, Ord, PartialOrd)]
#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, PartialOrd)]
pub struct Buff {
pub description: String,
pub cause: BuffCause,

10
blastmud_game/src/services/combat.rs
View File

@ -1,8 +1,11 @@
use crate::{
services::{
comms::broadcast_to_room,
skills::skill_check_and_grind,
skills::skill_check_only,
skills::{
skill_check_and_grind,
skill_check_only,
calculate_total_stats_skills_for_user,
},
destroy_container,
},
models::{
@ -384,6 +387,9 @@ pub async fn handle_resurrect(trans: &DBTrans, player: &mut Item) -> DResult<boo
Some(&format!("You lost {} experience points by dying.\n", lost_xp))).await?;
player.total_xp -= lost_xp;
user.experience.xp_change_for_this_reroll -= lost_xp as i64;
player.temporary_buffs = vec!();
calculate_total_stats_skills_for_user(player, &user);
player.health = max_health(&player);
player.active_climb = None;

4
blastmud_game/src/services/skills.rs
View File

@ -25,7 +25,7 @@ pub fn calculate_total_stats_skills_for_user(target_item: &mut Item, user: &User
BuffImpact::ChangeStat { stat, magnitude } => {
target_item.total_stats.entry(stat.clone())
.and_modify(|old_value| *old_value = (*old_value + magnitude.clone() as f64).max(0.0))
.or_insert((*magnitude).max(0) as f64);
.or_insert((*magnitude).max(0.0));
}
_ => {}
}
@ -153,7 +153,7 @@ pub fn calculate_total_stats_skills_for_user(target_item: &mut Item, user: &User
BuffImpact::ChangeSkill { skill, magnitude } => {
target_item.total_skills.entry(skill.clone())
.and_modify(|old_value| *old_value = (*old_value + magnitude.clone() as f64).max(0.0))
.or_insert((*magnitude).max(0) as f64);
.or_insert((*magnitude).max(0.0));
}
_ => {}
}