diff --git a/client/src/components/game.construct.jsx b/client/src/components/game.construct.jsx index 347b4511..9a9c9e90 100644 --- a/client/src/components/game.construct.jsx +++ b/client/src/components/game.construct.jsx @@ -89,7 +89,6 @@ const addState = connect( animText, gameSkillInfo, itemInfo, - tutorialGame, } = state; function selectSkillTarget(targetConstructId) { @@ -109,7 +108,6 @@ const addState = connect( selectSkillTarget, gameSkillInfo, itemInfo, - tutorialGame, }; }, @@ -118,11 +116,7 @@ const addState = connect( dispatch(actions.setGameEffectInfo(info)); } - function setTutorialGameClear(activeSkill, tutorialGame) { - if (activeSkill && tutorialGame) dispatch(actions.setTutorialGame(null)); - } - - return { setGameEffectInfo, setTutorialGameClear }; + return { setGameEffectInfo }; } ); @@ -157,7 +151,6 @@ class GameConstruct extends preact.Component { if (newProps.animating !== this.props.animating) return true; if (newProps.construct !== this.props.construct) return true; if (newProps.player !== this.props.player) return true; - if (newProps.tutorialGame !== this.props.tutorialGame) return true; if (newProps.gameSkillInfo !== this.props.gameSkillInfo) return true; return false; } @@ -171,14 +164,12 @@ class GameConstruct extends preact.Component { animating, construct, player, - tutorialGame, gameSkillInfo, // Constants i, itemInfo, // Functions selectSkillTarget, - setTutorialGameClear, setGameEffectInfo, } = this.props; @@ -233,7 +224,6 @@ class GameConstruct extends preact.Component {
{ selectSkillTarget(construct.id); - setTutorialGameClear(activeSkill, tutorialGame); }} style={ activeSkill ? { cursor: 'pointer' } : {}} class={`game-construct ${ko} ${cssClass}`}> diff --git a/client/src/events.jsx b/client/src/events.jsx index d6ca701a..ad4045f3 100644 --- a/client/src/events.jsx +++ b/client/src/events.jsx @@ -32,6 +32,11 @@ function registerEvents(store) { } + function clearTutorialGame() { + store.dispatch(actions.setTutorialGame(null)); + } + + function setPing(ping) { store.dispatch(actions.setPing(ping)); } @@ -351,6 +356,7 @@ function registerEvents(store) { clearInstance, clearMtxActive, clearTutorial, + clearTutorialGame, setAccount, setAccountInstances, setActiveItem, diff --git a/client/src/socket.jsx b/client/src/socket.jsx index a99fe130..210a0700 100644 --- a/client/src/socket.jsx +++ b/client/src/socket.jsx @@ -129,6 +129,7 @@ function createSocket(events) { { game_id: gameId, construct_id: constructId, target_construct_id: targetConstructId, skill }, ]); events.setActiveSkill(null); + events.clearTutorialGame(); } function sendGameSkillClear(gameId) {