Merge pull request #5042 from SolastaMods/dev

1.5.97.38
SolastaMods · Nov 8, 2024 · 4933d7f · 4933d7f
2 parents 19c786b + 0035a61
commit 4933d7f
Show file tree

Hide file tree

Showing 76 changed files with 448 additions and 771 deletions.
diff --git a/Diagnostics/CE-Definitions-GuiPresentation-InvalidSyntaxTranslation-en.txt b/Diagnostics/CE-Definitions-GuiPresentation-InvalidSyntaxTranslation-en.txt
@@ -1320,8 +1320,6 @@ PowerCreateSpellStoringWandOfShatter	Title='Shatter'.
 PowerCreateSpellStoringWandOfShatter	Description='Create a wand that can cast <b>Shatter (II)</b> spell using your Artificer spell attack modifier and save DC.'.
 PowerCreateSpellStoringWandOfSilence	Title='Silence'.
 PowerCreateSpellStoringWandOfSilence	Description='Create a wand that can cast <b>Silence (II)</b> spell using your Artificer spell attack modifier and save DC.'.
-PowerCreateSpellStoringWandOfSkinOfRetribution	Title='Armor of Agathys'.
-PowerCreateSpellStoringWandOfSkinOfRetribution	Description='Create a wand that can cast <b>Armor of Agathys (I)</b> spell using your Artificer spell attack modifier and save DC.'.
 PowerCreateSpellStoringWandOfSleep	Title='Sleep'.
 PowerCreateSpellStoringWandOfSleep	Description='Create a wand that can cast <b>Sleep (I)</b> spell using your Artificer spell attack modifier and save DC.'.
 PowerCreateSpellStoringWandOfSnillocSnowballStorm	Title='Snilloc's Snowball Storm'.
@@ -1858,8 +1856,6 @@ SpellStoringWandOfShatter	Title='Wand of Shatter'.
 SpellStoringWandOfShatter	Description='This wand allows casting the <b>Shatter</b> spell using spell casting stats of the Artificer who created it.'.
 SpellStoringWandOfSilence	Title='Wand of Silence'.
 SpellStoringWandOfSilence	Description='This wand allows casting the <b>Silence</b> spell using spell casting stats of the Artificer who created it.'.
-SpellStoringWandOfSkinOfRetribution	Title='Wand of Armor of Agathys'.
-SpellStoringWandOfSkinOfRetribution	Description='This wand allows casting the <b>Armor of Agathys</b> spell using spell casting stats of the Artificer who created it.'.
 SpellStoringWandOfSleep	Title='Wand of Sleep'.
 SpellStoringWandOfSleep	Description='This wand allows casting the <b>Sleep</b> spell using spell casting stats of the Artificer who created it.'.
 SpellStoringWandOfSnillocSnowballStorm	Title='Wand of Snilloc's Snowball Storm'.

diff --git a/Diagnostics/UnfinishedBusinessBlueprints/Assets.txt b/Diagnostics/UnfinishedBusinessBlueprints/Assets.txt
@@ -623,6 +623,7 @@ ConditionBanishedByBanishment	ConditionDefinition	ConditionDefinition	2e051532-e
 ConditionBanishingSmite	ConditionDefinition	ConditionDefinition	3f66db2a-5299-5c1b-98ab-f20063aa6a5f
 ConditionBanishingSmiteEnemy	ConditionDefinition	ConditionDefinition	ba2fe0a0-1836-5755-af0e-876571bae0d2
 ConditionBarbarianBrutalStrike	ConditionDefinition	ConditionDefinition	ebd01842-4fee-537d-a82c-a5a387636dda
+ConditionBardCounterCharmSavingThrowAdvantage	ConditionDefinition	ConditionDefinition	946d4b95-7615-5185-ae84-3719caa96758
 ConditionBeastForestGuardian	ConditionDefinition	ConditionDefinition	342db1f5-e7ee-5e8f-9494-fd89a553b595
 ConditionBladeDancerBladeDance	ConditionDefinition	ConditionDefinition	3034268e-3881-5845-ac11-11481d2d4155
 ConditionBladeDancerDanceOfDefense	ConditionDefinition	ConditionDefinition	43e4f784-80ef-51cf-b304-a42848b862a9
