Skip to content

Commit

Permalink
Merge pull request #4883 from SolastaMods/dev
Browse files Browse the repository at this point in the history
1.5.97.27
  • Loading branch information
ThyWoof authored Aug 18, 2024
2 parents d611a59 + 2c5f9ac commit 9f423b2
Show file tree
Hide file tree
Showing 308 changed files with 3,297 additions and 2,928 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ AttributeModifierDomainSmithReinforceArmor1 Description='This armor has been rei
AttributeModifierDomainSmithReinforceArmor2 Description='This armor has been reinforced providing an additional +2 AC.'.
AttributeModifierDomainSmithReinforceArmor3 Description='This armor has been reinforced providing an additional +3 AC.'.
AttributeModifierDomainSmithReinforceArmor4 Description='This armor has been reinforced providing an additional +4 AC.'.
BoomingBlade Description='You brandish the weapon used in the spell's casting and make a melee attack with it against one creature within 5 ft distance. On a hit, the target suffers the weapon attack's normal effects and then becomes sheathed in booming energy until the start of your next turn. If the target willingly moves 5 ft or more before then, the target takes 1d8 thunder damage, and the spell ends. At 5th level, the melee attack deals an extra 1d8 thunder damage to the target on a hit, and the damage the target takes for moving increases to 2d8. Both damage rolls increase by 1d8 at 11th and 17th levels.'.
CastSpellFeatMagicInitiateBard Title='Initiate'.
CastSpellFeatMagicInitiateBard Description='You learn two cantrips of your choice from the Bard spell list. In addition, choose one 1st-level spell to learn from that same list. Using this feat, you can cast the spell once at its lowest level, and you must finish a long rest before you can cast it in this way again.'.
CastSpellFeatMagicInitiateCleric Title='Initiate'.
Expand Down Expand Up @@ -271,7 +272,6 @@ ConditionRangerWildMasterBeastCompanionAttackRoll Description='-'.
ConditionRangerWildMasterBeastCompanionDamageRoll Description='-'.
ConditionRangerWildMasterBeastCompanionHitPoints Description='-'.
ConditionRescueTheDying Description='-'.
ConditionResonatingStrike Description='-'.
ConditionRingOfBlades Description='-'.
ConditionRogueCunningStrikeDisarmed Description='-'.
ConditionRogueDeviousStrikeKnockOut Description='-'.
Expand Down Expand Up @@ -1108,6 +1108,7 @@ PointPool4BonusFeats Title='4 Bonus Feats'.
PointPool4BonusFeats Description='Select 4 additional feats for your character.'.
PointPool5BonusFeats Title='5 Bonus Feats'.
PointPool5BonusFeats Description='Select 5 additional feats for your character.'.
PowerBoomingBladeDamage Description='You brandish the weapon used in the spell's casting and make a melee attack with it against one creature within 5 ft distance. On a hit, the target suffers the weapon attack's normal effects and then becomes sheathed in booming energy until the start of your next turn. If the target willingly moves 5 ft or more before then, the target takes 1d8 thunder damage, and the spell ends. At 5th level, the melee attack deals an extra 1d8 thunder damage to the target on a hit, and the damage the target takes for moving increases to 2d8. Both damage rolls increase by 1d8 at 11th and 17th levels.'.
PowerChaosBoltDamageAcid Title='Acid Damage'.
PowerChaosBoltDamageAcid Description='Use Acid Damage damage.'.
PowerChaosBoltDamageCold Title='Cold Damage'.
Expand Down Expand Up @@ -1481,6 +1482,7 @@ PowerRangerWildMasterSummonBeastCompanionKindredSpiritEagle Title='Summon Badlan
PowerRangerWildMasterSummonBeastCompanionKindredSpiritEagle Description='A Badlands Eagle bonded to a Ranger.'.
PowerRangerWildMasterSummonBeastCompanionKindredSpiritWolf Title='Summon Grayback Wolf'.
PowerRangerWildMasterSummonBeastCompanionKindredSpiritWolf Description='A Grayback Wolf bonded to a Ranger.'.
PowerResonatingStrike Description='You brandish the weapon used in the spell's casting and make a melee attack with it against one creature within 5 ft distance. On a hit, the target suffers the weapon attack's normal effects, and you can cause green fire to leap from the target to a different creature of your choice that you can see within 5 ft of it. The second creature takes fire damage equal to your spellcasting ability modifier. At 5th level, the melee attack deals an extra 1d8 fire damage to the target on a hit, and the fire damage to the second creature increases to 1d8 + your spellcasting ability modifier. Both damage rolls increase by 1d8 at 11th and 17th levels.'.
PowerSharedPoolCelestialHealingLight1 Title='Healing Light 1D6'.
PowerSharedPoolCelestialHealingLight1 Description='As a bonus action, you can heal one creature you can see within 60 feet of you, spending 1 dice from the pool. Roll the dice you spend, add them together, and restore a number of hit points equal to the total. Your pool regains all expended dice when you finish a long rest.'.
PowerSharedPoolCelestialHealingLight2 Title='Healing Light 2D6'.
Expand Down Expand Up @@ -1528,6 +1530,7 @@ PowerWayOfTheDiscordanceBurstOfDisharmony8 Title='Burst of Disharmony [8 Ki]'.
PowerWayOfTheDiscordanceBurstOfDisharmony8 Description='Spend 8 Ki Point to deal 9d6 necrotic damage.'.
PowerWayOfTheDiscordanceBurstOfDisharmony9 Title='Burst of Disharmony [9 Ki]'.
PowerWayOfTheDiscordanceBurstOfDisharmony9 Description='Spend 9 Ki Point to deal 10d6 necrotic damage.'.
ResonatingStrike Description='You brandish the weapon used in the spell's casting and make a melee attack with it against one creature within 5 ft distance. On a hit, the target suffers the weapon attack's normal effects, and you can cause green fire to leap from the target to a different creature of your choice that you can see within 5 ft of it. The second creature takes fire damage equal to your spellcasting ability modifier. At 5th level, the melee attack deals an extra 1d8 fire damage to the target on a hit, and the fire damage to the second creature increases to 1d8 + your spellcasting ability modifier. Both damage rolls increase by 1d8 at 11th and 17th levels.'.
SavingThrowAffinityWayOfTheDiscordanceTurmoil Title='Turmoil'.
SpellPowerChaosBoltDamageAcid Title='Acid Damage'.
SpellPowerChaosBoltDamageAcid Description='Use Acid Damage damage.'.
Expand Down Expand Up @@ -1903,3 +1906,4 @@ SpellStoringWandOfWitchBolt Title='Wand of Witch Bolt'.
SpellStoringWandOfWitchBolt Description='This wand allows casting the <b>Witch Bolt</b> spell using spell casting stats of the Artificer who created it.'.
SpellStoringWandOfWitherAndBloom Title='Wand of Wither and Bloom'.
SpellStoringWandOfWitherAndBloom Description='This wand allows casting the <b>Wither and Bloom</b> spell using spell casting stats of the Artificer who created it.'.
SunlightBlade Description='You brandish the weapon used in the spell's casting and make a melee attack with it against one creature within 5 ft distance. On a hit, the target suffers the weapon attack's normal effects, and is enveloped in glowing radiant energy, shedding dim light for the turn. Next attack against this creature while it is highlighted is done with advantage. At 5th level, the melee attack deals an extra 1d8 radiant damage to the target. The damage increases by another 1d8 at 11th and 17th levels.'.
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9068,
"actionType": "NoCost",
"id": 9069,
"actionType": "Bonus",
"actionScope": "Battle",
"pairedActionId": "NoAction",
"pairedActionId": "CastMain",
"usesPerTurn": -1,
"classNameOverride": "",
"requiresAuthorization": true,
"stealthBreakerBehavior": "None",
"feedbackOnHoverType": "None",
"classNameOverride": "CastSpell",
"requiresAuthorization": false,
"stealthBreakerBehavior": "RollIfTargets",
"feedbackOnHoverType": "LineOfSight",
"iterativeTargeting": false,
"canTriggerBattle": false,
"parameter": "None",
"parameter": "SelectSpell",
"formType": "Large",
"overrideGuiActionType": false,
"overridenGuiActionType": "Main",
"focusCameraOnAction": true,
"addedConditionName": "",
"removedConditionName": "",
"preventsSerialization": false,
"preventsSerialization": true,
"baseActionForFailureTooltips": null,
"activatedPower": null,
"displayPowerTooltip": false,
Expand All @@ -29,13 +29,26 @@
"targetType": "Sphere",
"targetParameter": 1,
"matchingCondition": "",
"particlePrefab": null,
"soundEvent": null,
"particlePrefab": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": "",
"m_SubObjectType": ""
},
"soundEvent": {
"$type": "AK.Wwise.Event, AK.Wwise.Unity.API.WwiseTypes",
"WwiseObjectReference": null,
"idInternal": 0,
"valueGuidInternal": {
"$type": "System.Byte[], mscorlib",
"$value": ""
}
},
"guiPresentation": {
"$type": "GuiPresentation, Assembly-CSharp",
"hidden": false,
"title": "Rules/&MetamagicOptionQuickenedSpellTitle",
"description": "Rules/&MetamagicOptionQuickenedSpellDescription",
"description": "Action/&CastQuickenedDescription",
"spriteReference": {
"$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
"m_AssetGUID": "944eb32f28b68144283fab27de377493",
Expand All @@ -55,7 +68,7 @@
"usedInValleyDLC": false
},
"contentCopyright": "UserContent",
"guid": "eb19933b-6209-5087-a127-16978d24656d",
"guid": "f49577d4-6ad5-543c-874a-e7b9177150f0",
"contentPack": 9999,
"name": "Quickened"
"name": "CastQuickened"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9068,
"actionType": "Bonus",
"actionScope": "All",
"pairedActionId": "NoAction",
"usesPerTurn": -1,
"classNameOverride": "UsePower",
"requiresAuthorization": true,
"stealthBreakerBehavior": "None",
"feedbackOnHoverType": "None",
"iterativeTargeting": false,
"canTriggerBattle": false,
"parameter": "ActivatePower",
"formType": "Large",
"overrideGuiActionType": false,
"overridenGuiActionType": "Main",
"focusCameraOnAction": false,
"addedConditionName": "",
"removedConditionName": "",
"preventsSerialization": false,
"baseActionForFailureTooltips": null,
"activatedPower": "Definition:PowerPathOfTheWildMagicWildSurgeReroll:011775eb-afc7-5751-bc38-e62ce6abfbc5",
"displayPowerTooltip": true,
"dieType": "D10",
"abilityScore": "Dexterity",
"addLevel": false,
"maxCells": 1,
"targetType": "Sphere",
"targetParameter": 1,
"matchingCondition": "",
"particlePrefab": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": "",
"m_SubObjectType": ""
},
"soundEvent": {
"$type": "AK.Wwise.Event, AK.Wwise.Unity.API.WwiseTypes",
"WwiseObjectReference": null,
"idInternal": 0,
"valueGuidInternal": {
"$type": "System.Byte[], mscorlib",
"$value": ""
}
},
"guiPresentation": {
"$type": "GuiPresentation, Assembly-CSharp",
"hidden": false,
"title": "Feature/&PowerPathOfTheWildMagicWildSurgeRerollTitle",
"description": "Feature/&PowerPathOfTheWildMagicWildSurgeRerollDescription",
"spriteReference": {
"$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
"m_AssetGUID": "f039effbc135454c9bb55de2851472b1",
"m_SubObjectName": "MetamagicToggle",
"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": "561cfafb-7363-5e70-b035-ced4429fdebd",
"contentPack": 9999,
"name": "WildSurgeReroll"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9069,
"id": 9070,
"actionType": "NoCost",
"actionScope": "All",
"pairedActionId": "NoAction",
Expand Down
Loading

0 comments on commit 9f423b2

Please sign in to comment.