From feef4019a4d796303bfd4a6cb81caa55d43c9dff Mon Sep 17 00:00:00 2001 From: pennyrigate Date: Wed, 8 Mar 2023 03:13:42 -0500 Subject: [PATCH] tin particles put on dynamic layer --- objects/enemy/tin.tscn | 12 ++++++------ objects/enemy/tin_die.gd | 9 --------- objects/enemy/tin_die.tscn | 6 +++++- 3 files changed, 11 insertions(+), 16 deletions(-) delete mode 100644 objects/enemy/tin_die.gd diff --git a/objects/enemy/tin.tscn b/objects/enemy/tin.tscn index d407e1f..63b680c 100644 --- a/objects/enemy/tin.tscn +++ b/objects/enemy/tin.tscn @@ -11,7 +11,7 @@ shader_param/border_color = Color( 0, 0, 0, 1 ) shader_param/border_corners = true [sub_resource type="Animation" id=2] -resource_name = "eye_hue" +resource_name = "eye hue" loop = true tracks/0/type = "value" tracks/0/path = NodePath("Eye:modulate") @@ -29,7 +29,7 @@ tracks/0/keys = { [sub_resource type="RectangleShape2D" id=3] extents = Vector2( 4, 4 ) -[node name="Tin" type="Node2D"] +[node name="Tin" type="Node2D" groups=["enemy"]] script = ExtResource( 1 ) score_for_killing = 100 @@ -38,12 +38,12 @@ material = SubResource( 1 ) texture = ExtResource( 3 ) [node name="Eye" type="Sprite" parent="."] -modulate = Color( 0.823775, 0.736539, 0.564706, 1 ) +modulate = Color( 0.560784, 1, 0.560784, 1 ) texture = ExtResource( 4 ) -[node name="AnimationPlayer" type="AnimationPlayer" parent="."] -autoplay = "eye_hue" -anims/eye_hue = SubResource( 2 ) +[node name="EyeAnim" type="AnimationPlayer" parent="."] +autoplay = "eye hue" +"anims/eye hue" = SubResource( 2 ) [node name="Hitbox" type="Area2D" parent="." groups=["enemy_hitbox"]] diff --git a/objects/enemy/tin_die.gd b/objects/enemy/tin_die.gd deleted file mode 100644 index 611d5cc..0000000 --- a/objects/enemy/tin_die.gd +++ /dev/null @@ -1,9 +0,0 @@ -extends Node2D - - -func _ready(): - $AnimatedSprite.playing = true - - -func _on_AnimatedSprite_animation_finished(): - $AnimatedSprite.queue_free() diff --git a/objects/enemy/tin_die.tscn b/objects/enemy/tin_die.tscn index b54d726..b432702 100644 --- a/objects/enemy/tin_die.tscn +++ b/objects/enemy/tin_die.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=14 format=2] [ext_resource path="res://graphics/enemy/explosion_small.png" type="Texture" id=1] -[ext_resource path="res://objects/enemy/tin_die.gd" type="Script" id=2] +[ext_resource path="res://objects/enemy/robot_die.gd" type="Script" id=2] [ext_resource path="res://graphics/enemy/tin.png" type="Texture" id=3] [ext_resource path="res://scripts/launch_rigid.gd" type="Script" id=4] @@ -50,6 +50,7 @@ script = ExtResource( 2 ) frames = SubResource( 7 ) [node name="Topleft" type="RigidBody2D" parent="."] +collision_layer = 4 mass = 2.0 physics_material_override = SubResource( 9 ) script = ExtResource( 4 ) @@ -70,6 +71,7 @@ wait_time = 5.0 autostart = true [node name="TopRight" type="RigidBody2D" parent="."] +collision_layer = 4 mass = 2.0 physics_material_override = SubResource( 9 ) script = ExtResource( 4 ) @@ -91,6 +93,7 @@ wait_time = 5.3 autostart = true [node name="BottomLeft" type="RigidBody2D" parent="."] +collision_layer = 4 mass = 2.0 physics_material_override = SubResource( 9 ) script = ExtResource( 4 ) @@ -113,6 +116,7 @@ autostart = true [node name="BottomRight" type="RigidBody2D" parent="."] position = Vector2( 3, 3 ) +collision_layer = 4 mass = 2.0 physics_material_override = SubResource( 9 ) script = ExtResource( 4 )