@@ -1159,7 +1160,6 @@ ConditionRoyalKnightInspiringSurge	ConditionDefinition	ConditionDefinition	e0818
 ConditionRoyalKnightSpiritedSurge	ConditionDefinition	ConditionDefinition	1385a45e-ff65-5ede-819f-4f212183fee5
 ConditionSanctuary	ConditionDefinition	ConditionDefinition	a81385c4-353b-5e6d-b3d8-c69f99443eb0
 ConditionSanctuaryReduceDamage	ConditionDefinition	ConditionDefinition	d015058d-9975-55d5-8be9-29126572624c
-ConditionSavingThrowAdvantage	ConditionDefinition	ConditionDefinition	7265d2c9-c101-53f9-8270-e3bc2ed7cfa8
 ConditionScornfulPrayer	ConditionDefinition	ConditionDefinition	c537a98e-c3e4-55a6-a0d6-b3e325492624
 ConditionSearingSmite	ConditionDefinition	ConditionDefinition	dc927e03-08a7-5033-98d8-3adee1d952fd
 ConditionSenseNormalVision24	ConditionDefinition	ConditionDefinition	1845364e-e920-535d-8dc8-c3513a2c151c
@@ -3283,7 +3283,6 @@ PowerCreateSpellStoringWandOfScorchingRay	FeatureDefinitionPowerSharedPool	Featu
 PowerCreateSpellStoringWandOfSeeInvisibility	FeatureDefinitionPowerSharedPool	FeatureDefinition	0b10a2ef-8771-52d2-b22b-a0b1e942951e
 PowerCreateSpellStoringWandOfShatter	FeatureDefinitionPowerSharedPool	FeatureDefinition	0da5acd1-05ab-5540-aa47-2f82e1b2acf3
 PowerCreateSpellStoringWandOfSilence	FeatureDefinitionPowerSharedPool	FeatureDefinition	1b016d29-0a5f-536e-87a0-4b7d1719297e
-PowerCreateSpellStoringWandOfSkinOfRetribution	FeatureDefinitionPowerSharedPool	FeatureDefinition	498759fd-741c-5fe5-a10a-9e92d189eadd
 PowerCreateSpellStoringWandOfSleep	FeatureDefinitionPowerSharedPool	FeatureDefinition	484f0297-e690-5c5e-827b-3d499f24da14
 PowerCreateSpellStoringWandOfSnillocSnowballStorm	FeatureDefinitionPowerSharedPool	FeatureDefinition	9e5012d6-2a1d-5a29-8084-687f27a80665
 PowerCreateSpellStoringWandOfSpellWeb	FeatureDefinitionPowerSharedPool	FeatureDefinition	becda24c-d440-5d09-9fe7-36867685f745
@@ -4267,6 +4266,7 @@ ReduceDamageSanctuary	FeatureDefinitionReduceDamage	FeatureDefinition	d1f0fb0e-b
 RegenerationSorcerousSorrAkkathDarknessAffinity	FeatureDefinitionRegeneration	FeatureDefinition	47388b81-48f0-5f5d-8f48-4f1683d25b8a
 ReplaceAttackWithCantripCasterFighting	FeatureDefinition	FeatureDefinition	9f727855-aa19-56a0-a6e6-6b2d42facae0
 SavingThrowAffinityAbiDalzimHorridWilting	FeatureDefinitionSavingThrowAffinity	FeatureDefinition	f611313d-4d27-513e-b475-bb454bad049d
+SavingThrowAffinityBardCounterCharmAdvantage	FeatureDefinitionSavingThrowAffinity	FeatureDefinition	d28e2736-5e76-5e38-83fa-3e6ebd37c69c
 SavingThrowAffinityCircleOfMagicalNegation	FeatureDefinitionSavingThrowAffinity	FeatureDefinition	087ffc2f-219d-56db-b77a-9b6f9a63b282
 SavingThrowAffinityDruidWildshape	FeatureDefinitionSavingThrowAffinity	FeatureDefinition	8a2527d3-8766-572c-9350-ea4d3374d4db
 SavingThrowAffinityGrayDwarfIllusion	FeatureDefinitionSavingThrowAffinity	FeatureDefinition	a792f4fd-c7aa-5803-9fae-6fda9fbe175b
