From 74cb4cce3abe2c33738eb1f81604ffda2d1b3416 Mon Sep 17 00:00:00 2001 From: jzy-chitong56 <48715223+jzy-chitong56@users.noreply.github.com> Date: Fri, 22 Nov 2024 09:49:32 +0800 Subject: [PATCH 01/35] Update de.json --- Electron/src/assets/i18n/de.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Electron/src/assets/i18n/de.json b/Electron/src/assets/i18n/de.json index 0f331b848..9debb48a5 100644 --- a/Electron/src/assets/i18n/de.json +++ b/Electron/src/assets/i18n/de.json @@ -1,4 +1,4 @@ -{ +{ //GERMAN "PAGES": { "HOME": { "TITLE": "AMAI-Installationsprogramm", @@ -7,9 +7,9 @@ "INSTALL_ON_FOLDER": "Im Verzeichnis installieren", "INSTALL_ON_MAP": "Auf Karte installieren", "INCLUDE_COMMANDER": "Kommandant installieren", - "INCLUDE_COMMANDER_VSAI": "Gegen Vanilla KI", + "INCLUDE_COMMANDER_VSAI": "AMAI vs andere KI", "INCLUDE_COMMANDER_OFF": "Kein Kommandant", - "OPTIMISE": "Optimierte Skripte verwenden", + "OPTIMISE": "Verringerung der Systemlast", "FORCELANG": "Standardsprache der KI überschreiben" }, "APP": { From e1e2f0ba22cf1227a60aefbb345e1fcebbec556e Mon Sep 17 00:00:00 2001 From: jzy-chitong56 <48715223+jzy-chitong56@users.noreply.github.com> Date: Fri, 22 Nov 2024 09:56:39 +0800 Subject: [PATCH 02/35] Update de.json --- Electron/src/assets/i18n/de.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Electron/src/assets/i18n/de.json b/Electron/src/assets/i18n/de.json index 9debb48a5..d8757c8bc 100644 --- a/Electron/src/assets/i18n/de.json +++ b/Electron/src/assets/i18n/de.json @@ -1,5 +1,8 @@ -{ //GERMAN +{ "PAGES": { + "CURRENT_LANGUAGE":{ + "TIPS"： "this Deutsch json" + }, "HOME": { "TITLE": "AMAI-Installationsprogramm", "CHOOSE_GAME_VERSION": "Spielversion wählen", @@ -10,7 +13,7 @@ "INCLUDE_COMMANDER_VSAI": "AMAI vs andere KI", "INCLUDE_COMMANDER_OFF": "Kein Kommandant", "OPTIMISE": "Verringerung der Systemlast", - "FORCELANG": "Standardsprache der KI überschreiben" + "FORCELANG": "AI Chat Sprache überschreiben" }, "APP": { "INSTALLING": "Installation in {{path}}", From 6466d0d9cd90a9e2c7d9c68db7caddd043115c69 Mon Sep 17 00:00:00 2001 From: jzy-chitong56 <48715223+jzy-chitong56@users.noreply.github.com> Date: Fri, 22 Nov 2024 09:57:17 +0800 Subject: [PATCH 03/35] Update de.json --- Electron/src/assets/i18n/de.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Electron/src/assets/i18n/de.json b/Electron/src/assets/i18n/de.json index d8757c8bc..db7784f73 100644 --- a/Electron/src/assets/i18n/de.json +++ b/Electron/src/assets/i18n/de.json @@ -1,7 +1,7 @@ { "PAGES": { - "CURRENT_LANGUAGE":{ - "TIPS"： "this Deutsch json" + "CURRENT_LANGUAGE": { + "TIPS"： "this Deutsch json", }, "HOME": { "TITLE": "AMAI-Installationsprogramm", From 0fd51f44d3a7097520e8cd1f367e62c5913aa63e Mon Sep 17 00:00:00 2001 From: jzy-chitong56 <48715223+jzy-chitong56@users.noreply.github.com> Date: Fri, 22 Nov 2024 09:57:28 +0800 Subject: [PATCH 04/35] Update de.json --- Electron/src/assets/i18n/de.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Electron/src/assets/i18n/de.json b/Electron/src/assets/i18n/de.json index db7784f73..b3a187fe8 100644 --- a/Electron/src/assets/i18n/de.json +++ b/Electron/src/assets/i18n/de.json @@ -1,7 +1,7 @@ { "PAGES": { "CURRENT_LANGUAGE": { - "TIPS"： "this Deutsch json", + "TIPS": "this Deutsch json" }, "HOME": { "TITLE": "AMAI-Installationsprogramm", From e14b66d6b56ae5b247447e286967e9ccc9645488 Mon Sep 17 00:00:00 2001 From: jzy-chitong56 <48715223+jzy-chitong56@users.noreply.github.com> Date: Fri, 22 Nov 2024 09:58:29 +0800 Subject: [PATCH 05/35] Update en.json --- Electron/src/assets/i18n/en.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Electron/src/assets/i18n/en.json b/Electron/src/assets/i18n/en.json index 198999929..52b16ccd0 100644 --- a/Electron/src/assets/i18n/en.json +++ b/Electron/src/assets/i18n/en.json @@ -1,5 +1,8 @@ { "PAGES": { + "CURRENT_LANGUAGE": { + "TIPS": "this Deutsch json" + }, "HOME": { "TITLE": "AMAI Installer", "CHOOSE_GAME_VERSION": "Choose Game Version", @@ -9,8 +12,8 @@ "INCLUDE_COMMANDER": "Install Commander", "INCLUDE_COMMANDER_VSAI": "Vs Vanilla AI", "INCLUDE_COMMANDER_OFF": "No Commander", - "OPTIMISE": "Use Optimised Scripts", - "FORCELANG": "Override Default AI Language" + "OPTIMISE": "Reduce System Load", + "FORCELANG": "Overwrite AI Chat Language" }, "APP": { "INSTALLING": "Installing into {{path}}", From 7ffc7185b3e292e81b2a96ec323c25ee0af6af9a Mon Sep 17 00:00:00 2001 From: jzy-chitong56 <48715223+jzy-chitong56@users.noreply.github.com> Date: Fri, 22 Nov 2024 09:59:11 +0800 Subject: [PATCH 06/35] Update de.json --- Electron/src/assets/i18n/de.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Electron/src/assets/i18n/de.json b/Electron/src/assets/i18n/de.json index b3a187fe8..f92598fb7 100644 --- a/Electron/src/assets/i18n/de.json +++ b/Electron/src/assets/i18n/de.json @@ -10,7 +10,7 @@ "INSTALL_ON_FOLDER": "Im Verzeichnis installieren", "INSTALL_ON_MAP": "Auf Karte installieren", "INCLUDE_COMMANDER": "Kommandant installieren", - "INCLUDE_COMMANDER_VSAI": "AMAI vs andere KI", + "INCLUDE_COMMANDER_VSAI": "vs Blizzard AI", "INCLUDE_COMMANDER_OFF": "Kein Kommandant", "OPTIMISE": "Verringerung der Systemlast", "FORCELANG": "AI Chat Sprache überschreiben" From 7977523eff4ece09213097960efe54d8b3e6a492 Mon Sep 17 00:00:00 2001 From: jzy-chitong56 <48715223+jzy-chitong56@users.noreply.github.com> Date: Fri, 22 Nov 2024 09:59:43 +0800 Subject: [PATCH 07/35] Update en.json --- Electron/src/assets/i18n/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Electron/src/assets/i18n/en.json b/Electron/src/assets/i18n/en.json index 52b16ccd0..1d78a92f6 100644 --- a/Electron/src/assets/i18n/en.json +++ b/Electron/src/assets/i18n/en.json @@ -1,7 +1,7 @@ { "PAGES": { "CURRENT_LANGUAGE": { - "TIPS": "this Deutsch json" + "TIPS": "this English json" }, "HOME": { "TITLE": "AMAI Installer", From 4afd3ff13dc1edcfa60bae23c1d8976ca1236d2a Mon Sep 17 00:00:00 2001 From: jzy-chitong56 <48715223+jzy-chitong56@users.noreply.github.com> Date: Fri, 22 Nov 2024 10:01:10 +0800 Subject: [PATCH 08/35] Update es.json --- Electron/src/assets/i18n/es.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Electron/src/assets/i18n/es.json b/Electron/src/assets/i18n/es.json index 033443bd5..bde202c5a 100644 --- a/Electron/src/assets/i18n/es.json +++ b/Electron/src/assets/i18n/es.json @@ -1,5 +1,8 @@ { "PAGES": { + "CURRENT_LANGUAGE": { + "TIPS": "this Spanish json" + }, "HOME": { "TITLE": "Instalador de AMAI", "CHOOSE_GAME_VERSION": "Elegir versión del juego", @@ -9,8 +12,8 @@ "INCLUDE_COMMANDER": "Incluir comandante", "INCLUDE_COMMANDER_VSAI": "Contra IA Vanilla", "INCLUDE_COMMANDER_OFF": "Sin Comandante", - "OPTIMISE": "Usar scripts optimizados", - "FORCELANG": "Sobrescribir el idioma predeterminado de la IA" + "OPTIMISE": "Reducir la carga del sistema", + "FORCELANG": "Cubrir el lenguaje de chat de Ia" }, "APP": { "INSTALLING": "Instalando en {{path}}", From 901681ffaa8cebd4b566d48fdfb18acb48497ba9 Mon Sep 17 00:00:00 2001 From: jzy-chitong56 <48715223+jzy-chitong56@users.noreply.github.com> Date: Fri, 22 Nov 2024 10:01:51 +0800 Subject: [PATCH 09/35] Update de.json --- Electron/src/assets/i18n/de.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Electron/src/assets/i18n/de.json b/Electron/src/assets/i18n/de.json index f92598fb7..06d532d7d 100644 --- a/Electron/src/assets/i18n/de.json +++ b/Electron/src/assets/i18n/de.json @@ -10,7 +10,7 @@ "INSTALL_ON_FOLDER": "Im Verzeichnis installieren", "INSTALL_ON_MAP": "Auf Karte installieren", "INCLUDE_COMMANDER": "Kommandant installieren", - "INCLUDE_COMMANDER_VSAI": "vs Blizzard AI", + "INCLUDE_COMMANDER_VSAI": "Gegen Vanilla KI", "INCLUDE_COMMANDER_OFF": "Kein Kommandant", "OPTIMISE": "Verringerung der Systemlast", "FORCELANG": "AI Chat Sprache überschreiben" From 974fa1ae1293ddf7e0ab453b897a29cfe0d7484f Mon Sep 17 00:00:00 2001 From: jzy-chitong56 <48715223+jzy-chitong56@users.noreply.github.com> Date: Fri, 22 Nov 2024 10:05:16 +0800 Subject: [PATCH 10/35] Update fr.json --- Electron/src/assets/i18n/fr.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Electron/src/assets/i18n/fr.json b/Electron/src/assets/i18n/fr.json index 04f6257f0..a3292a0e0 100644 --- a/Electron/src/assets/i18n/fr.json +++ b/Electron/src/assets/i18n/fr.json @@ -1,5 +1,8 @@ { "PAGES": { + "CURRENT_LANGUAGE": { + "TIPS": "this French json" + }, "HOME": { "TITLE": "Installeur AMAI", "CHOOSE_GAME_VERSION": "Choisir la version du jeu", @@ -9,8 +12,8 @@ "INCLUDE_COMMANDER": "Installer le commandant", "INCLUDE_COMMANDER_VSAI": "Contre IA Vanilla", "INCLUDE_COMMANDER_OFF": "Pas de Commandant", - "OPTIMISE": "Utiliser des scripts optimisés", - "FORCELANG": "Remplacer la langue par défaut de l'IA" + "OPTIMISE": "Réduire la charge du système", + "FORCELANG": "Couvrir le langage de chat ai" }, "APP": { "INSTALLING": "Installation dans {{path}}", From 9f0ca646bf3693ef3c062151b1e3823ed0bdf874 Mon Sep 17 00:00:00 2001 From: jzy-chitong56 <48715223+jzy-chitong56@users.noreply.github.com> Date: Fri, 22 Nov 2024 10:07:47 +0800 Subject: [PATCH 11/35] Update no.json --- Electron/src/assets/i18n/no.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Electron/src/assets/i18n/no.json b/Electron/src/assets/i18n/no.json index 4b9329110..0b2ff27e2 100644 --- a/Electron/src/assets/i18n/no.json +++ b/Electron/src/assets/i18n/no.json @@ -1,5 +1,8 @@ { "PAGES": { + "CURRENT_LANGUAGE": { + "TIPS": "this Norwegian json" + }, "HOME": { "TITLE": "AMAI Installer", "CHOOSE_GAME_VERSION": "Velg spillversjon", @@ -9,8 +12,8 @@ "INCLUDE_COMMANDER": "Inkluder kommandant", "INCLUDE_COMMANDER_VSAI": "Mot Vanilla AI", "INCLUDE_COMMANDER_OFF": "Ingen Kommandant", - "OPTIMISE": "Bruk optimaliserte skript", - "FORCELANG": "Overstyr standard AI-språk" + "OPTIMISE": "Reduser systemmengden", + "FORCELANG": "Overskriv AI-samtalespråk" }, "APP": { "INSTALLING": "Installerer i {{path}}", From d2a12929d89512f7589173494259e30829433196 Mon Sep 17 00:00:00 2001 From: jzy-chitong56 <48715223+jzy-chitong56@users.noreply.github.com> Date: Fri, 22 Nov 2024 10:08:37 +0800 Subject: [PATCH 12/35] Update pt.json --- Electron/src/assets/i18n/pt.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Electron/src/assets/i18n/pt.json b/Electron/src/assets/i18n/pt.json index e7bcec758..5f300fd3f 100644 --- a/Electron/src/assets/i18n/pt.json +++ b/Electron/src/assets/i18n/pt.json @@ -1,5 +1,8 @@ { "PAGES": { + "CURRENT_LANGUAGE": { + "TIPS": "this Portuguese json" + }, "HOME": { "TITLE": "Instalador do AMAI", "CHOOSE_GAME_VERSION": "Escolher versão do jogo", @@ -9,8 +12,8 @@ "INCLUDE_COMMANDER": "Incluir comandante", "INCLUDE_COMMANDER_VSAI": "Contra IA Vanilla", "INCLUDE_COMMANDER_OFF": "Sem Comandante", - "OPTIMISE": "Usar scripts otimizados", - "FORCELANG": "Substituir idioma padrão da IA" + "OPTIMISE": "Reduzir a carga do sistema", + "FORCELANG": "Substituir a linguagem de conversação AI" }, "APP": { "INSTALLING": "Instalando em {{path}}", From 946c325c95368baeeefcecebbe08972c4c77a15a Mon Sep 17 00:00:00 2001 From: jzy-chitong56 <48715223+jzy-chitong56@users.noreply.github.com> Date: Fri, 22 Nov 2024 10:09:35 +0800 Subject: [PATCH 13/35] Update ro.json --- Electron/src/assets/i18n/ro.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Electron/src/assets/i18n/ro.json b/Electron/src/assets/i18n/ro.json index f6eb2eb7b..32b1faa95 100644 --- a/Electron/src/assets/i18n/ro.json +++ b/Electron/src/assets/i18n/ro.json @@ -1,5 +1,8 @@ { "PAGES": { + "CURRENT_LANGUAGE": { + "TIPS": "this Romanian json" + }, "HOME": { "TITLE": "Instalator AMAI", "CHOOSE_GAME_VERSION": "Alege versiunea jocului", @@ -9,8 +12,8 @@ "INCLUDE_COMMANDER": "Include comandant", "INCLUDE_COMMANDER_VSAI": "Împotriva AI Vanilla", "INCLUDE_COMMANDER_OFF": "Fără comandant", - "OPTIMISE": "Utilizați scripturi optimizate", - "FORCELANG": "Suprascrieți limba implicită a AI" + "OPTIMISE": "Reducerea sarcinii sistemului", + "FORCELANG": "Suprascrie limbajul de chat AI" }, "APP": { "INSTALLING": "Instalare în curs la {{path}}", From 1f94e67ab5bc926fc467d2e4aeced8137e96c355 Mon Sep 17 00:00:00 2001 From: jzy-chitong56 <48715223+jzy-chitong56@users.noreply.github.com> Date: Fri, 22 Nov 2024 10:10:09 +0800 Subject: [PATCH 14/35] Update ru.json --- Electron/src/assets/i18n/ru.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Electron/src/assets/i18n/ru.json b/Electron/src/assets/i18n/ru.json index 270a250d3..ee36014d8 100644 --- a/Electron/src/assets/i18n/ru.json +++ b/Electron/src/assets/i18n/ru.json @@ -1,5 +1,8 @@ { "PAGES": { + "CURRENT_LANGUAGE": { + "TIPS": "this Russian json" + }, "HOME": { "TITLE": "Установщик AMAI", "CHOOSE_GAME_VERSION": "Выберите версию игры", @@ -9,8 +12,8 @@ "INCLUDE_COMMANDER": "Включить командира", "INCLUDE_COMMANDER_VSAI": "Против Vanilla ИИ", "INCLUDE_COMMANDER_OFF": "Без командира", - "OPTIMISE": "Использовать оптимизированные скрипты", - "FORCELANG": "Переопределить язык по умолчанию ИИ" + "OPTIMISE": "Снижение нагрузки системы", + "FORCELANG": "Скачать язык разговора" }, "APP": { "INSTALLING": "Установка в {{path}}", From 4b9c3cc862a274a9e12a84e3745de5f17dccc798 Mon Sep 17 00:00:00 2001 From: jzy-chitong56 <48715223+jzy-chitong56@users.noreply.github.com> Date: Fri, 22 Nov 2024 10:11:00 +0800 Subject: [PATCH 15/35] Update sv.json --- Electron/src/assets/i18n/sv.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Electron/src/assets/i18n/sv.json b/Electron/src/assets/i18n/sv.json index a357b7994..ed5b11578 100644 --- a/Electron/src/assets/i18n/sv.json +++ b/Electron/src/assets/i18n/sv.json @@ -1,5 +1,8 @@ { "PAGES": { + "CURRENT_LANGUAGE": { + "TIPS": "this Swedish json" + }, "HOME": { "TITLE": "AMAI Installerare", "CHOOSE_GAME_VERSION": "Välj spelversion", @@ -9,8 +12,8 @@ "INCLUDE_COMMANDER": "Inkludera befälhavare", "INCLUDE_COMMANDER_VSAI": "Mot Vanilla AI", "INCLUDE_COMMANDER_OFF": "Ingen befälhavare", - "OPTIMISE": "Använd optimerade skript", - "FORCELANG": "Åsidosätt standard AI-språk" + "OPTIMISE": "Minska systembelastningen", + "FORCELANG": "Skriv över AI-chattspråk" }, "APP": { "INSTALLING": "Installerar i {{path}}", From 271b46bfbc1c1a8b01ceddab022dd02051f5936b Mon Sep 17 00:00:00 2001 From: jzy-chitong56 <48715223+jzy-chitong56@users.noreply.github.com> Date: Fri, 22 Nov 2024 10:12:37 +0800 Subject: [PATCH 16/35] Update zh.json --- Electron/src/assets/i18n/zh.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Electron/src/assets/i18n/zh.json b/Electron/src/assets/i18n/zh.json index ba8ef91f4..86b6c690f 100644 --- a/Electron/src/assets/i18n/zh.json +++ b/Electron/src/assets/i18n/zh.json @@ -1,5 +1,8 @@ { "PAGES": { + "CURRENT_LANGUAGE": { + "TIPS": "Hi Developer , this Chinese json" + }, "HOME": { "TITLE": "AMAI 安装器", "CHOOSE_GAME_VERSION": "选择游戏版本", @@ -9,8 +12,8 @@ "INCLUDE_COMMANDER": "安装控制台", "INCLUDE_COMMANDER_VSAI": "安装VS AI控制台", "INCLUDE_COMMANDER_OFF": "不安装控制台", - "OPTIMISE": "使用优化脚本", - "FORCELANG": "覆盖默认AI语言" + "OPTIMISE": "降低系统负载", + "FORCELANG": "覆盖AI聊天语言" }, "APP": { "INSTALLING": "正在安装 {{path}}", From 418e603141932b8c77f4ed5b32174967dec8935f Mon Sep 17 00:00:00 2001 From: jzy-chitong56 <48715223+jzy-chitong56@users.noreply.github.com> Date: Fri, 22 Nov 2024 13:32:32 +0800 Subject: [PATCH 17/35] Update zh.json --- Electron/src/assets/i18n/zh.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Electron/src/assets/i18n/zh.json b/Electron/src/assets/i18n/zh.json index 86b6c690f..56f4348d8 100644 --- a/Electron/src/assets/i18n/zh.json +++ b/Electron/src/assets/i18n/zh.json @@ -1,7 +1,7 @@ { "PAGES": { "CURRENT_LANGUAGE": { - "TIPS": "Hi Developer , this Chinese json" + "TIPS": "this Chinese json" }, "HOME": { "TITLE": "AMAI 安装器", From f5802597de78d97a3eca5f0245d97256f63fe2c9 Mon Sep 17 00:00:00 2001 From: jzy-chitong56 <48715223+jzy-chitong56@users.noreply.github.com> Date: Fri, 22 Nov 2024 14:07:28 +0800 Subject: [PATCH 18/35] Update main.ts --- Electron/app/main.ts | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/Electron/app/main.ts b/Electron/app/main.ts index 6d045bc0f..ef848c5c5 100644 --- a/Electron/app/main.ts +++ b/Electron/app/main.ts @@ -260,7 +260,21 @@ const installTrans = () => { } translations = data as { [key: string]: string }; if (win != null) { - win.setTitle(translations['PAGES.HOME.TITLE'] || '') + let packageJson = {}; + let version = ''; + let WinTitle = translations['PAGES.HOME.TITLE']; + let WinTitle_err = ''; + fs.readFile(path.join(__dirname, 'package.json'), 'utf8', (err, data) => { + if (err) { + console.warn('Error reading package.json:', err); + } else { + packageJson = JSON.parse(data); + version = packageJson.version; + WinTitle = '${WinTitle} v${version}'; + WinTitle_err = 'v${version}'; + } + } + win.setTitle(${WinTitle} || ${WinTitle_err}) } }); } From 23450e733556243a0f39b584b6d9929b632a9435 Mon Sep 17 00:00:00 2001 From: jzy-chitong56 <48715223+jzy-chitong56@users.noreply.github.com> Date: Fri, 22 Nov 2024 14:10:01 +0800 Subject: [PATCH 19/35] Update zh.json --- Electron/src/assets/i18n/zh.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Electron/src/assets/i18n/zh.json b/Electron/src/assets/i18n/zh.json index 56f4348d8..bd47b8ce9 100644 --- a/Electron/src/assets/i18n/zh.json +++ b/Electron/src/assets/i18n/zh.json @@ -10,7 +10,7 @@ "INSTALL_ON_FOLDER": "按文件夹安装", "INSTALL_ON_MAP": "按地图安装", "INCLUDE_COMMANDER": "安装控制台", - "INCLUDE_COMMANDER_VSAI": "安装VS AI控制台", + "INCLUDE_COMMANDER_VSAI": "VS 暴雪AI", "INCLUDE_COMMANDER_OFF": "不安装控制台", "OPTIMISE": "降低系统负载", "FORCELANG": "覆盖AI聊天语言" From 7e6c150e9ac1f5ad4aa6dbc9bb024df3883b3a18 Mon Sep 17 00:00:00 2001 From: jzy-chitong56 <48715223+jzy-chitong56@users.noreply.github.com> Date: Fri, 22 Nov 2024 14:10:19 +0800 Subject: [PATCH 20/35] Update zh.json --- Electron/src/assets/i18n/zh.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Electron/src/assets/i18n/zh.json b/Electron/src/assets/i18n/zh.json index bd47b8ce9..e65698086 100644 --- a/Electron/src/assets/i18n/zh.json +++ b/Electron/src/assets/i18n/zh.json @@ -10,7 +10,7 @@ "INSTALL_ON_FOLDER": "按文件夹安装", "INSTALL_ON_MAP": "按地图安装", "INCLUDE_COMMANDER": "安装控制台", - "INCLUDE_COMMANDER_VSAI": "VS 暴雪AI", + "INCLUDE_COMMANDER_VSAI": "AMAI VS 暴雪AI", "INCLUDE_COMMANDER_OFF": "不安装控制台", "OPTIMISE": "降低系统负载", "FORCELANG": "覆盖AI聊天语言" From 5c2126f8cfdc8c0897d6212a49fe328cabac7da5 Mon Sep 17 00:00:00 2001 From: jzy-chitong56 <48715223+jzy-chitong56@users.noreply.github.com> Date: Fri, 22 Nov 2024 16:26:57 +0800 Subject: [PATCH 21/35] Update MakeVERBase.bat --- MakeVERBase.bat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MakeVERBase.bat b/MakeVERBase.bat index 16b26ff86..783380bcd 100644 --- a/MakeVERBase.bat +++ b/MakeVERBase.bat @@ -14,7 +14,7 @@ mkdir Scripts\%VER%\ ECHO _____________________________ ECHO creating \Scripts\%VER%\common.ai perl ejass.pl common.eai %VER% VER:%VER% > Scripts\%VER%\common.ai -ECHO IGNORE jasshelper --scriptonly common.j Scripts\%VER%\Blizzard.j Scripts\%VER%\Blizzard_VSAI.j Scripts\%VER%\common.ai Scripts\%VER%\common2.ai +ECHO IGNORE jasshelper --scriptonly common.j Scripts\%VER%\Blizzard.j Scripts\%VER%\vsai\Blizzard.j Scripts\%VER%\common.ai Scripts\%VER%\common2.ai ECHO \Scripts\%VER%\common.ai created pjass %VER%\common.j Scripts\%VER%\common.ai if "%errorlevel%"=="1" SET RESULTMAKEVER=1 @@ -55,14 +55,14 @@ if "%errorlevel%"=="1" SET RESULTMAKEVER=1 ECHO _____________________________ perl SplitBlizzardJ.pl %VER% ECHO _____________________________ -ECHO creating \Scripts\%VER%\Blizzard_VSAI.j +ECHO creating \Scripts\%VER%\vsai\Blizzard.j perl ejass.pl Blizzard3VAI.eai %VER% VER:%VER% > %VER%\tmp\Blizzard3Gen.j perl ejass.pl Blizzard.eai %VER% VER:%VER% > Scripts\%VER%\vsai\Blizzard.j pjass %VER%\common.j Scripts\%VER%\vsai\Blizzard.j if "%errorlevel%"=="1" SET RESULTMAKEVER=1 jassparser %VER%\common.j Scripts\%VER%\vsai\Blizzard.j if "%errorlevel%"=="1" SET RESULTMAKEVER=1 -ECHO \Scripts\%VER%\Blizzard_VSAI.j created +ECHO \Scripts\%VER%\vsai\Blizzard.j created ECHO _____________________________ ECHO creating \Scripts\%VER%\Blizzard.j perl ejass.pl Blizzard3.eai %VER% VER:%VER% > %VER%\tmp\Blizzard3Gen.j From 2a5c1372c360befc43fbb798fed03535477e9c61 Mon Sep 17 00:00:00 2001 From: jzy-chitong56 <48715223+jzy-chitong56@users.noreply.github.com> Date: Fri, 22 Nov 2024 16:44:05 +0800 Subject: [PATCH 22/35] Update main.ts --- Electron/app/main.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Electron/app/main.ts b/Electron/app/main.ts index ef848c5c5..a42d3416e 100644 --- a/Electron/app/main.ts +++ b/Electron/app/main.ts @@ -260,7 +260,10 @@ const installTrans = () => { } translations = data as { [key: string]: string }; if (win != null) { - let packageJson = {}; + interface PackageJson { + version: string; + } + let packageJson: PackageJson = {} as PackageJson; let version = ''; let WinTitle = translations['PAGES.HOME.TITLE']; let WinTitle_err = ''; @@ -273,8 +276,8 @@ const installTrans = () => { WinTitle = '${WinTitle} v${version}'; WinTitle_err = 'v${version}'; } - } - win.setTitle(${WinTitle} || ${WinTitle_err}) + }); + win.setTitle(WinTitle || WinTitle_err) } }); } From 7d4808c3a3e672015ad11a7fb828e5ad7336b232 Mon Sep 17 00:00:00 2001 From: jzy-chitong56 <48715223+jzy-chitong56@users.noreply.github.com> Date: Fri, 22 Nov 2024 17:55:47 +0800 Subject: [PATCH 23/35] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20install.js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Electron/AMAI-release/install.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Electron/AMAI-release/install.js b/Electron/AMAI-release/install.js index aacfe15b0..95bd469c7 100644 --- a/Electron/AMAI-release/install.js +++ b/Electron/AMAI-release/install.js @@ -66,8 +66,8 @@ const installOnDirectory = async () => { process.send(`ERROR: Cannot find ${process.cwd()}\\${blizzardPath}`) return } - if (vsAICommander && !fs.existsSync(`Scripts\\${ver}\\vsai\Blizzard.j`)) { - process.send(`ERROR: Cannot find ${process.cwd()}\\Scripts\\${ver}\\vsai\Blizzard.j`) + if (vsAICommander && !fs.existsSync(`Scripts\\${ver}\\vsai\\Blizzard.j`)) { + process.send(`ERROR: Cannot find ${process.cwd()}\\Scripts\\${ver}\\vsai\\Blizzard.j`) return } @@ -163,7 +163,7 @@ const installOnDirectory = async () => { [ 'a', file, - `Scripts\\${ver}\\vsai\*.ai`, + `Scripts\\${ver}\\vsai\\*.ai`, `Scripts` ], { encoding : `utf8` } From 375aa018c90000ee9d7e29a13ed2eacc27607043 Mon Sep 17 00:00:00 2001 From: jzy-chitong56 <48715223+jzy-chitong56@users.noreply.github.com> Date: Sat, 30 Nov 2024 12:43:22 +0800 Subject: [PATCH 24/35] Update menu.service.ts --- .../app/core/services/menu/menu.service.ts | 92 ++++++++++++++++++- 1 file changed, 88 insertions(+), 4 deletions(-) diff --git a/Electron/src/app/core/services/menu/menu.service.ts b/Electron/src/app/core/services/menu/menu.service.ts index 1d6b47a07..a618daa2e 100644 --- a/Electron/src/app/core/services/menu/menu.service.ts +++ b/Electron/src/app/core/services/menu/menu.service.ts @@ -20,25 +20,109 @@ export class MenuService { { label: 'Install Opt Reforged on Folder with Commander', click: () => { - this.electronService.ipcRenderer.send('install', 'REFORGED', true, true, true, false); + this.electronService.ipcRenderer.send('install', 'REFORGED', true, 1, true, true); + } + }, + { + label: 'Install Opt Reforged on Folder with VS AI Commander', + click: () => { + this.electronService.ipcRenderer.send('install', 'REFORGED', true, 2, true, true); } }, { label: 'Install Opt Reforged on Folder (No Commander)', click: () => { - this.electronService.ipcRenderer.send('install', true, false, true, false); + this.electronService.ipcRenderer.send('install', 'REFORGED', true, 0, true, true); } }, { label: 'Install Opt Reforged on Map with Commander', click: () => { - this.electronService.ipcRenderer.send('install','REFORGED', false, true, true, false); + this.electronService.ipcRenderer.send('install','REFORGED', false, 1, true, true); + } + }, + { + label: 'Install Opt Reforged on Map with VS AI Commander', + click: () => { + this.electronService.ipcRenderer.send('install','REFORGED', false, 2, true, true); } }, { label: 'Install Opt Reforged on Map (No Commander)', click: () => { - this.electronService.ipcRenderer.send('install', false, false, true, false); + this.electronService.ipcRenderer.send('install', 'REFORGED', false, 0, true, true); + } + }, + { + label: 'Install Opt TFT on Folder with Commander', + click: () => { + this.electronService.ipcRenderer.send('install', 'TFT', true, 1, true, true); + } + }, + { + label: 'Install Opt TFT on Folder with VS AI Commander', + click: () => { + this.electronService.ipcRenderer.send('install', 'TFT', true, 2, true, true); + } + }, + { + label: 'Install Opt TFT on Folder (No Commander)', + click: () => { + this.electronService.ipcRenderer.send('install', 'TFT', true, 0, true, true); + } + }, + { + label: 'Install Opt TFT on Map with Commander', + click: () => { + this.electronService.ipcRenderer.send('install','TFT', false, 1, true, true); + } + }, + { + label: 'Install Opt TFT on Map with VS AI Commander', + click: () => { + this.electronService.ipcRenderer.send('install','TFT', false, 2, true, true); + } + }, + { + label: 'Install Opt TFT on Map (No Commander)', + click: () => { + this.electronService.ipcRenderer.send('install', 'TFT', false, 0, true, true); + } + }, + { + label: 'Install Opt ROC on Folder with Commander', + click: () => { + this.electronService.ipcRenderer.send('install', 'ROC', true, 1, true, true); + } + }, + { + label: 'Install Opt ROC on Folder with VS AI Commander', + click: () => { + this.electronService.ipcRenderer.send('install', 'ROC', true, 2, true, true); + } + }, + { + label: 'Install Opt ROC on Folder (No Commander)', + click: () => { + this.electronService.ipcRenderer.send('install', 'ROC', true, 0, true, true); + } + }, + { + label: 'Install Opt ROC on Map with Commander', + click: () => { + this.electronService.ipcRenderer.send('install','ROC', false, 1, true, true); + } + }, + { + label: 'Install Opt ROC on Map with VS AI Commander', + click: () => { + this.electronService.ipcRenderer.send('install','ROC', false, 2, true, true); + } + }, + { + label: 'Install Opt ROC on Map (No Commander)', + click: () => { + this.electronService.ipcRenderer.send('install', 'ROC', false, 0, true, true); } }, // TODO: recreate MakeTFT script From 5d3b37498bfe5f071df77b4f3a1f5f62acec937c Mon Sep 17 00:00:00 2001 From: jzy-chitong56 <48715223+jzy-chitong56@users.noreply.github.com> Date: Sat, 30 Nov 2024 12:54:56 +0800 Subject: [PATCH 25/35] Update install.js --- Electron/AMAI-release/install.js | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/Electron/AMAI-release/install.js b/Electron/AMAI-release/install.js index 95bd469c7..659a839ba 100644 --- a/Electron/AMAI-release/install.js +++ b/Electron/AMAI-release/install.js @@ -207,6 +207,26 @@ const installOnDirectory = async () => { process.send(f2AddToMPQ.error.message) : process.send(installCommander ? `Installing commander ${file}` : `Installing VS Vanilla AI commander ${file}`); + } else { + const f2AddToMPQ = spawnSync( + `MPQEditor.exe`, + [ + 'd', + file, + `Scripts\\Blizzard.j`, + ], + { encoding : `utf8` } + ); + if (f2AddToMPQ.status == 5) { + process.send(`WARN: ${file} to disable ${bj} script failed, you may not have valid permissions or are blocked by windows UAC. Ensure map files are not in a UAC protected location`) + continue; + } else if (f2AddToMPQ.status > 0) { + process.send(`WARN: ${file} Possibly failed to disable ${bj} script, Unknown error occurred: ${f2AddToMPQ.status}`) + continue; + } + f2AddToMPQ.error ? + process.send(f2AddToMPQ.error.message) + : process.send(`Disable commander ${file}`); } const f3AddToMPQ = spawnSync( From 842087dd447333cc346eaa8ae7659dab44e96d73 Mon Sep 17 00:00:00 2001 From: jzy-chitong56 <48715223+jzy-chitong56@users.noreply.github.com> Date: Sat, 30 Nov 2024 12:55:13 +0800 Subject: [PATCH 26/35] Add files via upload --- InstallAppointVERToMap.bat | 110 +++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) create mode 100644 InstallAppointVERToMap.bat diff --git a/InstallAppointVERToMap.bat b/InstallAppointVERToMap.bat new file mode 100644 index 000000000..aa714476b --- /dev/null +++ b/InstallAppointVERToMap.bat @@ -0,0 +1,110 @@ +@ECHO off +chcp 65001 +SET VER=REFORGED +SET COMMAND=1 +SET COMMAND_STATE=安装常规控制台 + +:VERMenu +cls +ECHO. +ECHO (1/4) 请选择魔兽3版本: +ECHO. +ECHO 1. 重制版 REFORGED (1.33+) (默认) +ECHO 2. 经典版-冰封王座 TFT (1.24e+) +ECHO 3. 经典版-混乱之治 ROC (1.24e ~ 1.31) +ECHO. +set /p choice=请输入(1 ~ 3): + +if "%choice%"=="1" ( + set VER=REFORGED +) +if "%choice%"=="2" ( + set VER=TFT +) +if "%choice%"=="3" ( + set VER=ROC +) + +goto ComMenu + +:ComMenu +cls +ECHO. +ECHO 魔兽版本: %VER% +ECHO. +ECHO (2/4) 控制台选项: +ECHO 1. 安装常规控制台 (默认) +ECHO 2. 安装 VS AI 控制台 (VS 第三方 AI) +ECHO 3. 不安装控制台 +ECHO. +set /p choice=请输入(1 ~ 3): + +if "%choice%"=="1" ( + SET COMMAND=1 + SET COMMAND_STATE =安装常规控制台 +) +if "%choice%"=="2" ( + SET COMMAND=2 + SET COMMAND_STATE =安装 VS AI 控制台 +) +if "%choice%"=="3" ( + SET COMMAND=0 + SET COMMAND_STATE =不安装控制台 +) + +goto InstallMenu + +:InstallMenu +cls +ECHO. +ECHO 魔兽版本: %VER% , 控制台: %COMMAND_STATE% +ECHO. +ECHO (3/4) 请选择安装方式: +ECHO. 1. 批量安装 (默认) +ECHO. 2. 逐张地图安装 +ECHO. +set /p choice=请输入(1 ~ 2): + +if "%choice%"=="1" ( + goto InputPath +) + +if not "%choice%"=="1" ( + goto InputMap +) + + +:InputPath +cls +ECHO. +ECHO 魔兽版本: %VER% , 控制台: %COMMAND_STATE% , 安装方式: 批量安装 +ECHO. +ECHO (4/4) 请输入地图文件夹路径. +ECHO 例: C:\Documents\Warcraft III\Maps +ECHO. +set /p searchPath=请输入: + +setlocal enabledelayedexpansion +for %%F in ("%searchPath%\*.w3x" "%searchPath%\*.w3m") do ( + call InstallVERToMap !VER! "!%%~fF!" "%COMMAND%" +) +endlocal +goto EndScript + +:InputMap +cls +ECHO. +ECHO 魔兽版本: %VER% , 控制台: %COMMAND_STATE% , 安装方式: 逐张地图安装 +ECHO. +ECHO (4/4)请输入地图文件夹路径及地图名(包括格式) +ECHO 例: C:\Documents\Warcraft III\Maps\Friends_v1.2.w3x +ECHO. +set /p filePath=请输入: + +call InstallVERToMap %VER% "%filePath%" "%COMMAND%" +ECHO 若安装完成,请关闭本窗口,否则请点击任意键继续安装 +pause +goto InputMap + +:EndScript +pause \ No newline at end of file From 5d43eee47ff42660bfaf35493569085e9c5e51fa Mon Sep 17 00:00:00 2001 From: jzy-chitong56 <48715223+jzy-chitong56@users.noreply.github.com> Date: Sat, 30 Nov 2024 12:55:51 +0800 Subject: [PATCH 27/35] Update InstallAppointVERToMap.bat --- InstallAppointVERToMap.bat | 65 +++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/InstallAppointVERToMap.bat b/InstallAppointVERToMap.bat index aa714476b..8b53ce7fa 100644 --- a/InstallAppointVERToMap.bat +++ b/InstallAppointVERToMap.bat @@ -2,18 +2,18 @@ chcp 65001 SET VER=REFORGED SET COMMAND=1 -SET COMMAND_STATE=安装常规控制台 +SET COMMAND_STATE=Install Commander :VERMenu cls ECHO. -ECHO (1/4) 请选择魔兽3版本: +ECHO (1/4) Please select War3 version: ECHO. -ECHO 1. 重制版 REFORGED (1.33+) (默认) -ECHO 2. 经典版-冰封王座 TFT (1.24e+) -ECHO 3. 经典版-混乱之治 ROC (1.24e ~ 1.31) +ECHO 1. REFORGED (1.33+) (default) +ECHO 2. TFT (1.24e ~ 1.32.10) +ECHO 3. ROC (1.24e ~ 1.31) ECHO. -set /p choice=请输入(1 ~ 3): +set /p choice=Input(1 ~ 3): if "%choice%"=="1" ( set VER=REFORGED @@ -25,31 +25,31 @@ if "%choice%"=="3" ( set VER=ROC ) -goto ComMenu +goto comMenu -:ComMenu +:comMenu cls ECHO. -ECHO 魔兽版本: %VER% +ECHO War3 version: %VER% ECHO. -ECHO (2/4) 控制台选项: -ECHO 1. 安装常规控制台 (默认) -ECHO 2. 安装 VS AI 控制台 (VS 第三方 AI) -ECHO 3. 不安装控制台 +ECHO (2/4) Installation Commander?: +ECHO 1. Install Commander (default) +ECHO 2. Install VS AI Commander +ECHO 3. Not Install Commander ECHO. -set /p choice=请输入(1 ~ 3): +set /p choice=Input(1 ~ 3): if "%choice%"=="1" ( SET COMMAND=1 - SET COMMAND_STATE =安装常规控制台 + SET COMMAND_STATE=Install Commander ) if "%choice%"=="2" ( SET COMMAND=2 - SET COMMAND_STATE =安装 VS AI 控制台 + SET COMMAND_STATE=Install VS AI Commander ) if "%choice%"=="3" ( SET COMMAND=0 - SET COMMAND_STATE =不安装控制台 + SET COMMAND_STATE=Not Install Commander ) goto InstallMenu @@ -57,13 +57,13 @@ goto InstallMenu :InstallMenu cls ECHO. -ECHO 魔兽版本: %VER% , 控制台: %COMMAND_STATE% +ECHO War3 version: %VER% , Commander: %COMMAND_STATE% ECHO. -ECHO (3/4) 请选择安装方式: -ECHO. 1. 批量安装 (默认) -ECHO. 2. 逐张地图安装 +ECHO (3/4) Please choose the installation method: +ECHO. 1. Install to Map Folder (default) +ECHO. 2. Install to Single Map ECHO. -set /p choice=请输入(1 ~ 2): +set /p choice=Input(1 ~ 2): if "%choice%"=="1" ( goto InputPath @@ -73,16 +73,15 @@ if not "%choice%"=="1" ( goto InputMap ) - :InputPath cls ECHO. -ECHO 魔兽版本: %VER% , 控制台: %COMMAND_STATE% , 安装方式: 批量安装 +ECHO War3 version: %VER% , Commander: %COMMAND_STATE% , Installation Method : Map Folder ECHO. -ECHO (4/4) 请输入地图文件夹路径. -ECHO 例: C:\Documents\Warcraft III\Maps +ECHO (4/4) Please enter the complete path of the map folder. +ECHO e.g. C:\Documents\Warcraft III\Maps ECHO. -set /p searchPath=请输入: +set /p searchPath=Input: setlocal enabledelayedexpansion for %%F in ("%searchPath%\*.w3x" "%searchPath%\*.w3m") do ( @@ -94,17 +93,17 @@ goto EndScript :InputMap cls ECHO. -ECHO 魔兽版本: %VER% , 控制台: %COMMAND_STATE% , 安装方式: 逐张地图安装 +ECHO War3 version: %VER% , Commander: %COMMAND_STATE% , Installation Method : Single Map ECHO. -ECHO (4/4)请输入地图文件夹路径及地图名(包括格式) -ECHO 例: C:\Documents\Warcraft III\Maps\Friends_v1.2.w3x +ECHO (4/4) Please enter the complete path of the map folder and map File Name (with Format). +ECHO e.g. C:\Documents\Warcraft III\Maps\Friends_v1.2.w3x ECHO. -set /p filePath=请输入: +set /p filePath=Input: call InstallVERToMap %VER% "%filePath%" "%COMMAND%" -ECHO 若安装完成,请关闭本窗口,否则请点击任意键继续安装 +ECHO If the installation is complete, please close this window, else please click any key to continue installation. pause goto InputMap :EndScript -pause \ No newline at end of file +pause From 87fdc04e35b756584355855c80bfcdd18b2f8094 Mon Sep 17 00:00:00 2001 From: jzy-chitong56 <48715223+jzy-chitong56@users.noreply.github.com> Date: Mon, 9 Dec 2024 02:11:08 +0800 Subject: [PATCH 28/35] Update InstallAppointVERToMap.bat --- InstallAppointVERToMap.bat | 200 ++++++++++++++++++++++++++++--------- 1 file changed, 154 insertions(+), 46 deletions(-) diff --git a/InstallAppointVERToMap.bat b/InstallAppointVERToMap.bat index 8b53ce7fa..b466a03bb 100644 --- a/InstallAppointVERToMap.bat +++ b/InstallAppointVERToMap.bat @@ -1,87 +1,111 @@ @ECHO off -chcp 65001 SET VER=REFORGED SET COMMAND=1 -SET COMMAND_STATE=Install Commander +SET COMMAND_STATE=Convention Commander +SET SETMAP=1 -:VERMenu +:FunctionMenu cls +ECHO. Please select Mode: ECHO. -ECHO (1/4) Please select War3 version: -ECHO. -ECHO 1. REFORGED (1.33+) (default) -ECHO 2. TFT (1.24e ~ 1.32.10) -ECHO 3. ROC (1.24e ~ 1.31) +ECHO 1. Install AMAI (Convention Commander) (default) +ECHO 2. Install AMAI (VS VanillaAI Commander) +ECHO 3. Install AMAI (No Commander) +ECHO 4. Remove AMAI Commander +ECHO 5. Remove AMAI Script and Commander ECHO. -set /p choice=Input(1 ~ 3): +set /p choice=Input and Enter(1 ~ 5): if "%choice%"=="1" ( - set VER=REFORGED + SET COMMAND=1 + SET COMMAND_STATE=Convention Commander ) if "%choice%"=="2" ( - set VER=TFT + SET COMMAND=2 + SET COMMAND_STATE=VS VanillaAI Commander ) if "%choice%"=="3" ( - set VER=ROC + SET COMMAND=0 + SET COMMAND_STATE=No Commander +) +if "%choice%"=="4" ( + SET COMMAND=-1 + SET COMMAND_STATE=Remove AMAI AMAI Commander +) +if "%choice%"=="5" ( + SET COMMAND=-2 + SET COMMAND_STATE=Remove AMAI AMAI Script and Commander ) -goto comMenu +goto InstallMenu -:comMenu +:InstallMenu cls ECHO. -ECHO War3 version: %VER% +ECHO Mode: %COMMAND_STATE% ECHO. -ECHO (2/4) Installation Commander?: -ECHO 1. Install Commander (default) -ECHO 2. Install VS AI Commander -ECHO 3. Not Install Commander +ECHO Please choose Map process Method: +ECHO 1. Batch process by Folder (default) +ECHO 2. Each process by Map ECHO. -set /p choice=Input(1 ~ 3): +set /p choice=Input and Enter(1 ~ 2): if "%choice%"=="1" ( - SET COMMAND=1 - SET COMMAND_STATE=Install Commander -) -if "%choice%"=="2" ( - SET COMMAND=2 - SET COMMAND_STATE=Install VS AI Commander -) -if "%choice%"=="3" ( - SET COMMAND=0 - SET COMMAND_STATE=Not Install Commander + if "%COMMAND%"=="-1" ( + goto UnInstallComMenu + ) else if "%COMMAND%"=="-2" ( + goto UnInstallMenu + ) else ( + goto VERMenu + ) ) -goto InstallMenu +if not "%choice%"=="1" ( + set SETMAP=0 + if "%COMMAND%"=="-1" ( + goto UnInstallComMenu + ) else if "%COMMAND%"=="-2" ( + goto UnInstallMenu + ) else ( + goto VERMenu + ) +) -:InstallMenu +:VERMenu cls ECHO. -ECHO War3 version: %VER% , Commander: %COMMAND_STATE% +ECHO Please select War3 version: ECHO. -ECHO (3/4) Please choose the installation method: -ECHO. 1. Install to Map Folder (default) -ECHO. 2. Install to Single Map +ECHO 1. REFORGED (1.33+) (default) +ECHO 2. TFT (1.24e+) +ECHO 3. ROC (1.24e ~ 1.31) ECHO. -set /p choice=Input(1 ~ 2): +set /p choice=Input and Enter(1 ~ 3): if "%choice%"=="1" ( - goto InputPath + set VER=REFORGED ) - -if not "%choice%"=="1" ( +if "%choice%"=="2" ( + set VER=TFT +) +if "%choice%"=="3" ( + set VER=ROC +) +if "%SETMAP%"=="1" ( + goto InputPath +) else ( goto InputMap ) :InputPath cls ECHO. -ECHO War3 version: %VER% , Commander: %COMMAND_STATE% , Installation Method : Map Folder +ECHO War3 version: %VER% , Commander: %COMMAND_STATE% , Map process Method: Batch process by Folder ECHO. -ECHO (4/4) Please enter the complete path of the map folder. +ECHO Please enter the complete path of the map folder. ECHO e.g. C:\Documents\Warcraft III\Maps ECHO. -set /p searchPath=Input: +set /p searchPath=Input and Enter: setlocal enabledelayedexpansion for %%F in ("%searchPath%\*.w3x" "%searchPath%\*.w3m") do ( @@ -93,12 +117,12 @@ goto EndScript :InputMap cls ECHO. -ECHO War3 version: %VER% , Commander: %COMMAND_STATE% , Installation Method : Single Map +ECHO War3 version: %VER% , Commander: %COMMAND_STATE% , Map process Method: Each process by Map ECHO. -ECHO (4/4) Please enter the complete path of the map folder and map File Name (with Format). +ECHO Please enter the complete path of the map folder. and map File Name (with Format). ECHO e.g. C:\Documents\Warcraft III\Maps\Friends_v1.2.w3x ECHO. -set /p filePath=Input: +set /p filePath=Input and Enter: call InstallVERToMap %VER% "%filePath%" "%COMMAND%" ECHO If the installation is complete, please close this window, else please click any key to continue installation. @@ -107,3 +131,87 @@ goto InputMap :EndScript pause + +:UnInstallComMenu +if "%SETMAP%"=="1" ( + goto UnInstallComPath +) else ( + goto UnInstallComMap +) + +:UnInstallComPath +cls +ECHO. +ECHO RemoveAMAICommander, Map process Method: Batch process by Folder +ECHO. +ECHO Please enter the complete path of the map folder. +ECHO e.g. C:\Documents\Warcraft III\Maps +ECHO. +set /p searchPath=Input and Enter: + +setlocal enabledelayedexpansion +for %%F in ("%searchPath%\*.w3x" "%searchPath%\*.w3m") do ( + call UninstallCommander "!%%~fF!" +) +endlocal +goto EndUnScript + +:UnInstallComMap +cls +ECHO. +ECHO RemoveAMAICommander, Map process Method: Each process by Map +ECHO. +ECHO Please enter the complete path of the map folder. and map File Name (with Format). +ECHO e.g. C:\Documents\Warcraft III\Maps\Friends_v1.2.w3x +ECHO. +set /p filePath=Input and Enter: + +call UninstallCommander "%filePath%" +ECHO If the Remove is complete, please close this window, else please click any key to continue Remove. +pause +goto UnInstallComMap + +:EndUnScript +pause + +:UnInstallMenu +if "%SETMAP%"=="1" ( + goto UnInstallPath +) else ( + goto UnInstallMap +) + +:UnInstallPath +cls +ECHO. +ECHO Remove AMAI Script and Commander, Map process Method: Batch process by Folder +ECHO. +ECHO Please enter the complete path of the map folder. +ECHO e.g. C:\Documents\Warcraft III\Maps +ECHO. +set /p searchPath=Input and Enter: + +setlocal enabledelayedexpansion +for %%F in ("%searchPath%\*.w3x" "%searchPath%\*.w3m") do ( + call Uninstall "!%%~fF!" +) +endlocal +goto EndUnScript + +:UnInstallMap +cls +ECHO. +ECHO Remove AMAI Script and Commander, Map process Method: Each process by Map +ECHO. +ECHO Please enter the complete path of the map folder. and map File Name (with Format). +ECHO e.g. C:\Documents\Warcraft III\Maps\Friends_v1.2.w3x +ECHO. +set /p filePath=Input and Enter: + +call Uninstall "%filePath%" +ECHO If the Remove is complete, please close this window, else please click any key to continue Remove. +pause +goto UnInstallMap + +:EndUnScript +pause From 9e96eab09716de34364acdbda7bca08ff5e1f7c1 Mon Sep 17 00:00:00 2001 From: jzy-chitong56 <48715223+jzy-chitong56@users.noreply.github.com> Date: Tue, 10 Dec 2024 00:43:24 +0800 Subject: [PATCH 29/35] Update InstallAppointVERToMap.bat --- InstallAppointVERToMap.bat | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/InstallAppointVERToMap.bat b/InstallAppointVERToMap.bat index b466a03bb..9279097a4 100644 --- a/InstallAppointVERToMap.bat +++ b/InstallAppointVERToMap.bat @@ -129,9 +129,6 @@ ECHO If the installation is complete, please close this window, else please clic pause goto InputMap -:EndScript -pause - :UnInstallComMenu if "%SETMAP%"=="1" ( goto UnInstallComPath @@ -154,7 +151,7 @@ for %%F in ("%searchPath%\*.w3x" "%searchPath%\*.w3m") do ( call UninstallCommander "!%%~fF!" ) endlocal -goto EndUnScript +goto EndScript :UnInstallComMap cls @@ -171,9 +168,6 @@ ECHO If the Remove is complete, please close this window, else please click any pause goto UnInstallComMap -:EndUnScript -pause - :UnInstallMenu if "%SETMAP%"=="1" ( goto UnInstallPath @@ -196,7 +190,7 @@ for %%F in ("%searchPath%\*.w3x" "%searchPath%\*.w3m") do ( call Uninstall "!%%~fF!" ) endlocal -goto EndUnScript +goto EndScript :UnInstallMap cls @@ -213,5 +207,5 @@ ECHO If the Remove is complete, please close this window, else please click any pause goto UnInstallMap -:EndUnScript +:EndScript pause From 8295e6ded7e7bb44f6c0cfd17c6b02b0bb67e4bf Mon Sep 17 00:00:00 2001 From: jzy-chitong56 <48715223+jzy-chitong56@users.noreply.github.com> Date: Tue, 10 Dec 2024 21:44:23 +0800 Subject: [PATCH 30/35] Update InstallAppointVERToMap.bat --- InstallAppointVERToMap.bat | 2 ++ 1 file changed, 2 insertions(+) diff --git a/InstallAppointVERToMap.bat b/InstallAppointVERToMap.bat index 9279097a4..6d7c26adf 100644 --- a/InstallAppointVERToMap.bat +++ b/InstallAppointVERToMap.bat @@ -188,6 +188,7 @@ set /p searchPath=Input and Enter: setlocal enabledelayedexpansion for %%F in ("%searchPath%\*.w3x" "%searchPath%\*.w3m") do ( call Uninstall "!%%~fF!" + call UninstallCommander "!%%~fF!" ) endlocal goto EndScript @@ -203,6 +204,7 @@ ECHO. set /p filePath=Input and Enter: call Uninstall "%filePath%" +call UninstallCommander "%filePath%" ECHO If the Remove is complete, please close this window, else please click any key to continue Remove. pause goto UnInstallMap From 910d5ff27cdd6596417fa1051870505b81a30e42 Mon Sep 17 00:00:00 2001 From: jzy-chitong56 <48715223+jzy-chitong56@users.noreply.github.com> Date: Wed, 11 Dec 2024 00:09:33 +0800 Subject: [PATCH 31/35] Update package.json --- Electron/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/Electron/package.json b/Electron/package.json index e9bcc5ab3..98613eb44 100644 --- a/Electron/package.json +++ b/Electron/package.json @@ -17,6 +17,7 @@ "ng": "ng", "start": "cross-env ELECTRON_ENV=development npm-run-all -p electron:serve ng:serve", "ng:serve": "ng serve -c web -o", + "prebuild": "node -e \"const fs = require('fs'); const pkg = require('./package.json'); const content = fs.readFileSync('./app/main.ts', 'utf8').toString(); fs.writeFileSync('./app/main.ts', content.replace('__APP_VERSION__', JSON.stringify(pkg.version)))\"", "build": "npm run electron:serve-tsc && ng build --base-href ./", "build:dev": "npm run build -- -c dev", "build:prod": "npm run build -- -c production", From edf10729ec3758dac605c927f0ed6cf892c21ae2 Mon Sep 17 00:00:00 2001 From: jzy-chitong56 <48715223+jzy-chitong56@users.noreply.github.com> Date: Wed, 11 Dec 2024 00:10:51 +0800 Subject: [PATCH 32/35] Update main.ts --- Electron/app/main.ts | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/Electron/app/main.ts b/Electron/app/main.ts index a42d3416e..7270b7b0e 100644 --- a/Electron/app/main.ts +++ b/Electron/app/main.ts @@ -260,24 +260,10 @@ const installTrans = () => { } translations = data as { [key: string]: string }; if (win != null) { - interface PackageJson { - version: string; - } - let packageJson: PackageJson = {} as PackageJson; - let version = ''; - let WinTitle = translations['PAGES.HOME.TITLE']; - let WinTitle_err = ''; - fs.readFile(path.join(__dirname, 'package.json'), 'utf8', (err, data) => { - if (err) { - console.warn('Error reading package.json:', err); - } else { - packageJson = JSON.parse(data); - version = packageJson.version; - WinTitle = '${WinTitle} v${version}'; - WinTitle_err = 'v${version}'; - } - }); - win.setTitle(WinTitle || WinTitle_err) + let version = __APP_VERSION__ || ''; + let appName = translations['PAGES.HOME.TITLE'] || ''; + let WinTitle = `${appName} v${version}`; + win.setTitle(WinTitle) } }); } From 01f3e7ae1177f384441d02799404bde99d9771a2 Mon Sep 17 00:00:00 2001 From: jzy-chitong56 <48715223+jzy-chitong56@users.noreply.github.com> Date: Wed, 11 Dec 2024 00:18:51 +0800 Subject: [PATCH 33/35] Update main.ts --- Electron/app/main.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Electron/app/main.ts b/Electron/app/main.ts index 7270b7b0e..f7ca95d4b 100644 --- a/Electron/app/main.ts +++ b/Electron/app/main.ts @@ -260,9 +260,9 @@ const installTrans = () => { } translations = data as { [key: string]: string }; if (win != null) { - let version = __APP_VERSION__ || ''; + let version = __APP_VERSION__ ? `v${__APP_VERSION__}` : ''; let appName = translations['PAGES.HOME.TITLE'] || ''; - let WinTitle = `${appName} v${version}`; + let WinTitle = `${appName} ${version}`; win.setTitle(WinTitle) } }); From 182e39ceac15fec26d62e36a76ea6a4946128671 Mon Sep 17 00:00:00 2001 From: jzy-chitong56 <48715223+jzy-chitong56@users.noreply.github.com> Date: Wed, 11 Dec 2024 00:27:15 +0800 Subject: [PATCH 34/35] Update main.ts --- Electron/app/main.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Electron/app/main.ts b/Electron/app/main.ts index f7ca95d4b..7a99701cc 100644 --- a/Electron/app/main.ts +++ b/Electron/app/main.ts @@ -260,7 +260,8 @@ const installTrans = () => { } translations = data as { [key: string]: string }; if (win != null) { - let version = __APP_VERSION__ ? `v${__APP_VERSION__}` : ''; + let rawVersion = __APP_VERSION__ || ''; + let version = rawVersion ? `v${rawVersion}` : ''; let appName = translations['PAGES.HOME.TITLE'] || ''; let WinTitle = `${appName} ${version}`; win.setTitle(WinTitle) From 836ace7d2118437d9acb1263357c12077e1745f1 Mon Sep 17 00:00:00 2001 From: jzy-chitong56 <48715223+jzy-chitong56@users.noreply.github.com> Date: Sun, 16 Mar 2025 00:22:19 +0800 Subject: [PATCH 35/35] fix --- InstallAppointVERToMap.bat | 110 +++++++++++++++++++------------------ 1 file changed, 56 insertions(+), 54 deletions(-) diff --git a/InstallAppointVERToMap.bat b/InstallAppointVERToMap.bat index 6d7c26adf..9e398af2b 100644 --- a/InstallAppointVERToMap.bat +++ b/InstallAppointVERToMap.bat @@ -1,40 +1,40 @@ @ECHO off SET VER=REFORGED SET COMMAND=1 -SET COMMAND_STATE=Convention Commander +SET COMMAND_STATE=̨ SET SETMAP=1 :FunctionMenu cls -ECHO. Please select Mode: +ECHO. ѡģʽ: ECHO. -ECHO 1. Install AMAI (Convention Commander) (default) -ECHO 2. Install AMAI (VS VanillaAI Commander) -ECHO 3. Install AMAI (No Commander) -ECHO 4. Remove AMAI Commander -ECHO 5. Remove AMAI Script and Commander +ECHO 1. װ AMAI (̨) (Ĭ) +ECHO 2. װ AMAI (VSѩAĮ) +ECHO 3. װ AMAI (װ̨) +ECHO 4. Ƴ AMAI ̨ +ECHO 5. ж AMAI ̨ ECHO. -set /p choice=Input and Enter(1 ~ 5): +set /p choice=벢س(1 ~ 5): if "%choice%"=="1" ( SET COMMAND=1 - SET COMMAND_STATE=Convention Commander + SET COMMAND_STATE=̨ ) if "%choice%"=="2" ( SET COMMAND=2 - SET COMMAND_STATE=VS VanillaAI Commander + SET COMMAND_STATE=VS ѩAI ̨ ) if "%choice%"=="3" ( SET COMMAND=0 - SET COMMAND_STATE=No Commander + SET COMMAND_STATE=װ̨ ) if "%choice%"=="4" ( SET COMMAND=-1 - SET COMMAND_STATE=Remove AMAI AMAI Commander + SET COMMAND_STATE=Ƴ AMAI ̨ ) if "%choice%"=="5" ( SET COMMAND=-2 - SET COMMAND_STATE=Remove AMAI AMAI Script and Commander + SET COMMAND_STATE=ж AMAI ̨ ) goto InstallMenu @@ -42,13 +42,13 @@ goto InstallMenu :InstallMenu cls ECHO. -ECHO Mode: %COMMAND_STATE% +ECHO ģʽ: %COMMAND_STATE% ECHO. -ECHO Please choose Map process Method: -ECHO 1. Batch process by Folder (default) -ECHO 2. Each process by Map +ECHO ѡͼʽ: +ECHO 1. ļ (Ĭ) +ECHO 2. ŵͼ ECHO. -set /p choice=Input and Enter(1 ~ 2): +set /p choice=벢س(1 ~ 2): if "%choice%"=="1" ( if "%COMMAND%"=="-1" ( @@ -74,13 +74,13 @@ if not "%choice%"=="1" ( :VERMenu cls ECHO. -ECHO Please select War3 version: +ECHO ѡħ3汾: ECHO. -ECHO 1. REFORGED (1.33+) (default) -ECHO 2. TFT (1.24e+) -ECHO 3. ROC (1.24e ~ 1.31) +ECHO 1. ư REFORGED (1.33+) (Ĭ) +ECHO 2. - (1.24e+) +ECHO 3. -֮ (1.24e ~ 1.31) ECHO. -set /p choice=Input and Enter(1 ~ 3): +set /p choice=벢س(1 ~ 3): if "%choice%"=="1" ( set VER=REFORGED @@ -100,12 +100,12 @@ if "%SETMAP%"=="1" ( :InputPath cls ECHO. -ECHO War3 version: %VER% , Commander: %COMMAND_STATE% , Map process Method: Batch process by Folder +ECHO ħ3汾: %VER% , ̨: %COMMAND_STATE% , ͼʽ: ECHO. -ECHO Please enter the complete path of the map folder. -ECHO e.g. C:\Documents\Warcraft III\Maps +ECHO ͼļ· +ECHO : C:\Documents\Warcraft III\Maps ECHO. -set /p searchPath=Input and Enter: +set /p searchPath=벢س: setlocal enabledelayedexpansion for %%F in ("%searchPath%\*.w3x" "%searchPath%\*.w3m") do ( @@ -117,18 +117,19 @@ goto EndScript :InputMap cls ECHO. -ECHO War3 version: %VER% , Commander: %COMMAND_STATE% , Map process Method: Each process by Map +ECHO ħ3汾: %VER% , ̨: %COMMAND_STATE% , ͼʽ: ŵͼ ECHO. -ECHO Please enter the complete path of the map folder. and map File Name (with Format). -ECHO e.g. C:\Documents\Warcraft III\Maps\Friends_v1.2.w3x +ECHO ͼļ·ͼ(ʽ) +ECHO : C:\Documents\Warcraft III\Maps\Friends_v1.2.w3x ECHO. -set /p filePath=Input and Enter: +set /p filePath=벢س: call InstallVERToMap %VER% "%filePath%" "%COMMAND%" -ECHO If the installation is complete, please close this window, else please click any key to continue installation. +ECHO װ, رձ, װ pause goto InputMap + :UnInstallComMenu if "%SETMAP%"=="1" ( goto UnInstallComPath @@ -139,16 +140,16 @@ if "%SETMAP%"=="1" ( :UnInstallComPath cls ECHO. -ECHO RemoveAMAICommander, Map process Method: Batch process by Folder +ECHO ƳAMAĮ, ͼʽ: ECHO. -ECHO Please enter the complete path of the map folder. -ECHO e.g. C:\Documents\Warcraft III\Maps +ECHO ͼļ· +ECHO : C:\Documents\Warcraft III\Maps ECHO. -set /p searchPath=Input and Enter: +set /p searchPath=벢س: setlocal enabledelayedexpansion for %%F in ("%searchPath%\*.w3x" "%searchPath%\*.w3m") do ( - call UninstallCommander "!%%~fF!" + call UninstallCommander "%%~fF" ) endlocal goto EndScript @@ -156,18 +157,19 @@ goto EndScript :UnInstallComMap cls ECHO. -ECHO RemoveAMAICommander, Map process Method: Each process by Map +ECHO ƳAMAĮ, ͼʽ: ŵͼ ECHO. -ECHO Please enter the complete path of the map folder. and map File Name (with Format). -ECHO e.g. C:\Documents\Warcraft III\Maps\Friends_v1.2.w3x +ECHO ͼļ·ͼ(ʽ) +ECHO : C:\Documents\Warcraft III\Maps\Friends_v1.2.w3x ECHO. -set /p filePath=Input and Enter: +set /p filePath=벢س: call UninstallCommander "%filePath%" -ECHO If the Remove is complete, please close this window, else please click any key to continue Remove. +ECHO Ƴ, رձ, Ƴ pause goto UnInstallComMap + :UnInstallMenu if "%SETMAP%"=="1" ( goto UnInstallPath @@ -178,17 +180,17 @@ if "%SETMAP%"=="1" ( :UnInstallPath cls ECHO. -ECHO Remove AMAI Script and Commander, Map process Method: Batch process by Folder +ECHO жAMAĮ, ͼʽ: ECHO. -ECHO Please enter the complete path of the map folder. -ECHO e.g. C:\Documents\Warcraft III\Maps +ECHO ͼļ· +ECHO : C:\Documents\Warcraft III\Maps ECHO. -set /p searchPath=Input and Enter: +set /p searchPath=벢س: setlocal enabledelayedexpansion for %%F in ("%searchPath%\*.w3x" "%searchPath%\*.w3m") do ( - call Uninstall "!%%~fF!" - call UninstallCommander "!%%~fF!" + call Uninstall "%%~fF" + call UninstallCommander "%%~fF" ) endlocal goto EndScript @@ -196,18 +198,18 @@ goto EndScript :UnInstallMap cls ECHO. -ECHO Remove AMAI Script and Commander, Map process Method: Each process by Map +ECHO жAMAĮ, ͼʽ: ŵͼ ECHO. -ECHO Please enter the complete path of the map folder. and map File Name (with Format). -ECHO e.g. C:\Documents\Warcraft III\Maps\Friends_v1.2.w3x +ECHO ͼļ·ͼ(ʽ) +ECHO : C:\Documents\Warcraft III\Maps\Friends_v1.2.w3x ECHO. -set /p filePath=Input and Enter: +set /p filePath=벢س: call Uninstall "%filePath%" call UninstallCommander "%filePath%" -ECHO If the Remove is complete, please close this window, else please click any key to continue Remove. +ECHO ж, رձ, ж pause goto UnInstallMap :EndScript -pause +pause \ No newline at end of file