Merge pull request #4990 from SolastaMods/dev

1.5.97.34
SolastaMods · Oct 13, 2024 · 9aa7a03 · 9aa7a03
2 parents 5397fec + 49b9944
commit 9aa7a03
Show file tree

Hide file tree

Showing 50 changed files with 386 additions and 277 deletions.
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/Assets.txt b/Diagnostics/UnfinishedBusinessBlueprints/Assets.txt
@@ -1255,7 +1255,6 @@ DecisionBreakFreeConditionRestrainedByEntangle	TA.AI.DecisionDefinition	TA.AI.De
 DecisionBreakFreeConditionVileBrew	TA.AI.DecisionDefinition	TA.AI.DecisionDefinition	4b3278e8-334a-58d6-8c75-2f48e28b4e54
 DecisionBreakFreeConditionWrathfulSmiteEnemy	TA.AI.DecisionDefinition	TA.AI.DecisionDefinition	6400794a-3234-55f7-973f-d443c38c9a20
 Move_Approach	TA.AI.DecisionDefinition	TA.AI.DecisionDefinition	5cb2a87f-09a4-5fae-9b74-10516ea8a8ab
-Move_DissonantWhispers	TA.AI.DecisionDefinition	TA.AI.DecisionDefinition	bdfa6649-5cad-5b35-a697-209ea53ca45d
 Approach	TA.AI.DecisionPackageDefinition	TA.AI.DecisionPackageDefinition	5043a0ec-c626-5877-bd87-c7bc0584366d
 BreakFreeAbilityCheckConditionFlashFreeze	TA.AI.DecisionPackageDefinition	TA.AI.DecisionPackageDefinition	5578aa14-4a4c-5aa0-b787-7203e14b8a36
 BreakFreeAbilityCheckConditionGrappledRestrainedEnsnared	TA.AI.DecisionPackageDefinition	TA.AI.DecisionPackageDefinition	bf1d4828-465e-5897-91ca-bc8094b3d20e
@@ -1267,7 +1266,6 @@ BreakFreeAbilityCheckConditionOathOfAncientsNaturesWrath	TA.AI.DecisionPackageDe
 BreakFreeAbilityCheckConditionRestrainedByEntangle	TA.AI.DecisionPackageDefinition	TA.AI.DecisionPackageDefinition	0d9623d9-0cd7-5c03-8275-e9e61f0f1b6a
 BreakFreeAbilityCheckConditionVileBrew	TA.AI.DecisionPackageDefinition	TA.AI.DecisionPackageDefinition	7b202c71-3241-5f80-8b02-ada4a0d9383f
 BreakFreeAbilityCheckConditionWrathfulSmiteEnemy	TA.AI.DecisionPackageDefinition	TA.AI.DecisionPackageDefinition	8952dfa4-c552-57f5-bf82-7e317c4e459d
-DissonantWhispers_Fear	TA.AI.DecisionPackageDefinition	TA.AI.DecisionPackageDefinition	dfe2cc9e-cc70-5cfe-9057-19454acb1068
 DieTypeD3	DieTypeDefinition	DieTypeDefinition	63dc904b-8d78-5406-90aa-e7e1f3eefd84
 ProxyCircleOfTheWildfireCauterizingFlames	EffectProxyDefinition	EffectProxyDefinition	5d3d90cd-1858-5044-b4f6-586754122132
 ProxyCreateBonfire	EffectProxyDefinition	EffectProxyDefinition	a84e5459-b44a-5dfd-9f27-c4a44b571c3a
@@ -2212,6 +2210,7 @@ ConditionAffinityRangerSurvivalistDeafenedImmunity	FeatureDefinitionConditionAff
 ConditionAffinityRangerWildMasterBeastCompanion	FeatureDefinitionConditionAffinity	FeatureDefinition	2bd6cfd4-49bf-5687-9b68-4f3765984ce2
 ConditionAffinityRiftWalkerRestrainedImmunity	FeatureDefinitionConditionAffinity	FeatureDefinition	92cb7a89-3554-567c-a62e-f72c78cd34f1
 ConditionAffinitySickeningRadiance	FeatureDefinitionConditionAffinity	FeatureDefinition	fc61f40d-38f7-5a41-b8fb-d6e4464a3135
