From 7845b1f08ffe3bae49943503272210d804e86a75 Mon Sep 17 00:00:00 2001
From: Anthony Foxclaw <noreply@tonytins.xyz>
Date: Fri, 5 Jun 2020 13:00:13 -0400
Subject: [PATCH] World is now seperate scene

---
 src/game.tscn  | 10 ++++++++++
 src/newgame.gd |  2 +-
 src/world.tscn |  7 ++-----
 3 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 src/game.tscn

diff --git a/src/game.tscn b/src/game.tscn
new file mode 100644
index 0000000..2c4f1f0
--- /dev/null
+++ b/src/game.tscn
@@ -0,0 +1,10 @@
+[gd_scene load_steps=3 format=2]
+
+[ext_resource path="res://src/world.tscn" type="PackedScene" id=1]
+[ext_resource path="res://src/gui.tscn" type="PackedScene" id=2]
+
+[node name="Game" type="Node"]
+
+[node name="World" parent="." instance=ExtResource( 1 )]
+
+[node name="GUI" parent="." instance=ExtResource( 2 )]
diff --git a/src/newgame.gd b/src/newgame.gd
index 99f865b..7691e9e 100644
--- a/src/newgame.gd
+++ b/src/newgame.gd
@@ -4,4 +4,4 @@ func _on_CreateBtn_pressed():
 	var city_name = $CityNameEdit.text
 	CityData.city_name = city_name
 	
-	get_tree().change_scene("res://src/world.tscn")
+	get_tree().change_scene("res://src/game.tscn")
diff --git a/src/world.tscn b/src/world.tscn
index 5b0e5f0..34d1efb 100644
--- a/src/world.tscn
+++ b/src/world.tscn
@@ -1,11 +1,10 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=4 format=2]
 
 [ext_resource path="res://assets/terrian.tres" type="TileSet" id=1]
-[ext_resource path="res://src/gui.tscn" type="PackedScene" id=2]
 [ext_resource path="res://src/world.gd" type="Script" id=3]
 [ext_resource path="res://assets/water.tres" type="TileSet" id=4]
 
-[node name="Node2D" type="Node"]
+[node name="World" type="Node"]
 script = ExtResource( 3 )
 
 [node name="Water" type="TileMap" parent="."]
@@ -17,5 +16,3 @@ format = 1
 tile_set = ExtResource( 1 )
 cell_size = Vector2( 16, 16 )
 format = 1
-
-[node name="GUI" parent="." instance=ExtResource( 2 )]