@@ -5002,6 +5002,7 @@ PowerCasterFightingWarMagicAttack	FeatureDefinitionAttackModifier	FeatureDefinit
 PowerCircleOfTheNightPrimalStrike	FeatureDefinitionAttackModifier	FeatureDefinitionAffinity	174e3a39-0e45-5857-ba71-a4a0ba2ffcc9
 RegenerationSorcerousSorrAkkathDarknessAffinity	FeatureDefinitionRegeneration	FeatureDefinitionAffinity	47388b81-48f0-5f5d-8f48-4f1683d25b8a
 SavingThrowAffinityAbiDalzimHorridWilting	FeatureDefinitionSavingThrowAffinity	FeatureDefinitionAffinity	f611313d-4d27-513e-b475-bb454bad049d
+SavingThrowAffinityBardCounterCharmAdvantage	FeatureDefinitionSavingThrowAffinity	FeatureDefinitionAffinity	d28e2736-5e76-5e38-83fa-3e6ebd37c69c
 SavingThrowAffinityCircleOfMagicalNegation	FeatureDefinitionSavingThrowAffinity	FeatureDefinitionAffinity	087ffc2f-219d-56db-b77a-9b6f9a63b282
 SavingThrowAffinityDruidWildshape	FeatureDefinitionSavingThrowAffinity	FeatureDefinitionAffinity	8a2527d3-8766-572c-9350-ea4d3374d4db
 SavingThrowAffinityGrayDwarfIllusion	FeatureDefinitionSavingThrowAffinity	FeatureDefinitionAffinity	a792f4fd-c7aa-5803-9fae-6fda9fbe175b
@@ -6171,7 +6172,6 @@ PowerCreateSpellStoringWandOfScorchingRay	FeatureDefinitionPowerSharedPool	Featu
 PowerCreateSpellStoringWandOfSeeInvisibility	FeatureDefinitionPowerSharedPool	FeatureDefinitionPower	0b10a2ef-8771-52d2-b22b-a0b1e942951e
 PowerCreateSpellStoringWandOfShatter	FeatureDefinitionPowerSharedPool	FeatureDefinitionPower	0da5acd1-05ab-5540-aa47-2f82e1b2acf3
 PowerCreateSpellStoringWandOfSilence	FeatureDefinitionPowerSharedPool	FeatureDefinitionPower	1b016d29-0a5f-536e-87a0-4b7d1719297e
-PowerCreateSpellStoringWandOfSkinOfRetribution	FeatureDefinitionPowerSharedPool	FeatureDefinitionPower	498759fd-741c-5fe5-a10a-9e92d189eadd
 PowerCreateSpellStoringWandOfSleep	FeatureDefinitionPowerSharedPool	FeatureDefinitionPower	484f0297-e690-5c5e-827b-3d499f24da14
 PowerCreateSpellStoringWandOfSnillocSnowballStorm	FeatureDefinitionPowerSharedPool	FeatureDefinitionPower	9e5012d6-2a1d-5a29-8084-687f27a80665
 PowerCreateSpellStoringWandOfSpellWeb	FeatureDefinitionPowerSharedPool	FeatureDefinitionPower	becda24c-d440-5d09-9fe7-36867685f745
@@ -7137,6 +7137,7 @@ ProficiencyWildlingNaturalInstincts	FeatureDefinitionProficiency	FeatureDefiniti
 RegenerationSorcerousSorrAkkathDarknessAffinity	FeatureDefinitionRegeneration	FeatureDefinitionRegeneration	47388b81-48f0-5f5d-8f48-4f1683d25b8a
 AbilityCheckAffinityBladeDancerBladeDanceConstitution	FeatureDefinitionSavingThrowAffinity	FeatureDefinitionSavingThrowAffinity	0a2b2db5-be50-5edf-8136-c541bfe1ba3c
 SavingThrowAffinityAbiDalzimHorridWilting	FeatureDefinitionSavingThrowAffinity	FeatureDefinitionSavingThrowAffinity	f611313d-4d27-513e-b475-bb454bad049d
