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

Merge tag '1.5.3' into develop

Browse Source 
1.5.3
This commit is contained in:
ntr 2019-10-09 10:23:26 +11:00
commit 117f59f8d9
14 changed files with 75 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
1.5.2
1.5.3

2
acp/package.json
View File

@ -1,6 +1,6 @@
{
"name": "mnml-client",
"version": "1.5.2",
"version": "1.5.3",
"description": "",
"main": "index.js",
"scripts": {

2
client/animations.test.js
View File

@ -8,7 +8,7 @@ require('./assets/styles/instance.less');
require('./assets/styles/vbox.less');
require('./assets/styles/game.less');
require('./assets/styles/player.less');
require('./assets/styles/styles.mobile.css');
require('./assets/styles/styles.mobile.less');
require('./assets/styles/instance.mobile.less');
require('./src/animations.test.jsx');

12
client/assets/styles/game.less
View File

@ -400,16 +400,28 @@
}
.player {
width: calc(100% - 1em);
bottom: 3em;
height: calc(50% - 3em);
}
.opponent {
width: calc(100% - 1em);
.game-construct {
display: grid;
grid-template-columns: 1fr;
grid-template-rows: min-content 1fr;
}
}
#targeting, .resolving-skill {
width: calc(100% - 1em);
}
}
.player {
width: calc(100% - 1em);
bottom: 3em;
height: calc(50% - 3em);
}
}

3
client/assets/styles/styles.less
View File

@ -12,6 +12,9 @@ html body {
-moz-user-select: none;
-webkit-user-select: none;
-ms-user-select: none;
overflow-x: hidden;
overflow-y: hidden;
}
#mnml {

35
client/assets/styles/styles.mobile.less
View File

@ -1,4 +1,8 @@
@media (max-width: 800px) {
body {
overflow-y: initial;
}
#mnml {
font-size: 12pt;
padding: 0;
@ -11,7 +15,6 @@
height: 100vh;
max-height: initial;
min-height: initial;
overflow-y: initial;
}
table td {
@ -90,4 +93,34 @@
"inventory"
"games";
}
.menu {
.options {
display: grid;
grid-template-columns: 1fr;
button:not(:last-child) {
border: 2px solid #222;
}
button.logo {
border: none;
margin-right: 0;
margin-top: 0.5em;
background-position: center;
}
}
}
section {
.list {
grid-template-columns: 1fr;
}
}
.account {
div {
padding: 0;
}
}
}

2
client/package.json
View File

