From 9103ee4cc1ee01530c594303a6d78c771569a705 Mon Sep 17 00:00:00 2001
From: betalars <contact@betalars.de>
Date: Sun, 6 Oct 2024 11:31:47 +0200
Subject: [PATCH] misc code cleanup

---
 src/base-environments/youth_room/Collectable.gd | 2 +-
 src/logic-scenes/board/card-board.gd            | 7 ++++---
 src/logic-scenes/card_picker/card_picker.gd     | 2 +-
 src/logic-scenes/misc/skip_control.gd           | 3 ++-
 src/singletons/global_state.gd                  | 2 --
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/base-environments/youth_room/Collectable.gd b/src/base-environments/youth_room/Collectable.gd
index cdd4793..a623647 100644
--- a/src/base-environments/youth_room/Collectable.gd
+++ b/src/base-environments/youth_room/Collectable.gd
@@ -1,4 +1,4 @@
-extends Area3D
+class_name InteractiveSprite extends Area3D
 
 @onready var pass_to_actor = $UiWrapper/UiSprite/SubViewport/Collectable_ui
 @onready var wrapper = $UiWrapper
diff --git a/src/logic-scenes/board/card-board.gd b/src/logic-scenes/board/card-board.gd
index bd300ce..73950f9 100644
--- a/src/logic-scenes/board/card-board.gd
+++ b/src/logic-scenes/board/card-board.gd
@@ -1,4 +1,4 @@
-extends PanelContainer
+class_name CardBoard extends PanelContainer
 
 #var area_dict = {
 #    "dropzone_content": [],
@@ -123,7 +123,7 @@ func _ready():
 #        currently_active_node.is_dragged = false
 
 # Will be used later to spawn Cards and Post-Its and remember them in the dictionary 
-func populate_board(card_names: Array):
+func populate_board(card_names: Array[String]):
 	mementos_collected += 1
 	
 	var all_new:Dictionary = board_of_devs.get_cards_by_name_array(card_names)
@@ -369,9 +369,10 @@ func get_save_dict() -> Dictionary:
 	return {
 		"cards": cards,
 		"stickies": stickies
-	}
+	} if cards != {} and stickies != {} else {}
 
 func initialise_from_save(savegame: SaveGame):
+	if savegame.board_state == {}: return
 	var cards: Dictionary = savegame.board_state["cards"]
 	var stickies: Dictionary = savegame.board_state["stickies"]
 	
diff --git a/src/logic-scenes/card_picker/card_picker.gd b/src/logic-scenes/card_picker/card_picker.gd
index 55ac410..aaab1f7 100644
--- a/src/logic-scenes/card_picker/card_picker.gd
+++ b/src/logic-scenes/card_picker/card_picker.gd
@@ -1,4 +1,4 @@
-extends CenterContainer
+class_name CardPicker extends CenterContainer
 
 #fixme INI is probably redundant.
 enum {
diff --git a/src/logic-scenes/misc/skip_control.gd b/src/logic-scenes/misc/skip_control.gd
index bcbea57..8cb4259 100644
--- a/src/logic-scenes/misc/skip_control.gd
+++ b/src/logic-scenes/misc/skip_control.gd
@@ -9,7 +9,8 @@ var time_pressed: float = 0
 var pressed: bool
 
 func _ready():
-	owner = get_node(costum_owner)
+	if costum_owner != NodePath(""):
+		owner = get_node(costum_owner)
 	
 	if owner == null:
 		owner = get_parent().get_parent()
diff --git a/src/singletons/global_state.gd b/src/singletons/global_state.gd
index bf6bab8..c1cbc67 100644
--- a/src/singletons/global_state.gd
+++ b/src/singletons/global_state.gd
@@ -74,8 +74,6 @@ func load_user_settings():
 		file.close()
 		var parsed: Dictionary = JSON.parse_string(raw_json)
 		
-		print(parsed)
-		
 		for kategory in parsed.keys():
 			for key in parsed[kategory].keys():
 				set(key, parsed[key])