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

fix action parser not writing combo potency and offsetting all values

Browse source
This commit is contained in:
NotAdam 2019-07-26 00:21:47 +10:00
parent 7d56237e33
commit 2581840921
3 changed files with 707 additions and 704 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/tools/action_parse/main.cpp
View file

@ -249,9 +249,11 @@ int main()
// action.first, data.name, data.potency, data.flankPotency, data.frontPotency, data.rearPotency, // action.first, data.name, data.potency, data.flankPotency, data.frontPotency, data.rearPotency,
// data.curePotency, data.restorePercentage ); // data.curePotency, data.restorePercentage );
auto out = fmt::format( " // {}\n {{ {}, {{ {}, {}, {}, {}, {} }} }},\n", auto out = fmt::format( " // {}\n {{ {}, {{ {}, {}, {}, {}, {}, {} }} }},\n",
data.name, action.first, data.name, action.first,
data.potency, data.flankPotency, data.frontPotency, data.rearPotency, data.curePotency ); data.potency, data.comboPotency,
data.flankPotency, data.frontPotency, data.rearPotency,
data.curePotency );
output += out; output += out;
// Logger::info( out ); // Logger::info( out );

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

@ -371,14 +371,15 @@ void Action::Action::buildEffects()
// no script exists but we have a valid lut entry // no script exists but we have a valid lut entry
if( auto player = getSourceChara()->getAsPlayer() ) if( auto player = getSourceChara()->getAsPlayer() )
{ {
player->sendDebug( "Hit target: pot: {} (f: {}, r: {}), heal pot: {}", player->sendDebug( "Hit target: pot: {} (c: {}, f: {}, r: {}), heal pot: {}",
lutEntry.potency, lutEntry.flankPotency, lutEntry.rearPotency, lutEntry.curePotency ); lutEntry.potency, lutEntry.comboPotency, lutEntry.flankPotency, lutEntry.rearPotency,
lutEntry.curePotency );
} }
for( auto& actor : m_hitActors ) for( auto& actor : m_hitActors )
{ {
// todo: this is shit // todo: this is shit
if( actor->getObjKind() == m_pSource->getObjKind() && lutEntry.curePotency > 0 ) if( lutEntry.curePotency > 0 )
m_effectBuilder->healTarget( actor, lutEntry.curePotency ); m_effectBuilder->healTarget( actor, lutEntry.curePotency );
else if( lutEntry.potency > 0 ) else if( lutEntry.potency > 0 )

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

File diff suppressed because it is too large Load diff