diff --git a/client/assets/styles/game.css b/client/assets/styles/game.css
index 36d5b128..65f975f4 100644
--- a/client/assets/styles/game.css
+++ b/client/assets/styles/game.css
@@ -29,8 +29,7 @@
}
.opponent .combat-text {
- left: 40%;
- top: 65%;
+ top: 40%;
}
.opponent .game-construct {
@@ -204,8 +203,12 @@
font-size: 2em;
font-family: 'Jura';
position: absolute;
- top: 40%;
- left: 40%;
+ object-fit: contain;
+ top: 15%;
+}
+
+.combat-text svg {
+ height: 7em;
}
.game-construct.active-skill {
diff --git a/client/src/components/animations.jsx b/client/src/components/animations.jsx
index 56971485..bee94eae 100644
--- a/client/src/components/animations.jsx
+++ b/client/src/components/animations.jsx
@@ -5,14 +5,20 @@ const Attack = require('./anims/attack');
function animations(props) {
const { combatTextClass, combatText, stage, player, construct } = props;
- if (combatText === 'Attack') {
- return (
-
- );
+ const anim = text => {
+ switch (text) {
+ case 'Attack': return ;
+ default: return text;
+ }
+ };
+
+ if (combatText) {
+ const combatAnim = anim(combatText);
+ return
+ {combatAnim}
+
;
}
- if (combatText) return {combatText}
;
+
return (
);
}
diff --git a/client/src/components/anims/attack.jsx b/client/src/components/anims/attack.jsx
index e58b5214..4c5cbcfa 100644
--- a/client/src/components/anims/attack.jsx
+++ b/client/src/components/anims/attack.jsx
@@ -10,22 +10,24 @@ class Attack extends Component {
constructor(props) {
super();
this.props = props;
+ this.graphic = (
+
+
+
+
+
+ );
}
render() {
return (
);
}
@@ -35,22 +37,20 @@ class Attack extends Component {
if ((!this.props.team && this.props.stage === 'START_SKILL')
|| (this.props.team && this.props.stage === 'END_SKILL')) {
anime.set('.attack-anim', {
- translateY: -250,
- rotateX: 180,
+ rotateX: 0,
});
- value = '+=250px';
+ value = '+=250px',
}
if ((!this.props.team && this.props.stage === 'END_SKILL')
|| (this.props.team && this.props.stage === 'START_SKILL')) {
anime.set('.attack-anim', {
- translateY: 0,
rotateX: 0,
});
- value = '-=250px';
+ value = '-=250px',
}
anime({
- targets: ['.attack-anim'],
+ targets: [`.attack-anim-${this.props.id} polygon`],
translateY: {
value,
duration,
diff --git a/client/src/constants.jsx b/client/src/constants.jsx
index 6bf4de39..ee619980 100644
--- a/client/src/constants.jsx
+++ b/client/src/constants.jsx
@@ -3,6 +3,7 @@ module.exports = {
START_SKILL: 700,
END_SKILL: 700,
POST_SKILL: 1000,
+ DELAY: 150,
},
INFO: {
diff --git a/client/src/utils.jsx b/client/src/utils.jsx
index 3b506704..25039b98 100644
--- a/client/src/utils.jsx
+++ b/client/src/utils.jsx
@@ -204,14 +204,14 @@ function getCombatSequence(resolution) {
if (resolution.event[0] === 'Ko') return ['POST_SKILL'];
switch (resolution.stages) {
- case 1: return ['START_SKILL', 'END_SKILL'];
+ case 1: return ['START_SKILL', 'DELAY', 'END_SKILL'];
case 2: return ['START_SKILL', 'POST_SKILL'];
case 3: return ['START_SKILL'];
case 4: return ['END_SKILL', 'POST_SKILL'];
case 5: return ['END_SKILL'];
case 6: return ['POST_SKILL'];
case 7: return false;
- default: return ['START_SKILL', 'END_SKILL', 'POST_SKILL'];
+ default: return ['START_SKILL', 'DELAY', 'END_SKILL', 'POST_SKILL'];
}
}