fix(webui): incorrect description of topaz shields for blast (#2211)

Reviewed-on: OpenWF/SpaceNinjaServer#2211
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>

.github/workflows/build.yml

@@ -1,6 +1,7 @@
 name: Build
 on:
-    push: {}
+    push:
+        branches: ["main"]
     pull_request: {}
 jobs:
     build:

.github/workflows/docker.yml

@@ -4,9 +4,9 @@ on:
         branches:
             - main
 jobs:
-    docker:
+    docker-amd64:
         if: github.repository == 'OpenWF/SpaceNinjaServer'
-        runs-on: ubuntu-latest
+        runs-on: amd64
         steps:
             - name: Set up Docker buildx
               uses: docker/setup-buildx-action@v3
@@ -18,8 +18,27 @@ jobs:
             - name: Build and push
               uses: docker/build-push-action@v6
               with:
-                  platforms: linux/amd64,linux/arm64
+                  platforms: linux/amd64
                   push: true
                   tags: |
                       openwf/spaceninjaserver:latest
                       openwf/spaceninjaserver:${{ github.sha }}
+    docker-arm64:
+        if: github.repository == 'OpenWF/SpaceNinjaServer'
+        runs-on: arm64
+        steps:
+            - name: Set up Docker buildx
+              uses: docker/setup-buildx-action@v3
+            - name: Log in to container registry
+              uses: docker/login-action@v3
+              with:
+                  username: openwf
+                  password: ${{ secrets.DOCKERHUB_TOKEN }}
+            - name: Build and push
+              uses: docker/build-push-action@v6
+              with:
+                  platforms: linux/arm64
+                  push: true
+                  tags: |
+                      openwf/spaceninjaserver:latest-arm64
+                      openwf/spaceninjaserver:${{ github.sha }}-arm64

Dockerfile

@@ -1,53 +1,11 @@
 FROM node:24-alpine3.21
 
-ENV APP_MONGODB_URL=mongodb://mongodb:27017/openWF
-ENV APP_MY_ADDRESS=localhost
-ENV APP_HTTP_PORT=80
-ENV APP_HTTPS_PORT=443
-ENV APP_AUTO_CREATE_ACCOUNT=true
-ENV APP_SKIP_TUTORIAL=false
-ENV APP_SKIP_ALL_DIALOGUE=false
-ENV APP_UNLOCK_ALL_SCANS=false
-ENV APP_UNLOCK_ALL_MISSIONS=false
-ENV APP_INFINITE_CREDITS=false
-ENV APP_INFINITE_PLATINUM=false
-ENV APP_INFINITE_ENDO=false
-ENV APP_INFINITE_REGAL_AYA=false
-ENV APP_INFINITE_HELMINTH_MATERIALS=false
-ENV APP_CLAIMING_BLUEPRINT_REFUNDS_INGREDIENTS=false
-ENV APP_DONT_SUBTRACT_VOIDTRACES=false
-ENV APP_DONT_SUBTRACT_CONSUMABLES=false
-ENV APP_UNLOCK_ALL_SHIP_FEATURES=false
-ENV APP_UNLOCK_ALL_SHIP_DECORATIONS=false
-ENV APP_UNLOCK_ALL_FLAVOUR_ITEMS=false
-ENV APP_UNLOCK_ALL_SKINS=false
-ENV APP_UNLOCK_ALL_CAPTURA_SCENES=false
-ENV APP_UNIVERSAL_POLARITY_EVERYWHERE=false
-ENV APP_UNLOCK_DOUBLE_CAPACITY_POTATOES_EVERYWHERE=false
-ENV APP_UNLOCK_EXILUS_EVERYWHERE=false
-ENV APP_UNLOCK_ARCANES_EVERYWHERE=false
-ENV APP_NO_DAILY_FOCUS_LIMIT=false
-ENV APP_NO_ARGON_CRYSTAL_DECAY=false
-ENV APP_NO_MASTERY_RANK_UP_COOLDOWN=false
-ENV APP_NO_VENDOR_PURCHASE_LIMITS=true
-ENV APP_NO_DEATH_MARKS=false
-ENV APP_NO_KIM_COOLDOWNS=false
-ENV APP_SYNDICATE_MISSIONS_REPEATABLE=false
-ENV APP_INSTANT_FINISH_RIVEN_CHALLENGE=false
-ENV APP_INSTANT_RESOURCE_EXTRACTOR_DRONES=false
-ENV APP_NO_RESOURCE_EXTRACTOR_DRONES_DAMAGE=false
-ENV APP_SKIP_CLAN_KEY_CRAFTING=false
-ENV APP_NO_DOJO_ROOM_BUILD_STAGE=false
-ENV APP_NO_DECO_BUILD_STAGE=false
-ENV APP_FAST_DOJO_ROOM_DESTRUCTION=false
-ENV APP_NO_DOJO_RESEARCH_COSTS=false
-ENV APP_NO_DOJO_RESEARCH_TIME=false
-ENV APP_FAST_CLAN_ASCENSION=false
-ENV APP_SPOOF_MASTERY_RANK=-1
-
-RUN apk add --no-cache bash sed wget jq
+RUN apk add --no-cache bash jq
 
 COPY . /app
 WORKDIR /app
 
+RUN npm i --omit=dev
+RUN npm run build
+
 ENTRYPOINT ["/app/docker-entrypoint.sh"]

docker-compose.yml

@@ -1,62 +1,20 @@
 services:
     spaceninjaserver:
-        # build: .
+        # The image to use. If you have an ARM CPU, replace 'latest' with 'latest-arm64'.
         image: openwf/spaceninjaserver:latest
-        environment:
-            APP_MONGODB_URL: mongodb://openwfagent:spaceninjaserver@mongodb:27017/
 
-            # Following environment variables are set to default image values.
-            # Uncomment to edit.
-
-            # APP_MY_ADDRESS: localhost
-            # APP_HTTP_PORT: 80
-            # APP_HTTPS_PORT: 443
-            # APP_AUTO_CREATE_ACCOUNT: true
-            # APP_SKIP_TUTORIAL: false
-            # APP_SKIP_ALL_DIALOGUE: false
-            # APP_UNLOCK_ALL_SCANS: false
-            # APP_UNLOCK_ALL_MISSIONS: false
-            # APP_INFINITE_CREDITS: false
-            # APP_INFINITE_PLATINUM: false
-            # APP_INFINITE_ENDO: false
-            # APP_INFINITE_REGAL_AYA: false
-            # APP_INFINITE_HELMINTH_MATERIALS: false
-            # APP_CLAIMING_BLUEPRINT_REFUNDS_INGREDIENTS: false
-            # APP_DONT_SUBTRACT_VOIDTRACES: false
-            # APP_DONT_SUBTRACT_CONSUMABLES: false
-            # APP_UNLOCK_ALL_SHIP_FEATURES: false
-            # APP_UNLOCK_ALL_SHIP_DECORATIONS: false
-            # APP_UNLOCK_ALL_FLAVOUR_ITEMS: false
-            # APP_UNLOCK_ALL_SKINS: false
-            # APP_UNLOCK_ALL_CAPTURA_SCENES: false
-            # APP_UNIVERSAL_POLARITY_EVERYWHERE: false
-            # APP_UNLOCK_DOUBLE_CAPACITY_POTATOES_EVERYWHERE: false
-            # APP_UNLOCK_EXILUS_EVERYWHERE: false
-            # APP_UNLOCK_ARCANES_EVERYWHERE: false
-            # APP_NO_DAILY_FOCUS_LIMIT: false
-            # APP_NO_ARGON_CRYSTAL_DECAY: false
-            # APP_NO_MASTERY_RANK_UP_COOLDOWN: false
-            # APP_NO_VENDOR_PURCHASE_LIMITS: true
-            # APP_NO_DEATH_MARKS: false
-            # APP_NO_KIM_COOLDOWNS: false
-            # APP_SYNDICATE_MISSIONS_REPEATABLE: false
-            # APP_INSTANT_FINISH_RIVEN_CHALLENGE: false
-            # APP_INSTANT_RESOURCE_EXTRACTOR_DRONES: false
-            # APP_NO_RESOURCE_EXTRACTOR_DRONES_DAMAGE: false
-            # APP_SKIP_CLAN_KEY_CRAFTING: false
-            # APP_NO_DOJO_ROOM_BUILD_STAGE: false
-            # APP_NO_DECO_BUILD_STAGE: false
-            # APP_FAST_DOJO_ROOM_DESTRUCTION: false
-            # APP_NO_DOJO_RESEARCH_COSTS: false
-            # APP_NO_DOJO_RESEARCH_TIME: false
-            # APP_FAST_CLAN_ASCENSION: false
-            # APP_SPOOF_MASTERY_RANK: -1
         volumes:
-            - ./docker-data/static:/app/static/data
+            - ./docker-data/conf:/app/conf
+            - ./docker-data/static-data:/app/static/data
             - ./docker-data/logs:/app/logs
         ports:
             - 80:80
             - 443:443
+
+        # Normally, the image is fetched from Docker Hub, but you can use the local Dockerfile by removing "image" above and adding this:
+        #build: .
+        # Works best when using `docker-compose up --force-recreate --build`.
+
         depends_on:
             - mongodb
     mongodb:
@@ -66,3 +24,4 @@ services:
             MONGO_INITDB_ROOT_PASSWORD: spaceninjaserver
         volumes:
             - ./docker-data/database:/data/db
+        command: mongod --quiet --logpath /dev/null

docker-entrypoint.sh

@@ -1,24 +1,8 @@
 #!/bin/bash
 set -e
 
-# Set up the configuration file using environment variables.
-echo '{
-	"logger": {
-	  "files": true,
-	  "level": "trace",
-	  "__valid_levels": "fatal, error, warn, info, http, debug, trace"
-	}
-}
-' > config.json
+if [ ! -f conf/config.json ]; then
+	jq --arg value "mongodb://openwfagent:spaceninjaserver@mongodb:27017/" '.mongodbUrl = $value' /app/config.json.example > /app/conf/config.json
+fi
 
