From 0922b964168a76a6129d574f545a3b05b2d48661 Mon Sep 17 00:00:00 2001 From: Rendo Date: Fri, 18 Jul 2025 04:03:07 +0500 Subject: [PATCH] fixed zombie spawning in wrong pool --- project.godot | 4 ++-- resources/levels/balance_and_spawn_test.tres | 6 ++---- scripts/level/InitialPackedSceneSpawner.cs | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/project.godot b/project.godot index c8d0ffe..5cc0dbc 100644 --- a/project.godot +++ b/project.godot @@ -121,9 +121,9 @@ locale/translations=PackedStringArray("res://translations/plants.en.translation" 2d_physics/layer_1="Reserved" 2d_physics/layer_2="Plants Dummy" -2d_physics/layer_3="Plants True" +2d_physics/layer_3="Plants Full" 2d_physics/layer_4="Zombies Dummy" -2d_physics/layer_5="Zombies True" +2d_physics/layer_5="Zombies Full" 2d_physics/layer_7="FallLine" 2d_physics/layer_8="FallParticles" diff --git a/resources/levels/balance_and_spawn_test.tres b/resources/levels/balance_and_spawn_test.tres index 5ca10ef..3487575 100644 --- a/resources/levels/balance_and_spawn_test.tres +++ b/resources/levels/balance_and_spawn_test.tres @@ -1,8 +1,6 @@ -[gd_resource type="Resource" script_class="AdventureLevelResource" load_steps=32 format=3 uid="uid://ctbue7dex4umy"] +[gd_resource type="Resource" script_class="AdventureLevelResource" load_steps=30 format=3 uid="uid://ctbue7dex4umy"] -[ext_resource type="PackedScene" uid="uid://b5x35v3w2u8dx" path="res://scenes/entities/plants/potato_mine.tscn" id="1_5e1dl"] [ext_resource type="Script" uid="uid://bximdujbkj2n4" path="res://addons/pvzadventure/AdventureLevelResource.cs" id="1_46lr8"] -[ext_resource type="PackedScene" uid="uid://bgqmwsb6ynm81" path="res://scenes/entities/Zombies/hobo.tscn" id="2_nv3y4"] [ext_resource type="Script" uid="uid://cw7yc3i2lgcja" path="res://addons/pvzadventure/WaveEvent.cs" id="2_otfbt"] [ext_resource type="Script" uid="uid://7rptlb5qr3b6" path="res://addons/pvzadventure/WaveData.cs" id="3_cugtx"] [ext_resource type="Script" uid="uid://dl12rj75tk2qi" path="res://addons/pvzadventure/RowSpawn.cs" id="4_y1e37"] @@ -132,4 +130,4 @@ wavePercentage = 0.5 standardWaveDelay = 15.0 initialWaveDelay = 20.0 waves = [SubResource("Resource_qsvr4"), SubResource("Resource_otfbt"), SubResource("Resource_nv3y4"), SubResource("Resource_mt5r8"), SubResource("Resource_kugcf"), SubResource("Resource_oyvhx"), SubResource("Resource_k4k25"), SubResource("Resource_oxbea"), SubResource("Resource_5cdj6")] -initialScenes = Array[PackedScene]([null, ExtResource("1_5e1dl"), null, null, ExtResource("2_nv3y4"), null, null, null, null, null, ExtResource("1_5e1dl"), null, null, ExtResource("2_nv3y4"), null, null, null, null, null, ExtResource("1_5e1dl"), null, null, ExtResource("2_nv3y4"), null, null, null, null, null, ExtResource("1_5e1dl"), null, null, ExtResource("2_nv3y4"), null, null, null, null, null, ExtResource("1_5e1dl"), null, null, ExtResource("2_nv3y4"), null, null, null, null]) +initialScenes = Array[PackedScene]([null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]) diff --git a/scripts/level/InitialPackedSceneSpawner.cs b/scripts/level/InitialPackedSceneSpawner.cs index 8ffa190..e1cf30f 100644 --- a/scripts/level/InitialPackedSceneSpawner.cs +++ b/scripts/level/InitialPackedSceneSpawner.cs @@ -30,7 +30,7 @@ public partial class InitialPackedSceneSpawner : Node if (entity is RuntimeZombieData) { - PoolContainer.Instance.Structures.AddChild(node); + PoolContainer.Instance.Zombies.AddChild(node); node.GlobalPosition = position + new Vector2(0,0.5f*FieldParams.TileHeight); } else if (entity is RuntimePlantData plant)