From 237e3484cdf40bb401ab4e270315dade5c53765e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robin=20H=C3=BCbner?= <profan@prfn.se>
Date: Fri, 21 Sep 2018 21:03:52 +0200
Subject: [PATCH] separate data and logic setup

---
 data.gd | 43 +++++++++++++++++++++++++++++++++++++++++++
 game.gd | 54 ++++++++++++------------------------------------------
 2 files changed, 55 insertions(+), 42 deletions(-)
 create mode 100644 data.gd

diff --git a/data.gd b/data.gd
new file mode 100644
index 0000000..fb770a7
--- /dev/null
+++ b/data.gd
@@ -0,0 +1,43 @@
+extends Node
+
+# default game config
+const DEFAULT_CHARS_PER_SECOND = 32
+
+# voices for characters
+const brain_voice = null
+const arborator_voice = null
+
+const Characters = {
+	BRAIN = {
+		name = "~brain~",
+		name_colour = Color(1, 1, 1, 1),
+		voice = brain_voice,
+		talking_speed = 1.0,
+	},
+	ARBORATOR = {
+		name = "arborator",
+		name_colour = Color(1, 1, 1, 1),
+		voice = arborator_voice,
+		talking_speed = 1.0,
+	}
+}
+
+const Scenes = {
+	
+	# MENUS
+	MAIN_MENU = "res://menus/main_menu.tscn",
+	OPTIONS_MENU = "res://menus/options_menu.tscn",
+	
+	# GAME
+	INTRO = "res://scenes/intro.tscn",
+	FIRST_SCENE = "res://scenes/first_scene.tscn"
+	
+}
+
+const Themes = {
+	
+}
+
+const Images = {
+	INTRO_BG = "res://img/intro_bg.png"
+}
\ No newline at end of file
diff --git a/game.gd b/game.gd
index 9ffa60a..a5c4667 100644
--- a/game.gd
+++ b/game.gd
@@ -1,10 +1,16 @@
 extends Node
 
-# generic game globals
+const Data = preload("res://data.gd")
+
+# pull them into Game too
+const DEFAULT_CHARS_PER_SECOND = Data.DEFAULT_CHARS_PER_SECOND
+const Characters = Data.Characters
+const Images = Data.Images
+const Scenes = Data.Scenes
+const Themes = Data.Themes
+
+# generic game config globals
 var game_started = false setget _on_game_started_set
-
-var current_registry
-
 var reading_speed = 1.0 setget _on_set_reading_speed
 var master_vol = 50 setget _on_set_master_vol
 var music_vol = 50 setget _on_set_music_vol
@@ -26,44 +32,8 @@ onready var sfx_player = get_node("sfx_player")
 # transition node
 onready var transition = get_node("trans_layer/transition")
 
-# voices for characters
-const brain_voice = null
-const arborator_voice = null
-
-const DEFAULT_CHARS_PER_SECOND = 32
-
-const Characters = {
-	BRAIN = {
-		name = "~brain~",
-		name_colour = Color(1, 1, 1, 1),
-		voice = brain_voice,
-		talking_speed = 1.0,
-	},
-	ARBORATOR = {
-		name = "arborator",
-		name_colour = Color(1, 1, 1, 1),
-		voice = arborator_voice,
-		talking_speed = 1.0,
-	}
-}
-
-const Scenes = {
-	
-	# MENUS
-	MAIN_MENU = "res://menus/main_menu.tscn",
-	OPTIONS_MENU = "res://menus/options_menu.tscn",
-	
-	# GAME
-	INTRO = "res://scenes/intro.tscn",
-	FIRST_SCENE = "res://scenes/first_scene.tscn"
-	
-}
-
-const Themes = {}
-
-const Images = {
-	INTRO_BG = "res://img/intro_bg.png"
-}
+# actual game state here
+var current_registry
 
 func _ready():
 	pass