diff --git a/bt/tasks/blackboard/bt_set_var.cpp b/bt/tasks/blackboard/bt_set_var.cpp index d86be66..5b0af9b 100644 --- a/bt/tasks/blackboard/bt_set_var.cpp +++ b/bt/tasks/blackboard/bt_set_var.cpp @@ -33,9 +33,9 @@ BT::Status BTSetVar::_tick(double p_delta) { Variant error_result = SNAME("Error: BTSetVar failed to get value!"); Variant right_value = value->get_value(get_agent(), get_blackboard(), error_result); ERR_FAIL_COND_V_MSG(right_value == error_result, FAILURE, "BTSetVar: Failed to get parameter value. Returning FAILURE."); - if (operation == LimboUtility::OP_NONE) { + if (operation == LimboUtility::OPERATION_NONE) { result = right_value; - } else if (operation != LimboUtility::OP_NONE) { + } else if (operation != LimboUtility::OPERATION_NONE) { Variant left_value = get_blackboard()->get_var(variable, error_result); ERR_FAIL_COND_V_MSG(left_value == error_result, FAILURE, vformat("BTSetVar: Failed to get \"%s\" blackboard variable. Returning FAILURE.", variable)); result = LimboUtility::get_singleton()->perform_operation(operation, left_value, right_value); @@ -83,5 +83,5 @@ void BTSetVar::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::STRING, "variable"), "set_variable", "get_variable"); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "value", PROPERTY_HINT_RESOURCE_TYPE, "BBVariant"), "set_value", "get_value"); - ADD_PROPERTY(PropertyInfo(Variant::INT, "operation", PROPERTY_HINT_ENUM, "None,Addition,Subtraction,Multiplication,Division,Modulo,Power,Bit Shift Left,Bit Shift Right,Bit AND,Bit OR,Bit XOR"), "set_operation", "get_operation"); + ADD_PROPERTY(PropertyInfo(Variant::INT, "operation", PROPERTY_HINT_ENUM, "None,Addition,Subtraction,Multiplication,Division,Modulo,Power,Bitwise Shift Left,Bitwise Shift Right,Bitwise AND,Bitwise OR,Bitwise XOR"), "set_operation", "get_operation"); } diff --git a/bt/tasks/blackboard/bt_set_var.h b/bt/tasks/blackboard/bt_set_var.h index d2f89a9..f4c5692 100644 --- a/bt/tasks/blackboard/bt_set_var.h +++ b/bt/tasks/blackboard/bt_set_var.h @@ -26,7 +26,7 @@ class BTSetVar : public BTAction { private: String variable; Ref value; - LimboUtility::Operation operation = LimboUtility::OP_NONE; + LimboUtility::Operation operation = LimboUtility::OPERATION_NONE; protected: static void _bind_methods(); diff --git a/doc_classes/BBAabb.xml b/doc_classes/BBAabb.xml index 4f0153f..20af66b 100644 --- a/doc_classes/BBAabb.xml +++ b/doc_classes/BBAabb.xml @@ -1,5 +1,5 @@ - + AABB-type parameter for [BehaviorTree] tasks. See [BBParam]. diff --git a/doc_classes/BBArray.xml b/doc_classes/BBArray.xml index f1bfb2e..0b84e07 100644 --- a/doc_classes/BBArray.xml +++ b/doc_classes/BBArray.xml @@ -1,5 +1,5 @@ - + Array-type parameter for [BehaviorTree] tasks. See [BBParam]. diff --git a/doc_classes/BBBasis.xml b/doc_classes/BBBasis.xml index ad64b43..7cc4886 100644 --- a/doc_classes/BBBasis.xml +++ b/doc_classes/BBBasis.xml @@ -1,5 +1,5 @@ - + Basis-type parameter for [BehaviorTree] tasks. See [BBParam]. diff --git a/doc_classes/BBBool.xml b/doc_classes/BBBool.xml index d3d5e40..500f5d2 100644 --- a/doc_classes/BBBool.xml +++ b/doc_classes/BBBool.xml @@ -1,5 +1,5 @@ - + Bool-type parameter for [BehaviorTree] tasks. See [BBParam]. diff --git a/doc_classes/BBByteArray.xml b/doc_classes/BBByteArray.xml index 8319a3a..391a54d 100644 --- a/doc_classes/BBByteArray.xml +++ b/doc_classes/BBByteArray.xml @@ -1,5 +1,5 @@ - + ByteArray-type parameter for [BehaviorTree] tasks. See [BBParam]. diff --git a/doc_classes/BBColor.xml b/doc_classes/BBColor.xml index 128f68b..a446a05 100644 --- a/doc_classes/BBColor.xml +++ b/doc_classes/BBColor.xml @@ -1,5 +1,5 @@ - + Color-type parameter for [BehaviorTree] tasks. See [BBParam]. diff --git a/doc_classes/BBColorArray.xml b/doc_classes/BBColorArray.xml index de757dd..0aea196 100644 --- a/doc_classes/BBColorArray.xml +++ b/doc_classes/BBColorArray.xml @@ -1,5 +1,5 @@ - + ColorArray-type parameter for [BehaviorTree] tasks. See [BBParam]. diff --git a/doc_classes/BBDictionary.xml b/doc_classes/BBDictionary.xml index f248c50..dd576b2 100644 --- a/doc_classes/BBDictionary.xml +++ b/doc_classes/BBDictionary.xml @@ -1,5 +1,5 @@ - + Dictionary-type parameter for [BehaviorTree] tasks. See [BBParam]. diff --git a/doc_classes/BBFloat.xml b/doc_classes/BBFloat.xml index 255eb6e..eeeecf1 100644 --- a/doc_classes/BBFloat.xml +++ b/doc_classes/BBFloat.xml @@ -1,5 +1,5 @@ - + Float-type parameter for [BehaviorTree] tasks. See [BBParam]. diff --git a/doc_classes/BBFloatArray.xml b/doc_classes/BBFloatArray.xml index dd53b9c..8642137 100644 --- a/doc_classes/BBFloatArray.xml +++ b/doc_classes/BBFloatArray.xml @@ -1,5 +1,5 @@ - + FloatArray-type parameter for [BehaviorTree] tasks. See [BBParam]. diff --git a/doc_classes/BBInt.xml b/doc_classes/BBInt.xml index a00affa..1c769e0 100644 --- a/doc_classes/BBInt.xml +++ b/doc_classes/BBInt.xml @@ -1,5 +1,5 @@ - + Integer-type parameter for [BehaviorTree] tasks. See [BBParam]. diff --git a/doc_classes/BBIntArray.xml b/doc_classes/BBIntArray.xml index 119ca28..45f4a47 100644 --- a/doc_classes/BBIntArray.xml +++ b/doc_classes/BBIntArray.xml @@ -1,5 +1,5 @@ - + IntArray-type parameter for [BehaviorTree] tasks. See [BBParam]. diff --git a/doc_classes/BBNode.xml b/doc_classes/BBNode.xml index da85508..7153c13 100644 --- a/doc_classes/BBNode.xml +++ b/doc_classes/BBNode.xml @@ -1,5 +1,5 @@ - + Node-type parameter for [BehaviorTree] tasks. See [BBParam]. diff --git a/doc_classes/BBParam.xml b/doc_classes/BBParam.xml index 43f6845..61b6cf7 100644 --- a/doc_classes/BBParam.xml +++ b/doc_classes/BBParam.xml @@ -1,5 +1,5 @@ - + A base class for LimboAI typed parameters. diff --git a/doc_classes/BBPlane.xml b/doc_classes/BBPlane.xml index 0ae32fb..e2eb6fb 100644 --- a/doc_classes/BBPlane.xml +++ b/doc_classes/BBPlane.xml @@ -1,5 +1,5 @@ - + Plane-type parameter for [BehaviorTree] tasks. See [BBParam]. diff --git a/doc_classes/BBQuaternion.xml b/doc_classes/BBQuaternion.xml index 63cf9fa..572ae61 100644 --- a/doc_classes/BBQuaternion.xml +++ b/doc_classes/BBQuaternion.xml @@ -1,5 +1,5 @@ - + Quaternion-type parameter for [BehaviorTree] tasks. See [BBParam]. diff --git a/doc_classes/BBRect2.xml b/doc_classes/BBRect2.xml index 0ea63b8..72a2b86 100644 --- a/doc_classes/BBRect2.xml +++ b/doc_classes/BBRect2.xml @@ -1,5 +1,5 @@ - + Rect2-type parameter for [BehaviorTree] tasks. See [BBParam]. diff --git a/doc_classes/BBRect2i.xml b/doc_classes/BBRect2i.xml index ca20ca3..3e3e7df 100644 --- a/doc_classes/BBRect2i.xml +++ b/doc_classes/BBRect2i.xml @@ -1,5 +1,5 @@ - + Rect2i-type parameter for [BehaviorTree] tasks. See [BBParam]. diff --git a/doc_classes/BBString.xml b/doc_classes/BBString.xml index c8ad364..dfac3f2 100644 --- a/doc_classes/BBString.xml +++ b/doc_classes/BBString.xml @@ -1,5 +1,5 @@ - + String-type parameter for [BehaviorTree] tasks. See [BBParam]. diff --git a/doc_classes/BBStringArray.xml b/doc_classes/BBStringArray.xml index 32823d5..93448fc 100644 --- a/doc_classes/BBStringArray.xml +++ b/doc_classes/BBStringArray.xml @@ -1,5 +1,5 @@ - + StringArray-type parameter for [BehaviorTree] tasks. See [BBParam]. diff --git a/doc_classes/BBStringName.xml b/doc_classes/BBStringName.xml index d4ba314..0444e20 100644 --- a/doc_classes/BBStringName.xml +++ b/doc_classes/BBStringName.xml @@ -1,5 +1,5 @@ - + StringName-type parameter for [BehaviorTree] tasks. See [BBParam]. diff --git a/doc_classes/BBTransform2D.xml b/doc_classes/BBTransform2D.xml index 975a59b..124e7f5 100644 --- a/doc_classes/BBTransform2D.xml +++ b/doc_classes/BBTransform2D.xml @@ -1,5 +1,5 @@ - + Transform2D-type parameter for [BehaviorTree] tasks. See [BBParam]. diff --git a/doc_classes/BBTransform3D.xml b/doc_classes/BBTransform3D.xml index d28eb7e..dd697dd 100644 --- a/doc_classes/BBTransform3D.xml +++ b/doc_classes/BBTransform3D.xml @@ -1,5 +1,5 @@ - + Transform3D-type parameter for [BehaviorTree] tasks. See [BBParam]. diff --git a/doc_classes/BBVariant.xml b/doc_classes/BBVariant.xml index 29cd6a6..870635c 100644 --- a/doc_classes/BBVariant.xml +++ b/doc_classes/BBVariant.xml @@ -1,5 +1,5 @@ - + Variant-type parameter for [BehaviorTree] tasks. See [BBParam]. diff --git a/doc_classes/BBVector2.xml b/doc_classes/BBVector2.xml index 479eba8..481ce6c 100644 --- a/doc_classes/BBVector2.xml +++ b/doc_classes/BBVector2.xml @@ -1,5 +1,5 @@ - + Vector2-type parameter for [BehaviorTree] tasks. See [BBParam]. diff --git a/doc_classes/BBVector2Array.xml b/doc_classes/BBVector2Array.xml index 6f0d188..c7dc10e 100644 --- a/doc_classes/BBVector2Array.xml +++ b/doc_classes/BBVector2Array.xml @@ -1,5 +1,5 @@ - + Vector2Array-type parameter for [BehaviorTree] tasks. See [BBParam]. diff --git a/doc_classes/BBVector2i.xml b/doc_classes/BBVector2i.xml index 0929123..d12d428 100644 --- a/doc_classes/BBVector2i.xml +++ b/doc_classes/BBVector2i.xml @@ -1,5 +1,5 @@ - + Vector2i-type parameter for [BehaviorTree] tasks. See [BBParam]. diff --git a/doc_classes/BBVector3.xml b/doc_classes/BBVector3.xml index fe742f2..597197d 100644 --- a/doc_classes/BBVector3.xml +++ b/doc_classes/BBVector3.xml @@ -1,5 +1,5 @@ - + Vector3-type parameter for [BehaviorTree] tasks. See [BBParam]. diff --git a/doc_classes/BBVector3Array.xml b/doc_classes/BBVector3Array.xml index cf8d47d..6055fb0 100644 --- a/doc_classes/BBVector3Array.xml +++ b/doc_classes/BBVector3Array.xml @@ -1,5 +1,5 @@ - + Vector3Array-type parameter for [BehaviorTree] tasks. See [BBParam]. diff --git a/doc_classes/BBVector3i.xml b/doc_classes/BBVector3i.xml index 10412a0..815d656 100644 --- a/doc_classes/BBVector3i.xml +++ b/doc_classes/BBVector3i.xml @@ -1,5 +1,5 @@ - + Vector3i-type parameter for [BehaviorTree] tasks. See [BBParam]. diff --git a/doc_classes/BBVector4.xml b/doc_classes/BBVector4.xml index 9425138..77581fa 100644 --- a/doc_classes/BBVector4.xml +++ b/doc_classes/BBVector4.xml @@ -1,5 +1,5 @@ - + Vector4-type parameter for [BehaviorTree] tasks. See [BBParam]. diff --git a/doc_classes/BBVector4i.xml b/doc_classes/BBVector4i.xml index 602be31..8fc6175 100644 --- a/doc_classes/BBVector4i.xml +++ b/doc_classes/BBVector4i.xml @@ -1,5 +1,5 @@ - + Vector4i-type parameter for [BehaviorTree] tasks. See [BBParam]. diff --git a/doc_classes/BT.xml b/doc_classes/BT.xml index 0696ac4..1c2a456 100644 --- a/doc_classes/BT.xml +++ b/doc_classes/BT.xml @@ -1,5 +1,5 @@ - + Base of [BTTask]. diff --git a/doc_classes/BTAction.xml b/doc_classes/BTAction.xml index 7e8357f..e01c69e 100644 --- a/doc_classes/BTAction.xml +++ b/doc_classes/BTAction.xml @@ -1,5 +1,5 @@ - + Base class for all [BehaviorTree] actions. diff --git a/doc_classes/BTAlwaysFail.xml b/doc_classes/BTAlwaysFail.xml index 02aade8..5bb72e2 100644 --- a/doc_classes/BTAlwaysFail.xml +++ b/doc_classes/BTAlwaysFail.xml @@ -1,5 +1,5 @@ - + BT decorator that converts [code]SUCCESS[/code] into [code]FAILURE[/code]. diff --git a/doc_classes/BTAlwaysSucceed.xml b/doc_classes/BTAlwaysSucceed.xml index a01123d..26d6084 100644 --- a/doc_classes/BTAlwaysSucceed.xml +++ b/doc_classes/BTAlwaysSucceed.xml @@ -1,5 +1,5 @@ - + BT decorator that converts [code]FAILURE[/code] into [code]SUCCESS[/code]. diff --git a/doc_classes/BTAwaitAnimation.xml b/doc_classes/BTAwaitAnimation.xml index 628240d..c0e20da 100644 --- a/doc_classes/BTAwaitAnimation.xml +++ b/doc_classes/BTAwaitAnimation.xml @@ -1,5 +1,5 @@ - + BT action that waits for an animation to finish playing. diff --git a/doc_classes/BTCallMethod.xml b/doc_classes/BTCallMethod.xml index 180f8bb..0c83d10 100644 --- a/doc_classes/BTCallMethod.xml +++ b/doc_classes/BTCallMethod.xml @@ -1,5 +1,5 @@ - + BT action that calls a method on a specified [Node] or [Object]. diff --git a/doc_classes/BTCheckAgentProperty.xml b/doc_classes/BTCheckAgentProperty.xml index 9e73d3f..ba4fe4e 100644 --- a/doc_classes/BTCheckAgentProperty.xml +++ b/doc_classes/BTCheckAgentProperty.xml @@ -1,5 +1,5 @@ - + BT condition that checks agent's property value. diff --git a/doc_classes/BTCheckTrigger.xml b/doc_classes/BTCheckTrigger.xml index fdb06c5..68556b8 100644 --- a/doc_classes/BTCheckTrigger.xml +++ b/doc_classes/BTCheckTrigger.xml @@ -1,5 +1,5 @@ - + BT condition that checks a trigger (a boolean variable). diff --git a/doc_classes/BTCheckVar.xml b/doc_classes/BTCheckVar.xml index fa24b63..1a37389 100644 --- a/doc_classes/BTCheckVar.xml +++ b/doc_classes/BTCheckVar.xml @@ -1,5 +1,5 @@ - + BT condition that checks a variable on the blackboard. diff --git a/doc_classes/BTComment.xml b/doc_classes/BTComment.xml index 6fc02b6..dab7e46 100644 --- a/doc_classes/BTComment.xml +++ b/doc_classes/BTComment.xml @@ -1,5 +1,5 @@ - + BTComment adds annotations or explanatory notes to a [BehaviorTree]. diff --git a/doc_classes/BTComposite.xml b/doc_classes/BTComposite.xml index 7fc27fa..d69ddeb 100644 --- a/doc_classes/BTComposite.xml +++ b/doc_classes/BTComposite.xml @@ -1,5 +1,5 @@ - + Base class for BT composite tasks. diff --git a/doc_classes/BTCondition.xml b/doc_classes/BTCondition.xml index 3b605de..f084aa8 100644 --- a/doc_classes/BTCondition.xml +++ b/doc_classes/BTCondition.xml @@ -1,5 +1,5 @@ - + Base class for BT conditions. diff --git a/doc_classes/BTConsolePrint.xml b/doc_classes/BTConsolePrint.xml index a8f75d6..6b909a0 100644 --- a/doc_classes/BTConsolePrint.xml +++ b/doc_classes/BTConsolePrint.xml @@ -1,5 +1,5 @@ - + BT action task that outputs text to the console. diff --git a/doc_classes/BTCooldown.xml b/doc_classes/BTCooldown.xml index 63ee405..1f84cbd 100644 --- a/doc_classes/BTCooldown.xml +++ b/doc_classes/BTCooldown.xml @@ -1,5 +1,5 @@ - + BT decorator that executes its child task only if [member duration] time has passed since the previous execution. diff --git a/doc_classes/BTDecorator.xml b/doc_classes/BTDecorator.xml index 069d7aa..18789ee 100644 --- a/doc_classes/BTDecorator.xml +++ b/doc_classes/BTDecorator.xml @@ -1,5 +1,5 @@ - + Base class for BT decorators. diff --git a/doc_classes/BTDelay.xml b/doc_classes/BTDelay.xml index b5ca83f..739b082 100644 --- a/doc_classes/BTDelay.xml +++ b/doc_classes/BTDelay.xml @@ -1,5 +1,5 @@ - + BT decorator that introduces a delay before executing its child task. diff --git a/doc_classes/BTDynamicSelector.xml b/doc_classes/BTDynamicSelector.xml index a855dbd..056a4cf 100644 --- a/doc_classes/BTDynamicSelector.xml +++ b/doc_classes/BTDynamicSelector.xml @@ -1,5 +1,5 @@ - + BT composite that executes tasks from scratch every tick until first [code]SUCCESS[/code]. diff --git a/doc_classes/BTDynamicSequence.xml b/doc_classes/BTDynamicSequence.xml index c79f375..3a58522 100644 --- a/doc_classes/BTDynamicSequence.xml +++ b/doc_classes/BTDynamicSequence.xml @@ -1,5 +1,5 @@ - + BT composite that executes tasks from scratch every tick as long as they return [code]SUCCESS[/code]. diff --git a/doc_classes/BTFail.xml b/doc_classes/BTFail.xml index 84b0cae..951afaf 100644 --- a/doc_classes/BTFail.xml +++ b/doc_classes/BTFail.xml @@ -1,5 +1,5 @@ - + BT action that always returns [code]FAILURE[/code]. diff --git a/doc_classes/BTForEach.xml b/doc_classes/BTForEach.xml index e1936ac..2fbe450 100644 --- a/doc_classes/BTForEach.xml +++ b/doc_classes/BTForEach.xml @@ -1,5 +1,5 @@ - + BT decorator that executes its child task for each element of an [Array]. diff --git a/doc_classes/BTInvert.xml b/doc_classes/BTInvert.xml index 77777dc..2477cad 100644 --- a/doc_classes/BTInvert.xml +++ b/doc_classes/BTInvert.xml @@ -1,5 +1,5 @@ - + BT decorator that transforms [code]FAILURE[/code] into [code]SUCCESS[/code] and [code]SUCCESS[/code] into [code]FAILURE[/code]. diff --git a/doc_classes/BTNewScope.xml b/doc_classes/BTNewScope.xml index fedd834..252fa48 100644 --- a/doc_classes/BTNewScope.xml +++ b/doc_classes/BTNewScope.xml @@ -1,5 +1,5 @@ - + BT decorator that creates a new [Blackboard] scope. diff --git a/doc_classes/BTParallel.xml b/doc_classes/BTParallel.xml index 2ee1247..dfae4c9 100644 --- a/doc_classes/BTParallel.xml +++ b/doc_classes/BTParallel.xml @@ -1,5 +1,5 @@ - + BT composite that executes all of its child tasks simultaneously. diff --git a/doc_classes/BTPauseAnimation.xml b/doc_classes/BTPauseAnimation.xml index 4eeaeb0..a7e1663 100644 --- a/doc_classes/BTPauseAnimation.xml +++ b/doc_classes/BTPauseAnimation.xml @@ -1,5 +1,5 @@ - + BT action that pauses the playback of an animation on the specified [AnimationPlayer] node. diff --git a/doc_classes/BTPlayAnimation.xml b/doc_classes/BTPlayAnimation.xml index fc6c1e9..6094157 100644 --- a/doc_classes/BTPlayAnimation.xml +++ b/doc_classes/BTPlayAnimation.xml @@ -1,5 +1,5 @@ - + BT action that plays an animation on the specified [AnimationPlayer] node. diff --git a/doc_classes/BTPlayer.xml b/doc_classes/BTPlayer.xml index 93cb2a3..a49400d 100644 --- a/doc_classes/BTPlayer.xml +++ b/doc_classes/BTPlayer.xml @@ -1,5 +1,5 @@ - + Player of [BehaviorTree] resources. diff --git a/doc_classes/BTProbability.xml b/doc_classes/BTProbability.xml index e27a4af..ef1b68c 100644 --- a/doc_classes/BTProbability.xml +++ b/doc_classes/BTProbability.xml @@ -1,5 +1,5 @@ - + BT decorator that executes its child task with a given probability. diff --git a/doc_classes/BTProbabilitySelector.xml b/doc_classes/BTProbabilitySelector.xml index 0666891..4ae41a2 100644 --- a/doc_classes/BTProbabilitySelector.xml +++ b/doc_classes/BTProbabilitySelector.xml @@ -1,5 +1,5 @@ - + BT composite that chooses a child task to execute based on attached probabilities. diff --git a/doc_classes/BTRandomSelector.xml b/doc_classes/BTRandomSelector.xml index 840c291..c57812a 100644 --- a/doc_classes/BTRandomSelector.xml +++ b/doc_classes/BTRandomSelector.xml @@ -1,5 +1,5 @@ - + BT composite that executes tasks in random order until first [code]SUCCESS[/code]. diff --git a/doc_classes/BTRandomSequence.xml b/doc_classes/BTRandomSequence.xml index 9c84a27..eff1b6b 100644 --- a/doc_classes/BTRandomSequence.xml +++ b/doc_classes/BTRandomSequence.xml @@ -1,5 +1,5 @@ - + BT composite that executes tasks in random order as long as they return [code]SUCCESS[/code]. diff --git a/doc_classes/BTRandomWait.xml b/doc_classes/BTRandomWait.xml index a96b9aa..15b83d4 100644 --- a/doc_classes/BTRandomWait.xml +++ b/doc_classes/BTRandomWait.xml @@ -1,5 +1,5 @@ - + BT action that waits for a randomized duration to elapse and then returns [code]SUCCESS[/code]. diff --git a/doc_classes/BTRepeat.xml b/doc_classes/BTRepeat.xml index 7dcb03d..2e9f6e2 100644 --- a/doc_classes/BTRepeat.xml +++ b/doc_classes/BTRepeat.xml @@ -1,5 +1,5 @@ - + BT decorator that repeats its child a specified number of [member times]. diff --git a/doc_classes/BTRepeatUntilFailure.xml b/doc_classes/BTRepeatUntilFailure.xml index 4c91a8f..c4566a8 100644 --- a/doc_classes/BTRepeatUntilFailure.xml +++ b/doc_classes/BTRepeatUntilFailure.xml @@ -1,5 +1,5 @@ - + BT decorator that repeats its child task until [code]FAILURE[/code]. diff --git a/doc_classes/BTRepeatUntilSuccess.xml b/doc_classes/BTRepeatUntilSuccess.xml index d750a0d..cdf89b5 100644 --- a/doc_classes/BTRepeatUntilSuccess.xml +++ b/doc_classes/BTRepeatUntilSuccess.xml @@ -1,5 +1,5 @@ - + BT decorator that repeats its child task until [code]SUCCESS[/code]. diff --git a/doc_classes/BTRunLimit.xml b/doc_classes/BTRunLimit.xml index 7454f80..18f9cac 100644 --- a/doc_classes/BTRunLimit.xml +++ b/doc_classes/BTRunLimit.xml @@ -1,5 +1,5 @@ - + BT decorator that restricts the execution of its child a limited number of times. diff --git a/doc_classes/BTSelector.xml b/doc_classes/BTSelector.xml index bd011df..5f47568 100644 --- a/doc_classes/BTSelector.xml +++ b/doc_classes/BTSelector.xml @@ -1,5 +1,5 @@ - + BT composite that sequentially executes tasks until first [code]SUCCESS[/code]. diff --git a/doc_classes/BTSequence.xml b/doc_classes/BTSequence.xml index d5545c1..779de65 100644 --- a/doc_classes/BTSequence.xml +++ b/doc_classes/BTSequence.xml @@ -1,5 +1,5 @@ - + BT composite that sequentially executes tasks as long as they return [code]SUCCESS[/code]. diff --git a/doc_classes/BTSetAgentProperty.xml b/doc_classes/BTSetAgentProperty.xml index ded7d58..04e92c0 100644 --- a/doc_classes/BTSetAgentProperty.xml +++ b/doc_classes/BTSetAgentProperty.xml @@ -1,5 +1,5 @@ - + BT action that assigns a value to the specified agent's property. diff --git a/doc_classes/BTSetVar.xml b/doc_classes/BTSetVar.xml index e6c2457..dc461ed 100644 --- a/doc_classes/BTSetVar.xml +++ b/doc_classes/BTSetVar.xml @@ -1,15 +1,19 @@ - + BT action that assigns [member value] to the [member variable] and then returns [code]SUCCESS[/code]. - BTSetVar assigns [member value] to the [member variable] and then returns [code]SUCCESS[/code]. + BTSetVar assigns [member value] to the [member variable] and then returns [code]SUCCESS[/code]. Optionally, it can perform a specific [member operation] before assignment. Returns [code]FAILURE[/code] if it fails to set the [member variable]. + + Specifies the operation to be performed before assignment. Operation is executed as follows: + [code]variable = variable OPERATION value[/code] + Parameter that specifies the value to be assigned to the variable. diff --git a/doc_classes/BTState.xml b/doc_classes/BTState.xml index 8743016..7990803 100644 --- a/doc_classes/BTState.xml +++ b/doc_classes/BTState.xml @@ -1,5 +1,5 @@ - + A state node for [LimboHSM] that hosts a [BehaviorTree]. diff --git a/doc_classes/BTStopAnimation.xml b/doc_classes/BTStopAnimation.xml index 9d0a769..a5311cc 100644 --- a/doc_classes/BTStopAnimation.xml +++ b/doc_classes/BTStopAnimation.xml @@ -1,5 +1,5 @@ - + BT action that stops the playback of an animation on the specified [AnimationPlayer] node. diff --git a/doc_classes/BTSubtree.xml b/doc_classes/BTSubtree.xml index abf0fb5..de90388 100644 --- a/doc_classes/BTSubtree.xml +++ b/doc_classes/BTSubtree.xml @@ -1,5 +1,5 @@ - + BT decorator that instantiates and runs a subtree within the larger tree. diff --git a/doc_classes/BTTask.xml b/doc_classes/BTTask.xml index 4836678..dcce34e 100644 --- a/doc_classes/BTTask.xml +++ b/doc_classes/BTTask.xml @@ -1,5 +1,5 @@ - + Base class for all [BehaviorTree] tasks. diff --git a/doc_classes/BTTimeLimit.xml b/doc_classes/BTTimeLimit.xml index c8f4a31..a0b8d1a 100644 --- a/doc_classes/BTTimeLimit.xml +++ b/doc_classes/BTTimeLimit.xml @@ -1,5 +1,5 @@ - + BT decorator that sets a time limit for its child's execution. diff --git a/doc_classes/BTWait.xml b/doc_classes/BTWait.xml index 7ca0f86..fb2a977 100644 --- a/doc_classes/BTWait.xml +++ b/doc_classes/BTWait.xml @@ -1,5 +1,5 @@ - + BT action that waits for a specified [member duration] to elapse and then returns [code]SUCCESS[/code]. diff --git a/doc_classes/BTWaitTicks.xml b/doc_classes/BTWaitTicks.xml index e849438..13543e4 100644 --- a/doc_classes/BTWaitTicks.xml +++ b/doc_classes/BTWaitTicks.xml @@ -1,5 +1,5 @@ - + BT action that waits for a specified number of ticks to elapse and then returns [code]SUCCESS[/code]. diff --git a/doc_classes/BehaviorTree.xml b/doc_classes/BehaviorTree.xml index 216b1c1..eb25025 100644 --- a/doc_classes/BehaviorTree.xml +++ b/doc_classes/BehaviorTree.xml @@ -1,5 +1,5 @@ - + Contains Behavior Tree data. diff --git a/doc_classes/Blackboard.xml b/doc_classes/Blackboard.xml index 0e1528a..c04ba03 100644 --- a/doc_classes/Blackboard.xml +++ b/doc_classes/Blackboard.xml @@ -1,5 +1,5 @@ - + A key/value storage for sharing among [LimboHSM] states and [BehaviorTree] tasks. diff --git a/doc_classes/LimboHSM.xml b/doc_classes/LimboHSM.xml index 05a1caf..52aad6e 100644 --- a/doc_classes/LimboHSM.xml +++ b/doc_classes/LimboHSM.xml @@ -1,5 +1,5 @@ - + Event-based Hierarchical State Machine (HSM). diff --git a/doc_classes/LimboState.xml b/doc_classes/LimboState.xml index 2884834..48f785a 100644 --- a/doc_classes/LimboState.xml +++ b/doc_classes/LimboState.xml @@ -1,5 +1,5 @@ - + A state node for Hierarchical State Machines (HSM). diff --git a/doc_classes/LimboUtility.xml b/doc_classes/LimboUtility.xml index e6fee10..074dccf 100644 --- a/doc_classes/LimboUtility.xml +++ b/doc_classes/LimboUtility.xml @@ -1,5 +1,5 @@ - + Helper functions for LimboAI. @@ -49,5 +49,41 @@ Inequality Check. + + No operation. + + + Arithmetic addition. + + + Arithmetic subtraction. + + + Arithmetic multiplication. + + + Arithmetic division. + + + Produces the remainder of an integer division. + + + Multiply [code]a[/code] by itself [code]b[/code] times. + + + Bitwise left shift. + + + Bitwise right shift. + + + Bitwise AND. + + + Bitwise OR. + + + Bitwise XOR. + diff --git a/util/limbo_utility.cpp b/util/limbo_utility.cpp index f713c06..ad4ff11 100644 --- a/util/limbo_utility.cpp +++ b/util/limbo_utility.cpp @@ -151,40 +151,40 @@ bool LimboUtility::perform_check(CheckType p_check_type, const Variant &left_val String LimboUtility::get_operation_string(Operation p_operation) const { switch (p_operation) { - case OP_NONE: { + case OPERATION_NONE: { return ""; } break; - case OP_ADDITION: { + case OPERATION_ADDITION: { return "+"; } break; - case OP_SUBTRACTION: { + case OPERATION_SUBTRACTION: { return "-"; } break; - case OP_MULTIPLICATION: { + case OPERATION_MULTIPLICATION: { return "*"; } break; - case OP_DIVISION: { + case OPERATION_DIVISION: { return "/"; } break; - case OP_MODULO: { + case OPERATION_MODULO: { return "%"; } break; - case OP_POWER: { + case OPERATION_POWER: { return "**"; } break; - case OP_BIT_SHIFT_LEFT: { + case OPERATION_BIT_SHIFT_LEFT: { return "<<"; } break; - case OP_BIT_SHIFT_RIGHT: { + case OPERATION_BIT_SHIFT_RIGHT: { return ">>"; } break; - case OP_BIT_AND: { + case OPERATION_BIT_AND: { return "&"; } break; - case OP_BIT_OR: { + case OPERATION_BIT_OR: { return "|"; } break; - case OP_BIT_XOR: { + case OPERATION_BIT_XOR: { return "^"; } break; } @@ -192,40 +192,40 @@ String LimboUtility::get_operation_string(Operation p_operation) const { Variant LimboUtility::perform_operation(Operation p_operation, const Variant &left_value, const Variant &right_value) { switch (p_operation) { - case OP_NONE: { + case OPERATION_NONE: { return right_value; } break; - case OP_ADDITION: { + case OPERATION_ADDITION: { return Variant::evaluate(Variant::OP_ADD, left_value, right_value); } break; - case OP_SUBTRACTION: { + case OPERATION_SUBTRACTION: { return Variant::evaluate(Variant::OP_SUBTRACT, left_value, right_value); } break; - case OP_MULTIPLICATION: { + case OPERATION_MULTIPLICATION: { return Variant::evaluate(Variant::OP_MULTIPLY, left_value, right_value); } break; - case OP_DIVISION: { + case OPERATION_DIVISION: { return Variant::evaluate(Variant::OP_DIVIDE, left_value, right_value); } break; - case OP_MODULO: { + case OPERATION_MODULO: { return Variant::evaluate(Variant::OP_MODULE, left_value, right_value); } break; - case OP_POWER: { + case OPERATION_POWER: { return Variant::evaluate(Variant::OP_MODULE, left_value, right_value); } break; - case OP_BIT_SHIFT_LEFT: { + case OPERATION_BIT_SHIFT_LEFT: { return Variant::evaluate(Variant::OP_SHIFT_LEFT, left_value, right_value); } break; - case OP_BIT_SHIFT_RIGHT: { + case OPERATION_BIT_SHIFT_RIGHT: { return Variant::evaluate(Variant::OP_SHIFT_RIGHT, left_value, right_value); } break; - case OP_BIT_AND: { + case OPERATION_BIT_AND: { return Variant::evaluate(Variant::OP_BIT_AND, left_value, right_value); } break; - case OP_BIT_OR: { + case OPERATION_BIT_OR: { return Variant::evaluate(Variant::OP_BIT_OR, left_value, right_value); } break; - case OP_BIT_XOR: { + case OPERATION_BIT_XOR: { return Variant::evaluate(Variant::OP_BIT_XOR, left_value, right_value); } break; } @@ -243,18 +243,18 @@ void LimboUtility::_bind_methods() { BIND_ENUM_CONSTANT(CHECK_GREATER_THAN_OR_EQUAL); BIND_ENUM_CONSTANT(CHECK_NOT_EQUAL); - BIND_ENUM_CONSTANT(OP_NONE); - BIND_ENUM_CONSTANT(OP_ADDITION); - BIND_ENUM_CONSTANT(OP_SUBTRACTION); - BIND_ENUM_CONSTANT(OP_MULTIPLICATION); - BIND_ENUM_CONSTANT(OP_DIVISION); - BIND_ENUM_CONSTANT(OP_MODULO); - BIND_ENUM_CONSTANT(OP_POWER); - BIND_ENUM_CONSTANT(OP_BIT_SHIFT_LEFT); - BIND_ENUM_CONSTANT(OP_BIT_SHIFT_RIGHT); - BIND_ENUM_CONSTANT(OP_BIT_AND); - BIND_ENUM_CONSTANT(OP_BIT_OR); - BIND_ENUM_CONSTANT(OP_BIT_XOR); + BIND_ENUM_CONSTANT(OPERATION_NONE); + BIND_ENUM_CONSTANT(OPERATION_ADDITION); + BIND_ENUM_CONSTANT(OPERATION_SUBTRACTION); + BIND_ENUM_CONSTANT(OPERATION_MULTIPLICATION); + BIND_ENUM_CONSTANT(OPERATION_DIVISION); + BIND_ENUM_CONSTANT(OPERATION_MODULO); + BIND_ENUM_CONSTANT(OPERATION_POWER); + BIND_ENUM_CONSTANT(OPERATION_BIT_SHIFT_LEFT); + BIND_ENUM_CONSTANT(OPERATION_BIT_SHIFT_RIGHT); + BIND_ENUM_CONSTANT(OPERATION_BIT_AND); + BIND_ENUM_CONSTANT(OPERATION_BIT_OR); + BIND_ENUM_CONSTANT(OPERATION_BIT_XOR); } LimboUtility::LimboUtility() { diff --git a/util/limbo_utility.h b/util/limbo_utility.h index 8b47988..8c84be0 100644 --- a/util/limbo_utility.h +++ b/util/limbo_utility.h @@ -35,18 +35,18 @@ public: }; enum Operation { - OP_NONE, - OP_ADDITION, - OP_SUBTRACTION, - OP_MULTIPLICATION, - OP_DIVISION, - OP_MODULO, - OP_POWER, - OP_BIT_SHIFT_LEFT, - OP_BIT_SHIFT_RIGHT, - OP_BIT_AND, - OP_BIT_OR, - OP_BIT_XOR, + OPERATION_NONE, + OPERATION_ADDITION, + OPERATION_SUBTRACTION, + OPERATION_MULTIPLICATION, + OPERATION_DIVISION, + OPERATION_MODULO, + OPERATION_POWER, + OPERATION_BIT_SHIFT_LEFT, + OPERATION_BIT_SHIFT_RIGHT, + OPERATION_BIT_AND, + OPERATION_BIT_OR, + OPERATION_BIT_XOR, }; protected: