Merge pull request #4353 from SolastaMods/dev

1.5.94.53
SolastaMods · Feb 13, 2024 · 49d7e08 · 49d7e08
2 parents 88465e6 + 38025d0
commit 49d7e08
Show file tree

Hide file tree

Showing 339 changed files with 2,645 additions and 3,790 deletions.
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/Assets.txt b/Diagnostics/UnfinishedBusinessBlueprints/Assets.txt
@@ -607,7 +607,6 @@ ConditionCollegeOfLifeDarkvision	ConditionDefinition	ConditionDefinition	e0d8a98
 ConditionCollegeOfLifeElementalResistance	ConditionDefinition	ConditionDefinition	4710d88e-bee9-5ac9-8290-99dd97796762
 ConditionCollegeOfThespianCombatInspirationCombat	ConditionDefinition	ConditionDefinition	70a1a942-fa69-5449-9f20-8fdfe857701d
 ConditionCollegeOfThespianCombatInspirationMovement	ConditionDefinition	ConditionDefinition	8fb4a5b0-92b5-546f-b7bb-732be8851e14
-ConditionCollegeOfThespianFinale	ConditionDefinition	ConditionDefinition	a85cd6d0-7113-5403-a586-3235983b79f0
 ConditionCollegeOfValianceDishearteningPerformance	ConditionDefinition	ConditionDefinition	8b075dec-4ac0-5331-b23e-df6924fdb447
 ConditionCorruptingBolt	ConditionDefinition	ConditionDefinition	c47e9ae4-841b-53af-b40f-2cb08dfa7d08
 ConditionCrusadersMantle	ConditionDefinition	ConditionDefinition	04a3a8c7-cf68-5a07-a0c1-9aabc911cad9
@@ -836,8 +835,6 @@ ConditionOligathStoneEndurance	ConditionDefinition	ConditionDefinition	641d2146-
 ConditionPathOfTheElementsElementalBlessingBlizzard	ConditionDefinition	ConditionDefinition	279b058a-bb5d-534c-8f32-c8bb77237b9c
 ConditionPathOfTheElementsElementalBlessingStorm	ConditionDefinition	ConditionDefinition	0e8bffeb-0ca0-5960-b22d-5e3e6baa3e98
 ConditionPathOfTheElementsElementalBlessingWildfire	ConditionDefinition	ConditionDefinition	e3ac5003-7fb3-5f2c-a82d-d37b3fce8cdc
-ConditionPathOfTheElementsElementalBurstStorm	ConditionDefinition	ConditionDefinition	a4c2f1d5-96c2-58c7-b1c5-a0e5b6e33ea7
-ConditionPathOfTheElementsElementalBurstWildfire	ConditionDefinition	ConditionDefinition	f37a5a33-6918-569c-b800-7d0f2eec8695
 ConditionPathOfTheElementsElementalConduitStorm	ConditionDefinition	ConditionDefinition	6bfb1ce1-d289-5d7b-acc5-ddac3132b9ce
 ConditionPathOfTheLightEyesOfTruth	ConditionDefinition	ConditionDefinition	e1651ba5-918b-56dd-987d-0996689dd75e
 ConditionPathOfTheLightIlluminated	ConditionDefinition	ConditionDefinition	d7cf64bc-7d7a-56b2-8e06-c2b0abd66212
@@ -870,13 +867,13 @@ ConditionRangerSurvivalistDisablingStrike	ConditionDefinition	ConditionDefinitio
 ConditionRangerSurvivalistImprovedDisablingStrike	ConditionDefinition	ConditionDefinition	4a9a8a8d-8407-543f-90c6-87918885957c
 ConditionRavenScionHeartSeekingShot	ConditionDefinition	ConditionDefinition	1d011c4b-04e8-5aad-a4ed-f5feece0b10b
 ConditionRavenScionKillingSpree	ConditionDefinition	ConditionDefinition	366b5d16-020b-5f61-bb27-3b3177551bd1
+ConditionReduceSneakDice	ConditionDefinition	ConditionDefinition	a6e2eedf-e951-5faa-b743-061d407f4f7f
 ConditionResonatingStrike	ConditionDefinition	ConditionDefinition	fee957a4-e400-5b35-980f-a481680512f7
 ConditionReverseGravity	ConditionDefinition	ConditionDefinition	185248e1-0e90-560e-978c-86218a4747d9
 ConditionRiftWalkerRiftCloak	ConditionDefinition	ConditionDefinition	28dfbdc5-0ecd-5825-a646-e914d5171c19
 ConditionRingOfBlades	ConditionDefinition	ConditionDefinition	c4c6f9f8-2c03-5e6e-bdb5-52d52baf419f
 ConditionRingOfBladesFree	ConditionDefinition	ConditionDefinition	b0d325aa-c59e-52e0-b2a5-a84e2ffba552
 ConditionRogueCunningStrikeDisarmed	ConditionDefinition	ConditionDefinition	32d64aeb-f1bc-5f8a-ae40-220d75787d15
