-
-
Notifications
You must be signed in to change notification settings - Fork 68
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4904 from SolastaMods/dev
1.5.97.28
- Loading branch information
Showing
216 changed files
with
2,692 additions
and
1,607 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
157 changes: 157 additions & 0 deletions
157
...shedBusinessBlueprints/ConditionDefinition/ConditionPathOfTheWildMagicGrowthImmunity.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,157 @@ | ||
| { | ||
| "$type": "ConditionDefinition, Assembly-CSharp", | ||
| "inDungeonEditor": false, | ||
| "parentCondition": null, | ||
| "conditionType": "Beneficial", | ||
| "features": [ | ||
| "Definition:MovementAffinityFreedomOfMovement:097ce72cf88822243afb196bbddc360c" | ||
| ], | ||
| "allowMultipleInstances": false, | ||
| "silentWhenAdded": true, | ||
| "silentWhenRemoved": true, | ||
| "silentWhenRefreshed": false, | ||
| "terminateWhenRemoved": false, | ||
| "specialDuration": false, | ||
| "durationType": "Hour", | ||
| "durationParameterDie": "D4", | ||
| "durationParameter": 1, | ||
| "forceTurnOccurence": true, | ||
| "turnOccurence": "EndOfTurn", | ||
| "specialInterruptions": [], | ||
| "interruptionRequiresSavingThrow": false, | ||
| "interruptionSavingThrowComputationMethod": "SaveOverride", | ||
| "interruptionSavingThrowAbility": "", | ||
| "interruptionDamageThreshold": 0, | ||
| "keepConditionIfSavingThrowSucceeds": false, | ||
| "interruptionSavingThrowAffinity": "None", | ||
| "conditionTags": [], | ||
| "recurrentEffectForms": [], | ||
| "cancellingConditions": [], | ||
| "additionalDamageWhenHit": false, | ||
| "additionalDamageTypeDetermination": "Specific", | ||
| "additionalDamageType": "", | ||
| "additionalDamageQuantity": "AbilityBonus", | ||
| "additionalDamageDieType": "D1", | ||
| "additionalDamageDieNumber": 1, | ||
| "additionalConditionWhenHit": false, | ||
| "additionalCondition": null, | ||
| "additionalConditionDurationType": "Round", | ||
| "additionalConditionDurationParameter": 1, | ||
| "additionalConditionTurnOccurenceType": "StartOfTurn", | ||
| "conditionStartParticleReference": { | ||
| "$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables", | ||
| "m_AssetGUID": "", | ||
| "m_SubObjectName": null, | ||
| "m_SubObjectType": null | ||
| }, | ||
| "conditionParticleReference": { | ||
| "$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables", | ||
| "m_AssetGUID": "", | ||
| "m_SubObjectName": null, | ||
| "m_SubObjectType": null | ||
| }, | ||
| "conditionEndParticleReference": { | ||
| "$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables", | ||
| "m_AssetGUID": "", | ||
| "m_SubObjectName": null, | ||
| "m_SubObjectType": null | ||
| }, | ||
| "recurrentEffectParticleReference": null, | ||
| "characterShaderReference": { | ||
| "$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables", | ||
| "m_AssetGUID": "", | ||
| "m_SubObjectName": null, | ||
| "m_SubObjectType": null | ||
| }, | ||
| "particlesBasedOnAncestryDamageType": false, | ||
| "ancestryType": "Sorcerer", | ||
| "acidParticleParameters": null, | ||
| "coldParticleParameters": null, | ||
| "fireParticleParameters": null, | ||
| "lightningParticleParameters": null, | ||
| "poisonParticleParameters": null, | ||
| "overrideCharacterShaderColors": false, | ||
| "firstCharacterShaderColor": { | ||
| "$type": "UnityEngine.Color, UnityEngine.CoreModule", | ||
| "r": 0.0, | ||
| "g": 0.0, | ||
| "b": 0.0, | ||
| "a": 0.0 | ||
| }, | ||
| "secondCharacterShaderColor": { | ||
| "$type": "UnityEngine.Color, UnityEngine.CoreModule", | ||
| "r": 0.0, | ||
| "g": 0.0, | ||
| "b": 0.0, | ||
| "a": 0.0 | ||
| }, | ||
| "timeToWaitBeforeApplyingShader": 0.5, | ||
| "timeToWaitBeforeRemovingShader": 0.5, | ||
| "possessive": false, | ||
| "amountOrigin": "None", | ||
| "baseAmount": 0, | ||
| "additiveAmount": false, | ||
| "sourceAbilityBonusMinValue": 1, | ||
| "subsequentOnRemoval": null, | ||
| "subsequentHasSavingThrow": false, | ||
| "subsequentSavingThrowAbilityScore": "Constitution", | ||
| "subsequentVariableForDC": "FrenzyExhaustionDC", | ||
| "subsequentDCIncrease": 5, | ||
| "effectFormsOnRemoved": [], | ||
| "forceBehavior": false, | ||
| "addBehavior": false, | ||
| "fearSource": false, | ||
| "battlePackage": null, | ||
| "explorationPackage": null, | ||
| "removedFromTheGame": false, | ||
| "permanentlyRemovedIfExtraPlanar": false, | ||
| "refundReceivedDamageWhenRemoved": false, | ||
| "followSourcePosition": false, | ||
| "disolveCharacterOnDeath": false, | ||
| "disolveParameters": { | ||
| "$type": "GraphicsCharacterDefinitions+DisolveParameters, Assembly-CSharp", | ||
| "color": { | ||
| "$type": "UnityEngine.Color, UnityEngine.CoreModule", | ||
| "r": 0.0, | ||
| "g": 0.0, | ||
| "b": 0.0, | ||
| "a": 0.0 | ||
| }, | ||
| "colorWidth": 0.0, | ||
| "noiseScale": 5.0, | ||
| "hueScale": 0.0, | ||
| "vertexOffset": 0.0, | ||
| "curve": { | ||
| "$type": "UnityEngine.AnimationCurve, UnityEngine.CoreModule" | ||
| }, | ||
| "startAfterDeathAnimation": false, | ||
| "duration": 0.0 | ||
| }, | ||
| "guiPresentation": { | ||
| "$type": "GuiPresentation, Assembly-CSharp", | ||
| "hidden": true, | ||
| "title": "Feature/&NoContentTitle", | ||
| "description": "Feature/&NoContentTitle", | ||
| "spriteReference": { | ||
| "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables", | ||
| "m_AssetGUID": "", | ||
| "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": "3ee03a69-cd0c-5222-b664-9ad748b7e1d6", | ||
| "contentPack": 9999, | ||
| "name": "ConditionPathOfTheWildMagicGrowthImmunity" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 0 additions & 30 deletions
30
...inishedBusinessBlueprints/FeatureDefinition/FeaturePathOfTheWildMagicControlledSurge.json
This file was deleted.
Oops, something went wrong.
30 changes: 0 additions & 30 deletions
30
...cs/UnfinishedBusinessBlueprints/FeatureDefinition/FeaturePathOfTheWildMagicWildSurge.json
This file was deleted.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
...nessBlueprints/FeatureDefinitionFeatureSet/FeatureSetCollegeOfAudacityAudaciousWhirl.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.