Merge pull request #4258 from SolastaMods/dev

1.5.94.40
SolastaMods · Jan 3, 2024 · d4a8f6e · d4a8f6e
2 parents 7df5d65 + 079cb72
commit d4a8f6e
Show file tree

Hide file tree

Showing 216 changed files with 1,647 additions and 5,364 deletions.
diff --git a/Diagnostics/CE-Definitions-GuiPresentation-InvalidSyntaxTranslation-en.txt b/Diagnostics/CE-Definitions-GuiPresentation-InvalidSyntaxTranslation-en.txt
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/Assets.txt b/Diagnostics/UnfinishedBusinessBlueprints/Assets.txt
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/CharacterSubclassDefinition/DomainDefiler.json b/Diagnostics/UnfinishedBusinessBlueprints/CharacterSubclassDefinition/DomainDefiler.json
@@ -26,11 +26,6 @@
       "featureDefinition": "Definition:FeatureSetDomainDefilerMarkForDeath:92474773-54e8-5908-a328-a2cf39db0c4a",
       "level": 6
     },
-    {
-      "$type": "FeatureUnlockByLevel, Assembly-CSharp",
-      "featureDefinition": "Definition:DamageAffinityDomainDefilerDivineResistance:f97c531f-66f1-57f3-a51f-fe1cb8ad00ec",
-      "level": 8
-    },
     {
       "$type": "FeatureUnlockByLevel, Assembly-CSharp",
       "featureDefinition": "Definition:AdditionalDamageDomainDefilerDivineStrike:320cd4cd-21c7-5f0e-a8ff-60a87283c3e5",
@@ -41,11 +36,6 @@
       "featureDefinition": "Definition:PowerClericDivineInterventionPaladin:4f9a2e4ff332b204aae612753dada617",
       "level": 10
     },
-    {
-      "$type": "FeatureUnlockByLevel, Assembly-CSharp",
-      "featureDefinition": "Definition:DamageAffinityDomainDefilerDivineImmunity:762bd2b0-0bc5-582b-b02b-d0f33517daf9",
-      "level": 14
-    },
     {
       "$type": "FeatureUnlockByLevel, Assembly-CSharp",
       "featureDefinition": "Definition:AutoPreparedSpellsDomainDefilerDyingLight:a9f69d94-29c4-518d-87c8-dccab866b3d6",

diff --git a/...tics/UnfinishedBusinessBlueprints/CharacterSubclassDefinition/RoguishArcaneScoundrel.json b/...tics/UnfinishedBusinessBlueprints/CharacterSubclassDefinition/RoguishArcaneScoundrel.json
@@ -40,11 +40,6 @@
       "$type": "FeatureUnlockByLevel, Assembly-CSharp",
       "featureDefinition": "Definition:FeatureSetRoguishArcaneScoundrelTricksOfTheTrade:20bf9821-84ef-54d4-b4c6-7830a6aebbcb",
       "level": 17
-    },
-    {
-      "$type": "FeatureUnlockByLevel, Assembly-CSharp",
-      "featureDefinition": "Definition:FeatureSetRoguishArcaneScoundrelPremeditationSlot:8e525e1c-ab99-5166-9e82-ffebd11395ea",
-      "level": 19
     }
   ],
   "personalityFlagOccurences": [],

diff --git a/Diagnostics/UnfinishedBusinessBlueprints/CharacterSubclassDefinition/RoguishRavenScion.json b/Diagnostics/UnfinishedBusinessBlueprints/CharacterSubclassDefinition/RoguishRavenScion.json
@@ -16,19 +16,14 @@
       "featureDefinition": "Definition:PowerRavenScionHeartSeekingShot:4fe21d5b-9580-5f89-891b-e496918be669",
       "level": 9
     },