+SavingThrowAffinityBardCounterCharmAdvantage	FeatureDefinitionSavingThrowAffinity	FeatureDefinitionSavingThrowAffinity	d28e2736-5e76-5e38-83fa-3e6ebd37c69c
 SavingThrowAffinityCircleOfMagicalNegation	FeatureDefinitionSavingThrowAffinity	FeatureDefinitionSavingThrowAffinity	087ffc2f-219d-56db-b77a-9b6f9a63b282
 SavingThrowAffinityDruidWildshape	FeatureDefinitionSavingThrowAffinity	FeatureDefinitionSavingThrowAffinity	8a2527d3-8766-572c-9350-ea4d3374d4db
 SavingThrowAffinityGrayDwarfIllusion	FeatureDefinitionSavingThrowAffinity	FeatureDefinitionSavingThrowAffinity	a792f4fd-c7aa-5803-9fae-6fda9fbe175b
@@ -8591,7 +8592,6 @@ SpellStoringWandOfScorchingRay	ItemDefinition	ItemDefinition	34609b5b-c91a-529d-
 SpellStoringWandOfSeeInvisibility	ItemDefinition	ItemDefinition	43f77018-11a6-5463-8183-cf118ecb8dc1
 SpellStoringWandOfShatter	ItemDefinition	ItemDefinition	0ac4f426-d2cd-5907-a5bc-d329f839917e
 SpellStoringWandOfSilence	ItemDefinition	ItemDefinition	7eab1b7f-6b01-54ad-8505-e825e274dcfc
-SpellStoringWandOfSkinOfRetribution	ItemDefinition	ItemDefinition	a06b72f9-c5ce-5102-b83d-c106fb88ea65
 SpellStoringWandOfSleep	ItemDefinition	ItemDefinition	bedd1891-5eb7-5100-8c38-82ad57191cd6
 SpellStoringWandOfSnillocSnowballStorm	ItemDefinition	ItemDefinition	8a3307c0-1f0a-57de-b7ec-d24113f9d340
 SpellStoringWandOfSpellWeb	ItemDefinition	ItemDefinition	9488f02a-f1a3-5450-a703-ad1a73d00e67
@@ -12148,6 +12148,7 @@ RestActivityShortRestIdentify	RestActivityDefinition	RestActivityDefinition	deb1
 RestActivityShortRestStopInfusions	RestActivityDefinition	RestActivityDefinition	6551ce2e-7787-5d1d-a1f3-1a8deb814ae0
 RestActivitySignatureSpells	RestActivityDefinition	RestActivityDefinition	e9fb14c6-4a84-55d1-ab2f-b71805d7899d
 RestActivitySorcererSorcerousRestoration	RestActivityDefinition	RestActivityDefinition	0969cea1-0f55-5bac-88fe-04c851e37ad9
+RestActivitySorcerousRestoration	RestActivityDefinition	RestActivityDefinition	99f32100-20c2-5478-9c4d-233c1a9e5790
 RestActivitySpellMasterArcaneDepth	RestActivityDefinition	RestActivityDefinition	ada2cb29-cba7-58ef-a322-115d614ee794
 RestActivitySpellMastery	RestActivityDefinition	RestActivityDefinition	ab92f6eb-8a55-581f-8d9b-28470f5e70c1
 Building_Cabin_12C~SnowyForest~MOD	RoomBlueprint	RoomBlueprint	23f87928-fcf3-5327-a893-fdd8a8614051

diff --git a/...nition/ConditionSavingThrowAdvantage.json → ...BardCounterCharmSavingThrowAdvantage.json b/...nition/ConditionSavingThrowAdvantage.json → ...BardCounterCharmSavingThrowAdvantage.json
@@ -4,7 +4,7 @@
   "parentCondition": null,
   "conditionType": "Beneficial",
   "features": [
-    "Definition:SavingThrowAffinityAdvantageToAll:43ef34e25f37fc64bbc7af455a107f8f"
+    "Definition:SavingThrowAffinityBardCounterCharmAdvantage:d28e2736-5e76-5e38-83fa-3e6ebd37c69c"
   ],
   "allowMultipleInstances": false,
   "silentWhenAdded": true,
@@ -131,14 +131,14 @@
   },
   "guiPresentation": {
     "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": true,
-    "title": "Feature/&NoContentTitle",
-    "description": "Feature/&NoContentTitle",
+    "hidden": false,
+    "title": "Feature/&PowerBardCountercharmTitle",
+    "description": "Feature/&PowerBardCountercharmDescription",
     "spriteReference": {
       "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "",
-      "m_SubObjectName": null,
-      "m_SubObjectType": null
+      "m_AssetGUID": "24356fafbbd392a4e80c8b62cfd27f78",
+      "m_SubObjectName": "Countercharm",
+      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
     },
     "color": {
       "$type": "UnityEngine.Color, UnityEngine.CoreModule",
@@ -153,7 +153,7 @@
     "usedInValleyDLC": false
   },
   "contentCopyright": "UserContent",
-  "guid": "7265d2c9-c101-53f9-8270-e3bc2ed7cfa8",
+  "guid": "946d4b95-7615-5185-ae84-3719caa96758",
   "contentPack": 9999,
-  "name": "ConditionSavingThrowAdvantage"
+  "name": "ConditionBardCounterCharmSavingThrowAdvantage"
 }
diff --git a/...finishedBusinessBlueprints/ConditionDefinition/ConditionInnovationVitriolistCorroded.json b/...finishedBusinessBlueprints/ConditionDefinition/ConditionInnovationVitriolistCorroded.json
@@ -11,9 +11,9 @@
   "silentWhenRemoved": false,
   "silentWhenRefreshed": false,
   "terminateWhenRemoved": false,
-  "specialDuration": false,
-  "durationType": "Hour",
-  "durationParameterDie": "D4",
+  "specialDuration": true,
+  "durationType": "Round",
+  "durationParameterDie": "D1",
   "durationParameter": 1,
   "forceTurnOccurence": false,
   "turnOccurence": "EndOfTurn",

diff --git a/...inishedBusinessBlueprints/ConditionDefinition/ConditionInnovationVitriolistMiserable.json b/...inishedBusinessBlueprints/ConditionDefinition/ConditionInnovationVitriolistMiserable.json
@@ -9,9 +9,9 @@
   "silentWhenRemoved": false,
   "silentWhenRefreshed": false,
   "terminateWhenRemoved": false,
-  "specialDuration": false,
-  "durationType": "Hour",
-  "durationParameterDie": "D4",
+  "specialDuration": true,
+  "durationType": "Round",
+  "durationParameterDie": "D1",
   "durationParameter": 1,
   "forceTurnOccurence": false,
   "turnOccurence": "EndOfTurn",

diff --git a/...nfinishedBusinessBlueprints/ConditionDefinition/ConditionMoonlitScionLunarChillEnemy.json b/...nfinishedBusinessBlueprints/ConditionDefinition/ConditionMoonlitScionLunarChillEnemy.json
@@ -9,12 +9,12 @@
   "silentWhenRemoved": false,
   "silentWhenRefreshed": false,
   "terminateWhenRemoved": false,
-  "specialDuration": false,
+  "specialDuration": true,
   "durationType": "Round",
   "durationParameterDie": "D1",
   "durationParameter": 1,
   "forceTurnOccurence": false,
-  "turnOccurence": "EndOfTurn",
+  "turnOccurence": "EndOfSourceTurn",
   "specialInterruptions": [],
   "interruptionRequiresSavingThrow": false,
   "interruptionSavingThrowComputationMethod": "SaveOverride",

