From c8f3e8eee6bebc73b4afc7cd6e63e5f8524a04a2 Mon Sep 17 00:00:00 2001 From: Derek Date: Mon, 5 Aug 2024 08:25:09 -0500 Subject: [PATCH] hivemind tweaks --- assets/rocket_explosion.tscn | 1 - assets/spider2.tscn | 1 + project.godot | 2 +- scenes/enemy_working_scene.tscn | 7 +++++-- scripts/EnemyHivemind1.gd | 1 + scripts/LevelManager.gd | 1 - 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/assets/rocket_explosion.tscn b/assets/rocket_explosion.tscn index 42fcf33..9192031 100644 --- a/assets/rocket_explosion.tscn +++ b/assets/rocket_explosion.tscn @@ -18,7 +18,6 @@ point_count = 2 curve = SubResource("Curve_741s1") [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_evi0f"] -inherit_velocity_ratio = 1.0 direction = Vector3(0, 1, 0) spread = 66.739 initial_velocity_min = 10.0 diff --git a/assets/spider2.tscn b/assets/spider2.tscn index a976d61..54af6ca 100644 --- a/assets/spider2.tscn +++ b/assets/spider2.tscn @@ -595,6 +595,7 @@ bullet = ExtResource("2_aew5r") casing = ExtResource("3_e5ft5") bullet_speed = 75 bullet_drop = 0.01 +bullet_damage = 0 stamina = ExtResource("4_p0ci7") ammo = ExtResource("5_k1lw4") money = ExtResource("6_ihv2y") diff --git a/project.godot b/project.godot index 4c7bf98..7288300 100644 --- a/project.godot +++ b/project.godot @@ -11,7 +11,7 @@ config_version=5 [application] config/name="First Person Test" -run/main_scene="res://scenes/test_level_2v2.tscn" +run/main_scene="res://scenes/enemy_working_scene.tscn" config/features=PackedStringArray("4.2", "Forward Plus") config/icon="res://icon.svg" diff --git a/scenes/enemy_working_scene.tscn b/scenes/enemy_working_scene.tscn index f1a0478..3b8d64e 100644 --- a/scenes/enemy_working_scene.tscn +++ b/scenes/enemy_working_scene.tscn @@ -31,6 +31,9 @@ albedo_color = Color(0.300579, 0.462784, 0.249767, 1) [node name="EnemyWork" type="Node3D" node_paths=PackedStringArray("player")] script = ExtResource("1_laua1") player = NodePath("Player") +money = null +health = null +MAX_PARTICLES = null gun_1 = ExtResource("2_poauc") gun_2 = ExtResource("3_xdb5c") @@ -45,7 +48,7 @@ shadow_enabled = true transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00663102, 2.16663, -0.0244913) weapon_sway_amount = 0.07 -[node name="EnemyHivemind1" type="Node3D" parent="."] +[node name="EnemyHivemind1" type="Node3D" parent="." groups=["enemy_hivemind"]] script = ExtResource("5_ngmqi") [node name="spider" parent="EnemyHivemind1" instance=ExtResource("6_qmuhr")] @@ -72,7 +75,7 @@ player_path = NodePath("../../Player") transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.21709, -1.90735e-06, -3.3705) player_path = NodePath("../../Player") -[node name="EnemyHivemind2" type="Node3D" parent="."] +[node name="EnemyHivemind2" type="Node3D" parent="." groups=["enemy_hivemind"]] script = ExtResource("5_ngmqi") [node name="spider4" parent="EnemyHivemind2" instance=ExtResource("6_qmuhr")] diff --git a/scripts/EnemyHivemind1.gd b/scripts/EnemyHivemind1.gd index 8c301e2..cebfbec 100644 --- a/scripts/EnemyHivemind1.gd +++ b/scripts/EnemyHivemind1.gd @@ -12,6 +12,7 @@ func _ready(): # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta): + #calculate move position for each child for i in minions: #by number of minions determine the amount they should rotate around the player to be evenly distributed diff --git a/scripts/LevelManager.gd b/scripts/LevelManager.gd index 44d743c..b8f3d0b 100644 --- a/scripts/LevelManager.gd +++ b/scripts/LevelManager.gd @@ -14,7 +14,6 @@ var guns_dict = {} var current_gun_index var particle_number = 0 var enemy_hiveminds = [] -var remaining_enemies # Called when the node enters the scene tree for the first time. func _ready():