Skip to content

Commit

Permalink
Merge pull request #4166 from SolastaMods/dev
Browse files Browse the repository at this point in the history
1.5.94.31
  • Loading branch information
ThyWoof authored Oct 28, 2023
2 parents 44e992c + 31ff2ca commit 0b58981
Show file tree
Hide file tree
Showing 187 changed files with 1,523 additions and 129 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9043,
"actionType": "Bonus",
"actionScope": "All",
"pairedActionId": "NoAction",
"usesPerTurn": -1,
"classNameOverride": "",
"requiresAuthorization": true,
"stealthBreakerBehavior": "None",
"feedbackOnHoverType": "None",
"iterativeTargeting": false,
"canTriggerBattle": false,
"parameter": "None",
"formType": "Large",
"overrideGuiActionType": false,
"overridenGuiActionType": "Main",
"focusCameraOnAction": true,
"addedConditionName": "",
"removedConditionName": "",
"preventsSerialization": false,
"baseActionForFailureTooltips": null,
"activatedPower": null,
"displayPowerTooltip": false,
"dieType": "D10",
"abilityScore": "Dexterity",
"addLevel": false,
"maxCells": 1,
"targetType": "Sphere",
"targetParameter": 1,
"matchingCondition": "",
"particlePrefab": null,
"soundEvent": null,
"guiPresentation": {
"$type": "GuiPresentation, Assembly-CSharp",
"hidden": false,
"title": "Action/&CrystalDefenseOffTitle",
"description": "Action/&CrystalDefenseOffDescription",
"spriteReference": {
"$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
"m_AssetGUID": "ddb89560-ba48-517c-9aac-1b034e4aef36",
"m_SubObjectName": null,
"m_SubObjectType": null
},
"color": {
"$type": "UnityEngine.Color, UnityEngine.CoreModule",
"r": 1.0,
"g": 1.0,
"b": 1.0,
"a": 1.0
},
"symbolChar": "221E",
"sortOrder": 20,
"unusedInSolastaCOTM": false,
"usedInValleyDLC": false
},
"contentCopyright": "UserContent",
"guid": "3121900e-10f3-5e28-8efb-08d7bafbaed0",
"contentPack": 9999,
"name": "CrystalDefenseOff"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9042,
"actionType": "Main",
"actionScope": "All",
"pairedActionId": "NoAction",
"usesPerTurn": -1,
"classNameOverride": "",
"requiresAuthorization": true,
"stealthBreakerBehavior": "None",
"feedbackOnHoverType": "None",
"iterativeTargeting": false,
"canTriggerBattle": false,
"parameter": "None",
"formType": "Large",
"overrideGuiActionType": false,
"overridenGuiActionType": "Main",
"focusCameraOnAction": true,
"addedConditionName": "",
"removedConditionName": "",
"preventsSerialization": false,
"baseActionForFailureTooltips": null,
"activatedPower": null,
"displayPowerTooltip": false,
"dieType": "D10",
"abilityScore": "Dexterity",
"addLevel": false,
"maxCells": 1,
"targetType": "Sphere",
"targetParameter": 1,
"matchingCondition": "",
"particlePrefab": null,
"soundEvent": null,
"guiPresentation": {
"$type": "GuiPresentation, Assembly-CSharp",
"hidden": false,
"title": "Action/&CrystalDefenseOnTitle",
"description": "Action/&CrystalDefenseOnDescription",
"spriteReference": {
"$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
"m_AssetGUID": "c1ec4949-7e35-5ef4-b2ab-2507a7aadbe1",
"m_SubObjectName": null,
"m_SubObjectType": null
},
"color": {
"$type": "UnityEngine.Color, UnityEngine.CoreModule",
"r": 1.0,
"g": 1.0,
"b": 1.0,
"a": 1.0
},
"symbolChar": "221E",
"sortOrder": 20,
"unusedInSolastaCOTM": false,
"usedInValleyDLC": false
},
"contentCopyright": "UserContent",
"guid": "f16994d5-785b-5fe3-96a4-253aa4ae6a1e",
"contentPack": 9999,
"name": "CrystalDefenseOn"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9042,
"id": 9044,
"actionType": "NoCost",
"actionScope": "All",
"pairedActionId": "NoAction",
Expand Down
13 changes: 13 additions & 0 deletions Diagnostics/UnfinishedBusinessBlueprints/Assets.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ CastSignatureSpellsMain ActionDefinition ActionDefinition 6359cd25-fe50-58d4-96e
CastSpellMasteryMain ActionDefinition ActionDefinition b84732e6-bfb3-5555-8301-48542befdfad
CombatRageStart ActionDefinition ActionDefinition 9206ca7c-6ae0-59f1-8f28-ffd769a921d9
CombatWildShape ActionDefinition ActionDefinition 24ead3d3-6347-5c8b-99b0-c28850ea83ea
CrystalDefenseOff ActionDefinition ActionDefinition 3121900e-10f3-5e28-8efb-08d7bafbaed0
CrystalDefenseOn ActionDefinition ActionDefinition f16994d5-785b-5fe3-96a4-253aa4ae6a1e
CunningStrikeToggle ActionDefinition ActionDefinition 5faac58c-a675-557a-8471-5a5275d4a1a2
DoNothingFree ActionDefinition ActionDefinition 0a2a09be-6100-5635-b9c2-f5e18ffaf0fd
DoNothingReaction ActionDefinition ActionDefinition 88ca8b0c-fdea-5652-8add-814f1bd04770
Expand Down Expand Up @@ -423,6 +425,7 @@ Inventor CharacterClassDefinition CharacterClassDefinition fbc44110-e6c1-5830-86
InventorConstruct CharacterFamilyDefinition CharacterFamilyDefinition c1835974-5cc5-56eb-852a-3d21b1224952
RaceBolgrif CharacterRaceDefinition CharacterRaceDefinition 30624939-6f75-5f31-83ba-bd0889cd49e4
RaceCaveWyrmkin CharacterRaceDefinition CharacterRaceDefinition 2d02059d-4630-581e-87b2-0d0c03b5aa74
RaceCrystalWyrmkin CharacterRaceDefinition CharacterRaceDefinition 48a08f2f-7f77-5284-a02f-5aa39f54de07
RaceDarkelf CharacterRaceDefinition CharacterRaceDefinition 263d391a-ecb7-56e4-8613-a9e0f2915eb9
RaceDarkKobold CharacterRaceDefinition CharacterRaceDefinition 930f5725-69e5-5b90-86b6-5bef750addaf
RaceDraconicKobold CharacterRaceDefinition CharacterRaceDefinition 71f9a79f-d8fa-5d32-9514-2edc39725cfb
Expand Down Expand Up @@ -575,6 +578,7 @@ ConditionCollegeOfLifeElementalResistance ConditionDefinition ConditionDefinitio
ConditionCollegeOfValianceDishearteningPerformance ConditionDefinition ConditionDefinition 8b075dec-4ac0-5331-b23e-df6924fdb447
ConditionCorruptingBolt ConditionDefinition ConditionDefinition c47e9ae4-841b-53af-b40f-2cb08dfa7d08
ConditionCrusadersMantle ConditionDefinition ConditionDefinition 04a3a8c7-cf68-5a07-a0c1-9aabc911cad9
ConditionCrystalDefense ConditionDefinition ConditionDefinition 9f04a1bd-b2f4-5e66-9939-cc140c9fd83f
ConditionDarkKoboldGrovelCowerAndBeg ConditionDefinition ConditionDefinition 9b735621-9eb0-5b33-b7a3-d006020feaf1
ConditionDauntlessPursuer ConditionDefinition ConditionDefinition d3fdd040-03ce-5f8c-9ce0-f04a2edc00ad
ConditionDeadMasterUndeadChainsLevel ConditionDefinition ConditionDefinition a5f1f685-8443-59a3-919f-92149376003f
Expand Down Expand Up @@ -1223,6 +1227,8 @@ ActionAffinityAudaciousWhirlToggle FeatureDefinitionActionAffinity FeatureDefini
ActionAffinityCaveWyrmkinBonusShove FeatureDefinitionActionAffinity FeatureDefinition feed7d9e-34bd-51b7-99a4-7a152bfab68f
ActionAffinityCollegeOfValianceHeroicInspiration FeatureDefinitionActionAffinity FeatureDefinition 951aafe4-9c11-50cf-a43d-8c23ace8983f
ActionAffinityConditionBlind FeatureDefinitionActionAffinity FeatureDefinition ba8f244f-070a-5288-a482-e145ab83adef
ActionAffinityCrystalWyrmkinConditionCrystalDefense FeatureDefinitionActionAffinity FeatureDefinition 1274559b-34e5-5c07-acbe-9d51d149959e
ActionAffinityCrystalWyrmkinCrystalDefense FeatureDefinitionActionAffinity FeatureDefinition e8479afd-3a9b-58cd-9834-82ab704a749c
ActionAffinityCunningStrikeToggle FeatureDefinitionActionAffinity FeatureDefinition 931a2506-6cb6-572f-8177-206ce4e9bd88
ActionAffinityFeatCrusherToggle FeatureDefinitionActionAffinity FeatureDefinition d3ad399d-6f58-5787-b967-64355be1a0ff
ActionAffinityFeatPoisoner FeatureDefinitionActionAffinity FeatureDefinition 84210b8c-a6cd-53b7-acde-c0424a98a02d
Expand Down Expand Up @@ -1853,6 +1859,7 @@ FeatureCollegeOfValianceCaptivatingPresence FeatureDefinition FeatureDefinition
FeatureCollegeOfValianceSteadfastInspiration FeatureDefinition FeatureDefinition 6bfab326-6ffd-5f6a-8715-57cfbf834405
FeatureCollegeOfWarDancerFocusedWarDance FeatureDefinition FeatureDefinition 8511f8ff-5ea0-579e-a597-408185c840c7
FeatureCollegeOfWarDancerImprovedWarDance FeatureDefinition FeatureDefinition b7a18fd2-deb5-5ad6-9abe-71dfa1902c66
FeatureCrystalWyrmkinHardScales FeatureDefinition FeatureDefinition 6b38a03a-45bc-5688-8e0e-32088ebcb9f8
FeatureDomainDefilerInsidiousDeathMagic FeatureDefinition FeatureDefinition 5474f82c-c10e-5694-af52-5a3f797685a7
FeatureDomainOblivionKeeperOfOblivion FeatureDefinition FeatureDefinition 32c09e1c-09e8-5f6f-9669-aa311c37b5a7
FeatureDomainSmithBlessedMetal FeatureDefinition FeatureDefinition af616884-6e4e-54ea-93ec-6e13d7e5a730
Expand Down Expand Up @@ -2012,6 +2019,7 @@ FeatureSetCircleOfTheNightMonstrousForms FeatureDefinitionFeatureSet FeatureDefi
FeatureSetCollegeOfAudacityAudaciousWhirl FeatureDefinitionFeatureSet FeatureDefinition 5fadeec3-0f9b-56d8-9bae-042897333f9a
FeatureSetCollegeOfAudacityBonusProficiencies FeatureDefinitionFeatureSet FeatureDefinition 3d2c4b32-659d-5a5a-b4e4-d41030245b3b
FeatureSetCollegeOfAudacityMasterfulWhirl FeatureDefinitionFeatureSet FeatureDefinition 014fff71-308f-53ef-8df8-8f9eb5d6b1db
FeatureSetCrystalWyrmkinAbilityScoreIncrease FeatureDefinitionFeatureSet FeatureDefinition c0bc389d-8efb-5837-9533-70ab939b2f4a
FeatureSetDeadMasterNecromancyBonusDC FeatureDefinitionFeatureSet FeatureDefinition a894786a-6e0e-526e-b81d-26ce6c969939
FeatureSetDivineHeartDeityChoice FeatureDefinitionFeatureSet FeatureDefinition 50c4bac9-edbc-5b51-96f3-5fd8a1d106dd
FeatureSetDomainBattleParagonOfBattle FeatureDefinitionFeatureSet FeatureDefinition a71e6862-b8d0-5219-a26a-f32677c1ed36
Expand Down Expand Up @@ -2360,6 +2368,7 @@ PointPoolBackgroundToolSelect FeatureDefinitionPointPool FeatureDefinition c768f
PointPoolBackgroundToolSelect2 FeatureDefinitionPointPool FeatureDefinition f25a7a0a-e7cb-5efd-aff2-794a2d2a1f2f
PointPoolBardMagicalSecrets18 FeatureDefinitionPointPool FeatureDefinition a0e7412b-bb22-5d89-a48a-0d28a58a4fcf
PointPoolBardSkillPointsMulticlass FeatureDefinitionPointPool FeatureDefinition ddb6c131-8dc5-5d4f-bace-5ac90015601e
PointPoolCrystalWyrmkinInnateKnowledge FeatureDefinitionPointPool FeatureDefinition c50af733-f8f6-5645-a9fd-1757be3ba088
PointPoolFairyAbilityScore FeatureDefinitionPointPool FeatureDefinition 620a9be9-8104-5e16-b9e5-45398f40a68f
PointPoolFeatEldritchAdept FeatureDefinitionPointPool FeatureDefinition a8dc46a2-e036-5b90-b508-9c908cdce872
PointPoolFeatMagicInitiateBardCantrip FeatureDefinitionPointPool FeatureDefinition 56da36c9-595f-5089-9de0-b2eca1393580
Expand Down Expand Up @@ -3310,6 +3319,8 @@ ActionAffinityAudaciousWhirlToggle FeatureDefinitionActionAffinity FeatureDefini
ActionAffinityCaveWyrmkinBonusShove FeatureDefinitionActionAffinity FeatureDefinitionActionAffinity feed7d9e-34bd-51b7-99a4-7a152bfab68f
ActionAffinityCollegeOfValianceHeroicInspiration FeatureDefinitionActionAffinity FeatureDefinitionActionAffinity 951aafe4-9c11-50cf-a43d-8c23ace8983f
ActionAffinityConditionBlind FeatureDefinitionActionAffinity FeatureDefinitionActionAffinity ba8f244f-070a-5288-a482-e145ab83adef
ActionAffinityCrystalWyrmkinConditionCrystalDefense FeatureDefinitionActionAffinity FeatureDefinitionActionAffinity 1274559b-34e5-5c07-acbe-9d51d149959e
ActionAffinityCrystalWyrmkinCrystalDefense FeatureDefinitionActionAffinity FeatureDefinitionActionAffinity e8479afd-3a9b-58cd-9834-82ab704a749c
ActionAffinityCunningStrikeToggle FeatureDefinitionActionAffinity FeatureDefinitionActionAffinity 931a2506-6cb6-572f-8177-206ce4e9bd88
ActionAffinityFeatCrusherToggle FeatureDefinitionActionAffinity FeatureDefinitionActionAffinity d3ad399d-6f58-5787-b967-64355be1a0ff
ActionAffinityFeatPoisoner FeatureDefinitionActionAffinity FeatureDefinitionActionAffinity 84210b8c-a6cd-53b7-acde-c0424a98a02d
Expand Down Expand Up @@ -4308,6 +4319,7 @@ FeatureSetCircleOfTheNightMonstrousForms FeatureDefinitionFeatureSet FeatureDefi
FeatureSetCollegeOfAudacityAudaciousWhirl FeatureDefinitionFeatureSet FeatureDefinitionFeatureSet 5fadeec3-0f9b-56d8-9bae-042897333f9a
FeatureSetCollegeOfAudacityBonusProficiencies FeatureDefinitionFeatureSet FeatureDefinitionFeatureSet 3d2c4b32-659d-5a5a-b4e4-d41030245b3b
FeatureSetCollegeOfAudacityMasterfulWhirl FeatureDefinitionFeatureSet FeatureDefinitionFeatureSet 014fff71-308f-53ef-8df8-8f9eb5d6b1db
FeatureSetCrystalWyrmkinAbilityScoreIncrease FeatureDefinitionFeatureSet FeatureDefinitionFeatureSet c0bc389d-8efb-5837-9533-70ab939b2f4a
FeatureSetDeadMasterNecromancyBonusDC FeatureDefinitionFeatureSet FeatureDefinitionFeatureSet a894786a-6e0e-526e-b81d-26ce6c969939
FeatureSetDivineHeartDeityChoice FeatureDefinitionFeatureSet FeatureDefinitionFeatureSet 50c4bac9-edbc-5b51-96f3-5fd8a1d106dd
FeatureSetDomainBattleParagonOfBattle FeatureDefinitionFeatureSet FeatureDefinitionFeatureSet a71e6862-b8d0-5219-a26a-f32677c1ed36
Expand Down Expand Up @@ -4580,6 +4592,7 @@ PointPoolBackgroundToolSelect FeatureDefinitionPointPool FeatureDefinitionPointP
PointPoolBackgroundToolSelect2 FeatureDefinitionPointPool FeatureDefinitionPointPool f25a7a0a-e7cb-5efd-aff2-794a2d2a1f2f
PointPoolBardMagicalSecrets18 FeatureDefinitionPointPool FeatureDefinitionPointPool a0e7412b-bb22-5d89-a48a-0d28a58a4fcf
PointPoolBardSkillPointsMulticlass FeatureDefinitionPointPool FeatureDefinitionPointPool ddb6c131-8dc5-5d4f-bace-5ac90015601e
PointPoolCrystalWyrmkinInnateKnowledge FeatureDefinitionPointPool FeatureDefinitionPointPool c50af733-f8f6-5645-a9fd-1757be3ba088
PointPoolFairyAbilityScore FeatureDefinitionPointPool FeatureDefinitionPointPool 620a9be9-8104-5e16-b9e5-45398f40a68f
PointPoolFeatEldritchAdept FeatureDefinitionPointPool FeatureDefinitionPointPool a8dc46a2-e036-5b90-b508-9c908cdce872
PointPoolFeatMagicInitiateBardCantrip FeatureDefinitionPointPool FeatureDefinitionPointPool 56da36c9-595f-5089-9de0-b2eca1393580
Expand Down
Loading

0 comments on commit 0b58981

Please sign in to comment.