mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-28 20:27:46 +00:00
Code Activity

remove gain job resource

Browse source
This commit is contained in:
collett 2020-01-10 20:33:50 +09:00
parent a6daa4ea8e
commit b391bc4aad
4 changed files with 740 additions and 725 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/world/Action/Action.cpp
View file

@ -441,12 +441,12 @@ void Action::Action::buildEffects()
// we have a valid lut entry // we have a valid lut entry
if( auto player = getSourceChara()->getAsPlayer() ) if( auto player = getSourceChara()->getAsPlayer() )
{ {
player->sendDebug( "type: {}, dpot: {} (dcpot: {}, ddpot: {}), hpot: {}, shpot: {}, ss: {}, ts: {}, gmp: {}, gjob: {}", player->sendDebug( "type: {}, dpot: {} (dcpot: {}, ddpot: {}), hpot: {}, shpot: {}, ss: {}, ts: {}, gmp: {}",
m_actionData->attackType, m_actionData->attackType,
m_lutEntry.damagePotency, m_lutEntry.damageComboPotency, m_lutEntry.damageDirectionalPotency, m_lutEntry.damagePotency, m_lutEntry.damageComboPotency, m_lutEntry.damageDirectionalPotency,
m_lutEntry.healPotency, m_lutEntry.selfHealPotency, m_lutEntry.healPotency, m_lutEntry.selfHealPotency,
m_lutEntry.selfStatus, m_lutEntry.targetStatus, m_lutEntry.selfStatus, m_lutEntry.targetStatus,
m_lutEntry.gainMPPercentage, m_lutEntry.gainJobResource ); m_lutEntry.gainMPPercentage );
} }
// when aoe, these effects are in the target whatever is hit first // when aoe, these effects are in the target whatever is hit first
@ -789,7 +789,7 @@ Sapphire::Entity::CharaPtr Action::Action::getHitChara()
bool Action::Action::hasValidLutEntry() const bool Action::Action::hasValidLutEntry() const
{ {
return m_lutEntry.damagePotency != 0 || m_lutEntry.healPotency != 0 || m_lutEntry.selfHealPotency != 0 || m_lutEntry.selfStatus != 0 || return m_lutEntry.damagePotency != 0 || m_lutEntry.healPotency != 0 || m_lutEntry.selfHealPotency != 0 || m_lutEntry.selfStatus != 0 ||
m_lutEntry.targetStatus != 0 || m_lutEntry.gainMPPercentage != 0 || m_lutEntry.gainJobResource != 0; m_lutEntry.targetStatus != 0 || m_lutEntry.gainMPPercentage != 0;
} }
Action::EffectBuilderPtr Action::Action::getEffectbuilder() Action::EffectBuilderPtr Action::Action::getEffectbuilder()

2
src/world/Action/ActionLut.cpp
View file

@ -14,7 +14,7 @@ bool ActionLut::validEntryExists( uint16_t actionId )
// if all of these fields are 0, it's not 'valid' due to parse error or no useful data // if all of these fields are 0, it's not 'valid' due to parse error or no useful data
return entry.damagePotency != 0 || entry.healPotency != 0 || entry.selfHealPotency != 0 || entry.selfStatus != 0 || return entry.damagePotency != 0 || entry.healPotency != 0 || entry.selfHealPotency != 0 || entry.selfStatus != 0 ||
entry.targetStatus != 0 || entry.gainMPPercentage != 0 || entry.gainJobResource != 0; entry.targetStatus != 0 || entry.gainMPPercentage != 0;
} }
const ActionEntry& ActionLut::getEntry( uint16_t actionId ) const ActionEntry& ActionLut::getEntry( uint16_t actionId )

1
src/world/Action/ActionLut.h
View file

@ -19,7 +19,6 @@ namespace Sapphire::World::Action
uint32_t targetStatusDuration; uint32_t targetStatusDuration;
uint16_t targetStatusParam; uint16_t targetStatusParam;
uint16_t gainMPPercentage; uint16_t gainMPPercentage;
uint16_t gainJobResource;
}; };
const uint32_t EffectTypeInvalid = 0; const uint32_t EffectTypeInvalid = 0;

1456
src/world/Action/ActionLutData.cpp
View file

File diff suppressed because it is too large Load diff