From 61f35ef9a9b220fc189f49bbe6bc298d6d2c0e2f Mon Sep 17 00:00:00 2001 From: Mashy Date: Tue, 5 Nov 2019 15:04:16 +1000 Subject: [PATCH] give 125 mitigation stats by default --- WORKLOG.md | 13 +------------ client/src/components/game.construct.jsx | 2 +- server/src/construct.rs | 6 +++--- server/src/game.rs | 2 +- server/src/skill.rs | 1 + 5 files changed, 7 insertions(+), 17 deletions(-) diff --git a/WORKLOG.md b/WORKLOG.md index d8ff9e55..553ba1ae 100644 --- a/WORKLOG.md +++ b/WORKLOG.md @@ -5,16 +5,7 @@ * can't reset password without knowing password =\ -* mobile - - force to landscape view and try make everything fit - OR - - 2 pages vbox / equip - - vbox page as current with equip button at bottom - - equip page with inventory and all 3 construct avatars - - click one of the avatars to expand out skill / spec slots - - show the info pane at the bottom or as an overlay - - +* mobile styles * mobile info page * Invert recharge @@ -36,8 +27,6 @@ - Strike + SpeedRR -> StrikeSpeed (strike has Y% more speed) - Strike + LifeRR -> StrikeLife (Strike recharges X% of damage as red life) -* move item from one construct to another - * ACP * essential diff --git a/client/src/components/game.construct.jsx b/client/src/components/game.construct.jsx index 75a1677d..b448ecec 100644 --- a/client/src/components/game.construct.jsx +++ b/client/src/components/game.construct.jsx @@ -153,7 +153,7 @@ class GameConstruct extends Component { } const effects = construct.effects.length ? construct.effects.map(c => -
hoverInfo(e, c)} onMouseOut={e => hoverInfo(e, null)} diff --git a/server/src/construct.rs b/server/src/construct.rs index 325e6d5e..55a971f1 100644 --- a/server/src/construct.rs +++ b/server/src/construct.rs @@ -220,11 +220,11 @@ impl Construct { account: id, img: Uuid::new_v4(), red_power: ConstructStat { base: 320, value: 320, max: 320, stat: Stat::RedPower }, - red_life: ConstructStat { base: 0, value: 0, max: 0, stat: Stat::RedLife }, + red_life: ConstructStat { base: 125, value: 125, max: 125, stat: Stat::RedLife }, blue_power: ConstructStat { base: 320, value: 320, max: 320, stat: Stat::BluePower }, - blue_life: ConstructStat { base: 0, value: 0, max: 0, stat: Stat::BlueLife }, + blue_life: ConstructStat { base: 125, value: 125, max: 125, stat: Stat::BlueLife }, green_power: ConstructStat { base: 300, value: 300, max: 300, stat: Stat::GreenPower }, - green_life: ConstructStat { base: 950, value: 950, max: 950, stat: Stat::GreenLife }, + green_life: ConstructStat { base: 800, value: 800, max: 800, stat: Stat::GreenLife }, speed: ConstructStat { base: 100, value: 100, max: 100, stat: Stat::Speed }, // evasion: ConstructStat { base: 0, value: 0, max: 0, stat: Stat::Evasion }, skills: vec![], diff --git a/server/src/game.rs b/server/src/game.rs index 12a175b4..e484c286 100644 --- a/server/src/game.rs +++ b/server/src/game.rs @@ -1229,7 +1229,7 @@ mod tests { assert!(game.player_by_id(x_player.id).unwrap().constructs[0].is_stunned() == false); // riposte assert_eq!(game.player_by_id(y_player.id).unwrap().constructs[0].green_life(), ( - y_construct.green_life() - x_construct.red_power().pct(Skill::CounterAttack.multiplier()))); + y_construct.green_life() + y_construct.red_life() - x_construct.red_power().pct(Skill::CounterAttack.multiplier()))); } #[test] diff --git a/server/src/skill.rs b/server/src/skill.rs index 3827c180..849a4e0c 100644 --- a/server/src/skill.rs +++ b/server/src/skill.rs @@ -2082,6 +2082,7 @@ mod tests { x.blue_power.force(256); x.green_power.force(220); x.green_life.force(1024); + y.blue_life.force(0); x.green_life.reduce(512); let mut results = resolve(Skill::Siphon, &mut x, &mut y, vec![]);