diff --git a/assets/item_balloon/Balloon White.material b/assets/item_balloon/Balloon White.material index 77e4e06..8616299 100644 Binary files a/assets/item_balloon/Balloon White.material and b/assets/item_balloon/Balloon White.material differ diff --git a/assets/item_balloon/item_balloon.glb b/assets/item_balloon/item_balloon.glb index 8e96cf4..abc2105 100644 Binary files a/assets/item_balloon/item_balloon.glb and b/assets/item_balloon/item_balloon.glb differ diff --git a/scenes/item.tscn b/scenes/item.tscn index 8194a76..5475b60 100644 --- a/scenes/item.tscn +++ b/scenes/item.tscn @@ -9,4 +9,5 @@ script = ExtResource( 1 ) [node name="ItemLabel" type="Label3D" parent="."] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.881756, 0 ) +visible = false billboard = 1 diff --git a/scenes/item_balloon.tscn b/scenes/item_balloon.tscn index 66935fe..4124ba7 100644 --- a/scenes/item_balloon.tscn +++ b/scenes/item_balloon.tscn @@ -9,7 +9,7 @@ animation = "Balloon Bounce" [sub_resource type="AnimationNodeAnimation" id=2] -animation = "Balloon Idle" +animation = "Balloon Idle-loop" [sub_resource type="AnimationNodeAnimation" id=3] animation = "Balloon Reset" @@ -28,7 +28,7 @@ auto_advance = true states/bounce/node = SubResource( 1 ) states/bounce/position = Vector2( 653, 152.25 ) states/idle/node = SubResource( 2 ) -states/idle/position = Vector2( 358, 151.875 ) +states/idle/position = Vector2( 358, 151.781 ) states/reset/node = SubResource( 3 ) states/reset/position = Vector2( 495, 279.5 ) transitions = [ "idle", "bounce", SubResource( 4 ), "bounce", "reset", SubResource( 5 ), "reset", "idle", SubResource( 6 ) ] @@ -40,12 +40,12 @@ start_node = "idle" script = ExtResource( 1 ) [node name="ItemSpawn" type="BoneAttachment" parent="Armature/Skeleton" index="1"] -transform = Transform( -1, 0, -8.74228e-08, -8.96342e-08, 0, 1.0253, 0, 1, 0, 0, -0.013823, 0 ) +transform = Transform( 1, 2.77886e-15, 8.74228e-08, 2.76877e-15, 0.996368, -6.33421e-08, -8.74228e-08, 6.3573e-08, 1, 0, 0.00594532, 0 ) bone_name = "Item" [node name="attached_item" parent="Armature/Skeleton/ItemSpawn" index="0" instance=ExtResource( 3 )] unique_name_in_owner = true -transform = Transform( 1, 0, -2.37178e-09, 0, 1, 0, -2.37177e-09, 0, 1.02713, 1.6173e-08, 0, -0.184997 ) +transform = Transform( 1, -2.11758e-21, -2.37178e-09, -4.23516e-22, 1, 0, -2.37177e-09, -1.20792e-13, 1.02713, -5.21145e-16, -0.187539, 1.19224e-08 ) item_type = ExtResource( 4 ) [node name="AnimationPlayer" parent="." index="1"] diff --git a/scenes/oven.tscn b/scenes/oven.tscn index a86acb3..6b306e2 100644 --- a/scenes/oven.tscn +++ b/scenes/oven.tscn @@ -18,7 +18,7 @@ script = ExtResource( 2 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.621351, 0 ) [node name="item_dump" parent="." instance=ExtResource( 4 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.117529, 0 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 2.38419e-07, -0.117529, 0.694059 ) collision_mask = 0 items_required = [ ExtResource( 7 ), ExtResource( 6 ) ]