@ -1,6 +1,6 @@
{
"name": "mnml-client",
"version": "1.5.2",
"version": "1.5.3",
"description": "",
"main": "index.js",
"scripts": {

8
client/src/components/anims/chaos.jsx
View File

@ -77,10 +77,10 @@ class Chaos extends Component {
projectiles.forEach(proj => this.animations.push(anime({
targets: proj,
// cx: 150 + (Math.random() * 50 * (Math.random() < 0.5 ? -1 : 1)),
// cy: 200 + (Math.random() * 50 * (Math.random() < 0.5 ? -1 : 1)),
cx: 150,
cy: 200,
cx: 150 + (Math.random() * 50 * (Math.random() < 0.5 ? -1 : 1)),
cy: 200 + (Math.random() * 50 * (Math.random() < 0.5 ? -1 : 1)),
// cx: 150,
// cy: 200,
// opacity: 0,
delay: TIMES.TARGET_DELAY_MS,

16
client/src/components/anims/siphon.jsx
View File

@ -27,12 +27,9 @@ class Siphon extends Component {
version="1.1"
id="Layer_1"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 300 400"
viewBox="0 0 300 300"
opacity="0">
<filter id="blur">
<feGaussianBlur in="SourceGraphic" stdDeviation="2" />
</filter>
<circle id="siphon" r="140" cx="150" cy="150" stroke="#3050f8" stroke-width="2.5%" filter="url(#blur)"/>
<circle id="siphon" r="140" cx="150" cy="150" stroke="#3050f8" stroke-width="2.5%"/>
</svg>
);
}
@ -53,15 +50,10 @@ class Siphon extends Component {
anime({
targets: '#siphon',
keyframes: [
{ r: '110', stroke: '#1FF01F' },
{ r: '80', stroke: '#1FF01F' },
{ r: '50', stroke: '#3050f8' },
{ r: '20', stroke: '#3050f8' },
],
r: 0,
delay: TIMES.TARGET_DELAY_MS,
duration,
easing: 'easeInCubic',
easing: 'easeInSine',
});
}

28
client/src/components/anims/siphon.tick.jsx
View File

@ -20,9 +20,7 @@ function projectile(x, y, radius, colour) {
cx={x}
cy={y}
r={radius}
fill="url(#grad1)"
stroke-width="0.1"
stroke={colour}
fill={colour}
/>
);
}
@ -44,24 +42,16 @@ class SiphonTick extends Component {
version="1.1"
id="Layer_1"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 300 400">
viewBox="0 0 300 300">
<filter id="blur">
<feGaussianBlur in="SourceGraphic" stdDeviation="2" />
</filter>
<circle id="siphon" r="20" cx="150" cy="150" stroke="#3050f8" stroke-width="2.5%" filter="url(#blur)"/>
<defs>
<radialGradient id="grad1" cx="50%" cy="0%" r="85%" fx="50%" fy="50%">
<stop offset="0%" style="stop-color:#3050f8;stop-opacity:0.4" />
<stop offset="100%" style={'stop-color:#1FF01F;stop-opacity:1'} />
</radialGradient>
</defs>
<filter id="explosion">
<feGaussianBlur stdDeviation="4"/>
<feTurbulence type="turbulence" baseFrequency="0.001" numOctaves="3" result="turbulence"/>
<feDisplacementMap in2="turbulence" in="SourceGraphic" scale="1" xChannelSelector="A" yChannelSelector="A"/>
</filter>
{this.charges}
</svg>
);
@ -84,27 +74,23 @@ class SiphonTick extends Component {
});
anime.set('#siphon', {
r: '80',
r: 0,
stroke: '#3050f8',
});
anime({
targets: '#siphon',
keyframes: [
{ r: '50', stroke: '#3050f8' },
{ r: '20', stroke: '#3050f8' },
{ r: '0', stroke: '#3050f8' },
],
r: 600,
duration: duration * 2 / 3,
easing: 'easeInCubic',
easing: 'easeInSine',
});
const projectiles = document.querySelectorAll('.skill-anim circle');
projectiles.forEach(proj => {
anime({
targets: proj,
cx: Math.random() * 250 + 25,
cy: Math.random() * 200 - 100,
cx: 150 + (Math.random() * 300 * (Math.random() < 0.5 ? -1 : 1)),
cy: 150 + (Math.random() * 300 * (Math.random() < 0.5 ? -1 : 1)),
delay: (Math.random() * duration * 1 / 2),
duration,
easing: 'easeInQuad',

15
client/src/components/team.footer.jsx
View File

@ -7,7 +7,6 @@ const addState = connect(
function receiveState(state) {
const {
teamSelect,
showNav,
ws,
} = state;
@ -18,32 +17,18 @@ const addState = connect(
return {
sendAccountSetTeam,
teamSelect,
showNav,
};
},
function receiveDispatch(dispatch) {
function setShowNav(v) {
return dispatch(actions.setShowNav(v));
}
return {
setShowNav,
};
}
);
function TeamFooter(args) {
const {
showNav,
teamSelect,
sendAccountSetTeam,
setShowNav,
} = args;
return (
<footer>
<button id="nav-btn" onClick={() => setShowNav(!showNav)} >☰</button>
<button
disabled={teamSelect.some(c => !c)}
onClick={sendAccountSetTeam}>

5
client/src/events.jsx
View File

@ -1,3 +1,4 @@
const LogRocket = require('logrocket');
const querystring = require('query-string');
const eachSeries = require('async/eachSeries');
@ -123,6 +124,10 @@ function registerEvents(store) {
}
function setAccount(account) {
if (account) {
LogRocket.identify(account.id, account);
}
store.dispatch(actions.setAccount(account));
}

2
ops/package.json
View File

@ -1,6 +1,6 @@
{
"name": "mnml-ops",
"version": "1.5.2",
"version": "1.5.3",
"description": "",
"main": "index.js",
"scripts": {

2
server/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "mnml"
version = "1.5.2"
version = "1.5.3"
authors = ["ntr <ntr@smokestack.io>"]
[dependencies]