Skip to content

Commit

Permalink
Add tubs
Browse files Browse the repository at this point in the history
  • Loading branch information
UnseenFaith committed Apr 25, 2024
1 parent 977aa6a commit 309cf31
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
9 changes: 6 additions & 3 deletions nodes/wip/Tubs/Tub.tscn
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_scene load_steps=19 format=3 uid="uid://h6wala3xyh6c"]
[gd_scene load_steps=20 format=3 uid="uid://h6wala3xyh6c"]

[ext_resource type="Script" path="res://nodes/wip/Tubs/Tub.gd" id="1_fm7tn"]
[ext_resource type="Texture2D" uid="uid://dstti4knqy3mj" path="res://art/sink.png" id="2_ejv7p"]
Expand All @@ -17,6 +17,7 @@
[ext_resource type="Texture2D" uid="uid://dxu3ody1pq4lh" path="res://art/bubbles/bubbles13.png" id="15_ym03a"]
[ext_resource type="Texture2D" uid="uid://cboh4hghk2qe0" path="res://art/bubbles/bubbles14.png" id="16_wh6hx"]
[ext_resource type="Texture2D" uid="uid://bt40kxkwniyww" path="res://art/bubbles/bubbles15.png" id="17_u1ggl"]
[ext_resource type="PackedScene" uid="uid://dpsr055c1v16j" path="res://nodes/ui/MaterialToast.tscn" id="18_jg8xd"]

[sub_resource type="SpriteFrames" id="SpriteFrames_a2qc1"]
animations = [{
Expand Down Expand Up @@ -88,8 +89,10 @@ texture = ExtResource("2_ejv7p")
region_enabled = true
region_rect = Rect2(0, 26, 41, 38)

[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
[node name="Animation" type="AnimatedSprite2D" parent="."]
texture_filter = 1
position = Vector2(-3, -33)
sprite_frames = SubResource("SpriteFrames_a2qc1")
frame_progress = 0.609171
frame_progress = 0.13971

[node name="InventoryToast" parent="." instance=ExtResource("18_jg8xd")]
3 changes: 2 additions & 1 deletion nodes/wip/WipBlacksmith.gd
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,8 @@ func _process(_delta) -> void:
if immobile || interactable == null:
return
if Input.is_action_just_pressed("interaction"):
if !interactable.interact(self, &"interaction"):
var success = await interactable.interact(self, &"interaction")
if !success:
$WompWomp.play()
if Input.is_action_just_pressed("start_block"):
interactable.interact(self, &"start_block")
Expand Down

0 comments on commit 309cf31

Please sign in to comment.