From 1e1e371039475aff30fee7c74ae906ccd7cefc95 Mon Sep 17 00:00:00 2001 From: Pedro Gomes Date: Sun, 1 Jun 2025 20:06:32 +0100 Subject: [PATCH] minion warrior taunt ability --- .../Prefabs/Persistent Objects.prefab | 1 + .../BasicMinionPrefab_Warrior Variant.prefab | 40 +++++++++++++--- .../Minion-ChallengingShout_AoETaunt.asset | 48 +++++++++++++++++++ ...inion-ChallengingShout_AoETaunt.asset.meta | 8 ++++ 4 files changed, 91 insertions(+), 6 deletions(-) create mode 100644 Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Necromancer/Minions/Minion-ChallengingShout_AoETaunt.asset create mode 100644 Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Necromancer/Minions/Minion-ChallengingShout_AoETaunt.asset.meta diff --git a/Assets/Developer/Prefabs/Persistent Objects.prefab b/Assets/Developer/Prefabs/Persistent Objects.prefab index d236fef6..92062ae3 100644 --- a/Assets/Developer/Prefabs/Persistent Objects.prefab +++ b/Assets/Developer/Prefabs/Persistent Objects.prefab @@ -11899,6 +11899,7 @@ MonoBehaviour: - {fileID: 11400000, guid: 3cfe4199144e60d4ebd43f95df59d6e2, type: 2} - {fileID: 11400000, guid: 67c07fd55113f25478bc5a7954290614, type: 2} - {fileID: 11400000, guid: c602778d057001d4b929c6685f50bb59, type: 2} + - {fileID: 11400000, guid: f9fac722d620a31458c32b962378ad7c, type: 2} --- !u!1 &7475116341184709871 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Abilities/BasicMinionPrefab_Warrior Variant.prefab b/Assets/Resources/Abilities/BasicMinionPrefab_Warrior Variant.prefab index 0d0226c8..0cf8d323 100644 --- a/Assets/Resources/Abilities/BasicMinionPrefab_Warrior Variant.prefab +++ b/Assets/Resources/Abilities/BasicMinionPrefab_Warrior Variant.prefab @@ -165,23 +165,35 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4844945595746340765, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} propertyPath: abilityPriorityList.Array.size - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 4844945595746340765, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} propertyPath: abilityPriorityList.Array.data[0].ability value: - objectReference: {fileID: 11400000, guid: c1198db9cfa31aa41a12ccd60393a88f, type: 2} + objectReference: {fileID: 11400000, guid: f9fac722d620a31458c32b962378ad7c, type: 2} - target: {fileID: 4844945595746340765, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} propertyPath: abilityPriorityList.Array.data[1].ability value: + objectReference: {fileID: 11400000, guid: c1198db9cfa31aa41a12ccd60393a88f, type: 2} + - target: {fileID: 4844945595746340765, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} + propertyPath: abilityPriorityList.Array.data[2].ability + value: objectReference: {fileID: 11400000, guid: ae71fbffabf4be44cac54e69769419a8, type: 2} + - target: {fileID: 4844945595746340765, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} + propertyPath: abilityPriorityList.Array.data[0].castConditions.Array.size + value: 4 + objectReference: {fileID: 0} - target: {fileID: 4844945595746340765, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} propertyPath: abilityPriorityList.Array.data[1].castConditions.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4844945595746340765, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} + propertyPath: abilityPriorityList.Array.data[2].castConditions.Array.size value: 3 objectReference: {fileID: 0} - target: {fileID: 4844945595746340765, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} propertyPath: abilityPriorityList.Array.data[0].castConditions.Array.data[0].conditionType - value: 2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4844945595746340765, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} propertyPath: abilityPriorityList.Array.data[0].castConditions.Array.data[1].conditionType @@ -189,20 +201,36 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4844945595746340765, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} propertyPath: abilityPriorityList.Array.data[0].castConditions.Array.data[2].conditionType - value: 1 + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4844945595746340765, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} + propertyPath: abilityPriorityList.Array.data[0].castConditions.Array.data[3].conditionType + value: 4 objectReference: {fileID: 0} - target: {fileID: 4844945595746340765, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} propertyPath: abilityPriorityList.Array.data[1].castConditions.Array.data[0].conditionType - value: 0 + value: 2 objectReference: {fileID: 0} - target: {fileID: 4844945595746340765, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} propertyPath: abilityPriorityList.Array.data[1].castConditions.Array.data[1].conditionType - value: 3 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4844945595746340765, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} propertyPath: abilityPriorityList.Array.data[1].castConditions.Array.data[2].conditionType value: 1 objectReference: {fileID: 0} + - target: {fileID: 4844945595746340765, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} + propertyPath: abilityPriorityList.Array.data[2].castConditions.Array.data[0].conditionType + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4844945595746340765, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} + propertyPath: abilityPriorityList.Array.data[2].castConditions.Array.data[1].conditionType + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4844945595746340765, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} + propertyPath: abilityPriorityList.Array.data[2].castConditions.Array.data[2].conditionType + value: 1 + objectReference: {fileID: 0} - target: {fileID: 9207610886645488137, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} propertyPath: m_AnchoredPosition.y value: 1.4 diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Necromancer/Minions/Minion-ChallengingShout_AoETaunt.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Necromancer/Minions/Minion-ChallengingShout_AoETaunt.asset new file mode 100644 index 00000000..55c5718b --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Necromancer/Minions/Minion-ChallengingShout_AoETaunt.asset @@ -0,0 +1,48 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0c765e9ddb90681418e5635dc93b7716, type: 3} + m_Name: Minion-ChallengingShout_AoETaunt + m_EditorClassIdentifier: + displayName: Challenging Shout + Icon: {fileID: 21300000, guid: 14a0f66a7be165c4ba476e3d7c40e390, type: 3} + targettingTags: + - {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2} + tags: + - {fileID: 11400000, guid: f2044d584b586454f99656097deaa52f, type: 2} + - {fileID: 11400000, guid: 56d85d7ff5b22aa4bb8b40e97b2e850f, type: 2} + - {fileID: 11400000, guid: 9bbf01c0977dc98408db3efec6685c56, type: 2} + - {fileID: 11400000, guid: 09eb68d1a036a1643b74420197b999bd, type: 2} + abilityEffects: + - {fileID: 11400000, guid: ffa51d73731ab0746979d0d41da6a49f, type: 2} + - {fileID: 11400000, guid: 4dfb441f0cb185347957e2e2004b1cb1, type: 2} + - {fileID: 11400000, guid: 814d914c000537b498aa4bcee4f1c00a, type: 2} + castTime: 0.25 + manaCost: 2 + healthCost: 5 + classResourceCost: 0 + spiritPowerReserveCost: 0 + percentMaxManaCost: 0 + percentMaxHealthCost: 0 + cooldown: 2 + castableWhileMoving: 0 + animationType: 4 + aoePrefab: {fileID: 8058865113381185808, guid: 992bd86877d93794fa4c04824808f2a7, type: 3} + movementMask: + serializedVersion: 2 + m_Bits: 8 + lifeSpan: 1 + radius: 2 + shouldResizeVisuals: 0 + telegraphDelay: 0 + canHitSelf: 0 + spawnUnderUser: 1 + rotateOnSpawn: 0 diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Necromancer/Minions/Minion-ChallengingShout_AoETaunt.asset.meta b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Necromancer/Minions/Minion-ChallengingShout_AoETaunt.asset.meta new file mode 100644 index 00000000..bf508135 --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Necromancer/Minions/Minion-ChallengingShout_AoETaunt.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f9fac722d620a31458c32b962378ad7c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: