diff --git a/objects/enemy/bat.tscn b/objects/enemy/bat.tscn index 605ddf3..6361873 100644 --- a/objects/enemy/bat.tscn +++ b/objects/enemy/bat.tscn @@ -33,7 +33,6 @@ script = ExtResource( 3 ) score_for_killing = 25 speed = 40 move_direction = 1 -flip_sprite = false [node name="AnimatedSprite" type="AnimatedSprite" parent="."] material = SubResource( 1 ) diff --git a/objects/enemy/enemy_move_sidesideupdown.gd b/objects/enemy/enemy_move_sidesideupdown.gd index b59a471..365c157 100644 --- a/objects/enemy/enemy_move_sidesideupdown.gd +++ b/objects/enemy/enemy_move_sidesideupdown.gd @@ -11,10 +11,10 @@ export var direction = 1 export var speed = 50 #Move horizontal or vertical export(Direction) var move_direction -export var flip_sprite = true +export var node_to_flip: NodePath #Onreadys onready var startpos = position -onready var sprite = $AnimatedSprite +onready var _flipped_node: Node2D = get_node_or_null(node_to_flip) func _ready(): if Engine.editor_hint: @@ -40,10 +40,12 @@ func move_side_to_side(delta): #Switch dir if position.x >= startpos.x + (right_down_boundary): 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): 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): #Move @@ -51,10 +53,12 @@ func move_up_and_down(delta): #Switch dir if position.y >= startpos.y + (right_down_boundary): 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): 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 func _draw(): diff --git a/objects/enemy/laser_wall.tscn b/objects/enemy/laser_wall.tscn index 2d3431f..9b0a909 100644 --- a/objects/enemy/laser_wall.tscn +++ b/objects/enemy/laser_wall.tscn @@ -34,7 +34,6 @@ tracks/0/keys = { script = ExtResource( 2 ) blood = false speed = 16 -flip_sprite = false [node name="Laser" type="Line2D" parent="."] material = SubResource( 1 ) diff --git a/objects/enemy/robosnake.tscn b/objects/enemy/robosnake.tscn index 8287470..e98abe4 100644 --- a/objects/enemy/robosnake.tscn +++ b/objects/enemy/robosnake.tscn @@ -6,4 +6,4 @@ [node name="AnimatedSprite" parent="." index="0"] animation = "robo" -frame = 0 +frame = 1 diff --git a/objects/enemy/snail.tscn b/objects/enemy/snail.tscn index 49bd875..d3aac96 100644 --- a/objects/enemy/snail.tscn +++ b/objects/enemy/snail.tscn @@ -31,7 +31,6 @@ faster_speed = 60 [node name="AnimatedSprite" type="AnimatedSprite" parent="."] position = Vector2( 3, 3 ) frames = SubResource( 4 ) -frame = 1 playing = true [node name="Hitbox" type="Area2D" parent="." groups=["enemy_hitbox"]] diff --git a/objects/enemy/snake.tscn b/objects/enemy/snake.tscn index 66ad2e4..a64061d 100644 --- a/objects/enemy/snake.tscn +++ b/objects/enemy/snake.tscn @@ -45,6 +45,7 @@ extents = Vector2( 4, 4 ) [node name="Snake" type="Node2D" groups=["enemy"]] script = ExtResource( 3 ) score_for_killing = 15 +node_to_flip = NodePath("AnimatedSprite") [node name="AnimatedSprite" type="AnimatedSprite" parent="."] material = SubResource( 1 ) diff --git a/objects/enemy/spider.tscn b/objects/enemy/spider.tscn index 5c91706..eb4a9bc 100644 --- a/objects/enemy/spider.tscn +++ b/objects/enemy/spider.tscn @@ -42,6 +42,7 @@ position = Vector2( 5, 5 ) [node name="AnimatedSprite" type="AnimatedSprite" parent="Hitbox"] frames = SubResource( 3 ) +frame = 1 playing = true [node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"]