Nicola/RuinAdventurer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Finished first EA Version #1

Merged
Nicola merged 110 commits from dev into main 2026-05-19 20:01:13 +02:00
Conversation 0 Commits 110 Files Changed 456
+115 -78
12 changed files with 115 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e7de2433de - Show all commits
Prefabs/DSL/CraftNode.tscn
+18 -12
View File
@@ -19,41 +19,47 @@ listDisplay = NodePath("ListDisplay")
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
[node name="HBoxContainer" type="HBoxContainer" parent="EditorDisplay" unique_id=945032897] [node name="VBoxContainer" type="VBoxContainer" parent="EditorDisplay" unique_id=2050461070]
layout_mode = 2
[node name="HBoxContainer" type="HBoxContainer" parent="EditorDisplay/VBoxContainer" unique_id=945032897]
layout_mode = 2 layout_mode = 2
alignment = 1 alignment = 1
[node name="Flavour" type="RichTextLabel" parent="EditorDisplay/HBoxContainer" unique_id=1994560318] [node name="Flavour" type="RichTextLabel" parent="EditorDisplay/VBoxContainer/HBoxContainer" unique_id=1994560318]
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_stretch_ratio = 0.2
text = "Craft: " text = "Craft: "
fit_content = true fit_content = true
autowrap_mode = 0 autowrap_mode = 0
horizontal_alignment = 1 horizontal_alignment = 1
vertical_alignment = 1 vertical_alignment = 1
[node name="Item" type="OptionButton" parent="EditorDisplay/HBoxContainer" unique_id=117577134] [node name="TextureButton" type="TextureButton" parent="EditorDisplay/VBoxContainer/HBoxContainer" unique_id=479938935]
layout_mode = 2
size_flags_horizontal = 3
size_flags_stretch_ratio = 0.2
texture_normal = ExtResource("2_loic7")
[node name="Values" type="HBoxContainer" parent="EditorDisplay/VBoxContainer" unique_id=1811897037]
layout_mode = 2
alignment = 1
[node name="Item" type="OptionButton" parent="EditorDisplay/VBoxContainer/Values" unique_id=2066235567]
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
[node name="Amount" type="SpinBox" parent="EditorDisplay/HBoxContainer" unique_id=1195061461] [node name="Amount" type="SpinBox" parent="EditorDisplay/VBoxContainer/Values" unique_id=827307108]
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
rounded = true rounded = true
alignment = 1 alignment = 1
prefix = "x" prefix = "x"
[node name="TextureButton" type="TextureButton" parent="EditorDisplay/HBoxContainer" unique_id=479938935]
layout_mode = 2
size_flags_horizontal = 3
size_flags_stretch_ratio = 0.2
texture_normal = ExtResource("2_loic7")
[node name="ListDisplay" type="Button" parent="." unique_id=200731038] [node name="ListDisplay" type="Button" parent="." unique_id=200731038]
visible = false visible = false
layout_mode = 2 layout_mode = 2
tooltip_text = "Crafts the amount of the selected item." tooltip_text = "Crafts the amount of the selected item."
text = "Craft" text = "Craft"
[connection signal="pressed" from="EditorDisplay/HBoxContainer/TextureButton" to="." method="DeleteNodePressed"] [connection signal="pressed" from="EditorDisplay/VBoxContainer/HBoxContainer/TextureButton" to="." method="DeleteNodePressed"]
Prefabs/DSL/ForNode.tscn
+17 -11
View File
@@ -19,37 +19,43 @@ listDisplay = NodePath("ListDisplay")
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
[node name="HBoxContainer" type="HBoxContainer" parent="EditorDisplay" unique_id=945032897] [node name="VBoxContainer" type="VBoxContainer" parent="EditorDisplay" unique_id=914671634]
layout_mode = 2
[node name="HBoxContainer" type="HBoxContainer" parent="EditorDisplay/VBoxContainer" unique_id=945032897]
layout_mode = 2 layout_mode = 2
alignment = 1 alignment = 1
[node name="Flavour" type="RichTextLabel" parent="EditorDisplay/HBoxContainer" unique_id=1994560318] [node name="Flavour" type="RichTextLabel" parent="EditorDisplay/VBoxContainer/HBoxContainer" unique_id=1994560318]
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_stretch_ratio = 0.2
text = "For:" text = "For:"
fit_content = true fit_content = true
autowrap_mode = 0 autowrap_mode = 0
horizontal_alignment = 1 horizontal_alignment = 1
vertical_alignment = 1 vertical_alignment = 1
[node name="Amount" type="SpinBox" parent="EditorDisplay/HBoxContainer" unique_id=1195061461] [node name="TextureButton" type="TextureButton" parent="EditorDisplay/VBoxContainer/HBoxContainer" unique_id=479938935]
layout_mode = 2
size_flags_horizontal = 3
size_flags_stretch_ratio = 0.2
texture_normal = ExtResource("2_mtk18")
[node name="Values" type="HBoxContainer" parent="EditorDisplay/VBoxContainer" unique_id=1896004369]
layout_mode = 2
alignment = 1
[node name="Amount" type="SpinBox" parent="EditorDisplay/VBoxContainer/Values" unique_id=1393892745]
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
rounded = true rounded = true
alignment = 1 alignment = 1
prefix = "x" prefix = "x"
[node name="TextureButton" type="TextureButton" parent="EditorDisplay/HBoxContainer" unique_id=479938935]
layout_mode = 2
size_flags_horizontal = 3
size_flags_stretch_ratio = 0.2
texture_normal = ExtResource("2_mtk18")
[node name="ListDisplay" type="Button" parent="." unique_id=200731038] [node name="ListDisplay" type="Button" parent="." unique_id=200731038]
visible = false visible = false
layout_mode = 2 layout_mode = 2
tooltip_text = "Repeats the following blocks to the next for, until or while block the selected amount of times." tooltip_text = "Repeats the following blocks to the next for, until or while block the selected amount of times."
text = "For" text = "For"
[connection signal="pressed" from="EditorDisplay/HBoxContainer/TextureButton" to="." method="DeleteNodePressed"] [connection signal="pressed" from="EditorDisplay/VBoxContainer/HBoxContainer/TextureButton" to="." method="DeleteNodePressed"]
Prefabs/DSL/IfNode.tscn
+19 -13
View File
@@ -19,25 +19,37 @@ listDisplay = NodePath("ListDisplay")
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
[node name="HBoxContainer" type="HBoxContainer" parent="EditorDisplay" unique_id=945032897] [node name="VBoxContainer" type="VBoxContainer" parent="EditorDisplay" unique_id=1137776934]
layout_mode = 2
[node name="HBoxContainer" type="HBoxContainer" parent="EditorDisplay/VBoxContainer" unique_id=945032897]
layout_mode = 2 layout_mode = 2
alignment = 1 alignment = 1
[node name="Flavour" type="RichTextLabel" parent="EditorDisplay/HBoxContainer" unique_id=1994560318] [node name="Flavour" type="RichTextLabel" parent="EditorDisplay/VBoxContainer/HBoxContainer" unique_id=1994560318]
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_stretch_ratio = 0.2
text = "If:" text = "If:"
fit_content = true fit_content = true
autowrap_mode = 0 autowrap_mode = 0
horizontal_alignment = 1 horizontal_alignment = 1
vertical_alignment = 1 vertical_alignment = 1
[node name="Item" type="OptionButton" parent="EditorDisplay/HBoxContainer" unique_id=117577134] [node name="TextureButton" type="TextureButton" parent="EditorDisplay/VBoxContainer/HBoxContainer" unique_id=479938935]
layout_mode = 2
size_flags_horizontal = 3
size_flags_stretch_ratio = 0.2
texture_normal = ExtResource("2_a5cwv")
[node name="Values" type="HBoxContainer" parent="EditorDisplay/VBoxContainer" unique_id=149543652]
layout_mode = 2
alignment = 1
[node name="Item" type="OptionButton" parent="EditorDisplay/VBoxContainer/Values" unique_id=635450884]
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
[node name="Comparator" type="OptionButton" parent="EditorDisplay/HBoxContainer" unique_id=539633915] [node name="Comparator" type="OptionButton" parent="EditorDisplay/VBoxContainer/Values" unique_id=691603757]
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
item_count = 6 item_count = 6
@@ -54,23 +66,17 @@ popup/item_4/id = 4
popup/item_5/text = "is bigger than or equal to" popup/item_5/text = "is bigger than or equal to"
popup/item_5/id = 5 popup/item_5/id = 5
[node name="Amount" type="SpinBox" parent="EditorDisplay/HBoxContainer" unique_id=1195061461] [node name="Amount" type="SpinBox" parent="EditorDisplay/VBoxContainer/Values" unique_id=561942124]
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
rounded = true rounded = true
alignment = 1 alignment = 1
prefix = "x" prefix = "x"
[node name="TextureButton" type="TextureButton" parent="EditorDisplay/HBoxContainer" unique_id=479938935]
layout_mode = 2
size_flags_horizontal = 3
size_flags_stretch_ratio = 0.2
texture_normal = ExtResource("2_a5cwv")
[node name="ListDisplay" type="Button" parent="." unique_id=200731038] [node name="ListDisplay" type="Button" parent="." unique_id=200731038]
visible = false visible = false
layout_mode = 2 layout_mode = 2
tooltip_text = "Allows branching in the code with a condition based on item in your inventory. (Skips everything until another If or Else block if condition is false)" tooltip_text = "Allows branching in the code with a condition based on item in your inventory. (Skips everything until another If or Else block if condition is false)"
text = "If" text = "If"
[connection signal="pressed" from="EditorDisplay/HBoxContainer/TextureButton" to="." method="DeleteNodePressed"] [connection signal="pressed" from="EditorDisplay/VBoxContainer/HBoxContainer/TextureButton" to="." method="DeleteNodePressed"]
Prefabs/DSL/MoveNode.tscn
+19 -12
View File
@@ -19,11 +19,14 @@ listDisplay = NodePath("ListDisplay")
[node name="EditorDisplay" type="PanelContainer" parent="." unique_id=245583237] [node name="EditorDisplay" type="PanelContainer" parent="." unique_id=245583237]
layout_mode = 2 layout_mode = 2
[node name="HBoxContainer" type="HBoxContainer" parent="EditorDisplay" unique_id=1629099069] [node name="VBoxContainer" type="VBoxContainer" parent="EditorDisplay" unique_id=2004713919]
layout_mode = 2
[node name="HBoxContainer" type="HBoxContainer" parent="EditorDisplay/VBoxContainer" unique_id=1629099069]
layout_mode = 2 layout_mode = 2
alignment = 1 alignment = 1
[node name="Flavour" type="RichTextLabel" parent="EditorDisplay/HBoxContainer" unique_id=1497013575] [node name="Flavour" type="RichTextLabel" parent="EditorDisplay/VBoxContainer/HBoxContainer" unique_id=1497013575]
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
text = "Move to: " text = "Move to: "
@@ -32,36 +35,40 @@ autowrap_mode = 0
horizontal_alignment = 1 horizontal_alignment = 1
vertical_alignment = 1 vertical_alignment = 1
[node name="CoordinateX" type="SpinBox" parent="EditorDisplay/HBoxContainer" unique_id=485214217] [node name="TextureButton" type="TextureButton" parent="EditorDisplay/VBoxContainer/HBoxContainer" unique_id=753598237]
layout_mode = 2
size_flags_horizontal = 3
size_flags_stretch_ratio = 0.2
texture_normal = ExtResource("2_5ujwv")
[node name="Values" type="HBoxContainer" parent="EditorDisplay/VBoxContainer" unique_id=1288550105]
layout_mode = 2
alignment = 1
[node name="CoordinateX" type="SpinBox" parent="EditorDisplay/VBoxContainer/Values" unique_id=2062502281]
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
rounded = true rounded = true
alignment = 1 alignment = 1
prefix = "X" prefix = "X"
[node name="CoordinateY" type="SpinBox" parent="EditorDisplay/HBoxContainer" unique_id=724940645] [node name="CoordinateY" type="SpinBox" parent="EditorDisplay/VBoxContainer/Values" unique_id=211509452]
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
rounded = true rounded = true
alignment = 1 alignment = 1
prefix = "Y" prefix = "Y"
[node name="CoordinateZ" type="SpinBox" parent="EditorDisplay/HBoxContainer" unique_id=578943647] [node name="CoordinateZ" type="SpinBox" parent="EditorDisplay/VBoxContainer/Values" unique_id=832152386]
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
rounded = true rounded = true
alignment = 1 alignment = 1
prefix = "Z" prefix = "Z"
[node name="TextureButton" type="TextureButton" parent="EditorDisplay/HBoxContainer" unique_id=753598237]
layout_mode = 2
size_flags_horizontal = 3
size_flags_stretch_ratio = 0.2
texture_normal = ExtResource("2_5ujwv")
[node name="ListDisplay" type="Button" parent="." unique_id=347942160] [node name="ListDisplay" type="Button" parent="." unique_id=347942160]
layout_mode = 2 layout_mode = 2
tooltip_text = "Moves the robot to the selected coordinate" tooltip_text = "Moves the robot to the selected coordinate"
text = "Move" text = "Move"
[connection signal="pressed" from="EditorDisplay/HBoxContainer/TextureButton" to="." method="DeleteNodePressed"] [connection signal="pressed" from="EditorDisplay/VBoxContainer/HBoxContainer/TextureButton" to="." method="DeleteNodePressed"]
Prefabs/DSL/WhileNode.tscn
+19 -13
View File
@@ -19,25 +19,37 @@ listDisplay = NodePath("ListDisplay")
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
[node name="HBoxContainer" type="HBoxContainer" parent="EditorDisplay" unique_id=945032897] [node name="VBoxContainer" type="VBoxContainer" parent="EditorDisplay" unique_id=1034731324]
layout_mode = 2
[node name="HBoxContainer" type="HBoxContainer" parent="EditorDisplay/VBoxContainer" unique_id=1646219600]
layout_mode = 2 layout_mode = 2
alignment = 1 alignment = 1
[node name="Flavour" type="RichTextLabel" parent="EditorDisplay/HBoxContainer" unique_id=1994560318] [node name="Flavour" type="RichTextLabel" parent="EditorDisplay/VBoxContainer/HBoxContainer" unique_id=1184858872]
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_stretch_ratio = 0.2
text = "While:" text = "While:"
fit_content = true fit_content = true
autowrap_mode = 0 autowrap_mode = 0
horizontal_alignment = 1 horizontal_alignment = 1
vertical_alignment = 1 vertical_alignment = 1
[node name="Item" type="OptionButton" parent="EditorDisplay/HBoxContainer" unique_id=117577134] [node name="TextureButton" type="TextureButton" parent="EditorDisplay/VBoxContainer/HBoxContainer" unique_id=479938935]
layout_mode = 2
size_flags_horizontal = 3
size_flags_stretch_ratio = 0.2
texture_normal = ExtResource("2_yhncq")
[node name="Values" type="HBoxContainer" parent="EditorDisplay/VBoxContainer" unique_id=945032897]
layout_mode = 2
alignment = 1
[node name="Item" type="OptionButton" parent="EditorDisplay/VBoxContainer/Values" unique_id=117577134]
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
[node name="Comparator" type="OptionButton" parent="EditorDisplay/HBoxContainer" unique_id=539633915] [node name="Comparator" type="OptionButton" parent="EditorDisplay/VBoxContainer/Values" unique_id=539633915]
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
item_count = 6 item_count = 6
@@ -54,23 +66,17 @@ popup/item_4/id = 4
popup/item_5/text = "is bigger than or equal to" popup/item_5/text = "is bigger than or equal to"
popup/item_5/id = 5 popup/item_5/id = 5
[node name="Amount" type="SpinBox" parent="EditorDisplay/HBoxContainer" unique_id=1195061461] [node name="Amount" type="SpinBox" parent="EditorDisplay/VBoxContainer/Values" unique_id=1195061461]
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
rounded = true rounded = true
alignment = 1 alignment = 1
prefix = "x" prefix = "x"
[node name="TextureButton" type="TextureButton" parent="EditorDisplay/HBoxContainer" unique_id=479938935]
layout_mode = 2
size_flags_horizontal = 3
size_flags_stretch_ratio = 0.2
texture_normal = ExtResource("2_yhncq")
[node name="ListDisplay" type="Button" parent="." unique_id=200731038] [node name="ListDisplay" type="Button" parent="." unique_id=200731038]
visible = false visible = false
layout_mode = 2 layout_mode = 2
tooltip_text = "Allows repetition in the code with a condition based on item in your inventory. (Skips everything until another while, for or until block if condition is false)" tooltip_text = "Allows repetition in the code with a condition based on item in your inventory. (Skips everything until another while, for or until block if condition is false)"
text = "While" text = "While"
[connection signal="pressed" from="EditorDisplay/HBoxContainer/TextureButton" to="." method="DeleteNodePressed"] [connection signal="pressed" from="EditorDisplay/VBoxContainer/HBoxContainer/TextureButton" to="." method="DeleteNodePressed"]
Scenes/Game.tscn
+4 -2
View File
@@ -204,10 +204,12 @@ size_flags_vertical = 3
[node name="CodingWindow" type="PanelContainer" parent="CanvasLayer/UIHandler/MainUI/Content" unique_id=1576652491 node_paths=PackedStringArray("codeBlocks", "editorWindow", "availableScripts", "scriptName", "nameInput")] [node name="CodingWindow" type="PanelContainer" parent="CanvasLayer/UIHandler/MainUI/Content" unique_id=1576652491 node_paths=PackedStringArray("codeBlocks", "editorWindow", "availableScripts", "scriptName", "nameInput")]
visible = false visible = false
layout_mode = 1 layout_mode = 1
anchors_preset = 15 anchors_preset = 11
anchor_left = 1.0
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
grow_horizontal = 2 offset_left = -663.0
grow_horizontal = 0
grow_vertical = 2 grow_vertical = 2
theme_override_styles/panel = SubResource("StyleBoxFlat_7lihs") theme_override_styles/panel = SubResource("StyleBoxFlat_7lihs")
script = ExtResource("6_7lihs") script = ExtResource("6_7lihs")
Scripts/DSL/Nodes/CraftNode.cs
+2 -2
View File
@@ -42,7 +42,7 @@ public class CraftNode : ProgramNode
public override void ReadParameters(NodeDisplay display) public override void ReadParameters(NodeDisplay display)
{ {
HBoxContainer valueContainer = display.GetNode<HBoxContainer>("./EditorDisplay/HBoxContainer/"); HBoxContainer valueContainer = display.GetNode<HBoxContainer>("./EditorDisplay/VBoxContainer/Values");
OptionButton items = valueContainer.GetNode<OptionButton>("./Item"); OptionButton items = valueContainer.GetNode<OptionButton>("./Item");
string readableItem = items.GetItemText(items.GetSelectedId()).Split(":")[0]; string readableItem = items.GetItemText(items.GetSelectedId()).Split(":")[0];
if (GameData.availableItems.ContainsKey(ItemData.GetIndex(readableItem))) if (GameData.availableItems.ContainsKey(ItemData.GetIndex(readableItem)))
@@ -64,7 +64,7 @@ public class CraftNode : ProgramNode
public override void Setup(NodeDisplay display) public override void Setup(NodeDisplay display)
{ {
OptionButton options = display.GetNode<OptionButton>("./EditorDisplay/HBoxContainer/Item"); OptionButton options = display.GetNode<OptionButton>("./EditorDisplay/VBoxContainer/Values/Item");
options.AddItem("Select item..."); options.AddItem("Select item...");
foreach (ItemData item in GameData.availableItems.Values) foreach (ItemData item in GameData.availableItems.Values)
{ {
Scripts/DSL/Nodes/ForNode.cs
+1 -1
View File
@@ -22,7 +22,7 @@ public class ForNode : ProgramNode
public override void ReadParameters(NodeDisplay display) public override void ReadParameters(NodeDisplay display)
{ {
HBoxContainer valueContainer = display.GetNode<HBoxContainer>("./EditorDisplay/HBoxContainer/"); HBoxContainer valueContainer = display.GetNode<HBoxContainer>("./EditorDisplay/VBoxContainer/Values");
amount = (int)valueContainer.GetNode<SpinBox>("./Amount").Value; amount = (int)valueContainer.GetNode<SpinBox>("./Amount").Value;
} }
Scripts/DSL/Nodes/IfNode.cs
+3 -3
View File
@@ -43,7 +43,7 @@ public class IfNode : ProgramNode
public override void ReadParameters(NodeDisplay display) public override void ReadParameters(NodeDisplay display)
{ {
HBoxContainer valueContainer = display.GetNode<HBoxContainer>("./EditorDisplay/HBoxContainer/"); HBoxContainer valueContainer = display.GetNode<HBoxContainer>("./EditorDisplay/VBoxContainer/Values");
OptionButton items = valueContainer.GetNode<OptionButton>("./Item"); OptionButton items = valueContainer.GetNode<OptionButton>("./Item");
string readableItem = items.GetItemText(items.GetSelectedId()).Split(":")[0]; string readableItem = items.GetItemText(items.GetSelectedId()).Split(":")[0];
if (GameData.availableItems.ContainsKey(ItemData.GetIndex(readableItem))) if (GameData.availableItems.ContainsKey(ItemData.GetIndex(readableItem)))
@@ -69,7 +69,7 @@ public class IfNode : ProgramNode
public override void Setup(NodeDisplay display) public override void Setup(NodeDisplay display)
{ {
OptionButton options = display.GetNode<OptionButton>("./EditorDisplay/HBoxContainer/Item"); OptionButton options = display.GetNode<OptionButton>("./EditorDisplay/VBoxContainer/Values/Item");
options.AddItem("Select item..."); options.AddItem("Select item...");
foreach (ItemData item in GameData.availableItems.Values) foreach (ItemData item in GameData.availableItems.Values)
{ {
@@ -89,7 +89,7 @@ public class IfNode : ProgramNode
} }
} }
OptionButton comparators = display.GetNode<OptionButton>("./EditorDisplay/HBoxContainer/Comparator"); OptionButton comparators = display.GetNode<OptionButton>("./EditorDisplay/VBoxContainer/Values/Comparator");
if (comparator != null) if (comparator != null)
{ {
Scripts/DSL/Nodes/MoveNode.cs
+5 -1
View File
@@ -60,7 +60,7 @@ public class MoveNode : ProgramNode
public override void ReadParameters(NodeDisplay display) public override void ReadParameters(NodeDisplay display)
{ {
HBoxContainer valueContainer = display.GetNode<HBoxContainer>("./EditorDisplay/HBoxContainer/"); HBoxContainer valueContainer = display.GetNode<HBoxContainer>("./EditorDisplay/VBoxContainer/Values");
int posX = (int)valueContainer.GetNode<SpinBox>("./CoordinateX").Value; int posX = (int)valueContainer.GetNode<SpinBox>("./CoordinateX").Value;
int posY = (int)valueContainer.GetNode<SpinBox>("./CoordinateY").Value; int posY = (int)valueContainer.GetNode<SpinBox>("./CoordinateY").Value;
int posZ = (int)valueContainer.GetNode<SpinBox>("./CoordinateZ").Value; int posZ = (int)valueContainer.GetNode<SpinBox>("./CoordinateZ").Value;
@@ -78,6 +78,10 @@ public class MoveNode : ProgramNode
public override void Setup(NodeDisplay display) public override void Setup(NodeDisplay display)
{ {
HBoxContainer valueContainer = display.GetNode<HBoxContainer>("./EditorDisplay/VBoxContainer/Values");
valueContainer.GetNode<SpinBox>("./CoordinateX").MaxValue = GameData.layerSize;
valueContainer.GetNode<SpinBox>("./CoordinateY").MaxValue = GameData.ruinSize;
valueContainer.GetNode<SpinBox>("./CoordinateZ").MaxValue = GameData.layerSize;
} }
public override string Save() public override string Save()
Scripts/DSL/Nodes/WhileNode.cs
+3 -3
View File
@@ -44,7 +44,7 @@ public class WhileNode : ProgramNode
public override void ReadParameters(NodeDisplay display) public override void ReadParameters(NodeDisplay display)
{ {
HBoxContainer valueContainer = display.GetNode<HBoxContainer>("./EditorDisplay/HBoxContainer/"); HBoxContainer valueContainer = display.GetNode<HBoxContainer>("./EditorDisplay/VBoxContainer/Values");
OptionButton items = valueContainer.GetNode<OptionButton>("./Item"); OptionButton items = valueContainer.GetNode<OptionButton>("./Item");
string readableItem = items.GetItemText(items.GetSelectedId()).Split(":")[0]; string readableItem = items.GetItemText(items.GetSelectedId()).Split(":")[0];
@@ -71,7 +71,7 @@ public class WhileNode : ProgramNode
public override void Setup(NodeDisplay display) public override void Setup(NodeDisplay display)
{ {
OptionButton options = display.GetNode<OptionButton>("./EditorDisplay/HBoxContainer/Item"); OptionButton options = display.GetNode<OptionButton>("./EditorDisplay/VBoxContainer/Values/Item");
options.AddItem("Select item..."); options.AddItem("Select item...");
foreach (ItemData item in GameData.availableItems.Values) foreach (ItemData item in GameData.availableItems.Values)
{ {
@@ -91,7 +91,7 @@ public class WhileNode : ProgramNode
} }
} }
OptionButton comparators = display.GetNode<OptionButton>("./EditorDisplay/HBoxContainer/Comparator"); OptionButton comparators = display.GetNode<OptionButton>("./EditorDisplay/VBoxContainer/Values/Comparator");
if (comparator != null) if (comparator != null)
{ {
Scripts/UI/DSL/NodeDisplay.cs
+5 -5
View File
@@ -101,7 +101,7 @@ public partial class NodeDisplay : PanelContainer
private void LoadIf(string content) private void LoadIf(string content)
{ {
HBoxContainer valueContainer = GetNode<HBoxContainer>("./EditorDisplay/HBoxContainer/"); HBoxContainer valueContainer = GetNode<HBoxContainer>("./EditorDisplay/VBoxContainer/Values");
string[] parts = content.Split(","); string[] parts = content.Split(",");
string itemString = parts[1].Replace("Item:", "").Trim(); string itemString = parts[1].Replace("Item:", "").Trim();
string comparatorString = parts[2].Replace("Comparator:", "").Trim(); string comparatorString = parts[2].Replace("Comparator:", "").Trim();
@@ -120,7 +120,7 @@ public partial class NodeDisplay : PanelContainer
private void LoadFor(string content) private void LoadFor(string content)
{ {
HBoxContainer valueContainer = GetNode<HBoxContainer>("./EditorDisplay/HBoxContainer/"); HBoxContainer valueContainer = GetNode<HBoxContainer>("./EditorDisplay/VBoxContainer/Values");
string[] parts = content.Split(","); string[] parts = content.Split(",");
string amountExecuted = parts[1].Replace("AmountExecuted:", "").Trim(); string amountExecuted = parts[1].Replace("AmountExecuted:", "").Trim();
ForNode forNode = node as ForNode; ForNode forNode = node as ForNode;
@@ -136,7 +136,7 @@ public partial class NodeDisplay : PanelContainer
private void LoadWhile(string content) private void LoadWhile(string content)
{ {
HBoxContainer valueContainer = GetNode<HBoxContainer>("./EditorDisplay/HBoxContainer/"); HBoxContainer valueContainer = GetNode<HBoxContainer>("./EditorDisplay/VBoxContainer/Values");
string[] parts = content.Split(","); string[] parts = content.Split(",");
string itemString = parts[1].Replace("Item:", "").Trim(); string itemString = parts[1].Replace("Item:", "").Trim();
string comparatorString = parts[2].Replace("Comparator:", "").Trim(); string comparatorString = parts[2].Replace("Comparator:", "").Trim();
@@ -170,7 +170,7 @@ public partial class NodeDisplay : PanelContainer
public void LoadMove(string content) public void LoadMove(string content)
{ {
HBoxContainer valueContainer = GetNode<HBoxContainer>("./EditorDisplay/HBoxContainer/"); HBoxContainer valueContainer = GetNode<HBoxContainer>("./EditorDisplay/VBoxContainer/Values");
string[] parts = content.Split(","); string[] parts = content.Split(",");
string positionValues = parts[1].Replace("Position:", "").Replace("(", "").Replace(")", "").Trim(); string positionValues = parts[1].Replace("Position:", "").Replace("(", "").Replace(")", "").Trim();
int posX = int.Parse(positionValues.Split("|")[0]); int posX = int.Parse(positionValues.Split("|")[0]);
@@ -191,7 +191,7 @@ public partial class NodeDisplay : PanelContainer
public void LoadCraft(string content) public void LoadCraft(string content)
{ {
HBoxContainer valueContainer = GetNode<HBoxContainer>("./EditorDisplay/HBoxContainer/"); HBoxContainer valueContainer = GetNode<HBoxContainer>("./EditorDisplay/VBoxContainer/Values");
string[] parts = content.Split(","); string[] parts = content.Split(",");
string itemString = parts[1].Replace("Item:", "").Trim(); string itemString = parts[1].Replace("Item:", "").Trim();
if (itemString.ToLower() != "empty") if (itemString.ToLower() != "empty")