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

Compare commits

base: blasthavers:daa847b448fab0b56710c7385fd267fd10a233e9
Branches Tags
blasthavers:main
..
compare: blasthavers:e42bb6b4a96d3f479bd986439746c13d41c0af14
Branches Tags
blasthavers:main

No commits in common. "daa847b448fab0b56710c7385fd267fd10a233e9" and "e42bb6b4a96d3f479bd986439746c13d41c0af14" have entirely different histories.
daa847b448 ... e42bb6b4a9

2 changed files with 17 additions and 15 deletions
Show Stats Expand all files Collapse all files

20
blastmud_game/src/message_handler/user_commands/movement.rs
View File

@ -529,17 +529,19 @@ async fn attempt_move_immediate(
Some(attackers) => { Some(attackers) => {
let mut attacker_names = Vec::new(); let mut attacker_names = Vec::new();
let mut attacker_items = Vec::new(); let mut attacker_items = Vec::new();
for attacker in &attackers[..] { if let Some((_, session_dat)) = session.as_ref() {
if let Some((atype, acode)) = attacker.split_once("/") { for attacker in &attackers[..] {
if let Some(aitem) = ctx.trans.find_item_by_type_code(atype, acode).await? { if let Some((atype, acode)) = attacker.split_once("/") {
if let Some((_, session_dat)) = session.as_ref() { if let Some(aitem) =
ctx.trans.find_item_by_type_code(atype, acode).await?
{
attacker_names.push(aitem.display_for_session(session_dat)); attacker_names.push(aitem.display_for_session(session_dat));
// We don't push the actual attacker Item, because another attacker
// might re-target this attacker when we escape, causing the structure
// to be out of date. Instead, we push the type, code pair and look it
// up when we need it.
attacker_items.push((atype, acode));
} }
// We don't push the actual attacker Item, because another attacker
// might re-target this attacker when we escape, causing the structure
// to be out of date. Instead, we push the type, code pair and look it
// up when we need it.
attacker_items.push((atype, acode));
} }
} }
} }

12
blastmud_game/src/static_content/possession_type/blade.rs
View File

@ -77,7 +77,7 @@ pub fn data() -> &'static Vec<(PossessionType, PossessionData)> {
mean_damage: 3.0, mean_damage: 3.0,
stdev_damage: 2.0, stdev_damage: 2.0,
base_damage_type: DamageType::Slash, base_damage_type: DamageType::Slash,
other_damage_types: vec!((0.33334, DamageType::Pierce)), other_damage_types: vec!((1.0, DamageType::Pierce)),
..Default::default() ..Default::default()
}, },
..Default::default() ..Default::default()
@ -117,7 +117,7 @@ pub fn data() -> &'static Vec<(PossessionType, PossessionData)> {
mean_damage: 5.0, mean_damage: 5.0,
stdev_damage: 3.0, stdev_damage: 3.0,
base_damage_type: DamageType::Slash, base_damage_type: DamageType::Slash,
other_damage_types: vec!((0.4, DamageType::Beat)), other_damage_types: vec!((2.0, DamageType::Beat)),
..Default::default() ..Default::default()
}, },
..Default::default() ..Default::default()
@ -157,7 +157,7 @@ pub fn data() -> &'static Vec<(PossessionType, PossessionData)> {
mean_damage: 8.0, mean_damage: 8.0,
stdev_damage: 3.0, stdev_damage: 3.0,
base_damage_type: DamageType::Slash, base_damage_type: DamageType::Slash,
other_damage_types: vec!((0.375, DamageType::Pierce)), other_damage_types: vec!((3.0, DamageType::Pierce)),
..Default::default() ..Default::default()
}, },
..Default::default() ..Default::default()
@ -197,7 +197,7 @@ pub fn data() -> &'static Vec<(PossessionType, PossessionData)> {
mean_damage: 13.0, mean_damage: 13.0,
stdev_damage: 7.0, stdev_damage: 7.0,
base_damage_type: DamageType::Shock, base_damage_type: DamageType::Shock,
other_damage_types: vec!((0.231, DamageType::Slash)), other_damage_types: vec!((3.0, DamageType::Slash)),
..Default::default() ..Default::default()
}, },
..Default::default() ..Default::default()
@ -237,7 +237,7 @@ pub fn data() -> &'static Vec<(PossessionType, PossessionData)> {
mean_damage: 15.0, mean_damage: 15.0,
stdev_damage: 8.0, stdev_damage: 8.0,
base_damage_type: DamageType::Slash, base_damage_type: DamageType::Slash,
other_damage_types: vec!((0.2, DamageType::Pierce)), other_damage_types: vec!((3.0, DamageType::Pierce)),
..Default::default() ..Default::default()
}, },
..Default::default() ..Default::default()
@ -277,7 +277,7 @@ pub fn data() -> &'static Vec<(PossessionType, PossessionData)> {
mean_damage: 25.0, mean_damage: 25.0,
stdev_damage: 5.0, stdev_damage: 5.0,
base_damage_type: DamageType::Slash, base_damage_type: DamageType::Slash,
other_damage_types: vec!((0.4, DamageType::Pierce)), other_damage_types: vec!((10.0, DamageType::Pierce)),
..Default::default() ..Default::default()
}, },
..Default::default() ..Default::default()