From ed4104c83e08aca387838cad63fc8795b4b37eda Mon Sep 17 00:00:00 2001 From: Lucy <44952533+Skyliegirl33@users.noreply.github.com> Date: Mon, 6 Mar 2023 23:11:50 +0100 Subject: [PATCH] Add more modifiers --- src/common/Common.h | 40 ++++++++++++++++++------------ src/world/Action/ActionLutData.cpp | 8 ++++++ 2 files changed, 32 insertions(+), 16 deletions(-) diff --git a/src/common/Common.h b/src/common/Common.h index 72e14d21..f1790f5b 100644 --- a/src/common/Common.h +++ b/src/common/Common.h @@ -887,22 +887,30 @@ namespace Sapphire::Common Perception = 73, // Unique modifiers - HPPercent = 1000, - MPPercent = 1001, - TPPercent = 1002, - GPPercent = 1003, - CPPercent = 1004, - PhysicalDamagePercent = 1005, - MagicDamagePercent = 1006, - AttackPowerPercent = 1007, - DefensePercent = 1008, - AccuracyPercent = 1009, - EvasionPercent = 1010, - MagicDefensePercent = 1011, - CriticalHitPowerPercent = 1012, - CriticalHitResiliencePercent = 1013, - CriticalHitPercent = 1014, - EnmityPercent = 1015 + TickHeal = 1000, + TickDamage = 1001, + StrengthPercent = 1002, + DexterityPercent = 1003, + VitalityPercent = 1004, + IntelligencePercent = 1005, + MindPercent = 1006, + PietyPercent = 1007, + HPPercent = 1008, + MPPercent = 1009, + TPPercent = 1010, + GPPercent = 1011, + CPPercent = 1012, + PhysicalDamagePercent = 1013, + MagicDamagePercent = 1014, + AttackPowerPercent = 1015, + DefensePercent = 1016, + AccuracyPercent = 1017, + EvasionPercent = 1018, + MagicDefensePercent = 1019, + CriticalHitPowerPercent = 1020, + CriticalHitResiliencePercent = 1021, + CriticalHitPercent = 1022, + EnmityPercent = 1023 }; enum struct ActionAspect : uint8_t diff --git a/src/world/Action/ActionLutData.cpp b/src/world/Action/ActionLutData.cpp index 99ee9b73..9e4c7bcd 100644 --- a/src/world/Action/ActionLutData.cpp +++ b/src/world/Action/ActionLutData.cpp @@ -85,6 +85,14 @@ std::unordered_map< std::string, Common::ParamModifier > ActionLutData::m_modifi { "Control", Common::ParamModifier::Control }, { "Gathering", Common::ParamModifier::Gathering }, { "Perception", Common::ParamModifier::Perception }, + { "TickHeal", Common::ParamModifier::TickHeal }, + { "TickDamage", Common::ParamModifier::TickDamage }, + { "StrengthPercent", Common::ParamModifier::StrengthPercent }, + { "DexterityPercent", Common::ParamModifier::DexterityPercent }, + { "VitalityPercent", Common::ParamModifier::VitalityPercent }, + { "IntelligencePercent", Common::ParamModifier::IntelligencePercent }, + { "MindPercent", Common::ParamModifier::MindPercent }, + { "PietyPercent", Common::ParamModifier::PietyPercent }, { "HPPercent", Common::ParamModifier::HPPercent }, { "MPPercent", Common::ParamModifier::MPPercent }, { "TPPercent", Common::ParamModifier::TPPercent },