fix errorspew in movesideside enemies without an AnimatedSprite (fixes #88)
This commit is contained in:
parent
28920ef700
commit
0655605091
7 changed files with 13 additions and 10 deletions
|
@ -33,7 +33,6 @@ script = ExtResource( 3 )
|
||||||
score_for_killing = 25
|
score_for_killing = 25
|
||||||
speed = 40
|
speed = 40
|
||||||
move_direction = 1
|
move_direction = 1
|
||||||
flip_sprite = false
|
|
||||||
|
|
||||||
[node name="AnimatedSprite" type="AnimatedSprite" parent="."]
|
[node name="AnimatedSprite" type="AnimatedSprite" parent="."]
|
||||||
material = SubResource( 1 )
|
material = SubResource( 1 )
|
||||||
|
|
|
@ -11,10 +11,10 @@ export var direction = 1
|
||||||
export var speed = 50
|
export var speed = 50
|
||||||
#Move horizontal or vertical
|
#Move horizontal or vertical
|
||||||
export(Direction) var move_direction
|
export(Direction) var move_direction
|
||||||
export var flip_sprite = true
|
export var node_to_flip: NodePath
|
||||||
#Onreadys
|
#Onreadys
|
||||||
onready var startpos = position
|
onready var startpos = position
|
||||||
onready var sprite = $AnimatedSprite
|
onready var _flipped_node: Node2D = get_node_or_null(node_to_flip)
|
||||||
|
|
||||||
func _ready():
|
func _ready():
|
||||||
if Engine.editor_hint:
|
if Engine.editor_hint:
|
||||||
|
@ -40,10 +40,12 @@ func move_side_to_side(delta):
|
||||||
#Switch dir
|
#Switch dir
|
||||||
if position.x >= startpos.x + (right_down_boundary):
|
if position.x >= startpos.x + (right_down_boundary):
|
||||||
direction = -1
|
direction = -1
|
||||||
if flip_sprite == true: sprite.scale.x = -1
|
if is_instance_valid(_flipped_node):
|
||||||
|
_flipped_node.scale.x = -1.0
|
||||||
if position.x <= startpos.x + (-left_up_boundary):
|
if position.x <= startpos.x + (-left_up_boundary):
|
||||||
direction = 1
|
direction = 1
|
||||||
if flip_sprite == true: sprite.scale.x = 1
|
if is_instance_valid(_flipped_node):
|
||||||
|
_flipped_node.scale.x = 1.0
|
||||||
|
|
||||||
func move_up_and_down(delta):
|
func move_up_and_down(delta):
|
||||||
#Move
|
#Move
|
||||||
|
@ -51,10 +53,12 @@ func move_up_and_down(delta):
|
||||||
#Switch dir
|
#Switch dir
|
||||||
if position.y >= startpos.y + (right_down_boundary):
|
if position.y >= startpos.y + (right_down_boundary):
|
||||||
direction = -1
|
direction = -1
|
||||||
if flip_sprite == true: sprite.scale.y = 1
|
if is_instance_valid(_flipped_node):
|
||||||
|
_flipped_node.scale.y = 1.0
|
||||||
if position.y <= startpos.y + (-left_up_boundary):
|
if position.y <= startpos.y + (-left_up_boundary):
|
||||||
direction = 1
|
direction = 1
|
||||||
if flip_sprite == true: sprite.scale.y = -1
|
if is_instance_valid(_flipped_node):
|
||||||
|
_flipped_node.scale.y = -1.0
|
||||||
|
|
||||||
# editor debug drawing
|
# editor debug drawing
|
||||||
func _draw():
|
func _draw():
|
||||||
|
|
|
@ -34,7 +34,6 @@ tracks/0/keys = {
|
||||||
script = ExtResource( 2 )
|
script = ExtResource( 2 )
|
||||||
blood = false
|
blood = false
|
||||||
speed = 16
|
speed = 16
|
||||||
flip_sprite = false
|
|
||||||
|
|
||||||
[node name="Laser" type="Line2D" parent="."]
|
[node name="Laser" type="Line2D" parent="."]
|
||||||
material = SubResource( 1 )
|
material = SubResource( 1 )
|
||||||
|
|
|
@ -6,4 +6,4 @@
|
||||||
|
|
||||||
[node name="AnimatedSprite" parent="." index="0"]
|
[node name="AnimatedSprite" parent="." index="0"]
|
||||||
animation = "robo"
|
animation = "robo"
|
||||||
frame = 0
|
frame = 1
|
||||||
|
|
|
@ -31,7 +31,6 @@ faster_speed = 60
|
||||||
[node name="AnimatedSprite" type="AnimatedSprite" parent="."]
|
[node name="AnimatedSprite" type="AnimatedSprite" parent="."]
|
||||||
position = Vector2( 3, 3 )
|
position = Vector2( 3, 3 )
|
||||||
frames = SubResource( 4 )
|
frames = SubResource( 4 )
|
||||||
frame = 1
|
|
||||||
playing = true
|
playing = true
|
||||||
|
|
||||||
[node name="Hitbox" type="Area2D" parent="." groups=["enemy_hitbox"]]
|
[node name="Hitbox" type="Area2D" parent="." groups=["enemy_hitbox"]]
|
||||||
|
|
|
@ -45,6 +45,7 @@ extents = Vector2( 4, 4 )
|
||||||
[node name="Snake" type="Node2D" groups=["enemy"]]
|
[node name="Snake" type="Node2D" groups=["enemy"]]
|
||||||
script = ExtResource( 3 )
|
script = ExtResource( 3 )
|
||||||
score_for_killing = 15
|
score_for_killing = 15
|
||||||
|
node_to_flip = NodePath("AnimatedSprite")
|
||||||
|
|
||||||
[node name="AnimatedSprite" type="AnimatedSprite" parent="."]
|
[node name="AnimatedSprite" type="AnimatedSprite" parent="."]
|
||||||
material = SubResource( 1 )
|
material = SubResource( 1 )
|
||||||
|
|
|
@ -42,6 +42,7 @@ position = Vector2( 5, 5 )
|
||||||
|
|
||||||
[node name="AnimatedSprite" type="AnimatedSprite" parent="Hitbox"]
|
[node name="AnimatedSprite" type="AnimatedSprite" parent="Hitbox"]
|
||||||
frames = SubResource( 3 )
|
frames = SubResource( 3 )
|
||||||
|
frame = 1
|
||||||
playing = true
|
playing = true
|
||||||
|
|
||||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"]
|
[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"]
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue