Skip to content

Commit

Permalink
Merge pull request #4411 from SolastaMods/dev
Browse files Browse the repository at this point in the history
1.5.97.0
  • Loading branch information
ThyWoof authored Mar 10, 2024
2 parents a79b49f + c2cf8de commit 3a8a6ba
Show file tree
Hide file tree
Showing 1,595 changed files with 38,079 additions and 31,931 deletions.

Large diffs are not rendered by default.

350 changes: 192 additions & 158 deletions Diagnostics/UnfinishedBusinessBlueprints/Assets.txt

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -266,12 +266,12 @@
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:PowerUseModifierInventorInfusionPool00:75cc9b09-cb3d-575a-9e2d-e7e372ab7431",
"featureDefinition": "Definition:ProficiencyInventorToolExpertise:a1f29d49-c186-57e4-a2dc-7e05ef97d0a0",
"level": 6
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:ProficiencyInventorToolExpertise:a1f29d49-c186-57e4-a2dc-7e05ef97d0a0",
"featureDefinition": "Definition:PowerUseModifierInventorInfusionPool00:75cc9b09-cb3d-575a-9e2d-e7e372ab7431",
"level": 6
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
"featureUnlocks": [
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:FeatureSetCircleOfTheCosmosConstellationForm:df637ef0-ebbd-532e-904f-a2a150a1911b",
"featureDefinition": "Definition:FeatureSetCircleOfTheCosmosConstellationMap:3b0cdc7a-cf01-52ef-bd9d-674242f46f1d",
"level": 2
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:FeatureSetCircleOfTheCosmosConstellationMap:3b0cdc7a-cf01-52ef-bd9d-674242f46f1d",
"featureDefinition": "Definition:FeatureSetCircleOfTheCosmosConstellationForm:df637ef0-ebbd-532e-904f-a2a150a1911b",
"level": 2
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
"featureUnlocks": [
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:ProficiencyInnovationWeaponBattleReady:073495cf-41ae-548e-8741-517ccb3f3f6a",
"featureDefinition": "Definition:AutoPreparedSpellsInnovationWeapon:dd309c08-cc5f-57c3-938e-82a0494a6c14",
"level": 3
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:FeatureSetInnovationWeaponSteelDefender:765318d4-2884-5899-a364-9d226007df5b",
"featureDefinition": "Definition:ProficiencyInnovationWeaponBattleReady:073495cf-41ae-548e-8741-517ccb3f3f6a",
"level": 3
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:AutoPreparedSpellsInnovationWeapon:dd309c08-cc5f-57c3-938e-82a0494a6c14",
"featureDefinition": "Definition:FeatureSetInnovationWeaponSteelDefender:765318d4-2884-5899-a364-9d226007df5b",
"level": 3
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
"featureUnlocks": [
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:PowerPoolTacticianGambit:20212eff-ee31-5717-969d-22b9b8da2c95",
"featureDefinition": "Definition:InvocationPoolGambitLearn4:bf787818-378a-5206-b5ea-3669089af63d",
"level": 3
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:InvocationPoolGambitLearn4:bf787818-378a-5206-b5ea-3669089af63d",
"featureDefinition": "Definition:FeatureSetTacticianSharpMind:4db7f8bb-dad9-5fa6-a85b-db8a535e0484",
"level": 3
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:FeatureSetTacticianSharpMind:4db7f8bb-dad9-5fa6-a85b-db8a535e0484",
"featureDefinition": "Definition:PowerPoolTacticianGambit:20212eff-ee31-5717-969d-22b9b8da2c95",
"level": 3
},
{
Expand All @@ -23,12 +23,12 @@
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:InvocationPoolGambitLearn2:81610ec8-6ee4-5218-a274-46987457db6c",
"featureDefinition": "Definition:FeatureSetTacticianHonedCraft:c3440a1e-19b8-5765-9b3a-682310d7f982",
"level": 7
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:FeatureSetTacticianHonedCraft:c3440a1e-19b8-5765-9b3a-682310d7f982",
"featureDefinition": "Definition:InvocationPoolGambitLearn2:81610ec8-6ee4-5218-a274-46987457db6c",
"level": 7
},
{
Expand All @@ -38,17 +38,17 @@
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:FeatureTacticianGambitDieSizeD10:200658b7-db0d-5eec-ba50-4203fa3e9618",
"featureDefinition": "Definition:InvocationPoolGambitUnlearn:444d8f27-2c19-580a-bb72-1fe476ae5ec6",
"level": 10
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:InvocationPoolGambitUnlearn:444d8f27-2c19-580a-bb72-1fe476ae5ec6",
"featureDefinition": "Definition:FeatureSefTacticianStrategicPlan:adb9d7d1-a30b-5c04-9663-771cc4ac75ea",
"level": 10
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:FeatureSefTacticianStrategicPlan:adb9d7d1-a30b-5c04-9663-771cc4ac75ea",
"featureDefinition": "Definition:FeatureTacticianGambitDieSizeD10:200658b7-db0d-5eec-ba50-4203fa3e9618",
"level": 10
},
{
Expand All @@ -73,12 +73,12 @@
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:FeatureTacticianGambitDieSizeD12:e40d45bb-fc63-55a5-8d99-56561ba957fc",
"featureDefinition": "Definition:InvocationPoolGambitUnlearn:444d8f27-2c19-580a-bb72-1fe476ae5ec6",
"level": 18
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:InvocationPoolGambitUnlearn:444d8f27-2c19-580a-bb72-1fe476ae5ec6",
"featureDefinition": "Definition:FeatureTacticianGambitDieSizeD12:e40d45bb-fc63-55a5-8d99-56561ba957fc",
"level": 18
},
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,26 @@
{
"$type": "CharacterSubclassDefinition, Assembly-CSharp",
"featureUnlocks": [
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:PowerPathOfTheElementsBlizzard:d7a31d80-842a-501f-be65-27c349571abd",
"level": 3
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:FeatureSetPathOfTheElementsElementalFury:89f104f7-fa74-5ef6-9717-e357b12e87bf",
"level": 3
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:PowerPathOfTheElementsStorm:daeb69ac-02ba-54ee-ba72-8929ebc573cb",
"level": 3
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:PowerPathOfTheElementsWildfire:316fcbaf-9d5f-5dd7-8a67-cdedbb86b2cb",
"level": 3
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:FeatureSetPathOfTheElementsElementalBlessing:e6c56f22-8cab-5050-897e-b82eb3d92717",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
{
"$type": "CharacterSubclassDefinition, Assembly-CSharp",
"featureUnlocks": [
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:AttributeModifierRangerGloomStalkerDreadAmbusher:2fbcfeb8-3c01-50b3-b9a5-a822cba97318",
"level": 3
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:AutoPreparedSpellsRangerGloomStalker:fd684d16-ed62-5c36-a13e-691b532abf69",
"level": 3
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:FeatureRangerGloomStalkerUmbralSight:dd2b7969-07a3-50d5-97a6-3295047aac68",
"level": 3
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:FeatureSetRangerGloomStalkerIronMind:f39195a2-c049-5e6a-9562-b25600c44941",
"level": 7
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:FeatureRangerGloomStalkerStalkersFlurry:e6de6649-b6f6-5d5b-a875-5c66feff7d69",
"level": 11
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:FeatureRangerGloomStalkerShadowyDodge:7c7fe1a4-7f54-5d81-8df9-be34758b619a",
"level": 15
}
],
"personalityFlagOccurences": [],
"morphotypeSubclassFilterTag": "Default",
"guiPresentation": {
"$type": "GuiPresentation, Assembly-CSharp",
"hidden": false,
"title": "Subclass/&RangerGloomStalkerTitle",
"description": "Subclass/&RangerGloomStalkerDescription",
"spriteReference": {
"$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
"m_AssetGUID": "d23c4872-e030-5892-8864-46686b889880",
"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": 0,
"unusedInSolastaCOTM": false,
"usedInValleyDLC": false
},
"contentCopyright": "UserContent",
"guid": "a9975efe-0c31-5210-a2a0-929155934442",
"contentPack": 9999,
"name": "RangerGloomStalker"
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:DamageAffinityRangerSkyWarriorIntangibleForm:53057687-5db5-59b9-b02e-09df6647f07a",
"featureDefinition": "Definition:PowerRangerSkyWarriorGhostlyHowl:20ca7409-ef20-5f8f-8c40-79b81f3bf712",
"level": 7
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:AttributeModifierRangerSkyWarriorSwiftStrike:c4fe236e-9228-54a8-b4af-278511de7b52",
"featureDefinition": "Definition:DamageAffinityRangerSkyWarriorIntangibleForm:53057687-5db5-59b9-b02e-09df6647f07a",
"level": 7
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,7 @@
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:AdditionalDamageRangerFavoredEnemyChoice:2a798d74282db5d4bb4247c6ffe14b63",
"level": 15
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:SavingThrowAffinityRangerSurvivalistUnmatchedExperience:9a68b999-aeca-5951-86a7-ddd39422a7a4",
"featureDefinition": "Definition:FeatureSetRangerSurvivalistBlessingWilderness:dd991f1d-75ae-5752-b571-ae3e98413125",
"level": 15
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,22 @@
"featureUnlocks": [
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:FeatureSetWildMaster03:d7255ff8-8ca8-5346-a265-2bf66893c260",
"featureDefinition": "Definition:FeatureSetRangerWildMasterBeastCompanion:0ca2f3fd-cea2-5d19-883f-8b9a3e953fb3",
"level": 3
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:FeatureWildMasterBeastIsNextToSummoner:fe6a4dfb-87ac-5479-810b-e6f0a8678ab3",
"level": 3
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:FeatureSetWildMaster07:bb4c0ac8-d7f3-52ee-8e49-f31701e9497c",
"featureDefinition": "Definition:FeatureSetRangerWildMasterAdvancedTraining:ab721c6b-103b-59bb-9601-f24fa426a8ef",
"level": 7
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:FeatureSetWildMaster11:a5190c33-d74a-5537-8fe9-391b957d150f",
"featureDefinition": "Definition:SummoningAffinityRangerWildMasterTrueExpertise:b66ff234-1fd6-508c-8359-733b53e95005",
"level": 11
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:FeatureSetWildMaster15:ab3bd289-8ae3-5c31-90b7-34d4a8ade4ac",
"featureDefinition": "Definition:PowerRangerWildMasterKillCommand:b97390d9-0ab4-56a7-8d23-add910b758b3",
"level": 15
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"parentCondition": null,
"conditionType": "Beneficial",
"features": [
"Definition:AdditionalActionSpellFighting:2504bfe9-888d-52f3-98f1-cc8a54f7fd20"
"Definition:AdditionalActionArcaneFighterSpellFighting:14af4bb5-0bc3-541a-99c1-64272b3050ec"
],
"allowMultipleInstances": false,
"silentWhenAdded": true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,12 @@
"m_SubObjectName": "",
"m_SubObjectType": ""
},
"recurrentEffectParticleReference": null,
"recurrentEffectParticleReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": null,
"m_SubObjectType": null
},
"characterShaderReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"durationParameterDie": "D1",
"durationParameter": 3,
"forceTurnOccurence": false,
"turnOccurence": "EndOfSourceTurn",
"turnOccurence": 9000,
"specialInterruptions": [],
"interruptionRequiresSavingThrow": false,
"interruptionSavingThrowComputationMethod": "SaveOverride",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"durationParameterDie": "D1",
"durationParameter": 5,
"forceTurnOccurence": false,
"turnOccurence": "EndOfSourceTurn",
"turnOccurence": 9000,
"specialInterruptions": [],
"interruptionRequiresSavingThrow": false,
"interruptionSavingThrowComputationMethod": "SaveOverride",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"parentCondition": null,
"conditionType": "Beneficial",
"features": [
"Definition:AttributeModifierCollegeOfGutsArcaneDeflection:3f818f1c-df44-52de-b54f-efe328fc947b"
"Definition:AttributeModifierCollegeOfGutsArcaneDeflection:3f818f1c-df44-52de-b54f-efe328fc947b",
"Definition:MagicAffinityConditionShielded:d693eed024ffd63478a2c67a97d769e5"
],
"allowMultipleInstances": false,
"silentWhenAdded": false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
"silentWhenRemoved": false,
"silentWhenRefreshed": false,
"terminateWhenRemoved": false,
"specialDuration": false,
"durationType": "Hour",
"durationParameterDie": "D4",
"specialDuration": true,
"durationType": "Round",
"durationParameterDie": "D1",
"durationParameter": 1,
"forceTurnOccurence": false,
"turnOccurence": "EndOfTurn",
"turnOccurence": 9000,
"specialInterruptions": [],
"interruptionRequiresSavingThrow": false,
"interruptionSavingThrowComputationMethod": "SaveOverride",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,12 @@
"m_SubObjectName": "",
"m_SubObjectType": ""
},
"recurrentEffectParticleReference": null,
"recurrentEffectParticleReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": null,
"m_SubObjectType": null
},
"characterShaderReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,12 @@
"m_SubObjectName": "",
"m_SubObjectType": ""
},
"recurrentEffectParticleReference": null,
"recurrentEffectParticleReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": null,
"m_SubObjectType": null
},
"characterShaderReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@
"recurrentEffectParticleReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": "",
"m_SubObjectType": ""
"m_SubObjectName": null,
"m_SubObjectType": null
},
"characterShaderReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,12 @@
"m_SubObjectName": "",
"m_SubObjectType": ""
},
"recurrentEffectParticleReference": null,
"recurrentEffectParticleReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": "",
"m_SubObjectType": ""
},
"characterShaderReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
Expand Down
Loading

0 comments on commit 3a8a6ba

Please sign in to comment.