Skip to content

Commit

Permalink
Merge pull request #1393 from SolastaMods/Dev
Browse files Browse the repository at this point in the history
1.3.57.2F
  • Loading branch information
ThyWoof authored Jun 13, 2022
2 parents c738b4b + 96157b5 commit 2c03fb1
Show file tree
Hide file tree
Showing 63 changed files with 2,701 additions and 231 deletions.
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
ClassMagusArcaneArtRupture Description='ClassMagusArcaneArtRupture'.
DH_ElementalForm_Air Title='Air Plane'.
DH_ElementalForm_Air Description='When channeling the Air Plane, you gain Resistance to Thunder damage and apply Proficiency Bonus as damage of the same type to first hit each round.'.
DH_ElementalForm_AirAdditionalDamage Title='Elemental Damage: Air Plane'.
Expand Down Expand Up @@ -60,6 +61,7 @@ EldritchInvocationMageArmor Description='Cast Mage Armor at will.'.
EldritchInvocationMageArmorRemover Description='Cast Mage Armor at will.'.
EldritchInvocationSlow Description='Cast Slow once until long rest.'.
EldritchInvocationSlowRemover Description='Cast Slow once until long rest.'.
SpellClassMagusArcaneArtRupture Description='ClassMagusArcaneArtRupture'.
SpellDH_ElementalForm_Air Title='Air Plane'.
SpellDH_ElementalForm_Air Description='When channeling the Air Plane, you gain Resistance to Thunder damage and apply Proficiency Bonus as damage of the same type to first hit each round.'.
SpellDH_ElementalForm_Earth Title='Earth Plane'.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
ClassMagus Title='Class/&ClassMagusTitle'.
ClassMagus Description='Class/&ClassMagusDescription'.
ClassMagusArcaneArtRupture Title='Subclass/&ClassMagusArcaneArtRuptureTitle'.
ClassMagusArcaneFocus Title='Power/&ClassMagusArcaneFocusTitle'.
ClassMagusArcaneFocus Description='Power/&ClassMagusArcaneFocusDescription'.
ClassMagusArmorProficiency Title='Feature/&ClassMagusArmorProficiencyTitle'.
ClassMagusArmorProficiency Description='Feature/&ClassMagusArmorProficiencyDescription'.
ClassMagusCastSpell Title='Class/&ClassMagusSpellcastingTitle'.
ClassMagusCastSpell Description='Class/&ClassMagusSpellcastingDescription'.
ClassMagusSavingThrowProficiency Title='Feature/&ClassMagusSavingThrowProficiencyTitle'.
ClassMagusSavingThrowProficiency Description='Feature/&ClassMagusSavingThrowProficiencyDescription'.
ClassMagusSkillProficiency Title='Feature/&ClassMagusSkillProficiencyTitle'.
ClassMagusSkillProficiency Description='Feature/&ClassMagusSkillProficiencyDescription'.
ClassMagusToolsProficiency Title='Feature/&ClassMagusToolsProficiencyTitle'.
ClassMagusToolsProficiency Description='Feature/&ClassMagusToolsProficiencyDescription'.
ClassMagusWeaponProficiency Title='Feature/&ClassMagusWeaponProficiencyTitle'.
ClassMagusWeaponProficiency Description='Feature/&ClassMagusWeaponProficiencyDescription'.
CraftingManualRecipeEnchantCEHalberd+1 Description='Item/&CraftingManualRecipeEnchantCEHalberd+1Description'.
CraftingManualRecipeEnchantCEHalberd+2 Description='Item/&CraftingManualRecipeEnchantCEHalberd+2Description'.
CraftingManualRecipeEnchantCEHalberdLightning Description='Item/&CraftingManualRecipeEnchantCEHalberdLightningDescription'.
Expand All @@ -18,6 +35,11 @@ DHFeeblemindSpellActionAffinity Title='ActionAffinity/&DHFeeblemindSpellTitle'.
FeatureSetGreenWitchMagic Title='Subclass/&GreenWitchMagic'.
FeatureSetRedWitchMagic Title='Subclass/&RedWitchMagic'.
FeatureSetWhiteWitchMagic Title='Subclass/&WhiteWitchMagic'.
MagusSpellList Title='SpellList/&MagusSpellListTitle'.
MagusSpellList Description='SpellList/&MagusSpellListDescription'.
SpellClassMagusArcaneArtRupture Title='Subclass/&ClassMagusArcaneArtRuptureTitle'.
SpellClassMagusArcaneFocus Title='Power/&ClassMagusArcaneFocusTitle'.
SpellClassMagusArcaneFocus Description='Power/&ClassMagusArcaneFocusDescription'.
SpendPowerBundle Title='Reaction/&SpendPowerBundleTitle'.
SpendPowerBundle Description='Reaction/&SpendPowerBundleDescription'.
WardenArmorProficiencyMulticlass Title='Feature/&WardenArmorProficiencyTitle'.
25 changes: 25 additions & 0 deletions Diagnostics/CommunityExpansionBlueprints/Assets.txt
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@ Traps~Town~MOD BlueprintCategory BlueprintCategory 3bb25366-e510-5140-b641-e7278
Traps~TownInterior~MOD BlueprintCategory BlueprintCategory 23d7d0b8-6c2a-5452-af2d-2118e85b6e0c
Traps~ValleyPalace~MOD BlueprintCategory BlueprintCategory e72353f4-bde6-5f2c-9dea-2ae1065782a6
Traps~WoodLand~MOD BlueprintCategory BlueprintCategory b0da8bad-0ce2-5db0-adb6-32a37b6258b7
ClassMagus CharacterClassDefinition CharacterClassDefinition 97ded64b-8357-596a-aba0-9c74550e9416
ClassMonk CharacterClassDefinition CharacterClassDefinition b843a539-0063-5b6d-9db9-862800add5aa
ClassTinkerer CharacterClassDefinition CharacterClassDefinition 0bd993c5-be32-535c-96b5-70db46ed2ca8
ClassWarlock CharacterClassDefinition CharacterClassDefinition 22677dd9-ffe8-58ad-8dd2-bacb9dd9da2e
Expand Down Expand Up @@ -341,6 +342,7 @@ ArtificerInfusedConditionMindSharpener ConditionDefinition ConditionDefinition d
ArtificerInfusedFocus ConditionDefinition ConditionDefinition 85e4f946-f5c3-544e-aa7a-d003cac5c338
ArtificerInfusionArmorMagicalStrengthCondition ConditionDefinition ConditionDefinition 642970f4-1918-5a54-b575-a103ce59065a
BarkWard ConditionDefinition ConditionDefinition 2d27674c-26d3-5d01-b35b-8595f0f7eb52
ClassMagusConditionRupture ConditionDefinition ConditionDefinition 1a49e40d-10b1-5a8e-8a42-2483f8702bc5
ClassMonkAttackedWithMonkWeapon ConditionDefinition ConditionDefinition 48bf2461-f0ae-5181-8538-938f975f05e6
ClassMonkClimbingCondition ConditionDefinition ConditionDefinition c6981d91-7259-521f-9269-341a74942a3b
ClassMonkEmptyBodyCondition ConditionDefinition ConditionDefinition fd501d2c-0599-5550-92fc-c7f264fe24b1
Expand Down Expand Up @@ -701,6 +703,14 @@ CastSpellSpellShield FeatureDefinitionCastSpell FeatureDefinition 09aac17f-37c6-
CastSpellTinkerer FeatureDefinitionCastSpell FeatureDefinition 67ded021-18e4-5ebf-a396-449314a731ef
CastSpellWitch FeatureDefinitionCastSpell FeatureDefinition 73c40446-6b19-5203-9a7d-31c3926289b6
ChefTreatEatPower FeatureDefinitionPower FeatureDefinition 31ea87c9-f446-59ba-a422-6855c1b372bf
ClassMagusArcaneArtRupture SolastaCommunityExpansion.CustomDefinitions.FeatureDefinitionPowerSharedPool FeatureDefinition 2e65dba9-ac84-5d81-9076-addc04f8fd39
ClassMagusArcaneFocus FeatureDefinitionPower FeatureDefinition a2a464b9-5934-5289-b006-bf9875daf8a2
ClassMagusArmorProficiency FeatureDefinitionProficiency FeatureDefinition 4a37789c-ddbb-5bd5-8a11-ea8bb77c2d38
ClassMagusCastSpell FeatureDefinitionCastSpell FeatureDefinition b4059dd2-0805-5bf2-a699-f0e341d95621
ClassMagusSavingThrowProficiency FeatureDefinitionProficiency FeatureDefinition aca38866-ae80-54f1-b64a-5ab6471acfab
ClassMagusSkillProficiency FeatureDefinitionPointPool FeatureDefinition 8e96e965-8fe8-5958-9296-4fbcd0a2ff85
ClassMagusToolsProficiency FeatureDefinitionProficiency FeatureDefinition 605322f6-b75e-50e1-a079-28a1b704a448
ClassMagusWeaponProficiency FeatureDefinitionProficiency FeatureDefinition ec723019-70ac-50d1-ad24-c3ea1a9704f6
ClassMonkDeflectMissile FeatureDefinitionActionAffinity FeatureDefinition f8b37f2b-7bd0-5b31-8eed-28ac0b7370e0
ClassMonkDiamondSoul FeatureDefinitionProficiency FeatureDefinition c4fb60a3-74a2-574b-be2c-c4c054dff8f6
ClassMonkDiamondSoulPower SolastaCommunityExpansion.CustomDefinitions.FeatureDefinitionPowerSharedPool FeatureDefinition 46e42723-e78c-5863-9e81-ac24bb193036
Expand Down Expand Up @@ -989,6 +999,7 @@ FeatureSetWhiteWitchMagic FeatureDefinitionFeatureSet FeatureDefinition 13e52ca9
FeatureSetWitchFamiliar FeatureDefinitionFeatureSet FeatureDefinition d80020a5-f150-567a-948c-40bf8969233a
FeatWisIncrement FeatureDefinitionAttributeModifier FeatureDefinition 1794c14b-322c-560a-a025-d3e34d2cd58b
FeyTeleportationAutoPrepMistyBarbarian FeatureDefinitionAutoPreparedSpells FeatureDefinition 8a5682f7-8563-52f3-936b-138645322366
FeyTeleportationAutoPrepMistyClassMagus FeatureDefinitionAutoPreparedSpells FeatureDefinition 454a48eb-5d8f-53c0-8d03-39dd1ff81be4
FeyTeleportationAutoPrepMistyClassMonk FeatureDefinitionAutoPreparedSpells FeatureDefinition 061e2ddc-5378-5ef5-8af4-6e33e5cd7454
FeyTeleportationAutoPrepMistyClassTinkerer FeatureDefinitionAutoPreparedSpells FeatureDefinition 5902baac-de33-5c7d-ac6d-0c07a57b56f2
FeyTeleportationAutoPrepMistyClassWarlock FeatureDefinitionAutoPreparedSpells FeatureDefinition 66d409a0-4428-5b16-9f5a-31ee2b0ba874
Expand Down Expand Up @@ -1251,6 +1262,7 @@ SelfRepair FeatureDefinitionPower FeatureDefinition 68db5cab-6fc9-4795-88a6-f89d
SellswordBackgroundSuggestedSkills FeatureDefinition FeatureDefinition da5df8c6-7744-568f-8b4a-7d2b0b19914c
SentinelModePower SolastaCommunityExpansion.CustomDefinitions.FeatureDefinitionPowerSharedPool FeatureDefinition 410768a3-757f-48ee-8a2f-bffd963c0a5b
ShadowTouchedAutoPrepBarbarian FeatureDefinitionAutoPreparedSpells FeatureDefinition b7acf706-9bbc-514b-b378-4bb805007d32
ShadowTouchedAutoPrepClassMagus FeatureDefinitionAutoPreparedSpells FeatureDefinition d414ad28-8590-53fc-b60c-d33aec37bc5e
ShadowTouchedAutoPrepClassMonk FeatureDefinitionAutoPreparedSpells FeatureDefinition 2d39917b-321c-58e9-a0ca-54bd41cfff1e
ShadowTouchedAutoPrepClassTinkerer FeatureDefinitionAutoPreparedSpells FeatureDefinition 9b04bd07-5abe-5c39-b0e6-1e05b39afcb4
ShadowTouchedAutoPrepClassWarlock FeatureDefinitionAutoPreparedSpells FeatureDefinition 3b45beb6-dc7e-5e0e-81eb-ff6bdaeb5439
Expand Down Expand Up @@ -1561,6 +1573,7 @@ ArtilleryConstructLevel03AutopreparedSpells FeatureDefinitionAutoPreparedSpells
ArtilleryConstructLevel09AutopreparedSpells FeatureDefinitionAutoPreparedSpells FeatureDefinitionAutoPreparedSpells ecbbbfe6-4ff6-5c55-b9da-919b09896938
ArtilleryConstructLevel15AutopreparedSpells FeatureDefinitionAutoPreparedSpells FeatureDefinitionAutoPreparedSpells 841d72b7-2570-56d1-acfd-77fa34d2e4db
FeyTeleportationAutoPrepMistyBarbarian FeatureDefinitionAutoPreparedSpells FeatureDefinitionAutoPreparedSpells 8a5682f7-8563-52f3-936b-138645322366
FeyTeleportationAutoPrepMistyClassMagus FeatureDefinitionAutoPreparedSpells FeatureDefinitionAutoPreparedSpells 454a48eb-5d8f-53c0-8d03-39dd1ff81be4
FeyTeleportationAutoPrepMistyClassMonk FeatureDefinitionAutoPreparedSpells FeatureDefinitionAutoPreparedSpells 061e2ddc-5378-5ef5-8af4-6e33e5cd7454
FeyTeleportationAutoPrepMistyClassTinkerer FeatureDefinitionAutoPreparedSpells FeatureDefinitionAutoPreparedSpells 5902baac-de33-5c7d-ac6d-0c07a57b56f2
FeyTeleportationAutoPrepMistyClassWarlock FeatureDefinitionAutoPreparedSpells FeatureDefinitionAutoPreparedSpells 66d409a0-4428-5b16-9f5a-31ee2b0ba874
Expand All @@ -1579,6 +1592,7 @@ ProtectorConstructLevel15AutopreparedSpells FeatureDefinitionAutoPreparedSpells
ProtectorConstructLevel3AutopreparedSpells FeatureDefinitionAutoPreparedSpells FeatureDefinitionAutoPreparedSpells 25403813-58eb-47f4-b5ee-b7956cc02ccf
RedMagicAutoPreparedSpell FeatureDefinitionAutoPreparedSpells FeatureDefinitionAutoPreparedSpells 41cdb2c0-03d4-502c-b871-af662358b341
ShadowTouchedAutoPrepBarbarian FeatureDefinitionAutoPreparedSpells FeatureDefinitionAutoPreparedSpells b7acf706-9bbc-514b-b378-4bb805007d32
ShadowTouchedAutoPrepClassMagus FeatureDefinitionAutoPreparedSpells FeatureDefinitionAutoPreparedSpells d414ad28-8590-53fc-b60c-d33aec37bc5e
ShadowTouchedAutoPrepClassMonk FeatureDefinitionAutoPreparedSpells FeatureDefinitionAutoPreparedSpells 2d39917b-321c-58e9-a0ca-54bd41cfff1e
ShadowTouchedAutoPrepClassTinkerer FeatureDefinitionAutoPreparedSpells FeatureDefinitionAutoPreparedSpells 9b04bd07-5abe-5c39-b0e6-1e05b39afcb4
ShadowTouchedAutoPrepClassWarlock FeatureDefinitionAutoPreparedSpells FeatureDefinitionAutoPreparedSpells 3b45beb6-dc7e-5e0e-81eb-ff6bdaeb5439
Expand Down Expand Up @@ -1618,6 +1632,7 @@ CastSpellConArtist FeatureDefinitionCastSpell FeatureDefinitionCastSpell 20a1a15
CastSpellSpellShield FeatureDefinitionCastSpell FeatureDefinitionCastSpell 09aac17f-37c6-5456-adf1-6578251f8359
CastSpellTinkerer FeatureDefinitionCastSpell FeatureDefinitionCastSpell 67ded021-18e4-5ebf-a396-449314a731ef
CastSpellWitch FeatureDefinitionCastSpell FeatureDefinitionCastSpell 73c40446-6b19-5203-9a7d-31c3926289b6
ClassMagusCastSpell FeatureDefinitionCastSpell FeatureDefinitionCastSpell b4059dd2-0805-5bf2-a699-f0e341d95621
ClassWarlockCastSpell FeatureDefinitionCastSpell FeatureDefinitionCastSpell c6e9a37e-2888-5cfb-95ff-3e65c3a96c6b
DH_Custom_CastSpell_ArchMage FeatureDefinitionCastSpell FeatureDefinitionCastSpell 2bfc6eae-908f-52dc-8255-0e2a53a436bf
DH_Custom_CastSpell_GuardianNaga FeatureDefinitionCastSpell FeatureDefinitionCastSpell 22c4c5ba-3416-5750-8670-092083e95415
Expand Down Expand Up @@ -1755,6 +1770,7 @@ BackgroundSkillSelect2 FeatureDefinitionPointPool FeatureDefinitionPointPool 77d
BackgroundSkillSelect3 FeatureDefinitionPointPool FeatureDefinitionPointPool e6f2ed65-a44e-4314-b38c-393abb4ad900
BackgroundToolSelect FeatureDefinitionPointPool FeatureDefinitionPointPool 989ddb03-b915-42cc-9612-bc8be96b7476
BackgroundToolSelect2 FeatureDefinitionPointPool FeatureDefinitionPointPool 07d30e58-eddc-43eb-a24c-71f107b8d76a
ClassMagusSkillProficiency FeatureDefinitionPointPool FeatureDefinitionPointPool 8e96e965-8fe8-5958-9296-4fbcd0a2ff85
ClassMonkSkillProficiency FeatureDefinitionPointPool FeatureDefinitionPointPool 532783fa-78b3-54ae-8a87-5083d6776a31
ClassWarlockSkillProficiency FeatureDefinitionPointPool FeatureDefinitionPointPool fe4e8e1f-0358-5bb4-801d-88c9eb21e495
DHPactOfTheTomeBonusCantrips FeatureDefinitionPointPool FeatureDefinitionPointPool 862cdcdd-3f35-5a3f-bc93-870c70fa15af
Expand Down Expand Up @@ -1841,6 +1857,8 @@ CancelElixirResilience FeatureDefinitionPower FeatureDefinitionPower 4de693d2-f1
CancelElixirSwiftness FeatureDefinitionPower FeatureDefinitionPower 86888f66-c8b2-49db-910a-bde389dd69df
CancelFlyingConditionArtificialServant FeatureDefinitionPower FeatureDefinitionPower 15bff3c5-632e-451f-8c46-1511ed4cf805
ChefTreatEatPower FeatureDefinitionPower FeatureDefinitionPower 31ea87c9-f446-59ba-a422-6855c1b372bf
ClassMagusArcaneArtRupture SolastaCommunityExpansion.CustomDefinitions.FeatureDefinitionPowerSharedPool FeatureDefinitionPower 2e65dba9-ac84-5d81-9076-addc04f8fd39
ClassMagusArcaneFocus FeatureDefinitionPower FeatureDefinitionPower a2a464b9-5934-5289-b006-bf9875daf8a2
ClassMonkDiamondSoulPower SolastaCommunityExpansion.CustomDefinitions.FeatureDefinitionPowerSharedPool FeatureDefinitionPower 46e42723-e78c-5863-9e81-ac24bb193036
ClassMonkEmptyBody SolastaCommunityExpansion.CustomDefinitions.FeatureDefinitionPowerSharedPool FeatureDefinitionPower 8ad1c0d2-55f9-5f6d-9d5d-d95e4a3d4f08
ClassMonkFlurryOfBlows SolastaCommunityExpansion.CustomDefinitions.FeatureDefinitionPowerSharedPool FeatureDefinitionPower b860cc3a-edcd-565b-b8cb-77d6155e4bdf
Expand Down Expand Up @@ -2094,6 +2112,10 @@ ZSPowerPaladinAuraOfProtection18 FeatureDefinitionPower FeatureDefinitionPower 1
ZSPowerPaladinCleansingTouch FeatureDefinitionPower FeatureDefinitionPower 71861ca1-61ed-4344-bb26-ef21232adddd
ZSSorcerousRestoration FeatureDefinitionPower FeatureDefinitionPower a524f8eb-8d30-4614-819d-a8f7df84f73e
BarbarianArmorProficiencyMulticlass FeatureDefinitionProficiency FeatureDefinitionProficiency 86558227b0cd4771b42978a60dc610db
ClassMagusArmorProficiency FeatureDefinitionProficiency FeatureDefinitionProficiency 4a37789c-ddbb-5bd5-8a11-ea8bb77c2d38
ClassMagusSavingThrowProficiency FeatureDefinitionProficiency FeatureDefinitionProficiency aca38866-ae80-54f1-b64a-5ab6471acfab
ClassMagusToolsProficiency FeatureDefinitionProficiency FeatureDefinitionProficiency 605322f6-b75e-50e1-a079-28a1b704a448
ClassMagusWeaponProficiency FeatureDefinitionProficiency FeatureDefinitionProficiency ec723019-70ac-50d1-ad24-c3ea1a9704f6
ClassMonkDiamondSoul FeatureDefinitionProficiency FeatureDefinitionProficiency c4fb60a3-74a2-574b-be2c-c4c054dff8f6
ClassMonkSavingThrowProficiency FeatureDefinitionProficiency FeatureDefinitionProficiency ec3627f4-5cc8-53e4-bf70-13403ab1ddce
ClassMonkWeaponProficiency FeatureDefinitionProficiency FeatureDefinitionProficiency 40d8ad91-9775-5891-87c4-ed9141633730
Expand Down Expand Up @@ -5339,6 +5361,8 @@ SpellAncientForestHerbalBrewDamageAffinityPoisonResistancePower SpellDefinition
SpellAncientForestHerbalBrewDamageAffinityRadiantResistancePower SpellDefinition SpellDefinition 13d1b48f-4572-5e5c-b4f0-858655739297
SpellAncientForestHerbalBrewHealingPower SpellDefinition SpellDefinition 90c1ddae-a7ba-5db3-b282-af0244e72a80
SpellAncientForestHerbalBrewToxifyingPower SpellDefinition SpellDefinition de346781-91d3-50ae-a8e9-baba63fbaafe
SpellClassMagusArcaneArtRupture SpellDefinition SpellDefinition 860a27fd-dc63-5c22-9242-59e002a628b6
SpellClassMagusArcaneFocus SpellDefinition SpellDefinition 0c0d1d90-fb28-58ba-851c-e7a394d75573
SpellClassMonkOpenHandDistract SpellDefinition SpellDefinition b791cb32-6989-5275-83e0-cd0917f7464a
SpellClassMonkOpenHandProne SpellDefinition SpellDefinition f14fdb02-b1a9-5833-9633-148882dbdc59
SpellClassMonkOpenHandPush SpellDefinition SpellDefinition dcf8027a-c7fe-5293-9789-6b7e8a35ef9c
Expand Down Expand Up @@ -5394,6 +5418,7 @@ DHPactOfTheTomeSpellList SpellListDefinition SpellListDefinition 297fb15a-6b35-5
ElementalistSpellsList SpellListDefinition SpellListDefinition bf646de5-3d7b-53e5-93d4-4e70bd24501b
GuardianNaga_Spelllist SpellListDefinition SpellListDefinition 773d2cbf-c21f-5ef8-8f40-d9a9dc2e88a7
Lich_Spelllist SpellListDefinition SpellListDefinition 5b9c4eaf-d258-581c-a8e9-2d89dd643b1a
MagusSpellList SpellListDefinition SpellListDefinition c84df18b-9ce4-5867-9824-c85c7e686da1
MoonLitExpandedSpelllist SpellListDefinition SpellListDefinition b3725667-e904-5e98-bb01-d5580c15dab3
NaturalIllusionistSpellList SpellListDefinition SpellListDefinition ead60aeb-3a72-4296-af36-2e14b110bb0b
RiftWalkerSpellsList SpellListDefinition SpellListDefinition 02613d95-7568-5413-be6b-6ce96eeb153c
Expand Down
Loading

0 comments on commit 2c03fb1

Please sign in to comment.