From 9358d0a99f80692455432cf834a02e84993288ff Mon Sep 17 00:00:00 2001 From: ntr Date: Fri, 6 Sep 2019 17:44:29 +1000 Subject: [PATCH] update info --- client/src/components/info.component.jsx | 14 ++---- client/src/socket.jsx | 2 +- server/src/item.rs | 62 ++++++++++++------------ 3 files changed, 37 insertions(+), 41 deletions(-) diff --git a/client/src/components/info.component.jsx b/client/src/components/info.component.jsx index f990d118..29edb8cb 100644 --- a/client/src/components/info.component.jsx +++ b/client/src/components/info.component.jsx @@ -9,7 +9,6 @@ const shapes = require('./shapes'); function InfoComponent(args) { const { itemInfo, - combiner, player, info, } = args; @@ -25,6 +24,8 @@ function InfoComponent(args) {

double clicking items in the VBOX will purchase and move them to your INVENTORY.

hover over an item to see its effects and combinations.
+ combine a SKILL or SPEC with 2 COLOURS to create an item.
+ combine 3 of the same item to upgrade it.
click an item and then click a construct to equip that item to it.

click the READY button on the right to progress to the GAME PHASE.

@@ -40,17 +41,11 @@ function InfoComponent(args) { const regEx = /(RedPower|BluePower|GreenPower|RedLife|BlueLife|GreenLife|SpeedStat)/; const infoDescription = reactStringReplace(fullInfo.description, regEx, match => shapes[match]()); - const itemSource = itemInfo.combos.filter(c => c.item === info); - const itemSourceInfo = itemSource.length - ? `${itemSource[0].components[0]} ${itemSource[0].components[1]} ${itemSource[0].components[2]}` - : false; - const itemRegEx = /(Red|Blue|Green)/; - const itemSourceDescription = reactStringReplace(itemSourceInfo, itemRegEx, match => shapes[match]()); return (

{fullInfo.item}

-

{itemSourceDescription}

-
{infoDescription}
+

SKILL

+
{infoDescription}
); } @@ -144,6 +139,7 @@ function InfoComponent(args) { return (

{info}

+

SPEC

{infoDescription}
{thresholds} diff --git a/client/src/socket.jsx b/client/src/socket.jsx index d4a0c421..d3f91ff4 100644 --- a/client/src/socket.jsx +++ b/client/src/socket.jsx @@ -200,7 +200,7 @@ function createSocket(events) { let pongTimeout; function onPong() { events.setPing(Date.now() - ping); - pongTimeout = setTimeout(sendPing, 1000); + // pongTimeout = setTimeout(sendPing, 1000); } // ------------- diff --git a/server/src/item.rs b/server/src/item.rs index 67efb76e..a2d4b5cf 100644 --- a/server/src/item.rs +++ b/server/src/item.rs @@ -88,181 +88,181 @@ pub enum Item { AmplifyPlus, #[serde(rename = "Amplify++")] AmplifyPlusPlus, - + Absorb, #[serde(rename = "Absorb+")] AbsorbPlus, #[serde(rename = "Absorb++")] AbsorbPlusPlus, - + Banish, #[serde(rename = "Banish+")] BanishPlus, #[serde(rename = "Banish++")] BanishPlusPlus, - + Bash, #[serde(rename = "Bash+")] BashPlus, #[serde(rename = "Bash++")] BashPlusPlus, - + Blast, #[serde(rename = "Blast+")] BlastPlus, #[serde(rename = "Blast++")] BlastPlusPlus, - + Chaos, #[serde(rename = "Chaos+")] ChaosPlus, #[serde(rename = "Chaos++")] ChaosPlusPlus, - + Sustain, #[serde(rename = "Sustain+")] SustainPlus, #[serde(rename = "Sustain++")] SustainPlusPlus, - + Electrify, #[serde(rename = "Electrify+")] ElectrifyPlus, #[serde(rename = "Electrify++")] ElectrifyPlusPlus, - + Curse, #[serde(rename = "Curse+")] CursePlus, #[serde(rename = "Curse++")] CursePlusPlus, - + Decay, #[serde(rename = "Decay+")] DecayPlus, #[serde(rename = "Decay++")] DecayPlusPlus, - + Hex, #[serde(rename = "Hex+")] HexPlus, #[serde(rename = "Hex++")] HexPlusPlus, - + Haste, #[serde(rename = "Haste+")] HastePlus, #[serde(rename = "Haste++")] HastePlusPlus, - + Heal, #[serde(rename = "Heal+")] HealPlus, #[serde(rename = "Heal++")] HealPlusPlus, - + Hybrid, #[serde(rename = "Hybrid+")] HybridPlus, #[serde(rename = "Hybrid++")] HybridPlusPlus, - + Invert, #[serde(rename = "Invert+")] InvertPlus, #[serde(rename = "Invert++")] InvertPlusPlus, - + Counter, #[serde(rename = "Counter+")] CounterPlus, #[serde(rename = "Counter++")] CounterPlusPlus, - + Purge, #[serde(rename = "Purge+")] PurgePlus, #[serde(rename = "Purge++")] PurgePlusPlus, - + Purify, #[serde(rename = "Purify+")] PurifyPlus, #[serde(rename = "Purify++")] PurifyPlusPlus, - + Reflect, #[serde(rename = "Reflect+")] ReflectPlus, #[serde(rename = "Reflect++")] ReflectPlusPlus, - + Recharge, #[serde(rename = "Recharge+")] RechargePlus, #[serde(rename = "Recharge++")] RechargePlusPlus, - + Ruin, #[serde(rename = "Ruin+")] RuinPlus, #[serde(rename = "Ruin++")] RuinPlusPlus, - + Link, #[serde(rename = "Link+")] LinkPlus, #[serde(rename = "Link++")] LinkPlusPlus, - + Silence, #[serde(rename = "Silence+")] SilencePlus, #[serde(rename = "Silence++")] SilencePlusPlus, - + Slay, #[serde(rename = "Slay+")] SlayPlus, #[serde(rename = "Slay++")] SlayPlusPlus, - + Sleep, #[serde(rename = "Sleep+")] SleepPlus, #[serde(rename = "Sleep++")] SleepPlusPlus, - + Restrict, #[serde(rename = "Restrict+")] RestrictPlus, #[serde(rename = "Restrict++")] RestrictPlusPlus, - + Strike, #[serde(rename = "Strike+")] StrikePlus, #[serde(rename = "Strike++")] StrikePlusPlus, - + Siphon, #[serde(rename = "Siphon+")] SiphonPlus, #[serde(rename = "Siphon++")] SiphonPlusPlus, - + Intercept, #[serde(rename = "Intercept+")] InterceptPlus, #[serde(rename = "Intercept++")] InterceptPlusPlus, - + Break, #[serde(rename = "Break+")] BreakPlus, #[serde(rename = "Break++")] BreakPlusPlus, - + Triage, #[serde(rename = "Triage+")] TriagePlus, @@ -748,7 +748,7 @@ impl Item { Item::Counter| Item::CounterPlus | - Item::CounterPlusPlus => format!("Self targetting skill. Recharges RedLife for {:?}% RedPower and blocks red skills for {:?}T. + Item::CounterPlusPlus => format!("Self targetting skill. Recharges RedLife for {:?}% RedPower and blocks red skills for {:?}T. If a red skill is parried the construct will riposte the source dealing {:?}% RedPower as red damage.", self.into_skill().unwrap().multiplier(), self.into_skill().unwrap().effect()[0].get_duration(),