mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-25 19:17:45 +00:00
Code Activity

move attack type enum to common.h

Browse source
This commit is contained in:
collett 2020-01-11 16:33:19 +09:00
parent 96a25c9a9e
commit b15864b541
4 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/common/Common.h
View file

@ -1020,6 +1020,14 @@ namespace Sapphire::Common
Gatherer Gatherer
}; };
enum class AttackType : int8_t
{
Physical = -1,
None = 0,
Magic = 5,
LimitBreak = 8,
};
using PlayerStateFlagList = std::vector< PlayerStateFlag >; using PlayerStateFlagList = std::vector< PlayerStateFlag >;
} }

10
src/common/CommonGen.h
View file

@ -30,16 +30,6 @@ enum class ActionCategory : uint8_t
AdrenalineRush = 15, AdrenalineRush = 15,
}; };
///////////////////////////////////////////////////////////
//AttackType.exd
enum class AttackType : int8_t
{
Physical = -1,
None = 0,
Magic = 5,
LimitBreak = 8,
};
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
//BaseParam.exd //BaseParam.exd
enum class BaseParam : uint8_t enum class BaseParam : uint8_t

1
src/tools/exd_common_gen/main.cpp
View file

@ -116,7 +116,6 @@ int main( int argc, char** argv )
result += "namespace Sapphire::Common {\n"; result += "namespace Sapphire::Common {\n";
result += generateEnum( "ActionCategory", 0, "uint8_t" ); result += generateEnum( "ActionCategory", 0, "uint8_t" );
result += generateEnum( "AttackType", 0, "int8_t" );
result += generateEnum( "BaseParam", 1, "uint8_t" ); result += generateEnum( "BaseParam", 1, "uint8_t" );
result += generateEnum( "BeastReputationRank", 1, "uint8_t" ); result += generateEnum( "BeastReputationRank", 1, "uint8_t" );
result += generateEnum( "BeastTribe", 11, "uint8_t" ); result += generateEnum( "BeastTribe", 11, "uint8_t" );

2
src/world/Math/CalcStats.cpp
View file

@ -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 ) 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; Sapphire::Common::ActionHitSeverityType hitType = Sapphire::Common::ActionHitSeverityType::NormalDamage;
if( criticalHitProbability( chara, Sapphire::World::Action::EffectCritDHBonusFilterDamage ) > range100( rng ) ) if( criticalHitProbability( chara, Sapphire::World::Action::EffectCritDHBonusFilterDamage ) > range100( rng ) )