-    {
-      "$type": "FeatureUnlockByLevel, Assembly-CSharp",
-      "featureDefinition": "Definition:FeatureRavenScionKillingSpree:2f09173e-812e-5d27-afce-6f3ff28144e3",
-      "level": 9
-    },
     {
       "$type": "FeatureUnlockByLevel, Assembly-CSharp",
       "featureDefinition": "Definition:PowerRavenScionDeadlyFocus:4e4563c9-5a62-5fda-8d33-7a9f7d63a09d",
       "level": 13
     },
     {
       "$type": "FeatureUnlockByLevel, Assembly-CSharp",
-      "featureDefinition": "Definition:DieRollModifierRavenScionPerfectShot:a6d494f0-8596-558c-9437-f992b790942b",
+      "featureDefinition": "Definition:FeatureRavenScionKillingSpree:2f09173e-812e-5d27-afce-6f3ff28144e3",
       "level": 17
     }
   ],

diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionCorruptingBolt.json b/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionCorruptingBolt.json
@@ -16,8 +16,7 @@
     "Definition:DamageAffinityCorruptingBoltDamagePsychic:3067f7b9-8f8f-58e5-938d-21a62adead0b",
     "Definition:DamageAffinityCorruptingBoltDamageRadiant:5aea4d37-f8d1-5e29-a923-4c104d3adc4a",
     "Definition:DamageAffinityCorruptingBoltDamageSlashing:03ac99c2-c9af-542b-83d7-c7a4cc554538",
-    "Definition:DamageAffinityCorruptingBoltDamageThunder:bc58b4ae-0738-5441-bab1-45fd22c196a9",
-    "Definition:DamageAffinityCorruptingBoltDamagePure:e23adff8-0887-5ae7-9789-b0531a8b670b"
+    "Definition:DamageAffinityCorruptingBoltDamageThunder:bc58b4ae-0738-5441-bab1-45fd22c196a9"
   ],
   "allowMultipleInstances": false,
   "silentWhenAdded": false,

diff --git a/...shedBusinessBlueprints/ConditionDefinition/ConditionDomainDefilerInsidiousDeathMagic.json b/...shedBusinessBlueprints/ConditionDefinition/ConditionDomainDefilerInsidiousDeathMagic.json
@@ -12,9 +12,9 @@
   "silentWhenRefreshed": false,
   "terminateWhenRemoved": false,
   "specialDuration": true,
-  "durationType": "Minute",
+  "durationType": "Round",
   "durationParameterDie": "D1",
-  "durationParameter": 1,
+  "durationParameter": 6,
   "forceTurnOccurence": false,
   "turnOccurence": "EndOfTurn",
   "specialInterruptions": [],
@@ -40,23 +40,28 @@
   "additionalConditionTurnOccurenceType": "StartOfTurn",
   "conditionStartParticleReference": {
     "$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
-    "m_AssetGUID": "",
-    "m_SubObjectName": null,
-    "m_SubObjectType": null
+    "m_AssetGUID": "627bd8f637fc96149848ee0929fb1da9",
+    "m_SubObjectName": "",
+    "m_SubObjectType": ""
   },
   "conditionParticleReference": {
     "$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
-    "m_AssetGUID": "",
-    "m_SubObjectName": null,
-    "m_SubObjectType": null
+    "m_AssetGUID": "b385bd0d58005ab4d8a1f840ba91e861",
+    "m_SubObjectName": "",
+    "m_SubObjectType": ""
   },
   "conditionEndParticleReference": {
+    "$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
+    "m_AssetGUID": "063c54f5d4324ba4a8b724adef3cf136",
+    "m_SubObjectName": "",
+    "m_SubObjectType": ""
+  },
+  "recurrentEffectParticleReference": {
     "$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
     "m_AssetGUID": "",
-    "m_SubObjectName": null,
-    "m_SubObjectType": null
+    "m_SubObjectName": "",
+    "m_SubObjectType": ""
   },
