Merge branch 'develop'

CHANGELOG.md

@@ -1,5 +1,16 @@
 # CHANGELOG
 
+## v5.73.0 - 2024-08-31
+
+### Changed
+
+- Naval Commander increases the amount of water and lava on planets
+
+### Fixed
+
+- AI not handling upgraded Artemis units correctly
+- Sudden Death and Land Anywhere status not matching intelligence panel
+
 ## v5.72.0 - 2024-08-17
 
 ### Added

modinfo.json

@@ -4,9 +4,9 @@
   "display_name": "Galactic War Overhaul",
   "description": "Make Galactic War more exciting, more replayable, and if desired, more challenging. Featuring more systems, more tech cards, more factions, more game modes, more AI personalities, more difficulty levels, more unlocks, more strategy, and more AI brains. Start a new war to enjoy all the new features. Check out the new war tooltips for more information and difficulty recommendations. Recommended accompanying mods: Shared Systems for galactic war, AI Chat, and Show AI Personality Names",
   "author": "Quitch",
-  "version": "5.72.0",
+  "version": "5.73.0",
   "build": "120799",
-  "date": "2024-08-17",
+  "date": "2024-08-31",
   "signature": " ",
   "forum": "https://steamcommunity.com/app/386070/discussions/0/133259956005401439/",
   "category": [

sonar-project.properties

@@ -1,3 +1,3 @@
 sonar.projectKey=Quitch_GW-AI-Overhaul
 sonar.organization=quitch
-sonar.projectVersion=5.72.0
+sonar.projectVersion=5.73.0

ui/main/game/galactic_war/cards/gwaio_enable_tsunami.js

@@ -17,10 +17,12 @@ define([
       };
     },
     getContext: gwoCard.getContext,
-    deal: function (system, context) {
+    deal: function (system, context, inventory) {
       var chance = 40;
       const dist = system.distance();
-      if (
+      if (inventory.hasCard("gwaio_start_naval")) {
+        chance = 0;
+      } else if (
         context.totalSize <= GW.balance.numberOfSystems[0] ||
         context.totalSize <= GW.balance.numberOfSystems[1]
       ) {

ui/main/game/galactic_war/cards/gwaio_start_naval.js

@@ -13,7 +13,7 @@ define([
       return gwoCard.loadoutIcon(CARD.id);
     },
     describe: _.constant(
-      "!LOC:The Naval Commander loadout contains all naval factories."
+      "!LOC:The Naval Commander loadout contains all naval factories. Increases the amount of water and lava on eligible planets."
     ),
     deal: gwoCard.startCard,
     buff: function (inventory) {

ui/main/game/galactic_war/cards/gwaio_upgrade_artemis.js

@@ -49,7 +49,7 @@ define([
           value: "target",
         },
         {
-          file: gwoUnit.avenger,
+          file: gwoUnit.artemis,
           path: "unit_types",
           op: "push",
           value: "UNITTYPE_Heavy",

ui/mods/com.pa.quitch.gwaioverhaul/gw_play/cards.js

@@ -593,37 +593,38 @@ function gwoCard() {
 
         const setupGeneralCommander = function () {
           const cards = inventory.cards();
-          if (
-            cards.length === 1 &&
-            cards[0].id === "gwc_start_subcdr" &&
-            !cards[0].minions
-          ) {
-            const ai = gwoSettings && gwoSettings.ai;
-            _.times(2, function () {
-              const subcommander = _.cloneDeep(
-                _.sample(GWFactions[playerFaction].minions)
-              );
-              if (ai === "Penchant") {
-                const penchantValues = gwoAI.penchants();
-                subcommander.character =
-                  subcommander.character +
-                  (" " + loc(penchantValues.penchantName));
-                subcommander.personality.personality_tags =
-                  subcommander.personality.personality_tags.concat(
-                    penchantValues.penchants
-                  );
-              }
-              cards.push({
-                id: "gwc_minion",
-                minion: subcommander,
-                unique: Math.random(),
-              });
+          const ai = gwoSettings && gwoSettings.ai;
+          _.times(2, function () {
+            const subcommander = _.cloneDeep(
+              _.sample(GWFactions[playerFaction].minions)
+            );
+            if (ai === "Penchant") {
+              const penchantValues = gwoAI.penchants();
+              subcommander.character =
+                subcommander.character +
+                (" " + loc(penchantValues.penchantName));
+              subcommander.personality.personality_tags =
+                subcommander.personality.personality_tags.concat(
+                  penchantValues.penchants
+                );
+            }
+            cards.push({
+              id: "gwc_minion",
+              minion: subcommander,
+              unique: Math.random(),
             });
-            inventory.applyCards();
-            gwoSave(game, false);
-          }
+          });
+          inventory.applyCards();
+          gwoSave(game, false);
         };
-        setupGeneralCommander();
+
+        if (
+          cards.length === 1 &&
+          cards[0].id === "gwc_start_subcdr" &&
+          !cards[0].minions
+        ) {
+          setupGeneralCommander();
+        }
 
         const dealCardToSelectableAIWhenWarStarts = function (settings) {
           if (settings && !settings.firstDealComplete) {

ui/mods/com.pa.quitch.gwaioverhaul/gw_play/gwo_panel.js

@@ -25,7 +25,7 @@ function gwoWarInfoPanel() {
         // War Information
         const galaxy = game.galaxy();
         const originSystem = galaxy.stars()[galaxy.origin()].system();
-        model.gwoVersion = ko.observable("5.72.0");
+        model.gwoVersion = ko.observable("5.73.0");
         model.gwoSettings = originSystem.gwaio;
 
         if (model.gwoSettings) {

ui/mods/com.pa.quitch.gwaioverhaul/gw_play/referee_config.js

@@ -264,15 +264,17 @@ define([
     const playerBountyMode = inventory.hasCard("gwaio_enable_bounties");
     const bountyMode = ai.bountyMode || playerBountyMode;
     const playerSuddenDeathMode = inventory.hasCard("gwaio_enable_suddendeath");
-    const suddenDeathMode = ai.bountyMode || playerSuddenDeathMode;
+    const suddenDeathMode = ai.suddenDeath || playerSuddenDeathMode;
     const playerLandAnywhereMode = inventory.hasCard(
       "gwaio_enable_landanywhere"
     );
-    const landAnywhereMode = ai.bountyMode || playerLandAnywhereMode;
+    const landAnywhereMode = ai.landAnywhere || playerLandAnywhereMode;
     const canGlassPlanets = inventory.hasCard(
       "gwaio_enable_orbitalbombardment"
     );
-    const canFloodPlanets = inventory.hasCard("gwaio_enable_tsunami");
+    const canFloodPlanets =
+      inventory.hasCard("gwaio_enable_tsunami") ||
+      inventory.hasCard("gwaio_start_naval");
 
     if (canGlassPlanets) {
       currentStar.system().planets = glassPlanets(currentStar.system().planets);

ui/mods/com.pa.quitch.gwaioverhaul/gw_start/setup.js

@@ -387,7 +387,7 @@ function gwoSetup() {
           const busyToken = {};
           model.makeGameBusy(busyToken);
 
-          const version = "5.72.0";
+          const version = "5.73.0";
           console.log("War created using Galactic War Overhaul v" + version);
 
           const game = new GW.Game();