Merge pull request #3073 from t3du/ArrayIndex

Array Index Node: expose From param
armory3d · Nov 22, 2024 · 88af401 · 88af401
2 parents 22cc2a5 + a9a29a2
commit 88af401
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/Sources/armory/logicnode/ArrayIndexNode.hx b/Sources/armory/logicnode/ArrayIndexNode.hx
@@ -10,7 +10,8 @@ class ArrayIndexNode extends LogicNode {
 		var array: Array<Dynamic> = inputs[0].get();
 		array = array.map(item -> Std.string(item));
 		var value: Dynamic = inputs[1].get();
+		var from: Int = inputs[2].get();
 
-		return array.indexOf(Std.string(value));
+		return array.indexOf(Std.string(value), from);
 	}
 }
diff --git a/blender/arm/logicnode/array/LN_array_index.py b/blender/arm/logicnode/array/LN_array_index.py
@@ -4,10 +4,17 @@ class ArrayIndexNode(ArmLogicTreeNode):
     """Returns the array index of the given value."""
     bl_idname = 'LNArrayIndexNode'
     bl_label = 'Array Index'
-    arm_version = 1
+    arm_version = 2
 
     def arm_init(self, context):
         self.add_input('ArmNodeSocketArray', 'Array')
         self.add_input('ArmDynamicSocket', 'Value')
+        self.add_input('ArmIntSocket', 'From')
 
         self.add_output('ArmIntSocket', 'Index')
+
+    def get_replacement_node(self, node_tree: bpy.types.NodeTree):
+        if self.arm_version not in (0, 1):
+            raise LookupError()
+
+        return NodeReplacement.Identity(self)