Skip to content

Commit

Permalink
Merge pull request #4734 from SolastaMods/dev
Browse files Browse the repository at this point in the history 
1.5.97.15
  • Loading branch information
@ThyWoof
ThyWoof authored Jun 17, 2024
2 parents 8491ac7 + 3b45979 commit 0ae605e
Show file tree
Hide file tree
Showing 452 changed files with 36,531 additions and 3,336 deletions.
56 changes: 48 additions & 8 deletions Diagnostics/CE-Definitions-GuiPresentation-InvalidSyntaxTranslation-en.txt
View file

Large diffs are not rendered by default.

71 changes: 71 additions & 0 deletions Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/WildSurgeBolt.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9063,
"actionType": "Bonus",
"actionScope": "Battle",
"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:PowerPathOfTheWildMagicBolt:2643deef-1f30-5a4c-9c4b-ebb9ee2e65a4",
"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": null,
"m_SubObjectType": null
},
"soundEvent": {
"$type": "AK.Wwise.Event, AK.Wwise.Unity.API.WwiseTypes",
"WwiseObjectReference": null,
"idInternal": 0,
"valueGuidInternal": null
},
"guiPresentation": {
"$type": "GuiPresentation, Assembly-CSharp",
"hidden": false,
"title": "Action/&WildSurgeBoltTitle",
"description": "Action/&WildSurgeBoltDescription",
"spriteReference": {
"$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
"m_AssetGUID": "364a6600260bb3248a8c154574638f2a",
"m_SubObjectName": "GuidingBolt",
"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": 20,
"unusedInSolastaCOTM": false,
"usedInValleyDLC": false
},
"contentCopyright": "UserContent",
"guid": "20bc7bf1-65b4-5848-bace-96a3980150e0",
"contentPack": 9999,
"name": "WildSurgeBolt"
}
74 changes: 74 additions & 0 deletions Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/WildSurgeBoltFree.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9064,
"actionType": "NoCost",
"actionScope": "Battle",
"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:PowerPathOfTheWildMagicBolt:2643deef-1f30-5a4c-9c4b-ebb9ee2e65a4",
"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/&WildSurgeBoltTitle",
"description": "Action/&WildSurgeBoltDescription",
"spriteReference": {
"$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
"m_AssetGUID": "364a6600260bb3248a8c154574638f2a",
"m_SubObjectName": "GuidingBolt",
"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": 20,
"unusedInSolastaCOTM": false,
"usedInValleyDLC": false
},
"contentCopyright": "UserContent",
"guid": "2399cdc2-eada-53fd-aba8-62a265a3fce9",
"contentPack": 9999,
"name": "WildSurgeBoltFree"
}
71 changes: 71 additions & 0 deletions Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/WildSurgeSummon.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9065,
"actionType": "Bonus",
"actionScope": "Battle",
"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:PowerPathOfTheWildMagicSummon:72fc941e-2078-53c7-b1f0-83705ac2e84b",
"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": null,
"m_SubObjectType": null
},
"soundEvent": {
"$type": "AK.Wwise.Event, AK.Wwise.Unity.API.WwiseTypes",
"WwiseObjectReference": null,
"idInternal": 0,
"valueGuidInternal": null
},
"guiPresentation": {
"$type": "GuiPresentation, Assembly-CSharp",
"hidden": false,
"title": "Action/&WildSurgeSummonTitle",
"description": "Action/&WildSurgeSummonDescription",
"spriteReference": {
"$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
"m_AssetGUID": "521932a939bcf7b448041b17d8488d06",
"m_SubObjectName": "DancingLights",
"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": 20,
"unusedInSolastaCOTM": false,
"usedInValleyDLC": false
},
"contentCopyright": "UserContent",
"guid": "3937a3f5-5a6e-5d66-b588-e7dac29d563f",
"contentPack": 9999,
"name": "WildSurgeSummon"
}
74 changes: 74 additions & 0 deletions Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/WildSurgeSummonFree.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9066,
"actionType": "NoCost",
"actionScope": "Battle",
"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:PowerPathOfTheWildMagicSummon:72fc941e-2078-53c7-b1f0-83705ac2e84b",
"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/&WildSurgeSummonTitle",
"description": "Action/&WildSurgeSummonDescription",
"spriteReference": {
"$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
"m_AssetGUID": "521932a939bcf7b448041b17d8488d06",
"m_SubObjectName": "DancingLights",
"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": 20,
"unusedInSolastaCOTM": false,
"usedInValleyDLC": false
},
"contentCopyright": "UserContent",
"guid": "572d0e56-f959-553f-b434-21ae08da910c",
"contentPack": 9999,
"name": "WildSurgeSummonFree"
}
71 changes: 71 additions & 0 deletions Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/WildSurgeTeleport.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
{
"$type": "ActionDefinition, Assembly-CSharp",
"id": 9067,
"actionType": "Bonus",
"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:PowerPathOfTheWildMagicTeleport:bbd47537-4116-502b-946b-d75bd1d56523",
"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": null,
"m_SubObjectType": null
},
"soundEvent": {
"$type": "AK.Wwise.Event, AK.Wwise.Unity.API.WwiseTypes",
"WwiseObjectReference": null,
"idInternal": 0,
"valueGuidInternal": null
},
"guiPresentation": {
"$type": "GuiPresentation, Assembly-CSharp",
"hidden": false,
"title": "Action/&WildSurgeTeleportTitle",
"description": "Action/&WildSurgeTeleportDescription",
"spriteReference": {
"$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
"m_AssetGUID": "7e6cd80b881b7074d88a122382fd2103",
"m_SubObjectName": "MistyStep",
"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": 20,
"unusedInSolastaCOTM": false,
"usedInValleyDLC": false
},
"contentCopyright": "UserContent",
"guid": "71b8cdd2-551c-5014-9828-ac1fbb32766d",
"contentPack": 9999,
"name": "WildSurgeTeleport"
}
Loading

0 comments on commit 0ae605e

Please sign in to comment.