Skip to content

Commit

Permalink
Merge pull request #4311 from SolastaMods/dev
Browse files Browse the repository at this point in the history
1.5.94.48
  • Loading branch information
ThyWoof authored Jan 29, 2024
2 parents ca5c1a8 + 2afc513 commit 26122a1
Show file tree
Hide file tree
Showing 171 changed files with 8,447 additions and 466 deletions.
47 changes: 47 additions & 0 deletions Diagnostics/UnfinishedBusinessBlueprints/Assets.txt

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
"$type": "CharacterSubclassDefinition, Assembly-CSharp",
"featureUnlocks": [
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:MagicAffinityMoonlitScionExpandedSpells:62150503-18fb-56b2-8c65-40ddab1868f9",
"level": 1
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:FeatureSetMoonlitScionLunarCloak:886aa625-0ca0-5394-a0b9-ebcd9aecae9a",
"level": 1
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:FeatureSetMoonlitScionMidnightBlessing:49540db8-74c4-5204-b92a-d0bc6a7c1c36",
"level": 6
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:FeatureMoonlitScionLunarEmbrace:2381fa64-8c3a-58ca-8218-c3c935e7aada",
"level": 10
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:PowerMoonlitScionMoonlightGuise:b16b851e-fbe6-5636-8f69-1c220baba6df",
"level": 14
}
],
"personalityFlagOccurences": [],
"morphotypeSubclassFilterTag": "Default",
"guiPresentation": {
"$type": "GuiPresentation, Assembly-CSharp",
"hidden": false,
"title": "Subclass/&PatronMoonlitScionTitle",
"description": "Subclass/&PatronMoonlitScionDescription",
"spriteReference": {
"$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
"m_AssetGUID": "33ecb940-185c-54f9-99ea-eb05c49bdcd4",
"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": "e3c1e163-c7a3-5448-bd9e-5c35c4044470",
"contentPack": 9999,
"name": "PatronMoonlitScion"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,292 @@
{
"$type": "ConditionDefinition, Assembly-CSharp",
"inDungeonEditor": false,
"parentCondition": null,
"conditionType": "Beneficial",
"features": [
"Definition:PowerMoonlitScionLunarRadiance:ed6aefbf-f397-58b4-88d1-56eed3dde91b"
],
"allowMultipleInstances": false,
"silentWhenAdded": false,
"silentWhenRemoved": false,
"silentWhenRefreshed": false,
"terminateWhenRemoved": false,
"specialDuration": false,
"durationType": "Hour",
"durationParameterDie": "D4",
"durationParameter": 1,
"forceTurnOccurence": false,
"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": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": null,
"m_SubObjectType": null
},
"characterShaderReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": null,
"m_SubObjectType": null
},
"particlesBasedOnAncestryDamageType": false,
"ancestryType": "Sorcerer",
"acidParticleParameters": {
"$type": "ConditionParticleParameters, Assembly-CSharp",
"startParticleReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": null,
"m_SubObjectType": null
},
"particleReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": null,
"m_SubObjectType": null
},
"endParticleReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": null,
"m_SubObjectType": null
},
"recurrentEffectParticleReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": null,
"m_SubObjectType": null
}
},
"coldParticleParameters": {
"$type": "ConditionParticleParameters, Assembly-CSharp",
"startParticleReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": null,
"m_SubObjectType": null
},
"particleReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": null,
"m_SubObjectType": null
},
"endParticleReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": null,
"m_SubObjectType": null
},
"recurrentEffectParticleReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": null,
"m_SubObjectType": null
}
},
"fireParticleParameters": {
"$type": "ConditionParticleParameters, Assembly-CSharp",
"startParticleReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": null,
"m_SubObjectType": null
},
"particleReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": null,
"m_SubObjectType": null
},
"endParticleReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": null,
"m_SubObjectType": null
},
"recurrentEffectParticleReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": null,
"m_SubObjectType": null
}
},
"lightningParticleParameters": {
"$type": "ConditionParticleParameters, Assembly-CSharp",
"startParticleReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": null,
"m_SubObjectType": null
},
"particleReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": null,
"m_SubObjectType": null
},
"endParticleReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": null,
"m_SubObjectType": null
},
"recurrentEffectParticleReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": null,
"m_SubObjectType": null
}
},
"poisonParticleParameters": {
"$type": "ConditionParticleParameters, Assembly-CSharp",
"startParticleReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": null,
"m_SubObjectType": null
},
"particleReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": null,
"m_SubObjectType": null
},
"endParticleReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": null,
"m_SubObjectType": null
},
"recurrentEffectParticleReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": null,
"m_SubObjectType": 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": true,
"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": false,
"title": "Feature/&PowerMoonlitScionFullMoonTitle",
"description": "Feature/&NoContentTitle",
"spriteReference": {
"$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
"m_AssetGUID": "fb9c96de68451564f9edc22a0a7b9de3",
"m_SubObjectName": "ConditionProtectedInsideMagicCircle",
"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": "7b7ade74-06c9-5289-89e8-71be143473dc",
"contentPack": 9999,
"name": "ConditionMoonlitScionFullMoon"
}
Loading

0 comments on commit 26122a1

Please sign in to comment.