From 9eba7d3069283f734bc93811cfef12b3338d5fc7 Mon Sep 17 00:00:00 2001 From: Rendo Date: Tue, 29 Jul 2025 01:10:23 +0500 Subject: [PATCH] little editor refactor --- addons/pvzadventure/PvZAdventure.cs | 2 +- .../{ => adventure-editor}/adventure_editor.tscn | 0 .../{ => initial-editor}/initial_editor.tscn | 2 +- .../{ => initial-editor}/universal_grid_item.tscn | 0 .../{ => zombie-editor}/asset_browser_button.tscn | 0 .../scenes/{ => zombie-editor}/ze_grid_item.tscn | 0 .../scenes/{ => zombie-editor}/ze_row_editor.tscn | 0 .../scenes/{ => zombie-editor}/zombie_editor.tscn | 0 .../AdventureResourceInspector.cs | 15 ++++++++++++--- assets/levels/video_level.tres | 2 ++ 10 files changed, 16 insertions(+), 5 deletions(-) rename addons/pvzadventure/scenes/{ => adventure-editor}/adventure_editor.tscn (100%) rename addons/pvzadventure/scenes/{ => initial-editor}/initial_editor.tscn (98%) rename addons/pvzadventure/scenes/{ => initial-editor}/universal_grid_item.tscn (100%) rename addons/pvzadventure/scenes/{ => zombie-editor}/asset_browser_button.tscn (100%) rename addons/pvzadventure/scenes/{ => zombie-editor}/ze_grid_item.tscn (100%) rename addons/pvzadventure/scenes/{ => zombie-editor}/ze_row_editor.tscn (100%) rename addons/pvzadventure/scenes/{ => zombie-editor}/zombie_editor.tscn (100%) diff --git a/addons/pvzadventure/PvZAdventure.cs b/addons/pvzadventure/PvZAdventure.cs index c996d1f..f7a87ee 100644 --- a/addons/pvzadventure/PvZAdventure.cs +++ b/addons/pvzadventure/PvZAdventure.cs @@ -4,7 +4,7 @@ using Godot; [Tool] public partial class PvZAdventure : EditorPlugin { - private PackedScene panel = ResourceLoader.Load("res://addons/pvzadventure/scenes/adventure_editor.tscn"); + private PackedScene panel = ResourceLoader.Load("uid://dkq82o31vr3i2"); private Control panelInstance; public override void _EnterTree() diff --git a/addons/pvzadventure/scenes/adventure_editor.tscn b/addons/pvzadventure/scenes/adventure-editor/adventure_editor.tscn similarity index 100% rename from addons/pvzadventure/scenes/adventure_editor.tscn rename to addons/pvzadventure/scenes/adventure-editor/adventure_editor.tscn diff --git a/addons/pvzadventure/scenes/initial_editor.tscn b/addons/pvzadventure/scenes/initial-editor/initial_editor.tscn similarity index 98% rename from addons/pvzadventure/scenes/initial_editor.tscn rename to addons/pvzadventure/scenes/initial-editor/initial_editor.tscn index 0ec1e16..75a39d5 100644 --- a/addons/pvzadventure/scenes/initial_editor.tscn +++ b/addons/pvzadventure/scenes/initial-editor/initial_editor.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://sqessjn0m4o3"] -[ext_resource type="PackedScene" uid="uid://djb8ynxhnmo0t" path="res://addons/pvzadventure/scenes/universal_grid_item.tscn" id="1_d8e2t"] +[ext_resource type="PackedScene" uid="uid://djb8ynxhnmo0t" path="res://addons/pvzadventure/scenes/initial-editor/universal_grid_item.tscn" id="1_d8e2t"] [ext_resource type="Script" uid="uid://cumeahjpjgagq" path="res://addons/pvzadventure/scripts/InitialEditor.cs" id="1_tu7vy"] [node name="InitialEditor" type="ScrollContainer"] diff --git a/addons/pvzadventure/scenes/universal_grid_item.tscn b/addons/pvzadventure/scenes/initial-editor/universal_grid_item.tscn similarity index 100% rename from addons/pvzadventure/scenes/universal_grid_item.tscn rename to addons/pvzadventure/scenes/initial-editor/universal_grid_item.tscn diff --git a/addons/pvzadventure/scenes/asset_browser_button.tscn b/addons/pvzadventure/scenes/zombie-editor/asset_browser_button.tscn similarity index 100% rename from addons/pvzadventure/scenes/asset_browser_button.tscn rename to addons/pvzadventure/scenes/zombie-editor/asset_browser_button.tscn diff --git a/addons/pvzadventure/scenes/ze_grid_item.tscn b/addons/pvzadventure/scenes/zombie-editor/ze_grid_item.tscn similarity index 100% rename from addons/pvzadventure/scenes/ze_grid_item.tscn rename to addons/pvzadventure/scenes/zombie-editor/ze_grid_item.tscn diff --git a/addons/pvzadventure/scenes/ze_row_editor.tscn b/addons/pvzadventure/scenes/zombie-editor/ze_row_editor.tscn similarity index 100% rename from addons/pvzadventure/scenes/ze_row_editor.tscn rename to addons/pvzadventure/scenes/zombie-editor/ze_row_editor.tscn diff --git a/addons/pvzadventure/scenes/zombie_editor.tscn b/addons/pvzadventure/scenes/zombie-editor/zombie_editor.tscn similarity index 100% rename from addons/pvzadventure/scenes/zombie_editor.tscn rename to addons/pvzadventure/scenes/zombie-editor/zombie_editor.tscn diff --git a/addons/pvzadventure/scripts/adventure-editor/AdventureResourceInspector.cs b/addons/pvzadventure/scripts/adventure-editor/AdventureResourceInspector.cs index 53532b8..5fdb532 100644 --- a/addons/pvzadventure/scripts/adventure-editor/AdventureResourceInspector.cs +++ b/addons/pvzadventure/scripts/adventure-editor/AdventureResourceInspector.cs @@ -145,9 +145,18 @@ public partial class AdventureResourceInspector : Node } private TreeItem CreateItem(string Name, TreeItem root = null) { - var item = tree.CreateItem(root); - item.SetText(0, Name); - return item; + if (root == null) + { + var item = tree.CreateItem(); + item.SetText(0, Name); + return item; + } + else + { + var item = tree.CreateItem(root); + item.SetText(0, Name); + return item; + } } private TreeItem CreateItem(string Name, TreeItem.TreeCellMode cellMode, bool editable, TreeItem root = null) { diff --git a/assets/levels/video_level.tres b/assets/levels/video_level.tres index e9942cd..6dd82a5 100644 --- a/assets/levels/video_level.tres +++ b/assets/levels/video_level.tres @@ -282,6 +282,8 @@ standardWaveDelay = 30.0 initialWaveDelay = 20.0 reward = ExtResource("1_eqa0o") forbiddenPlants = Array[String](["aloe", "spikeweed", "peashooter", "wallnut"]) +forbiddenTags = Array[String]([]) +prepickedPlants = Array[String]([]) waves = [SubResource("Resource_c21si"), SubResource("Resource_icaa5"), SubResource("Resource_kc7t2"), SubResource("Resource_66y5q"), SubResource("Resource_tuvrx"), SubResource("Resource_t4nit"), SubResource("Resource_qx8xe"), SubResource("Resource_hyvhe"), SubResource("Resource_8syff"), SubResource("Resource_jfmww"), SubResource("Resource_vrqir"), SubResource("Resource_2seob"), SubResource("Resource_geil0"), SubResource("Resource_lxb1x"), SubResource("Resource_o5y12"), SubResource("Resource_diw66"), SubResource("Resource_pwwqn")] 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]) metadata/_custom_type_script = "uid://bximdujbkj2n4"