-ConditionRogueCunningStrikeReduceSneakDice	ConditionDefinition	ConditionDefinition	5eb7328f-dbce-54ef-aca6-e7488ebeedeb
 ConditionRogueCunningStrikeWithdraw	ConditionDefinition	ConditionDefinition	35bd50aa-a3e7-53ad-bb8f-b106a8f574e5
 ConditionRogueDeviousStrikeDazed	ConditionDefinition	ConditionDefinition	60a24872-505a-51a8-b742-aaf7bd616e66
 ConditionRogueDeviousStrikeDazedOnlyMovement	ConditionDefinition	ConditionDefinition	c9e7bdb1-4db9-5ea2-a682-b3be1e2e4c20
@@ -946,8 +943,8 @@ ConditionVileBrew	ConditionDefinition	ConditionDefinition	7c519d9b-1391-5b0e-b4e
 ConditionVoidGrasp	ConditionDefinition	ConditionDefinition	3a29e018-ae36-546b-95a1-112dcd7a8e7a
 ConditionWarDance	ConditionDefinition	ConditionDefinition	60cb6a58-0596-5844-b181-763b1badb445
 ConditionWarDanceExtraAttack	ConditionDefinition	ConditionDefinition	8c20ffc8-55d6-5052-8919-5aa4c5cd6d0c
+ConditionWarDanceMissedAttack	ConditionDefinition	ConditionDefinition	4d382a47-8037-5313-98d9-c5843ecaf9d2
 ConditionWarDanceMomentum	ConditionDefinition	ConditionDefinition	a1d37a0c-3de2-55e4-9310-dd503c1fb2ba
-ConditionWarDanceMomentumAlreadyApplied	ConditionDefinition	ConditionDefinition	53250620-9719-5dc3-9d60-ee0301e692b1
 ConditionWayOfSilhouetteSilhouetteStep	ConditionDefinition	ConditionDefinition	73265e33-155e-5cdf-aa1f-de2af87b82c0
 ConditionWayOfTheDiscordanceChaosChanneling	ConditionDefinition	ConditionDefinition	202019ed-2bc8-57b8-8f96-e92690f432a3
 ConditionWayOfTheDiscordanceDiscordance	ConditionDefinition	ConditionDefinition	62aab372-3ef3-5daa-931f-26c30b0aea91
@@ -1429,8 +1426,6 @@ AdditionalDamageRoguishArcaneScoundrelPossessed	FeatureDefinitionPower	FeatureDe
 AdditionalDamageRoguishBladeCallerBladeMark	FeatureDefinitionAdditionalDamage	FeatureDefinition	4f283071-43e2-5a6f-ade6-3d2f93e537dd
 AdditionalDamageRoguishDuelistDaringDuel	FeatureDefinitionAdditionalDamage	FeatureDefinition	b7621714-47e0-5efb-8d97-2e8b617cf1ad
 AdditionalDamageRoguishHoodlumBrutalAssault	FeatureDefinitionAdditionalDamage	FeatureDefinition	e73f4ec3-c93b-5d0d-9151-54006bb709e1
-AdditionalDamageRoguishSlayerChainOfExecution	FeatureDefinitionAdditionalDamage	FeatureDefinition	334cc375-7bdd-570d-a559-f9f7cdd62fb6
-AdditionalDamageRoguishSlayerChainOfExecutionSneakAttack	FeatureDefinitionAdditionalDamage	FeatureDefinition	b6bf6e3f-16bd-55c2-99f0-5623c214f742
 AdditionalDamageRoguishUmbralStalkerDeadlyShadows	FeatureDefinitionAdditionalDamage	FeatureDefinition	33ee65a7-f403-52b0-a681-593305cd3418
 AdditionalDamageRoguishUmbralStalkerGloomBlade	FeatureDefinitionAdditionalDamage	FeatureDefinition	29826fb3-e2c3-50df-b143-5165106ea6f2
 AdditionalDamageSearingSmite	FeatureDefinitionAdditionalDamage	FeatureDefinition	fdd3a816-0704-5d48-a633-402353b23d17
