From 7375ad3128d09aaeb9dbecedc0888788d3078e1d Mon Sep 17 00:00:00 2001 From: Eduardo Date: Sat, 17 Feb 2024 15:33:47 +0100 Subject: [PATCH] removed regex, using metadata so we dont depend of the node name --- assets/bateria/bateria.tscn | 1 + levels/ui.gd | 5 +---- player/Player.gd | 5 +---- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/assets/bateria/bateria.tscn b/assets/bateria/bateria.tscn index ccc3980..3e2febc 100644 --- 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 8ab4ec9..4405ae0 100644 --- 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 7d040ae..7a80cfd 100644 --- 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: -- 2.30.2