From 09c0a624d9e7a0f8f0044ac729b357296923635a Mon Sep 17 00:00:00 2001 From: ntr Date: Tue, 11 Dec 2018 14:39:44 +1100 Subject: [PATCH] lvl 64 stam fix --- server/src/cryp.rs | 5 ++++- server/src/game.rs | 8 ++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/server/src/cryp.rs b/server/src/cryp.rs index 375c7a96..5330d0d9 100644 --- a/server/src/cryp.rs +++ b/server/src/cryp.rs @@ -154,7 +154,10 @@ impl Cryp { pub fn create(mut self) -> Cryp { let mut rng = thread_rng(); - let stam_max = 2_u64.pow(self.lvl.into()); + let stam_max = match self.lvl == 64 { + true => u64::max_value(), + false => 2_u64.pow(self.lvl.into()), + }; let stam_min = match self.lvl == 1 { true => 2_u64, diff --git a/server/src/game.rs b/server/src/game.rs index 902e5c45..9b60b180 100644 --- a/server/src/game.rs +++ b/server/src/game.rs @@ -407,6 +407,14 @@ impl Game { } fn log_resolution(&mut self, source: &Cryp, target: &Cryp, cast: &Cast) -> &mut Game { + match cast.resolution.disable.disabled { + true => { + self.log.push(format!("{:?} {:?} {:?} disabled [{:?}]", source.name, cast.skill, target.name, cast.resolution.disable.effects)); + return self; + }, + false => (), + }; + for result in cast.resolution.results.iter() { match result { ResolutionResult::Damage { amount, category: _, immunity: _ } => {