Rendo/newlon
2
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactored code

Browse source
This commit is contained in:
Rendo 2025-07-17 18:11:00 +05:00
commit c18c7f4db7
13 changed files with 136 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

5
addons/pvzadventure/scenes/adventure_editor.tscn
View file

@ -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"]

5
addons/pvzadventure/scenes/initial_editor.tscn Normal file
View file

@ -0,0 +1,5 @@
[gd_scene format=3 uid="uid://sqessjn0m4o3"]
[node name="InitialEditor" type="ScrollContainer"]
offset_right = 40.0
offset_bottom = 40.0

27
addons/pvzadventure/scenes/universal_grid_item.tscn Normal file
View file

@ -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

3
addons/pvzadventure/scripts/AdventureEditor.cs
View file

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

95
addons/pvzadventure/scripts/AdventureResourceInspector.cs
View file

@ -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");
@ -38,37 +43,26 @@ public partial class AdventureResourceInspector : Node
EmitSignal(SignalName.Refreshed);
tree.Clear();
root = tree.CreateItem();
root.DisableFolding = true;
root.SetText(0, "Level");
root = CreateItem(LEVEL_ITEM_NAME);
var initial = tree.CreateItem(root);
initial.SetText(0, "Initial data");
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()
@ -146,6 +130,7 @@ public partial class AdventureResourceInspector : Node
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;
}
}

13
addons/pvzadventure/scripts/EditorsContainer.cs Normal file
View file

@ -0,0 +1,13 @@
using Godot;
[Tool]
public partial class EditorsContainer : PanelContainer
{
public void ClearChildren()
{
foreach (var child in GetChildren())
{
child.QueueFree();
}
}
}

1
addons/pvzadventure/scripts/EditorsContainer.cs.uid Normal file
View file

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

15
addons/pvzadventure/scripts/UNI_GridItem.cs Normal file
View file

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

1
addons/pvzadventure/scripts/UNI_GridItem.cs.uid Normal file
View file

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

2
resources/levels/test_level_2.tres
View file

@ -8,4 +8,4 @@ startSun = 50.0
wavePercentage = 0.0
standardWaveDelay = 0.0
initialWaveDelay = 0.0
waves = null
waves = []

11
resources/levels/test_level_3.tres Normal file
View file

@ -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 = []

6
resources/levels/test_level_for_execution.tres
View file

@ -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"]

2
scenes/entities/plants/potato_mine.tscn
View file

@ -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 = {