team-sg/hero-mark-2
team-sg/hero-mark-2
5
0
Fork 1
Code Issues 12 Releases Activity

remove tin-specific death code from enemy_move_diagonal.gd, use deferred died signal connection instead to avoid errors from adding physics bodies outside idle time

Browse source
This commit is contained in:
Haze Weathers 2023-02-22 16:04:50 -05:00
parent 1d2fa6da75
commit b31344a718
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
objects/enemy/enemy_move_diagonal.gd
View file

@ -30,4 +30,3 @@ func _physics_process(delta):
func die(): func die():
.die() .die()
Game.instance_node(load("res://objects/enemy/tin_die.tscn"),position.x,position.y,get_parent())

4
objects/enemy/tin.gd Normal file
View file

@ -0,0 +1,4 @@
extends "res://objects/enemy/enemy_move_diagonal.gd"
func _on_Tin_died():
Game.instance_node(load("res://objects/enemy/tin_die.tscn"), position.x, position.y, get_parent())

4
objects/enemy/tin.tscn
View file

@ -1,6 +1,6 @@
[gd_scene load_steps=8 format=2] [gd_scene load_steps=8 format=2]
[ext_resource path="res://objects/enemy/enemy_move_diagonal.gd" type="Script" id=1] [ext_resource path="res://objects/enemy/tin.gd" type="Script" id=1]
[ext_resource path="res://scripts/1px_border.gdshader" type="Shader" id=2] [ext_resource path="res://scripts/1px_border.gdshader" type="Shader" id=2]
[ext_resource path="res://graphics/enemy/tin.png" type="Texture" id=3] [ext_resource path="res://graphics/enemy/tin.png" type="Texture" id=3]
[ext_resource path="res://graphics/enemy/tin_eye.png" type="Texture" id=4] [ext_resource path="res://graphics/enemy/tin_eye.png" type="Texture" id=4]
@ -32,7 +32,6 @@ extents = Vector2( 4, 4 )
[node name="Tin" type="Node2D"] [node name="Tin" type="Node2D"]
script = ExtResource( 1 ) script = ExtResource( 1 )
score_for_killing = 100 score_for_killing = 100
blood = false
[node name="Sprite" type="Sprite" parent="."] [node name="Sprite" type="Sprite" parent="."]
material = SubResource( 1 ) material = SubResource( 1 )
@ -51,4 +50,5 @@ anims/eye_hue = SubResource( 2 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"] [node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"]
shape = SubResource( 3 ) shape = SubResource( 3 )
[connection signal="died" from="." to="." method="_on_Tin_died" flags=3]
[connection signal="area_entered" from="Hitbox" to="." method="_on_Hitbox_area_entered"] [connection signal="area_entered" from="Hitbox" to="." method="_on_Hitbox_area_entered"]