Deukhoofd
/
PkmnLib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adds OnFaint script hook to Angelscript.
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Deukhoofd 2021-11-19 12:40:31 +01:00
parent 545e321018
commit 47e3919734
Signed by: Deukhoofd
GPG Key ID: F63E044490819F6F
4 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ScriptResolving/AngelScript/AngelScriptScript.cpp
View File

@ -332,3 +332,9 @@ CreatureLib::Battling::BattleScript* AngelScriptScript::Clone(const ArbUt::Optio
return new AngelScriptScript(owner, GetAngelscriptOwner()->GetType(), _resolver, _type, obj, _ctxPool);
}
void AngelScriptScript::OnFaint(CreatureLib::Battling::Creature* creature, CreatureLib::Battling::DamageSource source) {
CALL_HOOK(OnFaint, {
ctx->SetArgObject(0, (void*)creature);
ctx->SetArgWord(1, static_cast<asWORD>(source));
})
}

2
src/ScriptResolving/AngelScript/AngelScriptScript.hpp
View File

@ -134,6 +134,8 @@ public:
uint32_t* experienceGain) override;
void DoesShareExperience(CreatureLib::Battling::Creature* faintedMon, CreatureLib::Battling::Creature* winningMon,
bool* shareExperience) override;
void OnFaint(CreatureLib::Battling::Creature* creature, CreatureLib::Battling::DamageSource source) override;
};
#undef CALL_HOOK

1
src/ScriptResolving/AngelScript/AngelScriptTypeInfo.hpp
View File

@ -165,6 +165,7 @@ public:
SCRIPT_HOOK_FUNCTION(PreventOpponentSwitch, "void PreventOpponentSwitch(SwitchTurnChoice@ choice, bool& result)");
SCRIPT_HOOK_FUNCTION(OnEndTurn, "void OnEndTurn()");
SCRIPT_HOOK_FUNCTION(OnFaint, "void OnFaint(Pokemon@ pokemon, DamageSource damageSource)");
};
#undef SCRIPT_HOOK_FUNCTION

1
src/ScriptResolving/AngelScript/TypeRegistry/BasicScriptClass.cpp
View File

@ -51,6 +51,7 @@ shared abstract class PkmnScript {
void PreventOpponentRunAway(FleeTurnChoice@ choice, bool& result){};
void PreventOpponentSwitch(SwitchTurnChoice@ choice, bool& result){};
void OnEndTurn(){};
void OnFaint(Pokemon@ pokemon, DamageSource damageSource){};
// PkmnLib methods
void ModifyCriticalStage(ExecutingMove@ attack, Pokemon@ target, uint8 hit, uint8& critStage){};