+ConditionGrappleTargetFlying	FeatureDefinitionMoveMode	FeatureDefinition	617fc4f1-520e-53b8-85bf-3dca03dc7231
 CraftingAffinityInventorMagicItemAdept	FeatureDefinitionCraftingAffinity	FeatureDefinition	26842e0a-9c1e-5740-ad4d-871da69932b1
 CustomCodeBarbarianPrimalChampion	FeatureDefinition	FeatureDefinition	85dac7d1-5e2a-5f02-983b-65b1905810b3
 CustomInvocationPoolMalakhAngelicForm	FeatureDefinitionCustomInvocationPool	FeatureDefinition	89a4a18c-0d51-526b-aecf-1b7ff85e2bae
@@ -5717,6 +5716,7 @@ MovementAffinityWizardGraviturgistDensityDecrease	FeatureDefinitionMovementAffin
 MovementAffinityWizardGraviturgistDensityIncrease	FeatureDefinitionMovementAffinity	FeatureDefinitionMovementAffinity	d0d79e06-f8b4-5aff-b8ee-98a50ddde9d9
 MovementAffinityWizardGraviturgistEventHorizon	FeatureDefinitionMovementAffinity	FeatureDefinitionMovementAffinity	90474524-85de-5766-8484-b84f2eb283eb
 MovementAffinityWizardGraviturgistEventHorizonSaved	FeatureDefinitionMovementAffinity	FeatureDefinitionMovementAffinity	fed3e079-b87f-5407-b4cf-a9a6428a8e7f
+ConditionGrappleTargetFlying	FeatureDefinitionMoveMode	FeatureDefinitionMoveMode	617fc4f1-520e-53b8-85bf-3dca03dc7231
 MoveModeFly0	FeatureDefinitionMoveMode	FeatureDefinitionMoveMode	b019af54-9539-548c-aad7-1b52e096bd83
 MoveModeFly14	FeatureDefinitionMoveMode	FeatureDefinitionMoveMode	e36200ce-233b-500c-82e2-4dfbce7a6b58
 MoveModeMove14	FeatureDefinitionMoveMode	FeatureDefinitionMoveMode	9f0985b9-dcfb-5656-b53e-4c0b7c3e1676

diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionGrappleSource.json b/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionGrappleSource.json
@@ -38,7 +38,7 @@
     "Definition:ConditionBanishedTimeshift:fa046e868c8816244bf8dcb28dbe7c72",
     "Definition:ConditionConfusedIncapacitated:5080467181c250c4c9c2b899f661fac4",
     "Definition:ConditionEyebiteAsleep:66d1a96e08e0a3a42b9b12658a3ba095",
-     "Definition:ConditionFlying:ec82fae48f9a55a41a49fd96d93b49b5",
+    "Definition:ConditionFlying:ec82fae48f9a55a41a49fd96d93b49b5",
     "Definition:ConditionFlying12:33fb0e0fb4c74604e8fe76b8d3370510",
     "Definition:ConditionFlyingAdaptive:cdef2a25e10345349a181ccf2b03cd97",
     "Definition:ConditionFlyingBootsWinged:83fc6ceb7037bcb41b2fc67df5595685",

diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionGrappleTarget.json b/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionGrappleTarget.json
@@ -6,6 +6,7 @@
   "features": [
     "Definition:ActionAffinityConditionRestrained:0a11d859909c2624086506f327824de8",
     "Definition:ActionAffinityGrappled:1c2c02a0e9f823c489b3d62d03534617",
+    "Definition:ConditionGrappleTargetFlying:617fc4f1-520e-53b8-85bf-3dca03dc7231",
     "Definition:MovementAffinityConditionRestrained:ed9d9d5986e47f845819579f936ee8cc"
   ],
   "allowMultipleInstances": false,

diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionResonatingStrike.json b/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionResonatingStrike.json
@@ -17,9 +17,7 @@
   "durationParameter": 1,
   "forceTurnOccurence": false,
   "turnOccurence": "EndOfTurn",
-  "specialInterruptions": [
-    9007
-  ],
+  "specialInterruptions": [],
   "interruptionRequiresSavingThrow": false,
   "interruptionSavingThrowComputationMethod": "SaveOverride",
   "interruptionSavingThrowAbility": "",

