ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

speed dec

Browse Source
This commit is contained in:
ntr 2019-05-30 20:10:39 +10:00
parent 18bb729688
commit 656902d9f3
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
client/src/components/nav.jsx
View File

@ -47,6 +47,15 @@ const addState = connect(
function setNav(place) { function setNav(place) {
dispatch(actions.setGame(null)); dispatch(actions.setGame(null));
dispatch(actions.setInstance(null)); dispatch(actions.setInstance(null));
dispatch(actions.setCombiner([null, null, null]));
dispatch(actions.setReclaiming(false));
dispatch(actions.setActiveSkill(null));
dispatch(actions.setActiveConstruct(null));
dispatch(actions.setInfo(null));
dispatch(actions.setItemEquip(null));
dispatch(actions.setItemUnequip(null));
dispatch(actions.setVboxHighlight([]));
return dispatch(actions.setNav(place)); return dispatch(actions.setNav(place));
} }

11
server/src/item.rs
View File

@ -213,7 +213,7 @@ impl Item {
let combos = get_combos(); let combos = get_combos();
let combo = combos.iter().find(|c| c.item == *self) let combo = combos.iter().find(|c| c.item == *self)
.unwrap_or_else(|| panic!("unable to find components for {:?}", self)); .unwrap_or_else(|| panic!("unable to find components for {:?}", self));
let mut colour_speed = 0; let mut colour_speed = 0;
let mut skill_speed = 0; let mut skill_speed = 0;
let mut component_speed = 0; let mut component_speed = 0;
@ -233,12 +233,12 @@ impl Item {
Item::Debuff => 4, Item::Debuff => 4,
_ => 0, _ => 0,
}; };
if colour_speed == 0 && skill_speed == 0 { if colour_speed == 0 && skill_speed == 0 {
component_speed = unit.speed(); component_speed = unit.speed();
} }
}); });
if component_speed > 0 { return component_speed }; if component_speed > 0 { return component_speed };
return 24 + colour_speed * skill_speed return 24 + colour_speed * skill_speed
} }
} }
@ -423,7 +423,8 @@ impl Item {
Item::Life => format!("Base ITEM for increased LIFE. Item::Life => format!("Base ITEM for increased LIFE.
When your CONSTRUCT reaches 0 GreenLife it becomes KO and cannot cast SKILLS."), When your CONSTRUCT reaches 0 GreenLife it becomes KO and cannot cast SKILLS."),
Item::Speed => format!("Base ITEM for increased SPEED. Item::Speed => format!("Base ITEM for increased SPEED.
SPEED determines the order in which skills resolve."), SPEED determines the order in which skills resolve.
Some SKILLS (such as STRIKE) have their damage increased by SPEED."),
// Lifes Upgrades // Lifes Upgrades
Item::LifeGGI => format!("Increases CONSTRUCT GreenLife. Item::LifeGGI => format!("Increases CONSTRUCT GreenLife.