Skip to content

Commit

Permalink
Merge pull request #4297 from SolastaMods/dev
Browse files Browse the repository at this point in the history 
1.5.94.45
  • Loading branch information
@ThyWoof
ThyWoof authored Jan 25, 2024
2 parents 665945e + f6099b8 commit a5a194d
Show file tree
Hide file tree
Showing 513 changed files with 3,029 additions and 3,124 deletions.
10 changes: 5 additions & 5 deletions Diagnostics/UnfinishedBusinessBlueprints/Assets.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1287,7 +1287,6 @@ ActionAffinityFeatShieldTechniques FeatureDefinitionActionAffinity FeatureDefini
ActionAffinityFightingStylePugilist FeatureDefinitionActionAffinity FeatureDefinition c4df47d8-b2cd-5e92-979e-89d8feaad835
ActionAffinityHailOfBladesToggle FeatureDefinitionActionAffinity FeatureDefinition 869c1170-11cd-5c19-88fe-eba8456f7fda
ActionAffinityHeroicInfusion FeatureDefinitionActionAffinity FeatureDefinition edbfbc22-adb1-5e9f-9267-77d8638c7447
ActionAffinityHonedAnimalAspectsWolf FeatureDefinitionActionAffinity FeatureDefinition 54fc09ad-5aec-5ff9-85fa-b4d2efe83750
ActionAffinityImpForestInnateCunning FeatureDefinitionActionAffinity FeatureDefinition 5692e3e8-fb5c-5eee-8d61-ed7e369f75e7
ActionAffinityImpishWrathToggle FeatureDefinitionActionAffinity FeatureDefinition a830a80e-5bb7-5572-8613-044936d44537
ActionAffinityInnovationAlchemyFastHands FeatureDefinitionActionAffinity FeatureDefinition ce58b680-f8b3-5a2a-b8d2-eb7cb31f4b08
Expand All @@ -1309,6 +1308,7 @@ ActionAffinityNoxiousSpray FeatureDefinitionActionAffinity FeatureDefinition 92f
ActionAffinityPaladinSmiteToggle FeatureDefinitionActionAffinity FeatureDefinition fbf5e9b0-876a-566b-85b0-e3d357c05409
ActionAffinityPathOfTheSavageryPrimalInstinct FeatureDefinitionActionAffinity FeatureDefinition 274eb464-e955-5d12-8589-3c5026eb51ad
ActionAffinityPathOfTheSpiritsCunningAction FeatureDefinitionActionAffinity FeatureDefinition ea43e6ee-4530-5abd-81c4-0b3cb5fc0289
ActionAffinityPathOfTheSpiritsHonedAnimalAspectsWolf FeatureDefinitionActionAffinity FeatureDefinition 2a169d50-29ae-5b9b-8015-e8192eda83d0
ActionAffinityPathOfTheYeomanStaggeringBlow FeatureDefinitionActionAffinity FeatureDefinition 5121306c-f96d-5159-8365-4b256bf27bcb
ActionAffinityPressTheAdvantageToggle FeatureDefinitionActionAffinity FeatureDefinition 54e9367a-c1f0-537c-90c2-fa88d23e7d4d
ActionAffinityPsychicWhipNoBonus FeatureDefinitionActionAffinity FeatureDefinition 52bc1435-b0d7-5869-883b-4afe038cd8e8
Expand Down Expand Up @@ -1769,9 +1769,9 @@ CombatAffinityMartialWarlordCoveringStrikeAlly FeatureDefinitionCombatAffinity F
CombatAffinityMartialWarlordExploitOpening FeatureDefinitionCombatAffinity FeatureDefinition 2f77ff1d-094d-505d-8daf-dc05cdc21c51
CombatAffinityMartialWarlordPredictAttack FeatureDefinitionCombatAffinity FeatureDefinition 19d1302f-0e43-5ea8-b47f-afb6bf59ba51
CombatAffinityOathOfDreadMarkOfTheSubmission FeatureDefinitionCombatAffinity FeatureDefinition 71db9100-67ac-5ca4-beed-0fb877e0796c
CombatAffinityPathOfTheSpiritsHonedAnimalAspectsBear FeatureDefinitionCombatAffinity FeatureDefinition a4b0d96b-c43f-5620-b8d5-e4feca64a910
CombatAffinityPathOfTheSpiritsWolfLeadershipPack FeatureDefinitionCombatAffinity FeatureDefinition 6f352fd3-4444-5b6d-af92-b7778c902dae
CombatAffinityPathOfTheYeomanBulwark FeatureDefinitionCombatAffinity FeatureDefinition c0655645-a5b8-5af1-9fe9-43a1a46990c2
CombatAffinityPowerHonedAnimalAspectsBear FeatureDefinitionCombatAffinity FeatureDefinition c2ff3c50-9d95-5c4b-bfa2-a6b4c7612a0e
CombatAffinityRangerSkyWarriorGiftOfTheWind FeatureDefinitionCombatAffinity FeatureDefinition 683630aa-4cd0-5813-b496-6f1c715c1b0d
CombatAffinityRavenRangeAttack FeatureDefinitionCombatAffinity FeatureDefinition b21910b8-4e20-5de3-999d-9e8a49a1f68a
CombatAffinityRogueCunningStrikeDisarmed FeatureDefinitionCombatAffinity FeatureDefinition 2723f5df-17ca-5655-afa6-266028a21ace
Expand Down Expand Up @@ -3459,7 +3459,6 @@ ActionAffinityFeatShieldTechniques FeatureDefinitionActionAffinity FeatureDefini
ActionAffinityFightingStylePugilist FeatureDefinitionActionAffinity FeatureDefinitionActionAffinity c4df47d8-b2cd-5e92-979e-89d8feaad835
ActionAffinityHailOfBladesToggle FeatureDefinitionActionAffinity FeatureDefinitionActionAffinity 869c1170-11cd-5c19-88fe-eba8456f7fda
ActionAffinityHeroicInfusion FeatureDefinitionActionAffinity FeatureDefinitionActionAffinity edbfbc22-adb1-5e9f-9267-77d8638c7447
ActionAffinityHonedAnimalAspectsWolf FeatureDefinitionActionAffinity FeatureDefinitionActionAffinity 54fc09ad-5aec-5ff9-85fa-b4d2efe83750
ActionAffinityImpForestInnateCunning FeatureDefinitionActionAffinity FeatureDefinitionActionAffinity 5692e3e8-fb5c-5eee-8d61-ed7e369f75e7
ActionAffinityImpishWrathToggle FeatureDefinitionActionAffinity FeatureDefinitionActionAffinity a830a80e-5bb7-5572-8613-044936d44537
ActionAffinityInnovationAlchemyFastHands FeatureDefinitionActionAffinity FeatureDefinitionActionAffinity ce58b680-f8b3-5a2a-b8d2-eb7cb31f4b08
Expand All @@ -3481,6 +3480,7 @@ ActionAffinityNoxiousSpray FeatureDefinitionActionAffinity FeatureDefinitionActi
ActionAffinityPaladinSmiteToggle FeatureDefinitionActionAffinity FeatureDefinitionActionAffinity fbf5e9b0-876a-566b-85b0-e3d357c05409
ActionAffinityPathOfTheSavageryPrimalInstinct FeatureDefinitionActionAffinity FeatureDefinitionActionAffinity 274eb464-e955-5d12-8589-3c5026eb51ad
ActionAffinityPathOfTheSpiritsCunningAction FeatureDefinitionActionAffinity FeatureDefinitionActionAffinity ea43e6ee-4530-5abd-81c4-0b3cb5fc0289
ActionAffinityPathOfTheSpiritsHonedAnimalAspectsWolf FeatureDefinitionActionAffinity FeatureDefinitionActionAffinity 2a169d50-29ae-5b9b-8015-e8192eda83d0
ActionAffinityPathOfTheYeomanStaggeringBlow FeatureDefinitionActionAffinity FeatureDefinitionActionAffinity 5121306c-f96d-5159-8365-4b256bf27bcb
ActionAffinityPressTheAdvantageToggle FeatureDefinitionActionAffinity FeatureDefinitionActionAffinity 54e9367a-c1f0-537c-90c2-fa88d23e7d4d
ActionAffinityPsychicWhipNoBonus FeatureDefinitionActionAffinity FeatureDefinitionActionAffinity 52bc1435-b0d7-5869-883b-4afe038cd8e8
Expand Down Expand Up @@ -3750,9 +3750,9 @@ CombatAffinityMartialWarlordCoveringStrikeAlly FeatureDefinitionCombatAffinity F
CombatAffinityMartialWarlordExploitOpening FeatureDefinitionCombatAffinity FeatureDefinitionAffinity 2f77ff1d-094d-505d-8daf-dc05cdc21c51
CombatAffinityMartialWarlordPredictAttack FeatureDefinitionCombatAffinity FeatureDefinitionAffinity 19d1302f-0e43-5ea8-b47f-afb6bf59ba51
CombatAffinityOathOfDreadMarkOfTheSubmission FeatureDefinitionCombatAffinity FeatureDefinitionAffinity 71db9100-67ac-5ca4-beed-0fb877e0796c
CombatAffinityPathOfTheSpiritsHonedAnimalAspectsBear FeatureDefinitionCombatAffinity FeatureDefinitionAffinity a4b0d96b-c43f-5620-b8d5-e4feca64a910
CombatAffinityPathOfTheSpiritsWolfLeadershipPack FeatureDefinitionCombatAffinity FeatureDefinitionAffinity 6f352fd3-4444-5b6d-af92-b7778c902dae
CombatAffinityPathOfTheYeomanBulwark FeatureDefinitionCombatAffinity FeatureDefinitionAffinity c0655645-a5b8-5af1-9fe9-43a1a46990c2
CombatAffinityPowerHonedAnimalAspectsBear FeatureDefinitionCombatAffinity FeatureDefinitionAffinity c2ff3c50-9d95-5c4b-bfa2-a6b4c7612a0e
CombatAffinityRangerSkyWarriorGiftOfTheWind FeatureDefinitionCombatAffinity FeatureDefinitionAffinity 683630aa-4cd0-5813-b496-6f1c715c1b0d
CombatAffinityRavenRangeAttack FeatureDefinitionCombatAffinity FeatureDefinitionAffinity b21910b8-4e20-5de3-999d-9e8a49a1f68a
CombatAffinityRogueCunningStrikeDisarmed FeatureDefinitionCombatAffinity FeatureDefinitionAffinity 2723f5df-17ca-5655-afa6-266028a21ace
Expand Down Expand Up @@ -4322,9 +4322,9 @@ CombatAffinityMartialWarlordCoveringStrikeAlly FeatureDefinitionCombatAffinity F
CombatAffinityMartialWarlordExploitOpening FeatureDefinitionCombatAffinity FeatureDefinitionCombatAffinity 2f77ff1d-094d-505d-8daf-dc05cdc21c51
CombatAffinityMartialWarlordPredictAttack FeatureDefinitionCombatAffinity FeatureDefinitionCombatAffinity 19d1302f-0e43-5ea8-b47f-afb6bf59ba51
CombatAffinityOathOfDreadMarkOfTheSubmission FeatureDefinitionCombatAffinity FeatureDefinitionCombatAffinity 71db9100-67ac-5ca4-beed-0fb877e0796c
CombatAffinityPathOfTheSpiritsHonedAnimalAspectsBear FeatureDefinitionCombatAffinity FeatureDefinitionCombatAffinity a4b0d96b-c43f-5620-b8d5-e4feca64a910
CombatAffinityPathOfTheSpiritsWolfLeadershipPack FeatureDefinitionCombatAffinity FeatureDefinitionCombatAffinity 6f352fd3-4444-5b6d-af92-b7778c902dae
CombatAffinityPathOfTheYeomanBulwark FeatureDefinitionCombatAffinity FeatureDefinitionCombatAffinity c0655645-a5b8-5af1-9fe9-43a1a46990c2
CombatAffinityPowerHonedAnimalAspectsBear FeatureDefinitionCombatAffinity FeatureDefinitionCombatAffinity c2ff3c50-9d95-5c4b-bfa2-a6b4c7612a0e
CombatAffinityRangerSkyWarriorGiftOfTheWind FeatureDefinitionCombatAffinity FeatureDefinitionCombatAffinity 683630aa-4cd0-5813-b496-6f1c715c1b0d
CombatAffinityRavenRangeAttack FeatureDefinitionCombatAffinity FeatureDefinitionCombatAffinity b21910b8-4e20-5de3-999d-9e8a49a1f68a
CombatAffinityRogueCunningStrikeDisarmed FeatureDefinitionCombatAffinity FeatureDefinitionCombatAffinity 2723f5df-17ca-5655-afa6-266028a21ace
Expand Down
8 changes: 4 additions & 4 deletions ...ssBlueprints/ConditionDefinition/ConditionPathOfTheElementsElementalBlessingBlizzard.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
"silentWhenRemoved": false,
"silentWhenRefreshed": false,
"terminateWhenRemoved": false,
"specialDuration": true,
"durationType": "Round",
"durationParameterDie": "D1",
"specialDuration": false,
"durationType": "Hour",
"durationParameterDie": "D4",
"durationParameter": 1,
"forceTurnOccurence": false,
"turnOccurence": "EndOfTurn",
"specialInterruptions": [
"RageStop"
9004
],
"interruptionRequiresSavingThrow": false,
"interruptionSavingThrowComputationMethod": "SaveOverride",
Expand Down
8 changes: 4 additions & 4 deletions ...inessBlueprints/ConditionDefinition/ConditionPathOfTheElementsElementalBlessingStorm.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
"silentWhenRemoved": false,
"silentWhenRefreshed": false,
"terminateWhenRemoved": false,
"specialDuration": true,
"durationType": "Round",
"durationParameterDie": "D1",
"specialDuration": false,
"durationType": "Hour",
"durationParameterDie": "D4",
"durationParameter": 1,
"forceTurnOccurence": false,
"turnOccurence": "EndOfTurn",
"specialInterruptions": [
"RageStop"
9004
],
"interruptionRequiresSavingThrow": false,
"interruptionSavingThrowComputationMethod": "SaveOverride",
Expand Down
8 changes: 4 additions & 4 deletions ...ssBlueprints/ConditionDefinition/ConditionPathOfTheElementsElementalBlessingWildfire.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
"silentWhenRemoved": false,
"silentWhenRefreshed": false,
"terminateWhenRemoved": false,
"specialDuration": true,
"durationType": "Round",
"durationParameterDie": "D1",
"specialDuration": false,
"durationType": "Hour",
"durationParameterDie": "D4",
"durationParameter": 1,
"forceTurnOccurence": false,
"turnOccurence": "EndOfTurn",
"specialInterruptions": [
"RageStop"
9004
],
"interruptionRequiresSavingThrow": false,
"interruptionSavingThrowComputationMethod": "SaveOverride",
Expand Down
10 changes: 5 additions & 5 deletions ...sinessBlueprints/ConditionDefinition/ConditionPathOfTheSpiritsHonedAnimalAspectsBear.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@
"parentCondition": null,
"conditionType": "Beneficial",
"features": [
"Definition:CombatAffinityPowerHonedAnimalAspectsBear:c2ff3c50-9d95-5c4b-bfa2-a6b4c7612a0e"
"Definition:CombatAffinityPathOfTheSpiritsHonedAnimalAspectsBear:a4b0d96b-c43f-5620-b8d5-e4feca64a910"
],
"allowMultipleInstances": false,
"silentWhenAdded": true,
"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": [
"RageStop"
9004
],
"interruptionRequiresSavingThrow": false,
"interruptionSavingThrowComputationMethod": "SaveOverride",
Expand Down
8 changes: 4 additions & 4 deletions ...inessBlueprints/ConditionDefinition/ConditionPathOfTheSpiritsHonedAnimalAspectsEagle.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"Definition:MoveModeFly8:d7d73f75fe686914f998f3c7b3f83e28"
],
"allowMultipleInstances": false,
"silentWhenAdded": false,
"silentWhenRemoved": false,
"silentWhenAdded": true,
"silentWhenRemoved": true,
"silentWhenRefreshed": false,
"terminateWhenRemoved": false,
"specialDuration": false,
Expand All @@ -18,7 +18,7 @@
"forceTurnOccurence": false,
"turnOccurence": "EndOfTurn",
"specialInterruptions": [
"RageStop"
9004
],
"interruptionRequiresSavingThrow": false,
"interruptionSavingThrowComputationMethod": "SaveOverride",
Expand Down Expand Up @@ -224,7 +224,7 @@
},
"timeToWaitBeforeApplyingShader": 0.5,
"timeToWaitBeforeRemovingShader": 0.5,
"possessive": false,
"possessive": true,
"amountOrigin": "None",
"baseAmount": 0,
"additiveAmount": false,
Expand Down
10 changes: 5 additions & 5 deletions ...sinessBlueprints/ConditionDefinition/ConditionPathOfTheSpiritsHonedAnimalAspectsWolf.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
"parentCondition": null,
"conditionType": "Beneficial",
"features": [
"Definition:ActionAffinityHonedAnimalAspectsWolf:54fc09ad-5aec-5ff9-85fa-b4d2efe83750"
"Definition:ActionAffinityPathOfTheSpiritsHonedAnimalAspectsWolf:2a169d50-29ae-5b9b-8015-e8192eda83d0"
],
"allowMultipleInstances": false,
"silentWhenAdded": false,
"silentWhenRemoved": false,
"silentWhenAdded": true,
"silentWhenRemoved": true,
"silentWhenRefreshed": false,
"terminateWhenRemoved": false,
"specialDuration": false,
Expand All @@ -18,7 +18,7 @@
"forceTurnOccurence": false,
"turnOccurence": "EndOfTurn",
"specialInterruptions": [
"RageStop"
9004
],
"interruptionRequiresSavingThrow": false,
"interruptionSavingThrowComputationMethod": "SaveOverride",
Expand Down Expand Up @@ -89,7 +89,7 @@
},
"timeToWaitBeforeApplyingShader": 0.5,
"timeToWaitBeforeRemovingShader": 0.5,
"possessive": false,
"possessive": true,
"amountOrigin": "None",
"baseAmount": 0,
"additiveAmount": false,
Expand Down
12 changes: 6 additions & 6 deletions ...edBusinessBlueprints/ConditionDefinition/ConditionPathOfTheSpiritsWolfLeadershipPack.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@
"Definition:CombatAffinityPathOfTheSpiritsWolfLeadershipPack:6f352fd3-4444-5b6d-af92-b7778c902dae"
],
"allowMultipleInstances": false,
"silentWhenAdded": false,
"silentWhenRemoved": false,
"silentWhenAdded": true,
"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": [
"RageStop"
9004
],
"interruptionRequiresSavingThrow": false,
"interruptionSavingThrowComputationMethod": "SaveOverride",
Expand Down
4 changes: 2 additions & 2 deletions ...ActionAffinityHonedAnimalAspectsWolf.json → ...thOfTheSpiritsHonedAnimalAspectsWolf.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"usedInValleyDLC": false
},
"contentCopyright": "UserContent",
"guid": "54fc09ad-5aec-5ff9-85fa-b4d2efe83750",
"guid": "2a169d50-29ae-5b9b-8015-e8192eda83d0",
"contentPack": 9999,
"name": "ActionAffinityHonedAnimalAspectsWolf"
"name": "ActionAffinityPathOfTheSpiritsHonedAnimalAspectsWolf"
}
4 changes: 2 additions & 2 deletions ...tAffinityPowerHonedAnimalAspectsBear.json → ...thOfTheSpiritsHonedAnimalAspectsBear.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"usedInValleyDLC": false
},
"contentCopyright": "UserContent",
"guid": "c2ff3c50-9d95-5c4b-bfa2-a6b4c7612a0e",
"guid": "a4b0d96b-c43f-5620-b8d5-e4feca64a910",
"contentPack": 9999,
"name": "CombatAffinityPowerHonedAnimalAspectsBear"
"name": "CombatAffinityPathOfTheSpiritsHonedAnimalAspectsBear"
}
2 changes: 1 addition & 1 deletion ...nts/FeatureDefinitionCombatAffinity/CombatAffinityPathOfTheSpiritsWolfLeadershipPack.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"myDamageReductionValueDetermination": "None",
"myDamageReductionDiceNumber": 1,
"myDamageReductionDieType": "D4",
"situationalContext": "None",
"situationalContext": 1016,
"requiredCondition": null,
"nullifiedBySenses": [],
"nullifiedBySelfSenses": [],
Expand Down
2 changes: 1 addition & 1 deletion ...usinessBlueprints/FeatureDefinitionPower/PowerPathOfTheElementsElementalConduitStorm.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"targetConditionName": "",
"targetConditionAsset": null,
"targetSide": "Ally",
"durationType": "UntilAnyRest",
"durationType": "Permanent",
"durationParameter": 0,
"endOfEffect": "EndOfTurn",
"hasSavingThrow": false,
Expand Down
2 changes: 1 addition & 1 deletion ...inishedBusinessBlueprints/FeatureDefinitionPower/PowerPathOfTheSpiritsBearResistance.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"targetConditionName": "",
"targetConditionAsset": null,
"targetSide": "Ally",
"durationType": "Dispelled",
"durationType": "Permanent",
"durationParameter": 0,
"endOfEffect": "EndOfTurn",
"hasSavingThrow": false,
Expand Down
4 changes: 2 additions & 2 deletions ...usinessBlueprints/FeatureDefinitionPower/PowerPathOfTheSpiritsHonedAnimalAspectsBear.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
"rangeParameter": 0,
"halfDamageOnAMiss": false,
"hitAffinitiesByTargetTag": [],
"targetType": "Sphere",
"targetType": "Cube",
"itemSelectionType": "None",
"targetParameter": 2,
"targetParameter": 3,
"targetParameter2": 2,
"emissiveBorder": "None",
"emissiveParameter": 1,
Expand Down
6 changes: 3 additions & 3 deletions ...sinessBlueprints/FeatureDefinitionPower/PowerPathOfTheSpiritsHonedAnimalAspectsEagle.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
"targetConditionName": "",
"targetConditionAsset": null,
"targetSide": "Ally",
"durationType": "Minute",
"durationParameter": 1,
"endOfEffect": "StartOfTurn",
"durationType": "Permanent",
"durationParameter": 0,
"endOfEffect": "EndOfTurn",
"hasSavingThrow": false,
"disableSavingThrowOnAllies": false,
"savingThrowAbility": "Dexterity",
Expand Down
6 changes: 3 additions & 3 deletions ...usinessBlueprints/FeatureDefinitionPower/PowerPathOfTheSpiritsHonedAnimalAspectsWolf.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
"targetConditionName": "",
"targetConditionAsset": null,
"targetSide": "Ally",
"durationType": "Minute",
"durationParameter": 1,
"endOfEffect": "StartOfTurn",
"durationType": "Permanent",
"durationParameter": 0,
"endOfEffect": "EndOfTurn",
"hasSavingThrow": false,
"disableSavingThrowOnAllies": false,
"savingThrowAbility": "Dexterity",
Expand Down
4 changes: 2 additions & 2 deletions ...inishedBusinessBlueprints/FeatureDefinitionPower/PowerPathOfTheSpiritsWolfLeadership.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
"rangeParameter": 0,
"halfDamageOnAMiss": false,
"hitAffinitiesByTargetTag": [],
"targetType": "Sphere",
"targetType": "Cube",
"itemSelectionType": "None",
"targetParameter": 3,
"targetParameter2": 2,
"emissiveBorder": "None",
"emissiveParameter": 1,
"requiresTargetProximity": false,
"targetProximityDistance": 6,
"targetExcludeCaster": false,
"targetExcludeCaster": true,
"canBePlacedOnCharacter": true,
"affectOnlyGround": false,
"targetFilteringMethod": "CharacterOnly",
Expand Down
0 ...ions/CharacterActionArcaneArcherToggle.cs → ...ions/CharacterActionArcaneArcherToggle.cs
View file
File renamed without changes.
0 ...ns/CharacterActionAudaciousWhirlToggle.cs → ...ns/CharacterActionAudaciousWhirlToggle.cs
View file
File renamed without changes.
0 ...Actions/CharacterActionCombatRageStart.cs → ...Actions/CharacterActionCombatRageStart.cs
View file
File renamed without changes.
0 .../CharacterActionCompellingStrikeToggle.cs → .../CharacterActionCompellingStrikeToggle.cs
View file
File renamed without changes.
0 ...haracterActionCoordinatedAssaultToggle.cs → ...haracterActionCoordinatedAssaultToggle.cs
View file
File renamed without changes.
0 ...tions/CharacterActionCrystalDefenseOff.cs → ...tions/CharacterActionCrystalDefenseOff.cs
View file
File renamed without changes.
0 ...ctions/CharacterActionCrystalDefenseOn.cs → ...ctions/CharacterActionCrystalDefenseOn.cs
View file
File renamed without changes.
0 ...ons/CharacterActionCunningStrikeToggle.cs → ...ons/CharacterActionCunningStrikeToggle.cs
View file
File renamed without changes.
0 ...CustomActions/CharacterActionDoNothing.cs → ...iness/Actions/CharacterActionDoNothing.cs
View file
File renamed without changes.
0 ...ctions/CharacterActionDyingLightToggle.cs → ...ctions/CharacterActionDyingLightToggle.cs
View file
File renamed without changes.
0 ...tions/CharacterActionFeatCrusherToggle.cs → ...tions/CharacterActionFeatCrusherToggle.cs
View file
File renamed without changes.
0 ...ions/CharacterActionHailOfBladesToggle.cs → ...ions/CharacterActionHailOfBladesToggle.cs
View file
File renamed without changes.
0 ...tions/CharacterActionImpishWrathToggle.cs → ...tions/CharacterActionImpishWrathToggle.cs
View file
File renamed without changes.
0 ...ns/CharacterActionMasterfulWhirlToggle.cs → ...ns/CharacterActionMasterfulWhirlToggle.cs
View file
File renamed without changes.
0 ...ctions/CharacterActionMindSculptToggle.cs → ...ctions/CharacterActionMindSculptToggle.cs
View file
File renamed without changes.
0 ...ions/CharacterActionMonkKiPointsToggle.cs → ...ions/CharacterActionMonkKiPointsToggle.cs
View file
File renamed without changes.
0 ...ions/CharacterActionPaladinSmiteToggle.cs → ...ions/CharacterActionPaladinSmiteToggle.cs
View file
File renamed without changes.
0 ...CharacterActionPressTheAdvantageToggle.cs → ...CharacterActionPressTheAdvantageToggle.cs
View file
File renamed without changes.
3 changes: 2 additions & 1 deletion ...ctions/CharacterActionPrioritizeAction.cs → ...ctions/CharacterActionPrioritizeAction.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Collections;
using JetBrains.Annotations;
using SolastaUnfinishedBusiness.CustomBehaviors;
using SolastaUnfinishedBusiness.BehaviorsSpecific;

