Skip to content

Commit

Permalink
Merge pull request #4427 from SolastaMods/dev
Browse files Browse the repository at this point in the history 
1.5.97.1
  • Loading branch information
@ThyWoof
ThyWoof authored Mar 15, 2024
2 parents 3a8a6ba + 310be43 commit a5d970b
Show file tree
Hide file tree
Showing 171 changed files with 7,122 additions and 1,480 deletions.
50 changes: 39 additions & 11 deletions Diagnostics/CE-Definitions-GuiPresentation-InvalidSyntaxTranslation-en.txt
View file

Large diffs are not rendered by default.

44 changes: 42 additions & 2 deletions Diagnostics/UnfinishedBusinessBlueprints/Assets.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -662,6 +662,7 @@ ConditionFeatNaturalFluidityGain1Slot ConditionDefinition ConditionDefinition c7
ConditionFeatNaturalFluidityGain2Slot ConditionDefinition ConditionDefinition fefa41e2-ffc2-5fd5-960a-57b83dbfc026
ConditionFeatNaturalFluidityGain3Slot ConditionDefinition ConditionDefinition f22de049-5ea1-5ba8-b07a-8bf593a07e93
ConditionFeatPowerAttack ConditionDefinition ConditionDefinition 9138a303-cd3a-551f-95e6-94dba23f85b2
ConditionFeatSecondChance ConditionDefinition ConditionDefinition 4f045474-ca65-5d4d-a7ef-48e8fe511221
ConditionFeatShieldTechniquesSavingThrow ConditionDefinition ConditionDefinition 146c7460-3d6a-5863-ada2-ce4ea41ff378
ConditionFeatSlasherCriticalHit ConditionDefinition ConditionDefinition 14360633-7e0f-58e7-9b0e-e97ae54d9428
ConditionFeatSlasherHit ConditionDefinition ConditionDefinition 05efc7df-fa62-579a-abcb-922c55e61c80
Expand Down Expand Up @@ -714,6 +715,11 @@ ConditionGambitSwitchSelf ConditionDefinition ConditionDefinition f88f01a5-058e-
ConditionGambitThreaten ConditionDefinition ConditionDefinition 4be70ef4-02a2-5be8-be5d-342141bd66d8
ConditionGambitUrgent ConditionDefinition ConditionDefinition 4d8a5ac8-ea3d-5e38-a470-3ef45a33ae26
ConditionGiftOfAlacrity ConditionDefinition ConditionDefinition 7a7f9641-5d98-513c-9dd8-8f8344a9b218
ConditionGiftOfTheChromaticDragonDamageAcid ConditionDefinition ConditionDefinition 996a8934-2d17-59af-82f5-403f28f95a0b
ConditionGiftOfTheChromaticDragonDamageCold ConditionDefinition ConditionDefinition 10977a76-ca69-5c55-8f8e-55e124e561ae
ConditionGiftOfTheChromaticDragonDamageFire ConditionDefinition ConditionDefinition 36e168e5-ccb2-539d-b735-7953ef295b21
ConditionGiftOfTheChromaticDragonDamageLightning ConditionDefinition ConditionDefinition a4ca0c1c-fbea-51b6-a622-9105a9a7932f
ConditionGiftOfTheChromaticDragonDamagePoison ConditionDefinition ConditionDefinition 6cf96f9b-b329-5af6-9c28-ead86e5b14b5
ConditionGrappledRestrainedEnsnared ConditionDefinition ConditionDefinition 526a12f3-594a-5627-82fa-8403e9315b07
ConditionGrappledRestrainedIceBound ConditionDefinition ConditionDefinition 968f2f49-dd5a-5f60-99e0-fe22f189bad2
ConditionGrappledRestrainedSpellWeb ConditionDefinition ConditionDefinition 7593e0f9-a1ff-539c-bf19-9ba1c7abfd60
Expand Down Expand Up @@ -1111,6 +1117,7 @@ FeatFlameTouchedCha FeatDefinition FeatDefinition a105baf4-1ff7-5e90-9099-61fd82
FeatFlameTouchedInt FeatDefinition FeatDefinition 150db01e-66d6-5d12-88bd-b1615051cc8c
FeatFlameTouchedWis FeatDefinition FeatDefinition 7c1afda8-9afa-5237-a0e0-b1b0dccfca78
FeatFrostAdaptation FeatDefinition FeatDefinition d2739d75-961f-597c-a279-7f5e672e50e7
FeatGiftOfTheChromaticDragon FeatDefinition FeatDefinition 18cae195-bdf3-5d8c-bb90-f85cbf91415c
FeatGreatWeapon FeatDefinitionWithPrerequisites FeatDefinition 96cb0fa7-ea6c-51a7-9eb6-84fc602d9501
FeatGroupAegisTouched FeatDefinition FeatDefinition d44096ee-4801-5161-9b3c-e5916304bbda
FeatGroupAgilityCombat FeatDefinition FeatDefinition 3d77dbe9-b434-55b4-af78-5cd2d190d494
Expand Down Expand Up @@ -1160,6 +1167,7 @@ FeatGroupRaceBound FeatDefinition FeatDefinition 08dd4258-765f-5a45-97c8-468f0ba
FeatGroupRangedCombat FeatDefinition FeatDefinition c478e23f-556b-5cd4-8540-6cac7a1b13d0
FeatGroupRetinueTouched FeatDefinition FeatDefinition d71d0040-b4fc-5d60-acf3-b5929a9d1990
FeatGroupRevenantGreatSword FeatDefinitionWithPrerequisites FeatDefinition 2b9de6a3-d310-5ee6-a680-de822e84a7d7
FeatGroupSecondChance FeatDefinitionWithPrerequisites FeatDefinition d2fc5f3a-bb59-585f-a589-e348ee1b29c2
FeatGroupShadowTouched FeatDefinition FeatDefinition 8279eade-c82e-56e7-94ab-6cfadf16b4a4
FeatGroupSkills FeatDefinition FeatDefinition 3a0ce468-e42e-5dcb-b43d-ec6205618dd0
FeatGroupSlasher FeatDefinition FeatDefinition bec59749-ea7e-5090-bd55-e4e0cfd7b343
Expand Down Expand Up @@ -1238,6 +1246,9 @@ FeatRevenantGreatSwordDex FeatDefinitionWithPrerequisites FeatDefinition ec489b3
FeatRevenantGreatSwordStr FeatDefinitionWithPrerequisites FeatDefinition 9f8126fa-5634-5dc8-b9fa-ae83d8ef01d2
FeatRopeItUp FeatDefinitionWithPrerequisites FeatDefinition f3b31d3e-1fd9-5aa3-ab73-1ba343a45840
FeatSavageAttack FeatDefinition FeatDefinition 9d9b6ca7-e9ff-5d6f-9a74-d1226e179ef4
FeatSecondChanceCha FeatDefinitionWithPrerequisites FeatDefinition 4990af6f-1705-541a-acb1-1931e88b0af2
FeatSecondChanceCon FeatDefinitionWithPrerequisites FeatDefinition e1376d00-a9ce-53a0-b6cb-4355e46a68b1
FeatSecondChanceDex FeatDefinitionWithPrerequisites FeatDefinition 947401e0-17dc-5f4c-bae5-c092e34a45c9
FeatSentinel FeatDefinitionWithPrerequisites FeatDefinition 3682aea3-2741-538a-9471-d8d00bf2cd0f
FeatShadowTouchedCha FeatDefinition FeatDefinition 38c0a46e-5443-5fe2-aa4d-c726e0656514
FeatShadowTouchedInt FeatDefinition FeatDefinition b3d92fa6-273c-51c1-8a12-fd52fa5003da
Expand Down Expand Up @@ -1536,6 +1547,11 @@ AttackModifierDeadMasterUndeadChains FeatureDefinitionAttackModifier FeatureDefi
AttackModifierFeatRangedExpert FeatureDefinitionAttackModifier FeatureDefinition 572ac926-b62b-5d05-a016-842718698dec
AttackModifierFeatSpearMastery FeatureDefinitionAttackModifier FeatureDefinition 9622edb0-0db2-5ddf-a91b-dc3551b4a6a3
AttackModifierForestGuardianSylvanDurability FeatureDefinitionAttackModifier FeatureDefinition a331f6cd-053a-528e-9ae1-ba4626cca57a
AttackModifierGiftOfTheChromaticDragonDamageAcid FeatureDefinitionAdditionalDamage FeatureDefinition 8c702240-dbcf-515d-8fb2-299f57d93f0e
AttackModifierGiftOfTheChromaticDragonDamageCold FeatureDefinitionAdditionalDamage FeatureDefinition 82a723a7-bb5a-53b2-ad4b-70bedccb0439
AttackModifierGiftOfTheChromaticDragonDamageFire FeatureDefinitionAdditionalDamage FeatureDefinition 778a40cd-b015-5cb1-acbf-9100d989a75e
AttackModifierGiftOfTheChromaticDragonDamageLightning FeatureDefinitionAdditionalDamage FeatureDefinition 69f99a61-eebc-5654-882a-3a4d07adb8b2
AttackModifierGiftOfTheChromaticDragonDamagePoison FeatureDefinitionAdditionalDamage FeatureDefinition 803c6922-09a0-526d-a4cb-29174879f8a4
AttackModifierHandAndAHalf FeatureDefinitionAttackModifier FeatureDefinition d39a2a64-26af-5ef5-8355-6ec9092b4e41
AttackModifierHeroicInfusion FeatureDefinitionCombatAffinity FeatureDefinition 45cbbf01-2362-5421-a779-4098016bef81
AttackModifierInfusionEnhanceWeapon FeatureDefinitionAttackModifier FeatureDefinition 69c1f195-9e49-5be0-b238-17442eb8a51d
Expand Down Expand Up @@ -1964,6 +1980,7 @@ FeatureFeatCleavingAttackFinish FeatureDefinition FeatureDefinition 1f5fa1d9-38e
FeatureFeatCrusher FeatureDefinition FeatureDefinition 64e6fea6-765a-5c24-ad0d-83be18d62d96
FeatureFeatHardy FeatureDefinition FeatureDefinition b4f8d7ee-079f-57dd-b420-f0980b030849
FeatureFeatPiercer FeatureDefinitionDieRollModifier FeatureDefinition 338a8e7d-d1be-5434-b3b1-8d23c2346a90
FeatureFeatSecondChance FeatureDefinition FeatureDefinition 746ce09a-b4da-5242-a0d6-d437f2beaa60
FeatureFeatSlasher FeatureDefinition FeatureDefinition de775d90-7155-534a-b21f-d8c00d22ae87
FeatureFightingStyleExecutioner FeatureDefinition FeatureDefinition 44cbdc12-60f2-546b-8b9a-2be9e29b7c23
FeatureGambitBrace FeatureDefinition FeatureDefinition 658fc369-f155-5aea-aa29-b8b92f31c36f
Expand Down Expand Up @@ -2797,6 +2814,13 @@ PowerGambitSwitchActivate FeatureDefinitionPowerSharedPool FeatureDefinition c41
PowerGambitThreatenActivate FeatureDefinitionPower FeatureDefinition eedde018-0318-536a-a304-de616507919a
PowerGambitThreatenReact FeatureDefinitionPowerSharedPool FeatureDefinition 80e20d99-a5f1-5e01-8ce3-97d4243e40e8
PowerGambitUrgentActivate FeatureDefinitionPowerSharedPool FeatureDefinition ffd2e477-1eaf-52ba-8d1f-32a4055e692e
PowerGiftOfTheChromaticDragonChromaticInfusion FeatureDefinitionPower FeatureDefinition f993c332-7eca-5cca-81b6-0351f7909d98
PowerGiftOfTheChromaticDragonDamageAcid FeatureDefinitionPowerSharedPool FeatureDefinition 3de5527d-fe57-51db-a87d-c21c020275a1
PowerGiftOfTheChromaticDragonDamageCold FeatureDefinitionPowerSharedPool FeatureDefinition 8ad5f602-69ee-596b-a22b-fcc9bc533902
PowerGiftOfTheChromaticDragonDamageFire FeatureDefinitionPowerSharedPool FeatureDefinition 148ea53c-245d-59ad-ae25-8c32b2d8d54b
PowerGiftOfTheChromaticDragonDamageLightning FeatureDefinitionPowerSharedPool FeatureDefinition 612d9e92-f959-5b0a-9c88-320cd96e304c
PowerGiftOfTheChromaticDragonDamagePoison FeatureDefinitionPowerSharedPool FeatureDefinition 37753c37-0501-5ec7-96df-26cd5c2f5bea
PowerGiftOfTheChromaticDragonReactiveResistance FeatureDefinitionPower FeatureDefinition de9b1627-30f9-5f78-992a-58bbde7cbc90
PowerGrayDwarfInvisibility FeatureDefinitionPower FeatureDefinition c4864fef-ecc0-5cf5-bb63-638addf6e90a
PowerGrayDwarfStoneStrength FeatureDefinitionPower FeatureDefinition a3310dbb-532e-56a8-ba7d-cb855cabe127
PowerHandwrapsOfPulling FeatureDefinitionPower FeatureDefinition 81b318cf-8220-5876-bac8-996c44adcdb9
Expand Down Expand Up @@ -2960,7 +2984,6 @@ PowerInvocationVexingHex FeatureDefinitionPower FeatureDefinition 7f1c83a5-1539-
PowerLightningArrowLeap FeatureDefinitionPower FeatureDefinition 5a02449f-aac5-5003-8192-c10c3a1a1c49
PowerMalakhAngelicFlight FeatureDefinitionPower FeatureDefinition 43d93184-e3fe-5e9d-ada6-fc9bdcfec9a1
PowerMalakhAngelicRadiance FeatureDefinitionPower FeatureDefinition da692cfd-2a1e-5c2d-a919-3dafe53ab2cc
PowerMalakhAngelicRadianceDamage FeatureDefinitionPower FeatureDefinition edec8afa-5a52-5ec1-9bff-7f3e0b96d80d
PowerMalakhAngelicVisage FeatureDefinitionPower FeatureDefinition d71f91ca-035b-583c-b612-6478801b8a3d
PowerMalakhHealingTouch FeatureDefinitionPower FeatureDefinition 76546263-34e5-5f4c-a0f4-1b1bf26d5c45
PowerMartialArcaneArcherArcaneShot FeatureDefinitionPower FeatureDefinition 3bd8b406-0722-5aa1-9e50-f2e5b2d100ae
Expand Down Expand Up @@ -3665,6 +3688,11 @@ AdditionalDamageWayOfTheTempestEyeOfTheStorm FeatureDefinitionAdditionalDamage F
AdditionalDamageWayOfTheTempestGatheringStorm FeatureDefinitionAdditionalDamage FeatureDefinitionAdditionalDamage 7925249d-a7b3-5f40-b8d7-80ff07fe330e
AdditionalDamageWizardGraviturgistViolentAttraction FeatureDefinitionAdditionalDamage FeatureDefinitionAdditionalDamage 613c3d37-db3c-572d-8910-abd08bed673e
AdditionalDamageWrathfulSmite FeatureDefinitionAdditionalDamage FeatureDefinitionAdditionalDamage a4155f80-3b56-5bb3-93fd-5f38a7e23c3b
AttackModifierGiftOfTheChromaticDragonDamageAcid FeatureDefinitionAdditionalDamage FeatureDefinitionAdditionalDamage 8c702240-dbcf-515d-8fb2-299f57d93f0e
AttackModifierGiftOfTheChromaticDragonDamageCold FeatureDefinitionAdditionalDamage FeatureDefinitionAdditionalDamage 82a723a7-bb5a-53b2-ad4b-70bedccb0439
AttackModifierGiftOfTheChromaticDragonDamageFire FeatureDefinitionAdditionalDamage FeatureDefinitionAdditionalDamage 778a40cd-b015-5cb1-acbf-9100d989a75e
AttackModifierGiftOfTheChromaticDragonDamageLightning FeatureDefinitionAdditionalDamage FeatureDefinitionAdditionalDamage 69f99a61-eebc-5654-882a-3a4d07adb8b2
AttackModifierGiftOfTheChromaticDragonDamagePoison FeatureDefinitionAdditionalDamage FeatureDefinitionAdditionalDamage 803c6922-09a0-526d-a4cb-29174879f8a4
FeatureEldritchVersatilityBlastEmpower FeatureDefinitionAdditionalDamage FeatureDefinitionAdditionalDamage 79c3f7d9-7672-5462-abf0-e29b3764059b
MagicAffinitySpellShieldCombatMagicVigor FeatureDefinitionAdditionalDamage FeatureDefinitionAdditionalDamage d397da35-229d-53b3-afda-26524a45f0f1
AbilityCheckAffinityBladeDancerBladeDanceAcrobatics FeatureDefinitionAbilityCheckAffinity FeatureDefinitionAffinity 9ad0158a-0879-5f58-baf0-c5f04ccc4615
Expand Down Expand Up @@ -5115,6 +5143,13 @@ PowerGambitSwitchActivate FeatureDefinitionPowerSharedPool FeatureDefinitionPowe
PowerGambitThreatenActivate FeatureDefinitionPower FeatureDefinitionPower eedde018-0318-536a-a304-de616507919a
PowerGambitThreatenReact FeatureDefinitionPowerSharedPool FeatureDefinitionPower 80e20d99-a5f1-5e01-8ce3-97d4243e40e8
PowerGambitUrgentActivate FeatureDefinitionPowerSharedPool FeatureDefinitionPower ffd2e477-1eaf-52ba-8d1f-32a4055e692e
PowerGiftOfTheChromaticDragonChromaticInfusion FeatureDefinitionPower FeatureDefinitionPower f993c332-7eca-5cca-81b6-0351f7909d98
PowerGiftOfTheChromaticDragonDamageAcid FeatureDefinitionPowerSharedPool FeatureDefinitionPower 3de5527d-fe57-51db-a87d-c21c020275a1
PowerGiftOfTheChromaticDragonDamageCold FeatureDefinitionPowerSharedPool FeatureDefinitionPower 8ad5f602-69ee-596b-a22b-fcc9bc533902
PowerGiftOfTheChromaticDragonDamageFire FeatureDefinitionPowerSharedPool FeatureDefinitionPower 148ea53c-245d-59ad-ae25-8c32b2d8d54b
PowerGiftOfTheChromaticDragonDamageLightning FeatureDefinitionPowerSharedPool FeatureDefinitionPower 612d9e92-f959-5b0a-9c88-320cd96e304c
PowerGiftOfTheChromaticDragonDamagePoison FeatureDefinitionPowerSharedPool FeatureDefinitionPower 37753c37-0501-5ec7-96df-26cd5c2f5bea
PowerGiftOfTheChromaticDragonReactiveResistance FeatureDefinitionPower FeatureDefinitionPower de9b1627-30f9-5f78-992a-58bbde7cbc90
PowerGrayDwarfInvisibility FeatureDefinitionPower FeatureDefinitionPower c4864fef-ecc0-5cf5-bb63-638addf6e90a
PowerGrayDwarfStoneStrength FeatureDefinitionPower FeatureDefinitionPower a3310dbb-532e-56a8-ba7d-cb855cabe127
PowerHandwrapsOfPulling FeatureDefinitionPower FeatureDefinitionPower 81b318cf-8220-5876-bac8-996c44adcdb9
Expand Down Expand Up @@ -5278,7 +5313,6 @@ PowerInvocationVexingHex FeatureDefinitionPower FeatureDefinitionPower 7f1c83a5-
PowerLightningArrowLeap FeatureDefinitionPower FeatureDefinitionPower 5a02449f-aac5-5003-8192-c10c3a1a1c49
PowerMalakhAngelicFlight FeatureDefinitionPower FeatureDefinitionPower 43d93184-e3fe-5e9d-ada6-fc9bdcfec9a1
PowerMalakhAngelicRadiance FeatureDefinitionPower FeatureDefinitionPower da692cfd-2a1e-5c2d-a919-3dafe53ab2cc
PowerMalakhAngelicRadianceDamage FeatureDefinitionPower FeatureDefinitionPower edec8afa-5a52-5ec1-9bff-7f3e0b96d80d
PowerMalakhAngelicVisage FeatureDefinitionPower FeatureDefinitionPower d71f91ca-035b-583c-b612-6478801b8a3d
PowerMalakhHealingTouch FeatureDefinitionPower FeatureDefinitionPower 76546263-34e5-5f4c-a0f4-1b1bf26d5c45
PowerMartialArcaneArcherArcaneShot FeatureDefinitionPower FeatureDefinitionPower 3bd8b406-0722-5aa1-9e50-f2e5b2d100ae
Expand Down Expand Up @@ -11032,6 +11066,12 @@ SpellPowerFeatSpiritualFluidityGainSlot1 SpellDefinition SpellDefinition 71f66ce
SpellPowerFeatSpiritualFluidityGainSlot2 SpellDefinition SpellDefinition efcacda5-a7bd-5bd1-94e2-c8d9cf6ccf42
SpellPowerFeatSpiritualFluidityGainSlot3 SpellDefinition SpellDefinition 4a45e7f0-6ce6-5f53-97bb-3322fcf919c4
SpellPowerFeatSpiritualFluidityGainSlotPool SpellDefinition SpellDefinition 3bc57c0b-3b86-510d-9168-a9327d55bbe1
SpellPowerGiftOfTheChromaticDragonChromaticInfusion SpellDefinition SpellDefinition 5d8e5cdb-a181-5d6d-a7a5-38b057597d36
SpellPowerGiftOfTheChromaticDragonDamageAcid SpellDefinition SpellDefinition 3dc5b372-c92e-51be-ab94-ec3fe234dace
SpellPowerGiftOfTheChromaticDragonDamageCold SpellDefinition SpellDefinition c0f59dfa-7e84-590f-9608-38d42774f338
SpellPowerGiftOfTheChromaticDragonDamageFire SpellDefinition SpellDefinition 61cb5e9f-d2bf-5a8a-b673-4e671ead367c
SpellPowerGiftOfTheChromaticDragonDamageLightning SpellDefinition SpellDefinition 067f8a7b-fb91-57e1-8e44-48ce260d3945
SpellPowerGiftOfTheChromaticDragonDamagePoison SpellDefinition SpellDefinition 67f2dd0e-7b0a-5311-a293-49145f61767b
SpellPowerInfusionMajorElemental SpellDefinition SpellDefinition aac53c48-8e24-5e6d-9e5e-7b9b9d71330a
SpellPowerInfusionMajorElementalDamageAcid SpellDefinition SpellDefinition 142f840f-1adf-5239-9c9d-2f61a3fce4ac
SpellPowerInfusionMajorElementalDamageCold SpellDefinition SpellDefinition e5025c1b-e5c4-52f1-b1f7-e6b52e4d8acf
Expand Down
15 changes: 0 additions & 15 deletions Diagnostics/UnfinishedBusinessBlueprints/CharacterSubclassDefinition/PathOfTheElements.json
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,11 @@
{
"$type": "CharacterSubclassDefinition, Assembly-CSharp",
"featureUnlocks": [
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:PowerPathOfTheElementsBlizzard:d7a31d80-842a-501f-be65-27c349571abd",
"level": 3
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:FeatureSetPathOfTheElementsElementalFury:89f104f7-fa74-5ef6-9717-e357b12e87bf",
"level": 3
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:PowerPathOfTheElementsStorm:daeb69ac-02ba-54ee-ba72-8929ebc573cb",
"level": 3
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:PowerPathOfTheElementsWildfire:316fcbaf-9d5f-5dd7-8a67-cdedbb86b2cb",
"level": 3
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:FeatureSetPathOfTheElementsElementalBlessing:e6c56f22-8cab-5050-897e-b82eb3d92717",
Expand Down
Loading

0 comments on commit a5d970b

Please sign in to comment.