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

???

Browse Source
This commit is contained in:
ntr 2019-09-24 12:29:05 +10:00
parent 5fb44ee226
commit b681c9218a
7 changed files with 156 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/assets/styles/instance.mobile.css
View File

@ -61,11 +61,8 @@
}
.instance.constructs-visible .construct-list {
display: flex;
flex-flow: row;
align-content: flex-end;
height: 100%;
margin: 0;
display: grid;
grid-auto-rows: 1fr;
}
.vbox-inventory {
@ -88,7 +85,6 @@
}
.instance-construct {
flex: 1;
display: grid;
grid-template-rows: min-content min-content min-content 1fr min-content;
grid-template-areas:
@ -107,10 +103,6 @@
transition-timing-function: ease;
}
.instance-construct .avatar {
min-height: 150px;
}
.instance-construct:first-child {
border-left-width: 0;
}

6
client/src/components/footer.jsx
View File

@ -5,7 +5,7 @@ const { connect } = require('preact-redux');
const actions = require('./../actions');
const TeamFooter = require('./team.footer');
const ListFooter = require('./list.footer');
const PlayFooter = require('./play.footer');
const InstanceFooter = require('./instance.footer');
const GameFooter = require('./game.footer');
@ -30,8 +30,8 @@ function renderHeader(args) {
if (game) return <GameFooter />;
if (instance) return <InstanceFooter />;
if (nav === 'team') return <TeamFooter />;
if (nav === 'list') return <ListFooter />;
if (nav === 'team' || nav === 'account') return <TeamFooter />;
if (nav === 'play' || nav === 'shop' || !nav) return <PlayFooter />;
}

27
client/src/components/game.footer.jsx
View File

