Merge pull request #5037 from SolastaMods/dev

1.5.97.37
SolastaMods · Nov 7, 2024 · 19c786b · 19c786b
2 parents 2fa3fe9 + be028f8
commit 19c786b
Show file tree

Hide file tree

Showing 374 changed files with 23,567 additions and 6,941 deletions.
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/GravityWellToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/GravityWellToggle.json
@@ -0,0 +1,74 @@
+{
+  "$type": "ActionDefinition, Assembly-CSharp",
+  "id": 9079,
+  "actionType": "NoCost",
+  "actionScope": "All",
+  "pairedActionId": "NoAction",
+  "usesPerTurn": -1,
+  "classNameOverride": "Toggle",
+  "requiresAuthorization": true,
+  "stealthBreakerBehavior": "None",
+  "feedbackOnHoverType": "None",
+  "iterativeTargeting": false,
+  "canTriggerBattle": false,
+  "parameter": "None",
+  "formType": "Large",
+  "overrideGuiActionType": false,
+  "overridenGuiActionType": "Main",
+  "focusCameraOnAction": false,
+  "addedConditionName": "",
+  "removedConditionName": "",
+  "preventsSerialization": false,
+  "baseActionForFailureTooltips": null,
+  "activatedPower": "Definition:PowerMonkStunningStrike:5e112de763b0d40428c65e6b825a2f74",
+  "displayPowerTooltip": false,
+  "dieType": "D10",
+  "abilityScore": "Dexterity",
+  "addLevel": false,
+  "maxCells": 1,
+  "targetType": "Sphere",
+  "targetParameter": 1,
+  "matchingCondition": "",
+  "particlePrefab": {
+    "$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
+    "m_AssetGUID": "",
+    "m_SubObjectName": "",
+    "m_SubObjectType": ""
+  },
+  "soundEvent": {
+    "$type": "AK.Wwise.Event, AK.Wwise.Unity.API.WwiseTypes",
+    "WwiseObjectReference": null,
+    "idInternal": 0,
+    "valueGuidInternal": {
+      "$type": "System.Byte[], mscorlib",
+      "$value": ""
+    }
+  },
+  "guiPresentation": {
+    "$type": "GuiPresentation, Assembly-CSharp",
+    "hidden": false,
+    "title": "Action/&GravityWellToggleTitle",
+    "description": "Action/&GravityWellToggleDescription",
+    "spriteReference": {
+      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
+      "m_AssetGUID": "f039effbc135454c9bb55de2851472b1",
+      "m_SubObjectName": "MetamagicToggle",
+      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=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": "cef3a8c0-6400-5474-8c85-2bc531d1f09b",
+  "contentPack": 9999,
+  "name": "GravityWellToggle"
+}
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/Assets.txt b/Diagnostics/UnfinishedBusinessBlueprints/Assets.txt
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/CharacterSubclassDefinition/WizardAbjuration.json b/Diagnostics/UnfinishedBusinessBlueprints/CharacterSubclassDefinition/WizardAbjuration.json
@@ -11,6 +11,11 @@
       "featureDefinition": "Definition:PowerWizardAbjurationArcaneWard:a39f1fde-05ec-5204-bb0c-9f28b345b754",
       "level": 2
     },
+    {
+      "$type": "FeatureUnlockByLevel, Assembly-CSharp",
+      "featureDefinition": "Definition:PowerWizardAbjurationRechargeArcaneWard:c0673e0e-8ccb-5096-9925-39df946bea31",
+      "level": 2
+    },
     {
       "$type": "FeatureUnlockByLevel, Assembly-CSharp",
       "featureDefinition": "Definition:PowerWizardAbjurationProjectedWard:35a98c67-3237-58b1-90d7-55ec6bf7f271",

diff --git a/Diagnostics/UnfinishedBusinessBlueprints/CharacterSubclassDefinition/WizardGraviturgist.json b/Diagnostics/UnfinishedBusinessBlueprints/CharacterSubclassDefinition/WizardGraviturgist.json
@@ -21,6 +21,11 @@
       "featureDefinition": "Definition:PowerWizardGraviturgistGravityWell:faf3975c-aac0-5eab-b363-62a253150e4d",
       "level": 6
     },
+    {
+      "$type": "FeatureUnlockByLevel, Assembly-CSharp",
+      "featureDefinition": "Definition:ActionAffinityGravityWellToggle:7384e03c-b244-5c70-b1ef-f1c73eadf997",
+      "level": 6
+    },
     {
       "$type": "FeatureUnlockByLevel, Assembly-CSharp",
       "featureDefinition": "Definition:PowerWizardGraviturgistViolentAttraction:643279dd-430f-5388-95a0-5a31d68ca973",
@@ -36,7 +41,7 @@
   "morphotypeSubclassFilterTag": "Default",
   "guiPresentation": {
     "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": true,
+    "hidden": false,
     "title": "Subclass/&WizardGraviturgistTitle",
     "description": "Subclass/&WizardGraviturgistDescription",
     "spriteReference": {

diff --git a/...ics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionForestGuardianBarkWard.json b/...ics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionForestGuardianBarkWard.json
@@ -63,7 +63,8 @@
     "Definition:ConditionSwallowedShamblingMound:10cc7c5600c606f43b33ab8775ebfc68",
     "Definition:ConditionUnconscious:2d543b2740ecddd4a977d8a706a8a2c9",
     "Definition:ConditionBanishedByBanishment:2e051532-eaa9-5f4c-8af2-2c47b3a8f501",
-    "Definition:ConditionBanishingSmiteEnemy:ba2fe0a0-1836-5755-af0e-876571bae0d2"
+    "Definition:ConditionBanishingSmiteEnemy:ba2fe0a0-1836-5755-af0e-876571bae0d2",
+    "Definition:ConditionCharmedByHypnoticPattern:5396f18314418ed449b0cd42f887aae1"
   ],
   "additionalDamageWhenHit": false,
   "additionalDamageTypeDetermination": "Specific",

diff --git a/...nishedBusinessBlueprints/ConditionDefinition/ConditionForestGuardianImprovedBarkWard.json b/...nishedBusinessBlueprints/ConditionDefinition/ConditionForestGuardianImprovedBarkWard.json
@@ -65,7 +65,8 @@
     "Definition:ConditionSwallowedShamblingMound:10cc7c5600c606f43b33ab8775ebfc68",
     "Definition:ConditionUnconscious:2d543b2740ecddd4a977d8a706a8a2c9",
     "Definition:ConditionBanishedByBanishment:2e051532-eaa9-5f4c-8af2-2c47b3a8f501",
-    "Definition:ConditionBanishingSmiteEnemy:ba2fe0a0-1836-5755-af0e-876571bae0d2"
+    "Definition:ConditionBanishingSmiteEnemy:ba2fe0a0-1836-5755-af0e-876571bae0d2",
+    "Definition:ConditionCharmedByHypnoticPattern:5396f18314418ed449b0cd42f887aae1"
   ],
   "additionalDamageWhenHit": false,
   "additionalDamageTypeDetermination": "Specific",

diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionGrappleSource.json b/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionGrappleSource.json
@@ -69,8 +69,9 @@
     "Definition:ConditionUnconscious:2d543b2740ecddd4a977d8a706a8a2c9",
     "Definition:ConditionBanishedByBanishment:2e051532-eaa9-5f4c-8af2-2c47b3a8f501",
     "Definition:ConditionBanishingSmiteEnemy:ba2fe0a0-1836-5755-af0e-876571bae0d2",
+    "Definition:ConditionInvocationTombOfFrost:b433cd22-643e-528e-b1a6-c061171d5460",
     "Definition:ConditionRogueDeviousStrikeKnockOut:8276a494-262e-545d-953e-203075253407",
-    "Definition:ConditionInvocationTombOfFrost:b433cd22-643e-528e-b1a6-c061171d5460"
+    "Definition:ConditionCharmedByHypnoticPattern:5396f18314418ed449b0cd42f887aae1"
   ],
   "additionalDamageWhenHit": false,
   "additionalDamageTypeDetermination": "Specific",

diff --git a/.../UnfinishedBusinessBlueprints/ConditionDefinition/ConditionGrappleSourceWithGrappler.json b/.../UnfinishedBusinessBlueprints/ConditionDefinition/ConditionGrappleSourceWithGrappler.json
@@ -68,8 +68,9 @@
     "Definition:ConditionUnconscious:2d543b2740ecddd4a977d8a706a8a2c9",
     "Definition:ConditionBanishedByBanishment:2e051532-eaa9-5f4c-8af2-2c47b3a8f501",
     "Definition:ConditionBanishingSmiteEnemy:ba2fe0a0-1836-5755-af0e-876571bae0d2",
+    "Definition:ConditionInvocationTombOfFrost:b433cd22-643e-528e-b1a6-c061171d5460",
     "Definition:ConditionRogueDeviousStrikeKnockOut:8276a494-262e-545d-953e-203075253407",
-    "Definition:ConditionInvocationTombOfFrost:b433cd22-643e-528e-b1a6-c061171d5460"
+    "Definition:ConditionCharmedByHypnoticPattern:5396f18314418ed449b0cd42f887aae1"
   ],
   "additionalDamageWhenHit": false,
   "additionalDamageTypeDetermination": "Specific",

diff --git a/...ishedBusinessBlueprints/ConditionDefinition/ConditionGrappleSourceWithGrapplerLarger.json b/...ishedBusinessBlueprints/ConditionDefinition/ConditionGrappleSourceWithGrapplerLarger.json
@@ -69,8 +69,9 @@
     "Definition:ConditionUnconscious:2d543b2740ecddd4a977d8a706a8a2c9",
     "Definition:ConditionBanishedByBanishment:2e051532-eaa9-5f4c-8af2-2c47b3a8f501",
     "Definition:ConditionBanishingSmiteEnemy:ba2fe0a0-1836-5755-af0e-876571bae0d2",
+    "Definition:ConditionInvocationTombOfFrost:b433cd22-643e-528e-b1a6-c061171d5460",
     "Definition:ConditionRogueDeviousStrikeKnockOut:8276a494-262e-545d-953e-203075253407",
-    "Definition:ConditionInvocationTombOfFrost:b433cd22-643e-528e-b1a6-c061171d5460"
+    "Definition:ConditionCharmedByHypnoticPattern:5396f18314418ed449b0cd42f887aae1"
   ],
   "additionalDamageWhenHit": false,
   "additionalDamageTypeDetermination": "Specific",