diff --git a/Assets/Resources/Abilities/AuraOfDeath_AreaOfEffectOverTimeWithTickEvent.prefab b/Assets/Resources/Abilities/AuraOfDeath_AreaOfEffectOverTimeWithTickEvent.prefab index 6d9d2f49..78e1dab4 100644 --- a/Assets/Resources/Abilities/AuraOfDeath_AreaOfEffectOverTimeWithTickEvent.prefab +++ b/Assets/Resources/Abilities/AuraOfDeath_AreaOfEffectOverTimeWithTickEvent.prefab @@ -46,6 +46,7 @@ MonoBehaviour: m_EditorClassIdentifier: ability: {fileID: 11400000, guid: 50fe026b53483dd4fa08679bd24bb4b9, type: 2} abilityPrefabName: {fileID: 1405724118519419521, guid: 0ccefd8e90a52a847b38fb05414ed6de, type: 3} + canDrainAllies: 0 --- !u!1 &7860705738977089692 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Abilities/ElectroSlash_NetworkedSlashWithOnHitEvent_Prefab (1).prefab b/Assets/Resources/Abilities/ElectroSlash_NetworkedSlashWithOnHitEvent_Prefab (1).prefab index bae1db8f..8460691d 100644 --- a/Assets/Resources/Abilities/ElectroSlash_NetworkedSlashWithOnHitEvent_Prefab (1).prefab +++ b/Assets/Resources/Abilities/ElectroSlash_NetworkedSlashWithOnHitEvent_Prefab (1).prefab @@ -46,6 +46,7 @@ MonoBehaviour: m_EditorClassIdentifier: ability: {fileID: 11400000, guid: 50fe026b53483dd4fa08679bd24bb4b9, type: 2} abilityPrefabName: {fileID: 1405724118519419521, guid: 0ccefd8e90a52a847b38fb05414ed6de, type: 3} + canDrainAllies: 0 --- !u!1 &3980789815621071287 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Abilities/SiphonSlash_NetworkedSlashWithOnHitEvent_Prefab.prefab b/Assets/Resources/Abilities/SiphonSlash_NetworkedSlashWithOnHitEvent_Prefab.prefab index 8faa1e24..ee33afa5 100644 --- a/Assets/Resources/Abilities/SiphonSlash_NetworkedSlashWithOnHitEvent_Prefab.prefab +++ b/Assets/Resources/Abilities/SiphonSlash_NetworkedSlashWithOnHitEvent_Prefab.prefab @@ -176,6 +176,7 @@ MonoBehaviour: m_EditorClassIdentifier: ability: {fileID: 11400000, guid: 50fe026b53483dd4fa08679bd24bb4b9, type: 2} abilityPrefabName: {fileID: 1405724118519419521, guid: 0ccefd8e90a52a847b38fb05414ed6de, type: 3} + canDrainAllies: 0 --- !u!1 &8389547513526139286 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Abilities/SoulBomb_AreaOfEffectWithImpactEvent.prefab b/Assets/Resources/Abilities/SoulBomb_AreaOfEffectWithImpactEvent.prefab index 116fe1f5..00194a84 100644 --- a/Assets/Resources/Abilities/SoulBomb_AreaOfEffectWithImpactEvent.prefab +++ b/Assets/Resources/Abilities/SoulBomb_AreaOfEffectWithImpactEvent.prefab @@ -46,6 +46,7 @@ MonoBehaviour: m_EditorClassIdentifier: ability: {fileID: 11400000, guid: d8917fa8b398ec7468cbd07a1eab0d29, type: 2} abilityPrefabName: {fileID: 1405724118519419521, guid: 0ccefd8e90a52a847b38fb05414ed6de, type: 3} + canDrainAllies: 0 --- !u!1 &752672217036731597 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/PlayableCharacters/PlayerPrefab_Mage Variant.prefab b/Assets/Resources/PlayableCharacters/PlayerPrefab_Mage Variant.prefab index f78cf6af..21f1947e 100644 --- a/Assets/Resources/PlayableCharacters/PlayerPrefab_Mage Variant.prefab +++ b/Assets/Resources/PlayableCharacters/PlayerPrefab_Mage Variant.prefab @@ -339,7 +339,7 @@ PrefabInstance: - target: {fileID: 4847227750113470832, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: ability value: - objectReference: {fileID: 11400000, guid: bb4727d12833f2749b88b66ee5585e6a, type: 2} + objectReference: {fileID: 11400000, guid: 6e6816a87356ed54aa546aefca31e06b, type: 2} - target: {fileID: 5627210965781110480, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: ability value: diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/1-IceShard_ProjectileAbility.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/1-IceShard_ProjectileAbility.asset index 7b82d332..f00bde3a 100644 --- a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/1-IceShard_ProjectileAbility.asset +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/1-IceShard_ProjectileAbility.asset @@ -28,7 +28,7 @@ MonoBehaviour: - {fileID: 11400000, guid: 7b7a9c9ae4b8ece4eb680f621937c58a, type: 2} - {fileID: 11400000, guid: 127f92fd14a21174695a692c0cf18746, type: 2} castTime: 0.5 - manaCost: 6 + manaCost: 1 healthCost: 0 classResourceCost: 0 cooldown: 0 diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/3-ManaBarrierAbility.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/3-ManaBarrierAbility.asset index 9651c8bc..ed9f06fa 100644 --- a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/3-ManaBarrierAbility.asset +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/3-ManaBarrierAbility.asset @@ -21,13 +21,14 @@ MonoBehaviour: - {fileID: 11400000, guid: 918ee6f8846e6a9449166ac16b6330ae, type: 2} - {fileID: 11400000, guid: 9ffd1c81aeea68b4eb6b0f054f0d989f, type: 2} - {fileID: 11400000, guid: 5ff891a32306c504f8f6159f69a1866e, type: 2} + - {fileID: 11400000, guid: 4242916f0b1bf6e4e8a04bce7028b3f4, type: 2} abilityEffects: - {fileID: 11400000, guid: 2536fad89b0bac442a6ef81548aa028c, type: 2} - castTime: 0.25 - manaCost: 5 + castTime: 0 + manaCost: 0 healthCost: 0 - classResourceCost: 25 - cooldown: 6 + classResourceCost: 18 + cooldown: 5 castableWhileMoving: 1 animationType: 1 projectilePrefab: {fileID: 3740678194898045934, guid: b347988a444ef2a4aabcc7394add4db2, type: 3} diff --git a/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Mage/1-IceShardEffects/Mage_IceShard_MovSpeedModifierEffect.asset b/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Mage/1-IceShardEffects/Mage_IceShard_MovSpeedModifierEffect.asset index 8770cabc..b22ea614 100644 --- a/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Mage/1-IceShardEffects/Mage_IceShard_MovSpeedModifierEffect.asset +++ b/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Mage/1-IceShardEffects/Mage_IceShard_MovSpeedModifierEffect.asset @@ -18,7 +18,7 @@ MonoBehaviour: influencingStats: - statTag: {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} percentInfluence: 0.001 - duration: 0.5 + duration: 1.5 applyToTargetsHit: 1 applyToSelf: 0 - speedModifierPercentage: 0.5 + speedModifierPercentage: 0.2 diff --git a/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Mage/2-BlizzardEffects/Mage_Blizzard_MovSpeedModifierEffect.asset b/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Mage/2-BlizzardEffects/Mage_Blizzard_MovSpeedModifierEffect.asset index 4511317d..88117b99 100644 --- a/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Mage/2-BlizzardEffects/Mage_Blizzard_MovSpeedModifierEffect.asset +++ b/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Mage/2-BlizzardEffects/Mage_Blizzard_MovSpeedModifierEffect.asset @@ -21,4 +21,4 @@ MonoBehaviour: duration: 0.5 applyToTargetsHit: 1 applyToSelf: 0 - speedModifierPercentage: 0.5 + speedModifierPercentage: 0.25 diff --git a/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Mage/3-ManaBarrierEffects/Mage_ManaBarrier_AbsorbEffect.asset b/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Mage/3-ManaBarrierEffects/Mage_ManaBarrier_AbsorbEffect.asset index 97f9129c..b089f628 100644 --- a/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Mage/3-ManaBarrierEffects/Mage_ManaBarrier_AbsorbEffect.asset +++ b/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Mage/3-ManaBarrierEffects/Mage_ManaBarrier_AbsorbEffect.asset @@ -22,6 +22,8 @@ MonoBehaviour: percentInfluence: 0.01 - statTag: {fileID: 11400000, guid: 5ff891a32306c504f8f6159f69a1866e, type: 2} percentInfluence: 0.01 + - statTag: {fileID: 11400000, guid: 4242916f0b1bf6e4e8a04bce7028b3f4, type: 2} + percentInfluence: 0.15 duration: 5 applyToTargetsHit: 0 applyToSelf: 1 diff --git a/Assets/Scripts/Networking/NetworkDrainEffectChainReaction.cs b/Assets/Scripts/Networking/NetworkDrainEffectChainReaction.cs index 865e408a..f2d1c08d 100644 --- a/Assets/Scripts/Networking/NetworkDrainEffectChainReaction.cs +++ b/Assets/Scripts/Networking/NetworkDrainEffectChainReaction.cs @@ -7,13 +7,20 @@ public class NetworkDrainEffectChainReaction : NetworkAbilityChainReaction { NetworkedDrainProjectile drainProjectile; + public bool canDrainAllies; + public override void ExecuteAbilityChainReaction(PhotonView owner, Taggable ownerTag, List targets) { if (!owner.IsMine) return; for (int i = 0; i < targets.Count; i++) { - spawnedChainReaction = PhotonNetwork.Instantiate("Abilities/" + abilityPrefabName.name, targets[i].transform.position + Vector3.up*0.5f, Quaternion.identity); + if(!canDrainAllies) + { + if (ownerTag.AlliedTagsContains(targets[i].targetTag)) continue; + } + + spawnedChainReaction = PhotonNetwork.Instantiate("Abilities/" + abilityPrefabName.name, targets[i].transform.position + Vector3.up * 0.5f, Quaternion.identity); drainProjectile = spawnedChainReaction.GetComponent(); @@ -25,6 +32,6 @@ public class NetworkDrainEffectChainReaction : NetworkAbilityChainReaction drainProjectile.Init(); } - + } } diff --git a/Assets/Scripts/Networking/NetworkedAreaOfEffect.cs b/Assets/Scripts/Networking/NetworkedAreaOfEffect.cs index a841c2f3..6e76c8e8 100644 --- a/Assets/Scripts/Networking/NetworkedAreaOfEffect.cs +++ b/Assets/Scripts/Networking/NetworkedAreaOfEffect.cs @@ -140,6 +140,8 @@ public class NetworkedAreaOfEffect : MonoBehaviour, IPunObservable protected virtual void CheckSurroundings() { + if (waitingForDestroy) return; + hits = Physics.OverlapSphere(this.transform.position, radius, abilityHitLayer); targets.Clear(); foreach (Collider collider in hits)