Skip to content

Commit

Permalink
Merge pull request #4910 from SolastaMods/dev
Browse files Browse the repository at this point in the history
1.5.97.29
  • Loading branch information
ThyWoof authored Aug 31, 2024
2 parents 1aefd6d + 00157df commit 03fa6f2
Showing 88 changed files with 701 additions and 2,101 deletions.
10 changes: 2 additions & 8 deletions Diagnostics/UnfinishedBusinessBlueprints/Assets.txt
Original file line number Diff line number Diff line change
@@ -2527,9 +2527,6 @@ FeatureSetInventorFlashOfGenius FeatureDefinitionFeatureSet FeatureDefinition 8a
FeatureSetInventorInfusions FeatureDefinitionFeatureSet FeatureDefinition db349abb-6477-5f34-b660-1755ee05f51f
FeatureSetInventorRituals FeatureDefinitionFeatureSet FeatureDefinition 9d79af97-db2b-58a7-8b07-5232cb21f143
FeatureSetInvocationAspectOfTheMoon FeatureDefinitionFeatureSet FeatureDefinition 4de4e4fd-3c99-5c32-9428-863c161bca8f
FeatureSetInvocationChillingHex FeatureDefinitionPower FeatureDefinition 56ba928e-c0a3-5076-a248-f63079db0de9
FeatureSetInvocationPerniciousCloak FeatureDefinitionPower FeatureDefinition 9adbf458-44d8-59d7-ae6f-bf837effcd34
FeatureSetInvocationVexingHex FeatureDefinitionPower FeatureDefinition 580a9166-f58b-544f-b237-b52f6b4c8865
FeatureSetLanguageCommonPlusOne FeatureDefinitionFeatureSet FeatureDefinition 1126ecfe-540b-5e61-a9b9-923a1c0da0e8
FeatureSetMalakhAbilityScoreIncrease FeatureDefinitionFeatureSet FeatureDefinition 6bc8a9b5-a509-5ecf-ac3b-1a092197a00b
FeatureSetMalakhDivineResistance FeatureDefinitionFeatureSet FeatureDefinition 6505738c-8ded-51d0-9bbf-78dbcab4405c
@@ -2871,6 +2868,7 @@ MoveModeInnovationArtilleristEldritchCannon FeatureDefinitionMoveMode FeatureDef
MoveModeMove14 FeatureDefinitionMoveMode FeatureDefinition 9f0985b9-dcfb-5656-b53e-4c0b7c3e1676
MoveModeMove16 FeatureDefinitionMoveMode FeatureDefinition e8634155-27e4-55ee-b324-b556ffb5fc34
MoveModeMove18 FeatureDefinitionMoveMode FeatureDefinition 911e748e-a21b-552c-b9e8-96652a62cc97
MoveModeTelekinesis FeatureDefinitionMoveMode FeatureDefinition f32a5326-5471-53f8-80fa-86098b13d002
MoveThroughEnemyModifierKineticJaunt FeatureDefinitionMoveThroughEnemyModifier FeatureDefinition d9780b4f-8fc3-58b5-bb80-d00bb576bfef
OnAfterActionWildShape FeatureDefinitionActionAffinity FeatureDefinition 2bfebc0c-2088-57d0-83f5-c756e102a4c3
OnAttackHitEffectFeatSentinel FeatureDefinition FeatureDefinition 1a2abf93-483e-5e6e-8408-bc553864469f
@@ -3522,7 +3520,6 @@ PowerInvocationPerniciousCloakDamage FeatureDefinitionPower FeatureDefinition 42
PowerInvocationPerniciousCloakRemove FeatureDefinitionPower FeatureDefinition f968d22a-b5a4-5f53-a2cb-6c154653170f
PowerInvocationTombOfFrost FeatureDefinitionPower FeatureDefinition 63a2904e-650f-550b-aa06-08d4624aad63
PowerInvocationVexingHex FeatureDefinitionPower FeatureDefinition 7f1c83a5-1539-5d8c-98ea-90c3c18c7fa7
PowerInvocationVexingHexDamage FeatureDefinitionPower FeatureDefinition 34cdf1c3-9859-58f1-8fef-a8e4bef10cf2
PowerLightningArrowLeap FeatureDefinitionPower FeatureDefinition 5a02449f-aac5-5003-8192-c10c3a1a1c49
PowerLizardfolkHungryJaws FeatureDefinitionPower FeatureDefinition 4a3567e3-1747-59b1-a62e-93d3fd8cb32d
PowerMalakhAngelicFlight FeatureDefinitionPower FeatureDefinition 43d93184-e3fe-5e9d-ada6-fc9bdcfec9a1
@@ -5677,6 +5674,7 @@ MoveModeInnovationArtilleristEldritchCannon FeatureDefinitionMoveMode FeatureDef
MoveModeMove14 FeatureDefinitionMoveMode FeatureDefinitionMoveMode 9f0985b9-dcfb-5656-b53e-4c0b7c3e1676
MoveModeMove16 FeatureDefinitionMoveMode FeatureDefinitionMoveMode e8634155-27e4-55ee-b324-b556ffb5fc34
MoveModeMove18 FeatureDefinitionMoveMode FeatureDefinitionMoveMode 911e748e-a21b-552c-b9e8-96652a62cc97
MoveModeTelekinesis FeatureDefinitionMoveMode FeatureDefinitionMoveMode f32a5326-5471-53f8-80fa-86098b13d002
MoveThroughEnemyModifierKineticJaunt FeatureDefinitionMoveThroughEnemyModifier FeatureDefinitionMoveThroughEnemyModifier d9780b4f-8fc3-58b5-bb80-d00bb576bfef
PerceptionAffinityHelmOfAwareness FeatureDefinitionPerceptionAffinity FeatureDefinitionPerceptionAffinity 514681b3-8d6d-54ef-97a8-562de1ff46a6
PerceptionAffinityMartialGuardianVigilance FeatureDefinitionPerceptionAffinity FeatureDefinitionPerceptionAffinity b0c29b41-a91c-5a72-acb5-8c0f38bb3b58
@@ -5750,9 +5748,6 @@ FeaturePathOfTheWildMagicControlledSurge FeatureDefinitionPower FeatureDefinitio
FeaturePathOfTheWildMagicUnstableBackslash FeatureDefinitionPower FeatureDefinitionPower 94f2df1a-4f5b-5b88-b978-f206a03725f6
FeaturePathOfTheWildMagicWildSurge FeatureDefinitionPower FeatureDefinitionPower 15876753-5e83-50b6-ab73-df6b9fbbe76e
FeatureRangerSkyWarriorDeathFromAbove FeatureDefinitionPower FeatureDefinitionPower 5f75e606-8450-559c-bbb6-7cadecf089d3
FeatureSetInvocationChillingHex FeatureDefinitionPower FeatureDefinitionPower 56ba928e-c0a3-5076-a248-f63079db0de9
FeatureSetInvocationPerniciousCloak FeatureDefinitionPower FeatureDefinitionPower 9adbf458-44d8-59d7-ae6f-bf837effcd34
FeatureSetInvocationVexingHex FeatureDefinitionPower FeatureDefinitionPower 580a9166-f58b-544f-b237-b52f6b4c8865
FeatureWayOfWealAndWoeBrutalWeal FeatureDefinitionPower FeatureDefinitionPower 25207523-f458-5827-b7fa-26f0420808e2
FeatureWayOfWealAndWoeTheirWoe FeatureDefinitionPower FeatureDefinitionPower 23df409a-d5ea-557f-b71c-0ac47d079862
FeatureWayOfWealAndWoeWoe FeatureDefinitionPower FeatureDefinitionPower 84c5683c-69d2-5d3d-9b62-d2aca0d4f6f9
@@ -6343,7 +6338,6 @@ PowerInvocationPerniciousCloakDamage FeatureDefinitionPower FeatureDefinitionPow
PowerInvocationPerniciousCloakRemove FeatureDefinitionPower FeatureDefinitionPower f968d22a-b5a4-5f53-a2cb-6c154653170f
PowerInvocationTombOfFrost FeatureDefinitionPower FeatureDefinitionPower 63a2904e-650f-550b-aa06-08d4624aad63
PowerInvocationVexingHex FeatureDefinitionPower FeatureDefinitionPower 7f1c83a5-1539-5d8c-98ea-90c3c18c7fa7
PowerInvocationVexingHexDamage FeatureDefinitionPower FeatureDefinitionPower 34cdf1c3-9859-58f1-8fef-a8e4bef10cf2
PowerLightningArrowLeap FeatureDefinitionPower FeatureDefinitionPower 5a02449f-aac5-5003-8192-c10c3a1a1c49
PowerLizardfolkHungryJaws FeatureDefinitionPower FeatureDefinitionPower 4a3567e3-1747-59b1-a62e-93d3fd8cb32d
PowerMalakhAngelicFlight FeatureDefinitionPower FeatureDefinitionPower 43d93184-e3fe-5e9d-ada6-fc9bdcfec9a1
Original file line number Diff line number Diff line change
@@ -3,7 +3,9 @@
"inDungeonEditor": false,
"parentCondition": "Definition:ConditionRestrained:ec9fa707d4174c54bbdecde60a860c2c",
"conditionType": "Detrimental",
"features": [],
"features": [
"Definition:MoveModeTelekinesis:f32a5326-5471-53f8-80fa-86098b13d002"
],
"allowMultipleInstances": false,
"silentWhenAdded": false,
"silentWhenRemoved": false,
@@ -22,7 +24,9 @@
"interruptionDamageThreshold": 0,
"keepConditionIfSavingThrowSucceeds": false,
"interruptionSavingThrowAffinity": "None",
"conditionTags": [],
"conditionTags": [
"Verticality"
],
"recurrentEffectForms": [],
"cancellingConditions": [],
"additionalDamageWhenHit": false,
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"$type": "FeatureDefinitionAttributeModifier, Assembly-CSharp",
"modifiedAttribute": "ArmorClass",
"modifierOperation": "AddConditionAmount",
"modifierValue": 1,
"modifierValue": 0,
"modifierAbilityScore": "Constitution",
"situationalContext": "None",
"minimum1": false,
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"$type": "FeatureDefinitionAttributeModifier, Assembly-CSharp",
"modifiedAttribute": "ArmorClass",
"modifierOperation": "AddConditionAmount",
"modifierValue": 1,
"modifierValue": 0,
"modifierAbilityScore": "Constitution",
"situationalContext": "None",
"minimum1": false,
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"$type": "FeatureDefinitionAttributeModifier, Assembly-CSharp",
"modifiedAttribute": "HitPoints",
"modifierOperation": "AddConditionAmount",
"modifierValue": 1,
"modifierValue": 0,
"modifierAbilityScore": "Constitution",
"situationalContext": "None",
"minimum1": false,
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"$type": "FeatureDefinitionAttributeModifier, Assembly-CSharp",
"modifiedAttribute": "ArmorClass",
"modifierOperation": "AddConditionAmount",
"modifierValue": 1,
"modifierValue": 0,
"modifierAbilityScore": "Constitution",
"situationalContext": "None",
"minimum1": false,
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"$type": "FeatureDefinitionAttributeModifier, Assembly-CSharp",
"modifiedAttribute": "ArmorClass",
"modifierOperation": "AddConditionAmount",
"modifierValue": 1,
"modifierValue": 0,
"modifierAbilityScore": "Constitution",
"situationalContext": "None",
"minimum1": false,
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"$type": "FeatureDefinitionAttributeModifier, Assembly-CSharp",
"modifiedAttribute": "HitPoints",
"modifierOperation": "AddConditionAmount",
"modifierValue": 1,
"modifierValue": 0,
"modifierAbilityScore": "Constitution",
"situationalContext": "None",
"minimum1": false,
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"$type": "FeatureDefinitionAttributeModifier, Assembly-CSharp",
"modifiedAttribute": "HitPoints",
"modifierOperation": "AddConditionAmount",
"modifierValue": 1,
"modifierValue": 0,
"modifierAbilityScore": "Constitution",
"situationalContext": "None",
"minimum1": false,
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"$type": "FeatureDefinitionAttributeModifier, Assembly-CSharp",
"modifiedAttribute": "ArmorClass",
"modifierOperation": "AddConditionAmount",
"modifierValue": 1,
"modifierValue": 0,
"modifierAbilityScore": "Constitution",
"situationalContext": "None",
"minimum1": false,
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"$type": "FeatureDefinitionAttributeModifier, Assembly-CSharp",
"modifiedAttribute": "Initiative",
"modifierOperation": "AddConditionAmount",
"modifierValue": 1,
"modifierValue": 0,
"modifierAbilityScore": "Constitution",
"situationalContext": "None",
"minimum1": false,
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"$type": "FeatureDefinitionAttributeModifier, Assembly-CSharp",
"modifiedAttribute": "ArmorClass",
"modifierOperation": "AddConditionAmount",
"modifierValue": 1,
"modifierValue": 0,
"modifierAbilityScore": "Constitution",
"situationalContext": "None",
"minimum1": false,
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"$type": "FeatureDefinitionAttributeModifier, Assembly-CSharp",
"modifiedAttribute": "ArmorClass",
"modifierOperation": "AddConditionAmount",
"modifierValue": 1,
"modifierValue": 0,
"modifierAbilityScore": "Constitution",
"situationalContext": "None",
"minimum1": false,
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"$type": "FeatureDefinitionAttributeModifier, Assembly-CSharp",
"modifiedAttribute": "ArmorClass",
"modifierOperation": "AddHalfProficiencyBonus",
"modifierValue": 1,
"modifierValue": 0,
"modifierAbilityScore": "Constitution",
"situationalContext": 9015,
"minimum1": false,
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"$type": "FeatureDefinitionAttributeModifier, Assembly-CSharp",
"modifiedAttribute": "ArmorClass",
"modifierOperation": "AddConditionAmount",
"modifierValue": 1,
"modifierValue": 0,
"modifierAbilityScore": "Constitution",
"situationalContext": "None",
"minimum1": false,
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"$type": "FeatureDefinitionAttributeModifier, Assembly-CSharp",
"modifiedAttribute": "HitPoints",
"modifierOperation": "AddConditionAmount",
"modifierValue": 1,
"modifierValue": 0,
"modifierAbilityScore": "Constitution",
"situationalContext": "None",
"minimum1": false,
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"$type": "FeatureDefinitionMoveMode, Assembly-CSharp",
"moveMode": "Fly",
"speed": 0,
"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": "f32a5326-5471-53f8-80fa-86098b13d002",
"contentPack": 9999,
"name": "MoveModeTelekinesis"
}
Loading

0 comments on commit 03fa6f2

Please sign in to comment.