From 20fa8857364d1f3226369b9939cee0ef40e0c1db Mon Sep 17 00:00:00 2001 From: pennyrigate Date: Wed, 7 Dec 2022 02:10:12 -0500 Subject: [PATCH] use enemy parent script --- objects/enemy/enemy.gd | 13 +++++++++++++ objects/enemy/enemy.tscn | 6 ++++++ objects/enemy/enemy_move_sidesideupdown.gd | 13 +------------ objects/enemy/enemy_stationary.gd | 14 +++----------- 4 files changed, 23 insertions(+), 23 deletions(-) create mode 100644 objects/enemy/enemy.gd create mode 100644 objects/enemy/enemy.tscn diff --git a/objects/enemy/enemy.gd b/objects/enemy/enemy.gd new file mode 100644 index 0000000..0cfc198 --- /dev/null +++ b/objects/enemy/enemy.gd @@ -0,0 +1,13 @@ +extends Node2D + +export var can_be_killed_by_sword = true + +func _on_Area2D_area_entered(area): + #Kill player + if area.is_in_group("player"): + area.get_parent().die() + #Die from sword + if area.is_in_group("sword"): + if can_be_killed_by_sword: + queue_free() + diff --git a/objects/enemy/enemy.tscn b/objects/enemy/enemy.tscn new file mode 100644 index 0000000..a6f6626 --- /dev/null +++ b/objects/enemy/enemy.tscn @@ -0,0 +1,6 @@ +[gd_scene load_steps=2 format=2] + +[ext_resource path="res://objects/enemy/enemy.gd" type="Script" id=1] + +[node name="Enemy" type="Node2D"] +script = ExtResource( 1 ) diff --git a/objects/enemy/enemy_move_sidesideupdown.gd b/objects/enemy/enemy_move_sidesideupdown.gd index d7b65ef..228aea0 100644 --- a/objects/enemy/enemy_move_sidesideupdown.gd +++ b/objects/enemy/enemy_move_sidesideupdown.gd @@ -1,4 +1,4 @@ -extends Node2D +extends "res://objects/enemy/enemy.gd" #How far to move export var left_up_boundry = 0.0 @@ -9,7 +9,6 @@ export var speed = 50 #Move horizontal or vertical export(int, "Horizontal", "Vertical") var move_direction export var flip_sprite = true -export var can_be_killed_by_sword = true #Onreadys onready var startpos = position onready var sprite = $AnimatedSprite @@ -40,13 +39,3 @@ func move_up_and_down(delta): if position.y <= startpos.y + (-left_up_boundry * 8): direction = 1 if flip_sprite == true: sprite.scale.y = -1 - - -func _on_Area2D_area_entered(area): - #Kill player - if area.is_in_group("player"): - area.get_parent().die() - #Die from sword - if area.is_in_group("sword"): - if can_be_killed_by_sword: - queue_free() diff --git a/objects/enemy/enemy_stationary.gd b/objects/enemy/enemy_stationary.gd index 60fefaa..aa523af 100644 --- a/objects/enemy/enemy_stationary.gd +++ b/objects/enemy/enemy_stationary.gd @@ -1,12 +1,4 @@ -extends Node2D +extends "res://objects/enemy/enemy.gd" -export var can_be_killed_by_sword = true - -func _on_Area2D_area_entered(area): - #Kill player - if area.is_in_group("player"): - area.get_parent().die() - #Die from sword - if area.is_in_group("sword"): - if can_be_killed_by_sword: - queue_free() +func _process(delta): + scale.x = -1