diff --git a/assets/Items/tiki_torch_props_strip_12.png b/assets/Items/tiki_torch_props_strip_12.png index d92dd13..c3ba4cb 100644 Binary files a/assets/Items/tiki_torch_props_strip_12.png and b/assets/Items/tiki_torch_props_strip_12.png differ diff --git a/src/Actors/Player.tscn b/src/Actors/Player.tscn index 780afee..7141448 100644 --- a/src/Actors/Player.tscn +++ b/src/Actors/Player.tscn @@ -702,7 +702,7 @@ texture = ExtResource( 7 ) texture_scale = 3.07 color = Color( 0.854902, 0.952941, 0.682353, 1 ) range_height = -2048.0 -range_item_cull_mask = 7 +range_item_cull_mask = 39 shadow_enabled = true shadow_item_cull_mask = 15 diff --git a/src/Items/BrakableVase.tscn b/src/Items/BrakableVase.tscn index 5732dbd..49dd77b 100644 --- a/src/Items/BrakableVase.tscn +++ b/src/Items/BrakableVase.tscn @@ -6,7 +6,7 @@ [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 5, 5 ) -[sub_resource type="Animation" id=3] +[sub_resource type="Animation" id=2] resource_name = "break" length = 0.3 tracks/0/type = "value" @@ -34,8 +34,7 @@ tracks/1/keys = { "values": [ true ] } -[sub_resource type="Animation" id=2] -resource_name = "idle" +[sub_resource type="Animation" id=3] length = 0.1 tracks/0/type = "value" tracks/0/path = NodePath("Sprite:frame") @@ -65,10 +64,11 @@ tracks/1/keys = { [node name="BrakableVase" type="Node2D" groups=[ "Breakable", ]] +light_mask = 32 script = ExtResource( 2 ) [node name="Sprite" type="Sprite" parent="."] -light_mask = 0 +light_mask = 32 position = Vector2( 0, -8 ) texture = ExtResource( 1 ) hframes = 6 @@ -83,5 +83,5 @@ shape = SubResource( 1 ) [node name="AnimationPlayer" type="AnimationPlayer" parent="."] autoplay = "idle" playback_speed = 0.8 -anims/break = SubResource( 3 ) -anims/idle = SubResource( 2 ) +anims/break = SubResource( 2 ) +anims/idle = SubResource( 3 ) diff --git a/src/Items/Torch.tscn b/src/Items/Torch.tscn index 111e904..01b1d04 100644 --- a/src/Items/Torch.tscn +++ b/src/Items/Torch.tscn @@ -82,16 +82,17 @@ tracks/0/keys = { light_mask = 8 position = Vector2( 0, -12 ) frames = SubResource( 13 ) +frame = 11 playing = true [node name="Light2D" type="Light2D" parent="AnimatedSprite"] position = Vector2( 0, -5 ) texture = ExtResource( 2 ) texture_scale = 5.285 -color = Color( 0.945098, 0.419608, 0.160784, 1 ) -range_item_cull_mask = 1037 -shadow_enabled = true -shadow_item_cull_mask = 1038 +color = Color( 0.933333, 0.407843, 0.152941, 1 ) +energy = 1.5 +range_item_cull_mask = 1087 +shadow_item_cull_mask = 1032 [node name="AnimationPlayer" type="AnimationPlayer" parent="."] autoplay = "halo"