diff --git a/project/data/spawn_data/default.tres b/project/data/spawn_data/default.tres index d4177fc6..3a377ca6 100644 --- a/project/data/spawn_data/default.tres +++ b/project/data/spawn_data/default.tres @@ -1,10 +1,11 @@ [gd_resource type="SpawnData" format=3 uid="uid://jya2iftfk0f6"] -[ext_resource type="PackedScene" uid="uid://5hg5eirw7v8n" path="res://objects/units/unit_4_wretched.tscn" id="1_0y836"] +[ext_resource type="PackedScene" uid="uid://5hg5eirw7v8n" path="res://objects/units/patrol_a.tscn" id="1_xecfb"] +[ext_resource type="PackedScene" uid="uid://d1vxjcn3op0l8" path="res://objects/units/hunt_a.tscn" id="2_rayfl"] [resource] difficulty_spawns = { -0: ExtResource("1_0y836"), -1: ExtResource("1_0y836"), -2: ExtResource("1_0y836") +0: ExtResource("1_xecfb"), +1: ExtResource("2_rayfl"), +2: ExtResource("1_xecfb") } diff --git a/project/maps/industrial_area_map.scn b/project/maps/industrial_area_map.scn index dd6da72a..2e38ce09 100644 Binary files a/project/maps/industrial_area_map.scn and b/project/maps/industrial_area_map.scn differ diff --git a/project/maps/industrial_area_map.scn.depren b/project/maps/industrial_area_map.scn.depren new file mode 100644 index 00000000..dc64f168 Binary files /dev/null and b/project/maps/industrial_area_map.scn.depren differ diff --git a/project/maps/testmap.tscn b/project/maps/testmap.tscn index 03e97327..925965b7 100644 --- a/project/maps/testmap.tscn +++ b/project/maps/testmap.tscn @@ -1,8 +1,8 @@ -[gd_scene load_steps=9 format=3 uid="uid://dukbdx7dt2qut"] +[gd_scene format=3 uid="uid://dukbdx7dt2qut"] [ext_resource type="PackedScene" uid="uid://snjgu4yp5swd" path="res://objects/player.tscn" id="1_6t4yh"] [ext_resource type="Material" uid="uid://b075rlo1f0e4u" path="res://assets/materials/greenish_grid.tres" id="1_ng1ul"] -[ext_resource type="PackedScene" uid="uid://5hg5eirw7v8n" path="res://objects/units/unit_4_wretched.tscn" id="3_7ng1a"] +[ext_resource type="PackedScene" uid="uid://5hg5eirw7v8n" path="res://objects/units/patrol_a.tscn" id="3_7ng1a"] [ext_resource type="PackedScene" uid="uid://bt054d3ic71rf" path="res://guis/pause_menu.tscn" id="4_d7x8f"] [sub_resource type="NavigationMesh" id="NavigationMesh_7ng1a"] diff --git a/project/objects/units/hunt_a.tscn b/project/objects/units/hunt_a.tscn new file mode 100644 index 00000000..418cdcd7 --- /dev/null +++ b/project/objects/units/hunt_a.tscn @@ -0,0 +1,14 @@ +[gd_scene format=3 uid="uid://d1vxjcn3op0l8"] + +[ext_resource type="PackedScene" uid="uid://cclghy01gblif" path="res://objects/pickups/demo_pack_pickup.tscn" id="1_h11v4"] +[ext_resource type="PackedScene" uid="uid://dqlqgk1veyos8" path="res://objects/enemies/enemy_wretched.tscn" id="2_l3d4y"] + +[node name="PatrolA" type="NpcUnit" unique_id=209119201] +patrol_speed = 3.0 +drop_on_clear = ExtResource("1_h11v4") + +[node name="EnemyWretched" parent="." unique_id=589775425 instance=ExtResource("2_l3d4y")] +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, -0.4453423, 0.023195954, -0.37280393) + +[node name="EnemyWretched5" parent="." unique_id=833864271 instance=ExtResource("2_l3d4y")] +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 0.30714047, 0.023195954, 0.58812845) diff --git a/project/objects/units/unit_4_wretched.tscn b/project/objects/units/patrol_a.tscn similarity index 73% rename from project/objects/units/unit_4_wretched.tscn rename to project/objects/units/patrol_a.tscn index ca6cd386..c51df745 100644 --- a/project/objects/units/unit_4_wretched.tscn +++ b/project/objects/units/patrol_a.tscn @@ -1,20 +1,20 @@ [gd_scene format=3 uid="uid://5hg5eirw7v8n"] -[ext_resource type="PackedScene" uid="uid://cclghy01gblif" path="res://objects/pickups/demo_pack_pickup.tscn" id="1_6gvav"] -[ext_resource type="PackedScene" uid="uid://dqlqgk1veyos8" path="res://objects/enemies/enemy_wretched.tscn" id="1_l77gx"] +[ext_resource type="PackedScene" uid="uid://cclghy01gblif" path="res://objects/pickups/demo_pack_pickup.tscn" id="1_e0nd4"] +[ext_resource type="PackedScene" uid="uid://dqlqgk1veyos8" path="res://objects/enemies/enemy_wretched.tscn" id="2_avriu"] -[node name="NpcUnit" type="NpcUnit" unique_id=209119201] +[node name="PatrolA" type="NpcUnit" unique_id=209119201] patrol_speed = 3.0 -drop_on_clear = ExtResource("1_6gvav") +drop_on_clear = ExtResource("1_e0nd4") -[node name="EnemyWretched" parent="." unique_id=589775425 instance=ExtResource("1_l77gx")] +[node name="EnemyWretched" parent="." unique_id=589775425 instance=ExtResource("2_avriu")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, -1.1853347, 0.023195954, -0.8597343) -[node name="EnemyWretched5" parent="." unique_id=833864271 instance=ExtResource("1_l77gx")] +[node name="EnemyWretched5" parent="." unique_id=833864271 instance=ExtResource("2_avriu")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 0.30714047, 0.023195954, 0.58812845) -[node name="EnemyWretched6" parent="." unique_id=857064194 instance=ExtResource("1_l77gx")] +[node name="EnemyWretched6" parent="." unique_id=857064194 instance=ExtResource("2_avriu")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 0.05460906, 0.023195954, -1.4555124) -[node name="EnemyWretched2" parent="." unique_id=80775110 instance=ExtResource("1_l77gx")] +[node name="EnemyWretched2" parent="." unique_id=80775110 instance=ExtResource("2_avriu")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 1.3425274, 0.023196908, -0.9988682)