@ -9,7 +9,7 @@ const addState = connect(
ws,
game,
account,
showNav,
animating,
} = state;
function sendGameReady() {
@ -24,9 +24,9 @@ const addState = connect(
return {
game,
account,
animating,
sendInstanceState,
sendGameReady,
showNav,
};
},
@ -36,15 +36,7 @@ const addState = connect(
dispatch(actions.setInstance(null));
}
function skip() {
dispatch(actions.setSkip(true));
}
function setShowNav(v) {
return dispatch(actions.setShowNav(v));
}
return { setShowNav, quit, skip };
return { quit };
}
);
@ -53,22 +45,13 @@ function GameFooter(props) {
const {
game,
account,
showNav,
animating,
quit,
setShowNav,
sendGameReady,
sendInstanceState,
} = props;
if (!game) {
return (
<footer id="footer">
<button id="nav-btn" onClick={() => setShowNav(!showNav)} >☰</button>
</footer>
);
}
const playerTeam = game.players.find(t => t.id === account.id);
function quitClick() {
@ -86,6 +69,7 @@ function GameFooter(props) {
const readyBtn = (
<button
disabled={animating}
class={`${playerTeam.ready ? 'ready' : ''} ready-btn`}
onClick={sendGameReady}>
Ready
@ -122,7 +106,6 @@ function GameFooter(props) {
return (
<footer>
{timer}
<button id="nav-btn" onClick={() => setShowNav(!showNav)} >☰</button>
{game.phase === 'Finish' && quitBtn }
{game.phase === 'Skill' && readyBtn }
</footer>

11
client/src/components/instance.footer.jsx
View File

@ -5,20 +5,16 @@ const actions = require('../actions');
const addState = connect(
function receiveState(state) {
const { ws, instance, player, nav, showNav } = state;
const { ws, instance, player, nav } = state;
function sendInstanceReady() {
return ws.sendInstanceReady(instance.id);
}
return { player, instance, sendInstanceReady, nav, showNav };
return { player, instance, sendInstanceReady, nav };
},
function receiveDispatch(dispatch) {
function setShowNav(v) {
return dispatch(actions.setShowNav(v));
}
function setInfo(c) {
return dispatch(actions.setInfo(c));
}
@ -30,7 +26,6 @@ const addState = connect(
return {
setInfo,
setNav,
setShowNav,
};
}
);
@ -44,7 +39,6 @@ function Instance(args) {
setInfo,
setNav,
setShowNav,
sendInstanceReady,
} = args;
@ -118,7 +112,6 @@ function Instance(args) {
return (
<footer id="footer">
{timer}
<button id="nav-btn" onClick={() => setShowNav(!showNav)} >☰</button>
{navBtn}
{readyBtn}
</footer>

48
client/src/components/list.footer.jsx
View File

@ -1,48 +0,0 @@
const { connect } = require('preact-redux');
const preact = require('preact');
const actions = require('./../actions');
const addState = connect(
function receiveState(state) {
const { showNav } = state;
return { showNav };
},
function receiveDispatch(dispatch) {
function navToTeam() {
return dispatch(actions.setNav('team'));
}
function setShowNav(v) {
return dispatch(actions.setShowNav(v));
}
return {
navToTeam,
setShowNav,
};
}
);
function ListFooter(args) {
return false;
// const {
// showNav,
// navToTeam,
// setShowNav,
// } = args;
// return (
// <footer>
// <button id="nav-btn" onClick={() => setShowNav(!showNav)} >☰</button>
// <button
// onClick={() => navToTeam()}>
// Back
// </button>
// </footer>
// );
}
module.exports = addState(ListFooter);

139
client/src/components/play.footer.jsx Normal file
View File

@ -0,0 +1,139 @@
const preact = require('preact');
const { connect } = require('preact-redux');
const { errorToast, infoToast } = require('../utils');
const AccountBox = require('./account.box');
const addState = connect(
function receiveState(state) {
const {
ws,
instances,
invite,
} = state;
function sendInstanceState(id) {
ws.sendInstanceState(id);
}
function sendInstancePractice() {
ws.sendInstancePractice();
}
function sendInstanceQueue() {
ws.sendInstanceQueue();
}
function sendInstanceInvite() {
ws.sendInstanceInvite();
}
return {
instances,
invite,
sendInstanceState,
sendInstanceQueue,
sendInstancePractice,
sendInstanceInvite,
};
}
);
function JoinButtons(args) {
const {
instances,
invite,
sendInstanceState,
sendInstanceQueue,
sendInstancePractice,
sendInstanceInvite,
} = args;
const discordBtn = (
<button
class='discord-btn'
onClick={() => window.open('https://discord.gg/YJJgurM') }>
&nbsp;
</button>
);
if (instances.length) {
return (
<footer id="footer">
<div class="timer-container"></div>
<button
class='pvp ready full'
onClick={() => sendInstanceState(instances[0].id)}
type="submit">
Rejoin
</button>
</footer>
);
}
const inviteBtn = () => {
if (!invite) {
return (
<button
class='pvp ready'
onClick={() => sendInstanceInvite()}
type="submit">
Invite
</button>
);
}
function copyClick(e) {
const link = `${document.location.origin}#join=${invite}`;
const textArea = document.createElement('textarea', { id: '#clipboard' });
textArea.value = link;
document.body.appendChild(textArea);
textArea.focus();
textArea.select();
try {
document.execCommand('copy');
infoToast('Invite link copied.');
} catch (err) {
console.error('link copy error', err);
errorToast('Invite link copy error.');
}
document.body.removeChild(textArea);
return true;
}
return (
<button
class='pvp ready enabled'
onClick={copyClick}
type="submit">
Copy Link
</button>
);
};
return (
<footer id="footer">
<div class="timer-container"></div>
<button
class='practice'
onClick={() => sendInstancePractice()}
type="submit">
Learn
</button>
{inviteBtn()}
<button
class='pvp ready'
onClick={() => sendInstanceQueue()}
type="submit">
PVP
</button>
</footer>
);
}
module.exports = addState(JoinButtons);

8
server/src/names.rs
View File

@ -1,7 +1,7 @@
use rand::prelude::*;
use rand::{thread_rng};
const FIRSTS: [&'static str; 50] = [
const FIRSTS: [&'static str; 51] = [
"artificial",
"ambient",
"borean",
@ -17,6 +17,7 @@ const FIRSTS: [&'static str; 50] = [
"emotive",
"emotionless",
"elliptical",
"extrasolar",
"fierce",
"fossilised",
"frozen",
@ -54,9 +55,10 @@ const FIRSTS: [&'static str; 50] = [
"weary",
];
const LASTS: [&'static str; 55] = [
const LASTS: [&'static str; 56] = [
"artifact",
"assembly",
"alloy",
"carbon",
"console",
"construct",
@ -68,7 +70,7 @@ const LASTS: [&'static str; 55] = [
"detector",
"energy",
"entropy",
"exomorph",
"exoplanet",
"foilage",
"forest",
"form",