Merge branch 'develop'

Quitch · Sep 7, 2024 · 1c97bb0 · 1c97bb0
2 parents 62460e7 + 389fa7c
commit 1c97bb0
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 47 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## v5.75.1 - 2024-09-07
+
+### Fixed
+
+- Translation of the easy systems option on the GWO info panel
+- Being able to acquire subcommander upgrades when your Data Banks are full
+
 ## v5.75.0 - 2024-09-03
 
 ### Changed

diff --git a/modinfo.json b/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.75.0",
+  "version": "5.75.1",
   "build": "120799",
-  "date": "2024-09-03",
+  "date": "2024-09-07",
   "signature": " ",
   "forum": "https://steamcommunity.com/app/386070/discussions/0/133259956005401439/",
   "category": [

diff --git a/sonar-project.properties b/sonar-project.properties
@@ -1,3 +1,3 @@
 sonar.projectKey=Quitch_GW-AI-Overhaul
 sonar.organization=quitch
-sonar.projectVersion=5.75.0
+sonar.projectVersion=5.75.1
diff --git a/ui/main/game/galactic_war/cards/gwaio_upgrade_subcommander_duplication.js b/ui/main/game/galactic_war/cards/gwaio_upgrade_subcommander_duplication.js
@@ -18,12 +18,7 @@ define(["coui://ui/mods/com.pa.quitch.gwaioverhaul/shared/cards.js"], function (
     getContext: gwoCard.getContext,
     deal: function (system, context, inventory) {
       const chance = inventory.minions().length * 30;
-      return {
-        params: {
-          allowOverflow: true,
-        },
-        chance: chance,
-      };
+      return { chance: chance };
     },
     buff: function () {
       // performed in referee_config.js

diff --git a/ui/main/game/galactic_war/cards/gwaio_upgrade_subcommander_fabber.js b/ui/main/game/galactic_war/cards/gwaio_upgrade_subcommander_fabber.js
@@ -23,12 +23,7 @@ define(["coui://ui/mods/com.pa.quitch.gwaioverhaul/shared/cards.js"], function (
         gwoSettings && gwoSettings.ai === "Queller"
           ? 0
           : inventory.minions().length * 30;
-      return {
-        params: {
-          allowOverflow: true,
-        },
-        chance: chance,
-      };
+      return { chance: chance };
     },
     buff: function () {
       // performed in referee_config.js

diff --git a/ui/main/game/galactic_war/cards/gwaio_upgrade_subcommander_tactics.js b/ui/main/game/galactic_war/cards/gwaio_upgrade_subcommander_tactics.js
@@ -18,12 +18,7 @@ define(["coui://ui/mods/com.pa.quitch.gwaioverhaul/shared/cards.js"], function (
     getContext: gwoCard.getContext,
     deal: function (system, context, inventory) {
       const chance = inventory.minions().length * 30;
-      return {
-        params: {
-          allowOverflow: true,
-        },
-        chance: chance,
-      };
+      return { chance: chance };
     },
     buff: function () {
       // performed in referee_config.js

diff --git a/ui/mods/com.pa.quitch.gwaioverhaul/gw_play/cards.js b/ui/mods/com.pa.quitch.gwaioverhaul/gw_play/cards.js
@@ -884,7 +884,7 @@ function gwoCard() {
           });
         };
 
-        // call dealCardToSelectableAI() so system cards update when player acquires a card
+        // call dealCardToSelectableAI() so systems' cards update when player acquires a card
         model.win = function (selectedCardIndex) {
           model.exitGate($.Deferred());
 

diff --git a/ui/mods/com.pa.quitch.gwaioverhaul/gw_play/gwo_panel.css b/ui/mods/com.pa.quitch.gwaioverhaul/gw_play/gwo_panel.css
@@ -24,6 +24,11 @@
   color: red;
 }
 
+/* This allows us to format text after it has been translated (which is case sensitive) */
+#options {
+  text-transform: lowercase;
+}
+
 #options::first-letter {
   text-transform: uppercase;
 }

diff --git a/ui/mods/com.pa.quitch.gwaioverhaul/gw_play/gwo_panel.js b/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.75.0");
+        model.gwoVersion = ko.observable("5.75.1");
         model.gwoSettings = originSystem.gwaio;
 
         if (model.gwoSettings) {
@@ -58,7 +58,7 @@ function gwoWarInfoPanel() {
           options(
             model.gwoOptions,
             model.gwoSettings.simpleSystems,
-            "!LOC:Simple systems"
+            "!LOC:Easy Systems"
           );
           options(
             model.gwoOptions,

diff --git a/ui/mods/com.pa.quitch.gwaioverhaul/gw_start/setup.js b/ui/mods/com.pa.quitch.gwaioverhaul/gw_start/setup.js
@@ -8,9 +8,7 @@ function gwoSetup() {
   gwoSetupLoaded = true;
 
   try {
-    model.makeGame = function () {
-      // Prevent changes to settings causing creation of new galaxies
-    };
+    model.makeGame = function () {}; // Prevent changes to settings causing creation of new galaxies
 
     const enableGoToWar = ko.observable(true);
     var sharedSystemsForGalacticWarActive = false;
@@ -184,9 +182,9 @@ function gwoSetup() {
 
         var aiFaction = 0;
         const getQuellerAITag = function (faction) {
-          // Minions don't have a faction number so use the previous one
-          // which should be from the primary AI and accurate
           if (!_.isUndefined(faction)) {
+            // Minions don't have a faction number so use the previous one
+            // which should be from the primary AI and accurate
             aiFaction = parseInt(faction);
           }
 
@@ -227,45 +225,45 @@ function gwoSetup() {
 
         const setAIPersonality = function (ai, difficulty) {
           const personalityId = "#gwo-personality-picker";
+          const personality = ai.personality;
 
-          ai.personality.micro_type = difficulty.microType();
-          ai.personality.go_for_the_kill = parseBoolean(difficulty.goForKill());
-          ai.personality.priority_scout_metal_spots = parseBoolean(
+          personality.micro_type = difficulty.microType();
+          personality.go_for_the_kill = parseBoolean(difficulty.goForKill());
+          personality.priority_scout_metal_spots = parseBoolean(
             difficulty.priorityScoutMetalSpots()
           );
-          ai.personality.factory_build_delay_min =
+          personality.factory_build_delay_min =
             difficulty.factoryBuildDelayMin();
-          ai.personality.factory_build_delay_max =
+          personality.factory_build_delay_max =
             difficulty.factoryBuildDelayMax();
-          ai.personality.unable_to_expand_delay =
-            difficulty.unableToExpandDelay();
-          ai.personality.enable_commander_danger_responses = parseBoolean(
+          personality.unable_to_expand_delay = difficulty.unableToExpandDelay();
+          personality.enable_commander_danger_responses = parseBoolean(
             difficulty.enableCommanderDangerResponses()
           );
-          ai.personality.per_expansion_delay = difficulty.perExpansionDelay();
-          ai.personality.max_basic_fabbers = difficulty.maxBasicFabbers();
-          ai.personality.max_advanced_fabbers = difficulty.maxAdvancedFabbers();
-          ai.personality.personality_tags =
+          personality.per_expansion_delay = difficulty.perExpansionDelay();
+          personality.max_basic_fabbers = difficulty.maxBasicFabbers();
+          personality.max_advanced_fabbers = difficulty.maxAdvancedFabbers();
+          personality.personality_tags =
             $(personalityId).val() === null ? [] : $(personalityId).val();
           // We treat 0 as undefined, which means the AI examines the
           // radius of the spawn zone
           if (difficulty.startingLocationEvaluationRadius() > 0) {
-            ai.personality.starting_location_evaluation_radius =
+            personality.starting_location_evaluation_radius =
               difficulty.startingLocationEvaluationRadius();
           }
 
           const titansAITags = ["Default"];
 
           switch (difficulty.ai()) {
             case "Queller":
-              ai.personality.personality_tags =
-                ai.personality.personality_tags.concat(
+              personality.personality_tags =
+                personality.personality_tags.concat(
                   getQuellerAITag(ai.faction)
                 );
               break;
             case "Titans":
-              ai.personality.personality_tags =
-                ai.personality.personality_tags.concat(titansAITags);
+              personality.personality_tags =
+                personality.personality_tags.concat(titansAITags);
             // fall through
             case "Penchant":
               setupPenchantAI(ai, titansAITags);
@@ -389,7 +387,7 @@ function gwoSetup() {
           const busyToken = {};
           model.makeGameBusy(busyToken);
 
-          const version = "5.75.0";
+          const version = "5.75.1";
           console.log("War created using Galactic War Overhaul v" + version);
 
           const game = new GW.Game();