mmo-ref/cyphesis
1
0
Fork 0
mirror of https://github.com/worldforge/cyphesis synced 2026-08-13 12:26:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

Added "get_entity" filter function.

Browse source 
Used to resolve entities from soft properties which refer to entities.
This is then used to check that a tool is wielded before use.
This commit is contained in:
Erik Ogenvik 2018-08-17 21:27:04 +02:00
parent 048e68d7ac
commit 9f85a22e3b
20 changed files with 335 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

12
rulesets/python/CyPy_MemMap.cpp
View file

@ -22,6 +22,8 @@
#include "CyPy_EntityFilter.h"
#include <Atlas/Objects/objectFactory.h>
#include <rulesets/entityfilter/Providers.h>
#include <rulesets/BaseWorld.h>
using Atlas::Objects::Root;
@ -213,7 +215,10 @@ Py::Object CyPy_MemMap::find_by_filter(const Py::Tuple& args)
Py::List list;
for (auto& entry : m_value->getEntities()) {
if (filter->match(*entry.second)) {
EntityFilter::QueryContext queryContext{*entry.second};
queryContext.entity_lookup_fn = [&](const std::string& id) { return m_value->get(id);};
if (filter->match(queryContext)) {
list.append(CyPy_MemEntity::wrap(entry.second.get()));
}
}
@ -239,7 +244,10 @@ Py::Object CyPy_MemMap::find_by_location_query(const Py::Tuple& args)
Py::List list;
if (location.m_loc && location.m_loc->m_contains) {
for (const auto& entry : *location.m_loc->m_contains) {
if (entry->isVisible() && filter->match(*entry)) {
EntityFilter::QueryContext queryContext{*entry};
queryContext.entity_lookup_fn = [&](const std::string& id) { return m_value->get(id);};
if (entry->isVisible() && filter->match(queryContext)) {
if (squareDistance(location.pos(), entry->m_location.pos()) < square_range) {
list.append(CyPy_LocatedEntity::wrap(entry));
}