Skip to content

Commit

Permalink
Merge pull request #5138 from SolastaMods/dev
Browse files Browse the repository at this point in the history 
1.5.97.43
  • Loading branch information
@ThyWoof
ThyWoof authored Jan 8, 2025
2 parents 788d1f2 + 3bb2515 commit 2ee5394
Show file tree
Hide file tree
Showing 804 changed files with 64,717 additions and 14,548 deletions.
238 changes: 153 additions & 85 deletions Diagnostics/CE-Definitions-GuiPresentation-InvalidSyntaxTranslation-en.txt
View file

Large diffs are not rendered by default.

61 changes: 61 additions & 0 deletions Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionGrappleNoCost.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9080,
"actionType": "NoCost",
"actionScope": "All",
"pairedActionId": "NoAction",
"usesPerTurn": -1,
"classNameOverride": "UsePower",
"requiresAuthorization": true,
"stealthBreakerBehavior": "None",
"feedbackOnHoverType": "None",
"iterativeTargeting": false,
"canTriggerBattle": false,
"parameter": "ActivatePower",
"formType": "Large",
"overrideGuiActionType": false,
"overridenGuiActionType": "Main",
"focusCameraOnAction": true,
"addedConditionName": "",
"removedConditionName": "",
"preventsSerialization": false,
"baseActionForFailureTooltips": null,
"activatedPower": "Definition:PowerGrapple:b821a1e4-f0ec-55e4-8424-907b7dfb1a86",
"displayPowerTooltip": true,
"dieType": "D10",
"abilityScore": "Dexterity",
"addLevel": false,
"maxCells": 1,
"targetType": "Sphere",
"targetParameter": 1,
"matchingCondition": "",
"particlePrefab": null,
"soundEvent": null,
"guiPresentation": {
"$type": "GuiPresentation, Assembly-CSharp",
"hidden": false,
"title": "Action/&ActionGrappleNoCostTitle",
"description": "Action/&ActionGrappleNoCostDescription",
"spriteReference": {
"$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
"m_AssetGUID": "f7a20282a4fded54ea666c159ba6dacf",
"m_SubObjectName": "UnarmedStrike",
"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": "ba583ecd-3954-591f-8af8-48fdc3633642",
"contentPack": 9999,
"name": "ActionGrappleNoCost"
}
74 changes: 74 additions & 0 deletions Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionProxyDarkness.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9081,
"actionType": "NoCost",
"actionScope": "All",
"pairedActionId": "NoAction",
"usesPerTurn": -1,
"classNameOverride": "ProxyActivate",
"requiresAuthorization": false,
"stealthBreakerBehavior": "None",
"feedbackOnHoverType": "None",
"iterativeTargeting": false,
"canTriggerBattle": false,
"parameter": "None",
"formType": "Large",
"overrideGuiActionType": false,
"overridenGuiActionType": "Main",
"focusCameraOnAction": true,
"addedConditionName": "",
"removedConditionName": "",
"preventsSerialization": false,
"baseActionForFailureTooltips": null,
"activatedPower": null,
"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": "Feature/&NoContentTitle",
"description": "Feature/&NoContentTitle",
"spriteReference": {
"$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": "",
"m_SubObjectType": ""
},
"color": {
"$type": "UnityEngine.Color, UnityEngine.CoreModule",
"r": 1.0,
"g": 1.0,
"b": 1.0,
"a": 1.0
},
"symbolChar": "221E",
"sortOrder": 51,
"unusedInSolastaCOTM": false,
"usedInValleyDLC": false
},
"contentCopyright": "UserContent",
"guid": "d8cab084-c702-5dbc-b8da-56d9013ddc1c",
"contentPack": 9999,
"name": "ActionProxyDarkness"
}
74 changes: 74 additions & 0 deletions Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/BlessedStrikesToggle.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9083,
"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/&BlessedStrikesToggleTitle",
"description": "Action/&BlessedStrikesToggleDescription",
"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": "74edb361-cb0d-5233-8275-61b20f98d1e7",
"contentPack": 9999,
"name": "BlessedStrikesToggle"
}
74 changes: 74 additions & 0 deletions Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ElementalFuryToggle.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9082,
"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/&ElementalFuryToggleTitle",
"description": "Action/&ElementalFuryToggleDescription",
"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": "e04b9584-3ad0-5cfc-88c5-ee15d00c0768",
"contentPack": 9999,
"name": "ElementalFuryToggle"
}
74 changes: 74 additions & 0 deletions Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/NatureStrikesToggle.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9084,
"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/&NatureStrikesToggleTitle",
"description": "Action/&NatureStrikesToggleDescription",
"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": "440e19e2-f61b-50b0-8706-573faa2e2457",
"contentPack": 9999,
"name": "NatureStrikesToggle"
}
Loading

0 comments on commit 2ee5394

Please sign in to comment.