From b05462aee85b43b07ecd0476a3cd554e2a2a49fe Mon Sep 17 00:00:00 2001 From: NotAdam Date: Sun, 7 Apr 2019 16:16:52 +1000 Subject: [PATCH] kill mobs instead of just restoring their hp --- src/scripts/CMakeLists.txt | 2 +- src/scripts/action/darkknight/ActionHardSlash3617.cpp | 2 +- src/scripts/action/darkknight/ActionUnleash3621.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/scripts/CMakeLists.txt b/src/scripts/CMakeLists.txt index ca247060..c049a97f 100644 --- a/src/scripts/CMakeLists.txt +++ b/src/scripts/CMakeLists.txt @@ -45,7 +45,7 @@ foreach(_scriptDir ${children}) MODULE ${SCRIPT_BUILD_FILES} "${SCRIPT_INCLUDE_FILES}" - "${_scriptDir}/ScriptLoader.cpp" action/darkknight/ActionUnleash3621.cpp action/darkknight/ActionUnleash3621.h) + "${_scriptDir}/ScriptLoader.cpp" ) target_link_libraries( "script_${_name}" world ) diff --git a/src/scripts/action/darkknight/ActionHardSlash3617.cpp b/src/scripts/action/darkknight/ActionHardSlash3617.cpp index 77775263..bd39b3ea 100644 --- a/src/scripts/action/darkknight/ActionHardSlash3617.cpp +++ b/src/scripts/action/darkknight/ActionHardSlash3617.cpp @@ -16,7 +16,7 @@ public: { for( auto& chara : action.getHitActors() ) { - chara->setHp( chara->getHp() - chara->getMaxHp() * 0.34f ); + chara->takeDamage( chara->getMaxHp() * 0.34f ); } } diff --git a/src/scripts/action/darkknight/ActionUnleash3621.cpp b/src/scripts/action/darkknight/ActionUnleash3621.cpp index b5004f66..dd06d42e 100644 --- a/src/scripts/action/darkknight/ActionUnleash3621.cpp +++ b/src/scripts/action/darkknight/ActionUnleash3621.cpp @@ -16,7 +16,7 @@ public: { for( auto& chara : action.getHitActors() ) { - chara->setHp( chara->getHp() - chara->getMaxHp() * 0.34f ); + chara->takeDamage( chara->getMaxHp() * 0.34f ); } } };