From c18c7f4db72c7cc27016dc03cd0855454beaf5a7 Mon Sep 17 00:00:00 2001 From: Rendo Date: Thu, 17 Jul 2025 18:11:00 +0500 Subject: [PATCH] Refactored code --- .../pvzadventure/scenes/adventure_editor.tscn | 5 +- .../pvzadventure/scenes/initial_editor.tscn | 5 + .../scenes/universal_grid_item.tscn | 27 +++++ .../pvzadventure/scripts/AdventureEditor.cs | 3 + .../scripts/AdventureResourceInspector.cs | 103 +++++++++--------- .../pvzadventure/scripts/EditorsContainer.cs | 13 +++ .../scripts/EditorsContainer.cs.uid | 1 + addons/pvzadventure/scripts/UNI_GridItem.cs | 15 +++ .../pvzadventure/scripts/UNI_GridItem.cs.uid | 1 + resources/levels/test_level_2.tres | 2 +- resources/levels/test_level_3.tres | 11 ++ .../levels/test_level_for_execution.tres | 6 +- scenes/entities/plants/potato_mine.tscn | 2 +- 13 files changed, 136 insertions(+), 58 deletions(-) create mode 100644 addons/pvzadventure/scenes/initial_editor.tscn create mode 100644 addons/pvzadventure/scenes/universal_grid_item.tscn create mode 100644 addons/pvzadventure/scripts/EditorsContainer.cs create mode 100644 addons/pvzadventure/scripts/EditorsContainer.cs.uid create mode 100644 addons/pvzadventure/scripts/UNI_GridItem.cs create mode 100644 addons/pvzadventure/scripts/UNI_GridItem.cs.uid create mode 100644 resources/levels/test_level_3.tres diff --git a/addons/pvzadventure/scenes/adventure_editor.tscn b/addons/pvzadventure/scenes/adventure_editor.tscn index aac382c..8f53ced 100644 --- a/addons/pvzadventure/scenes/adventure_editor.tscn +++ b/addons/pvzadventure/scenes/adventure_editor.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=5 format=3 uid="uid://dkq82o31vr3i2"] +[gd_scene load_steps=6 format=3 uid="uid://dkq82o31vr3i2"] [ext_resource type="Script" uid="uid://dkgxtig5fwdgi" path="res://addons/pvzadventure/scripts/AdventureEditor.cs" id="1_go5yu"] [ext_resource type="Script" uid="uid://binuuattefn7d" path="res://addons/pvzadventure/scripts/FileButton.cs" id="2_d5hwn"] [ext_resource type="PackedScene" uid="uid://db5ah76l43ng2" path="res://addons/pvzadventure/scenes/zombie_editor.tscn" id="3_1ojhm"] +[ext_resource type="Script" uid="uid://c6jttmpeyakoa" path="res://addons/pvzadventure/scripts/EditorsContainer.cs" id="3_5imrs"] [ext_resource type="Script" uid="uid://b0hl4ap18wbb2" path="res://addons/pvzadventure/scripts/AdventureResourceInspector.cs" id="3_d5hwn"] [node name="AdventureEditor" type="MarginContainer"] @@ -49,6 +50,7 @@ size_flags_vertical = 3 layout_mode = 2 size_flags_horizontal = 3 size_flags_stretch_ratio = 3.0 +script = ExtResource("3_5imrs") [node name="ZombieEditor" parent="Editor/WorkArea/PanelContainer" instance=ExtResource("3_1ojhm")] visible = false @@ -80,6 +82,7 @@ size_flags_vertical = 8 layout_mode = 2 text = "New" +[connection signal="HardReloadRequested" from="." to="Editor/WorkArea/PanelContainer" method="ClearChildren"] [connection signal="ResourceChanged" from="." to="Editor/WorkArea/Inspector/ResourceInspector" method="Refresh"] [connection signal="Refreshed" from="Editor/WorkArea/Inspector/ResourceInspector" to="." method="Save"] [connection signal="button_clicked" from="Editor/WorkArea/Inspector/ResourceInspector/Tree" to="Editor/WorkArea/Inspector/ResourceInspector" method="OnTreeButtonClicked"] diff --git a/addons/pvzadventure/scenes/initial_editor.tscn b/addons/pvzadventure/scenes/initial_editor.tscn new file mode 100644 index 0000000..551fe43 --- /dev/null +++ b/addons/pvzadventure/scenes/initial_editor.tscn @@ -0,0 +1,5 @@ +[gd_scene format=3 uid="uid://sqessjn0m4o3"] + +[node name="InitialEditor" type="ScrollContainer"] +offset_right = 40.0 +offset_bottom = 40.0 diff --git a/addons/pvzadventure/scenes/universal_grid_item.tscn b/addons/pvzadventure/scenes/universal_grid_item.tscn new file mode 100644 index 0000000..8035983 --- /dev/null +++ b/addons/pvzadventure/scenes/universal_grid_item.tscn @@ -0,0 +1,27 @@ +[gd_scene load_steps=3 format=3 uid="uid://djb8ynxhnmo0t"] + +[ext_resource type="Script" uid="uid://fof6kr0et8ng" path="res://addons/pvzadventure/scripts/ZE_GridItem.cs" id="1_e5mae"] + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_jbknv"] +bg_color = Color(0.18359, 0.18359, 0.18359, 1) +border_color = Color(0.140447, 0.140447, 0.140447, 1) +corner_radius_top_left = 5 +corner_radius_top_right = 5 +corner_radius_bottom_right = 5 +corner_radius_bottom_left = 5 + +[node name="GridItem" type="PanelContainer"] +clip_contents = true +custom_minimum_size = Vector2(100, 100) +anchors_preset = -1 +anchor_right = 0.172 +anchor_bottom = 0.25 +offset_right = -0.200005 +offset_bottom = -15.0 +theme_override_styles/panel = SubResource("StyleBoxFlat_jbknv") +script = ExtResource("1_e5mae") + +[node name="Texture" type="TextureRect" parent="."] +layout_mode = 2 +expand_mode = 1 +stretch_mode = 5 diff --git a/addons/pvzadventure/scripts/AdventureEditor.cs b/addons/pvzadventure/scripts/AdventureEditor.cs index 1f98b89..33bfb8f 100644 --- a/addons/pvzadventure/scripts/AdventureEditor.cs +++ b/addons/pvzadventure/scripts/AdventureEditor.cs @@ -10,6 +10,8 @@ public partial class AdventureEditor : MarginContainer public delegate void ResourceChangedEventHandler(AdventureLevelResource to); [Signal] public delegate void ReloadRequestedEventHandler(); + [Signal] + public delegate void HardReloadRequestedEventHandler(); public void Reload() { @@ -19,6 +21,7 @@ public partial class AdventureEditor : MarginContainer { editedResource = ResourceLoader.Load(editedPath); EmitSignal(SignalName.ResourceChanged, editedResource); + EmitSignal(SignalName.HardReloadRequested); Reload(); } diff --git a/addons/pvzadventure/scripts/AdventureResourceInspector.cs b/addons/pvzadventure/scripts/AdventureResourceInspector.cs index c56f1b7..8274e0c 100644 --- a/addons/pvzadventure/scripts/AdventureResourceInspector.cs +++ b/addons/pvzadventure/scripts/AdventureResourceInspector.cs @@ -5,23 +5,28 @@ using System.Globalization; [Tool] public partial class AdventureResourceInspector : Node { - const int ORDERED = 0; - const int EVENTS = 1; + const string LEVEL_ITEM_NAME = "Level"; + const string INITIAL_ITEM_NAME = "Initial data"; + const string ZOMBIES_ITEM_NAME = "Zombies"; + const string EVENTS_ITEM_NAME = "Events"; + const string HUGEWAVE_ITEM_NAME = "Is huge wave?"; private PackedScene zombieEditorScene = ResourceLoader.Load("uid://db5ah76l43ng2"); private Tree tree; private AdventureLevelResource heldResource; - private TreeItem root; private Texture2D deleteTexture = ResourceLoader.Load("res://addons/pvzadventure/icons/delete.png"); [Signal] public delegate void RefreshedEventHandler(); [Export] - public Control editorContainer; + public EditorsContainer editorContainer; [Export] public AdventureEditor adventureEditor; + private TreeItem root; + private TreeItem initialData; + public override void _Ready() { tree = GetNode("Tree"); @@ -36,39 +41,28 @@ public partial class AdventureResourceInspector : Node private void RefreshTree() { EmitSignal(SignalName.Refreshed); - - tree.Clear(); - root = tree.CreateItem(); - root.DisableFolding = true; - root.SetText(0, "Level"); - var initial = tree.CreateItem(root); - initial.SetText(0, "Initial data"); + tree.Clear(); + root = CreateItem(LEVEL_ITEM_NAME); + + initialData = CreateItem(INITIAL_ITEM_NAME, root); for (int i = 0; i < heldResource.waves.Count; i++) { - var item = tree.CreateItem(root); - item.DisableFolding = true; - item.SetText(0, string.Format("Wave {0}", i)); - item.AddButton(0, deleteTexture, tooltipText: "Removes wave. (note that number will not visibly change)"); + var wave = CreateItem(string.Format("Wave {0}", i), root); + wave.AddButton(0, deleteTexture, tooltipText: "Removes wave. (note that number will not visibly change)"); - var order = tree.CreateItem(item); - order.SetText(0, "Zombies"); + CreateItem(ZOMBIES_ITEM_NAME, wave); + CreateItem(EVENTS_ITEM_NAME, wave); + CreateItem(HUGEWAVE_ITEM_NAME, TreeItem.TreeCellMode.Check, true, wave) + .SetChecked(0, heldResource.waves[i].isHugeWave); + - var spawns = tree.CreateItem(item); - spawns.SetText(0, "Events"); - - var huge_wave = tree.CreateItem(item); - huge_wave.SetCellMode(0, TreeItem.TreeCellMode.Check); - huge_wave.SetChecked(0, heldResource.waves[i].isHugeWave); - huge_wave.SetText(0, "Is huge wave?"); - huge_wave.SetEditable(0, true); - - var delay = tree.CreateItem(item); + var delay = tree.CreateItem(wave); if (heldResource.waves[i].customWaveDelay > 0) delay.SetText(0, heldResource.waves[i].customWaveDelay.ToString(new CultureInfo("en-US"))); else - delay.SetText(0, "Delay"); + delay.SetText(0, heldResource.standardWaveDelay.ToString()); delay.SetEditable(0, true); } } @@ -84,40 +78,30 @@ public partial class AdventureResourceInspector : Node { var selected = tree.GetSelected(); - if ((selected.GetParent() == root && selected.GetIndex() != 0) || selected.IsEditable(0)) return; + if (selected.IsEditable(0) || selected.GetText(0).Split(" ")[0] == "Wave") return; - foreach (var child in editorContainer.GetChildren()) - { - child.QueueFree(); - } + editorContainer.ClearChildren(); - if (selected == root) + switch (selected.GetText(0)) { - GD.Print("level pressed"); - return; - } - var index = selected.GetIndex(); - if (index == 0 && selected.GetParent() == root) - { - GD.Print("Initial data selected"); - return; - } - if (index == ORDERED) - { + case LEVEL_ITEM_NAME: + EditorInterface.Singleton.EditResource(adventureEditor.editedResource); + tree.DeselectAll(); + return; + case ZOMBIES_ITEM_NAME: var editor = zombieEditorScene.Instantiate(); editorContainer.AddChild(editor); editor.SetEditedWave(heldResource.waves[GetWaveIndex(selected.GetParent())]); editor.SaveCallback += adventureEditor.Save; return; - } - else if (index == EVENTS) - { - GD.Print("Events pressed"); - return; - } + case EVENTS_ITEM_NAME: + break; + case INITIAL_ITEM_NAME: + break; + } } public void OnItemEdited() @@ -141,11 +125,12 @@ public partial class AdventureResourceInspector : Node } } Callable.From(RefreshTree).CallDeferred(); - + } public void OnTreeButtonClicked(TreeItem item, int column, int id, int button_index) { heldResource.waves.RemoveAt(GetWaveIndex(item)); + adventureEditor.HardReload(); RefreshTree(); } @@ -153,4 +138,18 @@ public partial class AdventureResourceInspector : Node { return int.Parse(waveTreeItem.GetText(0).Split(" ")[1]); } + private TreeItem CreateItem(string Name, TreeItem root = null) + { + var item = tree.CreateItem(root); + item.SetText(0, Name); + return item; + } + private TreeItem CreateItem(string Name, TreeItem.TreeCellMode cellMode, bool editable, TreeItem root = null) + { + var item = tree.CreateItem(root); + item.SetCellMode(0,cellMode); + item.SetEditable(0, editable); + item.SetText(0, Name); + return item; + } } diff --git a/addons/pvzadventure/scripts/EditorsContainer.cs b/addons/pvzadventure/scripts/EditorsContainer.cs new file mode 100644 index 0000000..a9db41c --- /dev/null +++ b/addons/pvzadventure/scripts/EditorsContainer.cs @@ -0,0 +1,13 @@ +using Godot; + +[Tool] +public partial class EditorsContainer : PanelContainer +{ + public void ClearChildren() + { + foreach (var child in GetChildren()) + { + child.QueueFree(); + } + } +} diff --git a/addons/pvzadventure/scripts/EditorsContainer.cs.uid b/addons/pvzadventure/scripts/EditorsContainer.cs.uid new file mode 100644 index 0000000..3f3ce39 --- /dev/null +++ b/addons/pvzadventure/scripts/EditorsContainer.cs.uid @@ -0,0 +1 @@ +uid://c6jttmpeyakoa diff --git a/addons/pvzadventure/scripts/UNI_GridItem.cs b/addons/pvzadventure/scripts/UNI_GridItem.cs new file mode 100644 index 0000000..c69b09d --- /dev/null +++ b/addons/pvzadventure/scripts/UNI_GridItem.cs @@ -0,0 +1,15 @@ +using Godot; +using System; + +public partial class UNI_GridItem : PanelContainer +{ + // Called when the node enters the scene tree for the first time. + public override void _Ready() + { + } + + // Called every frame. 'delta' is the elapsed time since the previous frame. + public override void _Process(double delta) + { + } +} diff --git a/addons/pvzadventure/scripts/UNI_GridItem.cs.uid b/addons/pvzadventure/scripts/UNI_GridItem.cs.uid new file mode 100644 index 0000000..6e63976 --- /dev/null +++ b/addons/pvzadventure/scripts/UNI_GridItem.cs.uid @@ -0,0 +1 @@ +uid://b8ccbjhhus7xk diff --git a/resources/levels/test_level_2.tres b/resources/levels/test_level_2.tres index 4aab480..8432e1c 100644 --- a/resources/levels/test_level_2.tres +++ b/resources/levels/test_level_2.tres @@ -8,4 +8,4 @@ startSun = 50.0 wavePercentage = 0.0 standardWaveDelay = 0.0 initialWaveDelay = 0.0 -waves = null +waves = [] diff --git a/resources/levels/test_level_3.tres b/resources/levels/test_level_3.tres new file mode 100644 index 0000000..f4b4653 --- /dev/null +++ b/resources/levels/test_level_3.tres @@ -0,0 +1,11 @@ +[gd_resource type="Resource" script_class="AdventureLevelResource" load_steps=2 format=3 uid="uid://b7p18kka1gx5a"] + +[ext_resource type="Script" uid="uid://bximdujbkj2n4" path="res://addons/pvzadventure/AdventureLevelResource.cs" id="1_5hmhj"] + +[resource] +script = ExtResource("1_5hmhj") +startSun = 50.0 +wavePercentage = 0.0 +standardWaveDelay = 0.0 +initialWaveDelay = 0.0 +waves = [] diff --git a/resources/levels/test_level_for_execution.tres b/resources/levels/test_level_for_execution.tres index 70be94d..271ebb2 100644 --- a/resources/levels/test_level_for_execution.tres +++ b/resources/levels/test_level_for_execution.tres @@ -19,8 +19,8 @@ zombies = Array[ExtResource("5_8miqm")]([null, null, ExtResource("8_ulhin"), nul script = ExtResource("3_hlq35") zombiesOrdered = Array[ExtResource("4_8miqm")]([SubResource("Resource_n6yt3")]) events = Array[ExtResource("2_8aewt")]([]) -customWaveDelay = 0.0 -isHugeWave = false +customWaveDelay = 30.0 +isHugeWave = true [sub_resource type="Resource" id="Resource_8h2xm"] script = ExtResource("4_8miqm") @@ -30,7 +30,7 @@ zombies = Array[ExtResource("5_8miqm")]([null, ExtResource("8_ulhin"), null, Ext script = ExtResource("3_hlq35") zombiesOrdered = Array[ExtResource("4_8miqm")]([SubResource("Resource_8h2xm")]) events = Array[ExtResource("2_8aewt")]([]) -customWaveDelay = 0.0 +customWaveDelay = 30.0 isHugeWave = false [sub_resource type="Resource" id="Resource_lxlrs"] diff --git a/scenes/entities/plants/potato_mine.tscn b/scenes/entities/plants/potato_mine.tscn index 228901e..0c0876c 100644 --- a/scenes/entities/plants/potato_mine.tscn +++ b/scenes/entities/plants/potato_mine.tscn @@ -84,7 +84,7 @@ MaxHP = 20.0 texture = ExtResource("2_sneas") hframes = 7 vframes = 4 -frame = 8 +frame = 7 [node name="AnimationPlayer" parent="." index="1"] libraries = {