From 1e73dd920e8c2fa5b0aa9432dfd55f85e3bdb1fb Mon Sep 17 00:00:00 2001 From: ntr Date: Tue, 12 Nov 2019 19:54:54 +1100 Subject: [PATCH] combo order --- client/assets/styles/instance.less | 2 +- server/src/item.rs | 16 ++++++---------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/client/assets/styles/instance.less b/client/assets/styles/instance.less index 7305386a..23b17a8c 100644 --- a/client/assets/styles/instance.less +++ b/client/assets/styles/instance.less @@ -70,7 +70,7 @@ border-right: 2px solid #222; svg { - vertical-align: bottom; + vertical-align: middle; } } diff --git a/server/src/item.rs b/server/src/item.rs index a754ecbc..182892da 100644 --- a/server/src/item.rs +++ b/server/src/item.rs @@ -1319,25 +1319,18 @@ pub fn get_combos() -> Vec { Combo { components: Item::Intercept.combo(), item: Item::Intercept }, Combo { components: Item::InterceptPlus.combo(), item: Item::InterceptPlus }, Combo { components: Item::InterceptPlusPlus.combo(), item: Item::InterceptPlusPlus }, - Combo { components: Item::Triage.combo(), item: Item::Triage }, Combo { components: Item::TriagePlus.combo(), item: Item::TriagePlus }, Combo { components: Item::TriagePlusPlus.combo(), item: Item::TriagePlusPlus }, - - Combo { components: Item::Link.combo(), item: Item::Link }, - Combo { components: Item::LinkPlus.combo(), item: Item::LinkPlus }, - Combo { components: Item::LinkPlusPlus.combo(), item: Item::LinkPlusPlus }, - - Combo { components: Item::Haste.combo(), item: Item::Haste }, - Combo { components: Item::HastePlus.combo(), item: Item::HastePlus }, - Combo { components: Item::HastePlusPlus.combo(), item: Item::HastePlusPlus }, Combo { components: Item::Absorb.combo(), item: Item::Absorb }, Combo { components: Item::AbsorbPlus.combo(), item: Item::AbsorbPlus }, Combo { components: Item::AbsorbPlusPlus.combo(), item: Item::AbsorbPlusPlus }, + Combo { components: Item::Haste.combo(), item: Item::Haste }, + Combo { components: Item::HastePlus.combo(), item: Item::HastePlus }, + Combo { components: Item::HastePlusPlus.combo(), item: Item::HastePlusPlus }, Combo { components: Item::Hybrid.combo(), item: Item::Hybrid }, Combo { components: Item::HybridPlus.combo(), item: Item::HybridPlus }, Combo { components: Item::HybridPlusPlus.combo(), item: Item::HybridPlusPlus }, - Combo { components: Item::Amplify.combo(), item: Item::Amplify }, Combo { components: Item::AmplifyPlus.combo(), item: Item::AmplifyPlus }, Combo { components: Item::AmplifyPlusPlus.combo(), item: Item::AmplifyPlusPlus }, @@ -1400,6 +1393,9 @@ pub fn get_combos() -> Vec { Combo { components: Item::Break.combo(), item: Item::Break }, Combo { components: Item::BreakPlus.combo(), item: Item::BreakPlus }, Combo { components: Item::BreakPlusPlus.combo(), item: Item::BreakPlusPlus }, + Combo { components: Item::Link.combo(), item: Item::Link }, + Combo { components: Item::LinkPlus.combo(), item: Item::LinkPlus }, + Combo { components: Item::LinkPlusPlus.combo(), item: Item::LinkPlusPlus }, Combo { components: Item::Banish.combo(), item: Item::Banish }, Combo { components: Item::BanishPlus.combo(), item: Item::BanishPlus }, Combo { components: Item::BanishPlusPlus.combo(), item: Item::BanishPlusPlus },