diff --git a/VERSION b/VERSION
index 8e03717d..a73b4325 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5.1
\ No newline at end of file
+1.5.2
\ No newline at end of file
diff --git a/acp/package.json b/acp/package.json
index de966aac..809c390d 100644
--- a/acp/package.json
+++ b/acp/package.json
@@ -1,6 +1,6 @@
{
"name": "mnml-client",
- "version": "1.5.1",
+ "version": "1.5.2",
"description": "",
"main": "index.js",
"scripts": {
diff --git a/client/assets/mnml.logo.trim.svg b/client/assets/mnml.logo.trim.svg
new file mode 100644
index 00000000..63f45668
--- /dev/null
+++ b/client/assets/mnml.logo.trim.svg
@@ -0,0 +1,2626 @@
+
+
+
+
diff --git a/client/assets/styles/game.less b/client/assets/styles/game.less
index a8765ba5..5e9586de 100644
--- a/client/assets/styles/game.less
+++ b/client/assets/styles/game.less
@@ -187,6 +187,11 @@
align-self: center;
text-align: center;
height: auto;
+ svg {
+ display: inline;
+ height: 1em;
+ margin-right: 0.1em
+ }
}
/* some stupid bug in chrome makes it fill the entire screen */
diff --git a/client/assets/styles/styles.less b/client/assets/styles/styles.less
index 2a1d8451..589fc2d8 100644
--- a/client/assets/styles/styles.less
+++ b/client/assets/styles/styles.less
@@ -288,7 +288,7 @@ li {
.logo {
height: 2em;
- background-image: url("../../src/components/svgs/menu.logo.svg");
+ background-image: url("../../assets/mnml.logo.trim.svg");
background-size: contain;
background-repeat: no-repeat;
background-position: left;
diff --git a/client/assets/styles/styles.mobile.css b/client/assets/styles/styles.mobile.css
index ec43c8d2..8cc73e6f 100644
--- a/client/assets/styles/styles.mobile.css
+++ b/client/assets/styles/styles.mobile.css
@@ -3,7 +3,7 @@
font-size: 12pt;
padding: 0;
grid-template-columns: 1fr;
- grid-template-rows: 1fr min-content;
+ grid-template-rows: 10fr 1fr;
grid-template-areas:
"main"
"footer";
@@ -31,6 +31,9 @@
footer {
display: flex;
+ position: fixed;
+ bottom: 0;
+ width: 100%;
}
#nav-btn, #instance-nav {
diff --git a/client/package.json b/client/package.json
index bdfacdc3..4fd0e2f6 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
{
"name": "mnml-client",
- "version": "1.5.1",
+ "version": "1.5.2",
"description": "",
"main": "index.js",
"scripts": {
diff --git a/client/src/animations.utils.jsx b/client/src/animations.utils.jsx
index feda087b..39ef17ef 100644
--- a/client/src/animations.utils.jsx
+++ b/client/src/animations.utils.jsx
@@ -74,8 +74,8 @@ function getObjects(resolution, stages, game, account) {
function getSequence(resolution) {
if (!resolution.event) return [];
if (resolution.event[0] === 'Inversion') return [];
+ if (['TargetKo', 'Ko'].includes(resolution.event[0])) return [];
if (['Skill', 'AoeSkill'].includes(resolution.event[0])) return ['START_SKILL', 'END_SKILL'];
- if (resolution.event[0] === 'Ko') return ['POST_SKILL'];
switch (resolution.stages) {
case 'AllStages': return ['START_SKILL', 'END_SKILL', 'POST_SKILL'];
diff --git a/client/src/components/game.footer.jsx b/client/src/components/game.footer.jsx
index 40095d45..101318a4 100644
--- a/client/src/components/game.footer.jsx
+++ b/client/src/components/game.footer.jsx
@@ -52,6 +52,8 @@ function GameFooter(props) {
sendInstanceState,
} = props;
+ if (!game) return false; // ???
+
const playerTeam = game.players.find(t => t.id === account.id);
function quitClick() {
diff --git a/client/src/components/instance.footer.jsx b/client/src/components/instance.footer.jsx
index 82e01681..90c3bc37 100644
--- a/client/src/components/instance.footer.jsx
+++ b/client/src/components/instance.footer.jsx
@@ -32,7 +32,7 @@ function Instance(args) {
sendInstanceReady,
} = args;
-
+ if (!instance) return false;
const rdyClasses = `ready-btn ready`;
const readyInfo = instance.phase === 'Lobby'
? 'lobbyReady'
diff --git a/client/src/components/play.ctrl.jsx b/client/src/components/play.ctrl.jsx
index 4b0ed01c..1f4c0d4c 100644
--- a/client/src/components/play.ctrl.jsx
+++ b/client/src/components/play.ctrl.jsx
@@ -106,7 +106,7 @@ function JoinButtons(args) {
try {
document.execCommand('copy');
- infoToast('Invite link copied.');
+ infoToast('Invite link copied to clipboard.');
} catch (err) {
console.error('link copy error', err);
errorToast('Invite link copy error.');
diff --git a/client/src/components/targeting.arrows.jsx b/client/src/components/targeting.arrows.jsx
index 6ea195f1..7d401887 100644
--- a/client/src/components/targeting.arrows.jsx
+++ b/client/src/components/targeting.arrows.jsx
@@ -2,12 +2,15 @@ const preact = require('preact');
const { Component } = require('preact');
const { connect } = require('preact-redux');
// const anime = require('animejs').default;
-
+const reactStringReplace = require('react-string-replace');
const throttle = require('lodash/throttle');
+const shapes = require('./shapes');
+const { removeTier } = require('../utils');
+
const addState = connect(
- ({ game, account, animTarget, animating }) =>
- ({ game, account, animTarget, animating })
+ ({ game, account, animTarget, animating, itemInfo }) =>
+ ({ game, account, animTarget, animating, itemInfo })
);
class TargetSvg extends Component {
@@ -25,7 +28,7 @@ class TargetSvg extends Component {
}
render(props, state) {
- const { game, account, animating, animTarget } = props;
+ const { game, account, animating, animTarget, itemInfo } = props;
const { width, height } = state;
if (!game) return false; // game will be null when battle ends
@@ -33,9 +36,17 @@ class TargetSvg extends Component {
// just put skill name up
if (animating) {
if (!animTarget) return false;
-
+ const itemSource = itemInfo.combos.filter(c => c.item === removeTier(animTarget.skill));
+ const itemSourceInfo = itemSource.length
+ ? `${itemSource[0].components[0]} ${itemSource[0].components[1]} ${itemSource[0].components[2]}`
+ : false;
+ const itemRegEx = /(Red|Blue|Green)/;
+ const itemSourceDescription = reactStringReplace(itemSourceInfo, itemRegEx, match => shapes[match]());
return (
- {animTarget.skill}
+
+
{animTarget.skill}
+
{itemSourceDescription}
+