@@ -1898,7 +1893,6 @@ FeatureCelestialRadiantSoul	FeatureDefinition	FeatureDefinition	25abe76c-934b-50
 FeatureCircleOfTheCosmosNovaStar	FeatureDefinitionFeatureSet	FeatureDefinition	1fa028a2-7e42-5138-a524-885b1eabc967
 FeatureCircleOfTheLifeRevitalizingBoon	FeatureDefinition	FeatureDefinition	36cafccc-8902-5d01-9ca2-cd8c6ddccc9a
 FeatureCircleOfTheLifeVerdancy	FeatureDefinition	FeatureDefinition	0b1ba759-565f-5cf6-9bbc-e144b4566b90
-FeatureCloseQuarters	FeatureDefinition	FeatureDefinition	597d8262-667f-58d3-a9c8-b03cfcc74631
 FeatureCollegeOfValianceCaptivatingPresence	FeatureDefinition	FeatureDefinition	7a0346fa-529d-5770-81fe-ac044d310f4e
 FeatureCollegeOfValianceSteadfastInspiration	FeatureDefinition	FeatureDefinition	6bfab326-6ffd-5f6a-8715-57cfbf834405
 FeatureCollegeOfWarDancerFocusedWarDance	FeatureDefinition	FeatureDefinition	8511f8ff-5ea0-579e-a597-408185c840c7
@@ -2069,6 +2063,7 @@ FeatureSetCircleOfTheNightMonstrousForms	FeatureDefinitionFeatureSet	FeatureDefi
 FeatureSetCollegeOfAudacityAudaciousWhirl	FeatureDefinitionFeatureSet	FeatureDefinition	5fadeec3-0f9b-56d8-9bae-042897333f9a
 FeatureSetCollegeOfAudacityBonusProficiencies	FeatureDefinitionFeatureSet	FeatureDefinition	3d2c4b32-659d-5a5a-b4e4-d41030245b3b
 FeatureSetCollegeOfAudacityMasterfulWhirl	FeatureDefinitionFeatureSet	FeatureDefinition	014fff71-308f-53ef-8df8-8f9eb5d6b1db
+FeatureSetCollegeOfLifeTransmuteForce	FeatureDefinitionFeatureSet	FeatureDefinition	6f2db17c-dffb-5605-bdd6-bf551fec713a
 FeatureSetCrystalWyrmkinAbilityScoreIncrease	FeatureDefinitionFeatureSet	FeatureDefinition	c0bc389d-8efb-5837-9533-70ab939b2f4a
 FeatureSetDeadMasterNecromancyBonusDC	FeatureDefinitionFeatureSet	FeatureDefinition	a894786a-6e0e-526e-b81d-26ce6c969939
 FeatureSetDivineHeartDeityChoice	FeatureDefinitionFeatureSet	FeatureDefinition	50c4bac9-edbc-5b51-96f3-5fd8a1d106dd
@@ -2165,6 +2160,7 @@ FeatureSetRoguishBladeCallerHailOfBlades	FeatureDefinitionFeatureSet	FeatureDefi
 FeatureSetRoguishDuelistMasterDuelist	FeatureDefinitionFeatureSet	FeatureDefinition	5d99dc80-7367-54d7-91b3-d16b353fa581
 FeatureSetRoguishDuelistSureFooted	FeatureDefinitionFeatureSet	FeatureDefinition	9f77aa71-a7ae-575d-a501-dc3886422c51
 FeatureSetRoguishUmbralStalkerDeadlyShadows	FeatureDefinitionFeatureSet	FeatureDefinition	393bd2de-4f19-50ef-91a4-d898bf5af2f1
+FeatureSetRoguishUmbralStalkerShadowStride	FeatureDefinitionFeatureSet	FeatureDefinition	b5076915-83a7-5c07-9ff3-fcc34132c3c0
 FeatureSetRoguishUmbralStalkerUmbralSoul	FeatureDefinitionFeatureSet	FeatureDefinition	40694e69-a80f-5f66-91c1-f8419de3d63e
 FeatureSetRoyalKnightInspiringProtection	FeatureDefinitionFeatureSet	FeatureDefinition	5c6ff3f8-1564-560a-865c-67d0ee72d763
 FeatureSetRoyalKnightRoyalEnvoy	FeatureDefinitionFeatureSet	FeatureDefinition	bad48f2a-730c-5cc9-a86c-45f1ab5f3348
