Refactored code

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<AdventureLevelResource>(editedPath);
 		EmitSignal(SignalName.ResourceChanged, editedResource);
+		EmitSignal(SignalName.HardReloadRequested);
 		Reload();
 	}
 

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<PackedScene>("uid://db5ah76l43ng2");
 
 	private Tree tree;
 	private AdventureLevelResource heldResource;
-	private TreeItem root;
 	private Texture2D deleteTexture = ResourceLoader.Load<Texture2D>("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>("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<ZombieEditor>();
 
 				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;
+	}
 }

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();
+		}
+	}
+}

addons/pvzadventure/scripts/EditorsContainer.cs.uid

@@ -0,0 +1 @@
+uid://c6jttmpeyakoa

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)
+	{
+	}
+}

addons/pvzadventure/scripts/UNI_GridItem.cs.uid

@@ -0,0 +1 @@
+uid://b8ccbjhhus7xk