From 07ddfe88f429f8c52be688487b07ff4ecb822434 Mon Sep 17 00:00:00 2001 From: collett Date: Mon, 15 Jun 2020 00:16:11 +0900 Subject: [PATCH] sam actions --- .../action/gnb/ActionBrutalShell16139.cpp | 4 +- src/scripts/action/sam/ActionEnpi7486.cpp | 59 +++++++++++++++++++ src/scripts/action/sam/ActionFuga7483.cpp | 32 ++++++++++ src/scripts/action/sam/ActionGekko7481.cpp | 43 ++++++++++++++ src/scripts/action/sam/ActionHagakure7495.cpp | 37 ++++++++++++ src/scripts/action/sam/ActionHakaze7477.cpp | 32 ++++++++++ .../action/sam/ActionIkishoten16482.cpp | 26 ++++++++ src/scripts/action/sam/ActionJinpu7478.cpp | 32 ++++++++++ src/scripts/action/sam/ActionKasha7482.cpp | 43 ++++++++++++++ src/scripts/action/sam/ActionMangetsu7484.cpp | 43 ++++++++++++++ src/scripts/action/sam/ActionOka7485.cpp | 43 ++++++++++++++ src/scripts/action/sam/ActionShifu7479.cpp | 32 ++++++++++ src/scripts/action/sam/ActionYukikaze7480.cpp | 43 ++++++++++++++ 13 files changed, 467 insertions(+), 2 deletions(-) create mode 100644 src/scripts/action/sam/ActionEnpi7486.cpp create mode 100644 src/scripts/action/sam/ActionFuga7483.cpp create mode 100644 src/scripts/action/sam/ActionGekko7481.cpp create mode 100644 src/scripts/action/sam/ActionHagakure7495.cpp create mode 100644 src/scripts/action/sam/ActionHakaze7477.cpp create mode 100644 src/scripts/action/sam/ActionIkishoten16482.cpp create mode 100644 src/scripts/action/sam/ActionJinpu7478.cpp create mode 100644 src/scripts/action/sam/ActionKasha7482.cpp create mode 100644 src/scripts/action/sam/ActionMangetsu7484.cpp create mode 100644 src/scripts/action/sam/ActionOka7485.cpp create mode 100644 src/scripts/action/sam/ActionShifu7479.cpp create mode 100644 src/scripts/action/sam/ActionYukikaze7480.cpp diff --git a/src/scripts/action/gnb/ActionBrutalShell16139.cpp b/src/scripts/action/gnb/ActionBrutalShell16139.cpp index a1a8d8af..eeb348bf 100644 --- a/src/scripts/action/gnb/ActionBrutalShell16139.cpp +++ b/src/scripts/action/gnb/ActionBrutalShell16139.cpp @@ -22,14 +22,14 @@ public: void onBeforeBuildEffect( Sapphire::World::Action::Action& action, uint8_t victimCounter, uint8_t validVictimCounter ) override { - if( validVictimCounter > 0 ) + if( validVictimCounter > 0 && action.isCorrectCombo() ) { auto chara = action.getSourceChara(); auto heal = action.calcHealing( 150 ); heal.first = Math::CalcStats::applyHealingReceiveMultiplier( *chara, heal.first ); action.getEffectbuilder()->heal( chara, chara, heal.first, heal.second ); - if( chara->getLevel() >= 52 ) + if( chara->getLevel() >= 52 && heal.first > 0 ) { World::Action::StatusEffectEntry effectEntry; effectEntry.effectType = static_cast< uint32_t >( Common::StatusEffectType::Shield ); diff --git a/src/scripts/action/sam/ActionEnpi7486.cpp b/src/scripts/action/sam/ActionEnpi7486.cpp new file mode 100644 index 00000000..67d57f81 --- /dev/null +++ b/src/scripts/action/sam/ActionEnpi7486.cpp @@ -0,0 +1,59 @@ +#include