//This should have default namespace so that it can be properly created by `CharacterActionPatcher`
// ReSharper disable once CheckNamespace
Expand All @@ -14,6 +14,7 @@ public override IEnumerator ExecuteImpl()
ActionSwitching.DoPrioritizeAction(actionParams.ActingCharacter,
(ActionDefinitions.ActionType)actionParams.IntParameter,
actionParams.IntParameter2);

yield break;
}
}
2 changes: 1 addition & 1 deletion ...tomActions/CharacterActionPushedCustom.cs → ...ss/Actions/CharacterActionPushedCustom.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public CharacterActionPushedCustom(CharacterActionParams actionParams) : base(ac
public override IEnumerator ExecuteImpl()
{
// Main.Log2($"CharacterActionPushedCustom [{ActionParams.ActingCharacter.Name}] ExecuteImpl START", true);
if (!GameLocationCharacter.IsValidCharacter(ActionParams.ActingCharacter) || ActionParams.Positions.Empty())
if (!GameLocationCharacter.IsValidCharacter(ActionParams.ActingCharacter) || ActionParams.Positions.Count == 0)
{
yield break;
}
Expand Down
0 ...tions/CharacterActionSupremeWillToggle.cs → ...tions/CharacterActionSupremeWillToggle.cs
View file
File renamed without changes.
0 ...onTraditionOpenHandQuiveringPalmToggle.cs → ...onTraditionOpenHandQuiveringPalmToggle.cs
View file
File renamed without changes.
0 ...ns/CharacterActionWildlingFeralAgility.cs → ...ns/CharacterActionWildlingFeralAgility.cs
View file
File renamed without changes.
0 ...aracterActionWildshapeSwapAttackToggle.cs → ...aracterActionWildshapeSwapAttackToggle.cs
View file
File renamed without changes.
0 .../CustomActions/CharacterActionWithdraw.cs → ...siness/Actions/CharacterActionWithdraw.cs
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion SolastaUnfinishedBusiness/Api/GameExtensions/CharacterReactionSubitemExtension.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using JetBrains.Annotations;
using SolastaUnfinishedBusiness.CustomBehaviors;
using SolastaUnfinishedBusiness.BehaviorsSpecific;
using SolastaUnfinishedBusiness.CustomUI;
using UnityEngine;

Expand Down
7 changes: 4 additions & 3 deletions SolastaUnfinishedBusiness/Api/GameExtensions/EffectDescriptionExtensions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,17 @@ public static DamageForm FindFirstNonNegatedDamageFormOfType(this EffectDescript
return effect?.effectForms
.Where(x => x.FormType == EffectForm.EffectFormType.Damage &&
(x.SavingThrowAffinity != RuleDefinitions.EffectSavingThrowType.Negates) | canForceHalfDamage &&
(types == null || types.Empty() || types.Contains(x.damageForm.damageType)))
(types == null || types.Count == 0 || types.Contains(x.damageForm.damageType)))
.Select(effectForm => effectForm.damageForm)
.FirstOrDefault();
}

public static DamageForm FindFirstDamageFormOfType(this EffectDescription effect, List<string> types)
{
return effect?.effectForms
.Where(x => x.FormType == EffectForm.EffectFormType.Damage &&
(types == null || types.Empty() || types.Contains(x.damageForm.damageType)))
.Where(x =>
x.FormType == EffectForm.EffectFormType.Damage &&
(types == null || types.Count == 0 || types.Contains(x.damageForm.damageType)))
.Select(effectForm => effectForm.damageForm)
.FirstOrDefault();
}
Expand Down
Loading

0 comments on commit a5a194d

Please sign in to comment.