Merge pull request #4797 from SolastaMods/dev

1.5.97.19
SolastaMods · Jul 10, 2024 · 9d5b528 · 9d5b528
2 parents 65d4aa2 + 8be9b0b
commit 9d5b528
Show file tree

Hide file tree

Showing 59 changed files with 642 additions and 569 deletions.
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/Assets.txt b/Diagnostics/UnfinishedBusinessBlueprints/Assets.txt
@@ -3862,6 +3862,7 @@ PowerUseModifierTacticianGambitPool00	FeatureDefinitionPowerUseModifier	FeatureD
 PowerUseModifierTacticianGambitPool01	FeatureDefinitionPowerUseModifier	FeatureDefinition	72c23326-29d2-5224-a708-c494fd573533
 PowerUseModifierTacticianGambitPoolFeatTacticianAdept	FeatureDefinitionPowerUseModifier	FeatureDefinition	b33418e8-2cd7-5940-983d-8107873b39e0
 PowerUseModifierTacticianGambitPoolImproviseStrategy	FeatureDefinitionPowerUseModifier	FeatureDefinition	18ec73c9-8c06-5ef8-b4c9-9aba6a7e649f
+PowerUseModifierTacticianGambitPoolMartialTactician	FeatureDefinitionPowerUseModifier	FeatureDefinition	142dbc79-602e-5057-aa01-646c3e046e07
 PowerUseModifierTacticianGambitPoolRemarkableTechnique	FeatureDefinitionPowerUseModifier	FeatureDefinition	aee88439-7ecc-5014-8c1e-52b30eb71dd4
 PowerVanishSummon	FeatureDefinitionPower	FeatureDefinition	2e2b66aa-217d-5063-9073-32f0dca0efb1
 PowerVitriolicSphere	FeatureDefinitionPower	FeatureDefinition	4c5d9fc8-78f1-57e9-831e-737b954d8e16

