feat: add support for switch game function

moddio · Jun 21, 2024 · 628ce1f · 628ce1f
1 parent 877f316
commit 628ce1f
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 9 deletions.
diff --git a/server/server.js b/server/server.js
@@ -660,6 +660,7 @@ var Server = TaroClass.extend({
  taro.network.define('gameOver', self._onGameOver);
  taro.network.define('ping', self._onPing);
  taro.network.define('sendPlayerToMap', self._onSomeBullshit);
+ taro.network.define('sendPlayerToGame', self._onSomeBullshit);
 
  taro.network.define('playerUnitMoved', self._onPlayerUnitMoved);
  taro.network.define('playerKeyDown', self._onPlayerKeyDown);

diff --git a/src/client.js b/src/client.js
@@ -685,6 +685,7 @@ const Client = TaroEventingClass.extend({
  defineNetworkEvents: function () {
  taro.network.define('ping', this._onPing);
  taro.network.define('sendPlayerToMap', this._onSendPlayerToMap);
+ taro.network.define('sendPlayerToGame', this._onSendPlayerToGame);
 
  taro.network.define('makePlayerSelectUnit', this._onMakePlayerSelectUnit);
  taro.network.define('makePlayerCameraTrackUnit', this._onMakePlayerCameraTrackUnit);

diff --git a/src/gameClasses/ClientNetworkEvents.js b/src/gameClasses/ClientNetworkEvents.js
@@ -388,13 +388,13 @@ var ClientNetworkEvents = {
  },
 
  // when client receives a ping response back from the server
- _onPing: function(data) {
+ _onPing: function (data) {
  const self = this;
  const now = taro._currentTime;
  const latency = now - data.sentAt;
- 
+
  // console.log("onPing", taro._currentTime, data.sentAt, latency);
- 
+
  // start reconciliation based on discrepancy between
  // where my unit when ping was sent and where unit is when ping is received
  if (taro.client.selectedUnit?.posHistory &&
@@ -444,7 +444,7 @@ var ClientNetworkEvents = {
  }
  }
  }
- 
+
  taro.pingElement = taro.pingElement || document.getElementById('updateping');
  taro.pingElement.innerHTML = Math.floor(latency);
  taro.pingLatency = taro.pingLatency || [];
@@ -849,20 +849,36 @@ var ClientNetworkEvents = {
  console.warn(data);
  },
 
+ _handlePokiSwitch: function (data) {
+ window.sessionStorage.setItem('redirectToGameData', JSON.stringify(data));
+ if (window.STATIC_EXPORT_ENABLED) {
+ window.PokiSDK?.gameplayStop();
+ }
+ window.location.reload();
+ }, 
+
  _onSendPlayerToMap: function (data) {
  if (data && data.type == 'sendPlayerToMap') {
  if (window.STATIC_EXPORT_ENABLED) {
- window.sessionStorage.setItem('redirectToGameData', JSON.stringify(data));
- if (window.STATIC_EXPORT_ENABLED) {
- window.PokiSDK?.gameplayStop();
- }
- window.location.reload();
+ this._handlePokiSwitch(data);
  } else {
  const mapUrl = `${window.location.origin}/play/${data.gameSlug}?autojoin=true&autoJoinToken=${data.autoJoinToken}${data.serverId ? '&serverId=' + data.serverId : ''}`;
  window.location.href = mapUrl;
  }
  }
  },
+
+ _onSendPlayerToGame: function (data) {
+ if (data && data.type == 'sendPlayerToGame') {
+ if (window.STATIC_EXPORT_ENABLED) {
+ this._handlePokiSwitch(data);
+ } else {
+ const mapUrl = `${window.location.origin}/play/${data.gameSlug}?autojoin=true&${data.serverId ? '&serverId=' + data.serverId : ''}`;
+ window.location.href = mapUrl;
+ }
+ }
+ },
+
 };
 
 if (typeof module !== 'undefined' && typeof module.exports !== 'undefined') {

diff --git a/src/gameClasses/components/script/ActionComponent.js b/src/gameClasses/components/script/ActionComponent.js
@@ -171,6 +171,29 @@ var ActionComponent = TaroEntity.extend({
 
  break;
 
+ case 'sendPlayerToGame':
+ if (taro.isServer) {
+ var player = self._script.param.getValue(action.player, vars);
+ var gameId = self._script.param.getValue(action.gameId, vars);
+
+ if (player && player._stats && player._stats.clientId) {
+ taro.workerComponent.sendPlayerToGame(gameId).then((res) => {
+ if (res && res.gameSlug) {
+ // ask client to reload game
+ taro.network.send(
+ 'sendPlayerToGame',
+ {
+ type: 'sendPlayerToGame',
+ gameSlug: res.gameSlug,
+ gameId: res.gameId,
+ },
+ player._stats.clientId
+ );
+ }
+ });
+ }
+ }
+
  case 'sendPlayerGroupToMap':
  if (taro.isServer) {
  var gameId = self._script.param.getValue(action.gameId, vars);