diff --git a/src/scripts/action/sam/ActionEnpi7486.cpp b/src/scripts/action/sam/ActionEnpi7486.cpp index 67d57f81..3a5c18a5 100644 --- a/src/scripts/action/sam/ActionEnpi7486.cpp +++ b/src/scripts/action/sam/ActionEnpi7486.cpp @@ -29,7 +29,7 @@ public: { kenki += 5; } - if( pPlayer->getLevel() >= 62 ) + if( level >= 62 ) { kenki += 5; } diff --git a/src/scripts/action/sam/ActionGekko7481.cpp b/src/scripts/action/sam/ActionGekko7481.cpp index bd9292f3..a5a4bbf6 100644 --- a/src/scripts/action/sam/ActionGekko7481.cpp +++ b/src/scripts/action/sam/ActionGekko7481.cpp @@ -27,7 +27,7 @@ public: { kenki += 5; } - if( pPlayer->getLevel() >= 62 ) + if( level >= 62 ) { kenki += 5; } diff --git a/src/scripts/action/sam/ActionHagakure7495.cpp b/src/scripts/action/sam/ActionHagakure7495.cpp index 1488518a..e9bdcab6 100644 --- a/src/scripts/action/sam/ActionHagakure7495.cpp +++ b/src/scripts/action/sam/ActionHagakure7495.cpp @@ -15,22 +15,18 @@ public: { } - void onExecute( Sapphire::World::Action::Action& action ) override + void onStart( Sapphire::World::Action::Action& action ) override { auto pPlayer = action.getSourceChara()->getAsPlayer(); assert( pPlayer ); - if( pPlayer->gaugeSamHasAnySen() ) - { - int kenki = pPlayer->gaugeSamGetKenki(); - if( pPlayer->gaugeSamGetSen( Common::SamSen::Getsu ) ) - kenki += 10; - if( pPlayer->gaugeSamGetSen( Common::SamSen::Setsu ) ) - kenki += 10; - if( pPlayer->gaugeSamGetSen( Common::SamSen::Ka ) ) - kenki += 10; - pPlayer->gaugeSamSetKenki( std::min( 100, kenki ) ); - pPlayer->gaugeSamSetSen( Common::SamSen::None ); - } + int kenki = pPlayer->gaugeSamGetKenki(); + if( pPlayer->gaugeSamGetSen( Common::SamSen::Getsu ) ) + kenki += 10; + if( pPlayer->gaugeSamGetSen( Common::SamSen::Setsu ) ) + kenki += 10; + if( pPlayer->gaugeSamGetSen( Common::SamSen::Ka ) ) + kenki += 10; + pPlayer->gaugeSamSetKenki( std::min( 100, kenki ) ); } }; diff --git a/src/scripts/action/sam/ActionKasha7482.cpp b/src/scripts/action/sam/ActionKasha7482.cpp index 18d705cf..4058f10b 100644 --- a/src/scripts/action/sam/ActionKasha7482.cpp +++ b/src/scripts/action/sam/ActionKasha7482.cpp @@ -27,7 +27,7 @@ public: { kenki += 5; } - if( pPlayer->getLevel() >= 62 ) + if( level >= 62 ) { kenki += 5; } diff --git a/src/scripts/action/sam/ActionMangetsu7484.cpp b/src/scripts/action/sam/ActionMangetsu7484.cpp index 1bfa647a..16d34a87 100644 --- a/src/scripts/action/sam/ActionMangetsu7484.cpp +++ b/src/scripts/action/sam/ActionMangetsu7484.cpp @@ -27,7 +27,7 @@ public: { kenki += 5; } - if( pPlayer->getLevel() >= 62 ) + if( level >= 62 ) { kenki += 5; } diff --git a/src/scripts/action/sam/ActionOka7485.cpp b/src/scripts/action/sam/ActionOka7485.cpp index 0ac21f64..cccb4391 100644 --- a/src/scripts/action/sam/ActionOka7485.cpp +++ b/src/scripts/action/sam/ActionOka7485.cpp @@ -27,7 +27,7 @@ public: { kenki += 5; } - if( pPlayer->getLevel() >= 62 ) + if( level >= 62 ) { kenki += 5; } diff --git a/src/scripts/action/sam/ActionYukikaze7480.cpp b/src/scripts/action/sam/ActionYukikaze7480.cpp index 903996d8..1c5807af 100644 --- a/src/scripts/action/sam/ActionYukikaze7480.cpp +++ b/src/scripts/action/sam/ActionYukikaze7480.cpp @@ -27,7 +27,7 @@ public: { kenki += 10; } - if( pPlayer->getLevel() >= 62 ) + if( level >= 62 ) { kenki += 5; }