diff --git a/Diagnostics/UnfinishedBusinessBlueprints/CharacterSubclassDefinition/CollegeOfValiance.json b/Diagnostics/UnfinishedBusinessBlueprints/CharacterSubclassDefinition/CollegeOfValiance.json
@@ -41,9 +41,9 @@
     "description": "Subclass/&CollegeOfValianceDescription",
     "spriteReference": {
       "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "a9f6675a067f5c74890a2acf2201e5a8",
-      "m_SubObjectName": "Monk_Light",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
+      "m_AssetGUID": "c7be297a-7045-558e-b4d7-fda31d77a17d",
+      "m_SubObjectName": null,
+      "m_SubObjectType": null
     },
     "color": {
       "$type": "UnityEngine.Color, UnityEngine.CoreModule",

diff --git a/Diagnostics/UnfinishedBusinessBlueprints/CharacterSubclassDefinition/MartialTactician.json b/Diagnostics/UnfinishedBusinessBlueprints/CharacterSubclassDefinition/MartialTactician.json
@@ -1,6 +1,11 @@
 {
   "$type": "CharacterSubclassDefinition, Assembly-CSharp",
   "featureUnlocks": [
+    {
+      "$type": "FeatureUnlockByLevel, Assembly-CSharp",
+      "featureDefinition": "Definition:PowerUseModifierTacticianGambitPoolMartialTactician:142dbc79-602e-5057-aa01-646c3e046e07",
+      "level": 3
+    },
     {
       "$type": "FeatureUnlockByLevel, Assembly-CSharp",
       "featureDefinition": "Definition:InvocationPoolGambitLearn4:bf787818-378a-5206-b5ea-3669089af63d",

diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionReverseGravity.json b/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionReverseGravity.json
@@ -3,9 +3,7 @@
   "inDungeonEditor": false,
   "parentCondition": "Definition:ConditionFlying:ec82fae48f9a55a41a49fd96d93b49b5",
   "conditionType": "Neutral",
-  "features": [
-    "Definition:MoveModeFly2:0196408f7a256674d8272106dfa74a0a"
-  ],
+  "features": [],
   "allowMultipleInstances": false,
   "silentWhenAdded": false,
   "silentWhenRemoved": false,

diff --git a/...nfinishedBusinessBlueprints/FeatureDefinitionPower/PowerSorcerousPsionMindOverMatter.json b/...nfinishedBusinessBlueprints/FeatureDefinitionPower/PowerSorcerousPsionMindOverMatter.json
@@ -113,12 +113,22 @@
       "$type": "EffectParticleParameters, Assembly-CSharp",
       "casterParticleReference": {
         "$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
-        "m_AssetGUID": "a3ab6be56385381458d6c6e9ed5e828b",
+        "m_AssetGUID": "de56dbcb8279e824d876e88bb3601378",
+        "m_SubObjectName": "",
+        "m_SubObjectType": ""
+      },
+      "casterSelfParticleReference": {
+        "$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
+        "m_AssetGUID": "",
+        "m_SubObjectName": "",
+        "m_SubObjectType": ""
+      },
+      "casterQuickSpellParticleReference": {
+        "$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
+        "m_AssetGUID": "",
         "m_SubObjectName": "",
         "m_SubObjectType": ""
       },
-      "casterSelfParticleReference": null,
-      "casterQuickSpellParticleReference": null,
       "targetParticleReference": {
         "$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
         "m_AssetGUID": "",

diff --git a/...eatureDefinitionPowerUseModifier/PowerUseModifierTacticianGambitPoolMartialTactician.json b/...eatureDefinitionPowerUseModifier/PowerUseModifierTacticianGambitPoolMartialTactician.json
@@ -0,0 +1,30 @@
+{
+  "$type": "FeatureDefinitionPowerUseModifier, SolastaUnfinishedBusiness",
+  "guiPresentation": {
+    "$type": "GuiPresentation, Assembly-CSharp",
+    "hidden": false,
+    "title": "Feature/&PowerUseModifierTacticianGambitPoolTitle",
+    "description": "Feature/&PowerUseModifierTacticianGambitPoolDescription",
+    "spriteReference": {
+      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
+      "m_AssetGUID": "",
+      "m_SubObjectName": null,
+      "m_SubObjectType": null
+    },
+    "color": {
+      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
+      "r": 1.0,
+      "g": 1.0,
+      "b": 1.0,
+      "a": 1.0
+    },
+    "symbolChar": "221E",
+    "sortOrder": 0,
+    "unusedInSolastaCOTM": false,
+    "usedInValleyDLC": false
+  },
+  "contentCopyright": "UserContent",
+  "guid": "142dbc79-602e-5057-aa01-646c3e046e07",
+  "contentPack": 9999,
+  "name": "PowerUseModifierTacticianGambitPoolMartialTactician"
+}
diff --git a/SolastaUnfinishedBusiness/Api/DatabaseHelper-RELEASE.cs b/SolastaUnfinishedBusiness/Api/DatabaseHelper-RELEASE.cs
@@ -29,7 +29,6 @@ internal static class ActionDefinitions
         internal static ActionDefinition ActionSurge { get; } = GetDefinition<ActionDefinition>("ActionSurge");
         internal static ActionDefinition CastInvocation { get; } = GetDefinition<ActionDefinition>("CastInvocation");
         internal static ActionDefinition DashBonus { get; } = GetDefinition<ActionDefinition>("DashBonus");
-        internal static ActionDefinition DisengageMain { get; } = GetDefinition<ActionDefinition>("DisengageMain");
         internal static ActionDefinition SpiritRage { get; } = GetDefinition<ActionDefinition>("SpiritRage");
 
         internal static ActionDefinition GrantBardicInspiration { get; } =
@@ -1037,9 +1036,6 @@ internal static class FeatureDefinitionAdditionalDamages
         internal static FeatureDefinitionAdditionalDamage AdditionalDamageRogueSneakAttack { get; } =
             GetDefinition<FeatureDefinitionAdditionalDamage>("AdditionalDamageRogueSneakAttack");
 
-        internal static FeatureDefinitionAdditionalDamage AdditionalDamageRoguishHoodlumNonFinesseSneakAttack { get; } =
-            GetDefinition<FeatureDefinitionAdditionalDamage>("AdditionalDamageRoguishHoodlumNonFinesseSneakAttack");
-
         internal static FeatureDefinitionAdditionalDamage
             AdditionalDamageTraditionLightRadiantStrikesLuminousKi { get; } =
             GetDefinition<FeatureDefinitionAdditionalDamage>("AdditionalDamageTraditionLightRadiantStrikesLuminousKi");
@@ -2018,9 +2014,6 @@ internal static class FeatureDefinitionPowers
         internal static FeatureDefinitionPower PowerPaladinNeutralizePoison { get; } =
             GetDefinition<FeatureDefinitionPower>("PowerPaladinNeutralizePoison");
 
-        internal static FeatureDefinitionPower PowerPatronFiendDarkOnesBlessing { get; } =
-            GetDefinition<FeatureDefinitionPower>("PowerPatronFiendDarkOnesBlessing");
-
         internal static FeatureDefinitionPower PowerPatronFiendDarkOnesOwnLuck { get; } =
             GetDefinition<FeatureDefinitionPower>("PowerPatronFiendDarkOnesOwnLuck");
 
@@ -2102,9 +2095,6 @@ internal static class FeatureDefinitionPowers
         internal static FeatureDefinitionPower PowerSpiderQueenPoisonCloud { get; } =
             GetDefinition<FeatureDefinitionPower>("PowerSpiderQueenPoisonCloud");
 
-        internal static FeatureDefinitionPower PowerSymbolOfSleep { get; } =
-            GetDefinition<FeatureDefinitionPower>("PowerSymbolOfSleep");
-
         internal static FeatureDefinitionPower PowerTraditionCourtMageSpellShield { get; } =
             GetDefinition<FeatureDefinitionPower>("PowerTraditionCourtMageSpellShield");
 

diff --git a/SolastaUnfinishedBusiness/Api/GameExtensions/GameLocationCharacterExtensions.cs b/SolastaUnfinishedBusiness/Api/GameExtensions/GameLocationCharacterExtensions.cs
@@ -79,7 +79,7 @@ internal static (RulesetAttackMode mode, ActionModifier modifier) GetFirstMeleeM
     {
         foreach (var mode in instance.RulesetCharacter.AttackModes)
         {
-            if (!ValidatorsWeapon.IsMelee(mode))
+            if (!ValidatorsWeapon.IsMelee(mode.SourceObject as RulesetItem))
             {
                 continue;
             }

diff --git a/SolastaUnfinishedBusiness/ChangelogHistory.txt b/SolastaUnfinishedBusiness/ChangelogHistory.txt
@@ -1,3 +1,34 @@
+1.5.97.19:
+
+all fixes marked with * were introduced with the IsMelee change on v18
+
+- added subclasses unique sprites [by otearaisu]
+- fixed Martial Arcane Archer arcane shots weapon type validator
+- fixed Martial Battle Master missing maneuvers initial pool amount
+- fixed Martial Psi Warrior force of will saving throw behavior
+- fixed Martial Psi Warrior psionic adept once in my turn validator
+- fixed monster reaction powers effect forms application
+- fixed Powerful metamagic interaction with Sunbeam spell
+- fixed Reverse Gravity spell granting flying to creatures
+- fixed Shapechange spell to delegate concentration to shape
+* fixed Exploiter feat attack mode validator
+* fixed GWM feat attack mode modifier, and additional attack validator
+* fixed Lunging Attack maneuver increase weapon reach validator
+* fixed Mage Slayer feat attack mode validator
+* fixed Martial Warlord coordinated assault attack mode validator
+* fixed Oath of Dread harrowing crusade attack mode validator
+* fixed Old Tactics feat attack mode validator
+* fixed Path of the Wild Magic wild surge attack mode validator
+* fixed Power Attack feat attack mode modifier
+* fixed Retaliate maneuver attack mode validator
+* fixed Wendigo natural lunger increase weapon reach validator
+* fixed Wyrmkin reactive retribution attack mode validator
+
+KNOWN ISSUES:
+
+- Artillerist Force Ballista tiny cannon doesn't force attack DIS within 5 ft
+- Chaos Bolt damage will be of wrong type under multiplayer if twinned and any bolt misses
+
 1.5.97.18:
 
 - added Circle of the Wildfire, and Vitriolic Sphere spell
@@ -24,11 +55,6 @@
 - fixed Rescue the Dying spell triggering logic
 - fixed Skill Empowerment spell suggested list
 
-KNOWN ISSUES:
-
-- Artillerist Force Ballista tiny cannon doesn't force attack DIS within 5 ft
-- Chaos Bolt damage will be of wrong type under multiplayer if twinned and any bolt misses [cannot fix]
-
 1.5.97.17:
 
 - fixed 'After was attacked' condition interruption also triggering on non attack roll magic effects

diff --git a/SolastaUnfinishedBusiness/Displays/CreditsDisplay.cs b/SolastaUnfinishedBusiness/Displays/CreditsDisplay.cs
@@ -58,7 +58,7 @@ internal static class CreditsDisplay
             "feats, fighting styles, items & crafting, Martial Eldritch Knight, Wizard Arcane Fighter, Wizard Spellmaster"),
 
         ("Otearaisu",
-            "Aasimar, Goliath, Imp, Lizardfolk, Oni, Warforged, Wendigo, Wildling, Wyrmkin, Path of the Battlerager, Path of the Beast, Path of the Wild Magic"),
+            "sprites, Aasimar, Goliath, Imp, Lizardfolk, Oni, Warforged, Wendigo, Wildling, Wyrmkin, Path of the Battlerager, Path of the Beast, Path of the Wild Magic"),
         ("Haxermn", "spells, Domain Defiler, Domain Forge, Oath of Ancients, Oath of Hatred, Way of Dragon"),
         ("SilverGriffon", "gameplay, visuals, spells, Dark Elf, Grey Dwarf, Kobold, Sorcerous Divine Soul"),
         ("tivie", "Circle of the Moon, Path of the Totem Warrior"),

diff --git a/SolastaUnfinishedBusiness/Feats/ArmorFeats.cs b/SolastaUnfinishedBusiness/Feats/ArmorFeats.cs
@@ -17,8 +17,6 @@ namespace SolastaUnfinishedBusiness.Feats;
 
 internal static class ArmorFeats
 {
-    internal const string ConditionShieldTechniquesResistanceName = "ConditionShieldTechniquesResistance";
-
     // this is entirely implemented on rulesetCharacterHero transpiler using context validations below
     // they change max dexterity to 3 and remove any instance of Stealth Disadvantage checks
     private static readonly FeatDefinition FeatMediumArmorMaster = FeatDefinitionBuilder