Relintai/entity_spell_system
1
0
Fork 0
mirror of https://github.com/Relintai/entity_spell_system.git synced 2025-02-20 17:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix relation in return statements. Added vendor interact range check to the serverside vendor methods. Did not add it for spell learning, that will have to be reworked.

Browse Source
This commit is contained in:
Relintai 2021-08-05 22:57:51 +02:00
parent 6490663c97
commit 0f709b5455
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
entities/entity.cpp
View File

@ -2906,7 +2906,7 @@ bool Entity::_iss_target_in_interact_range() {
return false;
}
return (b2d->get_transform().get_origin() - tb->get_transform().get_origin()).length_squared() > EntityEnums::ENTITY_INTERACT_RANGE_SQUARED;
return (b2d->get_transform().get_origin() - tb->get_transform().get_origin()).length_squared() <= EntityEnums::ENTITY_INTERACT_RANGE_SQUARED;
}
Spatial *b3d = get_body_3d();
@ -2918,7 +2918,7 @@ bool Entity::_iss_target_in_interact_range() {
return false;
}
return (b3d->get_transform().get_origin() - tb->get_transform().get_origin()).length_squared() > EntityEnums::ENTITY_INTERACT_RANGE_SQUARED;
return (b3d->get_transform().get_origin() - tb->get_transform().get_origin()).length_squared() <= EntityEnums::ENTITY_INTERACT_RANGE_SQUARED;
}
return false;
@ -2939,7 +2939,7 @@ bool Entity::_isc_target_in_interact_range() {
return false;
}
return (b2d->get_transform().get_origin() - tb->get_transform().get_origin()).length_squared() > EntityEnums::ENTITY_INTERACT_RANGE_SQUARED;
return (b2d->get_transform().get_origin() - tb->get_transform().get_origin()).length_squared() <= EntityEnums::ENTITY_INTERACT_RANGE_SQUARED;
}
Spatial *b3d = get_body_3d();
@ -2951,7 +2951,7 @@ bool Entity::_isc_target_in_interact_range() {
return false;
}
return (b3d->get_transform().get_origin() - tb->get_transform().get_origin()).length_squared() > EntityEnums::ENTITY_INTERACT_RANGE_SQUARED;
return (b3d->get_transform().get_origin() - tb->get_transform().get_origin()).length_squared() <= EntityEnums::ENTITY_INTERACT_RANGE_SQUARED;
}
return false;
@ -6436,6 +6436,10 @@ void Entity::_vendor_item_sbuy(const int index, const int count) {
if (!e)
return;
if (!iss_target_in_interact_range()) {
return;
}
Ref<EntityData> ed = e->gets_entity_data();
if (!ed.is_valid())
@ -6493,6 +6497,10 @@ void Entity::_vendor_item_ssell(const int slot_id) {
if (!e)
return;
if (!iss_target_in_interact_range()) {
return;
}
Ref<EntityData> ed = e->gets_entity_data();
if (!ed.is_valid())