Skip to content

Commit

Permalink
Merge pull request #4843 from SolastaMods/dev
Browse files Browse the repository at this point in the history
1.5.97.25
  • Loading branch information
ThyWoof authored Aug 4, 2024
2 parents efd8950 + 2c67f62 commit c5948b2
Show file tree
Hide file tree
Showing 1,255 changed files with 18,761 additions and 21,045 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,33 @@ CombatAffinityFeatSpellSniperSorcerer Title='Spell Sniper [Sorcerer]'.
CombatAffinityFeatSpellSniperWarlock Title='Spell Sniper [Warlock]'.
CombatAffinityFeatSpellSniperWizard Title='Spell Sniper [Wizard]'.
CombatAffinityWayOfTheDiscordanceTurmoil Title='Turmoil'.
ConditionAdderFangs Description='-'.
ConditionAshardalonStride3 Description='-'.
ConditionAshardalonStride4 Description='-'.
ConditionAshardalonStride5 Description='-'.
ConditionAshardalonStride6 Description='-'.
ConditionAshardalonStride7 Description='-'.
ConditionAshardalonStride8 Description='-'.
ConditionAshardalonStride9 Description='-'.
ConditionBlindedByCloudKill Title='Blinded by Cloudkill'.
ConditionBlindedByDarkness Title='Blinded by Darkness'.
ConditionBlindedByFogCloud Title='Blinded by Fog Cloud'.
ConditionBlindedByIncendiaryCloud Title='Blinded by Incendiary Cloud'.
ConditionBlindedByPetalStorm Title='Blinded by Petal Storm'.
ConditionBlindedBySleetStorm Title='Blinded by Sleet Storm'.
ConditionBlindedByStinkingCloud Title='Blinded by Stinking Cloud'.
ConditionCircleOfMagicalNegation Description='-'.
ConditionCircleOfTheCosmosArcher Description='-'.
ConditionCircleOfTheCosmosArcher14 Description='-'.
ConditionCircleOfTheCosmosDragon Description='-'.
ConditionCircleOfTheCosmosDragon10 Description='-'.
ConditionCircleOfTheCosmosDragon14 Description='-'.
ConditionCircleOfTheCosmosWealCosmosOmen Description='-'.
ConditionCircleOfTheCosmosWoeCosmosOmen Description='-'.
ConditionCrownOfStars Description='-'.
ConditionDistractedByAlly Description='-'.
ConditionDraconicTransformation Description='-'.
ConditionDragonWings Description='-'.
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'.
Expand Down Expand Up @@ -154,18 +181,52 @@ ConditionElementalistNormalFire Title='Channeling Fire Plane'.
ConditionElementalistNormalFire Description='Deal additional Fire damage equal to your proficiency bonus on a first hit each round.'.
ConditionElementalistNormalIce Title='Channeling Ice Plane'.
ConditionElementalistNormalIce Description='Deal additional Cold damage equal to your proficiency bonus on a first hit each round.'.
ConditionFeatAcrobat Description='-'.
ConditionFeatCallForCharge Description='-'.
ConditionFeatSlayTheEnemies1 Description='You have a bonus to attack and damage rolls equal to 1. If your target is a favored enemy, you have advantage instead of attack roll bonus.'.
ConditionFeatSlayTheEnemies2 Description='You have a bonus to attack and damage rolls equal to 2. If your target is a favored enemy, you have advantage instead of attack roll bonus.'.
ConditionFeatSlayTheEnemies3 Description='You have a bonus to attack and damage rolls equal to 3. If your target is a favored enemy, you have advantage instead of attack roll bonus.'.
ConditionFizbanPlatinumShield Description='-'.
ConditionGiftOfTheChromaticDragonDamageAcid Description='-'.
ConditionGiftOfTheChromaticDragonDamageCold Description='-'.
ConditionGiftOfTheChromaticDragonDamageFire Description='-'.
ConditionGiftOfTheChromaticDragonDamageLightning Description='-'.
ConditionGiftOfTheChromaticDragonDamagePoison Description='-'.
ConditionHamstringBlow Description='-'.
ConditionIntellectFortress Description='-'.
ConditionInvocationTombOfFrost Description='-'.
ConditionInvulnerability Description='-'.
ConditionKineticJaunt Description='-'.
ConditionLightSensitivity Description='-'.
ConditionMartialForceKnightForceBulwark Description='-'.
ConditionMoonlitScionFullMoon Description='-'.
ConditionMoonlitScionFullMoonLunarEmbrace Description='-'.
ConditionMoonlitScionFullMoonMidnightBlessing Description='-'.
ConditionMoonlitScionLunarChillEnemy Description='-'.
ConditionMoonlitScionLunarRadianceEnemy Description='-'.
ConditionMoonlitScionNewMoon Description='-'.
ConditionMoonlitScionNewMoonLunarEmbrace Description='-'.
ConditionMoonlitScionNewMoonMidnightBlessing Description='-'.
ConditionPsionicBlast Description='-'.
ConditionRangerGloomStalkerDreadAmbusher Description='-'.
ConditionRescueTheDying Description='-'.
ConditionResonatingStrike Description='-'.
ConditionRingOfBlades Description='-'.
ConditionShadarKaiTeleport Description='-'.
ConditionShelterFromEnergyDamageAcid Title='Acid Damage Resistance'.
ConditionShelterFromEnergyDamageCold Title='Cold Damage Resistance'.
ConditionShelterFromEnergyDamageFire Title='Fire Damage Resistance'.
ConditionShelterFromEnergyDamageLightning Title='Lightning Damage Resistance'.
ConditionShelterFromEnergyDamageNecrotic Title='Necrotic Damage Resistance'.
ConditionShelterFromEnergyDamageRadiant Title='Radiant Damage Resistance'.
ConditionShelterFromEnergyDamageThunder Title='Thunder Damage Resistance'.
ConditionSorcerousWildMagicDamageResistance Description='-'.
ConditionSorcerousWildMagicLightningStrike Description='-'.
ConditionSorcerousWildMagicPiercingVulnerability Description='-'.
ConditionStaggeringBlow Description='-'.
ConditionStopMovement Description='-'.
ConditionThunderousSmite Title='Thunderous Smite'.
ConditionVoidGrasp Description='-'.
CraftingManualRecipeEnchantBarbarianClothes_Deflection Title='Enchant Barbarian Clothes of Deflection'.
CraftingManualRecipeEnchantBarbarianClothes_FlameDancing Title='Enchant Barbarian Clothes of Flame Dancing'.
CraftingManualRecipeEnchantBarbarianClothes_FrostWalking Title='Enchant Barbarian Clothes of Frost Walking'.
Expand Down Expand Up @@ -789,7 +850,7 @@ FeatGroupCrusher Description='Increase your Strength or Constitution by 1, to a
When you hit a creature with an attack that deals bludgeoning damage, once per turn you push the enemy by 5ft. When you score a critical hit attack rolls against that creature are made with advantage until the start of your next turn.'.
FeatGroupDefenseCombat Description='Always Ready, Battle Fervor, Cloak and Dagger, Defensive Duelist, Dual Wielder, Fade Away, Raise Shield, Shield Bash, Shield Master, Twin Blade, Unarmored Expert'.
FeatGroupDefenseExpert Description='Increase one of your mental attributes by 1, to a maximum of 20.
While you are not wearing any armor, your armor class is equal to 10 + your Dexterity modifier + the selected mental attribute modifier.'.
While you are not wearing any armor, your AC is equal to 10 + your Dexterity modifier + the selected mental attribute modifier.'.
FeatGroupDevastatingStrikes Description='Your melee attacks are especially deadly. You gain the following benefits:
• Increase your Strength or Dexterity score by 1, to a maximum of 20.
• Once per turn, when you hit a creature with a melee weapon attack, you deal additional damage equal to your proficiency bonus.
Expand All @@ -799,7 +860,7 @@ FeatGroupDragonFear Description='When angered, you radiate menace. You gain the
• Instead of exhaling destructive energy, you can expend a use of your Breath Weapon trait to roar, forcing each creature of your choice within 30 feet of you to make a Wisdom saving throw (DC 8 + your proficiency bonus + your Charisma modifier). On a failed save, a target becomes frightened for 1 minute. The target can repeat the saving throw at the end of each of its turns, ending the effect on itself on a success.'.
FeatGroupDragonHide Description='You manifest scales and claws reminiscent of your draconic ancestors. You gain the following benefits:
• Increase your Strength, Constitution, or Charisma by 1, up to a maximum of 20.
• Your scales harden. While you aren't wearing armor, your armor class is equal to 10 + your Dexterity modifier + your Constitution modifier. You can use a shield and still gain this benefit.
• Your scales harden. While you aren't wearing armor, your AC is equal to 10 + your Dexterity modifier + your Constitution modifier. You can use a shield and still gain this benefit.
• You can grow retractable claws from the tips of your fingers. Extending or retracting the claws requires no action. The claws are natural weapons, which you can use to make unarmed strikes. If you hit with them, you deal slashing damage equal to 1d4 + your Strength modifier, instead of the normal bludgeoning damage for an unarmed strike.'.
FeatGroupElementalAdept Description='When you gain this feat, choose one of the following damage types: acid, cold, fire, lightning, or thunder. Spells you cast ignore resistance to the chosen damage type. In addition, when you roll damage for a spell you cast that deals damage of that type, you can reroll any 1s.'.
FeatGroupElementalMaster Description='When you gain this feat, choose one of the following damage types: acid, cold, fire, lightning, or thunder. Spells you cast ignore immunity to the chosen damage type. In addition, when you roll attack for a spell you cast that deals damage of that type, you can reroll any 1s.'.
Expand Down Expand Up @@ -853,12 +914,12 @@ FeatGroupPrecisionFocused Description='Increase one of your mental attributes by
You can use a bonus action to make weapon attacks count as magical and use selected mental attribute for attack and damage rolls for 1 minute. This feature can be used proficiency bonus times per long rest.'.
FeatGroupPrimalRage Description='Increase your Strength or Constitution by 1, to a maximum of 20. You gain one additional Rage usage between rests.'.
FeatGroupRaceBound Description='Bountiful Luck, Dark-Elf Magic, Dragon Fear, Dragon Hide, Dragon Wings, Dwarven Fortitude, Elven Accuracy, Fade Away, Flames of Phlegethos, Grudge Bearer, Infernal Constitution, Orcish Aggression, Orcish Fury, Revenant Blade, Second Chance, Squat Nimbleness, Wood-Elf Magic'.
FeatGroupRangedCombat Description='Bow Mastery, Crossbow Expert, Crossbow Mastery, Discretion of the Coedymwarth, Piercer, Sharpshooter, Take Aim, Uncanny Accuracy, Wise Archery'.
FeatGroupRangedCombat Description='Crossbow Expert, Discretion of the Coedymwarth, Piercer, Ranged Mastery, Sharpshooter, Take Aim, Uncanny Accuracy, Wise Archery'.
FeatGroupRetinueTouched Description='Increase one of your mental attributes by 1, to a maximum of 20.
You gain the ability to cast the bless, heroism and enhance ability spells once per long rest, and you can cast these spells with your spell slots.'.
FeatGroupRevenantGreatSword Description='You are descended from a master of the great sword, and some of that mastery has passed on to you. You gain the following benefits:
• Increase your Dexterity or Strength by 1, to a maximum of 20.
• While you are holding a great sword, you gain a +1 bonus to armor class.
• While you are holding a great sword, you gain a +1 bonus to AC.
• Great sword has the finesse property when you wield it.'.
FeatGroupSecondChance Description='Increase your Dexterity, Constitution, or Charisma by 1, to a maximum of 20. When a creature you can see hits you with an attack roll, you can use your reaction to force that creature to reroll. Once you use this ability, you can't use it again until you roll initiative at the start of combat or until you finish a short or long rest.'.
FeatGroupShadowTouched Description='Increase one of your mental attributes by 1, to a maximum of 20.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9002,
"id": 9004,
"actionType": "Bonus",
"actionScope": "All",
"pairedActionId": "NoAction",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9026,
"id": 9031,
"actionType": "Bonus",
"actionScope": "All",
"pairedActionId": "NoAction",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9028,
"id": 9033,
"actionType": "NoCost",
"actionScope": "All",
"pairedActionId": "NoAction",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9029,
"id": 9034,
"actionType": "NoCost",
"actionScope": "All",
"pairedActionId": "NoAction",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9031,
"id": 9037,
"actionType": "Main",
"actionScope": "All",
"pairedActionId": "NoAction",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9003,
"id": 9006,
"actionType": "Main",
"actionScope": "All",
"pairedActionId": "NoAction",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9004,
"id": 9007,
"actionType": "Bonus",
"actionScope": "All",
"pairedActionId": "NoAction",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9005,
"id": 9008,
"actionType": "Main",
"actionScope": "All",
"pairedActionId": "NoAction",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9006,
"id": 9009,
"actionType": "Bonus",
"actionScope": "All",
"pairedActionId": "NoAction",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9007,
"id": 9010,
"actionType": "Main",
"actionScope": "All",
"pairedActionId": "NoAction",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9008,
"id": 9011,
"actionType": "Bonus",
"actionScope": "All",
"pairedActionId": "NoAction",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9060,
"id": 9047,
"actionType": "Bonus",
"actionScope": "All",
"pairedActionId": "NoAction",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9054,
"id": 9048,
"actionType": "NoCost",
"actionScope": "All",
"pairedActionId": "NoAction",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9056,
"id": 9049,
"actionType": "Bonus",
"actionScope": "All",
"pairedActionId": "NoAction",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9057,
"id": 9050,
"actionType": "NoCost",
"actionScope": "Battle",
"pairedActionId": "NoAction",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9055,
"id": 9051,
"actionType": "Bonus",
"actionScope": "All",
"pairedActionId": "NoAction",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9046,
"id": 9060,
"actionType": "Bonus",
"actionScope": "All",
"pairedActionId": "NoAction",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9053,
"id": 9001,
"actionType": "NoCost",
"actionScope": "All",
"pairedActionId": "NoAction",
"usesPerTurn": -1,
"classNameOverride": "",
"classNameOverride": "Toggle",
"requiresAuthorization": true,
"stealthBreakerBehavior": "None",
"feedbackOnHoverType": "None",
Expand Down Expand Up @@ -47,8 +47,8 @@
"guiPresentation": {
"$type": "GuiPresentation, Assembly-CSharp",
"hidden": false,
"title": "Action/&AmazingDisplayToggleTitle",
"description": "Action/&AmazingDisplayToggleDescription",
"title": "Feature/&FeatureSetCollegeOfEleganceAmazingDisplayTitle",
"description": "Feature/&FeatureSetCollegeOfEleganceAmazingDisplayDescription",
"spriteReference": {
"$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
"m_AssetGUID": "f039effbc135454c9bb55de2851472b1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"actionScope": "All",
"pairedActionId": "NoAction",
"usesPerTurn": -1,
"classNameOverride": "",
"classNameOverride": "Toggle",
"requiresAuthorization": true,
"stealthBreakerBehavior": "None",
"feedbackOnHoverType": "None",
Expand Down Expand Up @@ -47,8 +47,8 @@
"guiPresentation": {
"$type": "GuiPresentation, Assembly-CSharp",
"hidden": false,
"title": "Action/&ArcaneArcherToggleTitle",
"description": "Action/&ArcaneArcherToggleDescription",
"title": "Feature/&FeatureSetMartialArcaneArcherArcaneShotTitle",
"description": "Feature/&FeatureSetMartialArcaneArcherArcaneShotDescription",
"spriteReference": {
"$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
"m_AssetGUID": "f039effbc135454c9bb55de2851472b1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9001,
"id": 9002,
"actionType": "NoCost",
"actionScope": "All",
"pairedActionId": "NoAction",
"usesPerTurn": -1,
"classNameOverride": "",
"classNameOverride": "Toggle",
"requiresAuthorization": true,
"stealthBreakerBehavior": "None",
"feedbackOnHoverType": "None",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9061,
"id": 9003,
"actionType": "NoCost",
"actionScope": "All",
"pairedActionId": "NoAction",
"usesPerTurn": -1,
"classNameOverride": "",
"classNameOverride": "Toggle",
"requiresAuthorization": true,
"stealthBreakerBehavior": "None",
"feedbackOnHoverType": "None",
Expand Down Expand Up @@ -47,8 +47,8 @@
"guiPresentation": {
"$type": "GuiPresentation, Assembly-CSharp",
"hidden": false,
"title": "Action/&BalefulScionToggleTitle",
"description": "Action/&BalefulScionToggleDescription",
"title": "Feature/&PowerFeatBalefulScionTitle",
"description": "Feature/&PowerFeatBalefulScionDescription",
"spriteReference": {
"$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
"m_AssetGUID": "f039effbc135454c9bb55de2851472b1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9050,
"id": 9005,
"actionType": "NoCost",
"actionScope": "All",
"pairedActionId": "NoAction",
"usesPerTurn": -1,
"classNameOverride": "",
"classNameOverride": "Toggle",
"requiresAuthorization": true,
"stealthBreakerBehavior": "None",
"feedbackOnHoverType": "None",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9009,
"id": 9012,
"actionType": "Bonus",
"actionScope": "Battle",
"pairedActionId": "NoAction",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9010,
"id": 9013,
"actionType": "NoCost",
"actionScope": "Battle",
"pairedActionId": "NoAction",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9011,
"id": 9014,
"actionType": "Bonus",
"actionScope": "Battle",
"pairedActionId": "NoAction",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9012,
"id": 9015,
"actionType": "Main",
"actionScope": "All",
"pairedActionId": "NoAction",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9013,
"id": 9016,
"actionType": "NoCost",
"actionScope": "All",
"pairedActionId": "NoAction",
Expand Down
Loading

0 comments on commit c5948b2

Please sign in to comment.