@@ -3056,6 +3052,7 @@ PowerRoguishShadowcasterShadowForm	FeatureDefinitionPower	FeatureDefinition	ae88
 PowerRoguishSlayerCloakOfShadows	FeatureDefinitionPower	FeatureDefinition	d6cf376e-3767-5b29-a15b-21af771767ac
 PowerRoguishUmbralStalkerShadowDance	FeatureDefinitionPower	FeatureDefinition	ba4f4ef9-bf45-5e98-a580-1efbdd21e98b
 PowerRoguishUmbralStalkerShadowStride	FeatureDefinitionPower	FeatureDefinition	9be72d78-639b-519d-8317-366a8ea4c552
+PowerRoguishUmbralStalkerShadowStrideAtWill	FeatureDefinitionPower	FeatureDefinition	21b2d192-191d-531d-bae2-16b81eed8d84
 PowerRoguishUmbralStalkerUmbralSoul	FeatureDefinitionPower	FeatureDefinition	bb72200c-a138-561e-baef-d2fb88f32126
 PowerRoyalKnightInspiringProtection	FeatureDefinitionPower	FeatureDefinition	544bbcf5-09e1-5d48-8b06-fd5dedb733f2
 PowerRoyalKnightInspiringProtectionAura	FeatureDefinitionPower	FeatureDefinition	28eb87d3-13f5-5ee2-9d4d-d383f8558907
@@ -3548,8 +3545,6 @@ AdditionalDamageRoguishArcaneScoundrelDistractingAmbush	FeatureDefinitionAdditio
 AdditionalDamageRoguishBladeCallerBladeMark	FeatureDefinitionAdditionalDamage	FeatureDefinitionAdditionalDamage	4f283071-43e2-5a6f-ade6-3d2f93e537dd
 AdditionalDamageRoguishDuelistDaringDuel	FeatureDefinitionAdditionalDamage	FeatureDefinitionAdditionalDamage	b7621714-47e0-5efb-8d97-2e8b617cf1ad
 AdditionalDamageRoguishHoodlumBrutalAssault	FeatureDefinitionAdditionalDamage	FeatureDefinitionAdditionalDamage	e73f4ec3-c93b-5d0d-9151-54006bb709e1
-AdditionalDamageRoguishSlayerChainOfExecution	FeatureDefinitionAdditionalDamage	FeatureDefinitionAdditionalDamage	334cc375-7bdd-570d-a559-f9f7cdd62fb6
-AdditionalDamageRoguishSlayerChainOfExecutionSneakAttack	FeatureDefinitionAdditionalDamage	FeatureDefinitionAdditionalDamage	b6bf6e3f-16bd-55c2-99f0-5623c214f742
 AdditionalDamageRoguishUmbralStalkerDeadlyShadows	FeatureDefinitionAdditionalDamage	FeatureDefinitionAdditionalDamage	33ee65a7-f403-52b0-a681-593305cd3418
 AdditionalDamageRoguishUmbralStalkerGloomBlade	FeatureDefinitionAdditionalDamage	FeatureDefinitionAdditionalDamage	29826fb3-e2c3-50df-b143-5165106ea6f2
 AdditionalDamageSearingSmite	FeatureDefinitionAdditionalDamage	FeatureDefinitionAdditionalDamage	fdd3a816-0704-5d48-a633-402353b23d17
@@ -4404,6 +4399,7 @@ FeatureSetCircleOfTheNightMonstrousForms	FeatureDefinitionFeatureSet	FeatureDefi
 FeatureSetCollegeOfAudacityAudaciousWhirl	FeatureDefinitionFeatureSet	FeatureDefinitionFeatureSet	5fadeec3-0f9b-56d8-9bae-042897333f9a
 FeatureSetCollegeOfAudacityBonusProficiencies	FeatureDefinitionFeatureSet	FeatureDefinitionFeatureSet	3d2c4b32-659d-5a5a-b4e4-d41030245b3b
 FeatureSetCollegeOfAudacityMasterfulWhirl	FeatureDefinitionFeatureSet	FeatureDefinitionFeatureSet	014fff71-308f-53ef-8df8-8f9eb5d6b1db
