beta-1.3/restructure-files (#2)
Reviewed-on: #2
This commit was merged in pull request #2.
This commit is contained in:
1
Main/Scripts/gui.gd
Normal file
1
Main/Scripts/gui.gd
Normal file
@@ -0,0 +1 @@
|
||||
extends CanvasLayer
|
||||
1
Main/Scripts/gui.gd.uid
Normal file
1
Main/Scripts/gui.gd.uid
Normal file
@@ -0,0 +1 @@
|
||||
uid://c4w8hney4mesw
|
||||
10
Main/Scripts/main.gd
Normal file
10
Main/Scripts/main.gd
Normal file
@@ -0,0 +1,10 @@
|
||||
extends Node2D
|
||||
|
||||
#@export var initial_map: PackedScene
|
||||
#
|
||||
#@onready var world: Node2D = $World
|
||||
#
|
||||
## Called when the node enters the scene tree for the first time.
|
||||
#func _ready() -> void:
|
||||
#var map := initial_map.instantiate()
|
||||
#world.add_child(map)
|
||||
1
Main/Scripts/main.gd.uid
Normal file
1
Main/Scripts/main.gd.uid
Normal file
@@ -0,0 +1 @@
|
||||
uid://vv4pj8uhiad8
|
||||
42
Main/Scripts/map_transitioner.gd
Normal file
42
Main/Scripts/map_transitioner.gd
Normal file
@@ -0,0 +1,42 @@
|
||||
extends Node
|
||||
|
||||
signal MapChanged(map_id: Enums.MapIds)
|
||||
|
||||
@export var initial_map_id: Enums.MapIds
|
||||
|
||||
@onready var world: Node2D = $"../World"
|
||||
|
||||
# Private Methods
|
||||
func _ready() -> void:
|
||||
var map_scene := MapLoader.GetMap(initial_map_id)
|
||||
var map := map_scene.instantiate()
|
||||
world.add_child(map)
|
||||
await map.ready
|
||||
|
||||
_connect_loading_zone_transporters()
|
||||
MapChanged.emit(initial_map_id)
|
||||
|
||||
|
||||
func _on_map_transition_queued(map_id: Enums.MapIds, marker_name: String) -> void:
|
||||
print("Map Transition Queued: %s" % [Enums.MapIds.keys()[map_id]])
|
||||
var map_scene := MapLoader.GetMap(map_id)
|
||||
MapLoader.SetSpawnMarker(marker_name)
|
||||
|
||||
for child in world.get_children():
|
||||
child.queue_free()
|
||||
await child.tree_exited
|
||||
|
||||
var map := map_scene.instantiate()
|
||||
world.call_deferred("add_child", map)
|
||||
await map.ready
|
||||
|
||||
_connect_loading_zone_transporters()
|
||||
MapChanged.emit(map_id)
|
||||
|
||||
|
||||
func _connect_loading_zone_transporters() -> void:
|
||||
var loading_zone_transporters := GroupUtils.GetAllLoadingZoneTransporters()
|
||||
print("Loading Zones: %d" % len(loading_zone_transporters))
|
||||
|
||||
for transporter in loading_zone_transporters:
|
||||
transporter.MapTransitionQueued.connect(_on_map_transition_queued)
|
||||
1
Main/Scripts/map_transitioner.gd.uid
Normal file
1
Main/Scripts/map_transitioner.gd.uid
Normal file
@@ -0,0 +1 @@
|
||||
uid://dr7ljodtof1k5
|
||||
1
Main/Scripts/world.gd
Normal file
1
Main/Scripts/world.gd
Normal file
@@ -0,0 +1 @@
|
||||
extends Node2D
|
||||
1
Main/Scripts/world.gd.uid
Normal file
1
Main/Scripts/world.gd.uid
Normal file
@@ -0,0 +1 @@
|
||||
uid://ekp7au5wf06q
|
||||
30
Main/main.tscn
Normal file
30
Main/main.tscn
Normal file
@@ -0,0 +1,30 @@
|
||||
[gd_scene format=3 uid="uid://dqgxg3i307lvr"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://vv4pj8uhiad8" path="res://Main/Scripts/main.gd" id="1_jjgbg"]
|
||||
[ext_resource type="Script" uid="uid://ekp7au5wf06q" path="res://Main/Scripts/world.gd" id="2_bo1nx"]
|
||||
[ext_resource type="Script" uid="uid://c4w8hney4mesw" path="res://Main/Scripts/gui.gd" id="3_8gbba"]
|
||||
[ext_resource type="Script" uid="uid://dr7ljodtof1k5" path="res://Main/Scripts/map_transitioner.gd" id="3_kry3j"]
|
||||
[ext_resource type="Script" uid="uid://cluyhxrc3pdb" path="res://Scripts/dialogue_trigger_connector.gd" id="4_6bp64"]
|
||||
[ext_resource type="PackedScene" uid="uid://cxc4x4yp7l3hg" path="res://UI/dialogue_box.tscn" id="6_21xkr"]
|
||||
|
||||
[node name="Main" type="Node2D" unique_id=1457826519]
|
||||
script = ExtResource("1_jjgbg")
|
||||
|
||||
[node name="Map Transitioner" type="Node" parent="." unique_id=1528505665]
|
||||
script = ExtResource("3_kry3j")
|
||||
|
||||
[node name="Dialogue Trigger Connector" type="Node" parent="." unique_id=1187622540 node_paths=PackedStringArray("dialogue_box")]
|
||||
script = ExtResource("4_6bp64")
|
||||
dialogue_box = NodePath("../Gui/Dialogue Box")
|
||||
|
||||
[node name="World" type="Node2D" parent="." unique_id=578440549]
|
||||
script = ExtResource("2_bo1nx")
|
||||
|
||||
[node name="Gui" type="CanvasLayer" parent="." unique_id=982257728]
|
||||
script = ExtResource("3_8gbba")
|
||||
|
||||
[node name="Dialogue Box" parent="Gui" unique_id=586562815 instance=ExtResource("6_21xkr")]
|
||||
visible = false
|
||||
|
||||
[connection signal="MapChanged" from="Map Transitioner" to="Dialogue Trigger Connector" method="_on_map_changed"]
|
||||
[connection signal="DialogueTriggered" from="Dialogue Trigger Connector" to="Gui/Dialogue Box" method="OnDialogueTriggered"]
|
||||
Reference in New Issue
Block a user