Relintai/entity_spell_system
1
0
Fork 0
mirror of https://github.com/Relintai/entity_spell_system.git synced 2025-04-19 21:33:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up the talent-related functions in entity.

Browse Source
This commit is contained in:
Relintai 2019-09-17 14:06:41 +02:00
parent bd6d2cfde5
commit 5e68f551a3
2 changed files with 26 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
entities/entity.cpp
View File

@ -3250,76 +3250,26 @@ void Entity::setc_target(Node *p_target) {
//// TalentComponent ////
void Entity::csend_request_rank_increase(int talentID) {
//SEND_RPC();
void Entity::crequest_rank_increase(int talent_x, int talent_y) {
sreceive_talent_rank_increase_request(talent_x, talent_y);
}
void Entity::csend_request_rank_decrease(int talentID) {
void Entity::sreceive_talent_rank_increase_request(int talent_x, int talent_y) {
if (has_method("_sreceive_talent_rank_increase_request")) {
call("_sreceive_talent_rank_increase_request", talent_x, talent_y);
}
}
void Entity::ssend_rank(int talentID, int rank) {
void Entity::crequest_talent_reset() {
sreceive_reset_talent_request();
}
void Entity::sreceive_rank_increase(int talentID) {
void Entity::sreceive_reset_talent_request() {
if (has_method("_sreceive_reset_talent_request")) {
call("_sreceive_reset_talent_request");
}
}
void Entity::sreceive_rank_decrease(int talentID) {
}
void Entity::creceive_rank(int talentID, int rank) {
/*
PlayerTalent *playerTalent = CGetTalent(talentID, true);
if (owner->PlayerData->Character == null) {
return;
}
Talent *talent = Talents::Instance->GetData(talentID);
if (talent == null) {
return;
}
if (talent->MaxRank >= playerTalent->getRank()) {
PlayerTalent *expr_47 = playerTalent;
int rank2 = expr_47->getRank();
expr_47->setRank(rank2 + 1);
if (OnCTalenChangedAction != null) {
DELEGATE_INVOKE(OnCTalenChangedAction);
}
}*/
}
//PlayerTalent *Entity::sget_talent(int id, bool create) {
/*
for (int i = 0; i < sTalents->Count; i += 1) {
if (sTalents->GetData(i)->TalentID == id) {
return sTalents->GetData(i);
}
}
if (create) {
PlayerTalent *playerTalent = new PlayerTalent(id);
sTalents->Add(playerTalent);
return playerTalent;
}
return null;*/
// return NULL;
//}
//PlayerTalent *Entity::cget_talent(int id, bool create) {
/*
for (int i = 0; i < cTalents->Count; i += 1) {
if (cTalents->GetData(i)->TalentID == id) {
return cTalents->GetData(i);
}
}
if (create) {
PlayerTalent *playerTalent = new PlayerTalent(id);
cTalents->Add(playerTalent);
return playerTalent;
}
return null;*/
// return NULL;
//}
//// Bag ////
Ref<Bag> Entity::gets_bag() const {
@ -3695,6 +3645,9 @@ void Entity::_bind_methods() {
BIND_VMETHOD(MethodInfo("_son_xp_gained", PropertyInfo(Variant::INT, "value")));
BIND_VMETHOD(MethodInfo("_son_level_up", PropertyInfo(Variant::INT, "value")));
BIND_VMETHOD(MethodInfo("_sreceive_talent_rank_increase_request", PropertyInfo(Variant::INT, "talent_x"), PropertyInfo(Variant::INT, "talent_y")));
BIND_VMETHOD(MethodInfo("_sreceive_reset_talent_request"));
ClassDB::bind_method(D_METHOD("son_before_aura_applied", "data"), &Entity::son_before_aura_applied);
ClassDB::bind_method(D_METHOD("son_after_aura_applied", "data"), &Entity::son_after_aura_applied);
@ -3726,6 +3679,12 @@ void Entity::_bind_methods() {
ClassDB::bind_method(D_METHOD("son_xp_gained", "value"), &Entity::son_xp_gained);
ClassDB::bind_method(D_METHOD("son_level_up", "value"), &Entity::son_level_up);
ClassDB::bind_method(D_METHOD("crequest_rank_increase", "talent_x", "talent_y"), &Entity::crequest_rank_increase);
ClassDB::bind_method(D_METHOD("sreceive_talent_rank_increase_request", "talent_x", "talent_y"), &Entity::sreceive_talent_rank_increase_request);
ClassDB::bind_method(D_METHOD("crequest_talent_reset"), &Entity::crequest_talent_reset);
ClassDB::bind_method(D_METHOD("sreceive_reset_talent_request"), &Entity::sreceive_reset_talent_request);
//Clientside EventHandlers
BIND_VMETHOD(MethodInfo("_con_cast_failed", PropertyInfo(Variant::OBJECT, "info", PROPERTY_HINT_RESOURCE_TYPE, "SpellCastInfo")));
BIND_VMETHOD(MethodInfo("_con_cast_started", PropertyInfo(Variant::OBJECT, "info", PROPERTY_HINT_RESOURCE_TYPE, "SpellCastInfo")));

13
entities/entity.h
View File

@ -528,14 +528,11 @@ public:
//// Talents ////
void csend_request_rank_increase(int talentID);
void csend_request_rank_decrease(int talentID);
void ssend_rank(int talentID, int rank);
void sreceive_rank_increase(int talentID);
void sreceive_rank_decrease(int talentID);
void creceive_rank(int talentID, int rank);
//PlayerTalent *sget_talent(int id, bool create = false);
//PlayerTalent *cget_talent(int id, bool create = false);
void crequest_rank_increase(int talent_x, int talent_y);
void sreceive_talent_rank_increase_request(int talent_x, int talent_y);
void crequest_talent_reset();
void sreceive_reset_talent_request();
//// Inventory ////