selectSkillTarget(cryp.id)} >
+ onClick={() => selectSkillTarget(construct.id)} >
{stats}
-
{cryp.name}
+
{construct.name}
{effects}
{targeting}
selectSkillTarget(cryp.id)} >
- {crypAvatar(cryp.name, cryp.id)}
+ onClick={() => selectSkillTarget(construct.id)} >
+ {constructAvatar(construct.name, construct.id)}
{combatTextEl}
{anim}
@@ -173,10 +173,10 @@ function GamePanel(props) {
function OpponentTeam(team) {
- const cryps = team.cryps.map(OpponentCryp);
+ const constructs = team.constructs.map(OpponentConstruct);
return (
- {cryps}
+ {constructs}
);
}
@@ -185,7 +185,7 @@ function GamePanel(props) {
function gameClick(e) {
e.stopPropagation();
- setActiveCryp(null);
+ setActiveConstruct(null);
}
return (
diff --git a/client/src/components/game.container.jsx b/client/src/components/game.container.jsx
index 03c421dc..50ebb468 100644
--- a/client/src/components/game.container.jsx
+++ b/client/src/components/game.container.jsx
@@ -13,12 +13,12 @@ const addState = connect(
resolution,
showLog,
activeSkill,
- activeCryp,
+ activeConstruct,
} = state;
- function selectSkillTarget(targetCrypId) {
+ function selectSkillTarget(targetConstructId) {
if (activeSkill) {
- return ws.sendGameSkill(game.id, activeSkill.crypId, targetCrypId, activeSkill.skill);
+ return ws.sendGameSkill(game.id, activeSkill.constructId, targetConstructId, activeSkill.skill);
}
return false;
}
@@ -34,7 +34,7 @@ const addState = connect(
// intercept self casting skills
if (activeSkill && activeSkill.skill.self_targeting) {
- ws.sendGameSkill(game.id, activeSkill.crypId, null, activeSkill.skill.skill);
+ ws.sendGameSkill(game.id, activeSkill.constructId, null, activeSkill.skill.skill);
}
return {
@@ -43,7 +43,7 @@ const addState = connect(
account,
resolution,
activeSkill,
- activeCryp,
+ activeConstruct,
selectSkillTarget,
sendInstanceState,
sendGameReady,
@@ -51,13 +51,13 @@ const addState = connect(
},
function receiveDispatch(dispatch) {
- function setActiveSkill(crypId, skill) {
- dispatch(actions.setActiveSkill(crypId, skill));
- // particlesJS(`particles-${crypId}`, config);
+ function setActiveSkill(constructId, skill) {
+ dispatch(actions.setActiveSkill(constructId, skill));
+ // particlesJS(`particles-${constructId}`, config);
}
- function setActiveCryp(cryp) {
- dispatch(actions.setActiveCryp(cryp));
+ function setActiveConstruct(construct) {
+ dispatch(actions.setActiveConstruct(construct));
}
function quit() {
@@ -73,7 +73,7 @@ const addState = connect(
dispatch(actions.setSkip(true));
}
- return { setActiveSkill, setActiveCryp, quit, toggleLog, skip };
+ return { setActiveSkill, setActiveConstruct, quit, toggleLog, skip };
}
);
diff --git a/client/src/components/game.cryp.jsx b/client/src/components/game.cryp.jsx
index 89bb2305..f26f8ff3 100644
--- a/client/src/components/game.cryp.jsx
+++ b/client/src/components/game.cryp.jsx
@@ -3,7 +3,7 @@ const preact = require('preact');
const range = require('lodash/range');
const actions = require('../actions');
-const { STATS, eventClasses, getCombatText, crypAvatar } = require('../utils');
+const { STATS, eventClasses, getCombatText, constructAvatar } = require('../utils');
const { animationDivs } = require('../animations');
const SkillBtn = require('./skill.btn');
@@ -18,16 +18,16 @@ const addState = connect(
activeSkill,
} = state;
- function selectSkillTarget(targetCrypId) {
+ function selectSkillTarget(targetConstructId) {
if (activeSkill) {
- return ws.sendGameSkill(game.id, activeSkill.crypId, targetCrypId, activeSkill.skill);
+ return ws.sendGameSkill(game.id, activeSkill.constructId, targetConstructId, activeSkill.skill);
}
return false;
}
// intercept self casting skills
if (activeSkill && activeSkill.skill.self_targeting) {
- ws.sendGameSkill(game.id, activeSkill.crypId, null, activeSkill.skill.skill);
+ ws.sendGameSkill(game.id, activeSkill.constructId, null, activeSkill.skill.skill);
}
return {
@@ -40,48 +40,48 @@ const addState = connect(
},
);
-function GameCryp(props) {
+function GameConstruct(props) {
const {
game,
account,
- cryp,
+ construct,
resolution,
activeSkill,
- setActiveCryp,
+ setActiveConstruct,
selectSkillTarget,
} = props;
- const ko = cryp.green_life.value === 0 ? 'ko' : '';
- const classes = eventClasses(resolution, cryp);
+ const ko = construct.green_life.value === 0 ? 'ko' : '';
+ const classes = eventClasses(resolution, construct);
const skills = range(0, 3)
- .map(i =>
);
+ .map(i =>
);
const stats = [STATS.greenLife, STATS.redLife, STATS.blueLife].map((s, j) => {
// i've seen this happen ;/
- if (cryp[s.stat].value < 0) console.warn(cryp);
+ if (construct[s.stat].value < 0) console.warn(construct);
return
{s.svg(`stat-icon ${s.colour}`)}
- {cryp[s.stat].value} / {cryp[s.stat].max}
+ {construct[s.stat].value} / {construct[s.stat].max}
});
- const [combatText, combatClass] = getCombatText(cryp, resolution);
+ const [combatText, combatClass] = getCombatText(construct, resolution);
const combatTextClass = `combat-text ${combatClass}`;
const combatTextEl = combatText
?
{combatText}
: null;
- const effects = cryp.effects.length
- ? cryp.effects.map(c =>
{c.effect} - {c.duration}T
)
+ const effects = construct.effects.length
+ ? construct.effects.map(c =>
{c.effect} - {c.duration}T
)
:
;
const playerTeam = game.players.find(t => t.id === account.id);
- const playerTeamIds = playerTeam.cryps.map(c => c.id);
+ const playerTeamIds = playerTeam.constructs.map(c => c.id);
const targeting = game.stack
- .filter(s => playerTeamIds.includes(s.source_cryp_id) && s.target_cryp_id === cryp.id)
+ .filter(s => playerTeamIds.includes(s.source_construct_id) && s.target_construct_id === construct.id)
.map((s, i) =>
{`< ${s.skill}`}
);
const anim = (
@@ -93,9 +93,9 @@ function GameCryp(props) {
return (
+ className={`game-construct ${ko} ${classes}`} >
- {cryp.name}
+ {construct.name}
{skills}
@@ -105,8 +105,8 @@ function GameCryp(props) {
selectSkillTarget(cryp.id)} >
- {crypAvatar(cryp.name, cryp.id)}
+ onClick={() => selectSkillTarget(construct.id)} >
+ {constructAvatar(construct.name, construct.id)}
{combatTextEl}
{anim}
@@ -120,4 +120,4 @@ function GameCryp(props) {
);
}
-module.exports = addState(GameCryp);
+module.exports = addState(GameConstruct);
diff --git a/client/src/components/header.component.jsx b/client/src/components/header.component.jsx
index 1a5077bd..1df1afc4 100644
--- a/client/src/components/header.component.jsx
+++ b/client/src/components/header.component.jsx
@@ -23,7 +23,7 @@ function renderHeader(args) {
return (
- cryps.gg
+ mnml.gg
{accountStatus}
diff --git a/client/src/components/info.component.jsx b/client/src/components/info.component.jsx
index 2c7f2dc8..8af1fbef 100644
--- a/client/src/components/info.component.jsx
+++ b/client/src/components/info.component.jsx
@@ -27,10 +27,10 @@ function Info(args) {
let red = 0;
let blue = 0;
let green = 0;
- player.cryps.forEach(cryp => {
- red += cryp.colours.red;
- blue += cryp.colours.blue;
- green += cryp.colours.green;
+ player.constructs.forEach(construct => {
+ red += construct.colours.red;
+ blue += construct.colours.blue;
+ green += construct.colours.green;
});
const teamColours = { red, blue, green };
diff --git a/client/src/components/instance.component.jsx b/client/src/components/instance.component.jsx
index e8fb641b..dff4d03c 100644
--- a/client/src/components/instance.component.jsx
+++ b/client/src/components/instance.component.jsx
@@ -3,7 +3,7 @@ const { connect } = require('react-redux');
const Vbox = require('./vbox.component');
const InfoContainer = require('./info.container');
-const InstanceCrypsContainer = require('./instance.cryps');
+const InstanceConstructsContainer = require('./instance.constructs');
const EquipmentContainer = require('./instance.equip');
const actions = require('../actions');
@@ -137,7 +137,7 @@ function Instance(args) {
-
+
);
}
diff --git a/client/src/components/instance.create.form.jsx b/client/src/components/instance.create.form.jsx
index 6eefda23..77a8abfc 100644
--- a/client/src/components/instance.create.form.jsx
+++ b/client/src/components/instance.create.form.jsx
@@ -6,9 +6,9 @@ const addState = connect(
function receiveState(state) {
const { ws, team } = state;
- function sendInstanceNew(sCryps, name, players) {
- if (sCryps.length) {
- return ws.sendInstanceNew(sCryps, name, players);
+ function sendInstanceNew(sConstructs, name, players) {
+ if (sConstructs.length) {
+ return ws.sendInstanceNew(sConstructs, name, players);
}
return false;
}
diff --git a/client/src/components/instance.cryps.jsx b/client/src/components/instance.cryps.jsx
index 4906520c..6e86b3ee 100644
--- a/client/src/components/instance.cryps.jsx
+++ b/client/src/components/instance.cryps.jsx
@@ -3,24 +3,24 @@ const preact = require('preact');
const range = require('lodash/range');
const shapes = require('./shapes');
-const { SPECS, STATS, instanceCryp } = require('../utils');
+const { SPECS, STATS, instanceConstruct } = require('../utils');
const actions = require('../actions');
const addState = connect(
function receiveState(state) {
- const { ws, instance, account, itemInfo, itemEquip, activeCryp } = state;
+ const { ws, instance, account, itemInfo, itemEquip, activeConstruct } = state;
const player = instance.players.find(p => p.id === account.id);
function sendInstanceReady() {
return ws.sendInstanceReady(instance.id);
}
- function sendVboxApply(crypId, i) {
- return ws.sendVboxApply(instance.id, crypId, i);
+ function sendVboxApply(constructId, i) {
+ return ws.sendVboxApply(instance.id, constructId, i);
}
- function sendUnequip(crypId, item) {
- return ws.sendVboxUnequip(instance.id, crypId, item);
+ function sendUnequip(constructId, item) {
+ return ws.sendVboxUnequip(instance.id, constructId, item);
}
return {
@@ -31,7 +31,7 @@ const addState = connect(
sendVboxApply,
itemInfo,
itemEquip,
- activeCryp,
+ activeConstruct,
sendUnequip,
};
},
@@ -45,8 +45,8 @@ const addState = connect(
dispatch(actions.setInfo(item));
}
- function setActiveCryp(value) {
- dispatch(actions.setActiveCryp(value));
+ function setActiveConstruct(value) {
+ dispatch(actions.setActiveConstruct(value));
}
function clearInfo() {
@@ -61,19 +61,19 @@ const addState = connect(
return dispatch(actions.setItemUnequip(v));
}
- return { quit, clearInfo, setInfo, setActiveCryp, setItemUnequip, setItemEquip };
+ return { quit, clearInfo, setInfo, setActiveConstruct, setItemUnequip, setItemEquip };
}
);
-function Cryp(props) {
+function Construct(props) {
const {
- activeCryp,
+ activeConstruct,
itemEquip,
- cryp,
+ construct,
player,
sendVboxApply,
- setActiveCryp,
+ setActiveConstruct,
setItemUnequip,
setItemEquip,
itemInfo,
@@ -84,9 +84,9 @@ function Cryp(props) {
function onClick(e) {
e.stopPropagation();
e.preventDefault();
- if (itemEquip !== null) sendVboxApply(cryp.id, itemEquip);
+ if (itemEquip !== null) sendVboxApply(construct.id, itemEquip);
setItemEquip(null);
- return setActiveCryp(cryp);
+ return setActiveConstruct(construct);
}
function hoverInfo(e, info) {
@@ -100,7 +100,7 @@ function Cryp(props) {
const specList = itemInfo.items.filter(v => v.spec).map(v => v.item);
const skills = range(0, 3).map(i => {
- const skill = cryp.skills[i];
+ const skill = construct.skills[i];
const s = skill
? skill.skill
: (
+);
@@ -108,15 +108,15 @@ function Cryp(props) {
function skillClick(e) {
if (!skill) return false;
setItemUnequip(skill.skill);
- setActiveCryp(cryp);
+ setActiveConstruct(construct);
e.stopPropagation();
return true;
}
function skillDblClick(e) {
if (!skill) return false;
- sendUnequip(cryp.id, skill.skill);
- setActiveCryp(null);
+ sendUnequip(construct.id, skill.skill);
+ setActiveConstruct(null);
setItemUnequip(null);
e.stopPropagation();
e.preventDefault();
@@ -140,7 +140,7 @@ function Cryp(props) {
});
const specs = range(0, 6).map(i => {
- const s = cryp.specs[i];
+ const s = construct.specs[i];
if (!s) {
const equip = specList.includes(vbox.bound[itemEquip]) ? 'equip-spec' : 'gray';
@@ -155,12 +155,12 @@ function Cryp(props) {
function specClick(e) {
e.stopPropagation();
setItemUnequip(s);
- setActiveCryp(cryp);
+ setActiveConstruct(construct);
}
function specDblClick(e) {
- sendUnequip(cryp.id, s);
- setActiveCryp(null);
+ sendUnequip(construct.id, s);
+ setActiveConstruct(null);
setItemUnequip(null);
e.stopPropagation();
e.preventDefault();
@@ -183,14 +183,14 @@ function Cryp(props) {
const stats = Object.values(STATS).map(s => (
{s.svg(`stat-icon ${s.colour} stat`)}
- {cryp[s.stat].value}
+ {construct[s.stat].value}
));
- const activeId = activeCryp ? activeCryp.id : false;
- const crypClass = activeId === cryp.id ? 'instance-cryp-active' : 'instance-cryp';
+ const activeId = activeConstruct ? activeConstruct.id : false;
+ const constructClass = activeId === construct.id ? 'instance-construct-active' : 'instance-construct';
- // const cTotal = cryp.colours.red + cryp.colours.blue + cryp.colours.green;
- // const colours = mapValues(cryp.colours, c => {
+ // const cTotal = construct.colours.red + construct.colours.blue + construct.colours.green;
+ // const colours = mapValues(construct.colours, c => {
// if (cTotal === 0) return 245;
// return Math.floor(c / cTotal * 255);
// });
@@ -204,13 +204,13 @@ function Cryp(props) {
// const border = { border: `${thickness(cTotal)}px solid rgba(${colours.red}, ${colours.green}, ${colours.blue}, ${alpha})` };
return (
-
- {instanceCryp(cryp.name, cryp.id)}
-
{cryp.name}
-
hoverInfo(e, 'crypSkills')} >
+
+ {instanceConstruct(construct.name, construct.id)}
+
{construct.name}
+
hoverInfo(e, 'constructSkills')} >
{skills}
-
hoverInfo(e, 'crypSpecs')} >
+
hoverInfo(e, 'constructSpecs')} >
{specs}
@@ -231,15 +231,15 @@ function Cryp(props) {
);
}
-function InstanceCryps(props) {
+function InstanceConstructs(props) {
const {
- activeCryp,
+ activeConstruct,
itemEquip,
player,
instance,
// clearInfo,
setInfo,
- setActiveCryp,
+ setActiveConstruct,
sendVboxApply,
itemInfo,
@@ -252,27 +252,27 @@ function InstanceCryps(props) {
if (!player) return false;
if (instance.phase === 'Lobby') return false;
- const cryps = player.cryps.map((c, i) => Cryp({
- cryp: c,
- activeCryp,
+ const constructs = player.constructs.map((c, i) => Construct({
+ construct: c,
+ activeConstruct,
itemEquip,
setItemUnequip,
setItemEquip,
player,
sendVboxApply,
setInfo,
- setActiveCryp,
+ setActiveConstruct,
itemInfo,
setVboxHighlight,
sendUnequip,
}));
- const classes = `cryp-list`;
+ const classes = `construct-list`;
return (
-
setActiveCryp(null)}>
- {cryps}
+
setActiveConstruct(null)}>
+ {constructs}
);
}
-module.exports = addState(InstanceCryps);
+module.exports = addState(InstanceConstructs);
diff --git a/client/src/components/instance.equip.jsx b/client/src/components/instance.equip.jsx
index 174d8fb4..fa5f8813 100644
--- a/client/src/components/instance.equip.jsx
+++ b/client/src/components/instance.equip.jsx
@@ -8,14 +8,14 @@ const { convertItem, SPECS } = require('./../utils');
const addState = connect(
function receiveState(state) {
- const { account, activeCryp, itemInfo, info, ws, instance, itemUnequip } = state;
+ const { account, activeConstruct, itemInfo, info, ws, instance, itemUnequip } = state;
const player = instance.players.find(p => p.id === account.id);
- function sendUnequip(crypId, item) {
- return ws.sendVboxUnequip(instance.id, crypId, item);
+ function sendUnequip(constructId, item) {
+ return ws.sendVboxUnequip(instance.id, constructId, item);
}
- return { player, itemInfo, instance, info, sendUnequip, activeCryp, itemUnequip };
+ return { player, itemInfo, instance, info, sendUnequip, activeConstruct, itemUnequip };
},
function receiveDispatch(dispatch) {
@@ -48,7 +48,7 @@ function Equipment(props) {
itemUnequip,
setItemEquip,
setItemUnequip,
- activeCryp,
+ activeConstruct,
itemInfo,
sendUnequip,
@@ -65,7 +65,7 @@ function Equipment(props) {
const isSpec = fullInfo && fullInfo.spec;
function skillClick(e, i) {
- if (itemUnequip && activeCryp) return false;
+ if (itemUnequip && activeConstruct) return false;
const value = vbox.bound[i];
setItemEquip(i);
return false;
@@ -74,9 +74,9 @@ function Equipment(props) {
function unequipClick(e) {
e.stopPropagation();
if (!itemUnequip) return false;
- if (!activeCryp) return false;
+ if (!activeConstruct) return false;
setItemUnequip(null);
- return sendUnequip(activeCryp.id, itemUnequip);
+ return sendUnequip(activeConstruct.id, itemUnequip);
}
function hoverInfo(e, info) {
diff --git a/client/src/components/list.jsx b/client/src/components/list.jsx
index de57c909..18674f30 100644
--- a/client/src/components/list.jsx
+++ b/client/src/components/list.jsx
@@ -7,7 +7,7 @@ const InstanceCreateForm = require('./instance.create.form');
const addState = connect(
function receiveState(state) {
- const { ws, cryps, team, instances, account } = state;
+ const { ws, constructs, team, instances, account } = state;
function sendInstanceJoin(instance) {
if (team.length) {
@@ -26,7 +26,7 @@ const addState = connect(
return {
account,
- cryps,
+ constructs,
team,
sendInstanceJoin,
sendInstanceState,
diff --git a/client/src/components/menu.component.jsx b/client/src/components/menu.component.jsx
index 0356ffd3..479e0eff 100644
--- a/client/src/components/menu.component.jsx
+++ b/client/src/components/menu.component.jsx
@@ -3,7 +3,7 @@ const range = require('lodash/range');
const { NULL_UUID } = require('./../utils');
-const { stringSort, crypAvatar } = require('./../utils');
+const { stringSort, constructAvatar } = require('./../utils');
const SpawnButton = require('./spawn.button');
const InstanceCreateForm = require('./instance.create.form');
@@ -19,14 +19,14 @@ const COLOURS = [
function Menu(args) {
const {
account,
- cryps,
+ constructs,
team,
setTeam,
sendInstanceState,
- sendPlayerMmCrypsSet,
+ sendPlayerMmConstructsSet,
sendInstanceJoin,
sendInstanceList,
- sendCrypSpawn,
+ sendConstructSpawn,
instances,
} = args;
@@ -61,7 +61,7 @@ function Menu(args) {
//
// );
@@ -88,12 +88,12 @@ function Menu(args) {
);
}
- function crypList() {
- if (!cryps) return
;
+ function constructList() {
+ if (!constructs) return
;
// redux limitation + suggested workaround
// so much for dumb components
- function selectCryp(id) {
+ function selectConstruct(id) {
// remove
const i = team.findIndex(sid => sid === id);
if (i > -1) {
@@ -108,37 +108,37 @@ function Menu(args) {
return setTeam(team);
}
- const crypPanels = cryps.sort(idSort).map(cryp => {
- const colour = team.indexOf(cryp.id);
+ const constructPanels = constructs.sort(idSort).map(construct => {
+ const colour = team.indexOf(construct.id);
const selected = colour > -1;
const borderColour = selected ? COLOURS[colour] : '#000000';
return (
+ key={construct.id}
+ className="menu-construct-ctr">
selectCryp(cryp.id)} >
- {crypAvatar(cryp.name)}
-
{cryp.name}
+ onClick={() => selectConstruct(construct.id)} >
+ {constructAvatar(construct.name)}
+ {construct.name}
);
});
- const spawnButtonsNum = cryps.length < 3
- ? (3 - cryps.length)
+ const spawnButtonsNum = constructs.length < 3
+ ? (3 - constructs.length)
: 1;
const spawnButtons = range(spawnButtonsNum)
- .map(i =>
sendCrypSpawn(name)} />);
+ .map(i => sendConstructSpawn(name)} />);
return (
-
- {crypPanels}
+
+ {constructPanels}
{spawnButtons}
);
diff --git a/client/src/components/menu.container.jsx b/client/src/components/menu.container.jsx
index bd2fecc1..a43dab97 100644
--- a/client/src/components/menu.container.jsx
+++ b/client/src/components/menu.container.jsx
@@ -5,7 +5,7 @@ const actions = require('./../actions');
const addState = connect(
function receiveState(state) {
- const { ws, cryps, team, instances, account } = state;
+ const { ws, constructs, team, instances, account } = state;
function sendInstanceJoin(instance) {
if (team.length) {
@@ -14,15 +14,15 @@ const addState = connect(
return false;
}
- function sendPlayerMmCrypsSet() {
+ function sendPlayerMmConstructsSet() {
if (team.length) {
- return ws.sendPlayerMmCrypsSet(team);
+ return ws.sendPlayerMmConstructsSet(team);
}
return false;
}
- function sendCrypSpawn(name) {
- return ws.sendCrypSpawn(name);
+ function sendConstructSpawn(name) {
+ return ws.sendConstructSpawn(name);
}
function sendInstanceState(instance) {
@@ -35,20 +35,20 @@ const addState = connect(
return {
account,
- cryps,
+ constructs,
team,
sendInstanceJoin,
sendInstanceState,
sendInstanceList,
- sendCrypSpawn,
- sendPlayerMmCrypsSet,
+ sendConstructSpawn,
+ sendPlayerMmConstructsSet,
instances,
};
},
function receiveDispatch(dispatch) {
- function setTeam(crypIds) {
- dispatch(actions.setTeam(crypIds));
+ function setTeam(constructIds) {
+ dispatch(actions.setTeam(constructIds));
}
return {
diff --git a/client/src/components/nav.jsx b/client/src/components/nav.jsx
index c06bc2d6..30a99040 100644
--- a/client/src/components/nav.jsx
+++ b/client/src/components/nav.jsx
@@ -15,7 +15,7 @@ const addState = connect(
account,
instances,
team,
- cryps,
+ constructs,
game,
} = state;
@@ -27,7 +27,7 @@ const addState = connect(
account,
instances,
team,
- cryps,
+ constructs,
game,
sendInstanceState,
};
@@ -60,7 +60,7 @@ function Nav(args) {
account,
sendInstanceState,
team,
- cryps,
+ constructs,
instances,
game,
@@ -81,8 +81,8 @@ function Nav(args) {
const teamElements = team.map((c, i) => {
if (c) {
- const cryp = cryps.find(f => f.id === c);
- return
;
+ const construct = constructs.find(f => f.id === c);
+ return
;
}
return
;
});
diff --git a/client/src/components/skill.btn.jsx b/client/src/components/skill.btn.jsx
index 548a8cc1..0a1742a1 100644
--- a/client/src/components/skill.btn.jsx
+++ b/client/src/components/skill.btn.jsx
@@ -17,8 +17,8 @@ const addState = connect(
},
function receiveDispatch(dispatch) {
- function setActiveSkill(crypId, skill) {
- dispatch(actions.setActiveSkill(crypId, skill));
+ function setActiveSkill(constructId, skill) {
+ dispatch(actions.setActiveSkill(constructId, skill));
}
return { setActiveSkill };
@@ -28,7 +28,7 @@ const addState = connect(
function Skill(props) {
const {
- cryp,
+ construct,
game,
i,
mobile,
@@ -36,14 +36,14 @@ function Skill(props) {
setActiveSkill,
} = props;
- const s = cryp.skills[i];
- const ko = cryp.green_life.value === 0 ? 'ko' : '';
+ const s = construct.skills[i];
+ const ko = construct.green_life.value === 0 ? 'ko' : '';
if (!s) {
return (
);
}
@@ -52,25 +52,25 @@ function Skill(props) {
? 'top'
: '';
- const cdText = cryp.skills[i].cd > 0
+ const cdText = construct.skills[i].cd > 0
? `- ${s.cd}T`
: '';
const highlight = activeSkill
- ? activeSkill.crypId === cryp.id && activeSkill.skill === s.skill
+ ? activeSkill.constructId === construct.id && activeSkill.skill === s.skill
: false;
function onClick(e) {
e.stopPropagation();
- return setActiveSkill(cryp.id, s.skill);
+ return setActiveSkill(construct.id, s.skill);
}
- const targeting = game.stack.some(stack => stack.source_cryp_id === cryp.id && stack.skill === s.skill);
+ const targeting = game.stack.some(stack => stack.source_construct_id === construct.id && stack.skill === s.skill);
return (