From 995bce495dd626de7caa2bb82c96cc328ddb9476 Mon Sep 17 00:00:00 2001 From: Lucy <44952533+Skyliegirl33@users.noreply.github.com> Date: Wed, 8 Mar 2023 18:10:15 +0100 Subject: [PATCH] Add even more modifiers --- data/actions/player.json | 31 ++++++++++++++++++++++++++++-- src/common/Common.h | 9 ++++++++- src/world/Action/ActionLutData.cpp | 9 ++++++++- 3 files changed, 45 insertions(+), 4 deletions(-) diff --git a/data/actions/player.json b/data/actions/player.json index 4764e4b8..51d6c81b 100644 --- a/data/actions/player.json +++ b/data/actions/player.json @@ -506,7 +506,7 @@ "duration": 24000, "modifiers": [ { - "modifier": "AttackPowerPercent", + "modifier": "DamageDealtPercent", "value": 20 } ] @@ -698,7 +698,34 @@ "restorePercentage": 0, "nextCombo": [], "statuses": { - "caster": [], + "caster": [ + { + "id": 91, + "duration": 0, + "modifiers": [ + { + "modifier": "HPPercent", + "value": 25 + }, + { + "modifier": "DamageDealtPercent", + "value": -25 + }, + { + "modifier": "HealingRecoveryPercent", + "value": 20 + }, + { + "modifier": "AccuracyPercent", + "value": 5 + }, + { + "modifier": "EnmityPercent", + "value": 20 + } + ] + } + ], "target": [] } }, diff --git a/src/common/Common.h b/src/common/Common.h index f1790f5b..09b8a0fe 100644 --- a/src/common/Common.h +++ b/src/common/Common.h @@ -910,7 +910,14 @@ namespace Sapphire::Common CriticalHitPowerPercent = 1020, CriticalHitResiliencePercent = 1021, CriticalHitPercent = 1022, - EnmityPercent = 1023 + EnmityPercent = 1023, + DamageDealtPercent = 1024, + DamageTakenPercent = 1025, + HealingMagicRecoveryPercent = 1026, + SlashingResistancePercent = 1027, + PiercingResistancePercent = 1028, + BluntResistancePercent = 1029, + ProjectileResistancePercent = 1030 }; enum struct ActionAspect : uint8_t diff --git a/src/world/Action/ActionLutData.cpp b/src/world/Action/ActionLutData.cpp index 9e4c7bcd..4a86ebfb 100644 --- a/src/world/Action/ActionLutData.cpp +++ b/src/world/Action/ActionLutData.cpp @@ -108,7 +108,14 @@ std::unordered_map< std::string, Common::ParamModifier > ActionLutData::m_modifi { "CriticalHitPowerPercent", Common::ParamModifier::CriticalHitPowerPercent }, { "CriticalHitResiliencePercent", Common::ParamModifier::CriticalHitResiliencePercent }, { "CriticalHitPercent", Common::ParamModifier::CriticalHitPercent }, - { "EnmityPercent", Common::ParamModifier::EnmityPercent } + { "EnmityPercent", Common::ParamModifier::EnmityPercent }, + { "DamageDealtPercent", Common::ParamModifier::DamageDealtPercent }, + { "DamageTakenPercent", Common::ParamModifier::DamageTakenPercent }, + { "HealingMagicRecoveryPercent", Common::ParamModifier::HealingMagicRecoveryPercent }, + { "SlashingResistancePercent", Common::ParamModifier::SlashingResistancePercent }, + { "PiercingResistancePercent", Common::ParamModifier::PiercingResistancePercent }, + { "BluntResistancePercent", Common::ParamModifier::BluntResistancePercent }, + { "ProjectileResistancePercent", Common::ParamModifier::ProjectileResistancePercent }, }; bool ActionLutData::cacheActions()