+FeatureSetCollegeOfLifeTransmuteForce	FeatureDefinitionFeatureSet	FeatureDefinitionFeatureSet	6f2db17c-dffb-5605-bdd6-bf551fec713a
 FeatureSetCrystalWyrmkinAbilityScoreIncrease	FeatureDefinitionFeatureSet	FeatureDefinitionFeatureSet	c0bc389d-8efb-5837-9533-70ab939b2f4a
 FeatureSetDeadMasterNecromancyBonusDC	FeatureDefinitionFeatureSet	FeatureDefinitionFeatureSet	a894786a-6e0e-526e-b81d-26ce6c969939
 FeatureSetDivineHeartDeityChoice	FeatureDefinitionFeatureSet	FeatureDefinitionFeatureSet	50c4bac9-edbc-5b51-96f3-5fd8a1d106dd
@@ -4500,6 +4496,7 @@ FeatureSetRoguishBladeCallerHailOfBlades	FeatureDefinitionFeatureSet	FeatureDefi
 FeatureSetRoguishDuelistMasterDuelist	FeatureDefinitionFeatureSet	FeatureDefinitionFeatureSet	5d99dc80-7367-54d7-91b3-d16b353fa581
 FeatureSetRoguishDuelistSureFooted	FeatureDefinitionFeatureSet	FeatureDefinitionFeatureSet	9f77aa71-a7ae-575d-a501-dc3886422c51
 FeatureSetRoguishUmbralStalkerDeadlyShadows	FeatureDefinitionFeatureSet	FeatureDefinitionFeatureSet	393bd2de-4f19-50ef-91a4-d898bf5af2f1
+FeatureSetRoguishUmbralStalkerShadowStride	FeatureDefinitionFeatureSet	FeatureDefinitionFeatureSet	b5076915-83a7-5c07-9ff3-fcc34132c3c0
 FeatureSetRoguishUmbralStalkerUmbralSoul	FeatureDefinitionFeatureSet	FeatureDefinitionFeatureSet	40694e69-a80f-5f66-91c1-f8419de3d63e
 FeatureSetRoyalKnightInspiringProtection	FeatureDefinitionFeatureSet	FeatureDefinitionFeatureSet	5c6ff3f8-1564-560a-865c-67d0ee72d763
 FeatureSetRoyalKnightRoyalEnvoy	FeatureDefinitionFeatureSet	FeatureDefinitionFeatureSet	bad48f2a-730c-5cc9-a86c-45f1ab5f3348
@@ -5317,6 +5314,7 @@ PowerRoguishShadowcasterShadowForm	FeatureDefinitionPower	FeatureDefinitionPower
 PowerRoguishSlayerCloakOfShadows	FeatureDefinitionPower	FeatureDefinitionPower	d6cf376e-3767-5b29-a15b-21af771767ac
 PowerRoguishUmbralStalkerShadowDance	FeatureDefinitionPower	FeatureDefinitionPower	ba4f4ef9-bf45-5e98-a580-1efbdd21e98b
 PowerRoguishUmbralStalkerShadowStride	FeatureDefinitionPower	FeatureDefinitionPower	9be72d78-639b-519d-8317-366a8ea4c552
+PowerRoguishUmbralStalkerShadowStrideAtWill	FeatureDefinitionPower	FeatureDefinitionPower	21b2d192-191d-531d-bae2-16b81eed8d84
 PowerRoguishUmbralStalkerUmbralSoul	FeatureDefinitionPower	FeatureDefinitionPower	bb72200c-a138-561e-baef-d2fb88f32126
 PowerRoyalKnightInspiringProtection	FeatureDefinitionPower	FeatureDefinitionPower	544bbcf5-09e1-5d48-8b06-fd5dedb733f2
 PowerRoyalKnightInspiringProtectionAura	FeatureDefinitionPower	FeatureDefinitionPower	28eb87d3-13f5-5ee2-9d4d-d383f8558907

diff --git a/Diagnostics/UnfinishedBusinessBlueprints/CharacterSubclassDefinition/CollegeOfLife.json b/Diagnostics/UnfinishedBusinessBlueprints/CharacterSubclassDefinition/CollegeOfLife.json
@@ -13,7 +13,7 @@
     },
     {
       "$type": "FeatureUnlockByLevel, Assembly-CSharp",
-      "featureDefinition": "Definition:PowerSharedPoolCollegeOfLifeHealingPool:e197ef97-b732-5855-9dc2-a455625e4ef6",
+      "featureDefinition": "Definition:FeatureSetCollegeOfLifeTransmuteForce:6f2db17c-dffb-5605-bdd6-bf551fec713a",
       "level": 6
     },
     {

diff --git a/...tics/UnfinishedBusinessBlueprints/CharacterSubclassDefinition/RoguishArcaneScoundrel.json b/...tics/UnfinishedBusinessBlueprints/CharacterSubclassDefinition/RoguishArcaneScoundrel.json
@@ -51,7 +51,7 @@
     "description": "Subclass/&RoguishArcaneScoundrelDescription",
     "spriteReference": {
       "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "3e73a2c2-af6c-59c1-8e47-77947b9d900a",
+      "m_AssetGUID": "4a718f50-fef8-5141-bd02-1f8017fdaa5a",
       "m_SubObjectName": null,
       "m_SubObjectType": null
     },

diff --git a/...ostics/UnfinishedBusinessBlueprints/CharacterSubclassDefinition/RoguishUmbralStalker.json b/...ostics/UnfinishedBusinessBlueprints/CharacterSubclassDefinition/RoguishUmbralStalker.json
@@ -13,7 +13,7 @@
     },
     {
       "$type": "FeatureUnlockByLevel, Assembly-CSharp",
-      "featureDefinition": "Definition:PowerRoguishUmbralStalkerShadowStride:9be72d78-639b-519d-8317-366a8ea4c552",
+      "featureDefinition": "Definition:FeatureSetRoguishUmbralStalkerShadowStride:b5076915-83a7-5c07-9ff3-fcc34132c3c0",
       "level": 9
     },
     {

diff --git a/...nostics/UnfinishedBusinessBlueprints/CharacterSubclassDefinition/SorcerousSpellBlade.json b/...nostics/UnfinishedBusinessBlueprints/CharacterSubclassDefinition/SorcerousSpellBlade.json
@@ -51,7 +51,7 @@
     "description": "Subclass/&SorcerousSpellBladeDescription",
     "spriteReference": {
       "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "ec996dbe-f9aa-56e8-b579-5d085bd8b70e",
+      "m_AssetGUID": "0feeee0a-724f-50de-adc0-530fa8335eb1",
       "m_SubObjectName": null,
       "m_SubObjectType": null
     },

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

diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionAlwaysReady.json b/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionAlwaysReady.json
@@ -9,12 +9,12 @@
   "silentWhenRemoved": true,
   "silentWhenRefreshed": false,
   "terminateWhenRemoved": false,
-  "specialDuration": true,
-  "durationType": "Round",
+  "specialDuration": false,
+  "durationType": "Hour",
   "durationParameterDie": "D4",
-  "durationParameter": 0,
+  "durationParameter": 1,
   "forceTurnOccurence": false,
-  "turnOccurence": "StartOfTurn",
+  "turnOccurence": "EndOfTurn",
   "specialInterruptions": [],
   "interruptionRequiresSavingThrow": false,
   "interruptionSavingThrowComputationMethod": "SaveOverride",

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

diff --git a/...nostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionBoomingBladeMarked.json b/...nostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionBoomingBladeMarked.json
@@ -9,15 +9,14 @@
   "silentWhenRemoved": true,
   "silentWhenRefreshed": false,
   "terminateWhenRemoved": false,
-  "specialDuration": true,
-  "durationType": "Round",
-  "durationParameterDie": "D1",
+  "specialDuration": false,
+  "durationType": "Hour",
+  "durationParameterDie": "D4",
   "durationParameter": 1,
   "forceTurnOccurence": false,
   "turnOccurence": "EndOfTurn",
   "specialInterruptions": [
-    9000,
-    "AnyBattleTurnEnd"
+    9000
   ],
   "interruptionRequiresSavingThrow": false,
   "interruptionSavingThrowComputationMethod": "SaveOverride",

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

diff --git a/...ics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionCasterFightingWarMagic.json b/...ics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionCasterFightingWarMagic.json
@@ -11,15 +11,13 @@
   "silentWhenRemoved": true,
   "silentWhenRefreshed": false,
   "terminateWhenRemoved": false,
-  "specialDuration": true,
-  "durationType": "Round",
+  "specialDuration": false,
+  "durationType": "Hour",
   "durationParameterDie": "D4",
-  "durationParameter": 0,
+  "durationParameter": 1,
   "forceTurnOccurence": false,
-  "turnOccurence": "StartOfTurn",
-  "specialInterruptions": [
-    "AnyBattleTurnEnd"
-  ],
+  "turnOccurence": "EndOfTurn",
+  "specialInterruptions": [],
   "interruptionRequiresSavingThrow": false,
   "interruptionSavingThrowComputationMethod": "SaveOverride",
   "interruptionSavingThrowAbility": "",

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

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

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