From 1298ca35ca31447ce72cb00ac6671c9c354bb617 Mon Sep 17 00:00:00 2001 From: Pedro Gomes Date: Sat, 20 Jul 2024 10:56:54 +0100 Subject: [PATCH] Base Effect stat influence update - all effects now properly scale with stats, making it possible to scale with multiple stats --- .../Prefabs/Persistent Objects.prefab | 35 ++++++++++------- ...ossEnemyPrefab_AngrySkelly_ Variant.prefab | 10 +++-- .../BossEnemyPrefab_SkellyMage_Variant.prefab | 8 ++++ ...asicEnemyPrefab_AngrySkelly_Variant.prefab | 10 ++++- ...BasicEnemyPrefab_SkellyMage_Variant.prefab | 2 +- .../Debug/NPC/{Boss.meta => -Boss.meta} | 0 .../Angry.meta => -Boss/AngrySkelly.meta} | 0 .../Debug/NPC/-Boss/AngrySkelly/Slash.meta} | 2 +- .../Slash}/Boss_AngrySkelly_MeleeSlash.asset | 9 ++--- .../Boss_AngrySkelly_MeleeSlash.asset.meta | 0 .../Debug/NPC/-Boss/AngrySkelly/Throw.meta} | 2 +- .../AngrySkelly/Throw/Boss_BoneThrow.asset | 38 ++++++++++++++++++ .../Throw/Boss_BoneThrow.asset.meta} | 2 +- .../NPC/-Boss/AngrySkelly/Ultimate.meta} | 2 +- ...eStorm_UltimateAreaOfEffectOverTime.asset} | 4 +- ...m_UltimateAreaOfEffectOverTime.asset.meta} | 0 .../Data/Abilities/Debug/NPC/-Boss/Mage.meta | 8 ++++ .../Abilities/Debug/NPC/-Boss/Mage/Slash.meta | 8 ++++ .../Mage/Slash/Boss_Mage_MeleeSlash.asset | 36 +++++++++++++++++ .../Slash/Boss_Mage_MeleeSlash.asset.meta} | 2 +- .../Abilities/Debug/NPC/-Boss/Mage/Throw.meta | 8 ++++ .../Mage/Throw/Boss_Mage_PutridOrb.asset | 37 ++++++++++++++++++ .../Throw/Boss_Mage_PutridOrb.asset.meta} | 2 +- .../Debug/NPC/-Boss/Mage/Ultimate.meta | 8 ++++ ...usPool_UltimateAreaOfEffectOverTime.asset} | 5 ++- ...l_UltimateAreaOfEffectOverTime.asset.meta} | 0 .../NPC/AngrySkelly/NPC_AoEAbility.asset | 35 ----------------- ...oEAbility.asset => Basic_AoEAbility.asset} | 7 +++- ...asset.meta => Basic_AoEAbility.asset.meta} | 0 .../Debug/NPC/{SkellyMage.meta => Mage.meta} | 0 .../Data/Abilities/Debug/NPC/Mage/Slash.meta | 8 ++++ .../Slash/Basic_MeleeSlashAbility.asset} | 7 ++-- .../Slash/Basic_MeleeSlashAbility.asset.meta} | 2 +- .../Data/Abilities/Debug/NPC/Mage/Throw.meta | 8 ++++ .../Throw/Basic_Mage_PutridOrb.asset} | 5 ++- .../Throw/Basic_Mage_PutridOrb.asset.meta} | 0 .../NPC/{AngrySkelly.meta => Skelly.meta} | 0 .../Abilities/Debug/NPC/Skelly/Slash.meta | 8 ++++ .../Slash/Basic_MeleeSlashAbility.asset | 39 +++++++++++++++++++ .../Slash/Basic_MeleeSlashAbility.asset.meta} | 0 .../Abilities/Debug/NPC/Skelly/Throw.meta | 8 ++++ .../Throw/Basic_BoneThrow.asset} | 9 ++++- .../Throw/Basic_BoneThrow.asset.meta} | 0 .../1-AxeThrow_ProjectileAbility.asset | 3 +- .../2-WhirlingAxes_AoEOverTimeAbility.asset | 7 +++- .../3-RageStorm_ChanneledAbility.asset | 7 ++-- .../1-ShieldThrow_ProjectileAbility.asset | 5 ++- .../2-ShieldWall_AntiProjectileAbility.asset | 4 +- .../3-ConsecrationAoEOverTimeAbility.asset | 10 ++++- .../Mage/1-IceShard_ProjectileAbility.asset | 4 +- .../Mage/2-Blizzard_AoEOverTimeAbility.asset | 6 ++- ...lacialBomb_AoEWithImpactEventAbility.asset | 5 ++- .../Debug/Player/MeleeSlashAbility.asset | 7 ++-- .../Priest/1-HolyBall_ProjectileAbility.asset | 5 ++- .../Priest/2-BurstOfHope_AoEAbility.asset | 11 +++--- .../3-HolyCircleAoEOverTimeAbility.asset | 9 +++-- .../Basic_Aoe_InstantEffect.asset} | 6 +-- ...eta => Basic_Aoe_InstantEffect.asset.meta} | 0 .../Debug/NPC/Boss/AngrySkellyBoss/Slash.meta | 8 ++++ .../AngrySkellyBoss_Slash_BleedEffect.asset} | 9 +++-- ...rySkellyBoss_Slash_BleedEffect.asset.meta} | 0 .../AngrySkellyBoss_Slash_InstantEffect.asset | 24 ++++++++++++ ...SkellyBoss_Slash_InstantEffect.asset.meta} | 0 .../Debug/NPC/Boss/AngrySkellyBoss/Throw.meta | 8 ++++ .../Throw/BoneThrow_InstantEffect.asset | 26 +++++++++++++ .../Throw/BoneThrow_InstantEffect.asset.meta | 8 ++++ .../NPC/Boss/AngrySkellyBoss/Ultimate.meta | 8 ++++ .../BoneStorm_InstantTickEffect.asset | 4 +- .../BoneStorm_InstantTickEffect.asset.meta | 0 .../Debug/NPC/Boss/SkellyMageBoss/Slash.meta | 8 ++++ .../Slash/Boss_Mage_Slash_InstantEffect.asset | 24 ++++++++++++ .../Boss_Mage_Slash_InstantEffect.asset.meta | 8 ++++ .../Debug/NPC/Boss/SkellyMageBoss/Throw.meta | 8 ++++ .../Boss_Mage_PutridOrb_InstantEffect.asset} | 8 ++-- ...ss_Mage_PutridOrb_InstantEffect.asset.meta | 8 ++++ .../Boss_Mage_PutridOrb_PoisonEffect.asset | 26 +++++++++++++ ...oss_Mage_PutridOrb_PoisonEffect.asset.meta | 8 ++++ .../NPC/Boss/SkellyMageBoss/Ultimate.meta | 8 ++++ ...age_PoisonousPool_InstantTickEffect.asset} | 8 ++-- ...oisonousPool_InstantTickEffect.asset.meta} | 0 ...Boss_Mage_PoisonousPool_PoisonEffect.asset | 26 +++++++++++++ ...age_PoisonousPool_PoisonEffect.asset.meta} | 0 .../NPC/Mage/NPC_INT_AoeInstantEffect.asset | 20 ---------- .../NPC_INT_ProjectileInstantEffect.asset | 20 ---------- .../Data/Effects/Debug/NPC/Mage/Slash.meta | 8 ++++ .../Mage/Slash/Basic_SlashInstantEffect.asset | 24 ++++++++++++ .../Slash/Basic_SlashInstantEffect.asset.meta | 8 ++++ .../Data/Effects/Debug/NPC/Mage/Throw.meta | 8 ++++ .../Throw/Basic_PutridOrb.asset} | 6 +-- .../Basic_PutridOrb.asset.meta} | 0 .../Throw/Basic_PutridOrb_PoisonEffect.asset} | 7 ++-- .../Basic_PutridOrb_PoisonEffect.asset.meta | 8 ++++ .../Debug/NPC/NPC_STR_AoeInstantEffect.asset | 20 ---------- ...NPC_MeleeSlashEffects.meta => Skelly.meta} | 0 .../Data/Effects/Debug/NPC/Skelly/Slash.meta | 8 ++++ .../Slash/Basic_SlashInstantEffect.asset | 24 ++++++++++++ .../Basic_SlashInstantEffect.asset.meta} | 0 .../Slash/Basic_Slash_BleedEffect.asset} | 7 ++-- .../Slash/Basic_Slash_BleedEffect.asset.meta | 8 ++++ .../Data/Effects/Debug/NPC/Skelly/Throw.meta | 8 ++++ .../Throw/Basic_BoneThrow_InstantEffect.asset | 26 +++++++++++++ .../Basic_BoneThrow_InstantEffect.asset.meta} | 0 .../Data/Effects/Debug/OverTimeEffect.asset | 19 --------- .../Effects/Debug/OverTimeEffect.asset.meta | 8 ---- ....asset => P_DarkMatterInstantEffect.asset} | 2 +- ...a => P_DarkMatterInstantEffect.asset.meta} | 0 ...2.asset => P_HolyBolt_InstantEffect.asset} | 2 +- ...ta => P_HolyBolt_InstantEffect.asset.meta} | 0 .../STR_HolyBolt_InstantEffect_01.asset | 20 ---------- .../STR_HolyBolt_InstantEffect_01.asset.meta | 8 ---- .../AGI_SlashInstantEffect.asset | 20 ---------- .../P_SlashInstantEffect.asset | 24 ++++++++++++ ...t.meta => P_SlashInstantEffect.asset.meta} | 0 .../STR_SlashInstantEffect.asset | 20 ---------- .../STR_SlashInstantEffect.asset.meta | 8 ---- .../AGI_AxeThrowInstantEffect_02.asset | 20 ---------- .../Barb_AxeThrow_BleedEffect.asset} | 8 ++-- ...a => Barb_AxeThrow_BleedEffect.asset.meta} | 0 .../Barb_AxeThrow_InstantEffect.asset | 24 ++++++++++++ ...=> Barb_AxeThrow_InstantEffect.asset.meta} | 0 .../STR_AxeThrowInstantEffect_01.asset | 20 ---------- .../STR_AxeThrowInstantEffect_01.asset.meta | 8 ---- .../AGI_WhirlingAxes_InstantEffect_02.asset | 20 ---------- ...I_WhirlingAxes_InstantEffect_02.asset.meta | 8 ---- .../Barb_WhirlingAxes_InstantEffect.asset | 24 ++++++++++++ ...arb_WhirlingAxes_InstantEffect.asset.meta} | 0 .../STR_WhirlingAxes_InstantEffect_01.asset | 20 ---------- .../AGI_RageStorm_InstantEffect_02.asset | 20 ---------- ... => Barb_RageStorm_DIModifierEffect.asset} | 7 ++-- ...arb_RageStorm_DIModifierEffect.asset.meta} | 0 .../Barb_RageStorm_InstantEffect.asset} | 6 +-- ...> Barb_RageStorm_InstantEffect.asset.meta} | 0 .../STR_RageStorm_InstantEffect_01.asset | 20 ---------- .../STR_RageStorm_InstantEffect_01.asset.meta | 8 ---- .../Debug/Player/INT_AoeInstantEffect.asset | 20 ---------- .../Player/INT_AoeInstantEffect.asset.meta | 8 ---- .../AGI_ProjectileInstantEffect_02.asset | 20 ---------- .../Knight_Projectile_InstantEffect.asset | 24 ++++++++++++ ...night_Projectile_InstantEffect.asset.meta} | 0 .../STR_ProjectileInstantEffect_01.asset | 20 ---------- .../STR_ProjectileInstantEffect_01.asset.meta | 8 ---- .../INT_Consecration_TickEffect_02.asset | 20 ---------- ...Consecration_BurnOverTimeEffectStack.asset | 28 +++++++++++++ ...ration_BurnOverTimeEffectStack.asset.meta} | 0 ...ight_Consecration_InstantEffect_Tick.asset | 24 ++++++++++++ ...onsecration_InstantEffect_Tick.asset.meta} | 0 .../STR_Consecration_TickEffect_01.asset | 20 ---------- .../STR_Consecration_TickEffect_01.asset.meta | 8 ---- .../Mage_IceShard_InstantEffect.asset} | 8 ++-- ...=> Mage_IceShard_InstantEffect.asset.meta} | 0 .../INT_Blizzard_TickEffect.asset | 20 ---------- .../Mage_Blizzard_InstantEffect_Tick.asset} | 6 +-- ...ge_Blizzard_InstantEffect_Tick.asset.meta} | 0 .../INT_ImpactInstantEffect_01.asset | 22 ----------- .../Mage_Impact_InstantEffect.asset | 24 ++++++++++++ ...a => Mage_Impact_InstantEffect.asset.meta} | 0 .../STR_ImpactInstantEffect_02.asset | 20 ---------- .../STR_ImpactInstantEffect_02.asset.meta | 8 ---- .../INT_HolyBall_InstantEffect_02.asset.meta | 8 ---- ...et => Priest_HolyBall_InstantEffect.asset} | 10 +++-- ... Priest_HolyBall_InstantEffect.asset.meta} | 0 .../SPI_HolyBall_InstantEffect_01.asset | 22 ----------- .../SPI_HolyBall_AbsorbEffect_01.asset | 24 ------------ .../SPI_HolyBall_AbsorbEffect_01.asset.meta | 8 ---- ... => Priest_BurstofHope_AbsorbEffect.asset} | 6 +-- ...riest_BurstofHope_AbsorbEffect.asset.meta} | 0 ...=> Priest_BurstofHope_InstantEffect.asset} | 8 ++-- ...iest_BurstofHope_InstantEffect.asset.meta} | 0 .../SPI_BurstofHope_InstantEffect_01.asset | 22 ----------- ...PI_BurstofHope_InstantEffect_01.asset.meta | 8 ---- .../INT_HolyCircle_TickEffect_02.asset.meta | 8 ---- ...riest_HolyCircle_InstantEffect_Tick.asset} | 10 +++-- ..._HolyCircle_InstantEffect_Tick.asset.meta} | 0 .../SPI_HolyCircle_TickEffect_01.asset | 22 ----------- .../Scripts/AbilitySystem/Base/BaseAbility.cs | 6 +-- .../Scripts/AbilitySystem/Base/BaseEffect.cs | 2 +- .../AbilitySystem/Base/StatInfluence.cs | 10 +++++ .../AbilitySystem/Base/StatInfluence.cs.meta | 11 ++++++ .../AbilitySystem/Effects/AbsorbEffect.cs | 21 ++++++++-- .../Effects/AbsorbEffectInstance.cs | 26 ++++++------- .../BaseDamageOverTimeEffectInstance.cs | 24 ++++++------ .../Effects/BleedEffectInstance.cs | 4 +- .../Effects/BurnEffectInstance.cs | 4 +- .../Effects/DamageIncomeModifierEffect.cs | 22 ++++++++++- .../DamageIncomeModifierEffectInstance.cs | 16 ++++---- .../Effects/DamageOverTimeEffect.cs | 28 ++++++++----- .../Effects/InstantValueEffect.cs | 29 +++++++++----- .../Effects/PoisonEffectInstance.cs | 4 +- .../Effects/StatusEffectInstance.cs | 10 ++--- 189 files changed, 1074 insertions(+), 859 deletions(-) rename Assets/Scriptables/Data/Abilities/Debug/NPC/{Boss.meta => -Boss.meta} (100%) rename Assets/Scriptables/Data/Abilities/Debug/NPC/{Boss/Angry.meta => -Boss/AngrySkelly.meta} (100%) rename Assets/Scriptables/Data/{Effects/Debug/Player/Barbarian/3-RageStorm/StatusEffects.meta => Abilities/Debug/NPC/-Boss/AngrySkelly/Slash.meta} (77%) rename Assets/Scriptables/Data/Abilities/Debug/NPC/{ => -Boss/AngrySkelly/Slash}/Boss_AngrySkelly_MeleeSlash.asset (90%) rename Assets/Scriptables/Data/Abilities/Debug/NPC/{ => -Boss/AngrySkelly/Slash}/Boss_AngrySkelly_MeleeSlash.asset.meta (100%) rename Assets/Scriptables/Data/{Effects/Debug/Player/Priest/1-HolyBallEffects/StatusEffects.meta => Abilities/Debug/NPC/-Boss/AngrySkelly/Throw.meta} (77%) create mode 100644 Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/AngrySkelly/Throw/Boss_BoneThrow.asset rename Assets/Scriptables/Data/Abilities/Debug/NPC/{SkellyMage/NPC_Mage_AoEAbility.asset.meta => -Boss/AngrySkelly/Throw/Boss_BoneThrow.asset.meta} (79%) rename Assets/Scriptables/Data/{Effects/Debug/Player/Priest/2-BurstofHopeEffects/StatusEffects.meta => Abilities/Debug/NPC/-Boss/AngrySkelly/Ultimate.meta} (77%) rename Assets/Scriptables/Data/Abilities/Debug/NPC/{Boss/Angry/NPC_BoneStorm_UltimateAreaOfEffectOverTime.asset => -Boss/AngrySkelly/Ultimate/Boss_Skelly_BoneStorm_UltimateAreaOfEffectOverTime.asset} (92%) rename Assets/Scriptables/Data/Abilities/Debug/NPC/{Boss/Angry/NPC_BoneStorm_UltimateAreaOfEffectOverTime.asset.meta => -Boss/AngrySkelly/Ultimate/Boss_Skelly_BoneStorm_UltimateAreaOfEffectOverTime.asset.meta} (100%) create mode 100644 Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/Mage.meta create mode 100644 Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/Mage/Slash.meta create mode 100644 Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/Mage/Slash/Boss_Mage_MeleeSlash.asset rename Assets/Scriptables/Data/{Effects/Debug/NPC/Boss/AngrySkellyBoss/AngrySkellyBoss_AGI_Slash_Instant.asset.meta => Abilities/Debug/NPC/-Boss/Mage/Slash/Boss_Mage_MeleeSlash.asset.meta} (79%) create mode 100644 Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/Mage/Throw.meta create mode 100644 Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/Mage/Throw/Boss_Mage_PutridOrb.asset rename Assets/Scriptables/Data/{Effects/Debug/NPC/NPC_MeleeSlashEffects/NPC_AGI_SlashInstantEffect.asset.meta => Abilities/Debug/NPC/-Boss/Mage/Throw/Boss_Mage_PutridOrb.asset.meta} (79%) create mode 100644 Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/Mage/Ultimate.meta rename Assets/Scriptables/Data/Abilities/Debug/NPC/{Boss/Angry/NPC_PoisonousPool_UltimateAreaOfEffectOverTime.asset => -Boss/Mage/Ultimate/Boss_Mage_PoisonousPool_UltimateAreaOfEffectOverTime.asset} (80%) rename Assets/Scriptables/Data/Abilities/Debug/NPC/{Boss/Angry/NPC_PoisonousPool_UltimateAreaOfEffectOverTime.asset.meta => -Boss/Mage/Ultimate/Boss_Mage_PoisonousPool_UltimateAreaOfEffectOverTime.asset.meta} (100%) delete mode 100644 Assets/Scriptables/Data/Abilities/Debug/NPC/AngrySkelly/NPC_AoEAbility.asset rename Assets/Scriptables/Data/Abilities/Debug/NPC/{SkellyMage/NPC_Mage_AoEAbility.asset => Basic_AoEAbility.asset} (91%) rename Assets/Scriptables/Data/Abilities/Debug/NPC/{AngrySkelly/NPC_AoEAbility.asset.meta => Basic_AoEAbility.asset.meta} (100%) rename Assets/Scriptables/Data/Abilities/Debug/NPC/{SkellyMage.meta => Mage.meta} (100%) create mode 100644 Assets/Scriptables/Data/Abilities/Debug/NPC/Mage/Slash.meta rename Assets/Scriptables/Data/Abilities/Debug/NPC/{NPC_MeleeSlashAbility.asset => Mage/Slash/Basic_MeleeSlashAbility.asset} (86%) rename Assets/Scriptables/Data/{Effects/Debug/NPC/NPC_STR_AoeInstantEffect.asset.meta => Abilities/Debug/NPC/Mage/Slash/Basic_MeleeSlashAbility.asset.meta} (79%) create mode 100644 Assets/Scriptables/Data/Abilities/Debug/NPC/Mage/Throw.meta rename Assets/Scriptables/Data/Abilities/Debug/NPC/{SkellyMage/NPC_Mage_ProjectileAbility.asset => Mage/Throw/Basic_Mage_PutridOrb.asset} (81%) rename Assets/Scriptables/Data/Abilities/Debug/NPC/{SkellyMage/NPC_Mage_ProjectileAbility.asset.meta => Mage/Throw/Basic_Mage_PutridOrb.asset.meta} (100%) rename Assets/Scriptables/Data/Abilities/Debug/NPC/{AngrySkelly.meta => Skelly.meta} (100%) create mode 100644 Assets/Scriptables/Data/Abilities/Debug/NPC/Skelly/Slash.meta create mode 100644 Assets/Scriptables/Data/Abilities/Debug/NPC/Skelly/Slash/Basic_MeleeSlashAbility.asset rename Assets/Scriptables/Data/Abilities/Debug/NPC/{NPC_MeleeSlashAbility.asset.meta => Skelly/Slash/Basic_MeleeSlashAbility.asset.meta} (100%) create mode 100644 Assets/Scriptables/Data/Abilities/Debug/NPC/Skelly/Throw.meta rename Assets/Scriptables/Data/Abilities/Debug/NPC/{AngrySkelly/NPC_ProjectileAbility.asset => Skelly/Throw/Basic_BoneThrow.asset} (83%) rename Assets/Scriptables/Data/Abilities/Debug/NPC/{AngrySkelly/NPC_ProjectileAbility.asset.meta => Skelly/Throw/Basic_BoneThrow.asset.meta} (100%) rename Assets/Scriptables/Data/Effects/Debug/{Player/Mage/1-IceShardEffects/INT_IceShard_InstantEffect_01.asset => NPC/Basic_Aoe_InstantEffect.asset} (79%) rename Assets/Scriptables/Data/Effects/Debug/NPC/{Mage/NPC_INT_AoeInstantEffect.asset.meta => Basic_Aoe_InstantEffect.asset.meta} (100%) create mode 100644 Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/Slash.meta rename Assets/Scriptables/Data/Effects/Debug/{Player/Knight/3-ConsecrationEffects/SPI_Consecration_BurnOverTimeEffectStack.asset => NPC/Boss/AngrySkellyBoss/Slash/AngrySkellyBoss_Slash_BleedEffect.asset} (76%) rename Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/{AngrySkellyBoss_STR_Slash_BleedEffect.asset.meta => Slash/AngrySkellyBoss_Slash_BleedEffect.asset.meta} (100%) create mode 100644 Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/Slash/AngrySkellyBoss_Slash_InstantEffect.asset rename Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/{AngrySkellyBoss_STR_Slash_Instant.asset.meta => Slash/AngrySkellyBoss_Slash_InstantEffect.asset.meta} (100%) create mode 100644 Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/Throw.meta create mode 100644 Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/Throw/BoneThrow_InstantEffect.asset create mode 100644 Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/Throw/BoneThrow_InstantEffect.asset.meta create mode 100644 Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/Ultimate.meta rename Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/{ => Ultimate}/BoneStorm_InstantTickEffect.asset (84%) rename Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/{ => Ultimate}/BoneStorm_InstantTickEffect.asset.meta (100%) create mode 100644 Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Slash.meta create mode 100644 Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Slash/Boss_Mage_Slash_InstantEffect.asset create mode 100644 Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Slash/Boss_Mage_Slash_InstantEffect.asset.meta create mode 100644 Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Throw.meta rename Assets/Scriptables/Data/Effects/Debug/NPC/Boss/{AngrySkellyBoss/AngrySkellyBoss_AGI_Slash_Instant.asset => SkellyMageBoss/Throw/Boss_Mage_PutridOrb_InstantEffect.asset} (76%) create mode 100644 Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Throw/Boss_Mage_PutridOrb_InstantEffect.asset.meta create mode 100644 Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Throw/Boss_Mage_PutridOrb_PoisonEffect.asset create mode 100644 Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Throw/Boss_Mage_PutridOrb_PoisonEffect.asset.meta create mode 100644 Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Ultimate.meta rename Assets/Scriptables/Data/Effects/Debug/NPC/Boss/{AngrySkellyBoss/AngrySkellyBoss_STR_Slash_Instant.asset => SkellyMageBoss/Ultimate/Boss_Mage_PoisonousPool_InstantTickEffect.asset} (75%) rename Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/{PoisonousPool_InstantTickEffect.asset.meta => Ultimate/Boss_Mage_PoisonousPool_InstantTickEffect.asset.meta} (100%) create mode 100644 Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Ultimate/Boss_Mage_PoisonousPool_PoisonEffect.asset rename Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/{PoisonousPool_PoisonEffect.asset.meta => Ultimate/Boss_Mage_PoisonousPool_PoisonEffect.asset.meta} (100%) delete mode 100644 Assets/Scriptables/Data/Effects/Debug/NPC/Mage/NPC_INT_AoeInstantEffect.asset delete mode 100644 Assets/Scriptables/Data/Effects/Debug/NPC/Mage/NPC_INT_ProjectileInstantEffect.asset create mode 100644 Assets/Scriptables/Data/Effects/Debug/NPC/Mage/Slash.meta create mode 100644 Assets/Scriptables/Data/Effects/Debug/NPC/Mage/Slash/Basic_SlashInstantEffect.asset create mode 100644 Assets/Scriptables/Data/Effects/Debug/NPC/Mage/Slash/Basic_SlashInstantEffect.asset.meta create mode 100644 Assets/Scriptables/Data/Effects/Debug/NPC/Mage/Throw.meta rename Assets/Scriptables/Data/Effects/Debug/NPC/{NPC_STR_ProjectileInstantEffect.asset => Mage/Throw/Basic_PutridOrb.asset} (79%) rename Assets/Scriptables/Data/Effects/Debug/NPC/Mage/{NPC_INT_ProjectileInstantEffect.asset.meta => Throw/Basic_PutridOrb.asset.meta} (100%) rename Assets/Scriptables/Data/Effects/Debug/NPC/{Boss/SkellyMageBoss/PoisonousPool_PoisonEffect.asset => Mage/Throw/Basic_PutridOrb_PoisonEffect.asset} (78%) create mode 100644 Assets/Scriptables/Data/Effects/Debug/NPC/Mage/Throw/Basic_PutridOrb_PoisonEffect.asset.meta delete mode 100644 Assets/Scriptables/Data/Effects/Debug/NPC/NPC_STR_AoeInstantEffect.asset rename Assets/Scriptables/Data/Effects/Debug/NPC/{NPC_MeleeSlashEffects.meta => Skelly.meta} (100%) create mode 100644 Assets/Scriptables/Data/Effects/Debug/NPC/Skelly/Slash.meta create mode 100644 Assets/Scriptables/Data/Effects/Debug/NPC/Skelly/Slash/Basic_SlashInstantEffect.asset rename Assets/Scriptables/Data/Effects/Debug/NPC/{NPC_MeleeSlashEffects/NPC_STR_SlashInstantEffect.asset.meta => Skelly/Slash/Basic_SlashInstantEffect.asset.meta} (100%) rename Assets/Scriptables/Data/Effects/Debug/{Player/Barbarian/1-AxeThrow/STR_BleedEffect.asset => NPC/Skelly/Slash/Basic_Slash_BleedEffect.asset} (79%) create mode 100644 Assets/Scriptables/Data/Effects/Debug/NPC/Skelly/Slash/Basic_Slash_BleedEffect.asset.meta create mode 100644 Assets/Scriptables/Data/Effects/Debug/NPC/Skelly/Throw.meta create mode 100644 Assets/Scriptables/Data/Effects/Debug/NPC/Skelly/Throw/Basic_BoneThrow_InstantEffect.asset rename Assets/Scriptables/Data/Effects/Debug/NPC/{NPC_STR_ProjectileInstantEffect.asset.meta => Skelly/Throw/Basic_BoneThrow_InstantEffect.asset.meta} (100%) delete mode 100644 Assets/Scriptables/Data/Effects/Debug/OverTimeEffect.asset delete mode 100644 Assets/Scriptables/Data/Effects/Debug/OverTimeEffect.asset.meta rename Assets/Scriptables/Data/Effects/Debug/Player/-Extras/DarkMatterEffects/{INT_DarkMatterInstantEffect.asset => P_DarkMatterInstantEffect.asset} (93%) rename Assets/Scriptables/Data/Effects/Debug/Player/-Extras/DarkMatterEffects/{INT_DarkMatterInstantEffect.asset.meta => P_DarkMatterInstantEffect.asset.meta} (100%) rename Assets/Scriptables/Data/Effects/Debug/Player/-Extras/HolyBoltEffects/{INT_HolyBolt_InstantEffect_02.asset => P_HolyBolt_InstantEffect.asset} (93%) rename Assets/Scriptables/Data/Effects/Debug/Player/-Extras/HolyBoltEffects/{INT_HolyBolt_InstantEffect_02.asset.meta => P_HolyBolt_InstantEffect.asset.meta} (100%) delete mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/-Extras/HolyBoltEffects/STR_HolyBolt_InstantEffect_01.asset delete mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/-Extras/HolyBoltEffects/STR_HolyBolt_InstantEffect_01.asset.meta delete mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/-Extras/MeleeSlashEffects/AGI_SlashInstantEffect.asset create mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/-Extras/MeleeSlashEffects/P_SlashInstantEffect.asset rename Assets/Scriptables/Data/Effects/Debug/Player/-Extras/MeleeSlashEffects/{AGI_SlashInstantEffect.asset.meta => P_SlashInstantEffect.asset.meta} (100%) delete mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/-Extras/MeleeSlashEffects/STR_SlashInstantEffect.asset delete mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/-Extras/MeleeSlashEffects/STR_SlashInstantEffect.asset.meta delete mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/1-AxeThrow/AGI_AxeThrowInstantEffect_02.asset rename Assets/Scriptables/Data/Effects/Debug/{NPC/Boss/AngrySkellyBoss/AngrySkellyBoss_STR_Slash_BleedEffect.asset => Player/Barbarian/1-AxeThrow/Barb_AxeThrow_BleedEffect.asset} (79%) rename Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/1-AxeThrow/{STR_BleedEffect.asset.meta => Barb_AxeThrow_BleedEffect.asset.meta} (100%) create mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/1-AxeThrow/Barb_AxeThrow_InstantEffect.asset rename Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/1-AxeThrow/{AGI_AxeThrowInstantEffect_02.asset.meta => Barb_AxeThrow_InstantEffect.asset.meta} (100%) delete mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/1-AxeThrow/STR_AxeThrowInstantEffect_01.asset delete mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/1-AxeThrow/STR_AxeThrowInstantEffect_01.asset.meta delete mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/2-WhirlingAxes/AGI_WhirlingAxes_InstantEffect_02.asset delete mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/2-WhirlingAxes/AGI_WhirlingAxes_InstantEffect_02.asset.meta create mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/2-WhirlingAxes/Barb_WhirlingAxes_InstantEffect.asset rename Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/2-WhirlingAxes/{STR_WhirlingAxes_InstantEffect_01.asset.meta => Barb_WhirlingAxes_InstantEffect.asset.meta} (100%) delete mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/2-WhirlingAxes/STR_WhirlingAxes_InstantEffect_01.asset delete mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/AGI_RageStorm_InstantEffect_02.asset rename Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/{StatusEffects/STR_RageStorm_DIModifierEffect_01.asset => Barb_RageStorm_DIModifierEffect.asset} (75%) rename Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/{StatusEffects/STR_RageStorm_DIModifierEffect_01.asset.meta => Barb_RageStorm_DIModifierEffect.asset.meta} (100%) rename Assets/Scriptables/Data/Effects/Debug/{NPC/NPC_MeleeSlashEffects/NPC_STR_SlashInstantEffect.asset => Player/Barbarian/3-RageStorm/Barb_RageStorm_InstantEffect.asset} (78%) rename Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/{AGI_RageStorm_InstantEffect_02.asset.meta => Barb_RageStorm_InstantEffect.asset.meta} (100%) delete mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/STR_RageStorm_InstantEffect_01.asset delete mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/STR_RageStorm_InstantEffect_01.asset.meta delete mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/INT_AoeInstantEffect.asset delete mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/INT_AoeInstantEffect.asset.meta delete mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/Knight/1-ShieldThrowEffects/AGI_ProjectileInstantEffect_02.asset create mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/Knight/1-ShieldThrowEffects/Knight_Projectile_InstantEffect.asset rename Assets/Scriptables/Data/Effects/Debug/Player/Knight/1-ShieldThrowEffects/{AGI_ProjectileInstantEffect_02.asset.meta => Knight_Projectile_InstantEffect.asset.meta} (100%) delete mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/Knight/1-ShieldThrowEffects/STR_ProjectileInstantEffect_01.asset delete mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/Knight/1-ShieldThrowEffects/STR_ProjectileInstantEffect_01.asset.meta delete mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/Knight/3-ConsecrationEffects/INT_Consecration_TickEffect_02.asset create mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/Knight/3-ConsecrationEffects/Knight_Consecration_BurnOverTimeEffectStack.asset rename Assets/Scriptables/Data/Effects/Debug/Player/Knight/3-ConsecrationEffects/{SPI_Consecration_BurnOverTimeEffectStack.asset.meta => Knight_Consecration_BurnOverTimeEffectStack.asset.meta} (100%) create mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/Knight/3-ConsecrationEffects/Knight_Consecration_InstantEffect_Tick.asset rename Assets/Scriptables/Data/Effects/Debug/Player/Knight/3-ConsecrationEffects/{INT_Consecration_TickEffect_02.asset.meta => Knight_Consecration_InstantEffect_Tick.asset.meta} (100%) delete mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/Knight/3-ConsecrationEffects/STR_Consecration_TickEffect_01.asset delete mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/Knight/3-ConsecrationEffects/STR_Consecration_TickEffect_01.asset.meta rename Assets/Scriptables/Data/Effects/Debug/{NPC/NPC_MeleeSlashEffects/NPC_AGI_SlashInstantEffect.asset => Player/Mage/1-IceShardEffects/Mage_IceShard_InstantEffect.asset} (76%) rename Assets/Scriptables/Data/Effects/Debug/Player/Mage/1-IceShardEffects/{INT_IceShard_InstantEffect_01.asset.meta => Mage_IceShard_InstantEffect.asset.meta} (100%) delete mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/Mage/2-BlizzardEffects/INT_Blizzard_TickEffect.asset rename Assets/Scriptables/Data/Effects/Debug/{NPC/Boss/SkellyMageBoss/PoisonousPool_InstantTickEffect.asset => Player/Mage/2-BlizzardEffects/Mage_Blizzard_InstantEffect_Tick.asset} (78%) rename Assets/Scriptables/Data/Effects/Debug/Player/Mage/2-BlizzardEffects/{INT_Blizzard_TickEffect.asset.meta => Mage_Blizzard_InstantEffect_Tick.asset.meta} (100%) delete mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/Mage/3-GlacialBombEffects/INT_ImpactInstantEffect_01.asset create mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/Mage/3-GlacialBombEffects/Mage_Impact_InstantEffect.asset rename Assets/Scriptables/Data/Effects/Debug/Player/Mage/3-GlacialBombEffects/{INT_ImpactInstantEffect_01.asset.meta => Mage_Impact_InstantEffect.asset.meta} (100%) delete mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/Mage/3-GlacialBombEffects/STR_ImpactInstantEffect_02.asset delete mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/Mage/3-GlacialBombEffects/STR_ImpactInstantEffect_02.asset.meta delete mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/INT_HolyBall_InstantEffect_02.asset.meta rename Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/{INT_HolyBall_InstantEffect_02.asset => Priest_HolyBall_InstantEffect.asset} (66%) rename Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/{SPI_HolyBall_InstantEffect_01.asset.meta => Priest_HolyBall_InstantEffect.asset.meta} (100%) delete mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/SPI_HolyBall_InstantEffect_01.asset delete mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/StatusEffects/SPI_HolyBall_AbsorbEffect_01.asset delete mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/StatusEffects/SPI_HolyBall_AbsorbEffect_01.asset.meta rename Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/{StatusEffects/SPI_BurstofHope_AbsorbEffect_01.asset => Priest_BurstofHope_AbsorbEffect.asset} (80%) rename Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/{StatusEffects/SPI_BurstofHope_AbsorbEffect_01.asset.meta => Priest_BurstofHope_AbsorbEffect.asset.meta} (100%) rename Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/{INT_BurstofHope_InstantEffect_02.asset => Priest_BurstofHope_InstantEffect.asset} (68%) rename Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/{INT_BurstofHope_InstantEffect_02.asset.meta => Priest_BurstofHope_InstantEffect.asset.meta} (100%) delete mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/SPI_BurstofHope_InstantEffect_01.asset delete mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/SPI_BurstofHope_InstantEffect_01.asset.meta delete mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/Priest/3-HolyCircleEffects/INT_HolyCircle_TickEffect_02.asset.meta rename Assets/Scriptables/Data/Effects/Debug/Player/Priest/3-HolyCircleEffects/{INT_HolyCircle_TickEffect_02.asset => Priest_HolyCircle_InstantEffect_Tick.asset} (65%) rename Assets/Scriptables/Data/Effects/Debug/Player/Priest/3-HolyCircleEffects/{SPI_HolyCircle_TickEffect_01.asset.meta => Priest_HolyCircle_InstantEffect_Tick.asset.meta} (100%) delete mode 100644 Assets/Scriptables/Data/Effects/Debug/Player/Priest/3-HolyCircleEffects/SPI_HolyCircle_TickEffect_01.asset create mode 100644 Assets/Scripts/AbilitySystem/Base/StatInfluence.cs create mode 100644 Assets/Scripts/AbilitySystem/Base/StatInfluence.cs.meta diff --git a/Assets/Developer/Prefabs/Persistent Objects.prefab b/Assets/Developer/Prefabs/Persistent Objects.prefab index f7571e70..e94a95bd 100644 --- a/Assets/Developer/Prefabs/Persistent Objects.prefab +++ b/Assets/Developer/Prefabs/Persistent Objects.prefab @@ -1615,13 +1615,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: StatusEffects: - - {fileID: 11400000, guid: c67c3526f466b254c9dba7c2d584eb4e, type: 2} - - {fileID: 11400000, guid: ac1c44b70abf5934abbcb97d1fc331cf, type: 2} - - {fileID: 11400000, guid: a1bafe62c9b7a5b428996e45d7bd3f33, type: 2} - {fileID: 11400000, guid: f6215263ccc38504983f5bbfb24c5484, type: 2} + - {fileID: 11400000, guid: a1bafe62c9b7a5b428996e45d7bd3f33, type: 2} - {fileID: 11400000, guid: d9d785193cdc1074f93a4100438442dc, type: 2} - - {fileID: 11400000, guid: 3abae6d7d3645c04899811b2b1fd30a2, type: 2} + - {fileID: 11400000, guid: ac1c44b70abf5934abbcb97d1fc331cf, type: 2} - {fileID: 11400000, guid: a5e3819c0b3e13840a7d8df0a40b9d37, type: 2} + - {fileID: 11400000, guid: 9dbaea888b8c168439811320a7cccfb9, type: 2} + - {fileID: 11400000, guid: 3abae6d7d3645c04899811b2b1fd30a2, type: 2} + - {fileID: 11400000, guid: f8ccb993ef7a8114aa9f678e3cdee866, type: 2} + - {fileID: 11400000, guid: 0b7040401c71ccd44bd23de8469d25d7, type: 2} --- !u!1 &7415797954231552197 GameObject: m_ObjectHideFlags: 0 @@ -2045,29 +2047,34 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Abilities: - - {fileID: 11400000, guid: 7242df20561c87c419bb0e80648290f9, type: 2} - - {fileID: 11400000, guid: 7db71a7a9f2ca1842a5dfd371700c6af, type: 2} - - {fileID: 11400000, guid: 4370ff9bb60c37343b99f24942443388, type: 2} + - {fileID: 11400000, guid: 48c21a87df147d240bd28d64dff3a9bf, type: 2} + - {fileID: 11400000, guid: 731bf850d0d00c249a66adceab3f7a76, type: 2} + - {fileID: 11400000, guid: 01dd8dfc3c72bec45a8a93e9c11d3386, type: 2} + - {fileID: 11400000, guid: e367535dfccec2240b234f5263cf2735, type: 2} + - {fileID: 11400000, guid: 24ef10843ab5be442a4febabbbd95bbd, type: 2} + - {fileID: 11400000, guid: c56aab26a7921ba4989033b7803f61b8, type: 2} + - {fileID: 11400000, guid: f7d0c807ee02b6947b7c02a69548f09d, type: 2} - {fileID: 11400000, guid: 9b34a79c173c62f4baf36af8c1e1ce41, type: 2} + - {fileID: 11400000, guid: 44d3aad893d771343950a3b3cfde096b, type: 2} + - {fileID: 11400000, guid: 7db71a7a9f2ca1842a5dfd371700c6af, type: 2} + - {fileID: 11400000, guid: 7242df20561c87c419bb0e80648290f9, type: 2} - {fileID: 11400000, guid: 9b43747f03d28d44f95e39e9e2e6eab7, type: 2} - {fileID: 11400000, guid: 3eb0543909f25a94eb803cdc9bb51da0, type: 2} - {fileID: 11400000, guid: 30f6d3f1460057a46bc32df18d5f11e8, type: 2} - {fileID: 11400000, guid: f78ff85297eeec34a941affb095f27f4, type: 2} - {fileID: 11400000, guid: da1fbcda369605140b8241d12c165bc4, type: 2} - {fileID: 11400000, guid: 173988f00454d854e9cf1de9f75bc3bd, type: 2} - - {fileID: 11400000, guid: c15517f2e2e470f4cae0cf7d24e8e528, type: 2} - - {fileID: 11400000, guid: f14dd16258b34f547adaad0f4bcec9fb, type: 2} - - {fileID: 11400000, guid: 24ff8efa4b2e859479400e18c23a098b, type: 2} - - {fileID: 11400000, guid: 8d25a412bad4d5549880697abbfba549, type: 2} - - {fileID: 11400000, guid: 3b11712f0ae0c3248b755e23ce4a3dd3, type: 2} - {fileID: 11400000, guid: 6e6816a87356ed54aa546aefca31e06b, type: 2} - {fileID: 11400000, guid: e75c893bb94c00f41b9bc6bbea9872d4, type: 2} - {fileID: 11400000, guid: d58ac5a6fef83a24e93311b30cc34b0d, type: 2} - {fileID: 11400000, guid: b2720497081a6e349a7988604c2376e5, type: 2} - {fileID: 11400000, guid: f3628bf368b593d488559a00aef758a6, type: 2} - {fileID: 11400000, guid: 96c81c820f0bfe747af956cccd0f0ba4, type: 2} - - {fileID: 11400000, guid: 01dd8dfc3c72bec45a8a93e9c11d3386, type: 2} - - {fileID: 11400000, guid: c56aab26a7921ba4989033b7803f61b8, type: 2} + - {fileID: 11400000, guid: c15517f2e2e470f4cae0cf7d24e8e528, type: 2} + - {fileID: 11400000, guid: f14dd16258b34f547adaad0f4bcec9fb, type: 2} + - {fileID: 11400000, guid: 8d25a412bad4d5549880697abbfba549, type: 2} + - {fileID: 11400000, guid: 3b11712f0ae0c3248b755e23ce4a3dd3, type: 2} + - {fileID: 11400000, guid: 24ff8efa4b2e859479400e18c23a098b, type: 2} --- !u!1 &7475116341184709871 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Bosses/BossEnemyPrefab_AngrySkelly_ Variant.prefab b/Assets/Resources/Bosses/BossEnemyPrefab_AngrySkelly_ Variant.prefab index 5775b0e9..99d4857f 100644 --- a/Assets/Resources/Bosses/BossEnemyPrefab_AngrySkelly_ Variant.prefab +++ b/Assets/Resources/Bosses/BossEnemyPrefab_AngrySkelly_ Variant.prefab @@ -853,7 +853,7 @@ PrefabInstance: - target: {fileID: 7680563380990892983, guid: d9b43fa944715a7489818765baa8fc11, type: 3} propertyPath: abilityPriorityList.Array.data[2].ability value: - objectReference: {fileID: 11400000, guid: 7db71a7a9f2ca1842a5dfd371700c6af, type: 2} + objectReference: {fileID: 11400000, guid: 731bf850d0d00c249a66adceab3f7a76, type: 2} - target: {fileID: 7680563380990892983, guid: d9b43fa944715a7489818765baa8fc11, type: 3} propertyPath: abilityPriorityList.Array.data[0].castConditions.Array.size value: 1 @@ -864,7 +864,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7680563380990892983, guid: d9b43fa944715a7489818765baa8fc11, type: 3} propertyPath: abilityPriorityList.Array.data[2].castConditions.Array.size - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 7680563380990892983, guid: d9b43fa944715a7489818765baa8fc11, type: 3} propertyPath: abilityPriorityList.Array.data[0].castConditions.Array.data[0].conditionType @@ -880,10 +880,14 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7680563380990892983, guid: d9b43fa944715a7489818765baa8fc11, type: 3} propertyPath: abilityPriorityList.Array.data[2].castConditions.Array.data[0].conditionType - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7680563380990892983, guid: d9b43fa944715a7489818765baa8fc11, type: 3} propertyPath: abilityPriorityList.Array.data[2].castConditions.Array.data[1].conditionType + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7680563380990892983, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: abilityPriorityList.Array.data[2].castConditions.Array.data[2].conditionType value: 3 objectReference: {fileID: 0} m_RemovedComponents: [] diff --git a/Assets/Resources/Bosses/BossEnemyPrefab_SkellyMage_Variant.prefab b/Assets/Resources/Bosses/BossEnemyPrefab_SkellyMage_Variant.prefab index a147a18e..fbf7f61b 100644 --- a/Assets/Resources/Bosses/BossEnemyPrefab_SkellyMage_Variant.prefab +++ b/Assets/Resources/Bosses/BossEnemyPrefab_SkellyMage_Variant.prefab @@ -1812,6 +1812,14 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0.68 objectReference: {fileID: 0} + - target: {fileID: 7680563380990892983, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: abilityPriorityList.Array.data[1].ability + value: + objectReference: {fileID: 11400000, guid: 24ef10843ab5be442a4febabbbd95bbd, type: 2} + - target: {fileID: 7680563380990892983, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: abilityPriorityList.Array.data[2].ability + value: + objectReference: {fileID: 11400000, guid: e367535dfccec2240b234f5263cf2735, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d9b43fa944715a7489818765baa8fc11, type: 3} --- !u!4 &4854261591842771834 stripped diff --git a/Assets/Resources/Enemies/BasicEnemyPrefab_AngrySkelly_Variant.prefab b/Assets/Resources/Enemies/BasicEnemyPrefab_AngrySkelly_Variant.prefab index a82f2a62..7f3e5d34 100644 --- a/Assets/Resources/Enemies/BasicEnemyPrefab_AngrySkelly_Variant.prefab +++ b/Assets/Resources/Enemies/BasicEnemyPrefab_AngrySkelly_Variant.prefab @@ -186,7 +186,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8562165150115495942, guid: 5e02787002b78154db83a830e460a4a9, type: 3} propertyPath: abilityPriorityList.Array.data[1].castConditions.Array.size - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 8562165150115495942, guid: 5e02787002b78154db83a830e460a4a9, type: 3} propertyPath: abilityPriorityList.Array.data[0].castConditions.Array.data[0].conditionType @@ -198,8 +198,16 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8562165150115495942, guid: 5e02787002b78154db83a830e460a4a9, type: 3} propertyPath: abilityPriorityList.Array.data[1].castConditions.Array.data[0].conditionType + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8562165150115495942, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: abilityPriorityList.Array.data[1].castConditions.Array.data[1].conditionType value: 0 objectReference: {fileID: 0} + - target: {fileID: 8562165150115495942, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + propertyPath: abilityPriorityList.Array.data[1].castConditions.Array.data[2].conditionType + value: 3 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5e02787002b78154db83a830e460a4a9, type: 3} --- !u!4 &4325447981286933009 stripped diff --git a/Assets/Resources/Enemies/BasicEnemyPrefab_SkellyMage_Variant.prefab b/Assets/Resources/Enemies/BasicEnemyPrefab_SkellyMage_Variant.prefab index 06552702..3d6ccbae 100644 --- a/Assets/Resources/Enemies/BasicEnemyPrefab_SkellyMage_Variant.prefab +++ b/Assets/Resources/Enemies/BasicEnemyPrefab_SkellyMage_Variant.prefab @@ -86,7 +86,7 @@ PrefabInstance: - target: {fileID: 8562165150115495942, guid: 5e02787002b78154db83a830e460a4a9, type: 3} propertyPath: abilityPriorityList.Array.data[1].ability value: - objectReference: {fileID: 11400000, guid: 44d3aad893d771343950a3b3cfde096b, type: 2} + objectReference: {fileID: 11400000, guid: f7d0c807ee02b6947b7c02a69548f09d, type: 2} - target: {fileID: 8562165150115495942, guid: 5e02787002b78154db83a830e460a4a9, type: 3} propertyPath: abilityPriorityList.Array.data[0].castConditions.Array.size value: 2 diff --git a/Assets/Scriptables/Data/Abilities/Debug/NPC/Boss.meta b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss.meta similarity index 100% rename from Assets/Scriptables/Data/Abilities/Debug/NPC/Boss.meta rename to Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss.meta diff --git a/Assets/Scriptables/Data/Abilities/Debug/NPC/Boss/Angry.meta b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/AngrySkelly.meta similarity index 100% rename from Assets/Scriptables/Data/Abilities/Debug/NPC/Boss/Angry.meta rename to Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/AngrySkelly.meta diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/StatusEffects.meta b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/AngrySkelly/Slash.meta similarity index 77% rename from Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/StatusEffects.meta rename to Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/AngrySkelly/Slash.meta index 6a1c51c4..51651503 100644 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/StatusEffects.meta +++ b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/AngrySkelly/Slash.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 08b2a229ca6b3c94e9eacb53752445e0 +guid: 27c91c8162fde7343ada7b3ee7faab78 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scriptables/Data/Abilities/Debug/NPC/Boss_AngrySkelly_MeleeSlash.asset b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/AngrySkelly/Slash/Boss_AngrySkelly_MeleeSlash.asset similarity index 90% rename from Assets/Scriptables/Data/Abilities/Debug/NPC/Boss_AngrySkelly_MeleeSlash.asset rename to Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/AngrySkelly/Slash/Boss_AngrySkelly_MeleeSlash.asset index 3d553333..f9894506 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/NPC/Boss_AngrySkelly_MeleeSlash.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/AngrySkelly/Slash/Boss_AngrySkelly_MeleeSlash.asset @@ -16,14 +16,13 @@ MonoBehaviour: targettingTags: - {fileID: 11400000, guid: 9e6b298c2ce2856418b205442417a433, type: 2} tags: + - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} + - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} + - {fileID: 11400000, guid: ff27e4f0bff17a145af826f8ade78c8a, type: 2} - {fileID: 11400000, guid: f2044d584b586454f99656097deaa52f, type: 2} - {fileID: 11400000, guid: 0edcb3dc0f6e9a241b3a30502dd59cbd, type: 2} - - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} - - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - - {fileID: 11400000, guid: ff27e4f0bff17a145af826f8ade78c8a, type: 2} abilityEffects: - - {fileID: 11400000, guid: a5e3819c0b3e13840a7d8df0a40b9d37, type: 2} - - {fileID: 11400000, guid: ada36b7b82feb814b83edbd09c6110ed, type: 2} + - {fileID: 11400000, guid: 43e21b84680041746ab5c99c88ebc90a, type: 2} - {fileID: 11400000, guid: a5e3819c0b3e13840a7d8df0a40b9d37, type: 2} castTime: 0.5 manaCost: 0 diff --git a/Assets/Scriptables/Data/Abilities/Debug/NPC/Boss_AngrySkelly_MeleeSlash.asset.meta b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/AngrySkelly/Slash/Boss_AngrySkelly_MeleeSlash.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Abilities/Debug/NPC/Boss_AngrySkelly_MeleeSlash.asset.meta rename to Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/AngrySkelly/Slash/Boss_AngrySkelly_MeleeSlash.asset.meta diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/StatusEffects.meta b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/AngrySkelly/Throw.meta similarity index 77% rename from Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/StatusEffects.meta rename to Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/AngrySkelly/Throw.meta index 6d88c7e1..924bdbd5 100644 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/StatusEffects.meta +++ b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/AngrySkelly/Throw.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c3aa78b7bba9868429177debe21aad59 +guid: f8e499d5431853b488f7659d619c43b6 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/AngrySkelly/Throw/Boss_BoneThrow.asset b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/AngrySkelly/Throw/Boss_BoneThrow.asset new file mode 100644 index 00000000..fea31337 --- /dev/null +++ b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/AngrySkelly/Throw/Boss_BoneThrow.asset @@ -0,0 +1,38 @@ +%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: f4ddf33e31e7c3d4e9f2078940308dfb, type: 3} + m_Name: Boss_BoneThrow + m_EditorClassIdentifier: + Icon: {fileID: 0} + targettingTags: + - {fileID: 11400000, guid: 9e6b298c2ce2856418b205442417a433, type: 2} + - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} + - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} + - {fileID: 11400000, guid: bbc3165000346194985eebb628129001, type: 2} + tags: + - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} + - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} + - {fileID: 11400000, guid: ff27e4f0bff17a145af826f8ade78c8a, type: 2} + - {fileID: 11400000, guid: 9bbf01c0977dc98408db3efec6685c56, type: 2} + abilityEffects: + - {fileID: 11400000, guid: 16c52a89828693b47b7343cc63ea66c1, type: 2} + castTime: 0 + manaCost: 2 + healthCost: 5 + cooldown: 0 + castableWhileMoving: 0 + animationType: 0 + projectilePrefab: {fileID: 6063651656755616566, guid: a89ee7eec16b2bc44aa4d4e85f9e9e47, type: 3} + projectileSpeed: 5 + lifeSpan: 3 + canPierce: 0 + canHitSelf: 0 diff --git a/Assets/Scriptables/Data/Abilities/Debug/NPC/SkellyMage/NPC_Mage_AoEAbility.asset.meta b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/AngrySkelly/Throw/Boss_BoneThrow.asset.meta similarity index 79% rename from Assets/Scriptables/Data/Abilities/Debug/NPC/SkellyMage/NPC_Mage_AoEAbility.asset.meta rename to Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/AngrySkelly/Throw/Boss_BoneThrow.asset.meta index 01d36a69..bff986bc 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/NPC/SkellyMage/NPC_Mage_AoEAbility.asset.meta +++ b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/AngrySkelly/Throw/Boss_BoneThrow.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4370ff9bb60c37343b99f24942443388 +guid: 731bf850d0d00c249a66adceab3f7a76 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/StatusEffects.meta b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/AngrySkelly/Ultimate.meta similarity index 77% rename from Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/StatusEffects.meta rename to Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/AngrySkelly/Ultimate.meta index 560fb9ef..d119934a 100644 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/StatusEffects.meta +++ b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/AngrySkelly/Ultimate.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ddc0db7a105fe8f40be32ea66537fd74 +guid: 434eac12374411b4782c1b5b1460e581 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scriptables/Data/Abilities/Debug/NPC/Boss/Angry/NPC_BoneStorm_UltimateAreaOfEffectOverTime.asset b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/AngrySkelly/Ultimate/Boss_Skelly_BoneStorm_UltimateAreaOfEffectOverTime.asset similarity index 92% rename from Assets/Scriptables/Data/Abilities/Debug/NPC/Boss/Angry/NPC_BoneStorm_UltimateAreaOfEffectOverTime.asset rename to Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/AngrySkelly/Ultimate/Boss_Skelly_BoneStorm_UltimateAreaOfEffectOverTime.asset index 56ef16b9..593ed09a 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/NPC/Boss/Angry/NPC_BoneStorm_UltimateAreaOfEffectOverTime.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/AngrySkelly/Ultimate/Boss_Skelly_BoneStorm_UltimateAreaOfEffectOverTime.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: cb14923287afab34b9aa3a618fdba03c, type: 3} - m_Name: NPC_BoneStorm_UltimateAreaOfEffectOverTime + m_Name: Boss_Skelly_BoneStorm_UltimateAreaOfEffectOverTime m_EditorClassIdentifier: Icon: {fileID: 0} targettingTags: @@ -22,6 +22,8 @@ MonoBehaviour: - {fileID: 11400000, guid: 842821b87edc6e741b87c4c74b52f8ec, type: 2} castTime: 0 manaCost: 10 + healthCost: 0 + cooldown: 5 castableWhileMoving: 0 animationType: 0 aoePrefab: {fileID: 758050341675869817, guid: 5245a1dc9755eec42adf1f51b0c52d08, type: 3} diff --git a/Assets/Scriptables/Data/Abilities/Debug/NPC/Boss/Angry/NPC_BoneStorm_UltimateAreaOfEffectOverTime.asset.meta b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/AngrySkelly/Ultimate/Boss_Skelly_BoneStorm_UltimateAreaOfEffectOverTime.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Abilities/Debug/NPC/Boss/Angry/NPC_BoneStorm_UltimateAreaOfEffectOverTime.asset.meta rename to Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/AngrySkelly/Ultimate/Boss_Skelly_BoneStorm_UltimateAreaOfEffectOverTime.asset.meta diff --git a/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/Mage.meta b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/Mage.meta new file mode 100644 index 00000000..80df9bfd --- /dev/null +++ b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/Mage.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f32d27a51ba497a44a4556cb555341cf +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/Mage/Slash.meta b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/Mage/Slash.meta new file mode 100644 index 00000000..25df4f4a --- /dev/null +++ b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/Mage/Slash.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a14d49d23de9fff4b8f2f30b6400cb27 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/Mage/Slash/Boss_Mage_MeleeSlash.asset b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/Mage/Slash/Boss_Mage_MeleeSlash.asset new file mode 100644 index 00000000..c744a418 --- /dev/null +++ b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/Mage/Slash/Boss_Mage_MeleeSlash.asset @@ -0,0 +1,36 @@ +%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: a5d5cf82dd5c07f438f5809f773372e2, type: 3} + m_Name: Boss_Mage_MeleeSlash + m_EditorClassIdentifier: + Icon: {fileID: 21300000, guid: 28a02df1369b7fd4eab040459b0cc450, type: 3} + targettingTags: + - {fileID: 11400000, guid: 9e6b298c2ce2856418b205442417a433, type: 2} + tags: + - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} + - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} + - {fileID: 11400000, guid: ff27e4f0bff17a145af826f8ade78c8a, type: 2} + abilityEffects: + - {fileID: 11400000, guid: 11db0cd64e7890d4d983ce5117631e92, type: 2} + castTime: 0.5 + manaCost: 0 + healthCost: 0 + cooldown: 0 + castableWhileMoving: 0 + animationType: 2 + slashPrefab: {fileID: 8389547513526139286, guid: b92cdb88e09bf1d47bec31bddd62fe50, type: 3} + regenHealthOnHit: 0 + regenManaOnHit: 0 + healthOnHit: 0 + manaOnHit: 0 + lifeSpan: 0.2 + range: 4 diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/AngrySkellyBoss_AGI_Slash_Instant.asset.meta b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/Mage/Slash/Boss_Mage_MeleeSlash.asset.meta similarity index 79% rename from Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/AngrySkellyBoss_AGI_Slash_Instant.asset.meta rename to Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/Mage/Slash/Boss_Mage_MeleeSlash.asset.meta index c46a60d5..8580e28b 100644 --- a/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/AngrySkellyBoss_AGI_Slash_Instant.asset.meta +++ b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/Mage/Slash/Boss_Mage_MeleeSlash.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ada36b7b82feb814b83edbd09c6110ed +guid: e367535dfccec2240b234f5263cf2735 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/Mage/Throw.meta b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/Mage/Throw.meta new file mode 100644 index 00000000..1e0527d6 --- /dev/null +++ b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/Mage/Throw.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0eaebacbf54ff7c43989f0b37aa42d69 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/Mage/Throw/Boss_Mage_PutridOrb.asset b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/Mage/Throw/Boss_Mage_PutridOrb.asset new file mode 100644 index 00000000..62358f94 --- /dev/null +++ b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/Mage/Throw/Boss_Mage_PutridOrb.asset @@ -0,0 +1,37 @@ +%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: f4ddf33e31e7c3d4e9f2078940308dfb, type: 3} + m_Name: Boss_Mage_PutridOrb + m_EditorClassIdentifier: + Icon: {fileID: 0} + targettingTags: + - {fileID: 11400000, guid: 9e6b298c2ce2856418b205442417a433, type: 2} + - {fileID: 11400000, guid: bbc3165000346194985eebb628129001, type: 2} + tags: + - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} + - {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} + - {fileID: 11400000, guid: f2044d584b586454f99656097deaa52f, type: 2} + - {fileID: 11400000, guid: 0edcb3dc0f6e9a241b3a30502dd59cbd, type: 2} + abilityEffects: + - {fileID: 11400000, guid: b8604a7bb5e3cb94c8d66437ab0c5601, type: 2} + - {fileID: 11400000, guid: 9dbaea888b8c168439811320a7cccfb9, type: 2} + castTime: 1 + manaCost: 20 + healthCost: 0 + cooldown: 0 + castableWhileMoving: 0 + animationType: 1 + projectilePrefab: {fileID: 482914955127851241, guid: d16d48fd289401c44980d410c522b025, type: 3} + projectileSpeed: 2 + lifeSpan: 5 + canPierce: 1 + canHitSelf: 0 diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/NPC_MeleeSlashEffects/NPC_AGI_SlashInstantEffect.asset.meta b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/Mage/Throw/Boss_Mage_PutridOrb.asset.meta similarity index 79% rename from Assets/Scriptables/Data/Effects/Debug/NPC/NPC_MeleeSlashEffects/NPC_AGI_SlashInstantEffect.asset.meta rename to Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/Mage/Throw/Boss_Mage_PutridOrb.asset.meta index 54443e75..fb9dddbe 100644 --- a/Assets/Scriptables/Data/Effects/Debug/NPC/NPC_MeleeSlashEffects/NPC_AGI_SlashInstantEffect.asset.meta +++ b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/Mage/Throw/Boss_Mage_PutridOrb.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dd7ab8c569a6f914eb4e6674d5ce01dd +guid: 24ef10843ab5be442a4febabbbd95bbd NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/Mage/Ultimate.meta b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/Mage/Ultimate.meta new file mode 100644 index 00000000..cdbbd951 --- /dev/null +++ b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/Mage/Ultimate.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 21a0bd00d32884d46af311d91fc048e1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Abilities/Debug/NPC/Boss/Angry/NPC_PoisonousPool_UltimateAreaOfEffectOverTime.asset b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/Mage/Ultimate/Boss_Mage_PoisonousPool_UltimateAreaOfEffectOverTime.asset similarity index 80% rename from Assets/Scriptables/Data/Abilities/Debug/NPC/Boss/Angry/NPC_PoisonousPool_UltimateAreaOfEffectOverTime.asset rename to Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/Mage/Ultimate/Boss_Mage_PoisonousPool_UltimateAreaOfEffectOverTime.asset index 475f1f8b..e2bd758d 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/NPC/Boss/Angry/NPC_PoisonousPool_UltimateAreaOfEffectOverTime.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/Mage/Ultimate/Boss_Mage_PoisonousPool_UltimateAreaOfEffectOverTime.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: cb14923287afab34b9aa3a618fdba03c, type: 3} - m_Name: NPC_PoisonousPool_UltimateAreaOfEffectOverTime + m_Name: Boss_Mage_PoisonousPool_UltimateAreaOfEffectOverTime m_EditorClassIdentifier: Icon: {fileID: 0} targettingTags: @@ -18,8 +18,11 @@ MonoBehaviour: tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} + - {fileID: 11400000, guid: f2044d584b586454f99656097deaa52f, type: 2} + - {fileID: 11400000, guid: 0edcb3dc0f6e9a241b3a30502dd59cbd, type: 2} abilityEffects: - {fileID: 11400000, guid: 2193103ba9df3c445a983c74b2d100df, type: 2} + - {fileID: 11400000, guid: 3abae6d7d3645c04899811b2b1fd30a2, type: 2} castTime: 0 manaCost: 40 healthCost: 0 diff --git a/Assets/Scriptables/Data/Abilities/Debug/NPC/Boss/Angry/NPC_PoisonousPool_UltimateAreaOfEffectOverTime.asset.meta b/Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/Mage/Ultimate/Boss_Mage_PoisonousPool_UltimateAreaOfEffectOverTime.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Abilities/Debug/NPC/Boss/Angry/NPC_PoisonousPool_UltimateAreaOfEffectOverTime.asset.meta rename to Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/Mage/Ultimate/Boss_Mage_PoisonousPool_UltimateAreaOfEffectOverTime.asset.meta diff --git a/Assets/Scriptables/Data/Abilities/Debug/NPC/AngrySkelly/NPC_AoEAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/NPC/AngrySkelly/NPC_AoEAbility.asset deleted file mode 100644 index eab0a968..00000000 --- a/Assets/Scriptables/Data/Abilities/Debug/NPC/AngrySkelly/NPC_AoEAbility.asset +++ /dev/null @@ -1,35 +0,0 @@ -%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: NPC_AoEAbility - m_EditorClassIdentifier: - targettingTags: - - {fileID: 11400000, guid: 9e6b298c2ce2856418b205442417a433, type: 2} - tags: - - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} - abilityEffects: - - {fileID: 11400000, guid: 5408af8da17c7a2428b70cf3b646eb05, type: 2} - castTime: 0 - manaCost: 5 - castableWhileMoving: 0 - animationType: 0 - aoePrefab: {fileID: 4737951027918891026, guid: b64ecf6f8c859304f963282fc7771d80, type: 3} - movementMask: - serializedVersion: 2 - m_Bits: 8 - lifeSpan: 0.25 - radius: 1 - shouldResizeVisuals: 1 - telegraphDelay: 1 - canHitSelf: 0 - spawnUnderUser: 0 diff --git a/Assets/Scriptables/Data/Abilities/Debug/NPC/SkellyMage/NPC_Mage_AoEAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/NPC/Basic_AoEAbility.asset similarity index 91% rename from Assets/Scriptables/Data/Abilities/Debug/NPC/SkellyMage/NPC_Mage_AoEAbility.asset rename to Assets/Scriptables/Data/Abilities/Debug/NPC/Basic_AoEAbility.asset index f5df043e..ccf93a10 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/NPC/SkellyMage/NPC_Mage_AoEAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/NPC/Basic_AoEAbility.asset @@ -10,8 +10,9 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 0c765e9ddb90681418e5635dc93b7716, type: 3} - m_Name: NPC_Mage_AoEAbility + m_Name: Basic_AoEAbility m_EditorClassIdentifier: + Icon: {fileID: 0} targettingTags: - {fileID: 11400000, guid: 9e6b298c2ce2856418b205442417a433, type: 2} tags: @@ -20,7 +21,9 @@ MonoBehaviour: abilityEffects: - {fileID: 11400000, guid: beefcddbc18793c4593dca4d983be49e, type: 2} castTime: 0 - manaCost: 5 + manaCost: 0 + healthCost: 0 + cooldown: 6 castableWhileMoving: 0 animationType: 0 aoePrefab: {fileID: 4737951027918891026, guid: b64ecf6f8c859304f963282fc7771d80, type: 3} diff --git a/Assets/Scriptables/Data/Abilities/Debug/NPC/AngrySkelly/NPC_AoEAbility.asset.meta b/Assets/Scriptables/Data/Abilities/Debug/NPC/Basic_AoEAbility.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Abilities/Debug/NPC/AngrySkelly/NPC_AoEAbility.asset.meta rename to Assets/Scriptables/Data/Abilities/Debug/NPC/Basic_AoEAbility.asset.meta diff --git a/Assets/Scriptables/Data/Abilities/Debug/NPC/SkellyMage.meta b/Assets/Scriptables/Data/Abilities/Debug/NPC/Mage.meta similarity index 100% rename from Assets/Scriptables/Data/Abilities/Debug/NPC/SkellyMage.meta rename to Assets/Scriptables/Data/Abilities/Debug/NPC/Mage.meta diff --git a/Assets/Scriptables/Data/Abilities/Debug/NPC/Mage/Slash.meta b/Assets/Scriptables/Data/Abilities/Debug/NPC/Mage/Slash.meta new file mode 100644 index 00000000..40eae3f3 --- /dev/null +++ b/Assets/Scriptables/Data/Abilities/Debug/NPC/Mage/Slash.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6c05e5063d3643a4db3f3650766fcb8d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Abilities/Debug/NPC/NPC_MeleeSlashAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/NPC/Mage/Slash/Basic_MeleeSlashAbility.asset similarity index 86% rename from Assets/Scriptables/Data/Abilities/Debug/NPC/NPC_MeleeSlashAbility.asset rename to Assets/Scriptables/Data/Abilities/Debug/NPC/Mage/Slash/Basic_MeleeSlashAbility.asset index 245d075c..ada14366 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/NPC/NPC_MeleeSlashAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/NPC/Mage/Slash/Basic_MeleeSlashAbility.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a5d5cf82dd5c07f438f5809f773372e2, type: 3} - m_Name: NPC_MeleeSlashAbility + m_Name: Basic_MeleeSlashAbility m_EditorClassIdentifier: Icon: {fileID: 21300000, guid: 28a02df1369b7fd4eab040459b0cc450, type: 3} targettingTags: @@ -20,10 +20,11 @@ MonoBehaviour: - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} - {fileID: 11400000, guid: ff27e4f0bff17a145af826f8ade78c8a, type: 2} abilityEffects: - - {fileID: 11400000, guid: cd35550f6da48d54092d49fd4a9d0a9b, type: 2} - - {fileID: 11400000, guid: dd7ab8c569a6f914eb4e6674d5ce01dd, type: 2} + - {fileID: 11400000, guid: a5608ff9c23567a4aac85c878817efb5, type: 2} castTime: 0.5 manaCost: 0 + healthCost: 0 + cooldown: 0 castableWhileMoving: 0 animationType: 2 slashPrefab: {fileID: 8389547513526139286, guid: b92cdb88e09bf1d47bec31bddd62fe50, type: 3} diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/NPC_STR_AoeInstantEffect.asset.meta b/Assets/Scriptables/Data/Abilities/Debug/NPC/Mage/Slash/Basic_MeleeSlashAbility.asset.meta similarity index 79% rename from Assets/Scriptables/Data/Effects/Debug/NPC/NPC_STR_AoeInstantEffect.asset.meta rename to Assets/Scriptables/Data/Abilities/Debug/NPC/Mage/Slash/Basic_MeleeSlashAbility.asset.meta index a2c6fe72..72bdbbc6 100644 --- a/Assets/Scriptables/Data/Effects/Debug/NPC/NPC_STR_AoeInstantEffect.asset.meta +++ b/Assets/Scriptables/Data/Abilities/Debug/NPC/Mage/Slash/Basic_MeleeSlashAbility.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5408af8da17c7a2428b70cf3b646eb05 +guid: f7d0c807ee02b6947b7c02a69548f09d NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Scriptables/Data/Abilities/Debug/NPC/Mage/Throw.meta b/Assets/Scriptables/Data/Abilities/Debug/NPC/Mage/Throw.meta new file mode 100644 index 00000000..42ae9a06 --- /dev/null +++ b/Assets/Scriptables/Data/Abilities/Debug/NPC/Mage/Throw.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2f35ec990cacb0b4188af0cdfe7130f4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Abilities/Debug/NPC/SkellyMage/NPC_Mage_ProjectileAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/NPC/Mage/Throw/Basic_Mage_PutridOrb.asset similarity index 81% rename from Assets/Scriptables/Data/Abilities/Debug/NPC/SkellyMage/NPC_Mage_ProjectileAbility.asset rename to Assets/Scriptables/Data/Abilities/Debug/NPC/Mage/Throw/Basic_Mage_PutridOrb.asset index 05bf64bc..969f423a 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/NPC/SkellyMage/NPC_Mage_ProjectileAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/NPC/Mage/Throw/Basic_Mage_PutridOrb.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4ddf33e31e7c3d4e9f2078940308dfb, type: 3} - m_Name: NPC_Mage_ProjectileAbility + m_Name: Basic_Mage_PutridOrb m_EditorClassIdentifier: Icon: {fileID: 0} targettingTags: @@ -19,8 +19,11 @@ MonoBehaviour: tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} + - {fileID: 11400000, guid: f2044d584b586454f99656097deaa52f, type: 2} + - {fileID: 11400000, guid: 0edcb3dc0f6e9a241b3a30502dd59cbd, type: 2} abilityEffects: - {fileID: 11400000, guid: d5d94abf5b6bb7f42888d6d242067a71, type: 2} + - {fileID: 11400000, guid: f8ccb993ef7a8114aa9f678e3cdee866, type: 2} castTime: 1 manaCost: 20 healthCost: 0 diff --git a/Assets/Scriptables/Data/Abilities/Debug/NPC/SkellyMage/NPC_Mage_ProjectileAbility.asset.meta b/Assets/Scriptables/Data/Abilities/Debug/NPC/Mage/Throw/Basic_Mage_PutridOrb.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Abilities/Debug/NPC/SkellyMage/NPC_Mage_ProjectileAbility.asset.meta rename to Assets/Scriptables/Data/Abilities/Debug/NPC/Mage/Throw/Basic_Mage_PutridOrb.asset.meta diff --git a/Assets/Scriptables/Data/Abilities/Debug/NPC/AngrySkelly.meta b/Assets/Scriptables/Data/Abilities/Debug/NPC/Skelly.meta similarity index 100% rename from Assets/Scriptables/Data/Abilities/Debug/NPC/AngrySkelly.meta rename to Assets/Scriptables/Data/Abilities/Debug/NPC/Skelly.meta diff --git a/Assets/Scriptables/Data/Abilities/Debug/NPC/Skelly/Slash.meta b/Assets/Scriptables/Data/Abilities/Debug/NPC/Skelly/Slash.meta new file mode 100644 index 00000000..8053c873 --- /dev/null +++ b/Assets/Scriptables/Data/Abilities/Debug/NPC/Skelly/Slash.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e740a88754c3ee944ac91924e079a3cb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Abilities/Debug/NPC/Skelly/Slash/Basic_MeleeSlashAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/NPC/Skelly/Slash/Basic_MeleeSlashAbility.asset new file mode 100644 index 00000000..cfa3a141 --- /dev/null +++ b/Assets/Scriptables/Data/Abilities/Debug/NPC/Skelly/Slash/Basic_MeleeSlashAbility.asset @@ -0,0 +1,39 @@ +%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: a5d5cf82dd5c07f438f5809f773372e2, type: 3} + m_Name: Basic_MeleeSlashAbility + m_EditorClassIdentifier: + Icon: {fileID: 21300000, guid: 28a02df1369b7fd4eab040459b0cc450, type: 3} + targettingTags: + - {fileID: 11400000, guid: 9e6b298c2ce2856418b205442417a433, type: 2} + tags: + - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} + - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} + - {fileID: 11400000, guid: ff27e4f0bff17a145af826f8ade78c8a, type: 2} + - {fileID: 11400000, guid: f2044d584b586454f99656097deaa52f, type: 2} + - {fileID: 11400000, guid: 0edcb3dc0f6e9a241b3a30502dd59cbd, type: 2} + abilityEffects: + - {fileID: 11400000, guid: cd35550f6da48d54092d49fd4a9d0a9b, type: 2} + - {fileID: 11400000, guid: 0b7040401c71ccd44bd23de8469d25d7, type: 2} + castTime: 0.5 + manaCost: 0 + healthCost: 0 + cooldown: 0 + castableWhileMoving: 0 + animationType: 2 + slashPrefab: {fileID: 8389547513526139286, guid: b92cdb88e09bf1d47bec31bddd62fe50, type: 3} + regenHealthOnHit: 0 + regenManaOnHit: 0 + healthOnHit: 2 + manaOnHit: 4 + lifeSpan: 0.2 + range: 3 diff --git a/Assets/Scriptables/Data/Abilities/Debug/NPC/NPC_MeleeSlashAbility.asset.meta b/Assets/Scriptables/Data/Abilities/Debug/NPC/Skelly/Slash/Basic_MeleeSlashAbility.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Abilities/Debug/NPC/NPC_MeleeSlashAbility.asset.meta rename to Assets/Scriptables/Data/Abilities/Debug/NPC/Skelly/Slash/Basic_MeleeSlashAbility.asset.meta diff --git a/Assets/Scriptables/Data/Abilities/Debug/NPC/Skelly/Throw.meta b/Assets/Scriptables/Data/Abilities/Debug/NPC/Skelly/Throw.meta new file mode 100644 index 00000000..9b4fc6b0 --- /dev/null +++ b/Assets/Scriptables/Data/Abilities/Debug/NPC/Skelly/Throw.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e96293d54bc702a439e422e8817c08c8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Abilities/Debug/NPC/AngrySkelly/NPC_ProjectileAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/NPC/Skelly/Throw/Basic_BoneThrow.asset similarity index 83% rename from Assets/Scriptables/Data/Abilities/Debug/NPC/AngrySkelly/NPC_ProjectileAbility.asset rename to Assets/Scriptables/Data/Abilities/Debug/NPC/Skelly/Throw/Basic_BoneThrow.asset index 7fc777a6..536fd6d0 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/NPC/AngrySkelly/NPC_ProjectileAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/NPC/Skelly/Throw/Basic_BoneThrow.asset @@ -10,8 +10,9 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4ddf33e31e7c3d4e9f2078940308dfb, type: 3} - m_Name: NPC_ProjectileAbility + m_Name: Basic_BoneThrow m_EditorClassIdentifier: + Icon: {fileID: 0} targettingTags: - {fileID: 11400000, guid: 9e6b298c2ce2856418b205442417a433, type: 2} - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} @@ -20,10 +21,14 @@ MonoBehaviour: tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} + - {fileID: 11400000, guid: ff27e4f0bff17a145af826f8ade78c8a, type: 2} + - {fileID: 11400000, guid: 9bbf01c0977dc98408db3efec6685c56, type: 2} abilityEffects: - {fileID: 11400000, guid: cd8d39445cd6b124cbf6817280bde90e, type: 2} castTime: 0 - manaCost: 5 + manaCost: 2 + healthCost: 5 + cooldown: 0 castableWhileMoving: 0 animationType: 0 projectilePrefab: {fileID: 6063651656755616566, guid: a89ee7eec16b2bc44aa4d4e85f9e9e47, type: 3} diff --git a/Assets/Scriptables/Data/Abilities/Debug/NPC/AngrySkelly/NPC_ProjectileAbility.asset.meta b/Assets/Scriptables/Data/Abilities/Debug/NPC/Skelly/Throw/Basic_BoneThrow.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Abilities/Debug/NPC/AngrySkelly/NPC_ProjectileAbility.asset.meta rename to Assets/Scriptables/Data/Abilities/Debug/NPC/Skelly/Throw/Basic_BoneThrow.asset.meta diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/1-AxeThrow_ProjectileAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/1-AxeThrow_ProjectileAbility.asset index c11b3d16..2b1d7316 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/1-AxeThrow_ProjectileAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/1-AxeThrow_ProjectileAbility.asset @@ -23,11 +23,10 @@ MonoBehaviour: - {fileID: 11400000, guid: f2044d584b586454f99656097deaa52f, type: 2} - {fileID: 11400000, guid: 0edcb3dc0f6e9a241b3a30502dd59cbd, type: 2} abilityEffects: - - {fileID: 11400000, guid: c9bd1824d7872e540a5b1d174b78d4b0, type: 2} - {fileID: 11400000, guid: 0031be0801f10414483e837e3f8b69b6, type: 2} - {fileID: 11400000, guid: f6215263ccc38504983f5bbfb24c5484, type: 2} castTime: 0.5 - manaCost: 10 + manaCost: 6 healthCost: 0 cooldown: 0 castableWhileMoving: 0 diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/2-WhirlingAxes_AoEOverTimeAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/2-WhirlingAxes_AoEOverTimeAbility.asset index e575f682..5216d735 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/2-WhirlingAxes_AoEOverTimeAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/2-WhirlingAxes_AoEOverTimeAbility.asset @@ -22,9 +22,10 @@ MonoBehaviour: - {fileID: 11400000, guid: ff27e4f0bff17a145af826f8ade78c8a, type: 2} abilityEffects: - {fileID: 11400000, guid: b0077ac50ef97114bb78ef5b8a879110, type: 2} - - {fileID: 11400000, guid: 0ad4a5d2abc8e644fa6c011ff9598e11, type: 2} castTime: 0.25 - manaCost: 25 + manaCost: 20 + healthCost: 0 + cooldown: 0 castableWhileMoving: 0 animationType: 0 aoePrefab: {fileID: 5286231604687820132, guid: e6bc5808d58f0ba4fbe3d5674f60b526, type: 3} @@ -39,3 +40,5 @@ MonoBehaviour: spawnUnderUser: 1 duration: 4 followUser: 1 + followTarget: 0 + damageFollowingTarget: 0 diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/3-RageStorm_ChanneledAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/3-RageStorm_ChanneledAbility.asset index 12be88a1..3c75f967 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/3-RageStorm_ChanneledAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/3-RageStorm_ChanneledAbility.asset @@ -19,19 +19,20 @@ MonoBehaviour: tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} - - {fileID: 11400000, guid: ff27e4f0bff17a145af826f8ade78c8a, type: 2} - {fileID: 11400000, guid: f2044d584b586454f99656097deaa52f, type: 2} - {fileID: 11400000, guid: 56d85d7ff5b22aa4bb8b40e97b2e850f, type: 2} + - {fileID: 11400000, guid: 9bbf01c0977dc98408db3efec6685c56, type: 2} abilityEffects: - - {fileID: 11400000, guid: 233a7270b002b90449bae5ed2adc8a9b, type: 2} - {fileID: 11400000, guid: aaaf405927fd4c045916d9483189c3f2, type: 2} - {fileID: 11400000, guid: a1bafe62c9b7a5b428996e45d7bd3f33, type: 2} castTime: 0 manaCost: 50 + healthCost: 0 + cooldown: 0 castableWhileMoving: 1 animationType: 3 prefab: {fileID: 1004020196762887022, guid: f9e892cd18bc2de4cb277f7d3459b200, type: 3} - duration: 8 + duration: 5 radius: 2.25 canHitSelf: 0 followUser: 1 diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Knight/1-ShieldThrow_ProjectileAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Knight/1-ShieldThrow_ProjectileAbility.asset index 5ab225c8..5b46d15e 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Knight/1-ShieldThrow_ProjectileAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Knight/1-ShieldThrow_ProjectileAbility.asset @@ -21,10 +21,11 @@ MonoBehaviour: - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} - {fileID: 11400000, guid: ff27e4f0bff17a145af826f8ade78c8a, type: 2} abilityEffects: - - {fileID: 11400000, guid: c06779deb6806db438e0fbeec44aad61, type: 2} - {fileID: 11400000, guid: a5cd57412dd7731448bbeab1c2485ecd, type: 2} castTime: 0.5 - manaCost: 10 + manaCost: 6 + healthCost: 0 + cooldown: 0 castableWhileMoving: 0 animationType: 0 projectilePrefab: {fileID: 7611295262132244940, guid: 85a2162510ed2a74cb6cd8c05187d28b, type: 3} diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Knight/2-ShieldWall_AntiProjectileAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Knight/2-ShieldWall_AntiProjectileAbility.asset index 8c455e5c..17e40400 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Knight/2-ShieldWall_AntiProjectileAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Knight/2-ShieldWall_AntiProjectileAbility.asset @@ -19,7 +19,9 @@ MonoBehaviour: tags: [] abilityEffects: [] castTime: 0.25 - manaCost: 35 + manaCost: 20 + healthCost: 0 + cooldown: 0 castableWhileMoving: 0 animationType: 0 antiProjectilePrefab: {fileID: 9043445715802431074, guid: 222e283b3616ff84f9094c92c14fce24, type: 3} diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Knight/3-ConsecrationAoEOverTimeAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Knight/3-ConsecrationAoEOverTimeAbility.asset index 5829014c..a319ed8a 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Knight/3-ConsecrationAoEOverTimeAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Knight/3-ConsecrationAoEOverTimeAbility.asset @@ -19,12 +19,16 @@ MonoBehaviour: tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} - - {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} + - {fileID: 11400000, guid: 9bbf01c0977dc98408db3efec6685c56, type: 2} + - {fileID: 11400000, guid: f2044d584b586454f99656097deaa52f, type: 2} + - {fileID: 11400000, guid: 0edcb3dc0f6e9a241b3a30502dd59cbd, type: 2} abilityEffects: - - {fileID: 11400000, guid: 6326f864bca14c74896ec05cd7a1bba0, type: 2} - {fileID: 11400000, guid: e5a380123e1ebbb448a0a58bdd8c3aae, type: 2} + - {fileID: 11400000, guid: d9d785193cdc1074f93a4100438442dc, type: 2} castTime: 0.5 manaCost: 50 + healthCost: 0 + cooldown: 0 castableWhileMoving: 0 animationType: 1 aoePrefab: {fileID: 242799163458536464, guid: 1f4bc3f1d82c9554486c4e7e3bde86fc, type: 3} @@ -39,3 +43,5 @@ MonoBehaviour: spawnUnderUser: 1 duration: 3 followUser: 0 + followTarget: 0 + damageFollowingTarget: 0 diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/1-IceShard_ProjectileAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/1-IceShard_ProjectileAbility.asset index 67054c48..a3026427 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/1-IceShard_ProjectileAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/1-IceShard_ProjectileAbility.asset @@ -22,7 +22,9 @@ MonoBehaviour: abilityEffects: - {fileID: 11400000, guid: d441f01dcc2dc5943a605b0bbffa1a03, type: 2} castTime: 0.75 - manaCost: 10 + manaCost: 6 + healthCost: 0 + cooldown: 0 castableWhileMoving: 0 animationType: 1 projectilePrefab: {fileID: 4298339421658607672, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/2-Blizzard_AoEOverTimeAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/2-Blizzard_AoEOverTimeAbility.asset index bdd8505f..f13329ea 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/2-Blizzard_AoEOverTimeAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/2-Blizzard_AoEOverTimeAbility.asset @@ -22,7 +22,9 @@ MonoBehaviour: abilityEffects: - {fileID: 11400000, guid: 429f24e760441e14abffd25879097b21, type: 2} castTime: 0.5 - manaCost: 25 + manaCost: 20 + healthCost: 0 + cooldown: 0 castableWhileMoving: 0 animationType: 1 aoePrefab: {fileID: 7332445597516000773, guid: 49d4c037b88cfc54a9fe2d4a84012145, type: 3} @@ -37,3 +39,5 @@ MonoBehaviour: spawnUnderUser: 0 duration: 4 followUser: 0 + followTarget: 0 + damageFollowingTarget: 0 diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/3-GlacialBomb_AoEWithImpactEventAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/3-GlacialBomb_AoEWithImpactEventAbility.asset index 9fd57ec0..413c1c29 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/3-GlacialBomb_AoEWithImpactEventAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Mage/3-GlacialBomb_AoEWithImpactEventAbility.asset @@ -22,9 +22,10 @@ MonoBehaviour: - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} abilityEffects: - {fileID: 11400000, guid: db121d164df0dac4980d3d5e61327b40, type: 2} - - {fileID: 11400000, guid: 670c1dd9c913edd4c91c9cff88350f10, type: 2} castTime: 1 - manaCost: 70 + manaCost: 60 + healthCost: 0 + cooldown: 0 castableWhileMoving: 0 animationType: 1 aoePrefab: {fileID: 7535207197812752309, guid: 263ed363454525d46aefa46b653b419d, type: 3} diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/MeleeSlashAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/MeleeSlashAbility.asset index 915e01cc..d9dd4f51 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/MeleeSlashAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/MeleeSlashAbility.asset @@ -21,16 +21,17 @@ MonoBehaviour: - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} - {fileID: 11400000, guid: ff27e4f0bff17a145af826f8ade78c8a, type: 2} abilityEffects: - - {fileID: 11400000, guid: e047c0f2639d4b840bf40c1ec243afc7, type: 2} - {fileID: 11400000, guid: 10ada31c8e07fc549ba69f40205ee996, type: 2} castTime: 0.5 manaCost: 0 + healthCost: 0 + cooldown: 0 castableWhileMoving: 0 animationType: 2 slashPrefab: {fileID: 8389547513526139286, guid: b92cdb88e09bf1d47bec31bddd62fe50, type: 3} regenHealthOnHit: 1 regenManaOnHit: 1 - healthOnHit: 2 - manaOnHit: 4 + healthOnHit: 3 + manaOnHit: 2 lifeSpan: 0.2 range: 2 diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/1-HolyBall_ProjectileAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/1-HolyBall_ProjectileAbility.asset index ee06c7d9..15d1f9f2 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/1-HolyBall_ProjectileAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/1-HolyBall_ProjectileAbility.asset @@ -19,13 +19,14 @@ MonoBehaviour: - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - - {fileID: 11400000, guid: d7a9b755d873bad4f9bbd0393bc36a42, type: 2} - {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} + - {fileID: 11400000, guid: d7a9b755d873bad4f9bbd0393bc36a42, type: 2} abilityEffects: - {fileID: 11400000, guid: c11e4e7ebf6d1844ba5825e9014ffbc9, type: 2} - - {fileID: 11400000, guid: a29bc493146d99d489cd682fe8cc7b6d, type: 2} castTime: 0.5 manaCost: 10 + healthCost: 0 + cooldown: 0 castableWhileMoving: 0 animationType: 1 projectilePrefab: {fileID: 6744685881493449327, guid: e8d140a8b81d1a54babce1a327614447, type: 3} diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/2-BurstOfHope_AoEAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/2-BurstOfHope_AoEAbility.asset index 77f36f18..7edd9a09 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/2-BurstOfHope_AoEAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/2-BurstOfHope_AoEAbility.asset @@ -18,17 +18,18 @@ MonoBehaviour: - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} tags: - - {fileID: 11400000, guid: f2044d584b586454f99656097deaa52f, type: 2} - - {fileID: 11400000, guid: b48912f0531050749aaa214045f32b1d, type: 2} - - {fileID: 11400000, guid: d7a9b755d873bad4f9bbd0393bc36a42, type: 2} - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} + - {fileID: 11400000, guid: d7a9b755d873bad4f9bbd0393bc36a42, type: 2} + - {fileID: 11400000, guid: f2044d584b586454f99656097deaa52f, type: 2} + - {fileID: 11400000, guid: b48912f0531050749aaa214045f32b1d, type: 2} abilityEffects: - - {fileID: 11400000, guid: ac1c44b70abf5934abbcb97d1fc331cf, type: 2} - - {fileID: 11400000, guid: 72f65c10a6d066541bd1d369c4f271e3, type: 2} - {fileID: 11400000, guid: ca9eaffa6d6eecb48b1e437022dd6f35, type: 2} + - {fileID: 11400000, guid: ac1c44b70abf5934abbcb97d1fc331cf, type: 2} castTime: 0.5 manaCost: 30 + healthCost: 0 + cooldown: 0 castableWhileMoving: 0 animationType: 1 aoePrefab: {fileID: 8979840876601850889, guid: da5aac032dc71764c851bcd729afd2ff, type: 3} diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/3-HolyCircleAoEOverTimeAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/3-HolyCircleAoEOverTimeAbility.asset index deff252e..c54a9c4c 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/3-HolyCircleAoEOverTimeAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/3-HolyCircleAoEOverTimeAbility.asset @@ -19,13 +19,14 @@ MonoBehaviour: - {fileID: 11400000, guid: 9e6b298c2ce2856418b205442417a433, type: 2} tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - - {fileID: 11400000, guid: d7a9b755d873bad4f9bbd0393bc36a42, type: 2} - {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} + - {fileID: 11400000, guid: d7a9b755d873bad4f9bbd0393bc36a42, type: 2} abilityEffects: - {fileID: 11400000, guid: 7c93de4abc24c6a42964968d8ed80f69, type: 2} - - {fileID: 11400000, guid: f5e6781929af8c24a8719ecf59d5153e, type: 2} castTime: 1 - manaCost: 60 + manaCost: 80 + healthCost: 0 + cooldown: 0 castableWhileMoving: 0 animationType: 1 aoePrefab: {fileID: 7455199422598815824, guid: b1f35b67c9e638443a850c78c0f87ac5, type: 3} @@ -40,3 +41,5 @@ MonoBehaviour: spawnUnderUser: 1 duration: 3 followUser: 0 + followTarget: 0 + damageFollowingTarget: 0 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Mage/1-IceShardEffects/INT_IceShard_InstantEffect_01.asset b/Assets/Scriptables/Data/Effects/Debug/NPC/Basic_Aoe_InstantEffect.asset similarity index 79% rename from Assets/Scriptables/Data/Effects/Debug/Player/Mage/1-IceShardEffects/INT_IceShard_InstantEffect_01.asset rename to Assets/Scriptables/Data/Effects/Debug/NPC/Basic_Aoe_InstantEffect.asset index 05f75adf..9e3d8c47 100644 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Mage/1-IceShardEffects/INT_IceShard_InstantEffect_01.asset +++ b/Assets/Scriptables/Data/Effects/Debug/NPC/Basic_Aoe_InstantEffect.asset @@ -10,13 +10,13 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 081df6f2fd69b7643a4844062a82871f, type: 3} - m_Name: INT_IceShard_InstantEffect_01 + m_Name: Basic_Aoe_InstantEffect m_EditorClassIdentifier: tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} influencingStats: - - {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} + - statTag: {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} + percentInfluence: 0.2 baseValue: 8 - percentStatInfluence: 0.4 AlliedTargetMultiplier: 1 EnemyTargetMultiplier: 1 diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Mage/NPC_INT_AoeInstantEffect.asset.meta b/Assets/Scriptables/Data/Effects/Debug/NPC/Basic_Aoe_InstantEffect.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Effects/Debug/NPC/Mage/NPC_INT_AoeInstantEffect.asset.meta rename to Assets/Scriptables/Data/Effects/Debug/NPC/Basic_Aoe_InstantEffect.asset.meta diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/Slash.meta b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/Slash.meta new file mode 100644 index 00000000..5b34197e --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/Slash.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a954f61c801274a4b857eb91013d6eeb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Knight/3-ConsecrationEffects/SPI_Consecration_BurnOverTimeEffectStack.asset b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/Slash/AngrySkellyBoss_Slash_BleedEffect.asset similarity index 76% rename from Assets/Scriptables/Data/Effects/Debug/Player/Knight/3-ConsecrationEffects/SPI_Consecration_BurnOverTimeEffectStack.asset rename to Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/Slash/AngrySkellyBoss_Slash_BleedEffect.asset index 41f246d3..15814966 100644 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Knight/3-ConsecrationEffects/SPI_Consecration_BurnOverTimeEffectStack.asset +++ b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/Slash/AngrySkellyBoss_Slash_BleedEffect.asset @@ -10,16 +10,17 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: af01294d38acd8c4ba867154b71b9ec6, type: 3} - m_Name: SPI_Consecration_BurnOverTimeEffectStack + m_Name: AngrySkellyBoss_Slash_BleedEffect m_EditorClassIdentifier: tags: - {fileID: 11400000, guid: f2044d584b586454f99656097deaa52f, type: 2} - {fileID: 11400000, guid: 0edcb3dc0f6e9a241b3a30502dd59cbd, type: 2} influencingStats: - - {fileID: 11400000, guid: d7a9b755d873bad4f9bbd0393bc36a42, type: 2} + - statTag: {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} + percentInfluence: 0.2 duration: 3 applyToTargetsHit: 1 applyToSelf: 0 - damagePerTick: 2 + baseDamagePerTick: 2 tickRate: 1 - damageType: 0 + damageType: 2 diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/AngrySkellyBoss_STR_Slash_BleedEffect.asset.meta b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/Slash/AngrySkellyBoss_Slash_BleedEffect.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/AngrySkellyBoss_STR_Slash_BleedEffect.asset.meta rename to Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/Slash/AngrySkellyBoss_Slash_BleedEffect.asset.meta diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/Slash/AngrySkellyBoss_Slash_InstantEffect.asset b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/Slash/AngrySkellyBoss_Slash_InstantEffect.asset new file mode 100644 index 00000000..eefe7fe5 --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/Slash/AngrySkellyBoss_Slash_InstantEffect.asset @@ -0,0 +1,24 @@ +%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: 081df6f2fd69b7643a4844062a82871f, type: 3} + m_Name: AngrySkellyBoss_Slash_InstantEffect + m_EditorClassIdentifier: + tags: + - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} + influencingStats: + - statTag: {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} + percentInfluence: 0.3 + - statTag: {fileID: 11400000, guid: ff27e4f0bff17a145af826f8ade78c8a, type: 2} + percentInfluence: 0.3 + baseValue: 10 + AlliedTargetMultiplier: 1 + EnemyTargetMultiplier: 1 diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/AngrySkellyBoss_STR_Slash_Instant.asset.meta b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/Slash/AngrySkellyBoss_Slash_InstantEffect.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/AngrySkellyBoss_STR_Slash_Instant.asset.meta rename to Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/Slash/AngrySkellyBoss_Slash_InstantEffect.asset.meta diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/Throw.meta b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/Throw.meta new file mode 100644 index 00000000..cfcef6fd --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/Throw.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5a15c48c3391c40418272ad6a662956c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/Throw/BoneThrow_InstantEffect.asset b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/Throw/BoneThrow_InstantEffect.asset new file mode 100644 index 00000000..f4f4f251 --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/Throw/BoneThrow_InstantEffect.asset @@ -0,0 +1,26 @@ +%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: 081df6f2fd69b7643a4844062a82871f, type: 3} + m_Name: BoneThrow_InstantEffect + m_EditorClassIdentifier: + tags: + - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} + influencingStats: + - statTag: {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} + percentInfluence: 0.05 + - statTag: {fileID: 11400000, guid: ff27e4f0bff17a145af826f8ade78c8a, type: 2} + percentInfluence: 0.05 + - statTag: {fileID: 11400000, guid: 9bbf01c0977dc98408db3efec6685c56, type: 2} + percentInfluence: 0.01 + baseValue: 5 + AlliedTargetMultiplier: 1 + EnemyTargetMultiplier: 1 diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/Throw/BoneThrow_InstantEffect.asset.meta b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/Throw/BoneThrow_InstantEffect.asset.meta new file mode 100644 index 00000000..f4f78d75 --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/Throw/BoneThrow_InstantEffect.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 16c52a89828693b47b7343cc63ea66c1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/Ultimate.meta b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/Ultimate.meta new file mode 100644 index 00000000..a7f792dc --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/Ultimate.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 645492885213c7f4290f80648c7bac5a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/BoneStorm_InstantTickEffect.asset b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/Ultimate/BoneStorm_InstantTickEffect.asset similarity index 84% rename from Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/BoneStorm_InstantTickEffect.asset rename to Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/Ultimate/BoneStorm_InstantTickEffect.asset index 8ec9b085..364249aa 100644 --- a/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/BoneStorm_InstantTickEffect.asset +++ b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/Ultimate/BoneStorm_InstantTickEffect.asset @@ -15,8 +15,8 @@ MonoBehaviour: tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} influencingStats: - - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} + - statTag: {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} + percentInfluence: 0.3 baseValue: 5 - percentStatInfluence: 0.5 AlliedTargetMultiplier: 1 EnemyTargetMultiplier: 1 diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/BoneStorm_InstantTickEffect.asset.meta b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/Ultimate/BoneStorm_InstantTickEffect.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/BoneStorm_InstantTickEffect.asset.meta rename to Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/Ultimate/BoneStorm_InstantTickEffect.asset.meta diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Slash.meta b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Slash.meta new file mode 100644 index 00000000..f69bdbc6 --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Slash.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6d7cc9990fc1dc0439f5455c80126678 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Slash/Boss_Mage_Slash_InstantEffect.asset b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Slash/Boss_Mage_Slash_InstantEffect.asset new file mode 100644 index 00000000..7d35a865 --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Slash/Boss_Mage_Slash_InstantEffect.asset @@ -0,0 +1,24 @@ +%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: 081df6f2fd69b7643a4844062a82871f, type: 3} + m_Name: Boss_Mage_Slash_InstantEffect + m_EditorClassIdentifier: + tags: + - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} + influencingStats: + - statTag: {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} + percentInfluence: 0.3 + - statTag: {fileID: 11400000, guid: ff27e4f0bff17a145af826f8ade78c8a, type: 2} + percentInfluence: 0.3 + baseValue: 10 + AlliedTargetMultiplier: 1 + EnemyTargetMultiplier: 1 diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Slash/Boss_Mage_Slash_InstantEffect.asset.meta b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Slash/Boss_Mage_Slash_InstantEffect.asset.meta new file mode 100644 index 00000000..2d113f3f --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Slash/Boss_Mage_Slash_InstantEffect.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 11db0cd64e7890d4d983ce5117631e92 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Throw.meta b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Throw.meta new file mode 100644 index 00000000..75486d8a --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Throw.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bfd58814d3912794698daa63c599d447 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/AngrySkellyBoss_AGI_Slash_Instant.asset b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Throw/Boss_Mage_PutridOrb_InstantEffect.asset similarity index 76% rename from Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/AngrySkellyBoss_AGI_Slash_Instant.asset rename to Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Throw/Boss_Mage_PutridOrb_InstantEffect.asset index 8ce183e7..f2ddbe5f 100644 --- a/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/AngrySkellyBoss_AGI_Slash_Instant.asset +++ b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Throw/Boss_Mage_PutridOrb_InstantEffect.asset @@ -10,13 +10,13 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 081df6f2fd69b7643a4844062a82871f, type: 3} - m_Name: AngrySkellyBoss_AGI_Slash_Instant + m_Name: Boss_Mage_PutridOrb_InstantEffect m_EditorClassIdentifier: tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} influencingStats: - - {fileID: 11400000, guid: ff27e4f0bff17a145af826f8ade78c8a, type: 2} - baseValue: 6 - percentStatInfluence: 0.3 + - statTag: {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} + percentInfluence: 0.3 + baseValue: 10 AlliedTargetMultiplier: 1 EnemyTargetMultiplier: 1 diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Throw/Boss_Mage_PutridOrb_InstantEffect.asset.meta b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Throw/Boss_Mage_PutridOrb_InstantEffect.asset.meta new file mode 100644 index 00000000..1b84a4b7 --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Throw/Boss_Mage_PutridOrb_InstantEffect.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b8604a7bb5e3cb94c8d66437ab0c5601 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Throw/Boss_Mage_PutridOrb_PoisonEffect.asset b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Throw/Boss_Mage_PutridOrb_PoisonEffect.asset new file mode 100644 index 00000000..bb39571d --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Throw/Boss_Mage_PutridOrb_PoisonEffect.asset @@ -0,0 +1,26 @@ +%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: af01294d38acd8c4ba867154b71b9ec6, type: 3} + m_Name: Boss_Mage_PutridOrb_PoisonEffect + m_EditorClassIdentifier: + tags: + - {fileID: 11400000, guid: f2044d584b586454f99656097deaa52f, type: 2} + - {fileID: 11400000, guid: 0edcb3dc0f6e9a241b3a30502dd59cbd, type: 2} + influencingStats: + - statTag: {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} + percentInfluence: 0.02 + duration: 3 + applyToTargetsHit: 1 + applyToSelf: 0 + baseDamagePerTick: 2 + tickRate: 1 + damageType: 1 diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Throw/Boss_Mage_PutridOrb_PoisonEffect.asset.meta b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Throw/Boss_Mage_PutridOrb_PoisonEffect.asset.meta new file mode 100644 index 00000000..d540af4b --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Throw/Boss_Mage_PutridOrb_PoisonEffect.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9dbaea888b8c168439811320a7cccfb9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Ultimate.meta b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Ultimate.meta new file mode 100644 index 00000000..8f30de41 --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Ultimate.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8bdcea5165c78444dbb0ab8b5d55743f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/AngrySkellyBoss_STR_Slash_Instant.asset b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Ultimate/Boss_Mage_PoisonousPool_InstantTickEffect.asset similarity index 75% rename from Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/AngrySkellyBoss_STR_Slash_Instant.asset rename to Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Ultimate/Boss_Mage_PoisonousPool_InstantTickEffect.asset index 33ccd23d..a72091a6 100644 --- a/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/AngrySkellyBoss_STR_Slash_Instant.asset +++ b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Ultimate/Boss_Mage_PoisonousPool_InstantTickEffect.asset @@ -10,13 +10,13 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 081df6f2fd69b7643a4844062a82871f, type: 3} - m_Name: AngrySkellyBoss_STR_Slash_Instant + m_Name: Boss_Mage_PoisonousPool_InstantTickEffect m_EditorClassIdentifier: tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} influencingStats: - - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} - baseValue: 6 - percentStatInfluence: 0.3 + - statTag: {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} + percentInfluence: 0.2 + baseValue: 3 AlliedTargetMultiplier: 1 EnemyTargetMultiplier: 1 diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/PoisonousPool_InstantTickEffect.asset.meta b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Ultimate/Boss_Mage_PoisonousPool_InstantTickEffect.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/PoisonousPool_InstantTickEffect.asset.meta rename to Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Ultimate/Boss_Mage_PoisonousPool_InstantTickEffect.asset.meta diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Ultimate/Boss_Mage_PoisonousPool_PoisonEffect.asset b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Ultimate/Boss_Mage_PoisonousPool_PoisonEffect.asset new file mode 100644 index 00000000..ca36942c --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Ultimate/Boss_Mage_PoisonousPool_PoisonEffect.asset @@ -0,0 +1,26 @@ +%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: af01294d38acd8c4ba867154b71b9ec6, type: 3} + m_Name: Boss_Mage_PoisonousPool_PoisonEffect + m_EditorClassIdentifier: + tags: + - {fileID: 11400000, guid: f2044d584b586454f99656097deaa52f, type: 2} + - {fileID: 11400000, guid: 0edcb3dc0f6e9a241b3a30502dd59cbd, type: 2} + influencingStats: + - statTag: {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} + percentInfluence: 0.1 + duration: 3 + applyToTargetsHit: 1 + applyToSelf: 0 + baseDamagePerTick: 2 + tickRate: 1 + damageType: 1 diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/PoisonousPool_PoisonEffect.asset.meta b/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Ultimate/Boss_Mage_PoisonousPool_PoisonEffect.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/PoisonousPool_PoisonEffect.asset.meta rename to Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/Ultimate/Boss_Mage_PoisonousPool_PoisonEffect.asset.meta diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Mage/NPC_INT_AoeInstantEffect.asset b/Assets/Scriptables/Data/Effects/Debug/NPC/Mage/NPC_INT_AoeInstantEffect.asset deleted file mode 100644 index 74b7eb93..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/NPC/Mage/NPC_INT_AoeInstantEffect.asset +++ /dev/null @@ -1,20 +0,0 @@ -%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: 081df6f2fd69b7643a4844062a82871f, type: 3} - m_Name: NPC_INT_AoeInstantEffect - m_EditorClassIdentifier: - tags: - - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - influencingStats: - - {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} - baseValue: 5 - percentStatInfluence: 0.4 diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Mage/NPC_INT_ProjectileInstantEffect.asset b/Assets/Scriptables/Data/Effects/Debug/NPC/Mage/NPC_INT_ProjectileInstantEffect.asset deleted file mode 100644 index 6ffb388d..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/NPC/Mage/NPC_INT_ProjectileInstantEffect.asset +++ /dev/null @@ -1,20 +0,0 @@ -%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: 081df6f2fd69b7643a4844062a82871f, type: 3} - m_Name: NPC_INT_ProjectileInstantEffect - m_EditorClassIdentifier: - tags: - - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - influencingStats: - - {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} - baseValue: 7 - percentStatInfluence: 0.6 diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Mage/Slash.meta b/Assets/Scriptables/Data/Effects/Debug/NPC/Mage/Slash.meta new file mode 100644 index 00000000..38589c3b --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/NPC/Mage/Slash.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b2badf2866de1e94dbf16ff7d9488b75 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Mage/Slash/Basic_SlashInstantEffect.asset b/Assets/Scriptables/Data/Effects/Debug/NPC/Mage/Slash/Basic_SlashInstantEffect.asset new file mode 100644 index 00000000..34977891 --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/NPC/Mage/Slash/Basic_SlashInstantEffect.asset @@ -0,0 +1,24 @@ +%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: 081df6f2fd69b7643a4844062a82871f, type: 3} + m_Name: Basic_SlashInstantEffect + m_EditorClassIdentifier: + tags: + - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} + influencingStats: + - statTag: {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} + percentInfluence: 0.1 + - statTag: {fileID: 11400000, guid: ff27e4f0bff17a145af826f8ade78c8a, type: 2} + percentInfluence: 0.1 + baseValue: 4 + AlliedTargetMultiplier: 1 + EnemyTargetMultiplier: 1 diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Mage/Slash/Basic_SlashInstantEffect.asset.meta b/Assets/Scriptables/Data/Effects/Debug/NPC/Mage/Slash/Basic_SlashInstantEffect.asset.meta new file mode 100644 index 00000000..75f9ac4c --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/NPC/Mage/Slash/Basic_SlashInstantEffect.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a5608ff9c23567a4aac85c878817efb5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Mage/Throw.meta b/Assets/Scriptables/Data/Effects/Debug/NPC/Mage/Throw.meta new file mode 100644 index 00000000..4ef3265f --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/NPC/Mage/Throw.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 82a63cd12527d2f4a82722dda26c406c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/NPC_STR_ProjectileInstantEffect.asset b/Assets/Scriptables/Data/Effects/Debug/NPC/Mage/Throw/Basic_PutridOrb.asset similarity index 79% rename from Assets/Scriptables/Data/Effects/Debug/NPC/NPC_STR_ProjectileInstantEffect.asset rename to Assets/Scriptables/Data/Effects/Debug/NPC/Mage/Throw/Basic_PutridOrb.asset index f3a1849b..c0152b59 100644 --- a/Assets/Scriptables/Data/Effects/Debug/NPC/NPC_STR_ProjectileInstantEffect.asset +++ b/Assets/Scriptables/Data/Effects/Debug/NPC/Mage/Throw/Basic_PutridOrb.asset @@ -10,13 +10,13 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 081df6f2fd69b7643a4844062a82871f, type: 3} - m_Name: NPC_STR_ProjectileInstantEffect + m_Name: Basic_PutridOrb m_EditorClassIdentifier: tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} influencingStats: - - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} + - statTag: {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} + percentInfluence: 0.2 baseValue: 5 - percentStatInfluence: 0.3 AlliedTargetMultiplier: 1 EnemyTargetMultiplier: 1 diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Mage/NPC_INT_ProjectileInstantEffect.asset.meta b/Assets/Scriptables/Data/Effects/Debug/NPC/Mage/Throw/Basic_PutridOrb.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Effects/Debug/NPC/Mage/NPC_INT_ProjectileInstantEffect.asset.meta rename to Assets/Scriptables/Data/Effects/Debug/NPC/Mage/Throw/Basic_PutridOrb.asset.meta diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/PoisonousPool_PoisonEffect.asset b/Assets/Scriptables/Data/Effects/Debug/NPC/Mage/Throw/Basic_PutridOrb_PoisonEffect.asset similarity index 78% rename from Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/PoisonousPool_PoisonEffect.asset rename to Assets/Scriptables/Data/Effects/Debug/NPC/Mage/Throw/Basic_PutridOrb_PoisonEffect.asset index 76a252d2..4ab0d54f 100644 --- a/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/PoisonousPool_PoisonEffect.asset +++ b/Assets/Scriptables/Data/Effects/Debug/NPC/Mage/Throw/Basic_PutridOrb_PoisonEffect.asset @@ -10,16 +10,17 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: af01294d38acd8c4ba867154b71b9ec6, type: 3} - m_Name: PoisonousPool_PoisonEffect + m_Name: Basic_PutridOrb_PoisonEffect m_EditorClassIdentifier: tags: - {fileID: 11400000, guid: f2044d584b586454f99656097deaa52f, type: 2} - {fileID: 11400000, guid: 0edcb3dc0f6e9a241b3a30502dd59cbd, type: 2} influencingStats: - - {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} + - statTag: {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} + percentInfluence: 0.01 duration: 3 applyToTargetsHit: 1 applyToSelf: 0 - damagePerTick: 1 + baseDamagePerTick: 1 tickRate: 1 damageType: 1 diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Mage/Throw/Basic_PutridOrb_PoisonEffect.asset.meta b/Assets/Scriptables/Data/Effects/Debug/NPC/Mage/Throw/Basic_PutridOrb_PoisonEffect.asset.meta new file mode 100644 index 00000000..8a262f88 --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/NPC/Mage/Throw/Basic_PutridOrb_PoisonEffect.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f8ccb993ef7a8114aa9f678e3cdee866 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/NPC_STR_AoeInstantEffect.asset b/Assets/Scriptables/Data/Effects/Debug/NPC/NPC_STR_AoeInstantEffect.asset deleted file mode 100644 index 4440edf2..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/NPC/NPC_STR_AoeInstantEffect.asset +++ /dev/null @@ -1,20 +0,0 @@ -%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: 081df6f2fd69b7643a4844062a82871f, type: 3} - m_Name: NPC_STR_AoeInstantEffect - m_EditorClassIdentifier: - tags: - - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - influencingStats: - - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} - baseValue: 5 - percentStatInfluence: 0.4 diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/NPC_MeleeSlashEffects.meta b/Assets/Scriptables/Data/Effects/Debug/NPC/Skelly.meta similarity index 100% rename from Assets/Scriptables/Data/Effects/Debug/NPC/NPC_MeleeSlashEffects.meta rename to Assets/Scriptables/Data/Effects/Debug/NPC/Skelly.meta diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Skelly/Slash.meta b/Assets/Scriptables/Data/Effects/Debug/NPC/Skelly/Slash.meta new file mode 100644 index 00000000..437f1073 --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/NPC/Skelly/Slash.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4ebd945e79d2bbc41a7587560f552760 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Skelly/Slash/Basic_SlashInstantEffect.asset b/Assets/Scriptables/Data/Effects/Debug/NPC/Skelly/Slash/Basic_SlashInstantEffect.asset new file mode 100644 index 00000000..34977891 --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/NPC/Skelly/Slash/Basic_SlashInstantEffect.asset @@ -0,0 +1,24 @@ +%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: 081df6f2fd69b7643a4844062a82871f, type: 3} + m_Name: Basic_SlashInstantEffect + m_EditorClassIdentifier: + tags: + - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} + influencingStats: + - statTag: {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} + percentInfluence: 0.1 + - statTag: {fileID: 11400000, guid: ff27e4f0bff17a145af826f8ade78c8a, type: 2} + percentInfluence: 0.1 + baseValue: 4 + AlliedTargetMultiplier: 1 + EnemyTargetMultiplier: 1 diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/NPC_MeleeSlashEffects/NPC_STR_SlashInstantEffect.asset.meta b/Assets/Scriptables/Data/Effects/Debug/NPC/Skelly/Slash/Basic_SlashInstantEffect.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Effects/Debug/NPC/NPC_MeleeSlashEffects/NPC_STR_SlashInstantEffect.asset.meta rename to Assets/Scriptables/Data/Effects/Debug/NPC/Skelly/Slash/Basic_SlashInstantEffect.asset.meta diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/1-AxeThrow/STR_BleedEffect.asset b/Assets/Scriptables/Data/Effects/Debug/NPC/Skelly/Slash/Basic_Slash_BleedEffect.asset similarity index 79% rename from Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/1-AxeThrow/STR_BleedEffect.asset rename to Assets/Scriptables/Data/Effects/Debug/NPC/Skelly/Slash/Basic_Slash_BleedEffect.asset index 22a5af71..22de61c8 100644 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/1-AxeThrow/STR_BleedEffect.asset +++ b/Assets/Scriptables/Data/Effects/Debug/NPC/Skelly/Slash/Basic_Slash_BleedEffect.asset @@ -10,16 +10,17 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: af01294d38acd8c4ba867154b71b9ec6, type: 3} - m_Name: STR_BleedEffect + m_Name: Basic_Slash_BleedEffect m_EditorClassIdentifier: tags: - {fileID: 11400000, guid: f2044d584b586454f99656097deaa52f, type: 2} - {fileID: 11400000, guid: 0edcb3dc0f6e9a241b3a30502dd59cbd, type: 2} influencingStats: - - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} + - statTag: {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} + percentInfluence: 0.1 duration: 3 applyToTargetsHit: 1 applyToSelf: 0 - damagePerTick: 1 + baseDamagePerTick: 1 tickRate: 1 damageType: 2 diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Skelly/Slash/Basic_Slash_BleedEffect.asset.meta b/Assets/Scriptables/Data/Effects/Debug/NPC/Skelly/Slash/Basic_Slash_BleedEffect.asset.meta new file mode 100644 index 00000000..218781d7 --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/NPC/Skelly/Slash/Basic_Slash_BleedEffect.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0b7040401c71ccd44bd23de8469d25d7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Skelly/Throw.meta b/Assets/Scriptables/Data/Effects/Debug/NPC/Skelly/Throw.meta new file mode 100644 index 00000000..919e9070 --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/NPC/Skelly/Throw.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7b70888eda1c2f24e8a2668816e06ecf +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Skelly/Throw/Basic_BoneThrow_InstantEffect.asset b/Assets/Scriptables/Data/Effects/Debug/NPC/Skelly/Throw/Basic_BoneThrow_InstantEffect.asset new file mode 100644 index 00000000..7b10e96f --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/NPC/Skelly/Throw/Basic_BoneThrow_InstantEffect.asset @@ -0,0 +1,26 @@ +%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: 081df6f2fd69b7643a4844062a82871f, type: 3} + m_Name: Basic_BoneThrow_InstantEffect + m_EditorClassIdentifier: + tags: + - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} + influencingStats: + - statTag: {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} + percentInfluence: 0.02 + - statTag: {fileID: 11400000, guid: ff27e4f0bff17a145af826f8ade78c8a, type: 2} + percentInfluence: 0.02 + - statTag: {fileID: 11400000, guid: 9bbf01c0977dc98408db3efec6685c56, type: 2} + percentInfluence: 0.01 + baseValue: 3 + AlliedTargetMultiplier: 1 + EnemyTargetMultiplier: 1 diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/NPC_STR_ProjectileInstantEffect.asset.meta b/Assets/Scriptables/Data/Effects/Debug/NPC/Skelly/Throw/Basic_BoneThrow_InstantEffect.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Effects/Debug/NPC/NPC_STR_ProjectileInstantEffect.asset.meta rename to Assets/Scriptables/Data/Effects/Debug/NPC/Skelly/Throw/Basic_BoneThrow_InstantEffect.asset.meta diff --git a/Assets/Scriptables/Data/Effects/Debug/OverTimeEffect.asset b/Assets/Scriptables/Data/Effects/Debug/OverTimeEffect.asset deleted file mode 100644 index e3ff6fed..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/OverTimeEffect.asset +++ /dev/null @@ -1,19 +0,0 @@ -%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: f4e3a9409d6b5e94d92aad7e9e4516b4, type: 3} - m_Name: OverTimeEffect - m_EditorClassIdentifier: - tags: - - {fileID: 11400000, guid: 0edcb3dc0f6e9a241b3a30502dd59cbd, type: 2} - value: 10 - duration: 10 - tickRate: 1 diff --git a/Assets/Scriptables/Data/Effects/Debug/OverTimeEffect.asset.meta b/Assets/Scriptables/Data/Effects/Debug/OverTimeEffect.asset.meta deleted file mode 100644 index e2b87021..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/OverTimeEffect.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3eb38aeb4936a4844afd944318ddb8e8 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/-Extras/DarkMatterEffects/INT_DarkMatterInstantEffect.asset b/Assets/Scriptables/Data/Effects/Debug/Player/-Extras/DarkMatterEffects/P_DarkMatterInstantEffect.asset similarity index 93% rename from Assets/Scriptables/Data/Effects/Debug/Player/-Extras/DarkMatterEffects/INT_DarkMatterInstantEffect.asset rename to Assets/Scriptables/Data/Effects/Debug/Player/-Extras/DarkMatterEffects/P_DarkMatterInstantEffect.asset index 6c3c5931..f5b92fe4 100644 --- a/Assets/Scriptables/Data/Effects/Debug/Player/-Extras/DarkMatterEffects/INT_DarkMatterInstantEffect.asset +++ b/Assets/Scriptables/Data/Effects/Debug/Player/-Extras/DarkMatterEffects/P_DarkMatterInstantEffect.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 081df6f2fd69b7643a4844062a82871f, type: 3} - m_Name: INT_DarkMatterInstantEffect + m_Name: P_DarkMatterInstantEffect m_EditorClassIdentifier: tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/-Extras/DarkMatterEffects/INT_DarkMatterInstantEffect.asset.meta b/Assets/Scriptables/Data/Effects/Debug/Player/-Extras/DarkMatterEffects/P_DarkMatterInstantEffect.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Effects/Debug/Player/-Extras/DarkMatterEffects/INT_DarkMatterInstantEffect.asset.meta rename to Assets/Scriptables/Data/Effects/Debug/Player/-Extras/DarkMatterEffects/P_DarkMatterInstantEffect.asset.meta diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/-Extras/HolyBoltEffects/INT_HolyBolt_InstantEffect_02.asset b/Assets/Scriptables/Data/Effects/Debug/Player/-Extras/HolyBoltEffects/P_HolyBolt_InstantEffect.asset similarity index 93% rename from Assets/Scriptables/Data/Effects/Debug/Player/-Extras/HolyBoltEffects/INT_HolyBolt_InstantEffect_02.asset rename to Assets/Scriptables/Data/Effects/Debug/Player/-Extras/HolyBoltEffects/P_HolyBolt_InstantEffect.asset index 1b7df252..effb86e3 100644 --- a/Assets/Scriptables/Data/Effects/Debug/Player/-Extras/HolyBoltEffects/INT_HolyBolt_InstantEffect_02.asset +++ b/Assets/Scriptables/Data/Effects/Debug/Player/-Extras/HolyBoltEffects/P_HolyBolt_InstantEffect.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 081df6f2fd69b7643a4844062a82871f, type: 3} - m_Name: INT_HolyBolt_InstantEffect_02 + m_Name: P_HolyBolt_InstantEffect m_EditorClassIdentifier: tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/-Extras/HolyBoltEffects/INT_HolyBolt_InstantEffect_02.asset.meta b/Assets/Scriptables/Data/Effects/Debug/Player/-Extras/HolyBoltEffects/P_HolyBolt_InstantEffect.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Effects/Debug/Player/-Extras/HolyBoltEffects/INT_HolyBolt_InstantEffect_02.asset.meta rename to Assets/Scriptables/Data/Effects/Debug/Player/-Extras/HolyBoltEffects/P_HolyBolt_InstantEffect.asset.meta diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/-Extras/HolyBoltEffects/STR_HolyBolt_InstantEffect_01.asset b/Assets/Scriptables/Data/Effects/Debug/Player/-Extras/HolyBoltEffects/STR_HolyBolt_InstantEffect_01.asset deleted file mode 100644 index 261095b1..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/Player/-Extras/HolyBoltEffects/STR_HolyBolt_InstantEffect_01.asset +++ /dev/null @@ -1,20 +0,0 @@ -%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: 081df6f2fd69b7643a4844062a82871f, type: 3} - m_Name: STR_HolyBolt_InstantEffect_01 - m_EditorClassIdentifier: - tags: - - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - influencingStats: - - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} - baseValue: 2 - percentStatInfluence: 0.4 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/-Extras/HolyBoltEffects/STR_HolyBolt_InstantEffect_01.asset.meta b/Assets/Scriptables/Data/Effects/Debug/Player/-Extras/HolyBoltEffects/STR_HolyBolt_InstantEffect_01.asset.meta deleted file mode 100644 index cfc82fa4..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/Player/-Extras/HolyBoltEffects/STR_HolyBolt_InstantEffect_01.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2eddba66a42b8d8458ef4e5d7068e536 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/-Extras/MeleeSlashEffects/AGI_SlashInstantEffect.asset b/Assets/Scriptables/Data/Effects/Debug/Player/-Extras/MeleeSlashEffects/AGI_SlashInstantEffect.asset deleted file mode 100644 index 79b3c22a..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/Player/-Extras/MeleeSlashEffects/AGI_SlashInstantEffect.asset +++ /dev/null @@ -1,20 +0,0 @@ -%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: 081df6f2fd69b7643a4844062a82871f, type: 3} - m_Name: AGI_SlashInstantEffect - m_EditorClassIdentifier: - tags: - - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - influencingStats: - - {fileID: 11400000, guid: ff27e4f0bff17a145af826f8ade78c8a, type: 2} - baseValue: 1 - percentStatInfluence: 0.2 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/-Extras/MeleeSlashEffects/P_SlashInstantEffect.asset b/Assets/Scriptables/Data/Effects/Debug/Player/-Extras/MeleeSlashEffects/P_SlashInstantEffect.asset new file mode 100644 index 00000000..04d8785a --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/Player/-Extras/MeleeSlashEffects/P_SlashInstantEffect.asset @@ -0,0 +1,24 @@ +%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: 081df6f2fd69b7643a4844062a82871f, type: 3} + m_Name: P_SlashInstantEffect + m_EditorClassIdentifier: + tags: + - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} + influencingStats: + - statTag: {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} + percentInfluence: 0.6 + - statTag: {fileID: 11400000, guid: ff27e4f0bff17a145af826f8ade78c8a, type: 2} + percentInfluence: 0.3 + baseValue: 3 + AlliedTargetMultiplier: 1 + EnemyTargetMultiplier: 1 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/-Extras/MeleeSlashEffects/AGI_SlashInstantEffect.asset.meta b/Assets/Scriptables/Data/Effects/Debug/Player/-Extras/MeleeSlashEffects/P_SlashInstantEffect.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Effects/Debug/Player/-Extras/MeleeSlashEffects/AGI_SlashInstantEffect.asset.meta rename to Assets/Scriptables/Data/Effects/Debug/Player/-Extras/MeleeSlashEffects/P_SlashInstantEffect.asset.meta diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/-Extras/MeleeSlashEffects/STR_SlashInstantEffect.asset b/Assets/Scriptables/Data/Effects/Debug/Player/-Extras/MeleeSlashEffects/STR_SlashInstantEffect.asset deleted file mode 100644 index d960a2f4..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/Player/-Extras/MeleeSlashEffects/STR_SlashInstantEffect.asset +++ /dev/null @@ -1,20 +0,0 @@ -%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: 081df6f2fd69b7643a4844062a82871f, type: 3} - m_Name: STR_SlashInstantEffect - m_EditorClassIdentifier: - tags: - - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - influencingStats: - - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} - baseValue: 1 - percentStatInfluence: 0.2 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/-Extras/MeleeSlashEffects/STR_SlashInstantEffect.asset.meta b/Assets/Scriptables/Data/Effects/Debug/Player/-Extras/MeleeSlashEffects/STR_SlashInstantEffect.asset.meta deleted file mode 100644 index 001b3701..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/Player/-Extras/MeleeSlashEffects/STR_SlashInstantEffect.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e047c0f2639d4b840bf40c1ec243afc7 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/1-AxeThrow/AGI_AxeThrowInstantEffect_02.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/1-AxeThrow/AGI_AxeThrowInstantEffect_02.asset deleted file mode 100644 index d228f2dd..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/1-AxeThrow/AGI_AxeThrowInstantEffect_02.asset +++ /dev/null @@ -1,20 +0,0 @@ -%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: 081df6f2fd69b7643a4844062a82871f, type: 3} - m_Name: AGI_AxeThrowInstantEffect_02 - m_EditorClassIdentifier: - tags: - - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - influencingStats: - - {fileID: 11400000, guid: ff27e4f0bff17a145af826f8ade78c8a, type: 2} - baseValue: 1 - percentStatInfluence: 0.2 diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/AngrySkellyBoss_STR_Slash_BleedEffect.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/1-AxeThrow/Barb_AxeThrow_BleedEffect.asset similarity index 79% rename from Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/AngrySkellyBoss_STR_Slash_BleedEffect.asset rename to Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/1-AxeThrow/Barb_AxeThrow_BleedEffect.asset index 7f571d20..449d5056 100644 --- a/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/AngrySkellyBoss/AngrySkellyBoss_STR_Slash_BleedEffect.asset +++ b/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/1-AxeThrow/Barb_AxeThrow_BleedEffect.asset @@ -10,17 +10,17 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: af01294d38acd8c4ba867154b71b9ec6, type: 3} - m_Name: AngrySkellyBoss_STR_Slash_BleedEffect + m_Name: Barb_AxeThrow_BleedEffect m_EditorClassIdentifier: tags: - {fileID: 11400000, guid: f2044d584b586454f99656097deaa52f, type: 2} - {fileID: 11400000, guid: 0edcb3dc0f6e9a241b3a30502dd59cbd, type: 2} influencingStats: - - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} + - statTag: {fileID: 11400000, guid: ff27e4f0bff17a145af826f8ade78c8a, type: 2} + percentInfluence: 0.2 duration: 3 applyToTargetsHit: 1 applyToSelf: 0 - damagePerTick: 2 - percentStatInfluence: 0.1 + baseDamagePerTick: 1 tickRate: 1 damageType: 2 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/1-AxeThrow/STR_BleedEffect.asset.meta b/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/1-AxeThrow/Barb_AxeThrow_BleedEffect.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/1-AxeThrow/STR_BleedEffect.asset.meta rename to Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/1-AxeThrow/Barb_AxeThrow_BleedEffect.asset.meta diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/1-AxeThrow/Barb_AxeThrow_InstantEffect.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/1-AxeThrow/Barb_AxeThrow_InstantEffect.asset new file mode 100644 index 00000000..85069c2a --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/1-AxeThrow/Barb_AxeThrow_InstantEffect.asset @@ -0,0 +1,24 @@ +%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: 081df6f2fd69b7643a4844062a82871f, type: 3} + m_Name: Barb_AxeThrow_InstantEffect + m_EditorClassIdentifier: + tags: + - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} + influencingStats: + - statTag: {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} + percentInfluence: 0.1 + - statTag: {fileID: 11400000, guid: ff27e4f0bff17a145af826f8ade78c8a, type: 2} + percentInfluence: 0.3 + baseValue: 5 + AlliedTargetMultiplier: 1 + EnemyTargetMultiplier: 1 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/1-AxeThrow/AGI_AxeThrowInstantEffect_02.asset.meta b/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/1-AxeThrow/Barb_AxeThrow_InstantEffect.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/1-AxeThrow/AGI_AxeThrowInstantEffect_02.asset.meta rename to Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/1-AxeThrow/Barb_AxeThrow_InstantEffect.asset.meta diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/1-AxeThrow/STR_AxeThrowInstantEffect_01.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/1-AxeThrow/STR_AxeThrowInstantEffect_01.asset deleted file mode 100644 index c4e1d1dd..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/1-AxeThrow/STR_AxeThrowInstantEffect_01.asset +++ /dev/null @@ -1,20 +0,0 @@ -%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: 081df6f2fd69b7643a4844062a82871f, type: 3} - m_Name: STR_AxeThrowInstantEffect_01 - m_EditorClassIdentifier: - tags: - - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - influencingStats: - - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} - baseValue: 1 - percentStatInfluence: 0.2 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/1-AxeThrow/STR_AxeThrowInstantEffect_01.asset.meta b/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/1-AxeThrow/STR_AxeThrowInstantEffect_01.asset.meta deleted file mode 100644 index 6ca37391..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/1-AxeThrow/STR_AxeThrowInstantEffect_01.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c9bd1824d7872e540a5b1d174b78d4b0 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/2-WhirlingAxes/AGI_WhirlingAxes_InstantEffect_02.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/2-WhirlingAxes/AGI_WhirlingAxes_InstantEffect_02.asset deleted file mode 100644 index 6c7a1d8a..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/2-WhirlingAxes/AGI_WhirlingAxes_InstantEffect_02.asset +++ /dev/null @@ -1,20 +0,0 @@ -%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: 081df6f2fd69b7643a4844062a82871f, type: 3} - m_Name: AGI_WhirlingAxes_InstantEffect_02 - m_EditorClassIdentifier: - tags: - - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - influencingStats: - - {fileID: 11400000, guid: ff27e4f0bff17a145af826f8ade78c8a, type: 2} - baseValue: 1 - percentStatInfluence: 0.2 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/2-WhirlingAxes/AGI_WhirlingAxes_InstantEffect_02.asset.meta b/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/2-WhirlingAxes/AGI_WhirlingAxes_InstantEffect_02.asset.meta deleted file mode 100644 index 2d036f9a..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/2-WhirlingAxes/AGI_WhirlingAxes_InstantEffect_02.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0ad4a5d2abc8e644fa6c011ff9598e11 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/2-WhirlingAxes/Barb_WhirlingAxes_InstantEffect.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/2-WhirlingAxes/Barb_WhirlingAxes_InstantEffect.asset new file mode 100644 index 00000000..ed5029fe --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/2-WhirlingAxes/Barb_WhirlingAxes_InstantEffect.asset @@ -0,0 +1,24 @@ +%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: 081df6f2fd69b7643a4844062a82871f, type: 3} + m_Name: Barb_WhirlingAxes_InstantEffect + m_EditorClassIdentifier: + tags: + - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} + influencingStats: + - statTag: {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} + percentInfluence: 0.2 + - statTag: {fileID: 11400000, guid: ff27e4f0bff17a145af826f8ade78c8a, type: 2} + percentInfluence: 0.2 + baseValue: 3 + AlliedTargetMultiplier: 1 + EnemyTargetMultiplier: 1 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/2-WhirlingAxes/STR_WhirlingAxes_InstantEffect_01.asset.meta b/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/2-WhirlingAxes/Barb_WhirlingAxes_InstantEffect.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/2-WhirlingAxes/STR_WhirlingAxes_InstantEffect_01.asset.meta rename to Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/2-WhirlingAxes/Barb_WhirlingAxes_InstantEffect.asset.meta diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/2-WhirlingAxes/STR_WhirlingAxes_InstantEffect_01.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/2-WhirlingAxes/STR_WhirlingAxes_InstantEffect_01.asset deleted file mode 100644 index bc9bf821..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/2-WhirlingAxes/STR_WhirlingAxes_InstantEffect_01.asset +++ /dev/null @@ -1,20 +0,0 @@ -%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: 081df6f2fd69b7643a4844062a82871f, type: 3} - m_Name: STR_WhirlingAxes_InstantEffect_01 - m_EditorClassIdentifier: - tags: - - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - influencingStats: - - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} - baseValue: 1 - percentStatInfluence: 0.2 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/AGI_RageStorm_InstantEffect_02.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/AGI_RageStorm_InstantEffect_02.asset deleted file mode 100644 index e082a2a2..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/AGI_RageStorm_InstantEffect_02.asset +++ /dev/null @@ -1,20 +0,0 @@ -%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: 081df6f2fd69b7643a4844062a82871f, type: 3} - m_Name: AGI_RageStorm_InstantEffect_02 - m_EditorClassIdentifier: - tags: - - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - influencingStats: - - {fileID: 11400000, guid: ff27e4f0bff17a145af826f8ade78c8a, type: 2} - baseValue: 3 - percentStatInfluence: 0.3 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/StatusEffects/STR_RageStorm_DIModifierEffect_01.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/Barb_RageStorm_DIModifierEffect.asset similarity index 75% rename from Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/StatusEffects/STR_RageStorm_DIModifierEffect_01.asset rename to Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/Barb_RageStorm_DIModifierEffect.asset index db083c7d..6ec6d43c 100644 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/StatusEffects/STR_RageStorm_DIModifierEffect_01.asset +++ b/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/Barb_RageStorm_DIModifierEffect.asset @@ -10,14 +10,15 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 13153d6a33b66b1428c0d7fc4cb4bff0, type: 3} - m_Name: STR_RageStorm_DIModifierEffect_01 + m_Name: Barb_RageStorm_DIModifierEffect m_EditorClassIdentifier: tags: - {fileID: 11400000, guid: f2044d584b586454f99656097deaa52f, type: 2} - {fileID: 11400000, guid: 56d85d7ff5b22aa4bb8b40e97b2e850f, type: 2} influencingStats: - - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} + - statTag: {fileID: 11400000, guid: 9bbf01c0977dc98408db3efec6685c56, type: 2} + percentInfluence: -0.001 duration: 1 applyToTargetsHit: 0 applyToSelf: 1 - damageIncomeModifierPercentage: -0.5 + damageIncomeModifierPercentage: -0.35 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/StatusEffects/STR_RageStorm_DIModifierEffect_01.asset.meta b/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/Barb_RageStorm_DIModifierEffect.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/StatusEffects/STR_RageStorm_DIModifierEffect_01.asset.meta rename to Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/Barb_RageStorm_DIModifierEffect.asset.meta diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/NPC_MeleeSlashEffects/NPC_STR_SlashInstantEffect.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/Barb_RageStorm_InstantEffect.asset similarity index 78% rename from Assets/Scriptables/Data/Effects/Debug/NPC/NPC_MeleeSlashEffects/NPC_STR_SlashInstantEffect.asset rename to Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/Barb_RageStorm_InstantEffect.asset index 63823e80..b947b63b 100644 --- a/Assets/Scriptables/Data/Effects/Debug/NPC/NPC_MeleeSlashEffects/NPC_STR_SlashInstantEffect.asset +++ b/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/Barb_RageStorm_InstantEffect.asset @@ -10,13 +10,13 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 081df6f2fd69b7643a4844062a82871f, type: 3} - m_Name: NPC_STR_SlashInstantEffect + m_Name: Barb_RageStorm_InstantEffect m_EditorClassIdentifier: tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} influencingStats: - - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} + - statTag: {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} + percentInfluence: 0.3 baseValue: 4 - percentStatInfluence: 0.4 AlliedTargetMultiplier: 1 EnemyTargetMultiplier: 1 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/AGI_RageStorm_InstantEffect_02.asset.meta b/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/Barb_RageStorm_InstantEffect.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/AGI_RageStorm_InstantEffect_02.asset.meta rename to Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/Barb_RageStorm_InstantEffect.asset.meta diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/STR_RageStorm_InstantEffect_01.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/STR_RageStorm_InstantEffect_01.asset deleted file mode 100644 index 0ffb6dd4..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/STR_RageStorm_InstantEffect_01.asset +++ /dev/null @@ -1,20 +0,0 @@ -%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: 081df6f2fd69b7643a4844062a82871f, type: 3} - m_Name: STR_RageStorm_InstantEffect_01 - m_EditorClassIdentifier: - tags: - - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - influencingStats: - - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} - baseValue: 3 - percentStatInfluence: 0.3 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/STR_RageStorm_InstantEffect_01.asset.meta b/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/STR_RageStorm_InstantEffect_01.asset.meta deleted file mode 100644 index d279d71e..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/STR_RageStorm_InstantEffect_01.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 233a7270b002b90449bae5ed2adc8a9b -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/INT_AoeInstantEffect.asset b/Assets/Scriptables/Data/Effects/Debug/Player/INT_AoeInstantEffect.asset deleted file mode 100644 index b3b64ec2..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/Player/INT_AoeInstantEffect.asset +++ /dev/null @@ -1,20 +0,0 @@ -%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: 081df6f2fd69b7643a4844062a82871f, type: 3} - m_Name: INT_AoeInstantEffect - m_EditorClassIdentifier: - tags: - - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - influencingStats: - - {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} - baseValue: 3 - percentStatInfluence: 0.4 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/INT_AoeInstantEffect.asset.meta b/Assets/Scriptables/Data/Effects/Debug/Player/INT_AoeInstantEffect.asset.meta deleted file mode 100644 index dd6a7866..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/Player/INT_AoeInstantEffect.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 209c85810803863418c79e39a75c6e31 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Knight/1-ShieldThrowEffects/AGI_ProjectileInstantEffect_02.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Knight/1-ShieldThrowEffects/AGI_ProjectileInstantEffect_02.asset deleted file mode 100644 index e30ba385..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Knight/1-ShieldThrowEffects/AGI_ProjectileInstantEffect_02.asset +++ /dev/null @@ -1,20 +0,0 @@ -%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: 081df6f2fd69b7643a4844062a82871f, type: 3} - m_Name: AGI_ProjectileInstantEffect_02 - m_EditorClassIdentifier: - tags: - - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - influencingStats: - - {fileID: 11400000, guid: ff27e4f0bff17a145af826f8ade78c8a, type: 2} - baseValue: 1 - percentStatInfluence: 0.2 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Knight/1-ShieldThrowEffects/Knight_Projectile_InstantEffect.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Knight/1-ShieldThrowEffects/Knight_Projectile_InstantEffect.asset new file mode 100644 index 00000000..2ffd6b42 --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/Player/Knight/1-ShieldThrowEffects/Knight_Projectile_InstantEffect.asset @@ -0,0 +1,24 @@ +%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: 081df6f2fd69b7643a4844062a82871f, type: 3} + m_Name: Knight_Projectile_InstantEffect + m_EditorClassIdentifier: + tags: + - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} + influencingStats: + - statTag: {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} + percentInfluence: 0.2 + - statTag: {fileID: 11400000, guid: ff27e4f0bff17a145af826f8ade78c8a, type: 2} + percentInfluence: 0.4 + baseValue: 6.5 + AlliedTargetMultiplier: 1 + EnemyTargetMultiplier: 1 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Knight/1-ShieldThrowEffects/AGI_ProjectileInstantEffect_02.asset.meta b/Assets/Scriptables/Data/Effects/Debug/Player/Knight/1-ShieldThrowEffects/Knight_Projectile_InstantEffect.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Effects/Debug/Player/Knight/1-ShieldThrowEffects/AGI_ProjectileInstantEffect_02.asset.meta rename to Assets/Scriptables/Data/Effects/Debug/Player/Knight/1-ShieldThrowEffects/Knight_Projectile_InstantEffect.asset.meta diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Knight/1-ShieldThrowEffects/STR_ProjectileInstantEffect_01.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Knight/1-ShieldThrowEffects/STR_ProjectileInstantEffect_01.asset deleted file mode 100644 index fa1a8630..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Knight/1-ShieldThrowEffects/STR_ProjectileInstantEffect_01.asset +++ /dev/null @@ -1,20 +0,0 @@ -%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: 081df6f2fd69b7643a4844062a82871f, type: 3} - m_Name: STR_ProjectileInstantEffect_01 - m_EditorClassIdentifier: - tags: - - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - influencingStats: - - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} - baseValue: 1 - percentStatInfluence: 0.2 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Knight/1-ShieldThrowEffects/STR_ProjectileInstantEffect_01.asset.meta b/Assets/Scriptables/Data/Effects/Debug/Player/Knight/1-ShieldThrowEffects/STR_ProjectileInstantEffect_01.asset.meta deleted file mode 100644 index 413a0c13..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Knight/1-ShieldThrowEffects/STR_ProjectileInstantEffect_01.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c06779deb6806db438e0fbeec44aad61 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Knight/3-ConsecrationEffects/INT_Consecration_TickEffect_02.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Knight/3-ConsecrationEffects/INT_Consecration_TickEffect_02.asset deleted file mode 100644 index 53ab98c7..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Knight/3-ConsecrationEffects/INT_Consecration_TickEffect_02.asset +++ /dev/null @@ -1,20 +0,0 @@ -%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: 081df6f2fd69b7643a4844062a82871f, type: 3} - m_Name: INT_Consecration_TickEffect_02 - m_EditorClassIdentifier: - tags: - - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - influencingStats: - - {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} - baseValue: 4 - percentStatInfluence: 0.35 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Knight/3-ConsecrationEffects/Knight_Consecration_BurnOverTimeEffectStack.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Knight/3-ConsecrationEffects/Knight_Consecration_BurnOverTimeEffectStack.asset new file mode 100644 index 00000000..ecf44259 --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/Player/Knight/3-ConsecrationEffects/Knight_Consecration_BurnOverTimeEffectStack.asset @@ -0,0 +1,28 @@ +%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: af01294d38acd8c4ba867154b71b9ec6, type: 3} + m_Name: Knight_Consecration_BurnOverTimeEffectStack + m_EditorClassIdentifier: + tags: + - {fileID: 11400000, guid: f2044d584b586454f99656097deaa52f, type: 2} + - {fileID: 11400000, guid: 0edcb3dc0f6e9a241b3a30502dd59cbd, type: 2} + influencingStats: + - statTag: {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} + percentInfluence: 0.1 + - statTag: {fileID: 11400000, guid: 9bbf01c0977dc98408db3efec6685c56, type: 2} + percentInfluence: 0.2 + duration: 3 + applyToTargetsHit: 1 + applyToSelf: 0 + baseDamagePerTick: 1 + tickRate: 1 + damageType: 0 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Knight/3-ConsecrationEffects/SPI_Consecration_BurnOverTimeEffectStack.asset.meta b/Assets/Scriptables/Data/Effects/Debug/Player/Knight/3-ConsecrationEffects/Knight_Consecration_BurnOverTimeEffectStack.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Effects/Debug/Player/Knight/3-ConsecrationEffects/SPI_Consecration_BurnOverTimeEffectStack.asset.meta rename to Assets/Scriptables/Data/Effects/Debug/Player/Knight/3-ConsecrationEffects/Knight_Consecration_BurnOverTimeEffectStack.asset.meta diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Knight/3-ConsecrationEffects/Knight_Consecration_InstantEffect_Tick.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Knight/3-ConsecrationEffects/Knight_Consecration_InstantEffect_Tick.asset new file mode 100644 index 00000000..a51e3149 --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/Player/Knight/3-ConsecrationEffects/Knight_Consecration_InstantEffect_Tick.asset @@ -0,0 +1,24 @@ +%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: 081df6f2fd69b7643a4844062a82871f, type: 3} + m_Name: Knight_Consecration_InstantEffect_Tick + m_EditorClassIdentifier: + tags: + - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} + influencingStats: + - statTag: {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} + percentInfluence: 0.1 + - statTag: {fileID: 11400000, guid: 9bbf01c0977dc98408db3efec6685c56, type: 2} + percentInfluence: 0.3 + baseValue: 4 + AlliedTargetMultiplier: 1 + EnemyTargetMultiplier: 1 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Knight/3-ConsecrationEffects/INT_Consecration_TickEffect_02.asset.meta b/Assets/Scriptables/Data/Effects/Debug/Player/Knight/3-ConsecrationEffects/Knight_Consecration_InstantEffect_Tick.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Effects/Debug/Player/Knight/3-ConsecrationEffects/INT_Consecration_TickEffect_02.asset.meta rename to Assets/Scriptables/Data/Effects/Debug/Player/Knight/3-ConsecrationEffects/Knight_Consecration_InstantEffect_Tick.asset.meta diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Knight/3-ConsecrationEffects/STR_Consecration_TickEffect_01.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Knight/3-ConsecrationEffects/STR_Consecration_TickEffect_01.asset deleted file mode 100644 index 47f4b223..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Knight/3-ConsecrationEffects/STR_Consecration_TickEffect_01.asset +++ /dev/null @@ -1,20 +0,0 @@ -%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: 081df6f2fd69b7643a4844062a82871f, type: 3} - m_Name: STR_Consecration_TickEffect_01 - m_EditorClassIdentifier: - tags: - - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - influencingStats: - - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} - baseValue: 4 - percentStatInfluence: 0.35 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Knight/3-ConsecrationEffects/STR_Consecration_TickEffect_01.asset.meta b/Assets/Scriptables/Data/Effects/Debug/Player/Knight/3-ConsecrationEffects/STR_Consecration_TickEffect_01.asset.meta deleted file mode 100644 index 84193757..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Knight/3-ConsecrationEffects/STR_Consecration_TickEffect_01.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6326f864bca14c74896ec05cd7a1bba0 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/NPC_MeleeSlashEffects/NPC_AGI_SlashInstantEffect.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Mage/1-IceShardEffects/Mage_IceShard_InstantEffect.asset similarity index 76% rename from Assets/Scriptables/Data/Effects/Debug/NPC/NPC_MeleeSlashEffects/NPC_AGI_SlashInstantEffect.asset rename to Assets/Scriptables/Data/Effects/Debug/Player/Mage/1-IceShardEffects/Mage_IceShard_InstantEffect.asset index 75d0da03..1550efc0 100644 --- a/Assets/Scriptables/Data/Effects/Debug/NPC/NPC_MeleeSlashEffects/NPC_AGI_SlashInstantEffect.asset +++ b/Assets/Scriptables/Data/Effects/Debug/Player/Mage/1-IceShardEffects/Mage_IceShard_InstantEffect.asset @@ -10,13 +10,13 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 081df6f2fd69b7643a4844062a82871f, type: 3} - m_Name: NPC_AGI_SlashInstantEffect + m_Name: Mage_IceShard_InstantEffect m_EditorClassIdentifier: tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} influencingStats: - - {fileID: 11400000, guid: ff27e4f0bff17a145af826f8ade78c8a, type: 2} - baseValue: 4 - percentStatInfluence: 0.4 + - statTag: {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} + percentInfluence: 0.65 + baseValue: 9.5 AlliedTargetMultiplier: 1 EnemyTargetMultiplier: 1 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Mage/1-IceShardEffects/INT_IceShard_InstantEffect_01.asset.meta b/Assets/Scriptables/Data/Effects/Debug/Player/Mage/1-IceShardEffects/Mage_IceShard_InstantEffect.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Effects/Debug/Player/Mage/1-IceShardEffects/INT_IceShard_InstantEffect_01.asset.meta rename to Assets/Scriptables/Data/Effects/Debug/Player/Mage/1-IceShardEffects/Mage_IceShard_InstantEffect.asset.meta diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Mage/2-BlizzardEffects/INT_Blizzard_TickEffect.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Mage/2-BlizzardEffects/INT_Blizzard_TickEffect.asset deleted file mode 100644 index c90a5a49..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Mage/2-BlizzardEffects/INT_Blizzard_TickEffect.asset +++ /dev/null @@ -1,20 +0,0 @@ -%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: 081df6f2fd69b7643a4844062a82871f, type: 3} - m_Name: INT_Blizzard_TickEffect - m_EditorClassIdentifier: - tags: - - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - influencingStats: - - {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} - baseValue: 2 - percentStatInfluence: 0.4 diff --git a/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/PoisonousPool_InstantTickEffect.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Mage/2-BlizzardEffects/Mage_Blizzard_InstantEffect_Tick.asset similarity index 78% rename from Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/PoisonousPool_InstantTickEffect.asset rename to Assets/Scriptables/Data/Effects/Debug/Player/Mage/2-BlizzardEffects/Mage_Blizzard_InstantEffect_Tick.asset index 549be556..517d60e3 100644 --- a/Assets/Scriptables/Data/Effects/Debug/NPC/Boss/SkellyMageBoss/PoisonousPool_InstantTickEffect.asset +++ b/Assets/Scriptables/Data/Effects/Debug/Player/Mage/2-BlizzardEffects/Mage_Blizzard_InstantEffect_Tick.asset @@ -10,13 +10,13 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 081df6f2fd69b7643a4844062a82871f, type: 3} - m_Name: PoisonousPool_InstantTickEffect + m_Name: Mage_Blizzard_InstantEffect_Tick m_EditorClassIdentifier: tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} influencingStats: - - {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} + - statTag: {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} + percentInfluence: 0.2 baseValue: 3 - percentStatInfluence: 0.6 AlliedTargetMultiplier: 1 EnemyTargetMultiplier: 1 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Mage/2-BlizzardEffects/INT_Blizzard_TickEffect.asset.meta b/Assets/Scriptables/Data/Effects/Debug/Player/Mage/2-BlizzardEffects/Mage_Blizzard_InstantEffect_Tick.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Effects/Debug/Player/Mage/2-BlizzardEffects/INT_Blizzard_TickEffect.asset.meta rename to Assets/Scriptables/Data/Effects/Debug/Player/Mage/2-BlizzardEffects/Mage_Blizzard_InstantEffect_Tick.asset.meta diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Mage/3-GlacialBombEffects/INT_ImpactInstantEffect_01.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Mage/3-GlacialBombEffects/INT_ImpactInstantEffect_01.asset deleted file mode 100644 index 22551827..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Mage/3-GlacialBombEffects/INT_ImpactInstantEffect_01.asset +++ /dev/null @@ -1,22 +0,0 @@ -%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: 081df6f2fd69b7643a4844062a82871f, type: 3} - m_Name: INT_ImpactInstantEffect_01 - m_EditorClassIdentifier: - tags: - - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - influencingStats: - - {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} - baseValue: 6 - percentStatInfluence: 0.2 - AlliedTargetMultiplier: 1 - EnemyTargetMultiplier: 1 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Mage/3-GlacialBombEffects/Mage_Impact_InstantEffect.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Mage/3-GlacialBombEffects/Mage_Impact_InstantEffect.asset new file mode 100644 index 00000000..3854d6fa --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/Player/Mage/3-GlacialBombEffects/Mage_Impact_InstantEffect.asset @@ -0,0 +1,24 @@ +%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: 081df6f2fd69b7643a4844062a82871f, type: 3} + m_Name: Mage_Impact_InstantEffect + m_EditorClassIdentifier: + tags: + - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} + influencingStats: + - statTag: {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} + percentInfluence: 0.6 + - statTag: {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} + percentInfluence: 1 + baseValue: 9 + AlliedTargetMultiplier: 1 + EnemyTargetMultiplier: 1 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Mage/3-GlacialBombEffects/INT_ImpactInstantEffect_01.asset.meta b/Assets/Scriptables/Data/Effects/Debug/Player/Mage/3-GlacialBombEffects/Mage_Impact_InstantEffect.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Effects/Debug/Player/Mage/3-GlacialBombEffects/INT_ImpactInstantEffect_01.asset.meta rename to Assets/Scriptables/Data/Effects/Debug/Player/Mage/3-GlacialBombEffects/Mage_Impact_InstantEffect.asset.meta diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Mage/3-GlacialBombEffects/STR_ImpactInstantEffect_02.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Mage/3-GlacialBombEffects/STR_ImpactInstantEffect_02.asset deleted file mode 100644 index 2af59d12..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Mage/3-GlacialBombEffects/STR_ImpactInstantEffect_02.asset +++ /dev/null @@ -1,20 +0,0 @@ -%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: 081df6f2fd69b7643a4844062a82871f, type: 3} - m_Name: STR_ImpactInstantEffect_02 - m_EditorClassIdentifier: - tags: - - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - influencingStats: - - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} - baseValue: 4 - percentStatInfluence: 1 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Mage/3-GlacialBombEffects/STR_ImpactInstantEffect_02.asset.meta b/Assets/Scriptables/Data/Effects/Debug/Player/Mage/3-GlacialBombEffects/STR_ImpactInstantEffect_02.asset.meta deleted file mode 100644 index ffe8e65f..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Mage/3-GlacialBombEffects/STR_ImpactInstantEffect_02.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 670c1dd9c913edd4c91c9cff88350f10 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/INT_HolyBall_InstantEffect_02.asset.meta b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/INT_HolyBall_InstantEffect_02.asset.meta deleted file mode 100644 index 156c5fbb..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/INT_HolyBall_InstantEffect_02.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a29bc493146d99d489cd682fe8cc7b6d -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/INT_HolyBall_InstantEffect_02.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/Priest_HolyBall_InstantEffect.asset similarity index 66% rename from Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/INT_HolyBall_InstantEffect_02.asset rename to Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/Priest_HolyBall_InstantEffect.asset index 6151490c..cc42e1bc 100644 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/INT_HolyBall_InstantEffect_02.asset +++ b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/Priest_HolyBall_InstantEffect.asset @@ -10,13 +10,15 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 081df6f2fd69b7643a4844062a82871f, type: 3} - m_Name: INT_HolyBall_InstantEffect_02 + m_Name: Priest_HolyBall_InstantEffect m_EditorClassIdentifier: tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} influencingStats: - - {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} - baseValue: 1 - percentStatInfluence: 0.1 + - statTag: {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} + percentInfluence: 0.1 + - statTag: {fileID: 11400000, guid: d7a9b755d873bad4f9bbd0393bc36a42, type: 2} + percentInfluence: 0.4 + baseValue: 3.5 AlliedTargetMultiplier: 0.5 EnemyTargetMultiplier: 1 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/SPI_HolyBall_InstantEffect_01.asset.meta b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/Priest_HolyBall_InstantEffect.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/SPI_HolyBall_InstantEffect_01.asset.meta rename to Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/Priest_HolyBall_InstantEffect.asset.meta diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/SPI_HolyBall_InstantEffect_01.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/SPI_HolyBall_InstantEffect_01.asset deleted file mode 100644 index c98fcdf7..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/SPI_HolyBall_InstantEffect_01.asset +++ /dev/null @@ -1,22 +0,0 @@ -%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: 081df6f2fd69b7643a4844062a82871f, type: 3} - m_Name: SPI_HolyBall_InstantEffect_01 - m_EditorClassIdentifier: - tags: - - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - influencingStats: - - {fileID: 11400000, guid: d7a9b755d873bad4f9bbd0393bc36a42, type: 2} - baseValue: 2 - percentStatInfluence: 0.3 - AlliedTargetMultiplier: 0.5 - EnemyTargetMultiplier: 1 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/StatusEffects/SPI_HolyBall_AbsorbEffect_01.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/StatusEffects/SPI_HolyBall_AbsorbEffect_01.asset deleted file mode 100644 index e79b7ce1..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/StatusEffects/SPI_HolyBall_AbsorbEffect_01.asset +++ /dev/null @@ -1,24 +0,0 @@ -%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: bbb95d10fa2aa464a84aecc6a7a7ef31, type: 3} - m_Name: SPI_HolyBall_AbsorbEffect_01 - m_EditorClassIdentifier: - tags: - - {fileID: 11400000, guid: f2044d584b586454f99656097deaa52f, type: 2} - - {fileID: 11400000, guid: b48912f0531050749aaa214045f32b1d, type: 2} - influencingStats: - - {fileID: 11400000, guid: d7a9b755d873bad4f9bbd0393bc36a42, type: 2} - duration: 4 - applyToTargetsHit: 1 - applyToSelf: 0 - amount: 20 - percentStatInfluence: 1 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/StatusEffects/SPI_HolyBall_AbsorbEffect_01.asset.meta b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/StatusEffects/SPI_HolyBall_AbsorbEffect_01.asset.meta deleted file mode 100644 index 2b29a260..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/StatusEffects/SPI_HolyBall_AbsorbEffect_01.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c67c3526f466b254c9dba7c2d584eb4e -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/StatusEffects/SPI_BurstofHope_AbsorbEffect_01.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/Priest_BurstofHope_AbsorbEffect.asset similarity index 80% rename from Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/StatusEffects/SPI_BurstofHope_AbsorbEffect_01.asset rename to Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/Priest_BurstofHope_AbsorbEffect.asset index bf46ee65..42cd9916 100644 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/StatusEffects/SPI_BurstofHope_AbsorbEffect_01.asset +++ b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/Priest_BurstofHope_AbsorbEffect.asset @@ -10,15 +10,15 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: bbb95d10fa2aa464a84aecc6a7a7ef31, type: 3} - m_Name: SPI_BurstofHope_AbsorbEffect_01 + m_Name: Priest_BurstofHope_AbsorbEffect m_EditorClassIdentifier: tags: - {fileID: 11400000, guid: f2044d584b586454f99656097deaa52f, type: 2} - {fileID: 11400000, guid: b48912f0531050749aaa214045f32b1d, type: 2} influencingStats: - - {fileID: 11400000, guid: d7a9b755d873bad4f9bbd0393bc36a42, type: 2} + - statTag: {fileID: 11400000, guid: d7a9b755d873bad4f9bbd0393bc36a42, type: 2} + percentInfluence: 0.1 duration: 2 applyToTargetsHit: 0 applyToSelf: 1 amount: 3 - percentStatInfluence: 1 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/StatusEffects/SPI_BurstofHope_AbsorbEffect_01.asset.meta b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/Priest_BurstofHope_AbsorbEffect.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/StatusEffects/SPI_BurstofHope_AbsorbEffect_01.asset.meta rename to Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/Priest_BurstofHope_AbsorbEffect.asset.meta diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/INT_BurstofHope_InstantEffect_02.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/Priest_BurstofHope_InstantEffect.asset similarity index 68% rename from Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/INT_BurstofHope_InstantEffect_02.asset rename to Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/Priest_BurstofHope_InstantEffect.asset index 90eaeaf7..4aeebb40 100644 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/INT_BurstofHope_InstantEffect_02.asset +++ b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/Priest_BurstofHope_InstantEffect.asset @@ -10,13 +10,15 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 081df6f2fd69b7643a4844062a82871f, type: 3} - m_Name: INT_BurstofHope_InstantEffect_02 + m_Name: Priest_BurstofHope_InstantEffect m_EditorClassIdentifier: tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} influencingStats: - - {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} + - statTag: {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} + percentInfluence: 0.1 + - statTag: {fileID: 11400000, guid: d7a9b755d873bad4f9bbd0393bc36a42, type: 2} + percentInfluence: 0.3 baseValue: 3 - percentStatInfluence: 0.1 AlliedTargetMultiplier: 0 EnemyTargetMultiplier: 1 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/INT_BurstofHope_InstantEffect_02.asset.meta b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/Priest_BurstofHope_InstantEffect.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/INT_BurstofHope_InstantEffect_02.asset.meta rename to Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/Priest_BurstofHope_InstantEffect.asset.meta diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/SPI_BurstofHope_InstantEffect_01.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/SPI_BurstofHope_InstantEffect_01.asset deleted file mode 100644 index 0f3700e1..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/SPI_BurstofHope_InstantEffect_01.asset +++ /dev/null @@ -1,22 +0,0 @@ -%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: 081df6f2fd69b7643a4844062a82871f, type: 3} - m_Name: SPI_BurstofHope_InstantEffect_01 - m_EditorClassIdentifier: - tags: - - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - influencingStats: - - {fileID: 11400000, guid: d7a9b755d873bad4f9bbd0393bc36a42, type: 2} - baseValue: 3 - percentStatInfluence: 0.2 - AlliedTargetMultiplier: 0 - EnemyTargetMultiplier: 1 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/SPI_BurstofHope_InstantEffect_01.asset.meta b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/SPI_BurstofHope_InstantEffect_01.asset.meta deleted file mode 100644 index bf4a0b43..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/SPI_BurstofHope_InstantEffect_01.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 72f65c10a6d066541bd1d369c4f271e3 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/3-HolyCircleEffects/INT_HolyCircle_TickEffect_02.asset.meta b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/3-HolyCircleEffects/INT_HolyCircle_TickEffect_02.asset.meta deleted file mode 100644 index 29bde614..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/3-HolyCircleEffects/INT_HolyCircle_TickEffect_02.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f5e6781929af8c24a8719ecf59d5153e -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/3-HolyCircleEffects/INT_HolyCircle_TickEffect_02.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/3-HolyCircleEffects/Priest_HolyCircle_InstantEffect_Tick.asset similarity index 65% rename from Assets/Scriptables/Data/Effects/Debug/Player/Priest/3-HolyCircleEffects/INT_HolyCircle_TickEffect_02.asset rename to Assets/Scriptables/Data/Effects/Debug/Player/Priest/3-HolyCircleEffects/Priest_HolyCircle_InstantEffect_Tick.asset index 9ebcd3fc..b9de4928 100644 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/3-HolyCircleEffects/INT_HolyCircle_TickEffect_02.asset +++ b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/3-HolyCircleEffects/Priest_HolyCircle_InstantEffect_Tick.asset @@ -10,13 +10,15 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 081df6f2fd69b7643a4844062a82871f, type: 3} - m_Name: INT_HolyCircle_TickEffect_02 + m_Name: Priest_HolyCircle_InstantEffect_Tick m_EditorClassIdentifier: tags: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} influencingStats: - - {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} - baseValue: 4 - percentStatInfluence: 0.35 + - statTag: {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} + percentInfluence: 0.1 + - statTag: {fileID: 11400000, guid: d7a9b755d873bad4f9bbd0393bc36a42, type: 2} + percentInfluence: 0.4 + baseValue: 5 AlliedTargetMultiplier: 1 EnemyTargetMultiplier: 0.5 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/3-HolyCircleEffects/SPI_HolyCircle_TickEffect_01.asset.meta b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/3-HolyCircleEffects/Priest_HolyCircle_InstantEffect_Tick.asset.meta similarity index 100% rename from Assets/Scriptables/Data/Effects/Debug/Player/Priest/3-HolyCircleEffects/SPI_HolyCircle_TickEffect_01.asset.meta rename to Assets/Scriptables/Data/Effects/Debug/Player/Priest/3-HolyCircleEffects/Priest_HolyCircle_InstantEffect_Tick.asset.meta diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/3-HolyCircleEffects/SPI_HolyCircle_TickEffect_01.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/3-HolyCircleEffects/SPI_HolyCircle_TickEffect_01.asset deleted file mode 100644 index ebe222d2..00000000 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/3-HolyCircleEffects/SPI_HolyCircle_TickEffect_01.asset +++ /dev/null @@ -1,22 +0,0 @@ -%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: 081df6f2fd69b7643a4844062a82871f, type: 3} - m_Name: SPI_HolyCircle_TickEffect_01 - m_EditorClassIdentifier: - tags: - - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - influencingStats: - - {fileID: 11400000, guid: d7a9b755d873bad4f9bbd0393bc36a42, type: 2} - baseValue: 4 - percentStatInfluence: 0.35 - AlliedTargetMultiplier: 1 - EnemyTargetMultiplier: 0.5 diff --git a/Assets/Scripts/AbilitySystem/Base/BaseAbility.cs b/Assets/Scripts/AbilitySystem/Base/BaseAbility.cs index 601d2011..ae51dbb3 100644 --- a/Assets/Scripts/AbilitySystem/Base/BaseAbility.cs +++ b/Assets/Scripts/AbilitySystem/Base/BaseAbility.cs @@ -66,11 +66,11 @@ public class BaseAbility : ScriptableObject tags.Add(tag); } } - foreach (var statTag in effect.influencingStats) + foreach (var influencingStat in effect.influencingStats) { - if(!tags.Contains(statTag)) + if(!tags.Contains(influencingStat.statTag)) { - tags.Add(statTag); + tags.Add(influencingStat.statTag); } } } diff --git a/Assets/Scripts/AbilitySystem/Base/BaseEffect.cs b/Assets/Scripts/AbilitySystem/Base/BaseEffect.cs index bfa3598a..e3f458e8 100644 --- a/Assets/Scripts/AbilitySystem/Base/BaseEffect.cs +++ b/Assets/Scripts/AbilitySystem/Base/BaseEffect.cs @@ -6,7 +6,7 @@ using UnityEngine; public class BaseEffect : ScriptableObject { public List tags = new List(); - public List influencingStats = new List(); + public List influencingStats = new List(); public virtual void ApplyEffect(Taggable user, List targets) { } diff --git a/Assets/Scripts/AbilitySystem/Base/StatInfluence.cs b/Assets/Scripts/AbilitySystem/Base/StatInfluence.cs new file mode 100644 index 00000000..ae6edfe2 --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Base/StatInfluence.cs @@ -0,0 +1,10 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[System.Serializable] +public class StatInfluence +{ + public GameTag statTag; + public float percentInfluence; +} diff --git a/Assets/Scripts/AbilitySystem/Base/StatInfluence.cs.meta b/Assets/Scripts/AbilitySystem/Base/StatInfluence.cs.meta new file mode 100644 index 00000000..64fd2016 --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Base/StatInfluence.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 77a073f2ec5d27f488fe617ab41eea49 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AbilitySystem/Effects/AbsorbEffect.cs b/Assets/Scripts/AbilitySystem/Effects/AbsorbEffect.cs index fc3498dd..df6e1fc2 100644 --- a/Assets/Scripts/AbilitySystem/Effects/AbsorbEffect.cs +++ b/Assets/Scripts/AbilitySystem/Effects/AbsorbEffect.cs @@ -9,7 +9,6 @@ using UnityEngine; public class AbsorbEffect : StatusEffect { public float amount; - public float percentStatInfluence; AbsorbEffectInstance targetAbsorbEffect; @@ -24,14 +23,14 @@ public class AbsorbEffect : StatusEffect if (IsAlliedTarget(user, target)) { targetAbsorbEffect = target.GetComponent(); - targetAbsorbEffect.owner.RPC(nameof(targetAbsorbEffect.RPC_ApplyAbsorbEffect), targetAbsorbEffect.owner.Owner, StatusEffectIndexer.Instance.StatusEffects.IndexOf(this)); + targetAbsorbEffect.owner.RPC(nameof(targetAbsorbEffect.RPC_ApplyAbsorbEffect), targetAbsorbEffect.owner.Owner, StatusEffectIndexer.Instance.StatusEffects.IndexOf(this), CalculateFinalAmount(user)); } } } if (applyToSelf) { targetAbsorbEffect = user.GetComponent(); - targetAbsorbEffect.ApplyEffect(this); + targetAbsorbEffect.ApplyEffect(this, CalculateFinalAmount(user)); //targetAbsorbEffect.owner.RPC(nameof(targetAbsorbEffect.RPC_ApplyAbsorbEffect), targetAbsorbEffect.owner.Owner, StatusEffectIndexer.Instance.StatusEffects.IndexOf(this)); } } @@ -40,4 +39,20 @@ public class AbsorbEffect : StatusEffect { return user.targetTag.AlliedTags.Contains(target.targetTag); } + + private float CalculateFinalAmount(Taggable user) + { + float finalAmount = amount; + CharacterStats stats = user.GetComponent(); + + foreach (var statInfluence in influencingStats) + { + if (stats.statsDictionary.TryGetValue(statInfluence.statTag.name.ToLower(), out CharacterStat stat)) + { + finalAmount += stat.Value * statInfluence.percentInfluence; + } + } + + return finalAmount; + } } diff --git a/Assets/Scripts/AbilitySystem/Effects/AbsorbEffectInstance.cs b/Assets/Scripts/AbilitySystem/Effects/AbsorbEffectInstance.cs index 77c6a7f9..f902a02b 100644 --- a/Assets/Scripts/AbilitySystem/Effects/AbsorbEffectInstance.cs +++ b/Assets/Scripts/AbilitySystem/Effects/AbsorbEffectInstance.cs @@ -48,9 +48,9 @@ public class AbsorbEffectInstance : StatusEffectInstance return this.income; } - public float GetHighestAmount() + public float GetHighestAmount(float value) { - float highestAmount = 0; + float highestAmount = value; for (int i = activeStacks.Count - 1; i >= 0; i--) { if (((AbsorbEffect)activeStacks[i]).amount > highestAmount) @@ -61,9 +61,9 @@ public class AbsorbEffectInstance : StatusEffectInstance } [PunRPC] - public void RPC_ApplyAbsorbEffect(int effectIndex) + public void RPC_ApplyAbsorbEffect(int effectIndex, float value) { - ApplyEffect(StatusEffectIndexer.Instance.StatusEffects[effectIndex]); + ApplyEffect(StatusEffectIndexer.Instance.StatusEffects[effectIndex], value); } [PunRPC] @@ -82,31 +82,31 @@ public class AbsorbEffectInstance : StatusEffectInstance OnAbsorbDamage.Invoke(); } - public override void ApplyEffect(StatusEffect effect) + public override void ApplyEffect(StatusEffect effect, float value) { - base.ApplyEffect(effect); + base.ApplyEffect(effect, value); } - protected override void AddStack(StatusEffect addedEffect) + protected override void AddStack(StatusEffect addedEffect, float value) { if (activeStacks.Count <= 0) { - startingAmount = ((AbsorbEffect)addedEffect).amount; + startingAmount = value; currentAmount = startingAmount; } else if (canStack) { - currentAmount += ((AbsorbEffect)addedEffect).amount; + currentAmount += value; } - base.AddStack(addedEffect); + base.AddStack(addedEffect, value); } - protected override void RefreshEffect(StatusEffect effect) + protected override void RefreshEffect(StatusEffect effect, float value) { - base.RefreshEffect(effect); + base.RefreshEffect(effect, value); - startingAmount = GetHighestAmount(); + startingAmount = GetHighestAmount(value); currentAmount = startingAmount; OnEffectStackAdded(); diff --git a/Assets/Scripts/AbilitySystem/Effects/BaseDamageOverTimeEffectInstance.cs b/Assets/Scripts/AbilitySystem/Effects/BaseDamageOverTimeEffectInstance.cs index fe073528..530d854c 100644 --- a/Assets/Scripts/AbilitySystem/Effects/BaseDamageOverTimeEffectInstance.cs +++ b/Assets/Scripts/AbilitySystem/Effects/BaseDamageOverTimeEffectInstance.cs @@ -24,17 +24,17 @@ public abstract class BaseDamageOverTimeEffectInstance : StatusEffectInstance } } - protected override void AddStack(StatusEffect addedEffect) + protected override void AddStack(StatusEffect addedEffect, float value) { DamageOverTimeEffect dotEffect = (DamageOverTimeEffect)addedEffect; - currentDamagePerTick += dotEffect.damagePerTick; - base.AddStack(addedEffect); + currentDamagePerTick += value; + base.AddStack(addedEffect, value); } - protected override void RefreshEffect(StatusEffect effect) + protected override void RefreshEffect(StatusEffect effect, float value) { - base.RefreshEffect(effect); - currentDamagePerTick = GetHighestDamagePerTick(); + base.RefreshEffect(effect, value); + currentDamagePerTick = GetHighestDamagePerTick(value); OnEffectStackAdded(); } @@ -78,21 +78,21 @@ public abstract class BaseDamageOverTimeEffectInstance : StatusEffectInstance base.EffectStateEnded(); } - private float GetHighestDamagePerTick() + private float GetHighestDamagePerTick(float value) { - float highestDamage = 0; + float highestDamage = value; for (int i = activeStacks.Count - 1; i >= 0; i--) { - if (((DamageOverTimeEffect)activeStacks[i]).damagePerTick > highestDamage) - highestDamage = ((DamageOverTimeEffect)activeStacks[i]).damagePerTick; + if (((DamageOverTimeEffect)activeStacks[i]).baseDamagePerTick > highestDamage) + highestDamage = ((DamageOverTimeEffect)activeStacks[i]).baseDamagePerTick; } return highestDamage; } [PunRPC] - public void RPC_ApplyDamageOverTimeEffect(int effectIndex) + public void RPC_ApplyDamageOverTimeEffect(int effectIndex, float value) { - ApplyEffect(StatusEffectIndexer.Instance.StatusEffects[effectIndex]); + ApplyEffect(StatusEffectIndexer.Instance.StatusEffects[effectIndex], value); } [PunRPC] diff --git a/Assets/Scripts/AbilitySystem/Effects/BleedEffectInstance.cs b/Assets/Scripts/AbilitySystem/Effects/BleedEffectInstance.cs index 0d6c9a16..ed1a91cf 100644 --- a/Assets/Scripts/AbilitySystem/Effects/BleedEffectInstance.cs +++ b/Assets/Scripts/AbilitySystem/Effects/BleedEffectInstance.cs @@ -5,8 +5,8 @@ public class BleedEffectInstance : BaseDamageOverTimeEffectInstance public override DamageOverTimeType DamageType => DamageOverTimeType.Bleed; [PunRPC] - public void RPC_ApplyDamageOverTimeEffectBleed(int effectIndex) + public void RPC_ApplyDamageOverTimeEffectBleed(int effectIndex, float value) { - ApplyEffect(StatusEffectIndexer.Instance.StatusEffects[effectIndex]); + ApplyEffect(StatusEffectIndexer.Instance.StatusEffects[effectIndex], value); } } \ No newline at end of file diff --git a/Assets/Scripts/AbilitySystem/Effects/BurnEffectInstance.cs b/Assets/Scripts/AbilitySystem/Effects/BurnEffectInstance.cs index e56f0d6a..22183652 100644 --- a/Assets/Scripts/AbilitySystem/Effects/BurnEffectInstance.cs +++ b/Assets/Scripts/AbilitySystem/Effects/BurnEffectInstance.cs @@ -5,8 +5,8 @@ public class BurnEffectInstance : BaseDamageOverTimeEffectInstance public override DamageOverTimeType DamageType => DamageOverTimeType.Burn; [PunRPC] - public void RPC_ApplyDamageOverTimeEffectBurn(int effectIndex) + public void RPC_ApplyDamageOverTimeEffectBurn(int effectIndex, float value) { - ApplyEffect(StatusEffectIndexer.Instance.StatusEffects[effectIndex]); + ApplyEffect(StatusEffectIndexer.Instance.StatusEffects[effectIndex], value); } } \ No newline at end of file diff --git a/Assets/Scripts/AbilitySystem/Effects/DamageIncomeModifierEffect.cs b/Assets/Scripts/AbilitySystem/Effects/DamageIncomeModifierEffect.cs index a780c167..2775851d 100644 --- a/Assets/Scripts/AbilitySystem/Effects/DamageIncomeModifierEffect.cs +++ b/Assets/Scripts/AbilitySystem/Effects/DamageIncomeModifierEffect.cs @@ -1,3 +1,5 @@ +using Kryz.CharacterStats; +using Kryz.CharacterStats.Examples; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -19,14 +21,30 @@ public class DamageIncomeModifierEffect : StatusEffect foreach (Taggable target in targets) { targetDamageIncomeModifierEffect = target.GetComponent(); - targetDamageIncomeModifierEffect.owner.RPC(nameof(targetDamageIncomeModifierEffect.RPC_ApplyDamageIncomeModifierEffect), targetDamageIncomeModifierEffect.owner.Owner, StatusEffectIndexer.Instance.StatusEffects.IndexOf(this)); + targetDamageIncomeModifierEffect.owner.RPC(nameof(targetDamageIncomeModifierEffect.RPC_ApplyDamageIncomeModifierEffect), targetDamageIncomeModifierEffect.owner.Owner, StatusEffectIndexer.Instance.StatusEffects.IndexOf(this), CalculateFinalAmount(user)); } } if(applyToSelf) { targetDamageIncomeModifierEffect = user.GetComponent(); - targetDamageIncomeModifierEffect.ApplyEffect(this); + targetDamageIncomeModifierEffect.ApplyEffect(this, CalculateFinalAmount(user)); } } + + private float CalculateFinalAmount(Taggable user) + { + float finalAmount = damageIncomeModifierPercentage; + CharacterStats stats = user.GetComponent(); + + foreach (var statInfluence in influencingStats) + { + if (stats.statsDictionary.TryGetValue(statInfluence.statTag.name.ToLower(), out CharacterStat stat)) + { + finalAmount += stat.Value * statInfluence.percentInfluence; + } + } + + return finalAmount; + } } diff --git a/Assets/Scripts/AbilitySystem/Effects/DamageIncomeModifierEffectInstance.cs b/Assets/Scripts/AbilitySystem/Effects/DamageIncomeModifierEffectInstance.cs index a2ced2de..007e7ec5 100644 --- a/Assets/Scripts/AbilitySystem/Effects/DamageIncomeModifierEffectInstance.cs +++ b/Assets/Scripts/AbilitySystem/Effects/DamageIncomeModifierEffectInstance.cs @@ -29,17 +29,17 @@ public class DamageIncomeModifierEffectInstance : StatusEffectInstance } [PunRPC] - public void RPC_ApplyDamageIncomeModifierEffect(int effectIndex) + public void RPC_ApplyDamageIncomeModifierEffect(int effectIndex, float value) { - ApplyEffect(StatusEffectIndexer.Instance.StatusEffects[effectIndex]); + ApplyEffect(StatusEffectIndexer.Instance.StatusEffects[effectIndex], value); } - public override void ApplyEffect(StatusEffect effect) + public override void ApplyEffect(StatusEffect effect, float value) { - base.ApplyEffect(effect); + base.ApplyEffect(effect, value); } - protected override void AddStack(StatusEffect addedEffect) + protected override void AddStack(StatusEffect addedEffect, float value) { if (activeStacks.Count <= 0) { @@ -56,12 +56,12 @@ public class DamageIncomeModifierEffectInstance : StatusEffectInstance return; } - base.AddStack(addedEffect); + base.AddStack(addedEffect, value); } - protected override void RefreshEffect(StatusEffect effect) + protected override void RefreshEffect(StatusEffect effect, float value) { - base.RefreshEffect(effect); + base.RefreshEffect(effect, value); startingIncomeModifierPercent = GetHighestAmount(); currentIncomeModifierPercent = startingIncomeModifierPercent; diff --git a/Assets/Scripts/AbilitySystem/Effects/DamageOverTimeEffect.cs b/Assets/Scripts/AbilitySystem/Effects/DamageOverTimeEffect.cs index 1463d340..b9534b2a 100644 --- a/Assets/Scripts/AbilitySystem/Effects/DamageOverTimeEffect.cs +++ b/Assets/Scripts/AbilitySystem/Effects/DamageOverTimeEffect.cs @@ -7,8 +7,7 @@ using Kryz.CharacterStats; public class DamageOverTimeEffect : StatusEffect { [Space] - public float damagePerTick; - public float percentStatInfluence; + public float baseDamagePerTick; public float tickRate = 1f; public DamageOverTimeType damageType; @@ -19,18 +18,20 @@ public class DamageOverTimeEffect : StatusEffect { base.ApplyEffect(user, targets); + finalTickValue = CalculateFinalDamage(user); + if (applyToTargetsHit) { foreach (Taggable target in targets) { BaseDamageOverTimeEffectInstance dotInstance = GetOrAddCorrectInstance(target); - dotInstance.owner.RPC((nameof(dotInstance.RPC_ApplyDamageOverTimeEffect)+damageType.ToString()), dotInstance.owner.Owner, StatusEffectIndexer.Instance.StatusEffects.IndexOf(this)); + dotInstance.owner.RPC((nameof(dotInstance.RPC_ApplyDamageOverTimeEffect)+damageType.ToString()), dotInstance.owner.Owner, StatusEffectIndexer.Instance.StatusEffects.IndexOf(this), finalTickValue); } } if (applyToSelf) { BaseDamageOverTimeEffectInstance dotInstance = GetOrAddCorrectInstance(user); - dotInstance.ApplyEffect(this); + dotInstance.ApplyEffect(this, finalTickValue); } } @@ -49,11 +50,20 @@ public class DamageOverTimeEffect : StatusEffect } } - private void GetFinalValue(CharacterStat stat) + private float CalculateFinalDamage(Taggable user) { - if (stat == null) - finalTickValue = damagePerTick; - else - finalTickValue = damagePerTick + stat.Value * percentStatInfluence; + float finalDamage = baseDamagePerTick; + CharacterStats stats = user.GetComponent(); + + foreach (var statInfluence in influencingStats) + { + if (stats.statsDictionary.TryGetValue(statInfluence.statTag.name.ToLower(), out CharacterStat stat)) + { + finalDamage += stat.Value * statInfluence.percentInfluence; + } + } + + return finalDamage; } + } \ No newline at end of file diff --git a/Assets/Scripts/AbilitySystem/Effects/InstantValueEffect.cs b/Assets/Scripts/AbilitySystem/Effects/InstantValueEffect.cs index 67b934b6..855d7782 100644 --- a/Assets/Scripts/AbilitySystem/Effects/InstantValueEffect.cs +++ b/Assets/Scripts/AbilitySystem/Effects/InstantValueEffect.cs @@ -8,7 +8,6 @@ using UnityEngine; public class InstantValueEffect : BaseEffect { public float baseValue; - public float percentStatInfluence; [Header("Optional Modifiers for damage / healing based on target")] public float AlliedTargetMultiplier = 1f; @@ -34,29 +33,39 @@ public class InstantValueEffect : BaseEffect private float GetCorrectValueSign(Taggable user, Taggable target) { stats = user.GetComponent(); - GetFinalValue(GetCorrectStat(stats)); + GetFinalValue(stats); return user.targetTag.AlliedTags.Contains(target.targetTag) ? (finalValue * AlliedTargetMultiplier) : (-finalValue * EnemyTargetMultiplier); } + /* private CharacterStat GetCorrectStat(CharacterStats stats) //TODO: make it use multiple stats correctly { for (int i = 0; i < influencingStats.Count; i++) { - if (stats.statsDictionary.ContainsKey(influencingStats[i].name.ToLower())) + if (stats.statsDictionary.ContainsKey(influencingStats[i].statTag.name.ToLower())) { - Debug.Log($"Influencing effect using: {influencingStats[i].name.ToLower()}"); - return stats.statsDictionary[influencingStats[i].name.ToLower()]; + Debug.Log($"Influencing effect using: {influencingStats[i].statTag.name.ToLower()}"); + return stats.statsDictionary[influencingStats[i].statTag.name.ToLower()]; } } return null; } + */ - private void GetFinalValue(CharacterStat stat) + private void GetFinalValue(CharacterStats stats) { - if (stat == null) - finalValue = baseValue; - else - finalValue = baseValue + stat.Value * percentStatInfluence; + finalValue = baseValue; + if (stats != null) + { + foreach (var statInfluence in influencingStats) + { + if (stats.statsDictionary.TryGetValue(statInfluence.statTag.name.ToLower(), out CharacterStat stat)) + { + finalValue += stat.Value * statInfluence.percentInfluence; + } + } + + } } } diff --git a/Assets/Scripts/AbilitySystem/Effects/PoisonEffectInstance.cs b/Assets/Scripts/AbilitySystem/Effects/PoisonEffectInstance.cs index a3049b1b..d7a20e6b 100644 --- a/Assets/Scripts/AbilitySystem/Effects/PoisonEffectInstance.cs +++ b/Assets/Scripts/AbilitySystem/Effects/PoisonEffectInstance.cs @@ -5,8 +5,8 @@ public class PoisonEffectInstance : BaseDamageOverTimeEffectInstance public override DamageOverTimeType DamageType => DamageOverTimeType.Poison; [PunRPC] - public void RPC_ApplyDamageOverTimeEffectPoison(int effectIndex) + public void RPC_ApplyDamageOverTimeEffectPoison(int effectIndex, float value) { - ApplyEffect(StatusEffectIndexer.Instance.StatusEffects[effectIndex]); + ApplyEffect(StatusEffectIndexer.Instance.StatusEffects[effectIndex], value); } } \ No newline at end of file diff --git a/Assets/Scripts/AbilitySystem/Effects/StatusEffectInstance.cs b/Assets/Scripts/AbilitySystem/Effects/StatusEffectInstance.cs index 2c154be3..22d97eb9 100644 --- a/Assets/Scripts/AbilitySystem/Effects/StatusEffectInstance.cs +++ b/Assets/Scripts/AbilitySystem/Effects/StatusEffectInstance.cs @@ -29,19 +29,19 @@ public class StatusEffectInstance : MonoBehaviour owner = GetComponentInParent(); } - public virtual void ApplyEffect(StatusEffect effect) + public virtual void ApplyEffect(StatusEffect effect, float value) { if (CanAddStack()) { - AddStack(effect); + AddStack(effect, value); } else if(CanRefresh()) { - RefreshEffect(effect); + RefreshEffect(effect, value); } } - protected virtual void AddStack(StatusEffect addedEffect) + protected virtual void AddStack(StatusEffect addedEffect, float value) { activeStacks.Add(addedEffect); OnEffectStackAdded(); @@ -67,7 +67,7 @@ public class StatusEffectInstance : MonoBehaviour return highestDuration; } - protected virtual void RefreshEffect(StatusEffect effect) + protected virtual void RefreshEffect(StatusEffect effect, float value) { }