Skip to content

Commit

Permalink
Merge pull request #4697 from SolastaMods/dev
Browse files Browse the repository at this point in the history
1.5.97.14
  • Loading branch information
ThyWoof authored Jun 9, 2024
2 parents 3d2406c + 1934305 commit 8491ac7
Show file tree
Hide file tree
Showing 171 changed files with 9,432 additions and 1,993 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,16 @@ CombatAffinityFeatSpellSniperSorcerer Title='Spell Sniper [Sorcerer]'.
CombatAffinityFeatSpellSniperWarlock Title='Spell Sniper [Warlock]'.
CombatAffinityFeatSpellSniperWizard Title='Spell Sniper [Wizard]'.
CombatAffinityWayOfTheDiscordanceTurmoil Title='Turmoil'.
ConditionElementalBaneDamageAcid Title='Elemental Bane: Acid Damage'.
ConditionElementalBaneDamageAcid Description='The first time each turn you take Acid Damage damage, you take an extra 2d6 Acid Damage damage. Moreover, You lose any resistance to Acid Damage damage until the spell ends.'.
ConditionElementalBaneDamageCold Title='Elemental Bane: Cold Damage'.
ConditionElementalBaneDamageCold Description='The first time each turn you take Cold Damage damage, you take an extra 2d6 Cold Damage damage. Moreover, You lose any resistance to Cold Damage damage until the spell ends.'.
ConditionElementalBaneDamageFire Title='Elemental Bane: Fire Damage'.
ConditionElementalBaneDamageFire Description='The first time each turn you take Fire Damage damage, you take an extra 2d6 Fire Damage damage. Moreover, You lose any resistance to Fire Damage damage until the spell ends.'.
ConditionElementalBaneDamageLightning Title='Elemental Bane: Lightning Damage'.
ConditionElementalBaneDamageLightning Description='The first time each turn you take Lightning Damage damage, you take an extra 2d6 Lightning Damage damage. Moreover, You lose any resistance to Lightning Damage damage until the spell ends.'.
ConditionElementalBaneDamageThunder Title='Elemental Bane: Thunder Damage'.
ConditionElementalBaneDamageThunder Description='The first time each turn you take Thunder Damage damage, you take an extra 2d6 Thunder Damage damage. Moreover, You lose any resistance to Thunder Damage damage until the spell ends.'.
ConditionElementalInfusionAcidDamage Title='Acid Damage Infusion'.
ConditionElementalInfusionAcidDamage Description='Your next melee attack deals an additional 1d6 Acid Damage per slot level spent.'.
ConditionElementalInfusionAcidResistance Title='Acid Damage Infusion'.
Expand Down Expand Up @@ -734,6 +744,11 @@ DieRollModifierDamageTypeDependentFeatElementalMasterDamagePoison Title='Element
DieRollModifierDamageTypeDependentFeatElementalMasterDamagePoison Description='Poison damage type spells you cast ignore target's immunity to damage. In addition, when you roll attack for these spells, you can reroll any 1s.'.
DieRollModifierDamageTypeDependentFeatElementalMasterDamageThunder Title='Elemental Master [Thunder]'.
DieRollModifierDamageTypeDependentFeatElementalMasterDamageThunder Description='Thunder damage type spells you cast ignore target's immunity to damage. In addition, when you roll attack for these spells, you can reroll any 1s.'.
ElementalBaneDamageAcid Title='Elemental Bane: Acid Damage'.
ElementalBaneDamageCold Title='Elemental Bane: Cold Damage'.
ElementalBaneDamageFire Title='Elemental Bane: Fire Damage'.
ElementalBaneDamageLightning Title='Elemental Bane: Lightning Damage'.
ElementalBaneDamageThunder Title='Elemental Bane: Thunder Damage'.
FeatAwakenTheBeastWithinCharisma Title='Awaken the Beast [Cha]'.
FeatAwakenTheBeastWithinCharisma Description='Increase your Charisma by 1, to a maximum of 20. Whenever you use your Wild Shape ability to transform into a beast, you gain temporary hit points equal to twice your druid level.'.
FeatAwakenTheBeastWithinConstitution Title='Awaken the Beast [Con]'.
Expand Down
66 changes: 63 additions & 3 deletions Diagnostics/UnfinishedBusinessBlueprints/Assets.txt

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@
"featureDefinition": "Definition:PowerMartialGuardianGrandChallenge:015d6844-d0f7-5ca9-b3d3-5a69e616fa0b",
"level": 10
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:ActionAffinityMartialGuardianVigilance:f6ac6c26-2020-59c7-8b1f-78831b915690",
"level": 15
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:PerceptionAffinityMartialGuardianVigilance:b0c29b41-a91c-5a72-acb5-8c0f38bb3b58",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
{
"$type": "ConditionDefinition, Assembly-CSharp",
"inDungeonEditor": false,
"parentCondition": null,
"conditionType": "Beneficial",
"features": [
"Definition:CombatAffinityAshardalonStride:3bc238ab-1b3e-5c2d-ac2a-0e2aa450326a",
"Definition:MovementAffinityAshardalonStride3:c6c95315-6ce3-5d1e-bf8f-ee8641723092"
],
"allowMultipleInstances": false,
"silentWhenAdded": false,
"silentWhenRemoved": false,
"silentWhenRefreshed": false,
"terminateWhenRemoved": false,
"specialDuration": false,
"durationType": "Hour",
"durationParameterDie": "D4",
"durationParameter": 1,
"forceTurnOccurence": false,
"turnOccurence": "EndOfTurn",
"specialInterruptions": [],
"interruptionRequiresSavingThrow": false,
"interruptionSavingThrowComputationMethod": "SaveOverride",
"interruptionSavingThrowAbility": "",
"interruptionDamageThreshold": 0,
"keepConditionIfSavingThrowSucceeds": false,
"interruptionSavingThrowAffinity": "None",
"conditionTags": [],
"recurrentEffectForms": [],
"cancellingConditions": [],
"additionalDamageWhenHit": false,
"additionalDamageTypeDetermination": "Specific",
"additionalDamageType": "",
"additionalDamageQuantity": "AbilityBonus",
"additionalDamageDieType": "D1",
"additionalDamageDieNumber": 1,
"additionalConditionWhenHit": false,
"additionalCondition": null,
"additionalConditionDurationType": "Round",
"additionalConditionDurationParameter": 1,
"additionalConditionTurnOccurenceType": "StartOfTurn",
"conditionStartParticleReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": null,
"m_SubObjectType": null
},
"conditionParticleReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "e13d321e7272a644daf36f792d2677e7",
"m_SubObjectName": "",
"m_SubObjectType": ""
},
"conditionEndParticleReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": null,
"m_SubObjectType": null
},
"recurrentEffectParticleReference": null,
"characterShaderReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": null,
"m_SubObjectType": null
},
"particlesBasedOnAncestryDamageType": false,
"ancestryType": "Sorcerer",
"acidParticleParameters": null,
"coldParticleParameters": null,
"fireParticleParameters": null,
"lightningParticleParameters": null,
"poisonParticleParameters": null,
"overrideCharacterShaderColors": false,
"firstCharacterShaderColor": {
"$type": "UnityEngine.Color, UnityEngine.CoreModule",
"r": 0.0,
"g": 0.0,
"b": 0.0,
"a": 0.0
},
"secondCharacterShaderColor": {
"$type": "UnityEngine.Color, UnityEngine.CoreModule",
"r": 0.0,
"g": 0.0,
"b": 0.0,
"a": 0.0
},
"timeToWaitBeforeApplyingShader": 0.5,
"timeToWaitBeforeRemovingShader": 0.5,
"possessive": true,
"amountOrigin": "None",
"baseAmount": 0,
"additiveAmount": false,
"sourceAbilityBonusMinValue": 1,
"subsequentOnRemoval": null,
"subsequentHasSavingThrow": false,
"subsequentSavingThrowAbilityScore": "Constitution",
"subsequentVariableForDC": "FrenzyExhaustionDC",
"subsequentDCIncrease": 5,
"effectFormsOnRemoved": [],
"forceBehavior": false,
"addBehavior": false,
"fearSource": false,
"battlePackage": null,
"explorationPackage": null,
"removedFromTheGame": false,
"permanentlyRemovedIfExtraPlanar": false,
"refundReceivedDamageWhenRemoved": false,
"followSourcePosition": false,
"disolveCharacterOnDeath": false,
"disolveParameters": {
"$type": "GraphicsCharacterDefinitions+DisolveParameters, Assembly-CSharp",
"color": {
"$type": "UnityEngine.Color, UnityEngine.CoreModule",
"r": 0.0,
"g": 0.0,
"b": 0.0,
"a": 0.0
},
"colorWidth": 0.0,
"noiseScale": 5.0,
"hueScale": 0.0,
"vertexOffset": 0.0,
"curve": {
"$type": "UnityEngine.AnimationCurve, UnityEngine.CoreModule"
},
"startAfterDeathAnimation": false,
"duration": 0.0
},
"guiPresentation": {
"$type": "GuiPresentation, Assembly-CSharp",
"hidden": false,
"title": "Spell/&AshardalonStrideTitle",
"description": "Feature/&NoContentTitle",
"spriteReference": {
"$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
"m_AssetGUID": "330874c01be3cf6408fc2d0a8e697c0a",
"m_SubObjectName": "ConditionPositiveMovement",
"m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=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": "44540cba-9177-5d81-8f3a-64b6157fdca1",
"contentPack": 9999,
"name": "ConditionAshardalonStride3"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
{
"$type": "ConditionDefinition, Assembly-CSharp",
"inDungeonEditor": false,
"parentCondition": null,
"conditionType": "Beneficial",
"features": [
"Definition:CombatAffinityAshardalonStride:3bc238ab-1b3e-5c2d-ac2a-0e2aa450326a",
"Definition:MovementAffinityAshardalonStride4:acd4d5fd-0f58-52bc-97be-b143a6bd3f0e"
],
"allowMultipleInstances": false,
"silentWhenAdded": false,
"silentWhenRemoved": false,
"silentWhenRefreshed": false,
"terminateWhenRemoved": false,
"specialDuration": false,
"durationType": "Hour",
"durationParameterDie": "D4",
"durationParameter": 1,
"forceTurnOccurence": false,
"turnOccurence": "EndOfTurn",
"specialInterruptions": [],
"interruptionRequiresSavingThrow": false,
"interruptionSavingThrowComputationMethod": "SaveOverride",
"interruptionSavingThrowAbility": "",
"interruptionDamageThreshold": 0,
"keepConditionIfSavingThrowSucceeds": false,
"interruptionSavingThrowAffinity": "None",
"conditionTags": [],
"recurrentEffectForms": [],
"cancellingConditions": [],
"additionalDamageWhenHit": false,
"additionalDamageTypeDetermination": "Specific",
"additionalDamageType": "",
"additionalDamageQuantity": "AbilityBonus",
"additionalDamageDieType": "D1",
"additionalDamageDieNumber": 1,
"additionalConditionWhenHit": false,
"additionalCondition": null,
"additionalConditionDurationType": "Round",
"additionalConditionDurationParameter": 1,
"additionalConditionTurnOccurenceType": "StartOfTurn",
"conditionStartParticleReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": null,
"m_SubObjectType": null
},
"conditionParticleReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "e13d321e7272a644daf36f792d2677e7",
"m_SubObjectName": "",
"m_SubObjectType": ""
},
"conditionEndParticleReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": null,
"m_SubObjectType": null
},
"recurrentEffectParticleReference": null,
"characterShaderReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": null,
"m_SubObjectType": null
},
"particlesBasedOnAncestryDamageType": false,
"ancestryType": "Sorcerer",
"acidParticleParameters": null,
"coldParticleParameters": null,
"fireParticleParameters": null,
"lightningParticleParameters": null,
"poisonParticleParameters": null,
"overrideCharacterShaderColors": false,
"firstCharacterShaderColor": {
"$type": "UnityEngine.Color, UnityEngine.CoreModule",
"r": 0.0,
"g": 0.0,
"b": 0.0,
"a": 0.0
},
"secondCharacterShaderColor": {
"$type": "UnityEngine.Color, UnityEngine.CoreModule",
"r": 0.0,
"g": 0.0,
"b": 0.0,
"a": 0.0
},
"timeToWaitBeforeApplyingShader": 0.5,
"timeToWaitBeforeRemovingShader": 0.5,
"possessive": true,
"amountOrigin": "None",
"baseAmount": 0,
"additiveAmount": false,
"sourceAbilityBonusMinValue": 1,
"subsequentOnRemoval": null,
"subsequentHasSavingThrow": false,
"subsequentSavingThrowAbilityScore": "Constitution",
"subsequentVariableForDC": "FrenzyExhaustionDC",
"subsequentDCIncrease": 5,
"effectFormsOnRemoved": [],
"forceBehavior": false,
"addBehavior": false,
"fearSource": false,
"battlePackage": null,
"explorationPackage": null,
"removedFromTheGame": false,
"permanentlyRemovedIfExtraPlanar": false,
"refundReceivedDamageWhenRemoved": false,
"followSourcePosition": false,
"disolveCharacterOnDeath": false,
"disolveParameters": {
"$type": "GraphicsCharacterDefinitions+DisolveParameters, Assembly-CSharp",
"color": {
"$type": "UnityEngine.Color, UnityEngine.CoreModule",
"r": 0.0,
"g": 0.0,
"b": 0.0,
"a": 0.0
},
"colorWidth": 0.0,
"noiseScale": 5.0,
"hueScale": 0.0,
"vertexOffset": 0.0,
"curve": {
"$type": "UnityEngine.AnimationCurve, UnityEngine.CoreModule"
},
"startAfterDeathAnimation": false,
"duration": 0.0
},
"guiPresentation": {
"$type": "GuiPresentation, Assembly-CSharp",
"hidden": false,
"title": "Spell/&AshardalonStrideTitle",
"description": "Feature/&NoContentTitle",
"spriteReference": {
"$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
"m_AssetGUID": "330874c01be3cf6408fc2d0a8e697c0a",
"m_SubObjectName": "ConditionPositiveMovement",
"m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=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": "48e7a336-d3d9-59a5-8af1-18b828aa9cd8",
"contentPack": 9999,
"name": "ConditionAshardalonStride4"
}
Loading

0 comments on commit 8491ac7

Please sign in to comment.