From 804122a3bd02ed2903582cee659205ea36b89ab4 Mon Sep 17 00:00:00 2001 From: Rendo Date: Sun, 20 Jul 2025 00:02:31 +0500 Subject: [PATCH] Small :+1: --- assets/levels/balance_and_spawn_test.tres | 47 +++++++++---------- scenes/gui/choose_your_seeds.tscn | 3 +- scenes/gui/seedpacket.tscn | 3 +- .../gui/choose_your_seeds/LevelRunButton.cs | 1 - scripts/level/LevelController.cs | 2 - 5 files changed, 25 insertions(+), 31 deletions(-) diff --git a/assets/levels/balance_and_spawn_test.tres b/assets/levels/balance_and_spawn_test.tres index 0650af1..e427b41 100644 --- a/assets/levels/balance_and_spawn_test.tres +++ b/assets/levels/balance_and_spawn_test.tres @@ -1,124 +1,123 @@ -[gd_resource type="Resource" script_class="AdventureLevelResource" load_steps=30 format=3 uid="uid://ctbue7dex4umy"] +[gd_resource type="Resource" script_class="AdventureLevelResource" load_steps=29 format=3 uid="uid://ctbue7dex4umy"] [ext_resource type="Script" uid="uid://bximdujbkj2n4" path="res://addons/pvzadventure/AdventureLevelResource.cs" id="1_46lr8"] [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"] -[ext_resource type="Script" uid="uid://cqxj7o8hdm82n" path="res://scripts/resources/ZombieResource.cs" id="5_y1e37"] [ext_resource type="Resource" uid="uid://buvacn56kyy2p" path="res://assets/zombies/basic.tres" id="6_qsvr4"] [ext_resource type="Resource" uid="uid://nceohd32fkxk" path="res://assets/zombies/conehead.tres" id="7_qsvr4"] [sub_resource type="Resource" id="Resource_5e1dl"] script = ExtResource("4_y1e37") -zombies = Array[ExtResource("5_y1e37")]([null, null, null, ExtResource("6_qsvr4"), null]) +zombies = [null, null, null, ExtResource("6_qsvr4"), null] [sub_resource type="Resource" id="Resource_qsvr4"] script = ExtResource("3_cugtx") -zombiesOrdered = Array[ExtResource("4_y1e37")]([SubResource("Resource_5e1dl")]) +zombiesOrdered = [SubResource("Resource_5e1dl")] events = Array[ExtResource("2_otfbt")]([]) customWaveDelay = 0.0 isHugeWave = false [sub_resource type="Resource" id="Resource_y1e37"] script = ExtResource("4_y1e37") -zombies = Array[ExtResource("5_y1e37")]([null, ExtResource("6_qsvr4"), null, null, null]) +zombies = [null, ExtResource("6_qsvr4"), null, null, null] [sub_resource type="Resource" id="Resource_otfbt"] script = ExtResource("3_cugtx") -zombiesOrdered = Array[ExtResource("4_y1e37")]([SubResource("Resource_y1e37")]) +zombiesOrdered = [SubResource("Resource_y1e37")] events = Array[ExtResource("2_otfbt")]([]) customWaveDelay = 0.0 isHugeWave = false [sub_resource type="Resource" id="Resource_ciic2"] script = ExtResource("4_y1e37") -zombies = Array[ExtResource("5_y1e37")]([ExtResource("6_qsvr4"), null, null, ExtResource("6_qsvr4"), null]) +zombies = [ExtResource("6_qsvr4"), null, null, ExtResource("6_qsvr4"), null] [sub_resource type="Resource" id="Resource_nv3y4"] script = ExtResource("3_cugtx") -zombiesOrdered = Array[ExtResource("4_y1e37")]([SubResource("Resource_ciic2")]) +zombiesOrdered = [SubResource("Resource_ciic2")] events = Array[ExtResource("2_otfbt")]([]) customWaveDelay = 0.0 isHugeWave = false [sub_resource type="Resource" id="Resource_1ut7p"] script = ExtResource("4_y1e37") -zombies = Array[ExtResource("5_y1e37")]([null, null, ExtResource("7_qsvr4"), null, null]) +zombies = [null, null, ExtResource("7_qsvr4"), null, null] [sub_resource type="Resource" id="Resource_mt5r8"] script = ExtResource("3_cugtx") -zombiesOrdered = Array[ExtResource("4_y1e37")]([SubResource("Resource_1ut7p")]) +zombiesOrdered = [SubResource("Resource_1ut7p")] events = Array[ExtResource("2_otfbt")]([]) customWaveDelay = 0.0 isHugeWave = false [sub_resource type="Resource" id="Resource_he3sm"] script = ExtResource("4_y1e37") -zombies = Array[ExtResource("5_y1e37")]([ExtResource("6_qsvr4"), ExtResource("6_qsvr4"), ExtResource("6_qsvr4"), null, null]) +zombies = [ExtResource("6_qsvr4"), ExtResource("6_qsvr4"), ExtResource("6_qsvr4"), null, null] [sub_resource type="Resource" id="Resource_kugcf"] script = ExtResource("3_cugtx") -zombiesOrdered = Array[ExtResource("4_y1e37")]([SubResource("Resource_he3sm")]) +zombiesOrdered = [SubResource("Resource_he3sm")] events = Array[ExtResource("2_otfbt")]([]) customWaveDelay = 0.0 isHugeWave = false [sub_resource type="Resource" id="Resource_sadu8"] script = ExtResource("4_y1e37") -zombies = Array[ExtResource("5_y1e37")]([null, ExtResource("6_qsvr4"), ExtResource("6_qsvr4"), null, ExtResource("6_qsvr4")]) +zombies = [null, ExtResource("6_qsvr4"), ExtResource("6_qsvr4"), null, ExtResource("6_qsvr4")] [sub_resource type="Resource" id="Resource_p5aki"] script = ExtResource("4_y1e37") -zombies = Array[ExtResource("5_y1e37")]([null, null, ExtResource("7_qsvr4"), null, null]) +zombies = [null, null, ExtResource("7_qsvr4"), null, null] [sub_resource type="Resource" id="Resource_oyvhx"] script = ExtResource("3_cugtx") -zombiesOrdered = Array[ExtResource("4_y1e37")]([SubResource("Resource_sadu8"), SubResource("Resource_p5aki")]) +zombiesOrdered = [SubResource("Resource_sadu8"), SubResource("Resource_p5aki")] events = Array[ExtResource("2_otfbt")]([]) customWaveDelay = 0.0 isHugeWave = false [sub_resource type="Resource" id="Resource_vikxa"] script = ExtResource("4_y1e37") -zombies = Array[ExtResource("5_y1e37")]([ExtResource("7_qsvr4"), null, null, null, ExtResource("7_qsvr4")]) +zombies = [ExtResource("7_qsvr4"), null, null, null, ExtResource("7_qsvr4")] [sub_resource type="Resource" id="Resource_k4k25"] script = ExtResource("3_cugtx") -zombiesOrdered = Array[ExtResource("4_y1e37")]([SubResource("Resource_vikxa")]) +zombiesOrdered = [SubResource("Resource_vikxa")] events = Array[ExtResource("2_otfbt")]([]) customWaveDelay = 0.0 isHugeWave = false [sub_resource type="Resource" id="Resource_gp8ns"] script = ExtResource("4_y1e37") -zombies = Array[ExtResource("5_y1e37")]([null, null, ExtResource("7_qsvr4"), ExtResource("7_qsvr4"), null]) +zombies = [null, null, ExtResource("7_qsvr4"), ExtResource("7_qsvr4"), null] [sub_resource type="Resource" id="Resource_ki4sn"] script = ExtResource("4_y1e37") -zombies = Array[ExtResource("5_y1e37")]([null, ExtResource("6_qsvr4"), ExtResource("6_qsvr4"), null, ExtResource("6_qsvr4")]) +zombies = [null, ExtResource("6_qsvr4"), ExtResource("6_qsvr4"), null, ExtResource("6_qsvr4")] [sub_resource type="Resource" id="Resource_oxbea"] script = ExtResource("3_cugtx") -zombiesOrdered = Array[ExtResource("4_y1e37")]([SubResource("Resource_gp8ns"), SubResource("Resource_ki4sn")]) +zombiesOrdered = [SubResource("Resource_gp8ns"), SubResource("Resource_ki4sn")] events = Array[ExtResource("2_otfbt")]([]) customWaveDelay = 0.0 isHugeWave = false [sub_resource type="Resource" id="Resource_2irq2"] script = ExtResource("4_y1e37") -zombies = Array[ExtResource("5_y1e37")]([ExtResource("6_qsvr4"), null, ExtResource("6_qsvr4"), ExtResource("6_qsvr4"), null]) +zombies = [ExtResource("6_qsvr4"), null, ExtResource("6_qsvr4"), ExtResource("6_qsvr4"), null] [sub_resource type="Resource" id="Resource_ipu8d"] script = ExtResource("4_y1e37") -zombies = Array[ExtResource("5_y1e37")]([null, ExtResource("6_qsvr4"), ExtResource("6_qsvr4"), null, ExtResource("6_qsvr4")]) +zombies = [null, ExtResource("6_qsvr4"), ExtResource("6_qsvr4"), null, ExtResource("6_qsvr4")] [sub_resource type="Resource" id="Resource_vu1ng"] script = ExtResource("4_y1e37") -zombies = Array[ExtResource("5_y1e37")]([null, ExtResource("7_qsvr4"), ExtResource("7_qsvr4"), ExtResource("7_qsvr4"), null]) +zombies = [null, ExtResource("7_qsvr4"), ExtResource("7_qsvr4"), ExtResource("7_qsvr4"), null] [sub_resource type="Resource" id="Resource_5cdj6"] script = ExtResource("3_cugtx") -zombiesOrdered = Array[ExtResource("4_y1e37")]([SubResource("Resource_2irq2"), SubResource("Resource_ipu8d"), SubResource("Resource_vu1ng")]) +zombiesOrdered = [SubResource("Resource_2irq2"), SubResource("Resource_ipu8d"), SubResource("Resource_vu1ng")] events = Array[ExtResource("2_otfbt")]([]) customWaveDelay = 20.0 isHugeWave = true diff --git a/scenes/gui/choose_your_seeds.tscn b/scenes/gui/choose_your_seeds.tscn index 11e97a4..77e6c69 100644 --- a/scenes/gui/choose_your_seeds.tscn +++ b/scenes/gui/choose_your_seeds.tscn @@ -135,7 +135,7 @@ layout_mode = 2 columns = 7 script = ExtResource("4_i7sou") -[node name="LevelRunButton" parent="Panel" node_paths=PackedStringArray("_player") instance=ExtResource("5_n80ic")] +[node name="LevelRunButton" parent="Panel" instance=ExtResource("5_n80ic")] layout_mode = 1 anchor_left = 1.0 anchor_right = 1.181 @@ -143,7 +143,6 @@ anchor_bottom = 0.131 offset_right = -16.16 offset_bottom = -16.016 script = ExtResource("7_k6b6g") -_player = NodePath("") [node name="AlmanachButton" type="Button" parent="Panel"] layout_mode = 0 diff --git a/scenes/gui/seedpacket.tscn b/scenes/gui/seedpacket.tscn index b80164b..379fee9 100644 --- a/scenes/gui/seedpacket.tscn +++ b/scenes/gui/seedpacket.tscn @@ -21,8 +21,7 @@ shader_parameter/mask = ExtResource("1_77bw1") anchors_preset = -1 anchor_right = 0.137 anchor_bottom = 0.28 -offset_left = 2.0 -offset_right = 1.8 +offset_right = -0.199997 mouse_default_cursor_shape = 2 texture_normal = ExtResource("1_77bw1") texture_focused = ExtResource("3_q0tvq") diff --git a/scripts/gui/choose_your_seeds/LevelRunButton.cs b/scripts/gui/choose_your_seeds/LevelRunButton.cs index 97d0e36..12a5c15 100644 --- a/scripts/gui/choose_your_seeds/LevelRunButton.cs +++ b/scripts/gui/choose_your_seeds/LevelRunButton.cs @@ -5,7 +5,6 @@ namespace Newlon.Components.GUI; public partial class LevelRunButton : Button { - [Export] private AnimationPlayer _player; public override void _Pressed() { RuntimeLevelData.Instance.SetLevelState(RuntimeLevelData.LevelStates.Pregame); diff --git a/scripts/level/LevelController.cs b/scripts/level/LevelController.cs index a1fe24e..be3880c 100644 --- a/scripts/level/LevelController.cs +++ b/scripts/level/LevelController.cs @@ -41,8 +41,6 @@ public partial class LevelController : Node } public void RestartLevel() { - if (_isLevelRunning == false) - return; var resource = RuntimeLevelData.LevelResource; GetTree().ReloadCurrentScene(); RuntimeLevelData.LevelResource = resource;