-for config in $(env | grep "APP_")
-do
-  var=$(echo "${config}" | tr '[:upper:]' '[:lower:]' | sed 's/app_//g' | sed -E 's/_([a-z])/\U\1/g' | sed 's/=.*//g')
-  val=$(echo "${config}" | sed 's/.*=//g')
-  jq --arg variable "$var" --arg value "$val" '.[$variable] += try [$value|fromjson][] catch $value' config.json > config.tmp
-  mv config.tmp config.json
-done
-
-npm i --omit=dev
-npm run build
-exec npm run start
+exec npm run start conf/config.json

src/controllers/api/nemesisController.ts

@@ -151,7 +151,8 @@ export const nemesisController: RequestHandler = async (req, res) => {
                 inventory.Nemesis!.HenchmenKilled += antivirusGain;
                 if (inventory.Nemesis!.HenchmenKilled >= 100) {
                     inventory.Nemesis!.HenchmenKilled = 100;
-                    // Client doesn't seem to request mode=w for infested liches, so weakening it here.
+
+                    // Weaken nemesis now.
                     inventory.Nemesis!.InfNodes = [
                         {
                             Node: getNemesisManifest(inventory.Nemesis!.manifest).showdownNode,
@@ -294,31 +295,15 @@ export const nemesisController: RequestHandler = async (req, res) => {
             target: inventory.toJSON().Nemesis
         });
     } else if ((req.query.mode as string) == "w") {
-        const inventory = await getInventory(
-            account._id.toString(),
-            "Nemesis LoadOutPresets CurrentLoadOutIds DataKnives Upgrades RawUpgrades"
-        );
+        const inventory = await getInventory(account._id.toString(), "Nemesis");
         //const body = getJSONfromString<INemesisWeakenRequest>(String(req.body));
 
-        if (inventory.Nemesis!.Weakened) {
-            logger.warn(`client is weakening an already-weakened nemesis?!`);
-        }
-
-        inventory.Nemesis!.InfNodes = [
-            {
-                Node: getNemesisManifest(inventory.Nemesis!.manifest).showdownNode,
-                Influence: 1
-            }
-        ];
-        inventory.Nemesis!.Weakened = true;
+        // As of 38.6.0, this request is no longer sent, instead mode=r already weakens the nemesis if appropriate.
+        // We always weaken the nemesis in mode=r so simply giving the client back the nemesis.
 
         const response: INemesisWeakenResponse = {
             target: inventory.toJSON<IInventoryClient>().Nemesis!
         };
-
-        await consumePasscodeModCharges(inventory, response);
-
-        await inventory.save();
         res.json(response);
     } else {
         logger.debug(`data provided to ${req.path}: ${String(req.body)}`);

src/controllers/api/renamePetController.ts

@@ -1,6 +1,7 @@
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
 import { getInventory, updateCurrency } from "@/src/services/inventoryService";
 import { getAccountIdForRequest } from "@/src/services/loginService";
+import { IInventoryChanges } from "@/src/types/purchaseTypes";
 import { RequestHandler } from "express";
 
 export const renamePetController: RequestHandler = async (req, res) => {
@@ -8,12 +9,18 @@ export const renamePetController: RequestHandler = async (req, res) => {
     const inventory = await getInventory(accountId, "KubrowPets PremiumCredits PremiumCreditsFree");
     const data = getJSONfromString<IRenamePetRequest>(String(req.body));
     const details = inventory.KubrowPets.id(data.petId)!.Details!;
+
     details.Name = data.name;
-    const currencyChanges = updateCurrency(inventory, 15, true);
+
+    const inventoryChanges: IInventoryChanges = {};
+    if (!("webui" in req.query)) {
+        updateCurrency(inventory, 15, true, inventoryChanges);
+    }
+
     await inventory.save();
     res.json({
         ...data,
-        inventoryChanges: currencyChanges
+        inventoryChanges: inventoryChanges
     });
 };
 

static/webui/script.js

@@ -546,6 +546,9 @@ function updateInventory() {
                                 td.textContent = item.ItemName + " (" + td.textContent + ")";
                             }
                         }
+                        if (item.Details?.Name) {
+                            td.textContent = item.Details.Name + " (" + td.textContent + ")";
+                        }
                         if (item.ModularParts && item.ModularParts.length) {
                             td.textContent += " [";
                             item.ModularParts.forEach(part => {
@@ -1506,15 +1509,28 @@ function sendBatchGearExp(data) {
 
 function renameGear(category, oid, name) {
     revalidateAuthz(() => {
-        $.post({
-            url: "/api/nameWeapon.php?" + window.authz + "&Category=" + category + "&ItemId=" + oid + "&webui=1",
-            contentType: "text/plain",
-            data: JSON.stringify({
-                ItemName: name
-            })
-        }).done(function () {
-            updateInventory();
-        });
+        if (category == "KubrowPets") {
+            $.post({
+                url: "/api/renamePet.php?" + window.authz + "&webui=1",
+                contentType: "text/plain",
+                data: JSON.stringify({
+                    petId: oid,
+                    name: name
+                })
+            }).done(function () {
+                updateInventory();
+            });
+        } else {
+            $.post({
+                url: "/api/nameWeapon.php?" + window.authz + "&Category=" + category + "&ItemId=" + oid + "&webui=1",
+                contentType: "text/plain",
+                data: JSON.stringify({
+                    ItemName: name
+                })
+            }).done(function () {
+                updateInventory();
+            });
+        }
     });
 }
 

static/webui/translations/de.js

@@ -185,7 +185,7 @@ dict = {
     upgrade_WarframeAbilityDuration: `[UNTRANSLATED] +|VAL|% Ability Duration`,
     upgrade_WarframeAbilityStrength: `[UNTRANSLATED] +|VAL|% Ability Strength`,
     upgrade_WarframeArmourMax: `[UNTRANSLATED] +|VAL| Armor`,
-    upgrade_WarframeBlastProc: `[UNTRANSLATED] +|VAL| Shields on inflicting Blast Status`,
+    upgrade_WarframeBlastProc: `[UNTRANSLATED] +|VAL| Shields on kill with Blast Damage`,
     upgrade_WarframeCastingSpeed: `[UNTRANSLATED] +|VAL|% Casting Speed`,
     upgrade_WarframeCorrosiveDamageBoost: `[UNTRANSLATED] +|VAL|% Ability Damage on enemies affected by Corrosion Status`,
     upgrade_WarframeCorrosiveStack: `[UNTRANSLATED] Increase max stacks of Corrosion Status by +|VAL|`,

static/webui/translations/en.js

@@ -184,7 +184,7 @@ dict = {
     upgrade_WarframeAbilityDuration: `+|VAL|% Ability Duration`,
     upgrade_WarframeAbilityStrength: `+|VAL|% Ability Strength`,
     upgrade_WarframeArmourMax: `+|VAL| Armor`,
-    upgrade_WarframeBlastProc: `+|VAL| Shields on inflicting Blast Status`,
+    upgrade_WarframeBlastProc: `+|VAL| Shields on kill with Blast Damage`,
     upgrade_WarframeCastingSpeed: `+|VAL|% Casting Speed`,
     upgrade_WarframeCorrosiveDamageBoost: `+|VAL|% Ability Damage on enemies affected by Corrosion Status`,
     upgrade_WarframeCorrosiveStack: `Increase max stacks of Corrosion Status by +|VAL|`,

static/webui/translations/es.js

@@ -167,7 +167,7 @@ dict = {
     cheats_fastClanAscension: `Ascenso rápido del clan`,
     cheats_spoofMasteryRank: `Rango de maestría simulado (-1 para desactivar)`,
     cheats_nightwaveStandingMultiplier: `Multiplicador de Reputación de Onda Nocturna`,
-    cheats_save: `[UNTRANSLATED] Save`,
+    cheats_save: `Guardar`,
     cheats_account: `Cuenta`,
     cheats_unlockAllFocusSchools: `Desbloquear todas las escuelas de enfoque`,
     cheats_helminthUnlockAll: `Subir al máximo el Helminto`,
@@ -185,7 +185,7 @@ dict = {
     upgrade_WarframeAbilityDuration: `+|VAL|% de duración de habilidades`,
     upgrade_WarframeAbilityStrength: `+|VAL|% de fuerza de habilidades`,
     upgrade_WarframeArmourMax: `+|VAL| de armadura`,
-    upgrade_WarframeBlastProc: `+|VAL| de escudos al infligir estado de explosión`,
+    upgrade_WarframeBlastProc: `[UNTRANSLATED] +|VAL| Shields on kill with Blast Damage`,
     upgrade_WarframeCastingSpeed: `+|VAL|% de velocidad de lanzamiento de habilidades`,
     upgrade_WarframeCorrosiveDamageBoost: `+|VAL|% de daño de habilidades a enemigos con estado corrosivo`,
     upgrade_WarframeCorrosiveStack: `Aumenta los acumuladores máximos de estado corrosivo en +|VAL|`,

static/webui/translations/fr.js

@@ -185,7 +185,7 @@ dict = {
     upgrade_WarframeAbilityDuration: `[UNTRANSLATED] +|VAL|% Ability Duration`,
     upgrade_WarframeAbilityStrength: `[UNTRANSLATED] +|VAL|% Ability Strength`,
     upgrade_WarframeArmourMax: `[UNTRANSLATED] +|VAL| Armor`,
-    upgrade_WarframeBlastProc: `[UNTRANSLATED] +|VAL| Shields on inflicting Blast Status`,
+    upgrade_WarframeBlastProc: `[UNTRANSLATED] +|VAL| Shields on kill with Blast Damage`,
     upgrade_WarframeCastingSpeed: `[UNTRANSLATED] +|VAL|% Casting Speed`,
     upgrade_WarframeCorrosiveDamageBoost: `[UNTRANSLATED] +|VAL|% Ability Damage on enemies affected by Corrosion Status`,
     upgrade_WarframeCorrosiveStack: `[UNTRANSLATED] Increase max stacks of Corrosion Status by +|VAL|`,

static/webui/translations/ru.js

@@ -185,7 +185,7 @@ dict = {
     upgrade_WarframeAbilityDuration: `[UNTRANSLATED] +|VAL|% Ability Duration`,
     upgrade_WarframeAbilityStrength: `[UNTRANSLATED] +|VAL|% Ability Strength`,
     upgrade_WarframeArmourMax: `[UNTRANSLATED] +|VAL| Armor`,
-    upgrade_WarframeBlastProc: `[UNTRANSLATED] +|VAL| Shields on inflicting Blast Status`,
+    upgrade_WarframeBlastProc: `[UNTRANSLATED] +|VAL| Shields on kill with Blast Damage`,
     upgrade_WarframeCastingSpeed: `[UNTRANSLATED] +|VAL|% Casting Speed`,
     upgrade_WarframeCorrosiveDamageBoost: `[UNTRANSLATED] +|VAL|% Ability Damage on enemies affected by Corrosion Status`,
     upgrade_WarframeCorrosiveStack: `[UNTRANSLATED] Increase max stacks of Corrosion Status by +|VAL|`,

static/webui/translations/zh.js

@@ -185,7 +185,7 @@ dict = {
     upgrade_WarframeAbilityDuration: `+|VAL|% 技能持续时间`,
     upgrade_WarframeAbilityStrength: `+|VAL|% 技能强度`,
     upgrade_WarframeArmourMax: `+|VAL| 护甲`,
-    upgrade_WarframeBlastProc: `施加爆炸状态时，护盾 +|VAL|`,
+    upgrade_WarframeBlastProc: `[UNTRANSLATED] +|VAL| Shields on kill with Blast Damage`,
     upgrade_WarframeCastingSpeed: `+|VAL|% 施放速度`,
     upgrade_WarframeCorrosiveDamageBoost: `对受腐蚀状态影响的敌人 +|VAL|% 技能伤害`,
     upgrade_WarframeCorrosiveStack: `腐蚀状态最大堆叠数 +|VAL|`,