botaccount
/
limboai
mirror of https://github.com/limbonaut/limboai.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BTRepeat: Add `forever` property 

This property makes BTRepeat iterate child indefinitely.
This commit is contained in:
Serhii Snitsaruk 2023-08-06 12:45:19 +02:00
parent 737bc6b1a2
commit 458ad5280e
2 changed files with 47 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
bt/decorators/bt_repeat.cpp
View File

@ -12,9 +12,18 @@
#include "bt_repeat.h" #include "bt_repeat.h"
#include "core/object/object.h" #include "core/object/object.h"
#include "core/string/ustring.h"
#include "core/variant/variant.h" #include "core/variant/variant.h"
static String repeat_forever_str;
String BTRepeat::_generate_name() const { String BTRepeat::_generate_name() const {
if (forever) {
if (repeat_forever_str.is_empty()) {
repeat_forever_str.parse_utf8("Repeat ∞");
}
return repeat_forever_str;
}
return vformat("Repeat x%s", times); return vformat("Repeat x%s", times);
} }
@ -25,7 +34,7 @@ void BTRepeat::_enter() {
int BTRepeat::_tick(double p_delta) { int BTRepeat::_tick(double p_delta) {
ERR_FAIL_COND_V_MSG(get_child_count() == 0, FAILURE, "BT decorator has no child."); ERR_FAIL_COND_V_MSG(get_child_count() == 0, FAILURE, "BT decorator has no child.");
int status = get_child(0)->execute(p_delta); int status = get_child(0)->execute(p_delta);
if (status == RUNNING) { if (status == RUNNING || forever) {
return RUNNING; return RUNNING;
} else if (status == FAILURE && abort_on_failure) { } else if (status == FAILURE && abort_on_failure) {
return FAILURE; return FAILURE;
@ -37,12 +46,38 @@ int BTRepeat::_tick(double p_delta) {
} }
} }
void BTRepeat::set_forever(bool p_forever) {
forever = p_forever;
notify_property_list_changed();
emit_changed();
}
void BTRepeat::set_times(int p_value) {
times = p_value;
emit_changed();
}
void BTRepeat::set_abort_on_failure(bool p_value) {
abort_on_failure = p_value;
emit_changed();
}
void BTRepeat::_get_property_list(List<PropertyInfo> *p_list) const {
if (!forever) {
p_list->push_back(PropertyInfo(Variant::INT, "times", PROPERTY_HINT_RANGE, "1,65535"));
p_list->push_back(PropertyInfo(Variant::BOOL, "abort_on_failure"));
}
}
void BTRepeat::_bind_methods() { void BTRepeat::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_forever", "p_value"), &BTRepeat::set_forever);
ClassDB::bind_method(D_METHOD("get_forever"), &BTRepeat::get_forever);
ClassDB::bind_method(D_METHOD("set_times", "p_value"), &BTRepeat::set_times); ClassDB::bind_method(D_METHOD("set_times", "p_value"), &BTRepeat::set_times);
ClassDB::bind_method(D_METHOD("get_times"), &BTRepeat::get_times); ClassDB::bind_method(D_METHOD("get_times"), &BTRepeat::get_times);
ClassDB::bind_method(D_METHOD("set_abort_on_failure", "p_value"), &BTRepeat::set_abort_on_failure); ClassDB::bind_method(D_METHOD("set_abort_on_failure", "p_value"), &BTRepeat::set_abort_on_failure);
ClassDB::bind_method(D_METHOD("get_abort_on_failure"), &BTRepeat::get_abort_on_failure); ClassDB::bind_method(D_METHOD("get_abort_on_failure"), &BTRepeat::get_abort_on_failure);
ADD_PROPERTY(PropertyInfo(Variant::INT, "times", PROPERTY_HINT_RANGE, "1,65535"), "set_times", "get_times"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "forever"), "set_forever", "get_forever");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "abort_on_failure"), "set_abort_on_failure", "get_abort_on_failure"); ADD_PROPERTY(PropertyInfo(Variant::INT, "times", PROPERTY_HINT_RANGE, "1,65535", PROPERTY_USAGE_NONE), "set_times", "get_times");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "abort_on_failure", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE), "set_abort_on_failure", "get_abort_on_failure");
} }

17
bt/decorators/bt_repeat.h
View File

@ -20,6 +20,7 @@ class BTRepeat : public BTDecorator {
GDCLASS(BTRepeat, BTDecorator); GDCLASS(BTRepeat, BTDecorator);
private: private:
bool forever = false;
int times = 1; int times = 1;
bool abort_on_failure = false; bool abort_on_failure = false;
int cur_iteration = 0; int cur_iteration = 0;
@ -27,20 +28,20 @@ private:
protected: protected:
static void _bind_methods(); static void _bind_methods();
void _get_property_list(List<PropertyInfo> *p_list) const;
virtual String _generate_name() const override; virtual String _generate_name() const override;
virtual void _enter() override; virtual void _enter() override;
virtual int _tick(double p_delta) override; virtual int _tick(double p_delta) override;
public: public:
void set_times(int p_value) { void set_forever(bool p_forever);
times = p_value; bool get_forever() const { return forever; }
emit_changed();
} void set_times(int p_value);
int get_times() const { return times; } int get_times() const { return times; }
void set_abort_on_failure(bool p_value) {
abort_on_failure = p_value; void set_abort_on_failure(bool p_value);
emit_changed();
}
bool get_abort_on_failure() const { return abort_on_failure; } bool get_abort_on_failure() const { return abort_on_failure; }
}; };