Skip to content

Commit

Permalink
Merge pull request #4493 from SolastaMods/dev
Browse files Browse the repository at this point in the history 
1.5.97.3
  • Loading branch information
@ThyWoof
ThyWoof authored Apr 1, 2024
2 parents a83c66f + cdc9c2f commit de162b2
Show file tree
Hide file tree
Showing 412 changed files with 11,470 additions and 2,829 deletions.
128 changes: 68 additions & 60 deletions Diagnostics/CE-Definitions-GuiPresentation-InvalidSyntaxTranslation-en.txt
View file

Large diffs are not rendered by default.

74 changes: 74 additions & 0 deletions Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/OrcishFuryToggle.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9053,
"actionType": "NoCost",
"actionScope": "All",
"pairedActionId": "NoAction",
"usesPerTurn": -1,
"classNameOverride": "",
"requiresAuthorization": true,
"stealthBreakerBehavior": "None",
"feedbackOnHoverType": "None",
"iterativeTargeting": false,
"canTriggerBattle": false,
"parameter": "ActivatePower",
"formType": "Large",
"overrideGuiActionType": false,
"overridenGuiActionType": "Main",
"focusCameraOnAction": false,
"addedConditionName": "",
"removedConditionName": "",
"preventsSerialization": false,
"baseActionForFailureTooltips": null,
"activatedPower": "Definition:PowerFeatOrcishFuryImpishWrath:16e3a36d-f549-5ea1-8b52-e542ece068b3",
"displayPowerTooltip": true,
"dieType": "D10",
"abilityScore": "Dexterity",
"addLevel": false,
"maxCells": 1,
"targetType": "Sphere",
"targetParameter": 1,
"matchingCondition": "",
"particlePrefab": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": "",
"m_SubObjectType": ""
},
"soundEvent": {
"$type": "AK.Wwise.Event, AK.Wwise.Unity.API.WwiseTypes",
"WwiseObjectReference": null,
"idInternal": 0,
"valueGuidInternal": {
"$type": "System.Byte[], mscorlib",
"$value": ""
}
},
"guiPresentation": {
"$type": "GuiPresentation, Assembly-CSharp",
"hidden": false,
"title": "Action/&OrcishFuryToggleTitle",
"description": "Action/&OrcishFuryToggleDescription",
"spriteReference": {
"$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
"m_AssetGUID": "f039effbc135454c9bb55de2851472b1",
"m_SubObjectName": "MetamagicToggle",
"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": "f1b69370-ae7d-59d1-ab51-e82991ef3473",
"contentPack": 9999,
"name": "OrcishFuryToggle"
}
78 changes: 72 additions & 6 deletions Diagnostics/UnfinishedBusinessBlueprints/Assets.txt
View file

Large diffs are not rendered by default.

54 changes: 54 additions & 0 deletions Diagnostics/UnfinishedBusinessBlueprints/CharacterSubclassDefinition/PathOfTheRavager.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"$type": "CharacterSubclassDefinition, Assembly-CSharp",
"featureUnlocks": [
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:AdditionalDamagePathOfTheRavagerFrenzy:5f749fce-f2dd-56c2-9c9c-1941f8a640da",
"level": 3
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:PowerBerserkerMindlessRage:192598156a60fe1438e3758a2ba9b547",
"level": 6
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:ActionAffinityRetaliation:ec64ca6a83b04e947a2a3fb85a22ddc9",
"level": 10
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:FeatureSetPathOfTheRavagerIntimidatingPresence:208e67ca-bd52-5485-a908-b7edf3f1d01a",
"level": 14
}
],
"personalityFlagOccurences": [],
"morphotypeSubclassFilterTag": "Default",
"guiPresentation": {
"$type": "GuiPresentation, Assembly-CSharp",
"hidden": false,
"title": "Subclass/&PathOfTheRavagerTitle",
"description": "Subclass/&PathOfTheRavagerDescription",
"spriteReference": {
"$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
"m_AssetGUID": "aa99d934a7dfe064191c9a18e4822595",
"m_SubObjectName": "Barbarian_Path_Berserker",
"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": "ded33e3b-9abc-5c55-9155-cf3b60b1c10d",
"contentPack": 9999,
"name": "PathOfTheRavager"
}
16 changes: 9 additions & 7 deletions .../ConditionShieldTechniquesResistance.json → ...ConditionFeatChargerAdditionalDamage.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
"inDungeonEditor": false,
"parentCondition": null,
"conditionType": "Beneficial",
"features": [],
"features": [
"Definition:AdditionalDamageFeatCharger:5e4d30ff-8673-591b-9ff6-833b76bc0696"
],
"allowMultipleInstances": false,
"silentWhenAdded": true,
"silentWhenRemoved": true,
Expand All @@ -16,7 +18,7 @@
"forceTurnOccurence": false,
"turnOccurence": "EndOfTurn",
"specialInterruptions": [
"Attacked"
"Attacks"
],
"interruptionRequiresSavingThrow": false,
"interruptionSavingThrowComputationMethod": "SaveOverride",
Expand Down Expand Up @@ -129,9 +131,9 @@
},
"guiPresentation": {
"$type": "GuiPresentation, Assembly-CSharp",
"hidden": false,
"title": "Feat/&FeatShieldTechniquesTitle",
"description": "Feat/&FeatShieldTechniquesDescription",
"hidden": true,
"title": "Feature/&NoContentTitle",
"description": "Feature/&NoContentTitle",
"spriteReference": {
"$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
"m_AssetGUID": "",
Expand All @@ -151,7 +153,7 @@
"usedInValleyDLC": false
},
"contentCopyright": "UserContent",
"guid": "9c4e8aae-976d-52fa-b19b-32e520bb8e2d",
"guid": "454e1f12-752a-52e6-8f55-6784a5ed3b2f",
"contentPack": 9999,
"name": "ConditionShieldTechniquesResistance"
"name": "ConditionFeatChargerAdditionalDamage"
}
162 changes: 162 additions & 0 deletions ...ics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionFeatFlamesOfPhlegethos.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,162 @@
{
"$type": "ConditionDefinition, Assembly-CSharp",
"inDungeonEditor": false,
"parentCondition": null,
"conditionType": "Beneficial",
"features": [
"Definition:DamageAffinityFeatFlamesOfPhlegethos:4955509d-fe4f-5601-83c7-3f5bfa72c4ab"
],
"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": "63f0f32d7d04cf343b2bd3018fa241e0",
"m_SubObjectName": "",
"m_SubObjectType": ""
},
"conditionParticleReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "e13d321e7272a644daf36f792d2677e7",
"m_SubObjectName": "",
"m_SubObjectType": ""
},
"conditionEndParticleReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "9cfcfe3680cc81f40867d8787cde2e5b",
"m_SubObjectName": "",
"m_SubObjectType": ""
},
"recurrentEffectParticleReference": {
"$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": "",
"m_SubObjectType": ""
},
"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": 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": "Condition/&ConditionFeatFlamesOfPhlegethosTitle",
"description": "Condition/&ConditionFeatFlamesOfPhlegethosDescription",
"spriteReference": {
"$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
"m_AssetGUID": "df79a8d92a082eb40a000919a6f5b27a",
"m_SubObjectName": "ConditionDivineFavor",
"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": "0f2d858f-1d3a-5c61-9cfd-151814083b41",
"contentPack": 9999,
"name": "ConditionFeatFlamesOfPhlegethos"
}
Loading

0 comments on commit de162b2

Please sign in to comment.