From 8fa39a28986343f4ad32a3f1c9c54c012dd35d5d Mon Sep 17 00:00:00 2001 From: vaporvee Date: Mon, 28 Nov 2022 18:02:47 +0100 Subject: [PATCH] removed not working dialog system advice making my own now --- scenes/gui/trigger/dialog_object_area.tscn | 14 ------- scenes/tiles/dialog_debug_tile.tscn | 4 +- src/scene-scripts/gui/dialog_bubble.cs | 42 --------------------- src/scene-scripts/gui/dialog_object_area.cs | 25 ------------ src/signal_bus.cs | 8 ---- tilesets/main_foreground.tres | 8 +--- 6 files changed, 3 insertions(+), 98 deletions(-) delete mode 100644 scenes/gui/trigger/dialog_object_area.tscn delete mode 100644 src/scene-scripts/gui/dialog_bubble.cs delete mode 100644 src/scene-scripts/gui/dialog_object_area.cs delete mode 100644 src/signal_bus.cs diff --git a/scenes/gui/trigger/dialog_object_area.tscn b/scenes/gui/trigger/dialog_object_area.tscn deleted file mode 100644 index 2c3c018..0000000 --- a/scenes/gui/trigger/dialog_object_area.tscn +++ /dev/null @@ -1,14 +0,0 @@ -[gd_scene load_steps=2 format=3 uid="uid://d14pjtkh0xmrk"] - -[ext_resource type="Script" path="res://src/scene-scripts/gui/dialog_object_area.cs" id="1_ttc4e"] - -[node name="dialog_area" type="Area2D"] -process_mode = 2 -collision_layer = 0 -collision_mask = 2 -script = ExtResource("1_ttc4e") - -[node name="CollisionShape2D" type="CollisionShape2D" parent="."] - -[connection signal="area_entered" from="." to="." method="onAreaEntered"] -[connection signal="area_exited" from="." to="." method="onAreaExited"] diff --git a/scenes/tiles/dialog_debug_tile.tscn b/scenes/tiles/dialog_debug_tile.tscn index f3caa59..ef094f6 100644 --- a/scenes/tiles/dialog_debug_tile.tscn +++ b/scenes/tiles/dialog_debug_tile.tscn @@ -1,7 +1,7 @@ -[gd_scene load_steps=5 format=3 uid="uid://cjqwrkx04evnr"] +[gd_scene load_steps=5 format=3 uid="uid://42f1sggm2w0g"] [ext_resource type="Texture2D" uid="uid://p5ubildre2tg" path="res://assets/textures/debug/cupcake.png" id="1_qmvgm"] -[ext_resource type="PackedScene" uid="uid://d14pjtkh0xmrk" path="res://scenes/gui/trigger/dialog_object_area.tscn" id="2_m1t8o"] +[ext_resource type="PackedScene" path="res://scenes/gui/trigger/dialog_object_area.tscn" id="2_m1t8o"] [sub_resource type="CircleShape2D" id="CircleShape2D_2d5dy"] radius = 30.8058 diff --git a/src/scene-scripts/gui/dialog_bubble.cs b/src/scene-scripts/gui/dialog_bubble.cs deleted file mode 100644 index 6213082..0000000 --- a/src/scene-scripts/gui/dialog_bubble.cs +++ /dev/null @@ -1,42 +0,0 @@ -using Godot; -using Godot.Collections; -using System; -using System.IO; - -public partial class dialog_bubble : CanvasLayer -{ - [Export(PropertyHint.File, "*.json,")] - public string textfile; - - private Dictionary text; - private string[] selectedText; - private bool inProgress = false; - - //ITS FUCKING GARBAGE I HATE THIS DOCUMENTATION - - public override void _Ready() - { - var background = GetNode("Background"); - var textLabel = GetNode("TextLabel"); - - background.Visible = false; - //text.Add(LoadSceneText(textVariant)); - //signal_bus.Connect("DisplayDialog", this, "onDisplayDialog"); - - } - public string LoadSceneText(string textVariant) - { - if (File.Exists(textfile)) - { - File.Open(textfile, FileMode.Open); - textVariant = JSON.ParseString(File.ReadAllText(textfile)).ToString(); - } - return textVariant; - - } - - // Called every frame. 'delta' is the elapsed time since the previous frame. - public override void _Process(double delta) - { - } -} diff --git a/src/scene-scripts/gui/dialog_object_area.cs b/src/scene-scripts/gui/dialog_object_area.cs deleted file mode 100644 index 6159047..0000000 --- a/src/scene-scripts/gui/dialog_object_area.cs +++ /dev/null @@ -1,25 +0,0 @@ -using Godot; -using System; - -public partial class dialog_object_area : Area2D -{ - [Export] - public string dialogKey = ""; - public bool areaActive = false; - - public override void _Input(InputEvent @event) - { - if(areaActive && @event.IsActionPressed("ui_accept")) - { - // signal_bus.EmitSignal("DialogDisplay", dialogKey); - } - } - public void onDialogAreaEntered() - { - areaActive = true; - } - public void onDialogAreaExited() - { - areaActive = false; - } -} diff --git a/src/signal_bus.cs b/src/signal_bus.cs deleted file mode 100644 index efd3804..0000000 --- a/src/signal_bus.cs +++ /dev/null @@ -1,8 +0,0 @@ -using Godot; -using System; - -public partial class signal_bus : Node -{ - [Signal] - public delegate void DialogDisplayEventHandler(string textKey); -} diff --git a/tilesets/main_foreground.tres b/tilesets/main_foreground.tres index bf258c5..1ef0b41 100644 --- a/tilesets/main_foreground.tres +++ b/tilesets/main_foreground.tres @@ -1,17 +1,11 @@ -[gd_resource type="TileSet" load_steps=5 format=3 uid="uid://txl24cadn8t4"] +[gd_resource type="TileSet" load_steps=3 format=3 uid="uid://txl24cadn8t4"] [ext_resource type="PackedScene" uid="uid://dk7fqaw2b3w1k" path="res://scenes/tiles/first_debug_tile.tscn" id="1_uxmn6"] -[ext_resource type="PackedScene" path="res://scenes/tiles/dialog_debug_tile.tscn" id="2_5mcbp"] [sub_resource type="TileSetScenesCollectionSource" id="TileSetScenesCollectionSource_h5u31"] resource_name = "test" scenes/0/scene = ExtResource("1_uxmn6") -[sub_resource type="TileSetScenesCollectionSource" id="TileSetScenesCollectionSource_tg2xg"] -resource_name = "dialog-test" -scenes/1/scene = ExtResource("2_5mcbp") - [resource] tile_size = Vector2i(64, 64) sources/0 = SubResource("TileSetScenesCollectionSource_h5u31") -sources/1 = SubResource("TileSetScenesCollectionSource_tg2xg")