removed regex, using metadata so we dont depend of the node name

diff --git a/assets/bateria/bateria.tscn b/assets/bateria/bateria.tscn
index ccc3980cd7054549fcad5d29dd7c55c6e1e9487f..3e2febc4d0f06bc1ad7639caf7289431e5a46e70 100644 (file)
--- a/assets/bateria/bateria.tscn
+++ b/assets/bateria/bateria.tscn
@@ -131,6 +131,7 @@ shadow_mesh = SubResource("ArrayMesh_fa21w")
 [node name="bateria" type="StaticBody3D"]
 transform = Transform3D(0.07, 0, 0, 0, 0.07, 0, 0, 0, 0.07, 0, 0.106267, 0)
 collision_layer = 3
+metadata/is_pickable = true
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00454712, 0.0455937, 0)

diff --git a/levels/ui.gd b/levels/ui.gd
index 8ab4ec99c592790d880a287e39076a9c3bb7f8b9..4405ae082f24822193547b07ee3d03fe71ee6c6d 100644 (file)
--- a/levels/ui.gd
+++ b/levels/ui.gd
@@ -21,12 +21,9 @@ func _ready() -> void:
 
 
 func _on_object_detected(ob: Object):
-       var regex = RegEx.new()
-       regex.compile("^bateria(\\d*)$")
-
        if !ob:
                actionTextLabel.set_text("")
-       elif regex.search(ob.name):
+       elif ob.get_meta("is_pickable", false):
                actionTextLabel.set_text("Press F to pick")
        else:
                actionTextLabel.set_text(ob.name)

diff --git a/player/Player.gd b/player/Player.gd
index 7d040ae39ce64ff0567f60dafbed472b3229f559..7a80cfdefaacfee3cf0f250b1b9a6deb3eab2254 100644 (file)
--- a/player/Player.gd
+++ b/player/Player.gd
@@ -56,10 +56,7 @@ func _physics_process(delta):
                noise_mod = running_noise_mod
 
        if Input.is_action_just_pressed("action") && object_detected:
-               var regex = RegEx.new()
-               regex.compile("^bateria(\\d*)$")
-
-               if regex.search(object_detected.name):
+               if object_detected.get_meta("is_pickable", false):
                        object_detected.queue_free()
                        emit_signal("recharge_battery")
                else: