Test

.github/workflows/Build Mod on PR.yml

@@ -18,7 +18,7 @@ jobs:
         GAME_NAME: Wrath
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         GITHUB_NAME: ${{ github.repository_owner }}
-        PACKAGE_OWNER: xADDBx
+        PACKAGE_OWNER: cabarius
         BRANCH_REF: ${{ github.event.pull_request.head.sha }}
 
     - name: Upload build artifacts
@@ -29,11 +29,11 @@ jobs:
 
     - name: Remove Test Label
       if: always()
-      shell: pwsh
+      shell: bash
       run: |
-        $headers = @{
-          Accept = 'application/vnd.github.v3+json'
-          Authorization = "token ${{ secrets.GITHUB_TOKEN }}"
-        }
-        $url = "https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.number }}/labels/safe%20to%20test"
-        Invoke-RestMethod -Uri $url -Method Delete -Headers $headers
+        curl --silent --fail-with-body \
+        -X DELETE \
+        -H "Accept: application/vnd.github+json" \
+        -H "Authorization: Bearer ${{ secrets.WRITE_PR_TOKEN }}" \
+        -H "X-GitHub-Api-Version: 2022-11-28" \
+        'https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.number }}/labels/safe%20to%20test'

.github/workflows/Build Mod on Push.yml

@@ -17,7 +17,7 @@ jobs:
         GAME_NAME: Wrath
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         GITHUB_NAME: ${{ github.repository_owner }}
-        PACKAGE_OWNER: xADDBx
+        PACKAGE_OWNER: cabarius
 
     - name: Upload build artifacts
       uses: actions/upload-artifact@v4

.github/workflows/Create Release for new Tag.yml

@@ -21,7 +21,7 @@ jobs:
         GAME_NAME: Wrath
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         GITHUB_NAME: ${{ github.repository_owner }}
-        PACKAGE_OWNER: xADDBx
+        PACKAGE_OWNER: cabarius
 
     - name: Upload build artifacts
       uses: actions/upload-artifact@v4

ToyBox/Incompatibilities.json

@@ -0,0 +1,3 @@
+[
+  [ "1.5.12", "2.3.0bb" ]
+]

ToyBox/Info.json

@@ -2,7 +2,7 @@
   "Id": "0ToyBox0",
   "DisplayName": "ToyBox",
   "Author": "Narria",
-  "Version": "1.5.18",
+  "Version": "1.5.24",
   "ManagerVersion": "0.27.11",
   "Requirements": [],
   "AssemblyName": "ToyBox.dll",

ToyBox/Localization/Wrath/en.json

@@ -1,6 +1,6 @@
 {
   "LanguageCode": "en",
-  "Version": "1.5.12",
+  "Version": "1.5.23",
   "Contributors": "The ToyBox Team",
   "HomePage": "https://github.com/cabarius/ToyBox/",
   "Strings": {
@@ -32,6 +32,7 @@
     "<color=#00ff00ff>Allow </color><color=#C060F0FF>any gender</color> <color=#00ff00ff>for any </color><color=#FF4040FF>R</color><color=orange>o</color><color=yellow>m</color><color=#00ff00ff>a</color><color=cyan>n</color><color=#8080FFFF>c</color><color=#C060F0FF>e</color>": "<color=#00ff00ff>Allow </color><color=#C060F0FF>any gender</color> <color=#00ff00ff>for any </color><color=#FF4040FF>R</color><color=orange>o</color><color=yellow>m</color><color=#00ff00ff>a</color><color=cyan>n</color><color=#8080FFFF>c</color><color=#C060F0FF>e</color>",
     "<color=#00ff00ff>Allow </color><color=#C060F0FF>multiple</color><color=#00ff00ff> romances at the same time</color>": "<color=#00ff00ff>Allow </color><color=#C060F0FF>multiple</color><color=#00ff00ff> romances at the same time</color>",
     "<color=#00ff00ff>creation of </color>new characters<b><color=yellow>\nNote:</color></b><color=orange> This value applies to </color><b><color=yellow>all saves</color></b><color=orange> and in the main menu</color>": "<color=#00ff00ff>creation of </color>new characters<b><color=yellow>\nNote:</color></b><color=orange> This value applies to </color><b><color=yellow>all saves</color></b><color=orange> and in the main menu</color>",
+    "<color=#00ff00ff>Makes the thumbs up/down in disappear in selections</color>": "<color=#00ff00ff>Makes the thumbs up/down in disappear in selections</color>",
     "<color=#00ff00ff>Some responses such as comments about your mythic powers will always choose the first one by default. This allows the game to mix things up a bit</color><b><color=yellow>\nWarning:</color></b><color=orange> this will introduce randomness to NPC responses to you in general and may lead to surprising or even wild outcomes</color>": "<color=#00ff00ff>Some responses such as comments about your mythic powers will always choose the first one by default. This allows the game to mix things up a bit</color><b><color=yellow>\nWarning:</color></b><color=orange> this will introduce randomness to NPC responses to you in general and may lead to surprising or even wild outcomes</color>",
     "<color=#00ff00ff>Tells the game to reset the in game UI.</color><color=yellow> Warning</color><color=orange> Using this in dialog or the book will dismiss that dialog which may break progress so use with care</color>": "<color=#00ff00ff>Tells the game to reset the in game UI.</color><color=yellow> Warning</color><color=orange> Using this in dialog or the book will dismiss that dialog which may break progress so use with care</color>",
     "<color=#00ff00ff>The following modifiers all work on </color><color=yellow>chance = chance (1 + modifier) </color><color=#00ff00ff>so a value of </color><color=yellow>-1</color><color=#00ff00ff> means the chance is 0, </color><color=yellow>0</color><color=#00ff00ff> is chance cost and </color><color=yellow>2</color><color=#00ff00ff> increases it 3x</color>": "<color=#00ff00ff>The following modifiers all work on </color><color=yellow>chance = chance (1 + modifier) </color><color=#00ff00ff>so a value of </color><color=yellow>-1</color><color=#00ff00ff> means the chance is 0, </color><color=yellow>0</color><color=#00ff00ff> is chance cost and </color><color=yellow>2</color><color=#00ff00ff> increases it 3x</color>",
@@ -455,6 +456,7 @@
     "Ignore Class Restrictions": "Ignore Class Restrictions",
     "ignore Equipment Restrictions": "ignore Equipment Restrictions",
     "Ignore Event Solution Restrictions": "Ignore Event Solution Restrictions",
+    "Ignore Feature Recommendations": "Ignore Feature Recommendations",
     "Ignore Feature Restrictions": "Ignore Feature Restrictions",
     "Ignore Forbidden Archetypes": "Ignore Forbidden Archetypes",
     "Ignore Pet Sizes For Mounting": "Ignore Pet Sizes For Mounting",

ToyBox/ReadMe.md

@@ -36,11 +36,32 @@
   your save before using. Remember that "with great power comes great responsibility"
 * **Quest Resolution**: this allows you to view your active quests and advance them as needed to work around bugs or
   skip quests you don't want to do. Be warned this may break your game progression if used carelessly.
+
+### Toybox Wrath - Ver 1.5.24 (built for 2.3.2c)
+* (***CascadingDragon***) Add new feature, Toggle Feature Recommendations. This will turn off the thumbs up/down in the Feature Selections on Level Up (Toggle found in Level Up tab, under Ignore Feature Restrictions)
+
+### ToyBox Wrath - Ver 1.5.23 (built for 2.3.2c)
+* (***CascadingDragon***) Fix Ignore Feature Prerequisites When Choosing Class (now it now longer allows taking feats you shouldn't be able too).
+
+### ToyBox Wrath - Ver 1.5.22 (built for 2.3.2c)
+* (***ADDB***) Add feature under Party => Stats to turn on/off AI control of specific characters.
+* (***CascadingDragon***) Fix Roll 10 Initiative.
+
+### ToyBox Wrath - Ver 1.5.21 (built for 2.3.2c)
+* (***ADDB***) Add incompatibility checker! From now on ToyBox will send a web request to check whether the current mod version has known incompatibilities with the current game version. This is done for cases where the mod still loads after updates, but causes issues in the background (i.e. enemies only having 1 HP). If it detects incompatibilities it will stop loading.
+
+### ToyBox Wrath - Ver 1.5.20 (built for 2.3.2c)
+* (***ADDB***) Maybe Party tab shows more features now? (Especially Parameterized stuff and such?).
+* (***CascadingDragon***) Fix Merging Manually Added Mythic Spell Books.
+
+### ToyBox Wrath - Ver 1.5.19 (built for 2.3.2c)
+* (***ADDB***) Maybe Fixed Remote Companions Dialog causing companions to talk about other companions you might've never even joined you.
+* (***ADDB***) My Magus changes broke some abilities (like Charge) if the feature is enabled. This should be fixed now.
 
 ### ToyBox Wrath - Ver 1.5.18 (built for 2.3.1e)
 * (***ADDB***) Fix the Magus: Allow Spell Combat for dual wielding.
 * (***ADDB***) Maybe added setting to forcefully disable all tutorials.
-* (***ADDB***) Fix MysticalMayhem breaking Search 'n Pick. Is this mod even working correctly currently?
+* (***ADDB***) Fix MysticalMayhem breaking Search 'n Pick. Is this mod even working correctly currently?.
 * (***Delth***) Add toggle to remove read-onlyness from etudes. 
 
 ### ToyBox Wrath - Ver 1.5.15 (built for 2.3.1e)

ToyBox/Repository.json

@@ -2,7 +2,7 @@
   "Releases": [
     {
       "Id": "0ToyBox0",
-      "Version": "1.5.18"
+      "Version": "1.5.22"
     }
   ]
 }

ToyBox/ToyBox.csproj

@@ -7,7 +7,7 @@
         <Description>ToyBox</Description>
         <AppDesignerFolder>Properties</AppDesignerFolder>
         <OutputType>Library</OutputType>
-        <Version>1.5.18</Version>
+        <Version>1.5.24</Version>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <FileAlignment>512</FileAlignment>
         <LangVersion>latest</LangVersion>

ToyBox/classes/Infrastructure/CasterHelpers.cs

@@ -1,4 +1,4 @@
-using Kingmaker.Blueprints;
+using Kingmaker.Blueprints;
 using Kingmaker.Blueprints.Classes;
 using Kingmaker.Blueprints.Root;
 using Kingmaker.EntitySystem.Entities;
@@ -246,25 +246,29 @@ public static int GetActualSpellsLearned(Spellbook spellbook, int level, List<Bl
         }
 #endif
 
-        public static IEnumerable<ClassData> MergableClasses(this UnitEntityData unit) {
+        public static IEnumerable<BlueprintSpellbook> MergableClasses(this UnitEntityData unit) {
             var spellbookCandidates = unit.Spellbooks
                                           .Where(sb => sb.IsStandaloneMythic && sb.Blueprint.CharacterClass != null)
                                           .Select(sb => sb.Blueprint).ToHashSet();
+            /* Dragon's comment on this. Why are we looking for the Mythic class here? It means you can't merge mythic spellbooks that are added via Toybox
+             * Or any other method that wouldn't add the Mythic class
+             * Looks like maybe for localized name, but... then it's not that functional
+             */
             //Mod.Log($"{unit.CharacterName} - spellbookCandidates: {string.Join(", ", spellbookCandidates.Select(sb => sb.DisplayName))}");
-            var classCandidates = unit.Progression.Classes
-                                      .Where(cl => cl.Spellbook != null && spellbookCandidates.Contains(cl.Spellbook));
+            //var classCandidates = unit.Progression.Classes
+            //                          .Where(cl => cl.Spellbook != null && spellbookCandidates.Contains(cl.Spellbook));
             //Mod.Log($"{unit.CharacterName} - classCandidates: {string.Join(", ", classCandidates.Select(cl => cl.CharacterClass.Name))}");
-            return classCandidates;
+            return spellbookCandidates;
         }
-        public static void MergeMythicSpellbook(this Spellbook targetSpellbook, ClassData fromClass) {
+        public static void MergeMythicSpellbook(this Spellbook targetSpellbook, BlueprintSpellbook fromClass) {
             var unit = targetSpellbook.Owner;
-            var oldMythicSpellbookBp = fromClass?.Spellbook;
+            var oldMythicSpellbookBp = fromClass;
             if (fromClass == null || oldMythicSpellbookBp == null || !oldMythicSpellbookBp.IsMythic) {
                 Mod.Warn("Can't merge because you don't have a mythic class / mythic spellbook!");
                 return;
             }
 
-            fromClass.Spellbook = targetSpellbook.Blueprint;
+            //fromClass.Spellbook = targetSpellbook.Blueprint;
             targetSpellbook.m_Type = SpellbookType.Mythic;
             targetSpellbook.AddSpecialList(oldMythicSpellbookBp.MythicSpellList);
             for (var i = targetSpellbook.MythicLevel; i < unit.Progression.MythicLevel; i++) {

ToyBox/classes/MainUI/Browser/FactsEditor.cs

@@ -354,10 +354,7 @@ public static List<Action> OnGUI<Item, Definition>(UnitEntityData ch, Browser<De
             } else {
                 browser.OnGUI(
                     fact,
-                    () => {
-                        var types = fact.GroupBy(f => f.Blueprint.GetType()).Select(g => g.FirstOrDefault().Blueprint.GetType());
-                        return GetBlueprints<Definition>()?.Where(bp => types.Contains(bp.GetType()));
-                    },
+                    GetBlueprints<Definition>,
                     (feature) => (Definition)feature.Blueprint,
                     (blueprint) => $"{GetSearchKey(blueprint)}" + (Settings.searchDescriptions ? $"{blueprint.Description}" : ""),
                     blueprint => new[] { GetSortKey(blueprint) },

ToyBox/classes/MainUI/DiceRollsGUI.cs

@@ -18,7 +18,7 @@ public static void OnGUI() {
                 () => EnumGrid("Never Roll 20".localize(), ref Settings.neverRoll20, AutoWidth()),
                 () => EnumGrid("Never Roll 1".localize(), ref Settings.neverRoll1, AutoWidth()),
                 () => EnumGrid("Initiative: Always Roll 20".localize(), ref Settings.roll20Initiative, AutoWidth()),
-                () => EnumGrid("Initiative: Always Roll 10".localize(), ref Settings.roll20Initiative, AutoWidth()),
+                () => EnumGrid("Initiative: Always Roll 10".localize(), ref Settings.roll10Initiative, AutoWidth()),
                 () => EnumGrid("Initiative: Always Roll 1".localize(), ref Settings.roll1Initiative, AutoWidth()),
                 () => EnumGrid("Non Combat: Take 20".localize(), ref Settings.alwaysRoll20OutOfCombat, AutoWidth()),
                 () => EnumGrid("Non Combat: Roll at least 10".localize(), ref Settings.rollAtLeast10OutOfCombat, AutoWidth()),
@@ -29,4 +29,4 @@ public static void OnGUI() {
                 );
         }
     }
-}
+}

ToyBox/classes/MainUI/LevelUp.cs

@@ -84,6 +84,11 @@ public static void OnGUI() {
                     Space(25);
                     Label(("Experimental".cyan() + ": lets you select any feat ignoring prerequisites.".green()).localize());
                 },
+                () => {
+                    Toggle("Ignore Feature Recommendations".localize(), ref Settings.toggleFeatureRecommendations);
+                    Space(25);
+                    Label(("Makes the thumbs up/down in disappear in selections".green()).localize());
+                },
                 () => Toggle("Allow Companions to Take Mythic Classes".localize(), ref Settings.toggleAllowCompanionsToBecomeMythic),
                 () => Toggle("Allow Pets to Take Mythic Classes".localize(), ref Settings.toggleAllowMythicPets),
                 () => Toggle("Ignore Prerequisites When Choosing A Feat".localize(), ref Settings.toggleFeaturesIgnorePrerequisites),

ToyBox/classes/MainUI/Main.cs

@@ -24,12 +24,14 @@
 using Kingmaker.UI.Common;
 using Newtonsoft.Json;
 using ToyBox.Multiclass;
+using System.Net;
 
 namespace ToyBox {
 #if DEBUG
     [EnableReloading]
 #endif
     internal static class Main {
+        internal const string LinkToIncompatibilitiesFile = "https://raw.githubusercontent.com/xADDBx/ToyBox-Wrath/main/ToyBox/Incompatibilities.json";
         internal static Harmony HarmonyInstance;
         public static readonly LogChannel logger = LogChannelFactory.GetOrCreate("Respec");
         private static string _modId;
@@ -78,6 +80,10 @@ public static void SetNeedsResetGameUI() {
         public static List<GameObject> Objects;
         private static bool Load(UnityModManager.ModEntry modEntry) {
             try {
+                if (!IsGameVersionSupported(modEntry.Version, modEntry.Logger)) {
+                    modEntry.Logger.Log("Fatal! The current Game Version has known incompatabilities with your current ToyBox version! Please Update.");
+                    return false;
+                }
 #if DEBUG
                 modEntry.OnUnload = OnUnload;
 #endif
@@ -380,5 +386,46 @@ private static void OnUpdate(UnityModManager.ModEntry modEntry, float z) {
                     Teleport.TeleportParty();
             }
         }
+        public static bool IsGameVersionSupported(Version modVersion, UnityModManager.ModEntry.ModLogger logger) {
+            try {
+                using var web = new WebClient();
+                var raw = web.DownloadString(LinkToIncompatibilitiesFile);
+                var definition = new[] { new[] { "", "" } };
+                var versions = JsonConvert.DeserializeAnonymousType(raw, definition);
+                var currentOrNewer = versions.FirstOrDefault(v => new Version(v[0]) >= modVersion);
+                if (currentOrNewer == null) return true;
+                return new Version(GetNumifiedVersion(currentOrNewer[1])) > new Version(GetNumifiedVersion(GameVersion.GetVersion()));
+            } catch (Exception ex) {
+                logger.Log(ex.ToString());
+            }
+            return true;
+        }
+        public static string GetNumifiedVersion(string version) {
+            var comps = version.Split('.');
+            var newComps = new List<string>();
+            foreach (var comp in comps) {
+                uint num = 0;
+                foreach (var c in comp) {
+                    uint newNum = num;
+                    try {
+                        checked {
+                            if (uint.TryParse(c.ToString(), out var n)) {
+                                newNum = newNum * 10u + n;
+                            } else {
+                                int signedCharNumber = char.ToUpper(c) - ' ';
+                                uint unsignedCharNumber = (uint)Math.Max(0, Math.Min(signedCharNumber, 99));
+                                newNum = newNum * 100u + unsignedCharNumber;
+                            }
+                            num = newNum;
+                        }
+                    } catch (OverflowException) {
+                        logger.Log($"Encountered uint overflow while parsing version component {comp}, continuing with {num}");
+                        break;
+                    }
+                }
+                newComps.Add(num.ToString());
+            }
+            return string.Join(".", newComps);
+        }
     }
 }

ToyBox/classes/MainUI/PartyEditor/SpellsEditor.cs

@@ -1,4 +1,4 @@
-using Kingmaker.Blueprints;
+using Kingmaker.Blueprints;
 using Kingmaker.EntitySystem.Entities;
 using Kingmaker.UnitLogic;
 using Kingmaker.UnitLogic.Abilities;
@@ -45,7 +45,7 @@ public static List<Action> OnSpellsGUI(UnitEntityData ch, List<Spellbook> spellb
                         25.space();
                         foreach (var cl in mergeableClasses) {
                             var sb = spellbook;
-                            ActionButton(cl.CharacterClass.LocalizedName.ToString(), () => sb.MergeMythicSpellbook(cl));
+                            ActionButton(cl.GetDisplayName(), () => sb.MergeMythicSpellbook(cl));
                             15.space();
                         }
                         25.space();