diff --git a/Diagnostics/UnfinishedBusinessBlueprints/DecisionDefinition/Move_DissonantWhispers.json b/Diagnostics/UnfinishedBusinessBlueprints/DecisionDefinition/Move_DissonantWhispers.json
diff --git a/...ostics/UnfinishedBusinessBlueprints/DecisionPackageDefinition/DissonantWhispers_Fear.json b/...ostics/UnfinishedBusinessBlueprints/DecisionPackageDefinition/DissonantWhispers_Fear.json
diff --git a/.../UnfinishedBusinessBlueprints/FeatureDefinitionMoveMode/ConditionGrappleTargetFlying.json b/.../UnfinishedBusinessBlueprints/FeatureDefinitionMoveMode/ConditionGrappleTargetFlying.json
@@ -0,0 +1,32 @@
+{
+  "$type": "FeatureDefinitionMoveMode, Assembly-CSharp",
+  "moveMode": "Fly",
+  "speed": 0,
+  "guiPresentation": {
+    "$type": "GuiPresentation, Assembly-CSharp",
+    "hidden": false,
+    "title": "Feature/&ConditionGrappleTargetFlyingTitle",
+    "description": "Feature/&ConditionGrappleTargetFlyingDescription",
+    "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": "617fc4f1-520e-53b8-85bf-3dca03dc7231",
+  "contentPack": 9999,
+  "name": "ConditionGrappleTargetFlying"
+}
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionPower/PowerFeatPoisonousSkin.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionPower/PowerFeatPoisonousSkin.json
@@ -37,7 +37,7 @@
     "hasSavingThrow": true,
     "disableSavingThrowOnAllies": false,
     "savingThrowAbility": "Constitution",
-    "ignoreCover": false,
+    "ignoreCover": true,
     "grantedConditionOnSave": null,
     "rollSaveOnlyIfRelevantForms": false,
     "hasShoveRoll": false,

diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionPower/PowerHandwrapsOfPulling.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionPower/PowerHandwrapsOfPulling.json
@@ -37,7 +37,7 @@
     "hasSavingThrow": true,
     "disableSavingThrowOnAllies": true,
     "savingThrowAbility": "Strength",
-    "ignoreCover": false,
+    "ignoreCover": true,
     "grantedConditionOnSave": null,
     "rollSaveOnlyIfRelevantForms": false,
     "hasShoveRoll": false,

diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionPower/PowerResonatingStrike.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionPower/PowerResonatingStrike.json
@@ -104,7 +104,7 @@
       "incrementMultiplier": 1,
       "additionalTargetsPerIncrement": 0,
       "additionalSubtargetsPerIncrement": 0,
-      "additionalDicePerIncrement": 0,
+      "additionalDicePerIncrement": 1,
       "additionalSpellLevelPerIncrement": 0,
       "additionalSummonsPerIncrement": 0,
       "additionalHPPerIncrement": 0,

diff --git a/Diagnostics/UnfinishedBusinessBlueprints/SpellDefinition/CreateBonfire.json b/Diagnostics/UnfinishedBusinessBlueprints/SpellDefinition/CreateBonfire.json
@@ -49,7 +49,7 @@
     "hasSavingThrow": true,
     "disableSavingThrowOnAllies": false,
     "savingThrowAbility": "Dexterity",
-    "ignoreCover": false,
+    "ignoreCover": true,
     "grantedConditionOnSave": null,
     "rollSaveOnlyIfRelevantForms": false,
     "hasShoveRoll": false,

diff --git a/SolastaUnfinishedBusiness/ChangelogHistory.txt b/SolastaUnfinishedBusiness/ChangelogHistory.txt
@@ -1,3 +1,14 @@
+1.5.97.34:
+
+- fixed battles soft lock with reaction spells, and readied actions
+- fixed Circle of Nature level up instability when switching subclasses
+- fixed Circle of Wildfire enhanced bond on successful save, and damage on first target only
+- fixed Dissonant Whispers de-sync on multiplayer
+- fixed Green-Flame Blade 2nd target damage, and interaction with reaction powers
+- fixed override party size setting interaction with heroes selection on new multiplayer
+- fixed Spike Growth and similar 2x damage on last tile move
+- fixed Wizard War Magic power surge on successful save
+
 1.5.97.33:
 
 - added homebrew Brawler feat

diff --git a/SolastaUnfinishedBusiness/Feats/OtherFeats.cs b/SolastaUnfinishedBusiness/Feats/OtherFeats.cs
@@ -2575,7 +2575,7 @@ public bool CanIgnoreAoOOnSelf(RulesetCharacter defender, RulesetCharacter attac
                 .SetDurationData(DurationType.Minute, 1)
                 .SetTargetingData(Side.Enemy, RangeType.Distance, 1, TargetType.IndividualsUnique)
                 .SetSavingThrowData(false,
-                    AttributeDefinitions.Constitution, false,
+                    AttributeDefinitions.Constitution, true,
                     EffectDifficultyClassComputation.AbilityScoreAndProficiency,
                     AttributeDefinitions.Constitution, 8)
                 .SetEffectForms(

diff --git a/SolastaUnfinishedBusiness/Info.json b/SolastaUnfinishedBusiness/Info.json
@@ -1,7 +1,7 @@
 {
   "Id": "SolastaUnfinishedBusiness",
   "DisplayName": "<i>[<b>Un</b>]</i> <color=Orange>Finished Business</color>",
-  "Version": "1.5.97.33",
+  "Version": "1.5.97.34",
   "GameVersion": "1.5.97",
   "ManagerVersion": "0.24.0",
   "AssemblyName": "SolastaUnfinishedBusiness.dll",

diff --git a/SolastaUnfinishedBusiness/Models/CustomWeaponsContext.cs b/SolastaUnfinishedBusiness/Models/CustomWeaponsContext.cs
@@ -176,7 +176,7 @@ private static void BuildHandwraps()
                                 .SetSavingThrowData(
                                     true,
                                     AttributeDefinitions.Strength,
-                                    false,
+                                    true,
                                     EffectDifficultyClassComputation.AbilityScoreAndProficiency)
                                 .SetParticleEffectParameters(FeatureDefinitionPowers.PowerShadowTamerRopeGrapple)
                                 .SetEffectForms(

diff --git a/SolastaUnfinishedBusiness/Models/GrappleContext.cs b/SolastaUnfinishedBusiness/Models/GrappleContext.cs
@@ -97,6 +97,11 @@ internal static void LateLoad()
             .SetBrain(battlePackage, true)
             .SetFeatures(
                 ActionAffinityGrappled,
+                //prevent grappled target from falling while grappled
+                FeatureDefinitionMoveModeBuilder.Create($"{ConditionGrappleTargetName}Flying")
+                    .SetGuiPresentation(Category.Feature)
+                    .SetMode(MoveMode.Fly, 0)
+                    .AddToDB(),
                 ActionAffinityConditionRestrained,
                 MovementAffinityConditionRestrained)
             .AddCustomSubFeatures(new OnConditionAddedOrRemovedConditionGrappleTarget())
@@ -377,7 +382,7 @@ public IEnumerator OnPowerOrSpellFinishedByMe(CharacterActionMagicEffect action,
 
             attacker.BurnOneMainAttack();
 
-            yield return TryAlterOutcomeAttributeCheck.ResolveRolls(
+             yield return TryAlterOutcomeAttributeCheck.ResolveRolls(
                 attacker, defender, ActionDefinitions.Id.NoAction, abilityCheckData);
 
             var success =
@@ -544,8 +549,10 @@ public void MoveStepStarted(GameLocationCharacter mover, int3 source, int3 desti
             if (canTeleport)
             {
                 target.StartTeleportTo(targetDestinationPosition, mover.Orientation, false);
+                target.Pushed = true;
                 target.FinishMoveTo(targetDestinationPosition, mover.Orientation);
                 target.StopMoving(mover.Orientation);
+                target.Pushed = false;
 
                 var isLastStep = GetDistanceFromCharacter(mover, mover.DestinationPosition) <= 1;
 

diff --git a/SolastaUnfinishedBusiness/Patches/CharacterBuildingManagerPatcher.cs b/SolastaUnfinishedBusiness/Patches/CharacterBuildingManagerPatcher.cs
@@ -179,7 +179,7 @@ public static void Prefix([NotNull] CharacterBuildingManager __instance, [NotNul
         public static void Postfix(CharacterBuildingManager __instance, [NotNull] RulesetCharacterHero hero)
         {
             //PATCH: grants cantrip selected by a Domain Nature on level 1
-            DomainNature.GrantCantrip(hero);
+            DomainNature.GrantCantripFromSubclassPool(hero);
 
             //PATCH: grants spell repertoires and respective selected spells from feats
             LevelUpContext.GrantSpellsOrCantripsFromFeatCastSpell(__instance, hero);
@@ -374,6 +374,9 @@ public static class UnassignLastSubclass_Patch
         [UsedImplicitly]
         public static bool Prefix([NotNull] RulesetCharacterHero hero)
         {
+            //PATCH: avoid Domain Nature to break level up with the cantrip it gets
+            DomainNature.ResetCantripSubclassPool(hero);
+
             //PATCH: un-captures the desired subclass
             LevelUpContext.SetSelectedSubclass(hero, null);