-[1.8.3] - 2019-11-10
+[1.8.5] - 2019-11-16 ++Fixed
+-
+
- Multiple ko event bug +
+[1.8.4] - 2019-11-14
++Fixed
+-
+
- Bug with tutorial introduced in last patch +
+[1.8.3] - 2019-11-13
Added
-
@@ -739,7 +753,7 @@ pre {
- Condensed recipe display
-Fixed
+Fixed- Construct display on info / demo page
- Case where a skill could send multiple ko events to target @@ -754,7 +768,7 @@ pre {
- Purify
- Now removes all effects on target -
- Applies "Purified" increasing healing taken +
- Applies "Pure" increasing healing taken
- Purge
@@ -766,14 +780,14 @@ pre {
[1.8.2] - 2019-11-10
-Fixed
+Fixed- Duplicate button issue in reshape tab
[1.8.1] - 2019-11-09
-Fixed
+Fixed- An issue where skills would not be put on cooldown after being used.
[1.6.5] - 2019-10-25
-Fixed
+Fixed- Stripe being blocked no longer causes unrecoverable error
- Automatic ready up is now throttled after abandons @@ -1102,7 +1116,7 @@ pre {
-Fixed
+Fixed- Fixed issue where dots / hots would not trigger when reapplied at a higher speed
- Changed layout of home page. UI elements for rerolling construct avatars moved to a separate tab. @@ -1113,7 +1127,7 @@ pre {
- Combiner bug where it would preview items for different combinations
- Skill descriptions are cleared when animations start @@ -1152,7 +1166,7 @@ pre {
- Matchmaking bug where server matches you with yourself
[1.6.2] - 2019-10-20
-Fixed
+Fixed-Fixed
+Fixed
{abandonBtn}
+ {concedeBtn}
{drawBtn}
);
diff --git a/client/src/components/header.jsx b/client/src/components/header.jsx
index 76e96fe7..b591afe0 100644
--- a/client/src/components/header.jsx
+++ b/client/src/components/header.jsx
@@ -32,11 +32,9 @@ const addState = connect(
function setNav(place) {
dispatch(actions.setGame(null));
dispatch(actions.setInstance(null));
- dispatch(actions.setCombiner([]));
dispatch(actions.setReclaiming(false));
dispatch(actions.setActiveSkill(null));
dispatch(actions.setInfo(null));
- dispatch(actions.setItemEquip(null));
dispatch(actions.setItemUnequip([]));
dispatch(actions.setVboxHighlight([]));
dispatch(actions.setMtxActive(null));
diff --git a/client/src/components/info.container.jsx b/client/src/components/info.container.jsx
index aec4b282..8a8dbb6f 100644
--- a/client/src/components/info.container.jsx
+++ b/client/src/components/info.container.jsx
@@ -7,7 +7,6 @@ const addState = connect(
function receiveState(state) {
const {
ws,
- combiner,
info,
itemInfo,
instance,
@@ -18,7 +17,6 @@ const addState = connect(
return {
ws,
- combiner,
info,
itemInfo,
instance,
diff --git a/client/src/components/instance.component.jsx b/client/src/components/instance.component.jsx
index 23b0148a..8b6c2377 100644
--- a/client/src/components/instance.component.jsx
+++ b/client/src/components/instance.component.jsx
@@ -27,12 +27,10 @@ const addState = connect(
function clearItems() {
- dispatch(actions.setCombiner([]));
dispatch(actions.setReclaiming(false));
- dispatch(actions.setItemEquip(null));
dispatch(actions.setItemUnequip([]));
dispatch(actions.setVboxHighlight([]));
- dispatch(actions.setVboxSelected([]));
+ dispatch(actions.setVboxSelected({ shopSelect: [], stashSelect: [] }));
return true;
}
diff --git a/client/src/components/instance.constructs.jsx b/client/src/components/instance.constructs.jsx
index 577fe84c..59e77b10 100644
--- a/client/src/components/instance.constructs.jsx
+++ b/client/src/components/instance.constructs.jsx
@@ -19,24 +19,19 @@ const addState = connect(
player,
account,
itemInfo,
- itemEquip,
itemUnequip,
vboxSelected,
tutorial,
} = state;
function sendVboxAcceptEquip(constructId) {
- return ws.sendVboxAcceptEquip(instance.id, vboxSelected[0], vboxSelected[1], constructId);
+ return ws.sendVboxAcceptEquip(instance.id, vboxSelected.shopSelect[0][0], vboxSelected.shopSelect[0][1], constructId);
}
function sendVboxApply(constructId, i) {
return ws.sendVboxApply(instance.id, constructId, i);
}
- function sendUnequip(constructId, item) {
- return ws.sendVboxUnequip(instance.id, constructId, item);
- }
-
function sendVboxUnequipApply(targetConstructId) {
return ws.sendVboxUnequipApply(instance.id, itemUnequip[0], itemUnequip[1], targetConstructId);
}
@@ -49,9 +44,7 @@ const addState = connect(
sendVboxUnequipApply,
sendVboxApply,
itemInfo,
- itemEquip,
itemUnequip,
- sendUnequip,
vboxSelected,
tutorial,
};
@@ -66,15 +59,12 @@ const addState = connect(
dispatch(actions.setInfo(item));
}
- function setItemEquip(v) {
- return dispatch(actions.setItemEquip(v));
- }
-
function setItemUnequip(v) {
+ dispatch(actions.setVboxSelected({ shopSelect: [], stashSelect: [] }));
return dispatch(actions.setItemUnequip(v));
}
- return { quit, setInfo, setItemUnequip, setItemEquip };
+ return { quit, setInfo, setItemUnequip };
}
);
@@ -84,7 +74,6 @@ function Construct(props) {
// Changing state variables
construct,
iter,
- itemEquip,
itemUnequip,
instance,
player,
@@ -96,13 +85,16 @@ function Construct(props) {
sendVboxApply,
sendVboxAcceptEquip,
sendVboxUnequipApply,
- sendUnequip,
setItemUnequip,
- setItemEquip,
setInfo,
} = props;
+
const { vbox } = player;
+ const itemEquip = vboxSelected.shopSelect.length === 0 && vboxSelected.stashSelect.length === 1
+ ? vboxSelected.stashSelect[0]
+ : -1;
+
const duplicateSkill = construct.skills.length !== 0 && construct.skills.every(sk => {
if (!itemEquip && itemEquip !== 0) return false;
if (!sk) return false;
@@ -113,17 +105,16 @@ function Construct(props) {
e.stopPropagation();
e.preventDefault();
if (duplicateSkill || tutorialDisableEquip) return true;
- if (itemEquip !== null) return sendVboxApply(construct.id, itemEquip);
- if (vboxSelected[0]) return sendVboxAcceptEquip(construct.id);
+ if (itemEquip !== -1) return sendVboxApply(construct.id, itemEquip);
+ if (vboxSelected.shopSelect.length === 1) return sendVboxAcceptEquip(construct.id);
if (itemUnequip.length && itemUnequip[0] !== construct.id) return sendVboxUnequipApply(construct.id);
- setItemEquip(null);
setItemUnequip([]);
return true;
}
-
function hoverInfo(e, info) {
- if (!info) return false;
e.stopPropagation();
+ if (!info) return false;
+ if (vboxSelected.shopSelect.length || vboxSelected.stashSelect.length) return false;
return setInfo(info);
}
@@ -138,20 +129,11 @@ function Construct(props) {
function skillClick(e) {
if (!skill) return false;
- setItemUnequip([construct.id, skill.skill]);
+ setItemUnequip([construct.id, skill.skill, i]);
e.stopPropagation();
return true;
}
- function skillDblClick(e) {
- if (!skill) return false;
- sendUnequip(construct.id, skill.skill);
- setItemUnequip([]);
- e.stopPropagation();
- e.preventDefault();
- return true;
- }
-
const equipping = skillList.includes(vbox.bound[itemEquip]) && !skill
&& !tutorialDisableEquip && !duplicateSkill && i === construct.skills.length;
const border = () => {
@@ -161,7 +143,9 @@ function Construct(props) {
return borderFn();
};
- const classes = `${equipping ? 'equipping' : ''} ${!skill ? 'empty' : ''} ${border()}`;
+ const highlight = itemUnequip[0] === construct.id && itemUnequip[1] === s ? 'highlight' : '';
+
+ const classes = `${highlight} ${equipping ? 'equipping' : ''} ${!skill ? 'empty' : ''} ${border()}`;
return (