diff --git a/src/common/Common.h b/src/common/Common.h index 3777085c..bffcd7f2 100644 --- a/src/common/Common.h +++ b/src/common/Common.h @@ -1020,6 +1020,14 @@ namespace Sapphire::Common Gatherer }; + enum class AttackType : int8_t + { + Physical = -1, + None = 0, + Magic = 5, + LimitBreak = 8, + }; + using PlayerStateFlagList = std::vector< PlayerStateFlag >; } diff --git a/src/common/CommonGen.h b/src/common/CommonGen.h index f1bd0c01..4833e57a 100644 --- a/src/common/CommonGen.h +++ b/src/common/CommonGen.h @@ -30,16 +30,6 @@ enum class ActionCategory : uint8_t AdrenalineRush = 15, }; -/////////////////////////////////////////////////////////// -//AttackType.exd -enum class AttackType : int8_t -{ - Physical = -1, - None = 0, - Magic = 5, - LimitBreak = 8, -}; - /////////////////////////////////////////////////////////// //BaseParam.exd enum class BaseParam : uint8_t diff --git a/src/tools/exd_common_gen/main.cpp b/src/tools/exd_common_gen/main.cpp index ea044d14..768b53c4 100644 --- a/src/tools/exd_common_gen/main.cpp +++ b/src/tools/exd_common_gen/main.cpp @@ -116,7 +116,6 @@ int main( int argc, char** argv ) result += "namespace Sapphire::Common {\n"; result += generateEnum( "ActionCategory", 0, "uint8_t" ); - result += generateEnum( "AttackType", 0, "int8_t" ); result += generateEnum( "BaseParam", 1, "uint8_t" ); result += generateEnum( "BeastReputationRank", 1, "uint8_t" ); result += generateEnum( "BeastTribe", 11, "uint8_t" ); diff --git a/src/world/Math/CalcStats.cpp b/src/world/Math/CalcStats.cpp index 5b00b9a3..b015edc7 100644 --- a/src/world/Math/CalcStats.cpp +++ b/src/world/Math/CalcStats.cpp @@ -607,7 +607,7 @@ float CalcStats::calcHealBaseOnPotency( const Sapphire::Entity::Chara& chara, ui std::pair< float, Sapphire::Common::ActionHitSeverityType > CalcStats::calcActionDamage( const Sapphire::Entity::Chara& chara, const Sapphire::World::Action::Action& action, uint32_t ptc, float wepDmg ) { - auto factor =calcDamageBaseOnPotency( chara, ptc, wepDmg ); + auto factor = calcDamageBaseOnPotency( chara, ptc, wepDmg ); Sapphire::Common::ActionHitSeverityType hitType = Sapphire::Common::ActionHitSeverityType::NormalDamage; if( criticalHitProbability( chara, Sapphire::World::Action::EffectCritDHBonusFilterDamage ) > range100( rng ) )