-  "recurrentEffectParticleReference": null,
   "characterShaderReference": {
     "$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
     "m_AssetGUID": "",

diff --git a/...ConditionSkinOfRetributionDamageAcid.json → ...efinition/ConditionSkinOfRetribution.json b/...ConditionSkinOfRetributionDamageAcid.json → ...efinition/ConditionSkinOfRetribution.json
@@ -4,13 +4,13 @@
   "parentCondition": null,
   "conditionType": "Beneficial",
   "features": [
-    "Definition:DamageAffinitySkinOfRetributionDamageAcid:2024e6af-38cb-5384-a889-47bb7f01b40d"
+    "Definition:DamageAffinitySkinOfRetribution:46db0433-e7ae-5219-84df-d4e09bb52b19"
   ],
   "allowMultipleInstances": false,
   "silentWhenAdded": true,
   "silentWhenRemoved": false,
   "silentWhenRefreshed": false,
-  "terminateWhenRemoved": false,
+  "terminateWhenRemoved": true,
   "specialDuration": false,
   "durationType": "Hour",
   "durationParameterDie": "D4",
@@ -26,13 +26,7 @@
   "interruptionSavingThrowAffinity": "None",
   "conditionTags": [],
   "recurrentEffectForms": [],
-  "cancellingConditions": [
-    "Definition:ConditionSkinOfRetributionDamageCold:12a93f66-73ba-57b7-bd96-4ea41680753d",
-    "Definition:ConditionSkinOfRetributionDamageFire:feb0fea6-e97b-57a3-8c09-7693614f9c11",
-    "Definition:ConditionSkinOfRetributionDamageLightning:882338fc-77bf-561e-ad15-63d03a72b289",
-    "Definition:ConditionSkinOfRetributionDamagePoison:ef02048e-ca30-5587-a55e-d1f7bfa32d3e",
-    "Definition:ConditionSkinOfRetributionDamageThunder:75f38f06-77b8-5f1f-9b93-5286f8f63027"
-  ],
+  "cancellingConditions": [],
   "additionalDamageWhenHit": false,
   "additionalDamageTypeDetermination": "Specific",
   "additionalDamageType": "",
@@ -46,21 +40,21 @@
   "additionalConditionTurnOccurenceType": "StartOfTurn",
   "conditionStartParticleReference": {
     "$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
-    "m_AssetGUID": "",
-    "m_SubObjectName": null,
-    "m_SubObjectType": null
+    "m_AssetGUID": "72457772ad415eb4cb12c64cd8c649c4",
+    "m_SubObjectName": "",
+    "m_SubObjectType": ""
   },
   "conditionParticleReference": {
     "$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
-    "m_AssetGUID": "",
-    "m_SubObjectName": null,
-    "m_SubObjectType": null
+    "m_AssetGUID": "336226270d32b514d976b3c213bd1baa",
+    "m_SubObjectName": "",
+    "m_SubObjectType": ""
   },
   "conditionEndParticleReference": {
     "$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
-    "m_AssetGUID": "",
-    "m_SubObjectName": null,
-    "m_SubObjectType": null
+    "m_AssetGUID": "ff72da1aae4219b4c89f7c06d6c7ebe0",
+    "m_SubObjectName": "",
+    "m_SubObjectType": ""
   },
   "recurrentEffectParticleReference": null,
   "characterShaderReference": {
@@ -137,7 +131,7 @@
     "$type": "GuiPresentation, Assembly-CSharp",
     "hidden": false,
     "title": "Condition/&ConditionSkinOfRetributionTitle",
-    "description": "If a creature hits you with a melee attack while you have these temporary hit points, the creature takes 5 Acid Damage per spell level.",
+    "description": "Condition/&ConditionSkinOfRetributionDescription",
     "spriteReference": {
       "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
       "m_AssetGUID": "2190a678-d008-5cd6-90e0-a269c474877f",
@@ -157,7 +151,7 @@
     "usedInValleyDLC": false
   },
   "contentCopyright": "UserContent",
-  "guid": "2e89b309-e5fc-5863-9516-6247c0260e4a",
+  "guid": "756ee728-5506-5f03-b552-b94004839697",
   "contentPack": 9999,
-  "name": "ConditionSkinOfRetributionDamageAcid"
+  "name": "ConditionSkinOfRetribution"
 }
diff --git a/...nfinishedBusinessBlueprints/ConditionDefinition/ConditionSkinOfRetributionDamageCold.json b/...nfinishedBusinessBlueprints/ConditionDefinition/ConditionSkinOfRetributionDamageCold.json