better prompt text

This commit is contained in:
ntr
2020-01-10 13:09:47 +10:00
parent b3b5716b21
commit 37a491b21a
9 changed files with 26 additions and 35 deletions
-1
View File
@@ -45,7 +45,6 @@ export const setTeamPage = value => ({ type: 'SET_TEAM_PAGE', value });
export const setTeamSelect = value => ({ type: 'SET_TEAM_SELECT', value: Array.from(value) });
export const setTutorial = value => ({ type: 'SET_TUTORIAL', value });
export const setTutorialGame = value => ({ type: 'SET_TUTORIAL_GAME', value });
export const setVboxSelected = value => ({ type: 'SET_VBOX_SELECTED', value: value });
export const setVboxCombiner = value => ({ type: 'SET_VBOX_COMBINER', value });
+1 -2
View File
@@ -50,12 +50,11 @@ function Play(args) {
);
const list = () => {
if (promptRegister) {
return (
<div class='block-text'>
<p><b>You just won your first round of MNML.</b></p>
<p>Register below to play a real Bo5 against other players, play a practice round, customise your team & more...</p>
<p>Register below to play a real Bo5 against other players,<br/> play a practice round against a tougher AI opponent,<br/> customise your team & more...</p>
<p>glhf</p>
</div>
)
+5 -6
View File
@@ -9,8 +9,8 @@ const shapes = require('./shapes');
const { effectInfo } = require('../utils');
const addState = connect(
({ game, account, animating, itemInfo, gameEffectInfo, tutorialGame }) =>
({ game, account, animating, itemInfo, gameEffectInfo, tutorialGame })
({ game, account, animating, itemInfo, gameEffectInfo, authenticated }) =>
({ game, account, animating, itemInfo, gameEffectInfo, authenticated })
);
class TargetSvg extends Component {
@@ -32,7 +32,6 @@ class TargetSvg extends Component {
if (newProps.account !== this.props.account) return true;
if (newProps.animating !== this.props.animating) return true;
if (newProps.gameEffectInfo !== this.props.gameEffectInfo) return true;
if (newProps.tutorialGame !== this.props.tutorialGame) return true;
if (newState.width !== this.state.width) return true;
if (newState.height !== this.state.height) return true;
return false;
@@ -45,7 +44,7 @@ class TargetSvg extends Component {
animating,
game,
gameEffectInfo,
tutorialGame,
authenticated,
} = props;
const { width, height } = state;
@@ -53,10 +52,10 @@ class TargetSvg extends Component {
if (game.phase === 'Finished') return false; // Clear everything if its over (in case of abandon)
// First time joining game phase
if (tutorialGame) {
if (!authenticated && game.stack.length === 0) {
return (
<div class="resolving-skill">
<h2>Select your skills, click on targets and then hit <b>READY</b>.</h2>
<h2><b>Select a skill</b> from each construct, <b>click a target</b> for that skill and then click <b>READY</b>.</h2>
</div>
);
}
-5
View File
@@ -30,10 +30,6 @@ function registerEvents(store) {
}
function clearTutorialGame() {
store.dispatch(actions.setTutorialGame(null));
}
function setPing(ping) {
store.dispatch(actions.setPing(ping));
}
@@ -231,7 +227,6 @@ function registerEvents(store) {
clearInstance,
clearMtxActive,
clearTutorial,
clearTutorialGame,
setAccount,
setAuthenticated,
setAccountInstances,
-1
View File
@@ -54,7 +54,6 @@ module.exports = {
teamSelect: createReducer([null, null, null], 'SET_TEAM_SELECT'),
tutorial: createReducer(1, 'SET_TUTORIAL'),
tutorialGame: createReducer(1, 'SET_TUTORIAL_GAME'),
vboxSelected: createReducer({ storeSelect: [], stashSelect: [] }, 'SET_VBOX_SELECTED'),
vboxCombiner: createReducer(null, 'SET_VBOX_COMBINER'),
-1
View File
@@ -129,7 +129,6 @@ function createSocket(events) {
{ game_id: gameId, construct_id: constructId, target_construct_id: targetConstructId, skill },
]);
events.setActiveSkill(null);
events.clearTutorialGame();
}
function sendGameSkillClear(gameId) {