From 7b190aaba168a431d7b6d0c84676c5977d73e02f Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Sun, 3 Apr 2022 08:22:18 +0200 Subject: [PATCH] :wrench: Set Player and Enemy's alliances --- src/entities/Enemy.tscn | 6 +++++- src/entities/Player.tscn | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/entities/Enemy.tscn b/src/entities/Enemy.tscn index 40b0e94..90874bc 100644 --- a/src/entities/Enemy.tscn +++ b/src/entities/Enemy.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=7 format=2] [ext_resource path="res://src/mechanics/Black.png" type="Texture" id=1] [ext_resource path="res://src/entities/behaviours/ErraticMovement.tscn" type="PackedScene" id=2] [ext_resource path="res://src/entities/behaviours/AttractedTo.tscn" type="PackedScene" id=3] [ext_resource path="res://src/entities/behaviours/Damageable.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/entities/behaviours/Alliance.tscn" type="PackedScene" id=5] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 16, 16 ) @@ -21,3 +22,6 @@ texture = ExtResource( 1 ) [node name="ErraticMovement" parent="." instance=ExtResource( 2 )] [node name="Damageable" parent="." instance=ExtResource( 4 )] + +[node name="Alliance" parent="." instance=ExtResource( 5 )] +alliance = -1 diff --git a/src/entities/Player.tscn b/src/entities/Player.tscn index dd660bd..88161e9 100644 --- a/src/entities/Player.tscn +++ b/src/entities/Player.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=7 format=2] [ext_resource path="res://src/mechanics/White.png" type="Texture" id=1] [ext_resource path="res://src/entities/behaviours/PlayerMovement.tscn" type="PackedScene" id=2] [ext_resource path="res://src/entities/behaviours/BulletSpawn.tscn" type="PackedScene" id=3] [ext_resource path="res://src/entities/behaviours/Damageable.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/entities/behaviours/Alliance.tscn" type="PackedScene" id=5] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 16, 16 ) @@ -24,3 +25,6 @@ texture = ExtResource( 1 ) [node name="Damageable" parent="." instance=ExtResource( 4 )] health = 5 max_health = 5 + +[node name="Alliance" parent="." instance=ExtResource( 5 )] +alliance = 1