Skip to content

Commit

Permalink
Merge pull request #4232 from SolastaMods/dev
Browse files Browse the repository at this point in the history
1.5.94.37
  • Loading branch information
ThyWoof authored Dec 13, 2023
2 parents 792bb9f + a70e09b commit 97cc17b
Show file tree
Hide file tree
Showing 70 changed files with 1,146 additions and 85 deletions.
5 changes: 5 additions & 0 deletions Diagnostics/UnfinishedBusinessBlueprints/Assets.txt
Original file line number Diff line number Diff line change
Expand Up @@ -972,6 +972,7 @@ DecisionBreakFreeConditionGrappledRestrainedEnsnared TA.AI.DecisionDefinition TA
DecisionBreakFreeConditionGrappledRestrainedIceBound TA.AI.DecisionDefinition TA.AI.DecisionDefinition 017c5b82-f11c-5899-8729-947eabcf949f
DecisionBreakFreeConditionGrappledRestrainedSpellWeb TA.AI.DecisionDefinition TA.AI.DecisionDefinition 61e7fc96-8cb5-5c2b-8a67-75fbef4f333a
DecisionBreakFreeConditionNoxiousSpray TA.AI.DecisionDefinition TA.AI.DecisionDefinition 2f033fcf-d478-5581-94d9-27a3ad4496ad
DecisionBreakFreeConditionRestrainedByEntangle TA.AI.DecisionDefinition TA.AI.DecisionDefinition 2a416669-5ec8-53c1-b07b-8fe6f29da4d2
DecisionBreakFreeConditionVileBrew TA.AI.DecisionDefinition TA.AI.DecisionDefinition 4b3278e8-334a-58d6-8c75-2f48e28b4e54
EffectGreenElementalBreath EffectProxyDefinition EffectProxyDefinition 1b305d09-3001-59d9-a97f-32ba86034933
ProxyEarthTremor EffectProxyDefinition EffectProxyDefinition fdec4a73-e825-5a14-9f0e-1faca83c21d3
Expand Down Expand Up @@ -3095,6 +3096,7 @@ PowerSpiritBeastEyebiteSickened FeatureDefinitionPower FeatureDefinition 3d7befe
PowerSteelWhirlwindTeleport FeatureDefinitionPower FeatureDefinition 8f74fc44-7afd-57f0-9cd4-c9e21998ec51
PowerStrikeWithTheWind FeatureDefinitionPower FeatureDefinition 84e17bae-7d8d-5a38-90e4-b2b0f3f25a54
PowerTacticianSharedVigilance FeatureDefinitionPower FeatureDefinition 3581ed42-7ce9-5464-a495-910e3bd168a9
PowerTeleportSummon FeatureDefinitionPower FeatureDefinition f0d1e121-9b02-52ee-b4c7-5525d575c078
PowerThunderousSmiteThunderousSmite FeatureDefinitionPower FeatureDefinition dba75004-bf8b-52f2-9787-999aa36d258d
PowerTieflingFeralDemonicWingsDismiss FeatureDefinitionPower FeatureDefinition 9357b380-e0e6-5ed7-aca3-374f01a05572
PowerTieflingFeralDemonicWingsSprout FeatureDefinitionPower FeatureDefinition 807ff5a3-bb54-5ae3-a280-2efb487ba004
Expand All @@ -3119,6 +3121,7 @@ PowerUseModifierTacticianGambitPool00 SolastaUnfinishedBusiness.CustomDefinition
PowerUseModifierTacticianGambitPool01 SolastaUnfinishedBusiness.CustomDefinitions.FeatureDefinitionPowerUseModifier FeatureDefinition 72c23326-29d2-5224-a708-c494fd573533
PowerUseModifierTacticianGambitPoolFeatTacticianAdept SolastaUnfinishedBusiness.CustomDefinitions.FeatureDefinitionPowerUseModifier FeatureDefinition b33418e8-2cd7-5940-983d-8107873b39e0
PowerUseModifierTacticianGambitPoolImproviseStrategy SolastaUnfinishedBusiness.CustomDefinitions.FeatureDefinitionPowerUseModifier FeatureDefinition 18ec73c9-8c06-5ef8-b4c9-9aba6a7e649f
PowerVanishSummon FeatureDefinitionPower FeatureDefinition 2e2b66aa-217d-5063-9073-32f0dca0efb1
PowerWarDancerWarDance FeatureDefinitionPower FeatureDefinition a89352fc-4f22-586e-947c-2cd98120eacb
PowerWarlockEldritchMaster FeatureDefinitionPower FeatureDefinition 8d5bb433-7ede-51cb-bb6b-e04405ea891c
PowerWayOfSilhouetteDarkness FeatureDefinitionPower FeatureDefinition fb406968-b055-586f-9a1a-2b4e4f28a8ce
Expand Down Expand Up @@ -5361,13 +5364,15 @@ PowerSpiritBeastEyebiteSickened FeatureDefinitionPower FeatureDefinitionPower 3d
PowerSteelWhirlwindTeleport FeatureDefinitionPower FeatureDefinitionPower 8f74fc44-7afd-57f0-9cd4-c9e21998ec51
PowerStrikeWithTheWind FeatureDefinitionPower FeatureDefinitionPower 84e17bae-7d8d-5a38-90e4-b2b0f3f25a54
PowerTacticianSharedVigilance FeatureDefinitionPower FeatureDefinitionPower 3581ed42-7ce9-5464-a495-910e3bd168a9
PowerTeleportSummon FeatureDefinitionPower FeatureDefinitionPower f0d1e121-9b02-52ee-b4c7-5525d575c078
PowerThunderousSmiteThunderousSmite FeatureDefinitionPower FeatureDefinitionPower dba75004-bf8b-52f2-9787-999aa36d258d
PowerTieflingFeralDemonicWingsDismiss FeatureDefinitionPower FeatureDefinitionPower 9357b380-e0e6-5ed7-aca3-374f01a05572
PowerTieflingFeralDemonicWingsSprout FeatureDefinitionPower FeatureDefinitionPower 807ff5a3-bb54-5ae3-a280-2efb487ba004
PowerTraditionLightPurityOfLight FeatureDefinitionPower FeatureDefinitionPower f1d798d8-5685-54ad-95e6-2735df7635ac
PowerTraditionOpenHandQuiveringPalm FeatureDefinitionPower FeatureDefinitionPower 9b1f88b1-bace-5a9a-ba01-4c833533f515
PowerTraditionOpenHandQuiveringPalmTrigger FeatureDefinitionPower FeatureDefinitionPower f4ceee0a-4db3-50b3-80aa-e29c92073219
PowerTraditionSurvivalPhysicalPerfection FeatureDefinitionPower FeatureDefinitionPower 12013063-7606-507c-99ab-3fa7b9d43be5
PowerVanishSummon FeatureDefinitionPower FeatureDefinitionPower 2e2b66aa-217d-5063-9073-32f0dca0efb1
PowerWarDancerWarDance FeatureDefinitionPower FeatureDefinitionPower a89352fc-4f22-586e-947c-2cd98120eacb
PowerWarlockEldritchMaster FeatureDefinitionPower FeatureDefinitionPower 8d5bb433-7ede-51cb-bb6b-e04405ea891c
PowerWayOfSilhouetteDarkness FeatureDefinitionPower FeatureDefinitionPower fb406968-b055-586f-9a1a-2b4e4f28a8ce
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"specialDuration": true,
"durationType": "Round",
"durationParameterDie": "D1",
"durationParameter": 2,
"durationParameter": 3,
"forceTurnOccurence": false,
"turnOccurence": "EndOfSourceTurn",
"specialInterruptions": [],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"specialDuration": true,
"durationType": "Round",
"durationParameterDie": "D1",
"durationParameter": 4,
"durationParameter": 5,
"forceTurnOccurence": false,
"turnOccurence": "EndOfSourceTurn",
"specialInterruptions": [],
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
{
"$type": "TA.AI.DecisionDefinition, Assembly-CSharp",
"decision": {
"$type": "TA.AI.DecisionDescription, Assembly-CSharp",
"description": "if restrained and can use main action, try to break free",
"scorer": {
"$type": "TA.AI.ActivityScorerDefinition, Assembly-CSharp",
"scorer": {
"$type": "TA.AI.ActivityScorer, Assembly-CSharp",
"considerations": [
{
"$type": "TA.AI.WeightedConsiderationDescription, Assembly-CSharp",
"consideration": {
"$type": "TA.AI.ConsiderationDefinition, Assembly-CSharp",
"consideration": {
"$type": "TA.AI.ConsiderationDescription, Assembly-CSharp",
"considerationType": "HasCondition",
"curve": {
"$type": "UnityEngine.AnimationCurve, UnityEngine.CoreModule"
},
"stringParameter": "ConditionRestrainedByEntangle",
"floatParameter": 2.0,
"intParameter": 2,
"byteParameter": 0,
"boolParameter": true,
"boolSecParameter": false,
"boolTerParameter": false
},
"name": "HasConditionRestrainedByEntangle"
},
"weight": 1.0
},
{
"$type": "TA.AI.WeightedConsiderationDescription, Assembly-CSharp",
"consideration": {
"$type": "TA.AI.ConsiderationDefinition, Assembly-CSharp",
"consideration": {
"$type": "TA.AI.ConsiderationDescription, Assembly-CSharp",
"considerationType": "ActionTypeStatus",
"curve": {
"$type": "UnityEngine.AnimationCurve, UnityEngine.CoreModule"
},
"stringParameter": "",
"floatParameter": 1.0,
"intParameter": 0,
"byteParameter": 0,
"boolParameter": true,
"boolSecParameter": false,
"boolTerParameter": false
},
"name": "MainActionNotFullyConsumed"
},
"weight": 1.0
}
]
},
"name": "BreakFree"
},
"activityType": "BreakFree",
"stringParameter": "2",
"stringSecParameter": "",
"boolParameter": false,
"boolSecParameter": false,
"floatParameter": 3.0,
"enumParameter": 1
},
"guiPresentation": {
"$type": "GuiPresentation, Assembly-CSharp",
"hidden": true,
"title": "Feature/&NoContentTitle",
"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": "2a416669-5ec8-53c1-b07b-8fe6f29da4d2",
"contentPack": 9999,
"name": "DecisionBreakFreeConditionRestrainedByEntangle"
}
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"motionForm": {
"$type": "MotionForm, Assembly-CSharp",
"type": "TeleportToDestination",
"distance": 12,
"distance": 0,
"forceTurnTowardsSourceCharacterAfterPush": false,
"forceSourceCharacterTurnTowardsTargetAfterPush": false
},
Expand Down
Loading

0 comments on commit 97cc17b

Please sign in to comment.