From e31acf96c6444fa462eb82a65d58751815288ac2 Mon Sep 17 00:00:00 2001 From: Mashy Date: Tue, 12 Nov 2019 22:01:56 +1000 Subject: [PATCH 1/4] group colours together in table, fix the vertical spacing issue --- client/assets/styles/instance.less | 36 +++++-------------- client/src/components/info.component.jsx | 30 ++++++++++------ client/src/components/instance.constructs.jsx | 2 +- client/src/components/instance.ctrl.btns.jsx | 6 ---- 4 files changed, 28 insertions(+), 46 deletions(-) diff --git a/client/assets/styles/instance.less b/client/assets/styles/instance.less index 23b17a8c..45538886 100644 --- a/client/assets/styles/instance.less +++ b/client/assets/styles/instance.less @@ -2,7 +2,7 @@ overflow: hidden; display: grid; grid-template-columns: 1fr minmax(min-content, 1fr); - grid-template-rows: minmax(min-content, 0.75fr) 1fr; + grid-template-rows: min-content 1fr; grid-template-areas: "vbox info" @@ -37,7 +37,7 @@ grid-area: info; display: grid; - grid-template-rows: 1fr 1fr; + grid-template-rows: 12em min-content; grid-template-areas: "item" "combos"; @@ -50,16 +50,20 @@ .combos { display: grid; grid-template-columns: repeat(6, 1fr); + align-content: center; .table-button { display: grid; text-align: center; + align-content: center; + border-bottom: 2px solid #222; grid-template-areas: "item" "ingr"; .item { + border-top: 2px solid #222; border-bottom: 2px solid #222; flex: 1; grid-area: item; @@ -68,15 +72,14 @@ div { border-right: 2px solid #222; - svg { vertical-align: middle; } } - &:last-child { + &:first-child { div { - border-right: 0; + border-left: 2px solid #222; } } } @@ -101,29 +104,6 @@ } } -.instance .combos { - margin: 0 0 1em 1em; - - table { - tr { - svg { - height: 1em; - } - } - } - - td.table-button { - padding:5px; - cursor: pointer; - animation: border-co 0.75s ease-in-out 0s infinite alternate; - &:hover { - color: whitesmoke; - background-color: @gray-hover; - } - - } -} - .instance .info figcaption { font-size: 1em; display: inline-block; diff --git a/client/src/components/info.component.jsx b/client/src/components/info.component.jsx index c0526730..71360599 100644 --- a/client/src/components/info.component.jsx +++ b/client/src/components/info.component.jsx @@ -147,19 +147,27 @@ class InfoComponent extends preact.Component { const vboxCombos = itemInfo.combos.filter(c => c.components.includes(info)); if (vboxCombos.length > 6 || vboxCombos.length === 0) return generalNotes; + const comboTable = vboxCombos.map((c, i) => { + const mouseOver = e => { + e.stopPropagation(); + this.setState({ comboItem: c.item }); + }; + const componentTable = (c.components.some(ci => ['Red', 'Blue', 'Green'].includes(ci))) + ? [
{convertItem(c.components[0])} {convertItem(c.components[1])}
, +
{convertItem(c.components[2])}
] + : c.components.map((u, j) =>
{convertItem(u)}
); + return ( +
setInfo(c.item)}> +
+ {convertItem(c.item)} +
+ {componentTable} +
+ ); + }); return (
- {vboxCombos.map((c, i) => -
{ - e.stopPropagation(); - this.setState({ comboItem: c.item }); - }} - onClick={() => setInfo(c.item)}> -
{convertItem(c.item)}
- {c.components.map((u, j) =>
{convertItem(u)}
)} -
- )} + {comboTable}
); }; diff --git a/client/src/components/instance.constructs.jsx b/client/src/components/instance.constructs.jsx index 7e859efa..577fe84c 100644 --- a/client/src/components/instance.constructs.jsx +++ b/client/src/components/instance.constructs.jsx @@ -238,7 +238,7 @@ function Construct(props) { ; }); - const classes = `instance-construct`; + const classes = 'instance-construct'; const avatarMouseOver = e => hoverInfo(e, `constructAvatar ${construct.name}`); return (
ev.preventDefault()} onDrop={onClick}> diff --git a/client/src/components/instance.ctrl.btns.jsx b/client/src/components/instance.ctrl.btns.jsx index 59752c1e..45c26e1f 100644 --- a/client/src/components/instance.ctrl.btns.jsx +++ b/client/src/components/instance.ctrl.btns.jsx @@ -17,16 +17,11 @@ const addState = connect( return ws.sendInstanceReady(instance.id); } - function sendAbandon() { - return ws.sendInstanceAbandon(instance.id); - } - return { instance, chatShow, account, - sendAbandon, sendReady, }; }, @@ -48,7 +43,6 @@ function InstanceCtrlBtns(args) { chatShow, account, - sendAbandon, sendReady, setChatShow, } = args; From ef4d3e57dca503dc2cd02b4cb50875d8ce5658ae Mon Sep 17 00:00:00 2001 From: Mashy Date: Tue, 12 Nov 2019 22:29:59 +1000 Subject: [PATCH 2/4] big info text, bring back hover --- client/assets/styles/instance.less | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/client/assets/styles/instance.less b/client/assets/styles/instance.less index 45538886..4bb23969 100644 --- a/client/assets/styles/instance.less +++ b/client/assets/styles/instance.less @@ -37,16 +37,11 @@ grid-area: info; display: grid; - grid-template-rows: 12em min-content; + grid-template-rows: 13em min-content; grid-template-areas: "item" "combos"; - .info-item { - flex: 1; - font-size: 90%; - } - .combos { display: grid; grid-template-columns: repeat(6, 1fr); @@ -62,6 +57,12 @@ "item" "ingr"; + cursor: pointer; + &:hover { + color: whitesmoke; + background-color: @gray; + } + .item { border-top: 2px solid #222; border-bottom: 2px solid #222; From f5978e90bdda231b967a2208cd95213500473c0c Mon Sep 17 00:00:00 2001 From: Mashy Date: Wed, 13 Nov 2019 10:58:57 +1000 Subject: [PATCH 3/4] changelog --- CHANGELOG.md | 8 ++++++++ WORKLOG.md | 3 --- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c6d3469..9a58fa60 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,16 @@ ## [1.8.3] - 2019-11-10 +### Added +- Preview combos by hovering over recipes +- Condensed recipe display + ### Fixed - Construct display on info / demo page ### Changed +- Automatically shows a preview of combo item when you have 3 items selected for combining + +- Only highlight the first available item slot when equipping + - Amplify no longer increase GreenPower - Purify diff --git a/WORKLOG.md b/WORKLOG.md index d406e805..52e0b9c8 100644 --- a/WORKLOG.md +++ b/WORKLOG.md @@ -12,9 +12,6 @@ * Buttons / General UI Theming * Front Page -* Don't drop out of game if you don't ready (esp. tutorial) -* Preview combo if you select 3 items - ## SOON * Graphical status effects instead of text * Improve colour contrast / buttons From 7f8679171c65a2591d8a391e34f325daa21bf8fe Mon Sep 17 00:00:00 2001 From: Mashy Date: Wed, 13 Nov 2019 11:09:34 +1000 Subject: [PATCH 4/4] debuff combo order --- server/src/item.rs | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/server/src/item.rs b/server/src/item.rs index 182892da..3708d80e 100644 --- a/server/src/item.rs +++ b/server/src/item.rs @@ -984,12 +984,12 @@ impl Item { Item::PurgePlusPlus => vec![Item::PurgePlus, Item::PurgePlus, Item::PurgePlus], // Needs flavour Item::SilencePlus => vec![Item::Silence, Item::Silence, Item::Silence], Item::SilencePlusPlus => vec![Item::SilencePlus, Item::SilencePlus, Item::SilencePlus], - Item::CursePlus => vec![Item::Curse, Item::Curse, Item::Curse], - Item::CursePlusPlus => vec![Item::CursePlus, Item::CursePlus, Item::CursePlus], - Item::DecayPlus => vec![Item::Decay, Item::Decay, Item::Decay], - Item::DecayPlusPlus => vec![Item::DecayPlus, Item::DecayPlus, Item::DecayPlus], Item::InvertPlus => vec![Item::Invert, Item::Invert, Item::Invert], Item::InvertPlusPlus => vec![Item::InvertPlus, Item::InvertPlus, Item::InvertPlus], + Item::DecayPlus => vec![Item::Decay, Item::Decay, Item::Decay], + Item::DecayPlusPlus => vec![Item::DecayPlus, Item::DecayPlus, Item::DecayPlus], + Item::CursePlus => vec![Item::Curse, Item::Curse, Item::Curse], + Item::CursePlusPlus => vec![Item::CursePlus, Item::CursePlus, Item::CursePlus], Item::Counter => vec![Item::Block, Item::Red, Item::Red], Item::Reflect => vec![Item::Block, Item::Green, Item::Blue], @@ -1341,21 +1341,18 @@ pub fn get_combos() -> Vec { Combo { components: Item::Purge.combo(), item: Item::Purge }, // Needs flavour Combo { components: Item::PurgePlus.combo(), item: Item::PurgePlus }, Combo { components: Item::PurgePlusPlus.combo(), item: Item::PurgePlusPlus }, - Combo { components: Item::Silence.combo(), item: Item::Silence }, Combo { components: Item::SilencePlus.combo(), item: Item::SilencePlus }, Combo { components: Item::SilencePlusPlus.combo(), item: Item::SilencePlusPlus }, - - - Combo { components: Item::Curse.combo(), item: Item::Curse }, - Combo { components: Item::CursePlus.combo(), item: Item::CursePlus }, - Combo { components: Item::CursePlusPlus.combo(), item: Item::CursePlusPlus }, - Combo { components: Item::Decay.combo(), item: Item::Decay }, - Combo { components: Item::DecayPlus.combo(), item: Item::DecayPlus }, - Combo { components: Item::DecayPlusPlus.combo(), item: Item::DecayPlusPlus }, Combo { components: Item::Invert.combo(), item: Item::Invert }, Combo { components: Item::InvertPlus.combo(), item: Item::InvertPlus }, Combo { components: Item::InvertPlusPlus.combo(), item: Item::InvertPlusPlus }, + Combo { components: Item::Decay.combo(), item: Item::Decay }, + Combo { components: Item::DecayPlus.combo(), item: Item::DecayPlus }, + Combo { components: Item::DecayPlusPlus.combo(), item: Item::DecayPlusPlus }, + Combo { components: Item::Curse.combo(), item: Item::Curse }, + Combo { components: Item::CursePlus.combo(), item: Item::CursePlus }, + Combo { components: Item::CursePlusPlus.combo(), item: Item::CursePlusPlus }, Combo { components: Item::Counter.combo(), item: Item::Counter }, Combo { components: Item::CounterPlus.combo(), item: Item::CounterPlus },