diff --git a/...nishedBusinessBlueprints/ConditionDefinition/ConditionMoonlitScionLunarRadianceEnemy.json b/...nishedBusinessBlueprints/ConditionDefinition/ConditionMoonlitScionLunarRadianceEnemy.json
@@ -11,12 +11,12 @@
   "silentWhenRemoved": false,
   "silentWhenRefreshed": false,
   "terminateWhenRemoved": false,
-  "specialDuration": false,
-  "durationType": "Hour",
-  "durationParameterDie": "D4",
+  "specialDuration": true,
+  "durationType": "Round",
+  "durationParameterDie": "D1",
   "durationParameter": 1,
   "forceTurnOccurence": false,
-  "turnOccurence": "EndOfTurn",
+  "turnOccurence": "EndOfSourceTurn",
   "specialInterruptions": [],
   "interruptionRequiresSavingThrow": false,
   "interruptionSavingThrowComputationMethod": "SaveOverride",

diff --git a/...UnfinishedBusinessBlueprints/FeatureDefinitionFeatureSet/FeatureSetInventorInfusions.json b/...UnfinishedBusinessBlueprints/FeatureDefinitionFeatureSet/FeatureSetInventorInfusions.json
@@ -3,7 +3,8 @@
   "featureSet": [
     "Definition:PowerInfusionPool:1c6f875b-98be-502c-91bc-cee37d423e7f",
     "Definition:InvocationPoolInfusionLearn4:3eb04c23-5397-5a01-b78e-579982b25bda",
-    "Definition:PowerUseModifierInventorInfusionPool2:d990e923-ae81-5f22-bf73-fdea8c5655e1"
+    "Definition:PowerUseModifierInventorInfusionPool2:d990e923-ae81-5f22-bf73-fdea8c5655e1",
+    "Definition:PowerAfterRestStopInfusions:59d0ab53-6ea5-557b-bb7d-0b3c7be05c84"
   ],
   "mode": "Union",
   "ancestryDamageTypeMap": [],

diff --git a/...ics/UnfinishedBusinessBlueprints/FeatureDefinitionPower/PowerCircleOfTheCosmosArcher.json b/...ics/UnfinishedBusinessBlueprints/FeatureDefinitionPower/PowerCircleOfTheCosmosArcher.json
@@ -31,9 +31,9 @@
     "targetConditionName": "",
     "targetConditionAsset": null,
     "targetSide": "Enemy",
-    "durationType": "Round",
+    "durationType": "Instantaneous",
     "durationParameter": 1,
-    "endOfEffect": "EndOfSourceTurn",
+    "endOfEffect": "EndOfTurn",
     "hasSavingThrow": false,
     "disableSavingThrowOnAllies": false,
     "savingThrowAbility": "Dexterity",

diff --git a/...finishedBusinessBlueprints/FeatureDefinitionPower/PowerCircleOfTheCosmosArcherNoCost.json b/...finishedBusinessBlueprints/FeatureDefinitionPower/PowerCircleOfTheCosmosArcherNoCost.json
@@ -31,9 +31,9 @@
     "targetConditionName": "",
     "targetConditionAsset": null,
     "targetSide": "Enemy",
-    "durationType": "Round",
+    "durationType": "Instantaneous",
     "durationParameter": 1,
-    "endOfEffect": "EndOfSourceTurn",
+    "endOfEffect": "EndOfTurn",
     "hasSavingThrow": false,
     "disableSavingThrowOnAllies": false,
     "savingThrowAbility": "Dexterity",

diff --git a/...stics/UnfinishedBusinessBlueprints/FeatureDefinitionPower/PowerWarlockMagicalCunning.json b/...stics/UnfinishedBusinessBlueprints/FeatureDefinitionPower/PowerWarlockMagicalCunning.json
@@ -87,7 +87,7 @@
       "$type": "EffectParticleParameters, Assembly-CSharp",
       "casterParticleReference": {
         "$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
-        "m_AssetGUID": "370bd5612dbadd74e83596f0937f0373",
+        "m_AssetGUID": "c026523a36850c64db1eaffac31c3875",
         "m_SubObjectName": "",
         "m_SubObjectType": ""
       },