Feat: only clear current route on attack_failue.

Author: Reqwey

main.js

@@ -312,6 +312,11 @@ async function createWindow() {
 
   ipcMain.on('change-server-config', async (_, val) => {
     let port = val.port, name = val.name
+    if (!(port > 0 && port < 65535)) {
+      dialog.showErrorBox('Server creation failed', 'The port number must be between 0 and 65535')
+      mainWindow.webContents.send('server-error', err)
+      return;
+    }
     global.serverConfig.port = port
     if (name && name.length) {
       global.serverConfig.name = xss(name)
@@ -339,21 +344,6 @@ async function createWindow() {
 
         let player;
 
-        socket.on('reconnect', async (playerId) => {
-          try {
-            if (global.gameStarted) { // Allow to reconnect
-              let playerIndex = await getPlayerIndex(playerId)
-              if (playerIndex !== -1) {
-                player = global.players[playerIndex]
-                global.players[playerIndex].socket_id = socket.id
-                io.local.emit('room_message', player.trans(), 're-joined the lobby.')
-              }
-            }
-          } catch (e) {
-            socket.emit('error', 'An unknown error occurred: ' + e.message, e.stack)
-          }
-        })
-
         socket.on('set_username', async (username) => {
           if (global.gameStarted) {
             socket.emit('reject_join', 'Game is already started')

package.json

@@ -1,11 +1,11 @@
 {
   "name": "gennia",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "Yet another portable generals.io server & client",
   "main": "main.js",
   "scripts": {
     "start": "electron --trace-warnings .",
-    "build": "electron-builder"
+    "build": "electron-builder --win --ia32"
   },
   "repository": "https://github.com/GenniaApp/Gennia",
   "keywords": [
@@ -14,7 +14,7 @@
     "socket-io",
     "game"
   ],
-  "author": "the Gennia Authors",
+  "author": "Gennia Developing Team",
   "license": "CC0-1.0",
   "devDependencies": {
     "electron": "^21.2.1",
@@ -23,7 +23,7 @@
   "build": {
     "appId": "com.reqwey.gennia",
     "productName": "Gennia",
-    "copyright": "© 2022 the Gennia Authors",
+    "copyright": "© 2022 Gennia Developing Team",
     "win": {
       "icon": "assets/img/favicon.png"
     }

renderer.js

@@ -32,10 +32,14 @@ let Queue = (function () {
 			items.push(item);
 		}
 
+		clearFromMap(route) {
+			$(`#td${route.from.x}-${route.from.y}`).removeClass(`queue_${dirName(route)}`)
+		}
+
 		pop() {
-			let item = items.shift()
+			let item = items.shift();
 			if (this.lastItem) {
-				$(`#td${this.lastItem.from.x}-${this.lastItem.from.y}`).removeClass(`queue_${dirName(this.lastItem)}`)
+				this.clearFromMap(this.lastItem);
 			}
 			this.lastItem = item;
 			return item;
@@ -44,7 +48,7 @@ let Queue = (function () {
 		pop_back() {
 			let item = items.pop()
 			if (item) {
-				$(`#td${item.from.x}-${item.from.y}`).removeClass(`queue_${dirName(item)}`)
+				this.clearFromMap(item);
 				return item;
 			}
 		}
@@ -67,11 +71,15 @@ let Queue = (function () {
 
 		clear() {
 			items.forEach(item => {
-				$(`#td${item.from.x}-${item.from.y}`).removeClass(`queue_${dirName(item)}`)
+				this.clearFromMap(item)
 			})
 			items.length = 0
+			this.clearLastItem()
+		}
+
+		clearLastItem() {
 			if (this.lastItem)
-				$(`#td${this.lastItem.from.x}-${this.lastItem.from.y}`).removeClass(`queue_${dirName(this.lastItem)}`)
+				this.clearFromMap(this.lastItem)
 		}
 
 		print() { // Print on map
@@ -584,7 +592,7 @@ function gameJoin(username) {
 				</table>
 				</div>
 			</div>`)
-			window.turn = 1
+			window.gameTurn = 1
 			window.queue = new Queue()
 			// let appContainer = document.getElementById('reqAppContainer')
 			$(document).bind('keydown', (event) => {
@@ -667,8 +675,17 @@ function gameJoin(username) {
 			})
 		})
 
-		socket.on('attack_failure', () => {
-			window.queue.clear()
+		socket.on('attack_failure', (from, to) => {
+			window.queue.clearLastItem()
+			while (!window.queue.isEmpty()) {
+				let point = window.queue.front().from
+				if (point.x === to.x && point.y === to.y) {
+					window.queue.pop()
+					to = point
+				} else {
+					break;
+				}
+			}
 		})
 
 		socket.on('captured', (player1, player2) => {
@@ -693,8 +710,8 @@ function gameJoin(username) {
 				window.queue.clear()
 			}
 			gameMap = JSON.parse(gameMap);
-			if (turn % 2 === 0) ++window.turn
-			$('.reqtitle').html(`<h3> Turn ${window.turn} - Gennia</h3>`)
+			if (turn % 2 === 0) ++window.gameTurn
+			$('.reqtitle').html(`<h3> Turn ${window.gameTurn} - Gennia</h3>`)
 			for (var i = 0; i < width; ++i) {
 				for (var j = 0; j < height; ++j) {
 					var $cell = $(`#td${i}-${j}`);