Skip to content

Commit

Permalink
Merge pull request #5004 from SolastaMods/dev
Browse files Browse the repository at this point in the history 
1.5.97.35
  • Loading branch information
@ThyWoof
ThyWoof authored Oct 21, 2024
2 parents 9aa7a03 + f7ecbc9 commit 4836f62
Show file tree
Hide file tree
Showing 449 changed files with 11,711 additions and 8,120 deletions.
58 changes: 10 additions & 48 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/CleavingAttackToggle.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9075,
"actionType": "NoCost",
"actionScope": "All",
"pairedActionId": "NoAction",
"usesPerTurn": -1,
"classNameOverride": "Toggle",
"requiresAuthorization": true,
"stealthBreakerBehavior": "None",
"feedbackOnHoverType": "None",
"iterativeTargeting": false,
"canTriggerBattle": false,
"parameter": "None",
"formType": "Large",
"overrideGuiActionType": false,
"overridenGuiActionType": "Main",
"focusCameraOnAction": false,
"addedConditionName": "",
"removedConditionName": "",
"preventsSerialization": false,
"baseActionForFailureTooltips": null,
"activatedPower": "Definition:PowerMonkStunningStrike:5e112de763b0d40428c65e6b825a2f74",
"displayPowerTooltip": false,
"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/&CleavingAttackToggleTitle",
"description": "Action/&CleavingAttackToggleDescription",
"spriteReference": {
"$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
"m_AssetGUID": "84350ac22b68d5a42abeed6160869576",
"m_SubObjectName": "Whirlwind",
"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": "ebe1228c-6d1c-51c5-9e52-7fd26d3483e4",
"contentPack": 9999,
"name": "CleavingAttackToggle"
}
74 changes: 74 additions & 0 deletions Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/DeadEyeToggle.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9077,
"actionType": "NoCost",
"actionScope": "All",
"pairedActionId": "NoAction",
"usesPerTurn": -1,
"classNameOverride": "Toggle",
"requiresAuthorization": true,
"stealthBreakerBehavior": "None",
"feedbackOnHoverType": "None",
"iterativeTargeting": false,
"canTriggerBattle": false,
"parameter": "None",
"formType": "Large",
"overrideGuiActionType": false,
"overridenGuiActionType": "Main",
"focusCameraOnAction": false,
"addedConditionName": "",
"removedConditionName": "",
"preventsSerialization": false,
"baseActionForFailureTooltips": null,
"activatedPower": "Definition:PowerMonkStunningStrike:5e112de763b0d40428c65e6b825a2f74",
"displayPowerTooltip": false,
"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/&DeadEyeToggleTitle",
"description": "Action/&DeadEyeToggleDescription",
"spriteReference": {
"$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
"m_AssetGUID": "bc467e2bd91fc4b4db9aacf70c5e1b1f",
"m_SubObjectName": "Volley",
"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": "710267a7-e34d-57e1-8a42-834cfb0cb29a",
"contentPack": 9999,
"name": "DeadEyeToggle"
}
74 changes: 74 additions & 0 deletions Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/GrappleOnUnarmedToggle.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9074,
"actionType": "NoCost",
"actionScope": "All",
"pairedActionId": "NoAction",
"usesPerTurn": -1,
"classNameOverride": "Toggle",
"requiresAuthorization": true,
"stealthBreakerBehavior": "None",
"feedbackOnHoverType": "None",
"iterativeTargeting": false,
"canTriggerBattle": false,
"parameter": "None",
"formType": "Large",
"overrideGuiActionType": false,
"overridenGuiActionType": "Main",
"focusCameraOnAction": false,
"addedConditionName": "",
"removedConditionName": "",
"preventsSerialization": false,
"baseActionForFailureTooltips": null,
"activatedPower": "Definition:PowerMonkStunningStrike:5e112de763b0d40428c65e6b825a2f74",
"displayPowerTooltip": false,
"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/&GrappleOnUnarmedToggleTitle",
"description": "Action/&GrappleOnUnarmedToggleDescription",
"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": "905bb431-ccf9-5e27-90e6-3c1fda1e981e",
"contentPack": 9999,
"name": "GrappleOnUnarmedToggle"
}
74 changes: 74 additions & 0 deletions Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/PowerAttackToggle.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9076,
"actionType": "NoCost",
"actionScope": "All",
"pairedActionId": "NoAction",
"usesPerTurn": -1,
"classNameOverride": "Toggle",
"requiresAuthorization": true,
"stealthBreakerBehavior": "None",
"feedbackOnHoverType": "None",
"iterativeTargeting": false,
"canTriggerBattle": false,
"parameter": "None",
"formType": "Large",
"overrideGuiActionType": false,
"overridenGuiActionType": "Main",
"focusCameraOnAction": false,
"addedConditionName": "",
"removedConditionName": "",
"preventsSerialization": false,
"baseActionForFailureTooltips": null,
"activatedPower": "Definition:PowerMonkStunningStrike:5e112de763b0d40428c65e6b825a2f74",
"displayPowerTooltip": false,
"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/&PowerAttackToggleTitle",
"description": "Action/&PowerAttackToggleDescription",
"spriteReference": {
"$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
"m_AssetGUID": "84350ac22b68d5a42abeed6160869576",
"m_SubObjectName": "Whirlwind",
"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": "d53f2489-40ca-51c2-950a-0a38052deebe",
"contentPack": 9999,
"name": "PowerAttackToggle"
}
Loading

0 comments on commit 4836f62

Please sign in to comment.