Merge pull request #4511 from SolastaMods/dev

1.5.97.4
SolastaMods · Apr 8, 2024 · 23f5a24 · 23f5a24
2 parents de162b2 + 9ba05e1
commit 23f5a24
Show file tree

Hide file tree

Showing 253 changed files with 9,685 additions and 2,079 deletions.
diff --git a/Diagnostics/CE-Definitions-GuiPresentation-InvalidSyntaxTranslation-en.txt b/Diagnostics/CE-Definitions-GuiPresentation-InvalidSyntaxTranslation-en.txt
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/DragonHideToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/DragonHideToggle.json
@@ -0,0 +1,74 @@
+{
+  "$type": "ActionDefinition, Assembly-CSharp",
+  "id": 9054,
+  "actionType": "NoCost",
+  "actionScope": "All",
+  "pairedActionId": "NoAction",
+  "usesPerTurn": -1,
+  "classNameOverride": "",
+  "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/&DragonHideToggleTitle",
+    "description": "Action/&DragonHideToggleDescription",
+    "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": "28a48100-249f-592f-a993-5eb2d78b5c91",
+  "contentPack": 9999,
+  "name": "DragonHideToggle"
+}
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/Assets.txt b/Diagnostics/UnfinishedBusinessBlueprints/Assets.txt
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/CharacterClassDefinition/Inventor.json b/Diagnostics/UnfinishedBusinessBlueprints/CharacterClassDefinition/Inventor.json
@@ -336,7 +336,7 @@
     },
     {
       "$type": "FeatureUnlockByLevel, Assembly-CSharp",
-      "featureDefinition": "Definition:PowerInventorSpellStoringItem:cbdb9138-1932-5d41-b695-aed1a6690eaf",
+      "featureDefinition": "Definition:FeatureSetSpellStoringItem:60af9dda-fd5c-55b5-b972-0d9806a6b427",
       "level": 11
     },
     {

diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionFeatMageSlayer.json b/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionFeatMageSlayer.json
@@ -0,0 +1,159 @@
+{
+  "$type": "ConditionDefinition, Assembly-CSharp",
+  "inDungeonEditor": false,
+  "parentCondition": null,
+  "conditionType": "Beneficial",
+  "features": [
+    "Definition:MagicAffinityFeatMageSlayer:c405c8a0-9ba5-5b41-aefc-18efe87c1a67"
+  ],
+  "allowMultipleInstances": false,
+  "silentWhenAdded": true,
+  "silentWhenRemoved": true,
+  "silentWhenRefreshed": false,
+  "terminateWhenRemoved": false,
+  "specialDuration": false,
+  "durationType": "Hour",
+  "durationParameterDie": "D4",
+  "durationParameter": 1,
+  "forceTurnOccurence": false,
+  "turnOccurence": "EndOfTurn",
+  "specialInterruptions": [
+    "AnyBattleTurnEnd"
+  ],
+  "interruptionRequiresSavingThrow": false,
+  "interruptionSavingThrowComputationMethod": "SaveOverride",
+  "interruptionSavingThrowAbility": "",
+  "interruptionDamageThreshold": 0,
+  "keepConditionIfSavingThrowSucceeds": false,
+  "interruptionSavingThrowAffinity": "None",
+  "conditionTags": [],
+  "recurrentEffectForms": [],
+  "cancellingConditions": [],
+  "additionalDamageWhenHit": false,
+  "additionalDamageTypeDetermination": "Specific",
+  "additionalDamageType": "",
+  "additionalDamageQuantity": "AbilityBonus",
+  "additionalDamageDieType": "D1",
+  "additionalDamageDieNumber": 1,
+  "additionalConditionWhenHit": false,
+  "additionalCondition": null,
+  "additionalConditionDurationType": "Round",
+  "additionalConditionDurationParameter": 1,
+  "additionalConditionTurnOccurenceType": "StartOfTurn",
+  "conditionStartParticleReference": {
+    "$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
+    "m_AssetGUID": "",
+    "m_SubObjectName": null,
+    "m_SubObjectType": null
+  },
+  "conditionParticleReference": {
+    "$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
+    "m_AssetGUID": "",
+    "m_SubObjectName": null,
+    "m_SubObjectType": null
+  },
+  "conditionEndParticleReference": {
+    "$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
+    "m_AssetGUID": "",
+    "m_SubObjectName": null,
+    "m_SubObjectType": null
+  },
+  "recurrentEffectParticleReference": null,
+  "characterShaderReference": {
+    "$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
+    "m_AssetGUID": "",
+    "m_SubObjectName": null,
+    "m_SubObjectType": null
+  },
+  "particlesBasedOnAncestryDamageType": false,
+  "ancestryType": "Sorcerer",
+  "acidParticleParameters": null,
+  "coldParticleParameters": null,
+  "fireParticleParameters": null,
+  "lightningParticleParameters": null,
+  "poisonParticleParameters": null,
+  "overrideCharacterShaderColors": false,
+  "firstCharacterShaderColor": {
+    "$type": "UnityEngine.Color, UnityEngine.CoreModule",
+    "r": 0.0,
+    "g": 0.0,
+    "b": 0.0,
+    "a": 0.0
+  },
+  "secondCharacterShaderColor": {
+    "$type": "UnityEngine.Color, UnityEngine.CoreModule",
+    "r": 0.0,
+    "g": 0.0,
+    "b": 0.0,
+    "a": 0.0
+  },
+  "timeToWaitBeforeApplyingShader": 0.5,
+  "timeToWaitBeforeRemovingShader": 0.5,
+  "possessive": false,
+  "amountOrigin": "None",
+  "baseAmount": 0,
+  "additiveAmount": false,
+  "sourceAbilityBonusMinValue": 1,
+  "subsequentOnRemoval": null,
+  "subsequentHasSavingThrow": false,
+  "subsequentSavingThrowAbilityScore": "Constitution",
+  "subsequentVariableForDC": "FrenzyExhaustionDC",
+  "subsequentDCIncrease": 5,
+  "effectFormsOnRemoved": [],
+  "forceBehavior": false,
+  "addBehavior": false,
+  "fearSource": false,
+  "battlePackage": null,
+  "explorationPackage": null,
+  "removedFromTheGame": false,
+  "permanentlyRemovedIfExtraPlanar": false,
+  "refundReceivedDamageWhenRemoved": false,
+  "followSourcePosition": false,
+  "disolveCharacterOnDeath": false,
+  "disolveParameters": {
+    "$type": "GraphicsCharacterDefinitions+DisolveParameters, Assembly-CSharp",
+    "color": {
+      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
+      "r": 0.0,
+      "g": 0.0,
+      "b": 0.0,
+      "a": 0.0
+    },
+    "colorWidth": 0.0,
+    "noiseScale": 5.0,
+    "hueScale": 0.0,
+    "vertexOffset": 0.0,
+    "curve": {
+      "$type": "UnityEngine.AnimationCurve, UnityEngine.CoreModule"
+    },
+    "startAfterDeathAnimation": false,
+    "duration": 0.0
+  },
+  "guiPresentation": {
+    "$type": "GuiPresentation, Assembly-CSharp",
+    "hidden": false,
+    "title": "Feat/&FeatMageSlayerTitle",
+    "description": "Feature/&NoContentTitle",
+    "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": "0eaa80b5-066e-58e5-a99a-c24a408ac20d",
+  "contentPack": 9999,
+  "name": "ConditionFeatMageSlayer"
+}
diff --git a/...ostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionFeatMobileAfterDash.json b/...ostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionFeatMobileAfterDash.json
@@ -1,11 +1,9 @@
 {
   "$type": "ConditionDefinition, Assembly-CSharp",
   "inDungeonEditor": false,
-  "parentCondition": null,
+  "parentCondition": "Definition:ConditionFreedomOfMovement:551c4afd41e56ac4da8d50da083beff4",
   "conditionType": "Beneficial",
-  "features": [
-    "Definition:MovementAffinityFreedomOfMovement:097ce72cf88822243afb196bbddc360c"
-  ],
+  "features": [],
   "allowMultipleInstances": false,
   "silentWhenAdded": false,
   "silentWhenRemoved": false,

diff --git a/...Blueprints/ConditionDefinition/ConditionInnovationArtilleristEldritchCannonHitPoints.json b/...Blueprints/ConditionDefinition/ConditionInnovationArtilleristEldritchCannonHitPoints.json
@@ -33,7 +33,7 @@
   "cancellingConditions": [],
   "additionalDamageWhenHit": false,
   "additionalDamageTypeDetermination": "Specific",
-  "additionalDamageType": "",
+  "additionalDamageType": "Inventor",
   "additionalDamageQuantity": "AbilityBonus",
   "additionalDamageDieType": "D1",
   "additionalDamageDieNumber": 1,
@@ -92,7 +92,7 @@
   "timeToWaitBeforeApplyingShader": 0.5,
   "timeToWaitBeforeRemovingShader": 0.5,
   "possessive": false,
-  "amountOrigin": 9001,
+  "amountOrigin": 9002,
   "baseAmount": 0,
   "additiveAmount": false,
   "sourceAbilityBonusMinValue": 1,

diff --git a/...hedBusinessBlueprints/ConditionDefinition/ConditionInnovationArtilleristFlamethrower.json b/...hedBusinessBlueprints/ConditionDefinition/ConditionInnovationArtilleristFlamethrower.json
@@ -3,9 +3,7 @@
   "inDungeonEditor": false,
   "parentCondition": null,
   "conditionType": "Beneficial",
-  "features": [
-    "Definition:ActionAffinityInnovationArtilleristFlamethrower:b62001b5-c044-5df3-998a-38440fce8596"
-  ],
+  "features": [],
   "allowMultipleInstances": false,
   "silentWhenAdded": false,
   "silentWhenRemoved": false,

diff --git a/...usinessBlueprints/ConditionDefinition/ConditionInnovationArtilleristFlamethrowerTiny.json b/...usinessBlueprints/ConditionDefinition/ConditionInnovationArtilleristFlamethrowerTiny.json
@@ -4,7 +4,8 @@
   "parentCondition": null,
   "conditionType": "Beneficial",
   "features": [
-    "Definition:ActionAffinityInnovationArtilleristFlamethrowerTiny:04a22078-4f03-5669-bf34-fb9188751216"
+    "Definition:ActionAffinityInnovationArtilleristFlamethrowerTiny:04a22078-4f03-5669-bf34-fb9188751216",
+    "Definition:PowerInnovationArtilleristFlamethrower:7cfd7fdb-f510-5f72-97af-61e945df19ae"
   ],
   "allowMultipleInstances": false,
   "silentWhenAdded": false,

diff --git a/...edBusinessBlueprints/ConditionDefinition/ConditionInnovationArtilleristForceBallista.json b/...edBusinessBlueprints/ConditionDefinition/ConditionInnovationArtilleristForceBallista.json
@@ -3,9 +3,7 @@
   "inDungeonEditor": false,
   "parentCondition": null,
   "conditionType": "Beneficial",
-  "features": [
-    "Definition:ActionAffinityInnovationArtilleristForceBallista:566cc166-e65d-5928-97f3-a504f38d5cde"
-  ],
+  "features": [],
   "allowMultipleInstances": false,
   "silentWhenAdded": false,
   "silentWhenRemoved": false,

diff --git a/...sinessBlueprints/ConditionDefinition/ConditionInnovationArtilleristForceBallistaTiny.json b/...sinessBlueprints/ConditionDefinition/ConditionInnovationArtilleristForceBallistaTiny.json
@@ -4,7 +4,8 @@
   "parentCondition": null,
   "conditionType": "Beneficial",
   "features": [
-    "Definition:ActionAffinityInnovationArtilleristForceBallistaTiny:ec29c583-1d60-5f90-b33a-84cc7b3148da"
+    "Definition:ActionAffinityInnovationArtilleristForceBallistaTiny:ec29c583-1d60-5f90-b33a-84cc7b3148da",
+    "Definition:PowerInnovationArtilleristForceBallista:1c3bfcab-e5d0-5904-ac99-391d24888799"
   ],
   "allowMultipleInstances": false,
   "silentWhenAdded": false,

diff --git a/...nishedBusinessBlueprints/ConditionDefinition/ConditionInnovationArtilleristProtector.json b/...nishedBusinessBlueprints/ConditionDefinition/ConditionInnovationArtilleristProtector.json
@@ -3,9 +3,7 @@
   "inDungeonEditor": false,
   "parentCondition": null,
   "conditionType": "Beneficial",
-  "features": [
-    "Definition:ActionAffinityInnovationArtilleristProtector:4bbfc8d3-5f77-5526-82cc-343a0b7a581f"
-  ],
+  "features": [],
   "allowMultipleInstances": false,
   "silentWhenAdded": false,
   "silentWhenRemoved": false,