From 2474881788bba8ceffef8dd93fa5c036365a64b7 Mon Sep 17 00:00:00 2001 From: GokuWeedLord Date: Sun, 10 Dec 2017 22:04:46 +1100 Subject: [PATCH] scripts build to their own libs now --- scripts/native/CMakeLists.txt | 4 +-- scripts/native/skill/AbilityScript3.cpp | 30 +++++++++---------- .../native/statuseffect/StatusEffect50.cpp | 10 +++---- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/scripts/native/CMakeLists.txt b/scripts/native/CMakeLists.txt index 6ee42ae3..3ce99db2 100644 --- a/scripts/native/CMakeLists.txt +++ b/scripts/native/CMakeLists.txt @@ -7,7 +7,7 @@ file(GLOB_RECURSE SCRIPT_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp") include_directories("../../src/servers/") include_directories("../../src/servers/Server_Zone/") -foreach(_sourcefile "${SCRIPT_FILES}") +foreach(_sourcefile ${SCRIPT_FILES}) get_filename_component(_file "${_sourcefile}" NAME_WE) add_library("${_file}" MODULE "${_sourcefile}" "${SCRIPT_INCLUDE_FILES}") @@ -22,4 +22,4 @@ foreach(_sourcefile "${SCRIPT_FILES}") LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_SOURCE_DIR}/../../bin/compiledscripts/" LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../../bin/compiledscripts/" ) -endforeach(_sourcefile "${SCRIPT_FILES}") \ No newline at end of file +endforeach(_sourcefile ${SCRIPT_FILES}) \ No newline at end of file diff --git a/scripts/native/skill/AbilityScript3.cpp b/scripts/native/skill/AbilityScript3.cpp index c6e4e987..a5fd30e9 100644 --- a/scripts/native/skill/AbilityScript3.cpp +++ b/scripts/native/skill/AbilityScript3.cpp @@ -1,15 +1,15 @@ -//#include "../ScriptObject.h" -// -//class ActionScript3 : public ActionScript -//{ -//public: -// ActionScript3() : ActionScript( "AbilityScript3", 3 ) -// {} -// -// virtual void onCastFinish( Core::Entity::Player player, Core::Entity::ActorPtr targetActor ) -// { -// player.addStatusEffectByIdIfNotExist( 50, 20000, player, 30 ); -// } -//}; -// -//EXPORT_ACTIONSCRIPT( ActionScript3 ) \ No newline at end of file +#include "../ScriptObject.h" + +class ActionScript3 : public ActionScript +{ +public: + ActionScript3() : ActionScript( "ActionScript3", 3 ) + {} + + virtual void onCastFinish( Core::Entity::Player player, Core::Entity::ActorPtr targetActor ) + { + player.addStatusEffectByIdIfNotExist( 50, 20000, player, 30 ); + } +}; + +EXPORT_ACTIONSCRIPT( ActionScript3 ) \ No newline at end of file diff --git a/scripts/native/statuseffect/StatusEffect50.cpp b/scripts/native/statuseffect/StatusEffect50.cpp index 478142d0..1b47a6aa 100644 --- a/scripts/native/statuseffect/StatusEffect50.cpp +++ b/scripts/native/statuseffect/StatusEffect50.cpp @@ -6,11 +6,11 @@ public: StatusEffect50() : StatusEffectScript( "StatusEffect50", 50 ) {} -// virtual void onTick( Core::Entity::ActorPtr actor ) -// { -// if( actor->isPlayer() ) -// actor->getAsPlayer()->sendDebug( "tick tock bitch" ); -// } + virtual void onTick( Core::Entity::ActorPtr actor ) + { + if( actor->isPlayer() ) + actor->getAsPlayer()->sendDebug( "tick tock bitch" ); + } }; EXPORT_STATUSEFFECTSCRIPT( StatusEffect50 ) \ No newline at end of file