From 365bd884888e5aafa52cc1ff8631be7760a484d1 Mon Sep 17 00:00:00 2001
From: Liam <liamjdavison@gmail.com>
Date: Sat, 22 Mar 2025 19:25:19 +0000
Subject: [PATCH 01/14] Creating scene and hex grid layout for sponsor edit
 scene. This will allow me to choose different arrangements of hexes for each
 sponsor map. Eventually.

---
 gdj/hexgrid/map/editor/HexMapGridEditor.gdj   |  29 +++
 gdj/hexgrid/map/editor/SponsorEditor.gdj      |  25 ++
 gdj/screens/MainMenu/MainMenu.gdj             |   1 +
 .../kuiper/confirm_action/ConfirmAction.kt    |   5 +-
 src/main/kuiper/hexgrid/Hex.kt                |  14 +-
 src/main/kuiper/hexgrid/HexGrid.kt            |   1 -
 .../hexgrid/map/editor/HexMapGridEditor.kt    |  62 +++++
 .../hexgrid/map/editor/SponsorEditor.kt       |  20 ++
 .../hexgrid/map/editor/hex_map_editor.tscn    |  93 +++++++
 src/main/kuiper/screens/mainMenu/MainMenu.kt  | 239 +++++++++---------
 .../kuiper/screens/mainMenu/main_menu.tscn    |   5 +
 .../kuiper/technology/editor/tech_editor.tscn |   4 +-
 .../technology/editor/tech_web_editor.tscn    |   4 +-
 13 files changed, 370 insertions(+), 132 deletions(-)
 create mode 100644 gdj/hexgrid/map/editor/HexMapGridEditor.gdj
 create mode 100644 gdj/hexgrid/map/editor/SponsorEditor.gdj
 create mode 100644 src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt
 create mode 100644 src/main/kuiper/hexgrid/map/editor/SponsorEditor.kt
 create mode 100644 src/main/kuiper/hexgrid/map/editor/hex_map_editor.tscn

diff --git a/gdj/hexgrid/map/editor/HexMapGridEditor.gdj b/gdj/hexgrid/map/editor/HexMapGridEditor.gdj
new file mode 100644
index 0000000..8dfbc9a
--- /dev/null
+++ b/gdj/hexgrid/map/editor/HexMapGridEditor.gdj
@@ -0,0 +1,29 @@
+// THIS FILE IS GENERATED! DO NOT EDIT OR DELETE IT. EDIT OR DELETE THE ASSOCIATED SOURCE CODE FILE INSTEAD
+// Note: You can however freely move this file inside your godot project if you want. Keep in mind however, that if you rename the originating source code file, this file will be deleted and regenerated as a new file instead of being updated! Other modifications to the source file however, will result in this file being updated.
+
+registeredName = HexMapGridEditor
+fqName = hexgrid.map.editor.HexMapGridEditor
+relativeSourcePath = src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt
+baseType = GridContainer
+supertypes = [
+    godot.api.GridContainer,
+	godot.api.Container,
+	godot.api.Control,
+	godot.api.CanvasItem,
+	godot.api.Node,
+	godot.api.Object,
+	godot.core.KtObject,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer,
+	kotlin.Any
+]
+signals = [
+    
+]
+properties = [
+    
+]
+functions = [
+    _ready,
+	_process
+]
\ No newline at end of file
diff --git a/gdj/hexgrid/map/editor/SponsorEditor.gdj b/gdj/hexgrid/map/editor/SponsorEditor.gdj
new file mode 100644
index 0000000..9f1dc6c
--- /dev/null
+++ b/gdj/hexgrid/map/editor/SponsorEditor.gdj
@@ -0,0 +1,25 @@
+// THIS FILE IS GENERATED! DO NOT EDIT OR DELETE IT. EDIT OR DELETE THE ASSOCIATED SOURCE CODE FILE INSTEAD
+// Note: You can however freely move this file inside your godot project if you want. Keep in mind however, that if you rename the originating source code file, this file will be deleted and regenerated as a new file instead of being updated! Other modifications to the source file however, will result in this file being updated.
+
+registeredName = SponsorEditor
+fqName = hexgrid.map.editor.SponsorEditor
+relativeSourcePath = src/main/kuiper/hexgrid/map/editor/SponsorEditor.kt
+baseType = Node
+supertypes = [
+    godot.api.Node,
+	godot.api.Object,
+	godot.core.KtObject,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer,
+	kotlin.Any
+]
+signals = [
+    
+]
+properties = [
+    
+]
+functions = [
+    _ready,
+	_process
+]
\ No newline at end of file
diff --git a/gdj/screens/MainMenu/MainMenu.gdj b/gdj/screens/MainMenu/MainMenu.gdj
index 1bc140f..3878f4a 100644
--- a/gdj/screens/MainMenu/MainMenu.gdj
+++ b/gdj/screens/MainMenu/MainMenu.gdj
@@ -30,5 +30,6 @@ functions = [
 	_on_load_button_pressed,
 	_on_load_file_selected,
 	on_tech_tree_editor_pressed,
+	on_sponsor_editor_pressed,
 	load_game
 ]
\ No newline at end of file
diff --git a/src/main/kuiper/confirm_action/ConfirmAction.kt b/src/main/kuiper/confirm_action/ConfirmAction.kt
index 2e32f4e..1c58882 100644
--- a/src/main/kuiper/confirm_action/ConfirmAction.kt
+++ b/src/main/kuiper/confirm_action/ConfirmAction.kt
@@ -79,7 +79,7 @@ class ConfirmAction : Control(), LogInterface {
         signalBus.showActionConfirmation.connect { h, c ->
             hex = h
             card = c
-            location = h.location
+            location = h.location ?: Location("**Unknown**")
             updateUI()
         }
     }
@@ -152,7 +152,7 @@ class ConfirmAction : Control(), LogInterface {
                             }
 
                             is Building.ScienceLab -> {
-                                buildingSummary.appendText("  New ${building.name} at ${hex.location.name}")
+                                buildingSummary.appendText("  New ${building.name} at ${hex.location?.name}")
 
                                 building.runningCosts.forEach { (resourceType, amount) ->
                                     costsPerTurnList.appendText(
@@ -197,7 +197,6 @@ class ConfirmAction : Control(), LogInterface {
         hexToRender.location = location
         hexToRender.isConfirmationDialog = true
         hexToRender.hexUnlocked = true
-        hexToRender.sectors = location.sectors.toMutableList()
         hexToRender.setName("ConfirmHex${hex.id}")
         // hide the location label because I've got better one down below
         hexToRender.getNodeAs<Label>("LocationLabel")!!.visible = false
diff --git a/src/main/kuiper/hexgrid/Hex.kt b/src/main/kuiper/hexgrid/Hex.kt
index 01013f0..71d928c 100644
--- a/src/main/kuiper/hexgrid/Hex.kt
+++ b/src/main/kuiper/hexgrid/Hex.kt
@@ -12,7 +12,7 @@ import godot.core.Vector2
 import godot.core.toVariantArray
 import godot.extension.getNodeAs
 import state.Location
-import state.Sector
+import state.SectorStatus
 import kotlin.math.cos
 import kotlin.math.sin
 
@@ -40,25 +40,23 @@ class Hex : Node2D(), LogInterface {
     var newRadius: Double = 75.0
 
     // UI elements
-    private lateinit var locationLabel: Label
+    private val locationLabel: Label by lazy { getNodeAs("%LocationLabel")!! }
     lateinit var marker: HexDropTarget
-    lateinit var location: Location
+    var location: Location? = null
 
     // Packed scenes
     private val sectorScene = ResourceLoader.load("res://src/main/kuiper/hexgrid/sector_segment.tscn") as PackedScene
 
     // Data
-    var sectors: MutableList<Sector> = mutableListOf()
     private lateinit var pointSet: Map<Int, Triple<Vector2, Vector2, Vector2>>
     private var unlockedColor = Color(1.0, 1.0, 1.0, 1.0)
     private var lockedColor = Color(0.2, 0.2, 0.2, 1.0)
     private var highlightColor = Color(1.0, 0.8, 0.8, 1.0)
-    private var colour: Color = unlockedColor
+    var colour: Color = unlockedColor
     var isConfirmationDialog: Boolean = false
 
     @RegisterFunction
     override fun _ready() {
-        locationLabel = getNodeAs("%LocationLabel")!!
         if (!hexUnlocked) {
             colour = lockedColor
         }
@@ -70,11 +68,11 @@ class Hex : Node2D(), LogInterface {
             segment.setTextureRepeat(CanvasItem.TextureRepeat.TEXTURE_REPEAT_DISABLED)
             segment.location = location
             segment.isConfirmationDialog = isConfirmationDialog
-            segment.status = sectors[index - 1].status
+            segment.status = location?.sectors?.get(index - 1)?.status ?: SectorStatus.EMPTY
             addChild(segment)
             segment.updateUI(
                 index - 1, PackedVector2Array(triangle.toList().toVariantArray()),
-                location.getBuilding(index - 1)
+                location?.getBuilding(index - 1)
             )
         }
     }
diff --git a/src/main/kuiper/hexgrid/HexGrid.kt b/src/main/kuiper/hexgrid/HexGrid.kt
index e311820..066b0db 100644
--- a/src/main/kuiper/hexgrid/HexGrid.kt
+++ b/src/main/kuiper/hexgrid/HexGrid.kt
@@ -77,7 +77,6 @@ class HexGrid : Control() {
         hex.id = i
         hex.location = location
         hex.hexUnlocked = location.unlocked
-        hex.sectors = location.sectors.toMutableList()
         val dropTarget = hex.getNodeAs<HexDropTarget>("%HexDropTarget")!!
         dropTarget.addToGroup("hexDropTargets".asCachedStringName())
         dropTarget.setName("HexDropTarget$i")
diff --git a/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt b/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt
new file mode 100644
index 0000000..e8b6572
--- /dev/null
+++ b/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt
@@ -0,0 +1,62 @@
+package hexgrid.map.editor
+
+import godot.annotation.RegisterClass
+import godot.annotation.RegisterFunction
+import godot.api.GridContainer
+import godot.api.Label
+import godot.api.PackedScene
+import godot.api.ResourceLoader
+import godot.core.Color
+import godot.core.Vector2
+import godot.extension.getNodeAs
+import hexgrid.Hex
+import state.Location
+import kotlin.math.cos
+
+@RegisterClass
+class HexMapGridEditor : GridContainer() {
+
+    // Packed scenes
+    private val hexScene = ResourceLoader.load("res://src/main/kuiper/hexgrid/Hex.tscn") as PackedScene
+
+    // UI elements
+
+
+    @RegisterFunction
+    override fun _ready() {
+
+        val startX = 150.0
+        val startY = 150.0
+//2 * (75.0 * sin(Math.PI / 2))
+        var xStagger = 225.0
+        var yStagger = 0.0
+        for (i in 0..5) {
+            for (j in 0..5) {
+                val rowStagger = if (j % 2 == 0) {
+                    112.5
+                } else {
+                    0.0
+                }
+                val colStagger = if (j % 2 == 0) {
+                    0.0
+                } else {
+                    -75.0
+                }
+                val hex = hexScene.instantiate() as Hex
+                val diameter = hex.newRadius * 2 * cos(Math.PI / 6)
+                hex.location = Location("location $i $j")
+                hex.setName("Hex_${i}_$j")
+                hex.colour = Color.mediumPurple
+                hex.setPosition(Vector2((i * xStagger) + startX + rowStagger, (j * diameter) + startY + colStagger))
+                hex.getNodeAs<Label>("%LocationLabel")!!.visible = false
+                addChild(hex)
+            }
+        }
+
+    }
+
+    @RegisterFunction
+    override fun _process(delta: Double) {
+
+    }
+}
diff --git a/src/main/kuiper/hexgrid/map/editor/SponsorEditor.kt b/src/main/kuiper/hexgrid/map/editor/SponsorEditor.kt
new file mode 100644
index 0000000..f1fa322
--- /dev/null
+++ b/src/main/kuiper/hexgrid/map/editor/SponsorEditor.kt
@@ -0,0 +1,20 @@
+package hexgrid.map.editor
+
+import godot.annotation.RegisterClass
+import godot.annotation.RegisterFunction
+import godot.api.Node
+
+@RegisterClass
+class SponsorEditor : Node() {
+
+
+	@RegisterFunction
+	override fun _ready() {
+
+	}
+
+	@RegisterFunction
+	override fun _process(delta: Double) {
+
+	}
+}
diff --git a/src/main/kuiper/hexgrid/map/editor/hex_map_editor.tscn b/src/main/kuiper/hexgrid/map/editor/hex_map_editor.tscn
new file mode 100644
index 0000000..3adc575
--- /dev/null
+++ b/src/main/kuiper/hexgrid/map/editor/hex_map_editor.tscn
@@ -0,0 +1,93 @@
+[gd_scene load_steps=4 format=3 uid="uid://b3lj8ojhudueu"]
+
+[ext_resource type="Script" uid="uid://cnjo42sklflyr" path="res://src/main/kuiper/hexgrid/map/editor/SponsorEditor.kt" id="1_dwvxf"]
+[ext_resource type="Script" uid="uid://bqj8mswck507g" path="res://src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt" id="2_rdfxg"]
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_rdfxg"]
+bg_color = Color(0.0278245, 0.0278245, 0.0278245, 1)
+
+[node name="HexMapEditor" type="Control"]
+layout_mode = 3
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+mouse_filter = 1
+script = ExtResource("1_dwvxf")
+
+[node name="VBoxContainer" type="VBoxContainer" parent="."]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+
+[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]
+custom_minimum_size = Vector2(0, 50)
+layout_mode = 2
+
+[node name="LoadSponsorBtn" type="MenuButton" parent="VBoxContainer/HBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+text = "Load Sponsor..."
+
+[node name="SaveSponsorBtn" type="Button" parent="VBoxContainer/HBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+text = "Save"
+
+[node name="NewSponsorBtn" type="Button" parent="VBoxContainer/HBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+text = "New Sponsor"
+
+[node name="MarginContainer" type="MarginContainer" parent="VBoxContainer/HBoxContainer"]
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="HBoxContainer2" type="HBoxContainer" parent="VBoxContainer"]
+layout_mode = 2
+size_flags_vertical = 3
+
+[node name="PanelContainer" type="PanelContainer" parent="VBoxContainer/HBoxContainer2"]
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="Label" type="Label" parent="VBoxContainer/HBoxContainer2/PanelContainer"]
+layout_mode = 2
+size_flags_horizontal = 0
+size_flags_vertical = 0
+text = "Starting bonuses, stats, sciences, description goes here"
+
+[node name="PanelContainer2" type="PanelContainer" parent="VBoxContainer/HBoxContainer2"]
+layout_mode = 2
+size_flags_horizontal = 3
+size_flags_stretch_ratio = 2.0
+theme_override_styles/panel = SubResource("StyleBoxFlat_rdfxg")
+
+[node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer2"]
+layout_mode = 2
+
+[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer2/VBoxContainer"]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="VBoxContainer/HBoxContainer2/PanelContainer2/VBoxContainer/HBoxContainer"]
+layout_mode = 2
+text = "Hex editor goes here"
+
+[node name="MarginContainer" type="MarginContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer2/VBoxContainer/HBoxContainer"]
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="AddHexButton" type="Button" parent="VBoxContainer/HBoxContainer2/PanelContainer2/VBoxContainer/HBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+text = "+ Add Hex"
+
+[node name="HexGridContainer" type="GridContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer2/VBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_vertical = 3
+script = ExtResource("2_rdfxg")
diff --git a/src/main/kuiper/screens/mainMenu/MainMenu.kt b/src/main/kuiper/screens/mainMenu/MainMenu.kt
index 615642a..c9b7074 100644
--- a/src/main/kuiper/screens/mainMenu/MainMenu.kt
+++ b/src/main/kuiper/screens/mainMenu/MainMenu.kt
@@ -19,121 +19,126 @@ import state.GameState
 @RegisterClass
 class MainMenu : Node(), LogInterface {
 
-    override var logEnabled: Boolean = true
-
-    // Globals
-    private lateinit var signalBus: SignalBus
-
-    @RegisterSignal
-    val quitGameSignal: Signal0 by signal0()
-
-    @RegisterSignal
-    val newGameSignal: Signal0 by signal0()
-
-    private lateinit var gameConfig: GameConfig
-    private lateinit var loadButton: Button
-    private lateinit var continueButton: Button
-    private lateinit var loadFileDialog: FileDialog
-
-    // Called when the node enters the scene tree for the first time.
-    @RegisterFunction
-    override fun _ready() {
-        signalBus = getNodeAs("/root/SignalBus")!!
-
-        loadButton = getNodeAs("VBoxContainer/VBoxContainer/Load")!!
-        continueButton = getNodeAs("VBoxContainer/VBoxContainer/Continue")!!
-        loadFileDialog = getNodeAs("LoadFileDialog")!!
-        loadFileDialog.let {
-            it.setCurrentPath("user://saves/")
-            it.clearFilters()
-            it.addFilter("*.json", "Saved JSON games")
-        }
-        gameConfig = loadConfiguration()
-        if (gameConfig.lastSaveFile != null) {
-            log("Last save file: ${gameConfig.lastSaveFile}")
-            continueButton.let {
-                it.disabled = false
-                it.tooltipText = "Continue game from ${gameConfig.lastSaveFile}"
-            }
-            loadButton.disabled = false
-        } else {
-            logWarning("No save file found")
-        }
-    }
-
-    // Called every frame. 'delta' is the elapsed time since the previous frame.
-    @RegisterFunction
-    override fun _process(delta: Double) {
-    }
-
-    @RegisterFunction
-    fun _on_new_game() {
-        getTree()?.changeSceneToFile("res://src/main/kuiper/screens/gameSetup/game_setup.tscn")
-    }
-
-    /**
-     * Quit the game
-     * **signal**: quitGameSignal
-     */
-    @RegisterFunction
-    fun _on_quit_game() {
-        log("Quitting game")
-        getTree()?.quit()
-    }
-
-
-    @RegisterFunction
-    fun _on_continue_game() {
-        loadGame(gameConfig.lastSaveFile!!)
-    }
-
-    @RegisterFunction
-    fun _on_load_button_pressed() {
-        loadFileDialog.visible = true
-    }
-
-    @RegisterFunction
-    fun _on_load_file_selected(file: String) {
-        loadGame(file)
-    }
-
-    @RegisterFunction
-    fun onTechTreeEditorPressed() {
-        getTree()?.changeSceneToFile("res://src/main/kuiper/technology/editor/tech_web_editor.tscn")
-    }
-
-    @RegisterFunction
-    fun loadGame(gameSave: String) {
-        if (FileAccess.fileExists(gameSave)) {
-            // Load game
-            val json = Json {
-                prettyPrint = true
-                encodeDefaults = true
-                allowStructuredMapKeys = true
-            }
-            val jsonString = FileAccess.open(gameSave, FileAccess.ModeFlags.READ)!!.getAsText()
-            val gameData = json.decodeFromString(GameState.serializer(), jsonString)
-            log("Loaded $gameSave : ${gameData.stateToString()}")
-            val gameState = getTree()?.root?.getChild(0) as GameState
-            gameState.deepCopy(gameData)
-            getTree()?.changeSceneToFile("res://src/main/kuiper/screens/kuiper/game.tscn")
-        } else {
-            logError("Save file not found: $gameSave")
-        }
-        loadButton.disabled = true
-        continueButton.disabled = true
-        continueButton.tooltipText = ""
-    }
-
-    private fun loadConfiguration(): GameConfig {
-        // Load configuration file, if it exists
-        val configFile = FileAccess.open("user://config.json", FileAccess.ModeFlags.READ)
-        val gameConfig = if (configFile != null) {
-            val configString = configFile.getAsText()
-            Json.decodeFromString(GameConfig.serializer(), configString)
-        } else {
-            GameConfig()
-        }
-        return gameConfig
-    }
+	override var logEnabled: Boolean = true
+
+	// Globals
+	private lateinit var signalBus: SignalBus
+
+	@RegisterSignal
+	val quitGameSignal: Signal0 by signal0()
+
+	@RegisterSignal
+	val newGameSignal: Signal0 by signal0()
+
+	private lateinit var gameConfig: GameConfig
+	private lateinit var loadButton: Button
+	private lateinit var continueButton: Button
+	private lateinit var loadFileDialog: FileDialog
+
+	// Called when the node enters the scene tree for the first time.
+	@RegisterFunction
+	override fun _ready() {
+		signalBus = getNodeAs("/root/SignalBus")!!
+
+		loadButton = getNodeAs("VBoxContainer/VBoxContainer/Load")!!
+		continueButton = getNodeAs("VBoxContainer/VBoxContainer/Continue")!!
+		loadFileDialog = getNodeAs("LoadFileDialog")!!
+		loadFileDialog.let {
+			it.setCurrentPath("user://saves/")
+			it.clearFilters()
+			it.addFilter("*.json", "Saved JSON games")
+		}
+		gameConfig = loadConfiguration()
+		if (gameConfig.lastSaveFile != null) {
+			log("Last save file: ${gameConfig.lastSaveFile}")
+			continueButton.let {
+				it.disabled = false
+				it.tooltipText = "Continue game from ${gameConfig.lastSaveFile}"
+			}
+			loadButton.disabled = false
+		} else {
+			logWarning("No save file found")
+		}
+	}
+
+	// Called every frame. 'delta' is the elapsed time since the previous frame.
+	@RegisterFunction
+	override fun _process(delta: Double) {
+	}
+
+	@RegisterFunction
+	fun _on_new_game() {
+		getTree()?.changeSceneToFile("res://src/main/kuiper/screens/gameSetup/game_setup.tscn")
+	}
+
+	/**
+	 * Quit the game
+	 * **signal**: quitGameSignal
+	 */
+	@RegisterFunction
+	fun _on_quit_game() {
+		log("Quitting game")
+		getTree()?.quit()
+	}
+
+
+	@RegisterFunction
+	fun _on_continue_game() {
+		loadGame(gameConfig.lastSaveFile!!)
+	}
+
+	@RegisterFunction
+	fun _on_load_button_pressed() {
+		loadFileDialog.visible = true
+	}
+
+	@RegisterFunction
+	fun _on_load_file_selected(file: String) {
+		loadGame(file)
+	}
+
+	@RegisterFunction
+	fun onTechTreeEditorPressed() {
+		getTree()?.changeSceneToFile("res://src/main/kuiper/technology/editor/tech_web_editor.tscn")
+	}
+
+	@RegisterFunction
+	fun onSponsorEditorPressed() {
+		getTree()?.changeSceneToFile("res://src/main/kuiper/hexgrid/map/editor/hex_map_editor.tscn")
+	}
+
+	@RegisterFunction
+	fun loadGame(gameSave: String) {
+		if (FileAccess.fileExists(gameSave)) {
+			// Load game
+			val json = Json {
+				prettyPrint = true
+				encodeDefaults = true
+				allowStructuredMapKeys = true
+			}
+			val jsonString = FileAccess.open(gameSave, FileAccess.ModeFlags.READ)!!.getAsText()
+			val gameData = json.decodeFromString(GameState.serializer(), jsonString)
+			log("Loaded $gameSave : ${gameData.stateToString()}")
+			val gameState = getTree()?.root?.getChild(0) as GameState
+			gameState.deepCopy(gameData)
+			getTree()?.changeSceneToFile("res://src/main/kuiper/screens/kuiper/game.tscn")
+		} else {
+			logError("Save file not found: $gameSave")
+		}
+		loadButton.disabled = true
+		continueButton.disabled = true
+		continueButton.tooltipText = ""
+	}
+
+	private fun loadConfiguration(): GameConfig {
+		// Load configuration file, if it exists
+		val configFile = FileAccess.open("user://config.json", FileAccess.ModeFlags.READ)
+		val gameConfig = if (configFile != null) {
+			val configString = configFile.getAsText()
+			Json.decodeFromString(GameConfig.serializer(), configString)
+		} else {
+			GameConfig()
+		}
+		return gameConfig
+	}
 }
diff --git a/src/main/kuiper/screens/mainMenu/main_menu.tscn b/src/main/kuiper/screens/mainMenu/main_menu.tscn
index 24cca4e..3036541 100644
--- a/src/main/kuiper/screens/mainMenu/main_menu.tscn
+++ b/src/main/kuiper/screens/mainMenu/main_menu.tscn
@@ -31,6 +31,10 @@ unique_name_in_owner = true
 layout_mode = 2
 text = "Tech Tree Editor"
 
+[node name="Button" type="Button" parent="HBoxContainer"]
+layout_mode = 2
+text = "Sponsor Editor"
+
 [node name="VBoxContainer" type="VBoxContainer" parent="."]
 anchors_preset = 8
 anchor_left = 0.5
@@ -96,6 +100,7 @@ file_mode = 0
 access = 1
 
 [connection signal="pressed" from="HBoxContainer/TechEditorButton" to="." method="on_tech_tree_editor_pressed"]
+[connection signal="pressed" from="HBoxContainer/Button" to="." method="on_sponsor_editor_pressed"]
 [connection signal="pressed" from="VBoxContainer/VBoxContainer/Continue" to="." method="_on_continue_game"]
 [connection signal="pressed" from="VBoxContainer/VBoxContainer/NewGame" to="." method="_on_new_game"]
 [connection signal="pressed" from="VBoxContainer/VBoxContainer/Load" to="." method="_on_load_button_pressed"]
diff --git a/src/main/kuiper/technology/editor/tech_editor.tscn b/src/main/kuiper/technology/editor/tech_editor.tscn
index 2852c01..01df89e 100644
--- a/src/main/kuiper/technology/editor/tech_editor.tscn
+++ b/src/main/kuiper/technology/editor/tech_editor.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=4 format=3 uid="uid://buebhw0isnxxj"]
 
-[ext_resource type="Script" path="res://src/main/kuiper/technology/editor/TechEditor.kt" id="1_174in"]
+[ext_resource type="Script" uid="uid://boiku4eb5is6t" path="res://src/main/kuiper/technology/editor/TechEditor.kt" id="1_174in"]
 [ext_resource type="PackedScene" uid="uid://mi2r8a4hdvio" path="res://src/main/kuiper/technology/editor/science_range_edit.tscn" id="2_5xk71"]
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_1hbku"]
@@ -70,6 +70,7 @@ alignment = 0
 item_count = 5
 popup/item_0/text = "Tier 1"
 popup/item_0/checked = true
+popup/item_0/id = 0
 popup/item_1/text = "Tier 2"
 popup/item_1/id = 1
 popup/item_2/text = "Tier 3"
@@ -113,6 +114,7 @@ layout_mode = 2
 text = "LOCKED"
 item_count = 4
 popup/item_0/text = "LOCKED"
+popup/item_0/id = 0
 popup/item_1/text = "UNLOCKED"
 popup/item_1/id = 1
 popup/item_2/text = "RESEARCHING"
diff --git a/src/main/kuiper/technology/editor/tech_web_editor.tscn b/src/main/kuiper/technology/editor/tech_web_editor.tscn
index 6a7e865..d50bd6b 100644
--- a/src/main/kuiper/technology/editor/tech_web_editor.tscn
+++ b/src/main/kuiper/technology/editor/tech_web_editor.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=3 uid="uid://p8uxma4wg6l5"]
 
-[ext_resource type="Script" path="res://src/main/kuiper/technology/editor/TechWebEditor.kt" id="1_qduao"]
-[ext_resource type="Script" path="res://src/main/kuiper/technology/editor/WebLayout.kt" id="2_qpoux"]
+[ext_resource type="Script" uid="uid://dacndy3nby176" path="res://src/main/kuiper/technology/editor/TechWebEditor.kt" id="1_qduao"]
+[ext_resource type="Script" uid="uid://dd1il2o6pakdm" path="res://src/main/kuiper/technology/editor/WebLayout.kt" id="2_qpoux"]
 
 [node name="TechWebEditor" type="Control"]
 layout_mode = 3

From 347c431b870dafa5b1dd2b51c262db350eed3be9 Mon Sep 17 00:00:00 2001
From: Liam <liamjdavison@gmail.com>
Date: Sun, 23 Mar 2025 11:35:54 +0000
Subject: [PATCH 02/14] New algorithm to calculate hex placement in a grid.

---
 gdj/hexgrid/map/editor/HexMapGridEditor.gdj   |  2 +-
 src/main/kuiper/hexgrid/Hex.kt                |  5 +
 .../hexgrid/map/editor/HexMapGridEditor.kt    | 94 ++++++++++++++-----
 .../hexgrid/map/editor/hex_map_editor.tscn    | 15 ++-
 4 files changed, 92 insertions(+), 24 deletions(-)

diff --git a/gdj/hexgrid/map/editor/HexMapGridEditor.gdj b/gdj/hexgrid/map/editor/HexMapGridEditor.gdj
index 8dfbc9a..8012720 100644
--- a/gdj/hexgrid/map/editor/HexMapGridEditor.gdj
+++ b/gdj/hexgrid/map/editor/HexMapGridEditor.gdj
@@ -21,7 +21,7 @@ signals = [
     
 ]
 properties = [
-    
+    dimension
 ]
 functions = [
     _ready,
diff --git a/src/main/kuiper/hexgrid/Hex.kt b/src/main/kuiper/hexgrid/Hex.kt
index 71d928c..80457c2 100644
--- a/src/main/kuiper/hexgrid/Hex.kt
+++ b/src/main/kuiper/hexgrid/Hex.kt
@@ -48,6 +48,11 @@ class Hex : Node2D(), LogInterface {
     private val sectorScene = ResourceLoader.load("res://src/main/kuiper/hexgrid/sector_segment.tscn") as PackedScene
 
     // Data
+    var q: Int = 0
+    var r: Int = 0
+    var row: Int = 0
+    var col: Int = 0
+
     private lateinit var pointSet: Map<Int, Triple<Vector2, Vector2, Vector2>>
     private var unlockedColor = Color(1.0, 1.0, 1.0, 1.0)
     private var lockedColor = Color(0.2, 0.2, 0.2, 1.0)
diff --git a/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt b/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt
index e8b6572..0595154 100644
--- a/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt
+++ b/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt
@@ -1,62 +1,112 @@
 package hexgrid.map.editor
 
+import godot.annotation.Export
 import godot.annotation.RegisterClass
 import godot.annotation.RegisterFunction
+import godot.annotation.RegisterProperty
 import godot.api.GridContainer
 import godot.api.Label
 import godot.api.PackedScene
 import godot.api.ResourceLoader
-import godot.core.Color
 import godot.core.Vector2
 import godot.extension.getNodeAs
 import hexgrid.Hex
 import state.Location
-import kotlin.math.cos
+import kotlin.math.sqrt
 
 @RegisterClass
 class HexMapGridEditor : GridContainer() {
 
+    @RegisterProperty
+    @Export
+    var dimension: Int = 6
+    
     // Packed scenes
     private val hexScene = ResourceLoader.load("res://src/main/kuiper/hexgrid/Hex.tscn") as PackedScene
 
     // UI elements
 
+    // Data
+    private var grid = Array(dimension) { Array(dimension) { Vector2.ZERO } }
 
     @RegisterFunction
     override fun _ready() {
 
-        val startX = 150.0
-        val startY = 150.0
-//2 * (75.0 * sin(Math.PI / 2))
-        var xStagger = 225.0
-        var yStagger = 0.0
-        for (i in 0..5) {
-            for (j in 0..5) {
-                val rowStagger = if (j % 2 == 0) {
-                    112.5
-                } else {
-                    0.0
-                }
-                val colStagger = if (j % 2 == 0) {
-                    0.0
-                } else {
-                    -75.0
-                }
+        // set up the grid
+        grid = calculateGridCoordinates(dimension, dimension)
+        grid.forEachIndexed { i, row ->
+            row.forEachIndexed { j, vector2 ->
                 val hex = hexScene.instantiate() as Hex
-                val diameter = hex.newRadius * 2 * cos(Math.PI / 6)
                 hex.location = Location("location $i $j")
                 hex.setName("Hex_${i}_$j")
-                hex.colour = Color.mediumPurple
-                hex.setPosition(Vector2((i * xStagger) + startX + rowStagger, (j * diameter) + startY + colStagger))
+                hex.colour = godot.core.Color.mediumPurple
+                hex.setPosition(vector2)
                 hex.getNodeAs<Label>("%LocationLabel")!!.visible = false
                 addChild(hex)
             }
         }
 
+        /*//2 * (75.0 * sin(Math.PI / 2))
+                var xSpacing = 225.0
+                for (i in 0..5) {
+                    for (j in 0..5) {
+                        val rowStagger = if (j % 2 == 0) {
+                            112.5
+                        } else {
+                            0.0
+                        }
+                        val colStagger = if (j % 2 == 0) {
+                            0.0
+                        } else {
+                            -75.0
+                        }
+                        val hex = hexScene.instantiate() as Hex
+                        val diameter = hex.newRadius * 2 * cos(Math.PI / 6)
+                        hex.location = Location("location $i $j")
+                        hex.setName("Hex_${i}_$j")
+                        hex.colour = Color.mediumPurple
+                        hex.setPosition(Vector2((i * xSpacing) + rowStagger, (j * diameter) + colStagger))
+                        hex.getNodeAs<Label>("%LocationLabel")!!.visible = false
+                        addChild(hex)
+                    }
+                }*/
+
     }
 
     @RegisterFunction
     override fun _process(delta: Double) {
 
     }
+
+    private fun calculateGridCoordinates(xCount: Int, yCount: Int): Array<Array<Vector2>> {
+        // flat topped, evenq orientation
+        val hexCoords = Array(xCount) { Array<Vector2>(yCount) { Vector2.ZERO } }
+        val radius = 75.0
+        val diameter = radius * 2
+        val width = diameter
+        val height = sqrt(3.0) * radius
+        val horizDistance = 3.0 / 2.0 * radius
+
+        // we are calculating the coordinates of the centre of each hex
+        for (i in 0 until xCount) {
+            for (j in 0 until yCount) {
+                val x = i * horizDistance
+                val y = j * height + (i % 2) * (height / 2)
+                hexCoords[i][j] = Vector2(x, y)
+            }
+        }
+        return hexCoords
+    }
+
+    /*  fun axial_to_oddq(hex: Hex) {
+          val col = hex.q
+          val row = hex.r + (hex.q - (hex.q&1)) / 2
+          return OffsetCoord(col, row)
+      }
+
+      fun oddq_to_axial(hex: Hex) {
+          val q = hex.col
+          val r = hex.row - (hex.col - (hex.col&1)) / 2
+          return Hex(q, r)
+      }*/
 }
diff --git a/src/main/kuiper/hexgrid/map/editor/hex_map_editor.tscn b/src/main/kuiper/hexgrid/map/editor/hex_map_editor.tscn
index 3adc575..50c2f59 100644
--- a/src/main/kuiper/hexgrid/map/editor/hex_map_editor.tscn
+++ b/src/main/kuiper/hexgrid/map/editor/hex_map_editor.tscn
@@ -86,8 +86,21 @@ unique_name_in_owner = true
 layout_mode = 2
 text = "+ Add Hex"
 
-[node name="HexGridContainer" type="GridContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer2/VBoxContainer"]
+[node name="MarginContainer" type="MarginContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer2/VBoxContainer"]
+layout_mode = 2
+theme_override_constants/margin_bottom = 120
+
+[node name="HBoxContainer2" type="HBoxContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer2/VBoxContainer"]
+layout_mode = 2
+size_flags_vertical = 3
+
+[node name="MarginContainer" type="MarginContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer2/VBoxContainer/HBoxContainer2"]
+layout_mode = 2
+theme_override_constants/margin_right = 200
+
+[node name="HexGridContainer" type="GridContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer2/VBoxContainer/HBoxContainer2"]
 unique_name_in_owner = true
 layout_mode = 2
+size_flags_horizontal = 3
 size_flags_vertical = 3
 script = ExtResource("2_rdfxg")

From 68347db94a06b5718ca6e80e3ba519d2b0246da6 Mon Sep 17 00:00:00 2001
From: Liam <liamjdavison@gmail.com>
Date: Sun, 23 Mar 2025 13:48:03 +0000
Subject: [PATCH 03/14] Got hex highlighting working, but it has broken action
 card dropping. The Hex class is being used in different ways and is getting
 messy...

---
 gdj/hexgrid/Hex.gdj                           |   4 +-
 src/main/kuiper/hexgrid/Hex.kt                |  21 +-
 src/main/kuiper/hexgrid/Hex.tscn              |   9 +
 src/main/kuiper/hexgrid/HexDropTarget.tscn    |   1 +
 src/main/kuiper/hexgrid/SectorSegment.kt      | 214 +++++++++---------
 .../hexgrid/map/editor/HexMapGridEditor.kt    |  28 +--
 .../hexgrid/map/editor/hex_map_editor.tscn    |   9 +-
 7 files changed, 143 insertions(+), 143 deletions(-)

diff --git a/gdj/hexgrid/Hex.gdj b/gdj/hexgrid/Hex.gdj
index 7abd0ea..1ce00f0 100644
--- a/gdj/hexgrid/Hex.gdj
+++ b/gdj/hexgrid/Hex.gdj
@@ -29,5 +29,7 @@ functions = [
 	_process,
 	_draw,
 	highlight,
-	unhighlight
+	unhighlight,
+	on_mouse_entered,
+	on_mouse_exited
 ]
\ No newline at end of file
diff --git a/src/main/kuiper/hexgrid/Hex.kt b/src/main/kuiper/hexgrid/Hex.kt
index 80457c2..7359257 100644
--- a/src/main/kuiper/hexgrid/Hex.kt
+++ b/src/main/kuiper/hexgrid/Hex.kt
@@ -41,6 +41,8 @@ class Hex : Node2D(), LogInterface {
 
     // UI elements
     private val locationLabel: Label by lazy { getNodeAs("%LocationLabel")!! }
+    private val area2D: Area2D by lazy { getNodeAs<Area2D>("%Area2D")!! }
+    private val collisionShape2D: CollisionPolygon2D by lazy { getNodeAs("%CollisionShape2D")!! }
     lateinit var marker: HexDropTarget
     var location: Location? = null
 
@@ -66,6 +68,10 @@ class Hex : Node2D(), LogInterface {
             colour = lockedColor
         }
         pointSet = calculateVerticesForHex(radius = newRadius.toFloat())
+        val packedArray = PackedVector2Array(
+            pointSet.values.flatMap { listOf(it.first, it.second) }.distinct().toVariantArray()
+        )
+        collisionShape2D.polygon = packedArray
         // for math reasons, the vertices are 1-indexed, but the sectors are 0-indexed
         pointSet.forEach { (index, triangle) ->
             val segment = sectorScene.instantiate() as SectorSegment
@@ -76,8 +82,7 @@ class Hex : Node2D(), LogInterface {
             segment.status = location?.sectors?.get(index - 1)?.status ?: SectorStatus.EMPTY
             addChild(segment)
             segment.updateUI(
-                index - 1, PackedVector2Array(triangle.toList().toVariantArray()),
-                location?.getBuilding(index - 1)
+                index - 1, PackedVector2Array(triangle.toList().toVariantArray()), location?.getBuilding(index - 1)
             )
         }
     }
@@ -112,12 +117,14 @@ class Hex : Node2D(), LogInterface {
     @RegisterFunction
     fun highlight() {
         colour = highlightColor
+        zIndex += 1
         queueRedraw()
     }
 
     @RegisterFunction
     fun unhighlight() {
         colour = if (hexUnlocked) unlockedColor else lockedColor
+        zIndex -= 1
         queueRedraw()
     }
 
@@ -137,6 +144,16 @@ class Hex : Node2D(), LogInterface {
         return pointSet.toMap()
     }
 
+    @RegisterFunction
+    fun onMouseEntered() {
+        highlight()
+    }
+
+    @RegisterFunction
+    fun onMouseExited() {
+        unhighlight()
+    }
+
     // possible functions:
     // - buildFacility(size: Int, site: Int)
     // - removeFacility(size: Int, site: Int)
diff --git a/src/main/kuiper/hexgrid/Hex.tscn b/src/main/kuiper/hexgrid/Hex.tscn
index 0c453f2..491da27 100644
--- a/src/main/kuiper/hexgrid/Hex.tscn
+++ b/src/main/kuiper/hexgrid/Hex.tscn
@@ -6,6 +6,12 @@
 [node name="Hex" type="Node2D"]
 script = ExtResource("1_8qct6")
 
+[node name="Area2D" type="Area2D" parent="."]
+unique_name_in_owner = true
+
+[node name="CollisionShape2D" type="CollisionPolygon2D" parent="Area2D"]
+unique_name_in_owner = true
+
 [node name="HexDropTarget" type="Marker2D" parent="."]
 unique_name_in_owner = true
 script = ExtResource("2_wqt7c")
@@ -25,3 +31,6 @@ grow_horizontal = 2
 grow_vertical = 0
 size_flags_horizontal = 6
 text = "<location>"
+
+[connection signal="mouse_entered" from="Area2D" to="." method="on_mouse_entered"]
+[connection signal="mouse_exited" from="Area2D" to="." method="on_mouse_exited"]
diff --git a/src/main/kuiper/hexgrid/HexDropTarget.tscn b/src/main/kuiper/hexgrid/HexDropTarget.tscn
index d4a774e..55a65e2 100644
--- a/src/main/kuiper/hexgrid/HexDropTarget.tscn
+++ b/src/main/kuiper/hexgrid/HexDropTarget.tscn
@@ -5,6 +5,7 @@
 [node name="HexDropControl" type="Control"]
 layout_mode = 3
 anchors_preset = 0
+mouse_filter = 1
 script = ExtResource("1_f1lbp")
 
 [node name="HexDropTarget" type="Marker2D" parent="."]
diff --git a/src/main/kuiper/hexgrid/SectorSegment.kt b/src/main/kuiper/hexgrid/SectorSegment.kt
index 0482f8f..7af21d2 100644
--- a/src/main/kuiper/hexgrid/SectorSegment.kt
+++ b/src/main/kuiper/hexgrid/SectorSegment.kt
@@ -19,123 +19,123 @@ import state.SectorStatus
 @RegisterClass
 class SectorSegment : Polygon2D(), LogInterface {
 
-	override var logEnabled = true
+    override var logEnabled = true
 
-	// UI elements
-	private lateinit var collisionPolygon: CollisionPolygon2D
-	private lateinit var sprite2D: Sprite2D
-	private lateinit var area2D: Area2D
+    // UI elements
+    private lateinit var collisionPolygon: CollisionPolygon2D
+    private lateinit var sprite2D: Sprite2D
+    private lateinit var area2D: Area2D
 
-	// Data
-	private var sectorId: Int = -1
-	var isConfirmationDialog: Boolean = false
-	var location: Location? = null
-	var status: SectorStatus = SectorStatus.EMPTY
-	private var selected: Boolean = false
-	private val emptyColor = Color(0.2, 0.2, 0.2, 0.2)
-	private var currentColor: Color = emptyColor
-	private var baseColor: Color = emptyColor
+    // Data
+    private var sectorId: Int = -1
+    var isConfirmationDialog: Boolean = false
+    var location: Location? = null
+    var status: SectorStatus = SectorStatus.EMPTY
+    private var selected: Boolean = false
+    private val emptyColor = Color(0.2, 0.2, 0.2, 0.2)
+    private var currentColor: Color = emptyColor
+    private var baseColor: Color = emptyColor
 
-	@RegisterFunction
-	override fun _ready() {
-		area2D = getNodeAs("Area2D")!!
-		sprite2D = getNodeAs("%Sprite2D")!!
-	}
+    @RegisterFunction
+    override fun _ready() {
+        area2D = getNodeAs("Area2D")!!
+        sprite2D = getNodeAs("%Sprite2D")!!
+    }
 
-	@RegisterFunction
-	fun updateUI(id: Int, polygonPoints: PackedVector2Array, building: Building?) {
-		sprite2D = getNodeAs("%Sprite2D")!!
-		val spritePath = building?.spritePath
-		val sprite = if (spritePath != null) {
-			ResourceLoader.load(spritePath, "Texture") as Texture2D
-		} else {
-			null
-		}
-		collisionPolygon = getNodeAs("%CollisionPolygon2D")!!
-		sectorId = id
-		collisionPolygon.polygon = polygonPoints
-		polygon = polygonPoints
-		when (status) {
-			SectorStatus.BUILT -> {
-				if (sprite != null) {
-					sprite2D.texture = sprite
-					sprite2D.centered = false
-					sprite2D.setScale(Vector2(0.3, 0.3))
-					sprite2D.setOffset(calculateSpriteOffset())
-				}
-				currentColor = Color(1.0, 1.0, 1.0, 1.0)
-			}
+    @RegisterFunction
+    fun updateUI(id: Int, polygonPoints: PackedVector2Array, building: Building?) {
+        sprite2D = getNodeAs("%Sprite2D")!!
+        val spritePath = building?.spritePath
+        val sprite = if (spritePath != null) {
+            ResourceLoader.load(spritePath, "Texture") as Texture2D
+        } else {
+            null
+        }
+        collisionPolygon = getNodeAs("%CollisionPolygon2D")!!
+        sectorId = id
+        collisionPolygon.polygon = polygonPoints
+        polygon = polygonPoints
+        when (status) {
+            SectorStatus.BUILT -> {
+                if (sprite != null) {
+                    sprite2D.texture = sprite
+                    sprite2D.centered = false
+                    sprite2D.setScale(Vector2(0.3, 0.3))
+                    sprite2D.setOffset(calculateSpriteOffset())
+                }
+                currentColor = Color(1.0, 1.0, 1.0, 1.0)
+            }
 
-			SectorStatus.EMPTY -> {
-				currentColor = emptyColor
-			}
+            SectorStatus.EMPTY -> {
+                currentColor = emptyColor
+            }
 
-			SectorStatus.DESTROYED -> {
-				currentColor = Color(1.0, 0.2, 0.2, 1.0)
-			}
+            SectorStatus.DESTROYED -> {
+                currentColor = Color(1.0, 0.2, 0.2, 1.0)
+            }
 
-			SectorStatus.CONSTRUCTING -> {
-				currentColor = Color(8.0, 0.6, 0.2, 1.0)
-			}
-		}
-		color = currentColor
-	}
+            SectorStatus.CONSTRUCTING -> {
+                currentColor = Color(8.0, 0.6, 0.2, 1.0)
+            }
+        }
+        color = currentColor
+    }
 
-	@RegisterFunction
-	fun _on_area_2d_input_event(viewport: Node, event: InputEvent?, shapeIdx: Int) {
-		// check for clicks
-		event?.let { e ->
-			if (e.isActionPressed("mouse_left_click".asCachedStringName())) {
-				if (isConfirmationDialog) {
-					baseColor = currentColor
-					selected = !selected
-					color = if (selected) {
-						Color.red
-					} else {
-						baseColor
-					}
-				}
-			}
-			if (e.isActionPressed("mouse_right_click".asCachedStringName())) {
-				if (isConfirmationDialog) {
-					selected = false
-					color = baseColor
-				}
-			}
-		}
-	}
+    @RegisterFunction
+    fun _on_area_2d_input_event(viewport: Node, event: InputEvent?, shapeIdx: Int) {
+        // check for clicks
+        event?.let { e ->
+            if (e.isActionPressed("mouse_left_click".asCachedStringName())) {
+                if (isConfirmationDialog) {
+                    baseColor = currentColor
+                    selected = !selected
+                    color = if (selected) {
+                        Color.red
+                    } else {
+                        baseColor
+                    }
+                }
+            }
+            if (e.isActionPressed("mouse_right_click".asCachedStringName())) {
+                if (isConfirmationDialog) {
+                    selected = false
+                    color = baseColor
+                }
+            }
+        }
+    }
 
-	@RegisterFunction
-	fun mouseEntered() {
-		if (location == null) {
-			return
-		} else if (location!!.unlocked && isConfirmationDialog) {
-//			log("Mouse entered location '${location!!.name}' sector $sectorId")
-			// show tooltip
-		}
+    @RegisterFunction
+    fun mouseEntered() {
+        if (location == null) {
+            return
+        } else if (location!!.unlocked && isConfirmationDialog) {
+            log("Mouse entered location '${location!!.name}' sector $sectorId")
+            // show tooltip
+        }
 
-	}
+    }
 
-	@RegisterFunction
-	fun mouseExited() {
-	}
+    @RegisterFunction
+    fun mouseExited() {
+    }
 
-	/**
-	 * Calculate the offset for the sprite based on the sector id
-	 * These are hard-coded values for now, but could be calculated based on the triangle centre points in the future
-	 *       _
-	 *    /3\4/5\
-	 *    \2/1\0/
-	 */
-	private fun calculateSpriteOffset(): Vector2 {
-		when (sectorId) {
-			0 -> return Vector2(60.0, 10.0)
-			1 -> return Vector2(-70.0, 70.0)
-			2 -> return Vector2(-190.0, 10.0)
-			3 -> return Vector2(-190.0, -140.0)
-			4 -> return Vector2(-65.0, -210.0)
-			5 -> return Vector2(60, -140.0)
-		}
-		return Vector2(0.0, 0.0)
-	}
+    /**
+     * Calculate the offset for the sprite based on the sector id
+     * These are hard-coded values for now, but could be calculated based on the triangle centre points in the future
+     *       _
+     *    /3\4/5\
+     *    \2/1\0/
+     */
+    private fun calculateSpriteOffset(): Vector2 {
+        when (sectorId) {
+            0 -> return Vector2(60.0, 10.0)
+            1 -> return Vector2(-70.0, 70.0)
+            2 -> return Vector2(-190.0, 10.0)
+            3 -> return Vector2(-190.0, -140.0)
+            4 -> return Vector2(-65.0, -210.0)
+            5 -> return Vector2(60, -140.0)
+        }
+        return Vector2(0.0, 0.0)
+    }
 }
diff --git a/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt b/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt
index 0595154..99c1a2b 100644
--- a/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt
+++ b/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt
@@ -20,7 +20,7 @@ class HexMapGridEditor : GridContainer() {
     @RegisterProperty
     @Export
     var dimension: Int = 6
-    
+
     // Packed scenes
     private val hexScene = ResourceLoader.load("res://src/main/kuiper/hexgrid/Hex.tscn") as PackedScene
 
@@ -45,32 +45,6 @@ class HexMapGridEditor : GridContainer() {
                 addChild(hex)
             }
         }
-
-        /*//2 * (75.0 * sin(Math.PI / 2))
-                var xSpacing = 225.0
-                for (i in 0..5) {
-                    for (j in 0..5) {
-                        val rowStagger = if (j % 2 == 0) {
-                            112.5
-                        } else {
-                            0.0
-                        }
-                        val colStagger = if (j % 2 == 0) {
-                            0.0
-                        } else {
-                            -75.0
-                        }
-                        val hex = hexScene.instantiate() as Hex
-                        val diameter = hex.newRadius * 2 * cos(Math.PI / 6)
-                        hex.location = Location("location $i $j")
-                        hex.setName("Hex_${i}_$j")
-                        hex.colour = Color.mediumPurple
-                        hex.setPosition(Vector2((i * xSpacing) + rowStagger, (j * diameter) + colStagger))
-                        hex.getNodeAs<Label>("%LocationLabel")!!.visible = false
-                        addChild(hex)
-                    }
-                }*/
-
     }
 
     @RegisterFunction
diff --git a/src/main/kuiper/hexgrid/map/editor/hex_map_editor.tscn b/src/main/kuiper/hexgrid/map/editor/hex_map_editor.tscn
index 50c2f59..4c84b3c 100644
--- a/src/main/kuiper/hexgrid/map/editor/hex_map_editor.tscn
+++ b/src/main/kuiper/hexgrid/map/editor/hex_map_editor.tscn
@@ -65,6 +65,7 @@ text = "Starting bonuses, stats, sciences, description goes here"
 layout_mode = 2
 size_flags_horizontal = 3
 size_flags_stretch_ratio = 2.0
+mouse_filter = 2
 theme_override_styles/panel = SubResource("StyleBoxFlat_rdfxg")
 
 [node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer2"]
@@ -75,17 +76,12 @@ layout_mode = 2
 
 [node name="Label" type="Label" parent="VBoxContainer/HBoxContainer2/PanelContainer2/VBoxContainer/HBoxContainer"]
 layout_mode = 2
-text = "Hex editor goes here"
+text = "Click on a highlighted hex to enable it for the map"
 
 [node name="MarginContainer" type="MarginContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer2/VBoxContainer/HBoxContainer"]
 layout_mode = 2
 size_flags_horizontal = 3
 
-[node name="AddHexButton" type="Button" parent="VBoxContainer/HBoxContainer2/PanelContainer2/VBoxContainer/HBoxContainer"]
-unique_name_in_owner = true
-layout_mode = 2
-text = "+ Add Hex"
-
 [node name="MarginContainer" type="MarginContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer2/VBoxContainer"]
 layout_mode = 2
 theme_override_constants/margin_bottom = 120
@@ -93,6 +89,7 @@ theme_override_constants/margin_bottom = 120
 [node name="HBoxContainer2" type="HBoxContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer2/VBoxContainer"]
 layout_mode = 2
 size_flags_vertical = 3
+mouse_filter = 2
 
 [node name="MarginContainer" type="MarginContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer2/VBoxContainer/HBoxContainer2"]
 layout_mode = 2

From 28db45bcbc33dadffd96d91a2909eeb6bfcca7a6 Mon Sep 17 00:00:00 2001
From: Liam <liamjdavison@gmail.com>
Date: Sun, 23 Mar 2025 17:24:09 +0000
Subject: [PATCH 04/14] Progress on creating the map editor. Location label is
 in a bad place for the editor.

---
 gdj/SignalBus.gdj                             |  4 +-
 gdj/hexgrid/Hex.gdj                           |  6 +-
 gdj/hexgrid/map/editor/HexMapGridEditor.gdj   |  4 +-
 src/main/kuiper/SignalBus.kt                  |  6 ++
 src/main/kuiper/hexgrid/Hex.kt                | 59 ++++++++++---
 src/main/kuiper/hexgrid/Hex.tscn              |  1 +
 .../hexgrid/map/editor/HexMapGridEditor.kt    | 61 +++++++++++--
 .../hexgrid/map/editor/hex_map_editor.tscn    | 85 ++++++++++++++++++-
 8 files changed, 198 insertions(+), 28 deletions(-)

diff --git a/gdj/SignalBus.gdj b/gdj/SignalBus.gdj
index ab4ead8..491fa96 100644
--- a/gdj/SignalBus.gdj
+++ b/gdj/SignalBus.gdj
@@ -31,7 +31,9 @@ signals = [
 	update_ongoing_action,
 	action_completed,
 	editor_tech_saved,
-	editor_delete_tech
+	editor_delete_tech,
+	editor_place_hex,
+	editor_clear_hex
 ]
 properties = [
     
diff --git a/gdj/hexgrid/Hex.gdj b/gdj/hexgrid/Hex.gdj
index 1ce00f0..3aff36b 100644
--- a/gdj/hexgrid/Hex.gdj
+++ b/gdj/hexgrid/Hex.gdj
@@ -22,7 +22,8 @@ signals = [
 properties = [
     id,
 	hex_unlocked,
-	new_radius
+	new_radius,
+	hex_mode
 ]
 functions = [
     _ready,
@@ -31,5 +32,6 @@ functions = [
 	highlight,
 	unhighlight,
 	on_mouse_entered,
-	on_mouse_exited
+	on_mouse_exited,
+	on_input_event
 ]
\ No newline at end of file
diff --git a/gdj/hexgrid/map/editor/HexMapGridEditor.gdj b/gdj/hexgrid/map/editor/HexMapGridEditor.gdj
index 8012720..10b36a4 100644
--- a/gdj/hexgrid/map/editor/HexMapGridEditor.gdj
+++ b/gdj/hexgrid/map/editor/HexMapGridEditor.gdj
@@ -7,6 +7,7 @@ relativeSourcePath = src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt
 baseType = GridContainer
 supertypes = [
     godot.api.GridContainer,
+	LogInterface,
 	godot.api.Container,
 	godot.api.Control,
 	godot.api.CanvasItem,
@@ -25,5 +26,6 @@ properties = [
 ]
 functions = [
     _ready,
-	_process
+	on_confirm_location,
+	on_cancel_location
 ]
\ No newline at end of file
diff --git a/src/main/kuiper/SignalBus.kt b/src/main/kuiper/SignalBus.kt
index 3552f30..bfca66c 100644
--- a/src/main/kuiper/SignalBus.kt
+++ b/src/main/kuiper/SignalBus.kt
@@ -86,6 +86,12 @@ class SignalBus : Node() {
     @RegisterSignal("delete_tech")
     val editor_deleteTech by signal1<TechWrapper>()
 
+    @RegisterSignal("place_row", "place_col")
+    val editor_placeHex by signal2<Int, Int>()
+
+    @RegisterSignal("clear_row", "clear_col")
+    val editor_clearHex by signal2<Int, Int>()
+
     @RegisterFunction
     override fun _ready() {
         // Connect to the screen resized signal and propagate it
diff --git a/src/main/kuiper/hexgrid/Hex.kt b/src/main/kuiper/hexgrid/Hex.kt
index 7359257..4d46e66 100644
--- a/src/main/kuiper/hexgrid/Hex.kt
+++ b/src/main/kuiper/hexgrid/Hex.kt
@@ -1,15 +1,13 @@
 package hexgrid
 
 import LogInterface
+import SignalBus
 import godot.annotation.Export
 import godot.annotation.RegisterClass
 import godot.annotation.RegisterFunction
 import godot.annotation.RegisterProperty
 import godot.api.*
-import godot.core.Color
-import godot.core.PackedVector2Array
-import godot.core.Vector2
-import godot.core.toVariantArray
+import godot.core.*
 import godot.extension.getNodeAs
 import state.Location
 import state.SectorStatus
@@ -39,6 +37,12 @@ class Hex : Node2D(), LogInterface {
     @RegisterProperty
     var newRadius: Double = 75.0
 
+    @RegisterProperty
+    var hexMode: HexMode = HexMode.NORMAL
+
+    // Globals
+    private lateinit var signalBus: SignalBus
+
     // UI elements
     private val locationLabel: Label by lazy { getNodeAs("%LocationLabel")!! }
     private val area2D: Area2D by lazy { getNodeAs<Area2D>("%Area2D")!! }
@@ -50,8 +54,6 @@ class Hex : Node2D(), LogInterface {
     private val sectorScene = ResourceLoader.load("res://src/main/kuiper/hexgrid/sector_segment.tscn") as PackedScene
 
     // Data
-    var q: Int = 0
-    var r: Int = 0
     var row: Int = 0
     var col: Int = 0
 
@@ -64,6 +66,8 @@ class Hex : Node2D(), LogInterface {
 
     @RegisterFunction
     override fun _ready() {
+        signalBus = getNodeAs("/root/SignalBus")!!
+
         if (!hexUnlocked) {
             colour = lockedColor
         }
@@ -72,7 +76,6 @@ class Hex : Node2D(), LogInterface {
             pointSet.values.flatMap { listOf(it.first, it.second) }.distinct().toVariantArray()
         )
         collisionShape2D.polygon = packedArray
-        // for math reasons, the vertices are 1-indexed, but the sectors are 0-indexed
         pointSet.forEach { (index, triangle) ->
             val segment = sectorScene.instantiate() as SectorSegment
             segment.setName("Sector${index - 1}")
@@ -117,14 +120,18 @@ class Hex : Node2D(), LogInterface {
     @RegisterFunction
     fun highlight() {
         colour = highlightColor
-        zIndex += 1
+        if (hexMode == HexMode.EDITOR) {
+            zIndex += 1
+        }
         queueRedraw()
     }
 
     @RegisterFunction
     fun unhighlight() {
         colour = if (hexUnlocked) unlockedColor else lockedColor
-        zIndex -= 1
+        if (hexMode == HexMode.EDITOR) {
+            zIndex -= 1
+        }
         queueRedraw()
     }
 
@@ -146,15 +153,39 @@ class Hex : Node2D(), LogInterface {
 
     @RegisterFunction
     fun onMouseEntered() {
-        highlight()
+        if (hexMode == HexMode.EDITOR) {
+            highlight()
+        }
     }
 
     @RegisterFunction
     fun onMouseExited() {
-        unhighlight()
+        if (hexMode == HexMode.EDITOR) {
+            unhighlight()
+        }
     }
 
-    // possible functions:
-    // - buildFacility(size: Int, site: Int)
-    // - removeFacility(size: Int, site: Int)
+    @RegisterFunction
+    fun onInputEvent(viewport: Node, event: InputEvent?, shapeIdx: Int) {
+        // check for clicks
+        if (hexMode == HexMode.EDITOR) {
+            event?.let { e ->
+                if (e.isActionPressed("mouse_left_click".asCachedStringName())) {
+                    signalBus.editor_placeHex.emit(row, col)
+                }
+                if (e.isActionPressed("mouse_right_click".asCachedStringName())) {
+                    signalBus.editor_clearHex.emit(row, col)
+                }
+            }
+        }
+    }
+}
+
+/**
+ * The Hex class is used quite differently in the game map and the editor.
+ * So this enum is used to differentiate between the two modes.
+ */
+enum class HexMode {
+    NORMAL,
+    EDITOR
 }
diff --git a/src/main/kuiper/hexgrid/Hex.tscn b/src/main/kuiper/hexgrid/Hex.tscn
index 491da27..5d04958 100644
--- a/src/main/kuiper/hexgrid/Hex.tscn
+++ b/src/main/kuiper/hexgrid/Hex.tscn
@@ -32,5 +32,6 @@ grow_vertical = 0
 size_flags_horizontal = 6
 text = "<location>"
 
+[connection signal="input_event" from="Area2D" to="." method="on_input_event"]
 [connection signal="mouse_entered" from="Area2D" to="." method="on_mouse_entered"]
 [connection signal="mouse_exited" from="Area2D" to="." method="on_mouse_exited"]
diff --git a/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt b/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt
index 99c1a2b..c6c2046 100644
--- a/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt
+++ b/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt
@@ -1,42 +1,60 @@
 package hexgrid.map.editor
 
+import LogInterface
+import SignalBus
 import godot.annotation.Export
 import godot.annotation.RegisterClass
 import godot.annotation.RegisterFunction
 import godot.annotation.RegisterProperty
-import godot.api.GridContainer
-import godot.api.Label
-import godot.api.PackedScene
-import godot.api.ResourceLoader
+import godot.api.*
 import godot.core.Vector2
+import godot.core.asStringName
+import godot.core.connect
 import godot.extension.getNodeAs
 import hexgrid.Hex
+import hexgrid.HexMode
 import state.Location
 import kotlin.math.sqrt
 
 @RegisterClass
-class HexMapGridEditor : GridContainer() {
+class HexMapGridEditor : GridContainer(), LogInterface {
+
+    override var logEnabled: Boolean = true
 
     @RegisterProperty
     @Export
     var dimension: Int = 6
 
+    // Globals
+    private lateinit var signalBus: SignalBus
+
     // Packed scenes
     private val hexScene = ResourceLoader.load("res://src/main/kuiper/hexgrid/Hex.tscn") as PackedScene
 
     // UI elements
+    private val sponsorNameEdit: LineEdit by lazy { getNodeAs("%SponsorNameEdit")!! }
+    private val sponsorDescEdit: TextEdit by lazy { getNodeAs("%SponsorDescEdit")!! }
+    private val placeHexPopup: PopupPanel by lazy { getNodeAs("%PlaceHexPopupPanel")!! }
+    private val phNameEdit: LineEdit by lazy { getNodeAs("%PlaceHexNameEdit")!! }
+    private val phCoordLbl: Label by lazy { getNodeAs("%PHCoordLbl")!! }
 
     // Data
     private var grid = Array(dimension) { Array(dimension) { Vector2.ZERO } }
+    var selectedRow = -1
+    var selectedCol = -1
 
     @RegisterFunction
     override fun _ready() {
+        signalBus = getNodeAs("/root/SignalBus")!!
 
         // set up the grid
         grid = calculateGridCoordinates(dimension, dimension)
         grid.forEachIndexed { i, row ->
             row.forEachIndexed { j, vector2 ->
                 val hex = hexScene.instantiate() as Hex
+                hex.hexMode = HexMode.EDITOR
+                hex.row = i
+                hex.col = j
                 hex.location = Location("location $i $j")
                 hex.setName("Hex_${i}_$j")
                 hex.colour = godot.core.Color.mediumPurple
@@ -45,11 +63,25 @@ class HexMapGridEditor : GridContainer() {
                 addChild(hex)
             }
         }
+
+        signalBus.editor_placeHex.connect { row, col ->
+            selectedRow = row
+            selectedCol = col
+            phCoordLbl.text = "@$row,$col"
+            placeHexPopup.visible = true
+        }
     }
 
     @RegisterFunction
-    override fun _process(delta: Double) {
+    fun onConfirmLocation() {
+        saveHexLocation(selectedRow, selectedCol, phNameEdit.text)
+    }
 
+    @RegisterFunction
+    fun onCancelLocation() {
+        selectedRow = -1
+        selectedCol = -1
+        placeHexPopup.visible = false
     }
 
     private fun calculateGridCoordinates(xCount: Int, yCount: Int): Array<Array<Vector2>> {
@@ -72,6 +104,23 @@ class HexMapGridEditor : GridContainer() {
         return hexCoords
     }
 
+    private fun saveHexLocation(row: Int, col: Int, name: String) {
+        val hex = grid[row][col]
+        val hexNode = getNodeAs("Hex_${row}_$col".asStringName()) as Hex?
+        if (hexNode == null) {
+            logError("Hex not found at $row $col")
+            return
+        }
+        hexNode.location = Location(name)
+        val locLabel = hexNode.getNodeAs<Label>("%LocationLabel")!!
+        locLabel.text = name
+        locLabel.visible = true
+        placeHexPopup.visible = false
+        selectedCol = -1
+        selectedRow = -1
+        phNameEdit.text = ""
+    }
+
     /*  fun axial_to_oddq(hex: Hex) {
           val col = hex.q
           val row = hex.r + (hex.q - (hex.q&1)) / 2
diff --git a/src/main/kuiper/hexgrid/map/editor/hex_map_editor.tscn b/src/main/kuiper/hexgrid/map/editor/hex_map_editor.tscn
index 4c84b3c..282ef64 100644
--- a/src/main/kuiper/hexgrid/map/editor/hex_map_editor.tscn
+++ b/src/main/kuiper/hexgrid/map/editor/hex_map_editor.tscn
@@ -55,11 +55,45 @@ size_flags_vertical = 3
 layout_mode = 2
 size_flags_horizontal = 3
 
-[node name="Label" type="Label" parent="VBoxContainer/HBoxContainer2/PanelContainer"]
+[node name="MarginContainer" type="MarginContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer"]
 layout_mode = 2
-size_flags_horizontal = 0
-size_flags_vertical = 0
-text = "Starting bonuses, stats, sciences, description goes here"
+theme_override_constants/margin_left = 20
+theme_override_constants/margin_top = 20
+theme_override_constants/margin_right = 20
+theme_override_constants/margin_bottom = 20
+
+[node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer"]
+layout_mode = 2
+
+[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer"]
+layout_mode = 2
+theme_override_constants/separation = 20
+
+[node name="SponsorNameLbl" type="Label" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer"]
+layout_mode = 2
+text = "Sponsor name"
+
+[node name="SponsorNameEdit" type="LineEdit" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 3
+placeholder_text = "name"
+
+[node name="HBoxContainer2" type="HBoxContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer"]
+layout_mode = 2
+theme_override_constants/separation = 20
+
+[node name="SponsorDescLbl" type="Label" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer2"]
+layout_mode = 2
+text = "Description"
+
+[node name="SponsorDescEdit" type="TextEdit" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer2"]
+unique_name_in_owner = true
+custom_minimum_size = Vector2(0, 200)
+layout_mode = 2
+size_flags_horizontal = 3
+placeholder_text = "description"
+wrap_mode = 1
 
 [node name="PanelContainer2" type="PanelContainer" parent="VBoxContainer/HBoxContainer2"]
 layout_mode = 2
@@ -101,3 +135,46 @@ layout_mode = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3
 script = ExtResource("2_rdfxg")
+
+[node name="PlaceHexPopupPanel" type="PopupPanel" parent="VBoxContainer/HBoxContainer2/PanelContainer2"]
+unique_name_in_owner = true
+initial_position = 2
+size = Vector2i(210, 200)
+
+[node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer2/PlaceHexPopupPanel"]
+offset_left = 4.0
+offset_top = 4.0
+offset_right = 206.0
+offset_bottom = 196.0
+alignment = 1
+
+[node name="Label" type="Label" parent="VBoxContainer/HBoxContainer2/PanelContainer2/PlaceHexPopupPanel/VBoxContainer"]
+layout_mode = 2
+text = "Confirm Hex placement"
+
+[node name="PHCoordLbl" type="Label" parent="VBoxContainer/HBoxContainer2/PanelContainer2/PlaceHexPopupPanel/VBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+text = "@"
+
+[node name="PlaceHexNameEdit" type="LineEdit" parent="VBoxContainer/HBoxContainer2/PanelContainer2/PlaceHexPopupPanel/VBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+placeholder_text = "location name"
+
+[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer2/PlaceHexPopupPanel/VBoxContainer"]
+layout_mode = 2
+alignment = 2
+
+[node name="PHCancel" type="Button" parent="VBoxContainer/HBoxContainer2/PanelContainer2/PlaceHexPopupPanel/VBoxContainer/HBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+text = "Cancel"
+
+[node name="PHConfirm" type="Button" parent="VBoxContainer/HBoxContainer2/PanelContainer2/PlaceHexPopupPanel/VBoxContainer/HBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+text = "Confirm"
+
+[connection signal="pressed" from="VBoxContainer/HBoxContainer2/PanelContainer2/PlaceHexPopupPanel/VBoxContainer/HBoxContainer/PHCancel" to="VBoxContainer/HBoxContainer2/PanelContainer2/VBoxContainer/HBoxContainer2/HexGridContainer" method="on_cancel_location"]
+[connection signal="pressed" from="VBoxContainer/HBoxContainer2/PanelContainer2/PlaceHexPopupPanel/VBoxContainer/HBoxContainer/PHConfirm" to="VBoxContainer/HBoxContainer2/PanelContainer2/VBoxContainer/HBoxContainer2/HexGridContainer" method="on_confirm_location"]

From 439eb221cf04a2f960e5ea9b6a7a0f920e390fa2 Mon Sep 17 00:00:00 2001
From: Liam <liamjdavison@gmail.com>
Date: Mon, 24 Mar 2025 09:25:14 +0000
Subject: [PATCH 05/14] Add checkbox for hex unlock status in map editor.
 Improved label positioning for editor.

---
 gdj/hexgrid/map/editor/HexMapGridEditor.gdj   |  3 +-
 src/main/kuiper/hexgrid/Hex.kt                |  1 +
 .../hexgrid/map/editor/HexMapGridEditor.kt    | 39 +++++++++++++++----
 .../hexgrid/map/editor/hex_map_editor.tscn    | 12 ++++++
 4 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/gdj/hexgrid/map/editor/HexMapGridEditor.gdj b/gdj/hexgrid/map/editor/HexMapGridEditor.gdj
index 10b36a4..62ff19e 100644
--- a/gdj/hexgrid/map/editor/HexMapGridEditor.gdj
+++ b/gdj/hexgrid/map/editor/HexMapGridEditor.gdj
@@ -27,5 +27,6 @@ properties = [
 functions = [
     _ready,
 	on_confirm_location,
-	on_cancel_location
+	on_cancel_location,
+	on_p_h_unlocked_at_start_toggled
 ]
\ No newline at end of file
diff --git a/src/main/kuiper/hexgrid/Hex.kt b/src/main/kuiper/hexgrid/Hex.kt
index 4d46e66..c92965a 100644
--- a/src/main/kuiper/hexgrid/Hex.kt
+++ b/src/main/kuiper/hexgrid/Hex.kt
@@ -189,3 +189,4 @@ enum class HexMode {
     NORMAL,
     EDITOR
 }
+
diff --git a/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt b/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt
index c6c2046..3d2e4a8 100644
--- a/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt
+++ b/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt
@@ -37,6 +37,7 @@ class HexMapGridEditor : GridContainer(), LogInterface {
     private val placeHexPopup: PopupPanel by lazy { getNodeAs("%PlaceHexPopupPanel")!! }
     private val phNameEdit: LineEdit by lazy { getNodeAs("%PlaceHexNameEdit")!! }
     private val phCoordLbl: Label by lazy { getNodeAs("%PHCoordLbl")!! }
+    private val phUnlockedAtStart: CheckBox by lazy { getNodeAs("%PHHexUnlocked")!! }
 
     // Data
     private var grid = Array(dimension) { Array(dimension) { Vector2.ZERO } }
@@ -55,11 +56,14 @@ class HexMapGridEditor : GridContainer(), LogInterface {
                 hex.hexMode = HexMode.EDITOR
                 hex.row = i
                 hex.col = j
-                hex.location = Location("location $i $j")
+                hex.location = Location("location $i,$j")
                 hex.setName("Hex_${i}_$j")
                 hex.colour = godot.core.Color.mediumPurple
+                val locLabel = hex.getNodeAs<Label>("%LocationLabel")!!
+                locLabel.visible = false
+//                locLabel.setText("${vector2.x},${vector2.y}")
+//                locLabel.setPosition(Vector2(-20.0,-20.0))
                 hex.setPosition(vector2)
-                hex.getNodeAs<Label>("%LocationLabel")!!.visible = false
                 addChild(hex)
             }
         }
@@ -68,6 +72,11 @@ class HexMapGridEditor : GridContainer(), LogInterface {
             selectedRow = row
             selectedCol = col
             phCoordLbl.text = "@$row,$col"
+            val hex = getNodeAtHex(row, col)
+            if (hex != null && hex.hexUnlocked) {
+                phNameEdit.text = hex.location?.name ?: ""
+                phUnlockedAtStart.buttonPressed = true
+            }
             placeHexPopup.visible = true
         }
     }
@@ -84,9 +93,14 @@ class HexMapGridEditor : GridContainer(), LogInterface {
         placeHexPopup.visible = false
     }
 
+    @RegisterFunction
+    fun onPHUnlockedAtStartToggled(toggledOn: Boolean) {
+        logInfo("Unlocked at start toggled to $toggledOn")
+    }
+
     private fun calculateGridCoordinates(xCount: Int, yCount: Int): Array<Array<Vector2>> {
         // flat topped, evenq orientation
-        val hexCoords = Array(xCount) { Array<Vector2>(yCount) { Vector2.ZERO } }
+        val hexCoords = Array(xCount) { Array(yCount) { Vector2.ZERO } }
         val radius = 75.0
         val diameter = radius * 2
         val width = diameter
@@ -106,19 +120,20 @@ class HexMapGridEditor : GridContainer(), LogInterface {
 
     private fun saveHexLocation(row: Int, col: Int, name: String) {
         val hex = grid[row][col]
-        val hexNode = getNodeAs("Hex_${row}_$col".asStringName()) as Hex?
-        if (hexNode == null) {
-            logError("Hex not found at $row $col")
-            return
-        }
+        val hexNode = getNodeAtHex(row, col) ?: return
         hexNode.location = Location(name)
         val locLabel = hexNode.getNodeAs<Label>("%LocationLabel")!!
         locLabel.text = name
         locLabel.visible = true
+        locLabel.setPosition(Vector2(-20.0, -20.0))
         placeHexPopup.visible = false
         selectedCol = -1
         selectedRow = -1
         phNameEdit.text = ""
+        phUnlockedAtStart.buttonPressed = false
+        hexNode.hexUnlocked =
+            true  // for now, we'll just unlock it, but should take into account hexUnlockedAtStart checkbox
+        hexNode.zIndex += 1
     }
 
     /*  fun axial_to_oddq(hex: Hex) {
@@ -132,4 +147,12 @@ class HexMapGridEditor : GridContainer(), LogInterface {
           val r = hex.row - (hex.col - (hex.col&1)) / 2
           return Hex(q, r)
       }*/
+
+    private fun getNodeAtHex(row: Int, col: Int): Hex? {
+        val node = getNodeAs("Hex_${row}_$col".asStringName()) as Hex?
+        if (node == null) {
+            logError("Hex not found at $row $col")
+        }
+        return node
+    }
 }
diff --git a/src/main/kuiper/hexgrid/map/editor/hex_map_editor.tscn b/src/main/kuiper/hexgrid/map/editor/hex_map_editor.tscn
index 282ef64..1d4754b 100644
--- a/src/main/kuiper/hexgrid/map/editor/hex_map_editor.tscn
+++ b/src/main/kuiper/hexgrid/map/editor/hex_map_editor.tscn
@@ -162,6 +162,17 @@ unique_name_in_owner = true
 layout_mode = 2
 placeholder_text = "location name"
 
+[node name="HBoxContainer2" type="HBoxContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer2/PlaceHexPopupPanel/VBoxContainer"]
+layout_mode = 2
+
+[node name="PHUnlockedAtStartLbl" type="Label" parent="VBoxContainer/HBoxContainer2/PanelContainer2/PlaceHexPopupPanel/VBoxContainer/HBoxContainer2"]
+layout_mode = 2
+text = "Unlocked at start?"
+
+[node name="PHHexUnlocked" type="CheckBox" parent="VBoxContainer/HBoxContainer2/PanelContainer2/PlaceHexPopupPanel/VBoxContainer/HBoxContainer2"]
+unique_name_in_owner = true
+layout_mode = 2
+
 [node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer2/PlaceHexPopupPanel/VBoxContainer"]
 layout_mode = 2
 alignment = 2
@@ -176,5 +187,6 @@ unique_name_in_owner = true
 layout_mode = 2
 text = "Confirm"
 
+[connection signal="toggled" from="VBoxContainer/HBoxContainer2/PanelContainer2/PlaceHexPopupPanel/VBoxContainer/HBoxContainer2/PHHexUnlocked" to="VBoxContainer/HBoxContainer2/PanelContainer2/VBoxContainer/HBoxContainer2/HexGridContainer" method="on_p_h_unlocked_at_start_toggled"]
 [connection signal="pressed" from="VBoxContainer/HBoxContainer2/PanelContainer2/PlaceHexPopupPanel/VBoxContainer/HBoxContainer/PHCancel" to="VBoxContainer/HBoxContainer2/PanelContainer2/VBoxContainer/HBoxContainer2/HexGridContainer" method="on_cancel_location"]
 [connection signal="pressed" from="VBoxContainer/HBoxContainer2/PanelContainer2/PlaceHexPopupPanel/VBoxContainer/HBoxContainer/PHConfirm" to="VBoxContainer/HBoxContainer2/PanelContainer2/VBoxContainer/HBoxContainer2/HexGridContainer" method="on_confirm_location"]

From 049c323f7902ec89cfd301c75418db4d963b7c4e Mon Sep 17 00:00:00 2001
From: Liam <liamjdavison@gmail.com>
Date: Mon, 24 Mar 2025 11:12:44 +0000
Subject: [PATCH 06/14] Gathering data to save.

---
 gdj/hexgrid/map/editor/HexMapGridEditor.gdj   |   3 +-
 .../hexgrid/map/editor/HexMapGridEditor.kt    |  41 +++-
 .../hexgrid/map/editor/hex_map_editor.tscn    | 195 +++++++++++++++++-
 3 files changed, 228 insertions(+), 11 deletions(-)

diff --git a/gdj/hexgrid/map/editor/HexMapGridEditor.gdj b/gdj/hexgrid/map/editor/HexMapGridEditor.gdj
index 62ff19e..b154b4a 100644
--- a/gdj/hexgrid/map/editor/HexMapGridEditor.gdj
+++ b/gdj/hexgrid/map/editor/HexMapGridEditor.gdj
@@ -28,5 +28,6 @@ functions = [
     _ready,
 	on_confirm_location,
 	on_cancel_location,
-	on_p_h_unlocked_at_start_toggled
+	on_p_h_unlocked_at_start_toggled,
+	on_save_sponsor_button_pressed
 ]
\ No newline at end of file
diff --git a/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt b/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt
index 3d2e4a8..b0c3a10 100644
--- a/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt
+++ b/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt
@@ -38,11 +38,12 @@ class HexMapGridEditor : GridContainer(), LogInterface {
     private val phNameEdit: LineEdit by lazy { getNodeAs("%PlaceHexNameEdit")!! }
     private val phCoordLbl: Label by lazy { getNodeAs("%PHCoordLbl")!! }
     private val phUnlockedAtStart: CheckBox by lazy { getNodeAs("%PHHexUnlocked")!! }
+    private val hexCoordsLbl: Label by lazy { getNodeAs("%HexCoordsLbl")!! }
 
     // Data
-    private var grid = Array(dimension) { Array(dimension) { Vector2.ZERO } }
-    var selectedRow = -1
-    var selectedCol = -1
+    private var grid = Array(dimension) { Array(dimension) { EditorData(Vector2.ZERO) } }
+    private var selectedRow = -1
+    private var selectedCol = -1
 
     @RegisterFunction
     override fun _ready() {
@@ -51,7 +52,7 @@ class HexMapGridEditor : GridContainer(), LogInterface {
         // set up the grid
         grid = calculateGridCoordinates(dimension, dimension)
         grid.forEachIndexed { i, row ->
-            row.forEachIndexed { j, vector2 ->
+            row.forEachIndexed { j, data ->
                 val hex = hexScene.instantiate() as Hex
                 hex.hexMode = HexMode.EDITOR
                 hex.row = i
@@ -63,12 +64,13 @@ class HexMapGridEditor : GridContainer(), LogInterface {
                 locLabel.visible = false
 //                locLabel.setText("${vector2.x},${vector2.y}")
 //                locLabel.setPosition(Vector2(-20.0,-20.0))
-                hex.setPosition(vector2)
+                hex.setPosition(data.vector)
                 addChild(hex)
             }
         }
 
         signalBus.editor_placeHex.connect { row, col ->
+            hexCoordsLbl.text = "($row,$col)"
             selectedRow = row
             selectedCol = col
             phCoordLbl.text = "@$row,$col"
@@ -98,9 +100,30 @@ class HexMapGridEditor : GridContainer(), LogInterface {
         logInfo("Unlocked at start toggled to $toggledOn")
     }
 
-    private fun calculateGridCoordinates(xCount: Int, yCount: Int): Array<Array<Vector2>> {
+    @RegisterFunction
+    fun onSaveSponsorButtonPressed() {
+        val sponsorName = sponsorNameEdit.text
+        val sponsorDesc = sponsorDescEdit.text
+        logInfo("Saving sponsor $sponsorName with description $sponsorDesc")
+
+        grid.forEachIndexed { i, row ->
+            row.forEachIndexed { j, data ->
+                val hex = getNodeAtHex(i, j)
+                if (hex == null) {
+                    logError("No hex found at $i $j")
+                    return
+                } else {
+                    if (hex.hexUnlocked) {
+                        logInfo("Hex ($i,$j) ${hex.location?.name} (Starts unlocked: ${data.unlockedAtStart})")
+                    }
+                }
+            }
+        }
+    }
+
+    private fun calculateGridCoordinates(xCount: Int, yCount: Int): Array<Array<EditorData>> {
         // flat topped, evenq orientation
-        val hexCoords = Array(xCount) { Array(yCount) { Vector2.ZERO } }
+        val hexCoords = Array(xCount) { Array(yCount) { EditorData(Vector2.ZERO) } }
         val radius = 75.0
         val diameter = radius * 2
         val width = diameter
@@ -112,7 +135,7 @@ class HexMapGridEditor : GridContainer(), LogInterface {
             for (j in 0 until yCount) {
                 val x = i * horizDistance
                 val y = j * height + (i % 2) * (height / 2)
-                hexCoords[i][j] = Vector2(x, y)
+                hexCoords[i][j] = EditorData(Vector2(x, y))
             }
         }
         return hexCoords
@@ -156,3 +179,5 @@ class HexMapGridEditor : GridContainer(), LogInterface {
         return node
     }
 }
+
+data class EditorData(val vector: Vector2, var unlockedAtStart: Boolean = false)
\ No newline at end of file
diff --git a/src/main/kuiper/hexgrid/map/editor/hex_map_editor.tscn b/src/main/kuiper/hexgrid/map/editor/hex_map_editor.tscn
index 1d4754b..aeb9f3d 100644
--- a/src/main/kuiper/hexgrid/map/editor/hex_map_editor.tscn
+++ b/src/main/kuiper/hexgrid/map/editor/hex_map_editor.tscn
@@ -1,6 +1,7 @@
-[gd_scene load_steps=4 format=3 uid="uid://b3lj8ojhudueu"]
+[gd_scene load_steps=5 format=3 uid="uid://b3lj8ojhudueu"]
 
 [ext_resource type="Script" uid="uid://cnjo42sklflyr" path="res://src/main/kuiper/hexgrid/map/editor/SponsorEditor.kt" id="1_dwvxf"]
+[ext_resource type="FontFile" uid="uid://dlm8mcyi0n4ri" path="res://assets/fonts/SpaceGrotesk-Bold.ttf" id="2_aat5g"]
 [ext_resource type="Script" uid="uid://bqj8mswck507g" path="res://src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt" id="2_rdfxg"]
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_rdfxg"]
@@ -64,6 +65,7 @@ theme_override_constants/margin_bottom = 20
 
 [node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer"]
 layout_mode = 2
+theme_override_constants/separation = 10
 
 [node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer"]
 layout_mode = 2
@@ -79,6 +81,19 @@ layout_mode = 2
 size_flags_horizontal = 3
 placeholder_text = "name"
 
+[node name="HBoxContainer3" type="HBoxContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer"]
+layout_mode = 2
+theme_override_constants/separation = 20
+
+[node name="SponsorColourLbl" type="Label" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer3"]
+layout_mode = 2
+text = "Colour"
+
+[node name="ColorPickerButton" type="ColorPickerButton" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer3"]
+custom_minimum_size = Vector2(50, 0)
+layout_mode = 2
+size_flags_horizontal = 3
+
 [node name="HBoxContainer2" type="HBoxContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer"]
 layout_mode = 2
 theme_override_constants/separation = 20
@@ -95,6 +110,172 @@ size_flags_horizontal = 3
 placeholder_text = "description"
 wrap_mode = 1
 
+[node name="StartingResLbl" type="Label" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer"]
+layout_mode = 2
+theme_override_fonts/font = ExtResource("2_aat5g")
+text = "Starting resources"
+
+[node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer"]
+layout_mode = 2
+theme_override_constants/separation = 10
+
+[node name="HBoxContainer4" type="HBoxContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/VBoxContainer"]
+layout_mode = 2
+theme_override_constants/separation = 20
+
+[node name="SponsorStartGoldLbl" type="Label" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/VBoxContainer/HBoxContainer4"]
+layout_mode = 2
+text = "Gold"
+
+[node name="SponsorStartGoldEdit" type="SpinBox" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/VBoxContainer/HBoxContainer4"]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 3
+max_value = 500.0
+value = 100.0
+rounded = true
+
+[node name="HBoxContainer5" type="HBoxContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/VBoxContainer"]
+layout_mode = 2
+theme_override_constants/separation = 20
+
+[node name="SponsorStartInfLbl" type="Label" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/VBoxContainer/HBoxContainer5"]
+layout_mode = 2
+text = "Influence"
+
+[node name="SponsorStartInfEdit" type="SpinBox" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/VBoxContainer/HBoxContainer5"]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 3
+max_value = 500.0
+value = 100.0
+rounded = true
+
+[node name="HBoxContainer6" type="HBoxContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/VBoxContainer"]
+layout_mode = 2
+theme_override_constants/separation = 20
+
+[node name="SponsorStartConMatsLbl" type="Label" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/VBoxContainer/HBoxContainer6"]
+layout_mode = 2
+text = "Con Mats"
+
+[node name="SponsorStartConMatsEdit" type="SpinBox" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/VBoxContainer/HBoxContainer6"]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 3
+max_value = 500.0
+value = 100.0
+rounded = true
+
+[node name="StartingSciLbl" type="Label" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer"]
+layout_mode = 2
+theme_override_fonts/font = ExtResource("2_aat5g")
+text = "Starting science rates"
+
+[node name="HBoxContainer4" type="VBoxContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer"]
+layout_mode = 2
+theme_override_constants/separation = 10
+
+[node name="VBoxContainer" type="HBoxContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4"]
+layout_mode = 2
+theme_override_constants/separation = 20
+
+[node name="SSPhysicsLbl" type="Label" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4/VBoxContainer"]
+layout_mode = 2
+text = "Physics"
+
+[node name="SponsorStartPhysics" type="SpinBox" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4/VBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 3
+value = 10.0
+rounded = true
+
+[node name="VBoxContainer2" type="HBoxContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4"]
+layout_mode = 2
+theme_override_constants/separation = 20
+
+[node name="SSAstronomyLbl" type="Label" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4/VBoxContainer2"]
+layout_mode = 2
+text = "Astronomy"
+
+[node name="SponsorStartAstronomy" type="SpinBox" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4/VBoxContainer2"]
+layout_mode = 2
+size_flags_horizontal = 3
+value = 10.0
+rounded = true
+
+[node name="VBoxContainer3" type="HBoxContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4"]
+layout_mode = 2
+theme_override_constants/separation = 20
+
+[node name="SSBiochemLbl" type="Label" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4/VBoxContainer3"]
+layout_mode = 2
+text = "Biochemistry"
+
+[node name="SponsorStartBiochem" type="SpinBox" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4/VBoxContainer3"]
+layout_mode = 2
+size_flags_horizontal = 3
+value = 10.0
+rounded = true
+
+[node name="VBoxContainer4" type="HBoxContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4"]
+layout_mode = 2
+theme_override_constants/separation = 20
+
+[node name="SSEngineeringLbl" type="Label" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4/VBoxContainer4"]
+layout_mode = 2
+text = "Engineering"
+
+[node name="SponsorStartEngineering" type="SpinBox" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4/VBoxContainer4"]
+layout_mode = 2
+size_flags_horizontal = 3
+value = 10.0
+rounded = true
+
+[node name="VBoxContainer5" type="HBoxContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4"]
+layout_mode = 2
+theme_override_constants/separation = 20
+
+[node name="SSMathsLbl" type="Label" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4/VBoxContainer5"]
+layout_mode = 2
+text = "Mathematics"
+
+[node name="SponsorStartMaths" type="SpinBox" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4/VBoxContainer5"]
+layout_mode = 2
+size_flags_horizontal = 3
+value = 10.0
+rounded = true
+
+[node name="VBoxContainer6" type="HBoxContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4"]
+layout_mode = 2
+theme_override_constants/separation = 20
+
+[node name="SSPsychLbl" type="Label" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4/VBoxContainer6"]
+layout_mode = 2
+text = "Psychology"
+
+[node name="SponsorStartPsych" type="SpinBox" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4/VBoxContainer6"]
+layout_mode = 2
+size_flags_horizontal = 3
+value = 10.0
+rounded = true
+
+[node name="VBoxContainer7" type="HBoxContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4"]
+layout_mode = 2
+theme_override_constants/separation = 20
+
+[node name="SSEurekaLbl" type="Label" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4/VBoxContainer7"]
+layout_mode = 2
+text = "Eureka"
+
+[node name="SponsorStartEureka" type="SpinBox" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4/VBoxContainer7"]
+layout_mode = 2
+size_flags_horizontal = 3
+max_value = 10.0
+value = 1.0
+rounded = true
+
 [node name="PanelContainer2" type="PanelContainer" parent="VBoxContainer/HBoxContainer2"]
 layout_mode = 2
 size_flags_horizontal = 3
@@ -109,8 +290,11 @@ layout_mode = 2
 layout_mode = 2
 
 [node name="Label" type="Label" parent="VBoxContainer/HBoxContainer2/PanelContainer2/VBoxContainer/HBoxContainer"]
+custom_minimum_size = Vector2(900, 0)
 layout_mode = 2
-text = "Click on a highlighted hex to enable it for the map"
+text = "Click on a highlighted hex to enable it for the map and assign it a name. Toggle whether the hex should be unlocked at game startup.
+Add starting buildings. There must be at least one HQ building sector."
+autowrap_mode = 2
 
 [node name="MarginContainer" type="MarginContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer2/VBoxContainer/HBoxContainer"]
 layout_mode = 2
@@ -120,6 +304,12 @@ size_flags_horizontal = 3
 layout_mode = 2
 theme_override_constants/margin_bottom = 120
 
+[node name="HexCoordsLbl" type="Label" parent="VBoxContainer/HBoxContainer2/PanelContainer2/VBoxContainer/MarginContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+text = "(i,j)"
+horizontal_alignment = 1
+
 [node name="HBoxContainer2" type="HBoxContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer2/VBoxContainer"]
 layout_mode = 2
 size_flags_vertical = 3
@@ -187,6 +377,7 @@ unique_name_in_owner = true
 layout_mode = 2
 text = "Confirm"
 
+[connection signal="pressed" from="VBoxContainer/HBoxContainer/SaveSponsorBtn" to="VBoxContainer/HBoxContainer2/PanelContainer2/VBoxContainer/HBoxContainer2/HexGridContainer" method="on_save_sponsor_button_pressed"]
 [connection signal="toggled" from="VBoxContainer/HBoxContainer2/PanelContainer2/PlaceHexPopupPanel/VBoxContainer/HBoxContainer2/PHHexUnlocked" to="VBoxContainer/HBoxContainer2/PanelContainer2/VBoxContainer/HBoxContainer2/HexGridContainer" method="on_p_h_unlocked_at_start_toggled"]
 [connection signal="pressed" from="VBoxContainer/HBoxContainer2/PanelContainer2/PlaceHexPopupPanel/VBoxContainer/HBoxContainer/PHCancel" to="VBoxContainer/HBoxContainer2/PanelContainer2/VBoxContainer/HBoxContainer2/HexGridContainer" method="on_cancel_location"]
 [connection signal="pressed" from="VBoxContainer/HBoxContainer2/PanelContainer2/PlaceHexPopupPanel/VBoxContainer/HBoxContainer/PHConfirm" to="VBoxContainer/HBoxContainer2/PanelContainer2/VBoxContainer/HBoxContainer2/HexGridContainer" method="on_confirm_location"]

From ede691e8654b76226b1f70b8c7ee63719029434c Mon Sep 17 00:00:00 2001
From: Liam <liamjdavison@gmail.com>
Date: Tue, 25 Mar 2025 21:52:08 +0000
Subject: [PATCH 07/14] Working on saving sponsor data from editor. Will break
 current game creation/loading for now.

---
 .../hexgrid/map/editor/HexMapGridEditor.kt    | 108 ++++++++++++++++--
 .../hexgrid/map/editor/hex_map_editor.tscn    |  22 ++--
 .../kuiper/serializers/GDVectorSerializer.kt  |  32 ++++++
 src/main/kuiper/state/Sponsor.kt              |  29 ++++-
 4 files changed, 169 insertions(+), 22 deletions(-)
 create mode 100644 src/main/kuiper/serializers/GDVectorSerializer.kt

diff --git a/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt b/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt
index b0c3a10..760ee89 100644
--- a/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt
+++ b/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt
@@ -2,18 +2,25 @@ package hexgrid.map.editor
 
 import LogInterface
 import SignalBus
+import actions.ResourceType
 import godot.annotation.Export
 import godot.annotation.RegisterClass
 import godot.annotation.RegisterFunction
 import godot.annotation.RegisterProperty
 import godot.api.*
 import godot.core.Vector2
+import godot.core.Vector2i
 import godot.core.asStringName
 import godot.core.connect
 import godot.extension.getNodeAs
 import hexgrid.Hex
 import hexgrid.HexMode
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.Json
+import serializers.GDVectorSerializer
 import state.Location
+import state.Sponsor
+import technology.Science
 import kotlin.math.sqrt
 
 @RegisterClass
@@ -34,6 +41,18 @@ class HexMapGridEditor : GridContainer(), LogInterface {
     // UI elements
     private val sponsorNameEdit: LineEdit by lazy { getNodeAs("%SponsorNameEdit")!! }
     private val sponsorDescEdit: TextEdit by lazy { getNodeAs("%SponsorDescEdit")!! }
+    private val sponsorColorPicker: ColorPickerButton by lazy { getNodeAs("%ColorPickerButton")!! }
+    private val sponsorStartGold: SpinBox by lazy { getNodeAs("%SponsorStartGoldEdit")!! }
+    private val sponsorStartInf: SpinBox by lazy { getNodeAs("%SponsorStartInfEdit")!! }
+    private val sponsorStartConMats: SpinBox by lazy { getNodeAs("%SponsorStartConMatsEdit")!! }
+    private val physics: SpinBox by lazy { getNodeAs("%PhysicsEdit")!! }
+    private val engineering: SpinBox by lazy { getNodeAs("%EngineeringEdit")!! }
+    private val biochemistry: SpinBox by lazy { getNodeAs("%BiochemistryEdit")!! }
+    private val maths: SpinBox by lazy { getNodeAs("%MathsEdit")!! }
+    private val astronomy: SpinBox by lazy { getNodeAs("%AstronomyEdit")!! }
+    private val psychology: SpinBox by lazy { getNodeAs("%PsychologyEdit")!! }
+    private val eureka: SpinBox by lazy { getNodeAs("%EurekaEdit")!! }
+
     private val placeHexPopup: PopupPanel by lazy { getNodeAs("%PlaceHexPopupPanel")!! }
     private val phNameEdit: LineEdit by lazy { getNodeAs("%PlaceHexNameEdit")!! }
     private val phCoordLbl: Label by lazy { getNodeAs("%PHCoordLbl")!! }
@@ -41,9 +60,12 @@ class HexMapGridEditor : GridContainer(), LogInterface {
     private val hexCoordsLbl: Label by lazy { getNodeAs("%HexCoordsLbl")!! }
 
     // Data
-    private var grid = Array(dimension) { Array(dimension) { EditorData(Vector2.ZERO) } }
+    private var grid =
+        Array(dimension) { Array(dimension) { EditorData(dimension, dimension, Location(""), Vector2.ZERO) } }
     private var selectedRow = -1
     private var selectedCol = -1
+    private var sponsor: Sponsor? = null
+    private var sponsorCount: Int = 0
 
     @RegisterFunction
     override fun _ready() {
@@ -64,7 +86,7 @@ class HexMapGridEditor : GridContainer(), LogInterface {
                 locLabel.visible = false
 //                locLabel.setText("${vector2.x},${vector2.y}")
 //                locLabel.setPosition(Vector2(-20.0,-20.0))
-                hex.setPosition(data.vector)
+                hex.setPosition(data.position)
                 addChild(hex)
             }
         }
@@ -79,13 +101,14 @@ class HexMapGridEditor : GridContainer(), LogInterface {
                 phNameEdit.text = hex.location?.name ?: ""
                 phUnlockedAtStart.buttonPressed = true
             }
+            placeHexPopup.setPosition(getGlobalMousePosition().toVector2i().minus(Vector2i(50.0, 50.0)))
             placeHexPopup.visible = true
         }
     }
 
     @RegisterFunction
     fun onConfirmLocation() {
-        saveHexLocation(selectedRow, selectedCol, phNameEdit.text)
+        storeHexLocation(selectedRow, selectedCol, phNameEdit.text)
     }
 
     @RegisterFunction
@@ -97,14 +120,44 @@ class HexMapGridEditor : GridContainer(), LogInterface {
 
     @RegisterFunction
     fun onPHUnlockedAtStartToggled(toggledOn: Boolean) {
-        logInfo("Unlocked at start toggled to $toggledOn")
+        // no need to do anything here
+        // logInfo("Unlocked at start toggled to $toggledOn")
     }
 
     @RegisterFunction
     fun onSaveSponsorButtonPressed() {
         val sponsorName = sponsorNameEdit.text
         val sponsorDesc = sponsorDescEdit.text
-        logInfo("Saving sponsor $sponsorName with description $sponsorDesc")
+        logInfo("Saving sponsor '$sponsorName' with description '$sponsorDesc'.")
+
+        // extract the sponsor data
+        val startGold = sponsorStartGold.getLineEdit()!!.text
+        val startInf = sponsorStartInf.getLineEdit()!!.text
+        val startConMats = sponsorStartConMats.getLineEdit()!!.text
+
+        val sponsor = Sponsor(
+            id = sponsorCount + 1,
+            name = sponsorName,
+            colour = sponsorColorPicker.color,
+            introText = sponsorDesc,
+            startingResources = mapOf(
+                ResourceType.GOLD to startGold.toInt(),
+                ResourceType.INFLUENCE to startInf.toInt(),
+                ResourceType.CONSTRUCTION_MATERIALS to startConMats.toInt()
+            ),
+            baseScienceRate = mapOf(
+                Science.PHYSICS to physics.getLineEdit()!!.text.toFloat(),
+                Science.ENGINEERING to engineering.getLineEdit()!!.text.toFloat(),
+                Science.BIOCHEMISTRY to biochemistry.getLineEdit()!!.text.toFloat(),
+                Science.MATHEMATICS to maths.getLineEdit()!!.text.toFloat(),
+                Science.ASTRONOMY to astronomy.getLineEdit()!!.text.toFloat(),
+                Science.PSYCHOLOGY to psychology.getLineEdit()!!.text.toFloat(),
+                Science.EUREKA to eureka.getLineEdit()!!.text.toFloat()
+            ),
+            startingTechs = emptyList(),
+            hexDimensions = Pair(dimension, dimension),
+            hexGrid = grid
+        )
 
         grid.forEachIndexed { i, row ->
             row.forEachIndexed { j, data ->
@@ -115,15 +168,31 @@ class HexMapGridEditor : GridContainer(), LogInterface {
                 } else {
                     if (hex.hexUnlocked) {
                         logInfo("Hex ($i,$j) ${hex.location?.name} (Starts unlocked: ${data.unlockedAtStart})")
+                        data.location = hex.location ?: Location("<no name>", data.unlockedAtStart)
                     }
+                    sponsor.hexGrid[i][j] = data
                 }
             }
         }
+        saveSponsor(sponsor)
+    }
+
+    private fun saveSponsor(sponsor: Sponsor) {
+        val json = Json {
+            prettyPrint = true
+            encodeDefaults = true
+            allowStructuredMapKeys = true
+        }
+        val sponsorJson = json.encodeToString(Sponsor.serializer(), sponsor)
+        log(sponsorJson)
     }
 
+    /**
+     * Calculate the grid pixel coordinates for the given number of rows and columns
+     */
     private fun calculateGridCoordinates(xCount: Int, yCount: Int): Array<Array<EditorData>> {
         // flat topped, evenq orientation
-        val hexCoords = Array(xCount) { Array(yCount) { EditorData(Vector2.ZERO) } }
+        val hexCoords = Array(xCount) { Array(yCount) { EditorData(xCount, yCount, Location(""), Vector2.ZERO) } }
         val radius = 75.0
         val diameter = radius * 2
         val width = diameter
@@ -135,16 +204,22 @@ class HexMapGridEditor : GridContainer(), LogInterface {
             for (j in 0 until yCount) {
                 val x = i * horizDistance
                 val y = j * height + (i % 2) * (height / 2)
-                hexCoords[i][j] = EditorData(Vector2(x, y))
+                hexCoords[i][j] = EditorData(i, j, Location(""), Vector2(x, y))
             }
         }
         return hexCoords
     }
 
-    private fun saveHexLocation(row: Int, col: Int, name: String) {
+    /**
+     * Store the details of the given hex into the grid
+     */
+    private fun storeHexLocation(row: Int, col: Int, name: String) {
         val hex = grid[row][col]
+        hex.unlockedAtStart = phUnlockedAtStart.buttonPressed
         val hexNode = getNodeAtHex(row, col) ?: return
-        hexNode.location = Location(name)
+        val location = Location(name, phUnlockedAtStart.buttonPressed)
+        hexNode.location = location
+        hex.location = location
         val locLabel = hexNode.getNodeAs<Label>("%LocationLabel")!!
         locLabel.text = name
         locLabel.visible = true
@@ -154,8 +229,7 @@ class HexMapGridEditor : GridContainer(), LogInterface {
         selectedRow = -1
         phNameEdit.text = ""
         phUnlockedAtStart.buttonPressed = false
-        hexNode.hexUnlocked =
-            true  // for now, we'll just unlock it, but should take into account hexUnlockedAtStart checkbox
+        hexNode.hexUnlocked = true
         hexNode.zIndex += 1
     }
 
@@ -171,6 +245,9 @@ class HexMapGridEditor : GridContainer(), LogInterface {
           return Hex(q, r)
       }*/
 
+    /**
+     * Get the hex at the given row and column
+     */
     private fun getNodeAtHex(row: Int, col: Int): Hex? {
         val node = getNodeAs("Hex_${row}_$col".asStringName()) as Hex?
         if (node == null) {
@@ -180,4 +257,11 @@ class HexMapGridEditor : GridContainer(), LogInterface {
     }
 }
 
-data class EditorData(val vector: Vector2, var unlockedAtStart: Boolean = false)
\ No newline at end of file
+@Serializable
+data class EditorData(
+    var row: Int,
+    var column: Int,
+    var location: Location,
+    @Serializable(with = GDVectorSerializer::class) val position: Vector2,
+    var unlockedAtStart: Boolean = false
+)
diff --git a/src/main/kuiper/hexgrid/map/editor/hex_map_editor.tscn b/src/main/kuiper/hexgrid/map/editor/hex_map_editor.tscn
index aeb9f3d..692fdde 100644
--- a/src/main/kuiper/hexgrid/map/editor/hex_map_editor.tscn
+++ b/src/main/kuiper/hexgrid/map/editor/hex_map_editor.tscn
@@ -90,6 +90,7 @@ layout_mode = 2
 text = "Colour"
 
 [node name="ColorPickerButton" type="ColorPickerButton" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer3"]
+unique_name_in_owner = true
 custom_minimum_size = Vector2(50, 0)
 layout_mode = 2
 size_flags_horizontal = 3
@@ -184,7 +185,7 @@ theme_override_constants/separation = 20
 layout_mode = 2
 text = "Physics"
 
-[node name="SponsorStartPhysics" type="SpinBox" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4/VBoxContainer"]
+[node name="PhysicsEdit" type="SpinBox" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4/VBoxContainer"]
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 3
@@ -199,7 +200,8 @@ theme_override_constants/separation = 20
 layout_mode = 2
 text = "Astronomy"
 
-[node name="SponsorStartAstronomy" type="SpinBox" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4/VBoxContainer2"]
+[node name="AstronomyEdit" type="SpinBox" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4/VBoxContainer2"]
+unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 3
 value = 10.0
@@ -213,7 +215,8 @@ theme_override_constants/separation = 20
 layout_mode = 2
 text = "Biochemistry"
 
-[node name="SponsorStartBiochem" type="SpinBox" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4/VBoxContainer3"]
+[node name="BiochemistryEdit" type="SpinBox" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4/VBoxContainer3"]
+unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 3
 value = 10.0
@@ -227,7 +230,8 @@ theme_override_constants/separation = 20
 layout_mode = 2
 text = "Engineering"
 
-[node name="SponsorStartEngineering" type="SpinBox" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4/VBoxContainer4"]
+[node name="EngineeringEdit" type="SpinBox" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4/VBoxContainer4"]
+unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 3
 value = 10.0
@@ -241,7 +245,8 @@ theme_override_constants/separation = 20
 layout_mode = 2
 text = "Mathematics"
 
-[node name="SponsorStartMaths" type="SpinBox" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4/VBoxContainer5"]
+[node name="MathsEdit" type="SpinBox" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4/VBoxContainer5"]
+unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 3
 value = 10.0
@@ -255,7 +260,8 @@ theme_override_constants/separation = 20
 layout_mode = 2
 text = "Psychology"
 
-[node name="SponsorStartPsych" type="SpinBox" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4/VBoxContainer6"]
+[node name="PsychologyEdit" type="SpinBox" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4/VBoxContainer6"]
+unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 3
 value = 10.0
@@ -269,7 +275,8 @@ theme_override_constants/separation = 20
 layout_mode = 2
 text = "Eureka"
 
-[node name="SponsorStartEureka" type="SpinBox" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4/VBoxContainer7"]
+[node name="EurekaEdit" type="SpinBox" parent="VBoxContainer/HBoxContainer2/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4/VBoxContainer7"]
+unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 3
 max_value = 10.0
@@ -328,7 +335,6 @@ script = ExtResource("2_rdfxg")
 
 [node name="PlaceHexPopupPanel" type="PopupPanel" parent="VBoxContainer/HBoxContainer2/PanelContainer2"]
 unique_name_in_owner = true
-initial_position = 2
 size = Vector2i(210, 200)
 
 [node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer/HBoxContainer2/PanelContainer2/PlaceHexPopupPanel"]
diff --git a/src/main/kuiper/serializers/GDVectorSerializer.kt b/src/main/kuiper/serializers/GDVectorSerializer.kt
new file mode 100644
index 0000000..38bdbcc
--- /dev/null
+++ b/src/main/kuiper/serializers/GDVectorSerializer.kt
@@ -0,0 +1,32 @@
+package serializers
+
+import godot.core.Vector2
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+object GDVectorSerializer : KSerializer<Vector2> {
+    override val descriptor: SerialDescriptor =
+        SerialDescriptor("godot.core.Vector2", GDVectorSurrogate.serializer().descriptor)
+
+    override fun serialize(encoder: Encoder, value: Vector2) {
+        val surrogate = GDVectorSurrogate(value.x, value.y)
+        encoder.encodeSerializableValue(GDVectorSurrogate.serializer(), surrogate)
+    }
+
+    override fun deserialize(decoder: Decoder): Vector2 {
+        val surrogate = decoder.decodeSerializableValue(GDVectorSurrogate.serializer())
+        return Vector2(surrogate.x, surrogate.y)
+    }
+
+}
+
+@Serializable
+@SerialName("Vector2")
+private class GDVectorSurrogate(
+    val x: Double = 0.0,
+    val y: Double = 0.0
+)
\ No newline at end of file
diff --git a/src/main/kuiper/state/Sponsor.kt b/src/main/kuiper/state/Sponsor.kt
index 6127d51..0d0b3c8 100644
--- a/src/main/kuiper/state/Sponsor.kt
+++ b/src/main/kuiper/state/Sponsor.kt
@@ -2,6 +2,7 @@ package state
 
 import actions.ResourceType
 import godot.core.Color
+import hexgrid.map.editor.EditorData
 import kotlinx.serialization.Serializable
 import serializers.GDColorSerializer
 import technology.Science
@@ -12,5 +13,29 @@ data class Sponsor(
     val introText: String,
     val startingResources: Map<ResourceType, Int>,
     val baseScienceRate: Map<Science, Float>,
-    val startingTechs: List<Int> = emptyList()
-)
\ No newline at end of file
+    val startingTechs: List<Int> = emptyList(),
+    val hexDimensions: Pair<Int, Int> = Pair(1, 1),
+    val hexGrid: Array<Array<EditorData>> = emptyArray()
+) {
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as Sponsor
+
+        if (id != other.id) return false
+        if (name != other.name) return false
+        if (colour != other.colour) return false
+        if (introText != other.introText) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = id
+        result = 31 * result + name.hashCode()
+        result = 31 * result + colour.hashCode()
+        result = 31 * result + introText.hashCode()
+        return result
+    }
+}
\ No newline at end of file

From 820b67f34f0348bb9493d1cde96f90736a6ab71e Mon Sep 17 00:00:00 2001
From: Liam <liamjdavison@gmail.com>
Date: Wed, 26 Mar 2025 06:42:12 +0000
Subject: [PATCH 08/14] Progress on loading/saving sponsors in the editor. Does
 not refresh the grid on load. Saves duplicate sponsors.

---
 assets/data/sponsors.json                     | 4581 ++++++++++++++++-
 assets/data/sponsors_original.json            |  200 +
 gdj/hexgrid/map/editor/HexMapGridEditor.gdj   |    3 +-
 .../hexgrid/map/editor/HexMapGridEditor.kt    |  110 +-
 .../hexgrid/map/editor/hex_map_editor.tscn    |   11 +-
 5 files changed, 4744 insertions(+), 161 deletions(-)
 create mode 100644 assets/data/sponsors_original.json

diff --git a/assets/data/sponsors.json b/assets/data/sponsors.json
index 306bd4c..c13752f 100644
--- a/assets/data/sponsors.json
+++ b/assets/data/sponsors.json
@@ -1,200 +1,4475 @@
 [
     {
-        "id": 1,
+        "id": 0,
         "name": "Europe",
         "colour": {
-            "b": 1.0,
+            "r": 0.06217360496520996,
+            "g": 0.040008544921875,
+            "b": 0.4453125,
             "a": 1.0,
-            "b8": 255,
+            "r8": 16,
+            "g8": 10,
+            "b8": 114,
             "a8": 255,
-            "h": 0.6666666666666666,
-            "s": 1.0,
-            "v": 1.0
+            "h": 0.67578125,
+            "s": 0.91015625,
+            "v": 0.4453125
         },
-        "introText": "[b]Welcome to Europe![/b]",
+        "introText": "A multinational collaboration.",
         "startingResources": {
             "GOLD": 100,
-            "INFLUENCE": 10,
-            "CONSTRUCTION_MATERIALS": 250
+            "INFLUENCE": 100,
+            "CONSTRUCTION_MATERIALS": 100
         },
         "baseScienceRate": {
-            "ASTRONOMY": 10.0,
             "PHYSICS": 10.0,
-            "BIOCHEMISTRY": 10.0,
             "ENGINEERING": 10.0,
-            "MATHEMATICS": 10.0,
-            "PSYCHOLOGY": 10.0
-        }
-    },
-    {
-        "id": 2,
-        "name": "North America",
-        "colour": {
-            "r": 1.0,
-            "a": 1.0,
-            "r8": 255,
-            "a8": 255,
-            "s": 1.0,
-            "v": 1.0
-        },
-        "introText": "[b]Welcome to North America![/b]\nAlthough the space launch centre was destroyed by the asteroid, you have the technology and political will to rebuild the NASA space programme..",
-        "startingResources": {
-            "GOLD": 150,
-            "INFLUENCE": 15,
-            "CONSTRUCTION_MATERIALS": 200
-        },
-        "baseScienceRate": {
-            "ASTRONOMY": 10.0,
-            "PHYSICS": 10.0,
             "BIOCHEMISTRY": 10.0,
-            "ENGINEERING": 10.0,
             "MATHEMATICS": 10.0,
-            "PSYCHOLOGY": 10.0
-        }
-    },
-    {
-        "id": 3,
-        "name": "South America",
-        "colour": {
-            "r": 1.0,
-            "g": 1.0,
-            "a": 1.0,
-            "r8": 255,
-            "g8": 255,
-            "a8": 255,
-            "h": 0.16666666666666666,
-            "s": 1.0,
-            "v": 1.0
+            "ASTRONOMY": 10.0,
+            "PSYCHOLOGY": 10.0,
+            "EUREKA": 1.0
         },
-        "introText": "[b]Welcome to South America![/b]",
-        "startingResources": {
-            "GOLD": 120,
-            "INFLUENCE": 12,
-            "CONSTRUCTION_MATERIALS": 150
+        "startingTechs": [],
+        "hexDimensions": {
+            "first": 6,
+            "second": 6
         },
-        "baseScienceRate": {
-            "ASTRONOMY": 10.0,
-            "PHYSICS": 10.0,
-            "BIOCHEMISTRY": 10.0,
-            "ENGINEERING": 10.0,
-            "MATHEMATICS": 10.0,
-            "PSYCHOLOGY": 10.0
-        }
+        "hexGrid": [
+            [
+                {
+                    "row": 0,
+                    "column": 0,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 0.0,
+                        "y": 0.0
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 0,
+                    "column": 1,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 0.0,
+                        "y": 129.9038105676658
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 0,
+                    "column": 2,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 0.0,
+                        "y": 259.8076211353316
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 0,
+                    "column": 3,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 0.0,
+                        "y": 389.7114317029974
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 0,
+                    "column": 4,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 0.0,
+                        "y": 519.6152422706632
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 0,
+                    "column": 5,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 0.0,
+                        "y": 649.519052838329
+                    },
+                    "unlockedAtStart": false
+                }
+            ],
+            [
+                {
+                    "row": 1,
+                    "column": 0,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 112.5,
+                        "y": 64.9519052838329
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 1,
+                    "column": 1,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 112.5,
+                        "y": 194.8557158514987
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 1,
+                    "column": 2,
+                    "location": {
+                        "name": "Iberia",
+                        "unlocked": true,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 112.5,
+                        "y": 324.7595264191645
+                    },
+                    "unlockedAtStart": true
+                },
+                {
+                    "row": 1,
+                    "column": 3,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 112.5,
+                        "y": 454.6633369868303
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 1,
+                    "column": 4,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 112.5,
+                        "y": 584.5671475544962
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 1,
+                    "column": 5,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 112.5,
+                        "y": 714.4709581221618
+                    },
+                    "unlockedAtStart": false
+                }
+            ],
+            [
+                {
+                    "row": 2,
+                    "column": 0,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 225.0,
+                        "y": 0.0
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 2,
+                    "column": 1,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 225.0,
+                        "y": 129.9038105676658
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 2,
+                    "column": 2,
+                    "location": {
+                        "name": "France",
+                        "unlocked": true,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 225.0,
+                        "y": 259.8076211353316
+                    },
+                    "unlockedAtStart": true
+                },
+                {
+                    "row": 2,
+                    "column": 3,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 225.0,
+                        "y": 389.7114317029974
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 2,
+                    "column": 4,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 225.0,
+                        "y": 519.6152422706632
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 2,
+                    "column": 5,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 225.0,
+                        "y": 649.519052838329
+                    },
+                    "unlockedAtStart": false
+                }
+            ],
+            [
+                {
+                    "row": 3,
+                    "column": 0,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 337.5,
+                        "y": 64.9519052838329
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 3,
+                    "column": 1,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 337.5,
+                        "y": 194.8557158514987
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 3,
+                    "column": 2,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 337.5,
+                        "y": 324.7595264191645
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 3,
+                    "column": 3,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 337.5,
+                        "y": 454.6633369868303
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 3,
+                    "column": 4,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 337.5,
+                        "y": 584.5671475544962
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 3,
+                    "column": 5,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 337.5,
+                        "y": 714.4709581221618
+                    },
+                    "unlockedAtStart": false
+                }
+            ],
+            [
+                {
+                    "row": 4,
+                    "column": 0,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 450.0,
+                        "y": 0.0
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 4,
+                    "column": 1,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 450.0,
+                        "y": 129.9038105676658
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 4,
+                    "column": 2,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 450.0,
+                        "y": 259.8076211353316
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 4,
+                    "column": 3,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 450.0,
+                        "y": 389.7114317029974
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 4,
+                    "column": 4,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 450.0,
+                        "y": 519.6152422706632
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 4,
+                    "column": 5,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 450.0,
+                        "y": 649.519052838329
+                    },
+                    "unlockedAtStart": false
+                }
+            ],
+            [
+                {
+                    "row": 5,
+                    "column": 0,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 562.5,
+                        "y": 64.9519052838329
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 5,
+                    "column": 1,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 562.5,
+                        "y": 194.8557158514987
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 5,
+                    "column": 2,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 562.5,
+                        "y": 324.7595264191645
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 5,
+                    "column": 3,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 562.5,
+                        "y": 454.6633369868303
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 5,
+                    "column": 4,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 562.5,
+                        "y": 584.5671475544962
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 5,
+                    "column": 5,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 562.5,
+                        "y": 714.4709581221618
+                    },
+                    "unlockedAtStart": false
+                }
+            ]
+        ]
     },
     {
-        "id": 4,
-        "name": "Asia",
+        "id": 1,
+        "name": "",
         "colour": {
-            "r": 0.823529,
-            "g": 0.705882,
-            "b": 0.54902,
+            "r": 0.0,
+            "g": 0.0,
+            "b": 0.0,
             "a": 1.0,
-            "r8": 210,
-            "g8": 180,
-            "b8": 140,
+            "r8": 0,
+            "g8": 0,
+            "b8": 0,
             "a8": 255,
-            "h": 0.0952379217681995,
-            "s": 0.3333325238091191,
-            "v": 0.823529
+            "h": 0.0,
+            "s": 0.0,
+            "v": 0.0
         },
-        "introText": "[b]Welcome to Asia![/b]",
+        "introText": "",
         "startingResources": {
-            "GOLD": 200,
-            "INFLUENCE": 12,
-            "CONSTRUCTION_MATERIALS": 350
+            "GOLD": 100,
+            "INFLUENCE": 100,
+            "CONSTRUCTION_MATERIALS": 100
         },
         "baseScienceRate": {
-            "ASTRONOMY": 10.0,
             "PHYSICS": 10.0,
-            "BIOCHEMISTRY": 10.0,
             "ENGINEERING": 10.0,
+            "BIOCHEMISTRY": 10.0,
             "MATHEMATICS": 10.0,
-            "PSYCHOLOGY": 10.0
-        }
-    },
-    {
-        "id": 5,
-        "name": "Africa",
-        "colour": {
-            "g": 1.0,
-            "a": 1.0,
-            "g8": 255,
-            "a8": 255,
-            "h": 0.3333333333333333,
-            "s": 1.0,
-            "v": 1.0
+            "ASTRONOMY": 10.0,
+            "PSYCHOLOGY": 10.0,
+            "EUREKA": 1.0
         },
-        "introText": "[b]Welcome to Africa![/b]",
-        "startingResources": {
-            "GOLD": 80,
-            "INFLUENCE": 8,
-            "CONSTRUCTION_MATERIALS": 250
+        "startingTechs": [],
+        "hexDimensions": {
+            "first": 6,
+            "second": 6
         },
-        "baseScienceRate": {
-            "ASTRONOMY": 10.0,
-            "PHYSICS": 10.0,
-            "BIOCHEMISTRY": 10.0,
-            "ENGINEERING": 10.0,
-            "MATHEMATICS": 10.0,
-            "PSYCHOLOGY": 10.0
-        }
+        "hexGrid": [
+            [
+                {
+                    "row": 0,
+                    "column": 0,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 0.0,
+                        "y": 0.0
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 0,
+                    "column": 1,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 0.0,
+                        "y": 129.9038105676658
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 0,
+                    "column": 2,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 0.0,
+                        "y": 259.8076211353316
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 0,
+                    "column": 3,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 0.0,
+                        "y": 389.7114317029974
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 0,
+                    "column": 4,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 0.0,
+                        "y": 519.6152422706632
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 0,
+                    "column": 5,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 0.0,
+                        "y": 649.519052838329
+                    },
+                    "unlockedAtStart": false
+                }
+            ],
+            [
+                {
+                    "row": 1,
+                    "column": 0,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 112.5,
+                        "y": 64.9519052838329
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 1,
+                    "column": 1,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 112.5,
+                        "y": 194.8557158514987
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 1,
+                    "column": 2,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 112.5,
+                        "y": 324.7595264191645
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 1,
+                    "column": 3,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 112.5,
+                        "y": 454.6633369868303
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 1,
+                    "column": 4,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 112.5,
+                        "y": 584.5671475544962
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 1,
+                    "column": 5,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 112.5,
+                        "y": 714.4709581221618
+                    },
+                    "unlockedAtStart": false
+                }
+            ],
+            [
+                {
+                    "row": 2,
+                    "column": 0,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 225.0,
+                        "y": 0.0
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 2,
+                    "column": 1,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 225.0,
+                        "y": 129.9038105676658
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 2,
+                    "column": 2,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 225.0,
+                        "y": 259.8076211353316
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 2,
+                    "column": 3,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 225.0,
+                        "y": 389.7114317029974
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 2,
+                    "column": 4,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 225.0,
+                        "y": 519.6152422706632
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 2,
+                    "column": 5,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 225.0,
+                        "y": 649.519052838329
+                    },
+                    "unlockedAtStart": false
+                }
+            ],
+            [
+                {
+                    "row": 3,
+                    "column": 0,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 337.5,
+                        "y": 64.9519052838329
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 3,
+                    "column": 1,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 337.5,
+                        "y": 194.8557158514987
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 3,
+                    "column": 2,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 337.5,
+                        "y": 324.7595264191645
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 3,
+                    "column": 3,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 337.5,
+                        "y": 454.6633369868303
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 3,
+                    "column": 4,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 337.5,
+                        "y": 584.5671475544962
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 3,
+                    "column": 5,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 337.5,
+                        "y": 714.4709581221618
+                    },
+                    "unlockedAtStart": false
+                }
+            ],
+            [
+                {
+                    "row": 4,
+                    "column": 0,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 450.0,
+                        "y": 0.0
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 4,
+                    "column": 1,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 450.0,
+                        "y": 129.9038105676658
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 4,
+                    "column": 2,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 450.0,
+                        "y": 259.8076211353316
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 4,
+                    "column": 3,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 450.0,
+                        "y": 389.7114317029974
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 4,
+                    "column": 4,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 450.0,
+                        "y": 519.6152422706632
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 4,
+                    "column": 5,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 450.0,
+                        "y": 649.519052838329
+                    },
+                    "unlockedAtStart": false
+                }
+            ],
+            [
+                {
+                    "row": 5,
+                    "column": 0,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 562.5,
+                        "y": 64.9519052838329
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 5,
+                    "column": 1,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 562.5,
+                        "y": 194.8557158514987
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 5,
+                    "column": 2,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 562.5,
+                        "y": 324.7595264191645
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 5,
+                    "column": 3,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 562.5,
+                        "y": 454.6633369868303
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 5,
+                    "column": 4,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 562.5,
+                        "y": 584.5671475544962
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 5,
+                    "column": 5,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 562.5,
+                        "y": 714.4709581221618
+                    },
+                    "unlockedAtStart": false
+                }
+            ]
+        ]
     },
     {
-        "id": 6,
-        "name": "Oceania",
+        "id": 2,
+        "name": "Europe",
         "colour": {
-            "g": 1.0,
-            "b": 1.0,
+            "r": 0.06217360496520996,
+            "g": 0.040008544921875,
+            "b": 0.4453125,
             "a": 1.0,
-            "g8": 255,
-            "b8": 255,
+            "r8": 16,
+            "g8": 10,
+            "b8": 114,
             "a8": 255,
-            "h": 0.5,
-            "s": 1.0,
-            "v": 1.0
+            "h": 0.67578125,
+            "s": 0.91015625,
+            "v": 0.4453125
         },
-        "introText": "[b]Welcome to Oceania![/b]",
+        "introText": "A multinational collaboration.",
         "startingResources": {
-            "GOLD": 90,
-            "INFLUENCE": 9,
-            "CONSTRUCTION_MATERIALS": 150
+            "GOLD": 100,
+            "INFLUENCE": 100,
+            "CONSTRUCTION_MATERIALS": 100
         },
         "baseScienceRate": {
-            "ASTRONOMY": 10.0,
             "PHYSICS": 10.0,
-            "BIOCHEMISTRY": 10.0,
             "ENGINEERING": 10.0,
+            "BIOCHEMISTRY": 10.0,
             "MATHEMATICS": 10.0,
-            "PSYCHOLOGY": 10.0
-        }
-    },
-    {
-        "id": 7,
-        "name": "Antarctica",
-        "colour": {
-            "r": 1.0,
-            "g": 1.0,
-            "b": 1.0,
-            "a": 1.0,
-            "r8": 255,
-            "g8": 255,
-            "b8": 255,
-            "a8": 255,
-            "v": 1.0
+            "ASTRONOMY": 10.0,
+            "PSYCHOLOGY": 10.0,
+            "EUREKA": 2.0
         },
-        "introText": "[b]Welcome to Antarctica![/b]\nThis will be your hardest challenge.",
-        "startingResources": {
-            "GOLD": 50,
-            "INFLUENCE": 5,
-            "CONSTRUCTION_MATERIALS": 50
+        "startingTechs": [],
+        "hexDimensions": {
+            "first": 6,
+            "second": 6
         },
-        "baseScienceRate": {
-            "ASTRONOMY": 10.0,
-            "PHYSICS": 10.0,
-            "BIOCHEMISTRY": 10.0,
-            "ENGINEERING": 10.0,
-            "MATHEMATICS": 10.0,
-            "PSYCHOLOGY": 10.0
-        }
+        "hexGrid": [
+            [
+                {
+                    "row": 0,
+                    "column": 0,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 0.0,
+                        "y": 0.0
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 0,
+                    "column": 1,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 0.0,
+                        "y": 129.9038105676658
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 0,
+                    "column": 2,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 0.0,
+                        "y": 259.8076211353316
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 0,
+                    "column": 3,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 0.0,
+                        "y": 389.7114317029974
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 0,
+                    "column": 4,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 0.0,
+                        "y": 519.6152422706632
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 0,
+                    "column": 5,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 0.0,
+                        "y": 649.519052838329
+                    },
+                    "unlockedAtStart": false
+                }
+            ],
+            [
+                {
+                    "row": 1,
+                    "column": 0,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 112.5,
+                        "y": 64.9519052838329
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 1,
+                    "column": 1,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 112.5,
+                        "y": 194.8557158514987
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 1,
+                    "column": 2,
+                    "location": {
+                        "name": "Iberia",
+                        "unlocked": true,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 112.5,
+                        "y": 324.7595264191645
+                    },
+                    "unlockedAtStart": true
+                },
+                {
+                    "row": 1,
+                    "column": 3,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 112.5,
+                        "y": 454.6633369868303
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 1,
+                    "column": 4,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 112.5,
+                        "y": 584.5671475544962
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 1,
+                    "column": 5,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 112.5,
+                        "y": 714.4709581221618
+                    },
+                    "unlockedAtStart": false
+                }
+            ],
+            [
+                {
+                    "row": 2,
+                    "column": 0,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 225.0,
+                        "y": 0.0
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 2,
+                    "column": 1,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 225.0,
+                        "y": 129.9038105676658
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 2,
+                    "column": 2,
+                    "location": {
+                        "name": "France",
+                        "unlocked": true,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 225.0,
+                        "y": 259.8076211353316
+                    },
+                    "unlockedAtStart": true
+                },
+                {
+                    "row": 2,
+                    "column": 3,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 225.0,
+                        "y": 389.7114317029974
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 2,
+                    "column": 4,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 225.0,
+                        "y": 519.6152422706632
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 2,
+                    "column": 5,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 225.0,
+                        "y": 649.519052838329
+                    },
+                    "unlockedAtStart": false
+                }
+            ],
+            [
+                {
+                    "row": 3,
+                    "column": 0,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 337.5,
+                        "y": 64.9519052838329
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 3,
+                    "column": 1,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 337.5,
+                        "y": 194.8557158514987
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 3,
+                    "column": 2,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 337.5,
+                        "y": 324.7595264191645
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 3,
+                    "column": 3,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 337.5,
+                        "y": 454.6633369868303
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 3,
+                    "column": 4,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 337.5,
+                        "y": 584.5671475544962
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 3,
+                    "column": 5,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 337.5,
+                        "y": 714.4709581221618
+                    },
+                    "unlockedAtStart": false
+                }
+            ],
+            [
+                {
+                    "row": 4,
+                    "column": 0,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 450.0,
+                        "y": 0.0
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 4,
+                    "column": 1,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 450.0,
+                        "y": 129.9038105676658
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 4,
+                    "column": 2,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 450.0,
+                        "y": 259.8076211353316
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 4,
+                    "column": 3,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 450.0,
+                        "y": 389.7114317029974
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 4,
+                    "column": 4,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 450.0,
+                        "y": 519.6152422706632
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 4,
+                    "column": 5,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 450.0,
+                        "y": 649.519052838329
+                    },
+                    "unlockedAtStart": false
+                }
+            ],
+            [
+                {
+                    "row": 5,
+                    "column": 0,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 562.5,
+                        "y": 64.9519052838329
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 5,
+                    "column": 1,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 562.5,
+                        "y": 194.8557158514987
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 5,
+                    "column": 2,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 562.5,
+                        "y": 324.7595264191645
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 5,
+                    "column": 3,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 562.5,
+                        "y": 454.6633369868303
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 5,
+                    "column": 4,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 562.5,
+                        "y": 584.5671475544962
+                    },
+                    "unlockedAtStart": false
+                },
+                {
+                    "row": 5,
+                    "column": 5,
+                    "location": {
+                        "name": "",
+                        "unlocked": false,
+                        "_buildings": [],
+                        "sectors": [
+                            {
+                                "id": 0,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 1,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 2,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 3,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 4,
+                                "status": "EMPTY"
+                            },
+                            {
+                                "id": 5,
+                                "status": "EMPTY"
+                            }
+                        ]
+                    },
+                    "position": {
+                        "x": 562.5,
+                        "y": 714.4709581221618
+                    },
+                    "unlockedAtStart": false
+                }
+            ]
+        ]
     }
 ]
\ No newline at end of file
diff --git a/assets/data/sponsors_original.json b/assets/data/sponsors_original.json
new file mode 100644
index 0000000..306bd4c
--- /dev/null
+++ b/assets/data/sponsors_original.json
@@ -0,0 +1,200 @@
+[
+    {
+        "id": 1,
+        "name": "Europe",
+        "colour": {
+            "b": 1.0,
+            "a": 1.0,
+            "b8": 255,
+            "a8": 255,
+            "h": 0.6666666666666666,
+            "s": 1.0,
+            "v": 1.0
+        },
+        "introText": "[b]Welcome to Europe![/b]",
+        "startingResources": {
+            "GOLD": 100,
+            "INFLUENCE": 10,
+            "CONSTRUCTION_MATERIALS": 250
+        },
+        "baseScienceRate": {
+            "ASTRONOMY": 10.0,
+            "PHYSICS": 10.0,
+            "BIOCHEMISTRY": 10.0,
+            "ENGINEERING": 10.0,
+            "MATHEMATICS": 10.0,
+            "PSYCHOLOGY": 10.0
+        }
+    },
+    {
+        "id": 2,
+        "name": "North America",
+        "colour": {
+            "r": 1.0,
+            "a": 1.0,
+            "r8": 255,
+            "a8": 255,
+            "s": 1.0,
+            "v": 1.0
+        },
+        "introText": "[b]Welcome to North America![/b]\nAlthough the space launch centre was destroyed by the asteroid, you have the technology and political will to rebuild the NASA space programme..",
+        "startingResources": {
+            "GOLD": 150,
+            "INFLUENCE": 15,
+            "CONSTRUCTION_MATERIALS": 200
+        },
+        "baseScienceRate": {
+            "ASTRONOMY": 10.0,
+            "PHYSICS": 10.0,
+            "BIOCHEMISTRY": 10.0,
+            "ENGINEERING": 10.0,
+            "MATHEMATICS": 10.0,
+            "PSYCHOLOGY": 10.0
+        }
+    },
+    {
+        "id": 3,
+        "name": "South America",
+        "colour": {
+            "r": 1.0,
+            "g": 1.0,
+            "a": 1.0,
+            "r8": 255,
+            "g8": 255,
+            "a8": 255,
+            "h": 0.16666666666666666,
+            "s": 1.0,
+            "v": 1.0
+        },
+        "introText": "[b]Welcome to South America![/b]",
+        "startingResources": {
+            "GOLD": 120,
+            "INFLUENCE": 12,
+            "CONSTRUCTION_MATERIALS": 150
+        },
+        "baseScienceRate": {
+            "ASTRONOMY": 10.0,
+            "PHYSICS": 10.0,
+            "BIOCHEMISTRY": 10.0,
+            "ENGINEERING": 10.0,
+            "MATHEMATICS": 10.0,
+            "PSYCHOLOGY": 10.0
+        }
+    },
+    {
+        "id": 4,
+        "name": "Asia",
+        "colour": {
+            "r": 0.823529,
+            "g": 0.705882,
+            "b": 0.54902,
+            "a": 1.0,
+            "r8": 210,
+            "g8": 180,
+            "b8": 140,
+            "a8": 255,
+            "h": 0.0952379217681995,
+            "s": 0.3333325238091191,
+            "v": 0.823529
+        },
+        "introText": "[b]Welcome to Asia![/b]",
+        "startingResources": {
+            "GOLD": 200,
+            "INFLUENCE": 12,
+            "CONSTRUCTION_MATERIALS": 350
+        },
+        "baseScienceRate": {
+            "ASTRONOMY": 10.0,
+            "PHYSICS": 10.0,
+            "BIOCHEMISTRY": 10.0,
+            "ENGINEERING": 10.0,
+            "MATHEMATICS": 10.0,
+            "PSYCHOLOGY": 10.0
+        }
+    },
+    {
+        "id": 5,
+        "name": "Africa",
+        "colour": {
+            "g": 1.0,
+            "a": 1.0,
+            "g8": 255,
+            "a8": 255,
+            "h": 0.3333333333333333,
+            "s": 1.0,
+            "v": 1.0
+        },
+        "introText": "[b]Welcome to Africa![/b]",
+        "startingResources": {
+            "GOLD": 80,
+            "INFLUENCE": 8,
+            "CONSTRUCTION_MATERIALS": 250
+        },
+        "baseScienceRate": {
+            "ASTRONOMY": 10.0,
+            "PHYSICS": 10.0,
+            "BIOCHEMISTRY": 10.0,
+            "ENGINEERING": 10.0,
+            "MATHEMATICS": 10.0,
+            "PSYCHOLOGY": 10.0
+        }
+    },
+    {
+        "id": 6,
+        "name": "Oceania",
+        "colour": {
+            "g": 1.0,
+            "b": 1.0,
+            "a": 1.0,
+            "g8": 255,
+            "b8": 255,
+            "a8": 255,
+            "h": 0.5,
+            "s": 1.0,
+            "v": 1.0
+        },
+        "introText": "[b]Welcome to Oceania![/b]",
+        "startingResources": {
+            "GOLD": 90,
+            "INFLUENCE": 9,
+            "CONSTRUCTION_MATERIALS": 150
+        },
+        "baseScienceRate": {
+            "ASTRONOMY": 10.0,
+            "PHYSICS": 10.0,
+            "BIOCHEMISTRY": 10.0,
+            "ENGINEERING": 10.0,
+            "MATHEMATICS": 10.0,
+            "PSYCHOLOGY": 10.0
+        }
+    },
+    {
+        "id": 7,
+        "name": "Antarctica",
+        "colour": {
+            "r": 1.0,
+            "g": 1.0,
+            "b": 1.0,
+            "a": 1.0,
+            "r8": 255,
+            "g8": 255,
+            "b8": 255,
+            "a8": 255,
+            "v": 1.0
+        },
+        "introText": "[b]Welcome to Antarctica![/b]\nThis will be your hardest challenge.",
+        "startingResources": {
+            "GOLD": 50,
+            "INFLUENCE": 5,
+            "CONSTRUCTION_MATERIALS": 50
+        },
+        "baseScienceRate": {
+            "ASTRONOMY": 10.0,
+            "PHYSICS": 10.0,
+            "BIOCHEMISTRY": 10.0,
+            "ENGINEERING": 10.0,
+            "MATHEMATICS": 10.0,
+            "PSYCHOLOGY": 10.0
+        }
+    }
+]
\ No newline at end of file
diff --git a/gdj/hexgrid/map/editor/HexMapGridEditor.gdj b/gdj/hexgrid/map/editor/HexMapGridEditor.gdj
index b154b4a..63c0d8b 100644
--- a/gdj/hexgrid/map/editor/HexMapGridEditor.gdj
+++ b/gdj/hexgrid/map/editor/HexMapGridEditor.gdj
@@ -29,5 +29,6 @@ functions = [
 	on_confirm_location,
 	on_cancel_location,
 	on_p_h_unlocked_at_start_toggled,
-	on_save_sponsor_button_pressed
+	on_save_sponsor_button_pressed,
+	on_sponsor_chosen
 ]
\ No newline at end of file
diff --git a/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt b/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt
index 760ee89..d345859 100644
--- a/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt
+++ b/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt
@@ -16,6 +16,7 @@ import godot.extension.getNodeAs
 import hexgrid.Hex
 import hexgrid.HexMode
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.json.Json
 import serializers.GDVectorSerializer
 import state.Location
@@ -59,6 +60,8 @@ class HexMapGridEditor : GridContainer(), LogInterface {
     private val phUnlockedAtStart: CheckBox by lazy { getNodeAs("%PHHexUnlocked")!! }
     private val hexCoordsLbl: Label by lazy { getNodeAs("%HexCoordsLbl")!! }
 
+    private val chooseSponsorButton: MenuButton by lazy { getNodeAs("%LoadSponsorBtn")!! }
+
     // Data
     private var grid =
         Array(dimension) { Array(dimension) { EditorData(dimension, dimension, Location(""), Vector2.ZERO) } }
@@ -66,11 +69,24 @@ class HexMapGridEditor : GridContainer(), LogInterface {
     private var selectedCol = -1
     private var sponsor: Sponsor? = null
     private var sponsorCount: Int = 0
+    private var sponsorJsonPath: String = "res://assets/data/sponsors.json"
+    private var sponsors: MutableList<Sponsor> = mutableListOf()
 
     @RegisterFunction
     override fun _ready() {
         signalBus = getNodeAs("/root/SignalBus")!!
 
+        // load the sponsors
+        sponsors = loadSponsors()
+        if (sponsors.size > 0) {
+            sponsors.forEach { sponsor ->
+                chooseSponsorButton.getPopup()!!.addItem(sponsor.name, sponsor.id)
+            }
+        }
+        chooseSponsorButton.getPopup()!!.idPressed.connect { id ->
+            onSponsorChosen(id.toInt())
+        }
+
         // set up the grid
         grid = calculateGridCoordinates(dimension, dimension)
         grid.forEachIndexed { i, row ->
@@ -124,11 +140,51 @@ class HexMapGridEditor : GridContainer(), LogInterface {
         // logInfo("Unlocked at start toggled to $toggledOn")
     }
 
+
     @RegisterFunction
     fun onSaveSponsorButtonPressed() {
+        sponsor = storeSponsorDetails()
+        sponsor?.let { saveSponsor(it) }
+    }
+
+    @RegisterFunction
+    fun onSponsorChosen(id: Int) {
+        log("Switching to sponsor $id")
+        sponsor = sponsors.find { it.id == id }
+        if (sponsor == null) {
+            logError("Failed to switch to sponsor $id; null returned")
+            return
+        }
+        sponsor?.let {
+            sponsorNameEdit.setText(it.name)
+            sponsorDescEdit.setText(it.introText)
+            sponsorColorPicker.color = it.colour
+            sponsorStartGold.setValue(it.startingResources[ResourceType.GOLD]?.toDouble() ?: 0.0)
+            sponsorStartInf.setValue(it.startingResources[ResourceType.INFLUENCE]?.toDouble() ?: 0.0)
+            sponsorStartConMats.setValue(it.startingResources[ResourceType.CONSTRUCTION_MATERIALS]?.toDouble() ?: 0.0)
+            physics.setValue(it.baseScienceRate[Science.PHYSICS]?.toDouble() ?: 0.0)
+            engineering.setValue(it.baseScienceRate[Science.ENGINEERING]?.toDouble() ?: 0.0)
+            biochemistry.setValue(it.baseScienceRate[Science.BIOCHEMISTRY]?.toDouble() ?: 0.0)
+            maths.setValue(it.baseScienceRate[Science.MATHEMATICS]?.toDouble() ?: 0.0)
+            astronomy.setValue(it.baseScienceRate[Science.ASTRONOMY]?.toDouble() ?: 0.0)
+            psychology.setValue(it.baseScienceRate[Science.PSYCHOLOGY]?.toDouble() ?: 0.0)
+            eureka.setValue(it.baseScienceRate[Science.EUREKA]?.toDouble() ?: 0.0)
+            grid = it.hexGrid
+        }
+
+    }
+
+    /**
+     * Extract the sponsor information from the UI and store it in a Sponsor object
+     */
+    private fun storeSponsorDetails(): Sponsor? {
         val sponsorName = sponsorNameEdit.text
         val sponsorDesc = sponsorDescEdit.text
         logInfo("Saving sponsor '$sponsorName' with description '$sponsorDesc'.")
+        if (sponsorName.isBlank() || sponsorDesc.isBlank()) {
+            logError("Sponsor name and description must be provided")
+            return null
+        }
 
         // extract the sponsor data
         val startGold = sponsorStartGold.getLineEdit()!!.text
@@ -136,7 +192,7 @@ class HexMapGridEditor : GridContainer(), LogInterface {
         val startConMats = sponsorStartConMats.getLineEdit()!!.text
 
         val sponsor = Sponsor(
-            id = sponsorCount + 1,
+            id = sponsors.size,
             name = sponsorName,
             colour = sponsorColorPicker.color,
             introText = sponsorDesc,
@@ -164,7 +220,7 @@ class HexMapGridEditor : GridContainer(), LogInterface {
                 val hex = getNodeAtHex(i, j)
                 if (hex == null) {
                     logError("No hex found at $i $j")
-                    return
+                    return null
                 } else {
                     if (hex.hexUnlocked) {
                         logInfo("Hex ($i,$j) ${hex.location?.name} (Starts unlocked: ${data.unlockedAtStart})")
@@ -174,17 +230,61 @@ class HexMapGridEditor : GridContainer(), LogInterface {
                 }
             }
         }
-        saveSponsor(sponsor)
+        return sponsor
     }
 
+    /**
+     * Save the given sponsor to the sponsors.json file
+     */
     private fun saveSponsor(sponsor: Sponsor) {
         val json = Json {
             prettyPrint = true
             encodeDefaults = true
             allowStructuredMapKeys = true
         }
-        val sponsorJson = json.encodeToString(Sponsor.serializer(), sponsor)
-        log(sponsorJson)
+        sponsors.find { it.id == sponsor.id }?.let {
+            it == sponsor
+        } ?: sponsors.add(sponsor)
+        val sponsorJson = json.encodeToString(ListSerializer(Sponsor.serializer()), sponsors)
+        if (!DirAccess.dirExistsAbsolute("res://assets/data")) {
+            DirAccess.makeDirRecursiveAbsolute("res://assets/data")
+        }
+        val sponsorFile = FileAccess.open(
+            "res://assets/data/sponsors.json",
+            FileAccess.ModeFlags.WRITE
+        )
+        log("Saving sponsor file ${ProjectSettings.globalizePath(sponsorFile?.getPath() ?: "null")}")
+        sponsorFile?.let {
+            it.storeString(sponsorJson)
+            it.close()
+        }
+    }
+
+    /**
+     * Load the sponsors from the sponsors.json file
+     */
+    private fun loadSponsors(): MutableList<Sponsor> {
+        val sponsors = mutableListOf<Sponsor>()
+        if (!DirAccess.dirExistsAbsolute("res://assets/data")) {
+            logError("No data directory found")
+            return sponsors
+        }
+        if (!FileAccess.fileExists(sponsorJsonPath)) {
+            logError("No sponsors.json file found")
+            return sponsors
+        } else {
+            val sponsorFile = FileAccess.open(sponsorJsonPath, FileAccess.ModeFlags.READ)!!
+            val sponsorJson = sponsorFile.getAsText()
+            val json = Json {
+                prettyPrint = true
+                encodeDefaults = true
+                allowStructuredMapKeys = true
+            }
+            val sponsorList = json.decodeFromString(ListSerializer(Sponsor.serializer()), sponsorJson)
+            sponsors.addAll(sponsorList)
+            log("Loaded ${sponsors.size} sponsors")
+        }
+        return sponsors
     }
 
     /**
diff --git a/src/main/kuiper/hexgrid/map/editor/hex_map_editor.tscn b/src/main/kuiper/hexgrid/map/editor/hex_map_editor.tscn
index 692fdde..835f5e5 100644
--- a/src/main/kuiper/hexgrid/map/editor/hex_map_editor.tscn
+++ b/src/main/kuiper/hexgrid/map/editor/hex_map_editor.tscn
@@ -28,16 +28,18 @@ grow_vertical = 2
 [node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]
 custom_minimum_size = Vector2(0, 50)
 layout_mode = 2
+theme_override_constants/separation = 10
 
 [node name="LoadSponsorBtn" type="MenuButton" parent="VBoxContainer/HBoxContainer"]
 unique_name_in_owner = true
 layout_mode = 2
-text = "Load Sponsor..."
+text = "Choose Sponsor..."
+flat = false
 
 [node name="SaveSponsorBtn" type="Button" parent="VBoxContainer/HBoxContainer"]
 unique_name_in_owner = true
 layout_mode = 2
-text = "Save"
+text = "Save all"
 
 [node name="NewSponsorBtn" type="Button" parent="VBoxContainer/HBoxContainer"]
 unique_name_in_owner = true
@@ -48,6 +50,11 @@ text = "New Sponsor"
 layout_mode = 2
 size_flags_horizontal = 3
 
+[node name="DeleteSponsorBtn" type="Button" parent="VBoxContainer/HBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+text = "Delete"
+
 [node name="HBoxContainer2" type="HBoxContainer" parent="VBoxContainer"]
 layout_mode = 2
 size_flags_vertical = 3

From c09364178946b242ded6103ecb202e0bfd46b37e Mon Sep 17 00:00:00 2001
From: Liam <liamjdavison@gmail.com>
Date: Wed, 26 Mar 2025 20:25:42 +0000
Subject: [PATCH 09/14] Fixed saving and loading sponsors in the editor. Added
 Delete.

---
 assets/data/sponsors.json                     | 3032 +----------------
 gdj/hexgrid/map/editor/HexMapGridEditor.gdj   |    3 +-
 .../hexgrid/map/editor/HexMapGridEditor.kt    |   24 +-
 .../hexgrid/map/editor/hex_map_editor.tscn    |    1 +
 4 files changed, 48 insertions(+), 3012 deletions(-)

diff --git a/assets/data/sponsors.json b/assets/data/sponsors.json
index c13752f..bb01650 100644
--- a/assets/data/sponsors.json
+++ b/assets/data/sponsors.json
@@ -1,33 +1,33 @@
 [
     {
-        "id": 0,
+        "id": 1,
         "name": "Europe",
         "colour": {
-            "r": 0.06217360496520996,
-            "g": 0.040008544921875,
-            "b": 0.4453125,
+            "r": 0.11230778694152832,
+            "g": 0.0599212646484375,
+            "b": 0.73046875,
             "a": 1.0,
-            "r8": 16,
-            "g8": 10,
-            "b8": 114,
+            "r8": 29,
+            "g8": 15,
+            "b8": 186,
             "a8": 255,
-            "h": 0.67578125,
-            "s": 0.91015625,
-            "v": 0.4453125
+            "h": 0.6796875,
+            "s": 0.91796875,
+            "v": 0.73046875
         },
-        "introText": "A multinational collaboration.",
+        "introText": "The nations of Europe come together and combine their scientific expertise and large industrial base.",
         "startingResources": {
-            "GOLD": 100,
-            "INFLUENCE": 100,
+            "GOLD": 250,
+            "INFLUENCE": 80,
             "CONSTRUCTION_MATERIALS": 100
         },
         "baseScienceRate": {
             "PHYSICS": 10.0,
-            "ENGINEERING": 10.0,
-            "BIOCHEMISTRY": 10.0,
-            "MATHEMATICS": 10.0,
-            "ASTRONOMY": 10.0,
-            "PSYCHOLOGY": 10.0,
+            "ENGINEERING": 12.0,
+            "BIOCHEMISTRY": 12.0,
+            "MATHEMATICS": 9.0,
+            "ASTRONOMY": 8.0,
+            "PSYCHOLOGY": 1.0,
             "EUREKA": 1.0
         },
         "startingTechs": [],
@@ -283,7 +283,7 @@
                     "row": 1,
                     "column": 0,
                     "location": {
-                        "name": "",
+                        "name": "UK",
                         "unlocked": false,
                         "_buildings": [],
                         "sectors": [
@@ -363,8 +363,8 @@
                     "row": 1,
                     "column": 2,
                     "location": {
-                        "name": "Iberia",
-                        "unlocked": true,
+                        "name": "Spain",
+                        "unlocked": false,
                         "_buildings": [],
                         "sectors": [
                             {
@@ -397,7 +397,7 @@
                         "x": 112.5,
                         "y": 324.7595264191645
                     },
-                    "unlockedAtStart": true
+                    "unlockedAtStart": false
                 },
                 {
                     "row": 1,
@@ -606,7 +606,7 @@
                     "column": 2,
                     "location": {
                         "name": "France",
-                        "unlocked": true,
+                        "unlocked": false,
                         "_buildings": [],
                         "sectors": [
                             {
@@ -639,7 +639,7 @@
                         "x": 225.0,
                         "y": 259.8076211353316
                     },
-                    "unlockedAtStart": true
+                    "unlockedAtStart": false
                 },
                 {
                     "row": 2,
@@ -807,2989 +807,7 @@
                     "row": 3,
                     "column": 1,
                     "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 337.5,
-                        "y": 194.8557158514987
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 3,
-                    "column": 2,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 337.5,
-                        "y": 324.7595264191645
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 3,
-                    "column": 3,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 337.5,
-                        "y": 454.6633369868303
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 3,
-                    "column": 4,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 337.5,
-                        "y": 584.5671475544962
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 3,
-                    "column": 5,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 337.5,
-                        "y": 714.4709581221618
-                    },
-                    "unlockedAtStart": false
-                }
-            ],
-            [
-                {
-                    "row": 4,
-                    "column": 0,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 450.0,
-                        "y": 0.0
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 4,
-                    "column": 1,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 450.0,
-                        "y": 129.9038105676658
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 4,
-                    "column": 2,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 450.0,
-                        "y": 259.8076211353316
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 4,
-                    "column": 3,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 450.0,
-                        "y": 389.7114317029974
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 4,
-                    "column": 4,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 450.0,
-                        "y": 519.6152422706632
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 4,
-                    "column": 5,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 450.0,
-                        "y": 649.519052838329
-                    },
-                    "unlockedAtStart": false
-                }
-            ],
-            [
-                {
-                    "row": 5,
-                    "column": 0,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 562.5,
-                        "y": 64.9519052838329
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 5,
-                    "column": 1,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 562.5,
-                        "y": 194.8557158514987
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 5,
-                    "column": 2,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 562.5,
-                        "y": 324.7595264191645
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 5,
-                    "column": 3,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 562.5,
-                        "y": 454.6633369868303
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 5,
-                    "column": 4,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 562.5,
-                        "y": 584.5671475544962
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 5,
-                    "column": 5,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 562.5,
-                        "y": 714.4709581221618
-                    },
-                    "unlockedAtStart": false
-                }
-            ]
-        ]
-    },
-    {
-        "id": 1,
-        "name": "",
-        "colour": {
-            "r": 0.0,
-            "g": 0.0,
-            "b": 0.0,
-            "a": 1.0,
-            "r8": 0,
-            "g8": 0,
-            "b8": 0,
-            "a8": 255,
-            "h": 0.0,
-            "s": 0.0,
-            "v": 0.0
-        },
-        "introText": "",
-        "startingResources": {
-            "GOLD": 100,
-            "INFLUENCE": 100,
-            "CONSTRUCTION_MATERIALS": 100
-        },
-        "baseScienceRate": {
-            "PHYSICS": 10.0,
-            "ENGINEERING": 10.0,
-            "BIOCHEMISTRY": 10.0,
-            "MATHEMATICS": 10.0,
-            "ASTRONOMY": 10.0,
-            "PSYCHOLOGY": 10.0,
-            "EUREKA": 1.0
-        },
-        "startingTechs": [],
-        "hexDimensions": {
-            "first": 6,
-            "second": 6
-        },
-        "hexGrid": [
-            [
-                {
-                    "row": 0,
-                    "column": 0,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 0.0,
-                        "y": 0.0
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 0,
-                    "column": 1,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 0.0,
-                        "y": 129.9038105676658
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 0,
-                    "column": 2,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 0.0,
-                        "y": 259.8076211353316
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 0,
-                    "column": 3,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 0.0,
-                        "y": 389.7114317029974
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 0,
-                    "column": 4,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 0.0,
-                        "y": 519.6152422706632
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 0,
-                    "column": 5,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 0.0,
-                        "y": 649.519052838329
-                    },
-                    "unlockedAtStart": false
-                }
-            ],
-            [
-                {
-                    "row": 1,
-                    "column": 0,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 112.5,
-                        "y": 64.9519052838329
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 1,
-                    "column": 1,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 112.5,
-                        "y": 194.8557158514987
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 1,
-                    "column": 2,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 112.5,
-                        "y": 324.7595264191645
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 1,
-                    "column": 3,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 112.5,
-                        "y": 454.6633369868303
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 1,
-                    "column": 4,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 112.5,
-                        "y": 584.5671475544962
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 1,
-                    "column": 5,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 112.5,
-                        "y": 714.4709581221618
-                    },
-                    "unlockedAtStart": false
-                }
-            ],
-            [
-                {
-                    "row": 2,
-                    "column": 0,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 225.0,
-                        "y": 0.0
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 2,
-                    "column": 1,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 225.0,
-                        "y": 129.9038105676658
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 2,
-                    "column": 2,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 225.0,
-                        "y": 259.8076211353316
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 2,
-                    "column": 3,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 225.0,
-                        "y": 389.7114317029974
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 2,
-                    "column": 4,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 225.0,
-                        "y": 519.6152422706632
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 2,
-                    "column": 5,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 225.0,
-                        "y": 649.519052838329
-                    },
-                    "unlockedAtStart": false
-                }
-            ],
-            [
-                {
-                    "row": 3,
-                    "column": 0,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 337.5,
-                        "y": 64.9519052838329
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 3,
-                    "column": 1,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 337.5,
-                        "y": 194.8557158514987
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 3,
-                    "column": 2,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 337.5,
-                        "y": 324.7595264191645
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 3,
-                    "column": 3,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 337.5,
-                        "y": 454.6633369868303
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 3,
-                    "column": 4,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 337.5,
-                        "y": 584.5671475544962
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 3,
-                    "column": 5,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 337.5,
-                        "y": 714.4709581221618
-                    },
-                    "unlockedAtStart": false
-                }
-            ],
-            [
-                {
-                    "row": 4,
-                    "column": 0,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 450.0,
-                        "y": 0.0
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 4,
-                    "column": 1,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 450.0,
-                        "y": 129.9038105676658
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 4,
-                    "column": 2,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 450.0,
-                        "y": 259.8076211353316
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 4,
-                    "column": 3,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 450.0,
-                        "y": 389.7114317029974
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 4,
-                    "column": 4,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 450.0,
-                        "y": 519.6152422706632
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 4,
-                    "column": 5,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 450.0,
-                        "y": 649.519052838329
-                    },
-                    "unlockedAtStart": false
-                }
-            ],
-            [
-                {
-                    "row": 5,
-                    "column": 0,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 562.5,
-                        "y": 64.9519052838329
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 5,
-                    "column": 1,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 562.5,
-                        "y": 194.8557158514987
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 5,
-                    "column": 2,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 562.5,
-                        "y": 324.7595264191645
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 5,
-                    "column": 3,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 562.5,
-                        "y": 454.6633369868303
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 5,
-                    "column": 4,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 562.5,
-                        "y": 584.5671475544962
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 5,
-                    "column": 5,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 562.5,
-                        "y": 714.4709581221618
-                    },
-                    "unlockedAtStart": false
-                }
-            ]
-        ]
-    },
-    {
-        "id": 2,
-        "name": "Europe",
-        "colour": {
-            "r": 0.06217360496520996,
-            "g": 0.040008544921875,
-            "b": 0.4453125,
-            "a": 1.0,
-            "r8": 16,
-            "g8": 10,
-            "b8": 114,
-            "a8": 255,
-            "h": 0.67578125,
-            "s": 0.91015625,
-            "v": 0.4453125
-        },
-        "introText": "A multinational collaboration.",
-        "startingResources": {
-            "GOLD": 100,
-            "INFLUENCE": 100,
-            "CONSTRUCTION_MATERIALS": 100
-        },
-        "baseScienceRate": {
-            "PHYSICS": 10.0,
-            "ENGINEERING": 10.0,
-            "BIOCHEMISTRY": 10.0,
-            "MATHEMATICS": 10.0,
-            "ASTRONOMY": 10.0,
-            "PSYCHOLOGY": 10.0,
-            "EUREKA": 2.0
-        },
-        "startingTechs": [],
-        "hexDimensions": {
-            "first": 6,
-            "second": 6
-        },
-        "hexGrid": [
-            [
-                {
-                    "row": 0,
-                    "column": 0,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 0.0,
-                        "y": 0.0
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 0,
-                    "column": 1,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 0.0,
-                        "y": 129.9038105676658
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 0,
-                    "column": 2,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 0.0,
-                        "y": 259.8076211353316
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 0,
-                    "column": 3,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 0.0,
-                        "y": 389.7114317029974
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 0,
-                    "column": 4,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 0.0,
-                        "y": 519.6152422706632
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 0,
-                    "column": 5,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 0.0,
-                        "y": 649.519052838329
-                    },
-                    "unlockedAtStart": false
-                }
-            ],
-            [
-                {
-                    "row": 1,
-                    "column": 0,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 112.5,
-                        "y": 64.9519052838329
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 1,
-                    "column": 1,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 112.5,
-                        "y": 194.8557158514987
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 1,
-                    "column": 2,
-                    "location": {
-                        "name": "Iberia",
-                        "unlocked": true,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 112.5,
-                        "y": 324.7595264191645
-                    },
-                    "unlockedAtStart": true
-                },
-                {
-                    "row": 1,
-                    "column": 3,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 112.5,
-                        "y": 454.6633369868303
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 1,
-                    "column": 4,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 112.5,
-                        "y": 584.5671475544962
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 1,
-                    "column": 5,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 112.5,
-                        "y": 714.4709581221618
-                    },
-                    "unlockedAtStart": false
-                }
-            ],
-            [
-                {
-                    "row": 2,
-                    "column": 0,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 225.0,
-                        "y": 0.0
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 2,
-                    "column": 1,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 225.0,
-                        "y": 129.9038105676658
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 2,
-                    "column": 2,
-                    "location": {
-                        "name": "France",
-                        "unlocked": true,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 225.0,
-                        "y": 259.8076211353316
-                    },
-                    "unlockedAtStart": true
-                },
-                {
-                    "row": 2,
-                    "column": 3,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 225.0,
-                        "y": 389.7114317029974
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 2,
-                    "column": 4,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 225.0,
-                        "y": 519.6152422706632
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 2,
-                    "column": 5,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 225.0,
-                        "y": 649.519052838329
-                    },
-                    "unlockedAtStart": false
-                }
-            ],
-            [
-                {
-                    "row": 3,
-                    "column": 0,
-                    "location": {
-                        "name": "",
-                        "unlocked": false,
-                        "_buildings": [],
-                        "sectors": [
-                            {
-                                "id": 0,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 1,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 2,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 3,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 4,
-                                "status": "EMPTY"
-                            },
-                            {
-                                "id": 5,
-                                "status": "EMPTY"
-                            }
-                        ]
-                    },
-                    "position": {
-                        "x": 337.5,
-                        "y": 64.9519052838329
-                    },
-                    "unlockedAtStart": false
-                },
-                {
-                    "row": 3,
-                    "column": 1,
-                    "location": {
-                        "name": "",
+                        "name": "Germany",
                         "unlocked": false,
                         "_buildings": [],
                         "sectors": [
diff --git a/gdj/hexgrid/map/editor/HexMapGridEditor.gdj b/gdj/hexgrid/map/editor/HexMapGridEditor.gdj
index 63c0d8b..af90d9c 100644
--- a/gdj/hexgrid/map/editor/HexMapGridEditor.gdj
+++ b/gdj/hexgrid/map/editor/HexMapGridEditor.gdj
@@ -30,5 +30,6 @@ functions = [
 	on_cancel_location,
 	on_p_h_unlocked_at_start_toggled,
 	on_save_sponsor_button_pressed,
-	on_sponsor_chosen
+	on_sponsor_chosen,
+	delete_sponsor
 ]
\ No newline at end of file
diff --git a/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt b/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt
index d345859..faa4d35 100644
--- a/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt
+++ b/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt
@@ -68,7 +68,6 @@ class HexMapGridEditor : GridContainer(), LogInterface {
     private var selectedRow = -1
     private var selectedCol = -1
     private var sponsor: Sponsor? = null
-    private var sponsorCount: Int = 0
     private var sponsorJsonPath: String = "res://assets/data/sponsors.json"
     private var sponsors: MutableList<Sponsor> = mutableListOf()
 
@@ -80,7 +79,7 @@ class HexMapGridEditor : GridContainer(), LogInterface {
         sponsors = loadSponsors()
         if (sponsors.size > 0) {
             sponsors.forEach { sponsor ->
-                chooseSponsorButton.getPopup()!!.addItem(sponsor.name, sponsor.id)
+                chooseSponsorButton.getPopup()!!.addItem("${sponsor.id} - ${sponsor.name}", sponsor.id)
             }
         }
         chooseSponsorButton.getPopup()!!.idPressed.connect { id ->
@@ -172,6 +171,14 @@ class HexMapGridEditor : GridContainer(), LogInterface {
             grid = it.hexGrid
         }
 
+        // update the grid
+        grid.forEach { editorData ->
+            editorData.forEach { value ->
+                if (value.location.name.isNotEmpty()) {
+                    storeHexLocation(value.row, value.column, value.location.name)
+                }
+            }
+        }
     }
 
     /**
@@ -250,8 +257,7 @@ class HexMapGridEditor : GridContainer(), LogInterface {
             DirAccess.makeDirRecursiveAbsolute("res://assets/data")
         }
         val sponsorFile = FileAccess.open(
-            "res://assets/data/sponsors.json",
-            FileAccess.ModeFlags.WRITE
+            "res://assets/data/sponsors.json", FileAccess.ModeFlags.WRITE
         )
         log("Saving sponsor file ${ProjectSettings.globalizePath(sponsorFile?.getPath() ?: "null")}")
         sponsorFile?.let {
@@ -260,6 +266,16 @@ class HexMapGridEditor : GridContainer(), LogInterface {
         }
     }
 
+    @RegisterFunction
+    fun deleteSponsor() {
+        val currentSponsor = sponsor?.id
+        val sponsor = sponsors.find { it.id == currentSponsor }
+        if (sponsor != null) {
+            sponsors.remove(sponsor)
+            chooseSponsorButton.getPopup()!!.removeItem(sponsor.id)
+        }
+    }
+
     /**
      * Load the sponsors from the sponsors.json file
      */
diff --git a/src/main/kuiper/hexgrid/map/editor/hex_map_editor.tscn b/src/main/kuiper/hexgrid/map/editor/hex_map_editor.tscn
index 835f5e5..8a8f7c9 100644
--- a/src/main/kuiper/hexgrid/map/editor/hex_map_editor.tscn
+++ b/src/main/kuiper/hexgrid/map/editor/hex_map_editor.tscn
@@ -391,6 +391,7 @@ layout_mode = 2
 text = "Confirm"
 
 [connection signal="pressed" from="VBoxContainer/HBoxContainer/SaveSponsorBtn" to="VBoxContainer/HBoxContainer2/PanelContainer2/VBoxContainer/HBoxContainer2/HexGridContainer" method="on_save_sponsor_button_pressed"]
+[connection signal="pressed" from="VBoxContainer/HBoxContainer/DeleteSponsorBtn" to="VBoxContainer/HBoxContainer2/PanelContainer2/VBoxContainer/HBoxContainer2/HexGridContainer" method="delete_sponsor"]
 [connection signal="toggled" from="VBoxContainer/HBoxContainer2/PanelContainer2/PlaceHexPopupPanel/VBoxContainer/HBoxContainer2/PHHexUnlocked" to="VBoxContainer/HBoxContainer2/PanelContainer2/VBoxContainer/HBoxContainer2/HexGridContainer" method="on_p_h_unlocked_at_start_toggled"]
 [connection signal="pressed" from="VBoxContainer/HBoxContainer2/PanelContainer2/PlaceHexPopupPanel/VBoxContainer/HBoxContainer/PHCancel" to="VBoxContainer/HBoxContainer2/PanelContainer2/VBoxContainer/HBoxContainer2/HexGridContainer" method="on_cancel_location"]
 [connection signal="pressed" from="VBoxContainer/HBoxContainer2/PanelContainer2/PlaceHexPopupPanel/VBoxContainer/HBoxContainer/PHConfirm" to="VBoxContainer/HBoxContainer2/PanelContainer2/VBoxContainer/HBoxContainer2/HexGridContainer" method="on_confirm_location"]

From a3fa21601b4cec11a742fe3ab7ec88567573e15c Mon Sep 17 00:00:00 2001
From: Liam <liamjdavison@gmail.com>
Date: Wed, 26 Mar 2025 20:32:43 +0000
Subject: [PATCH 10/14] Fixed new game and science panel.

---
 src/main/kuiper/loaders/DataLoader.kt   |  5 ++++-
 src/main/kuiper/science/SciencePanel.kt | 12 +++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/kuiper/loaders/DataLoader.kt b/src/main/kuiper/loaders/DataLoader.kt
index f8403d1..518360d 100644
--- a/src/main/kuiper/loaders/DataLoader.kt
+++ b/src/main/kuiper/loaders/DataLoader.kt
@@ -44,7 +44,10 @@ class DataLoader : Node() {
             GD.printErr("Failed to load sponsor data from $sponsorJsonPath")
             return emptyList()
         }
-        val sponsorJson = Json.decodeFromString<List<Sponsor>>(sponsorFile.getAsText())
+        val json = Json {
+            allowStructuredMapKeys = true
+        }
+        val sponsorJson = json.decodeFromString<List<Sponsor>>(sponsorFile.getAsText())
         GD.print("Loaded ${sponsorJson.size} sponsors")
         return sponsorJson
     }
diff --git a/src/main/kuiper/science/SciencePanel.kt b/src/main/kuiper/science/SciencePanel.kt
index 4f1cca6..f25ff3c 100644
--- a/src/main/kuiper/science/SciencePanel.kt
+++ b/src/main/kuiper/science/SciencePanel.kt
@@ -35,11 +35,13 @@ class SciencePanel : Control() {
         pulldownControl = getNodeAs("%PulldownPanel")!!
 
         signalBus.updateScience.connect { scienceName, value ->
-            science = Science.valueOf(scienceName.uppercase())
-            iconRow.getNodeAs<ResourceDisplay>(science.name)?.apply {
-                updateValue(value)
-                panelContents.getNodeAs<RichTextLabel>("${science}_summary")?.apply {
-                    text = "[img=25]${science.spritePath}[/img] [b]${science.displayName}:[/b] %.2f".format(value)
+            if (scienceName != "EUREKA") {
+                science = Science.valueOf(scienceName.uppercase())
+                iconRow.getNodeAs<ResourceDisplay>(science.name)?.apply {
+                    updateValue(value)
+                    panelContents.getNodeAs<RichTextLabel>("${science}_summary")?.apply {
+                        text = "[img=25]${science.spritePath}[/img] [b]${science.displayName}:[/b] %.2f".format(value)
+                    }
                 }
             }
         }

From d866a8ae9334dbb0f38e4ebec239b22803829096 Mon Sep 17 00:00:00 2001
From: Liam <liamjdavison@gmail.com>
Date: Thu, 27 Mar 2025 06:45:46 +0000
Subject: [PATCH 11/14] Integrated sponsor grid map loading into main game.

---
 assets/data/sponsors.json                     |  8 +--
 src/main/kuiper/hexgrid/HexGrid.kt            | 22 ++++----
 src/main/kuiper/hexgrid/hex_grid.tscn         | 11 ++--
 src/main/kuiper/hexgrid/map/editor/HexData.kt | 18 +++++++
 .../hexgrid/map/editor/HexMapGridEditor.kt    | 19 ++-----
 .../kuiper/screens/gameSetup/GameSetup.kt     | 14 +++--
 src/main/kuiper/state/Company.kt              | 52 ++++++++++---------
 src/main/kuiper/state/Sponsor.kt              |  4 +-
 src/main/kuiper/state/Zone.kt                 |  3 +-
 9 files changed, 83 insertions(+), 68 deletions(-)
 create mode 100644 src/main/kuiper/hexgrid/map/editor/HexData.kt

diff --git a/assets/data/sponsors.json b/assets/data/sponsors.json
index bb01650..6236f88 100644
--- a/assets/data/sponsors.json
+++ b/assets/data/sponsors.json
@@ -284,7 +284,7 @@
                     "column": 0,
                     "location": {
                         "name": "UK",
-                        "unlocked": false,
+                        "unlocked": true,
                         "_buildings": [],
                         "sectors": [
                             {
@@ -317,7 +317,7 @@
                         "x": 112.5,
                         "y": 64.9519052838329
                     },
-                    "unlockedAtStart": false
+                    "unlockedAtStart": true
                 },
                 {
                     "row": 1,
@@ -847,7 +847,7 @@
                     "row": 3,
                     "column": 2,
                     "location": {
-                        "name": "",
+                        "name": "Italy",
                         "unlocked": false,
                         "_buildings": [],
                         "sectors": [
@@ -1009,7 +1009,7 @@
                     "row": 4,
                     "column": 0,
                     "location": {
-                        "name": "",
+                        "name": "Scandanavia",
                         "unlocked": false,
                         "_buildings": [],
                         "sectors": [
diff --git a/src/main/kuiper/hexgrid/HexGrid.kt b/src/main/kuiper/hexgrid/HexGrid.kt
index 066b0db..9f02467 100644
--- a/src/main/kuiper/hexgrid/HexGrid.kt
+++ b/src/main/kuiper/hexgrid/HexGrid.kt
@@ -11,8 +11,8 @@ import godot.core.asCachedStringName
 import godot.core.connect
 import godot.extension.getNodeAs
 import godot.extension.instantiateAs
+import hexgrid.map.editor.HexData
 import state.GameState
-import state.Location
 
 @RegisterClass
 class HexGrid : Control() {
@@ -23,7 +23,7 @@ class HexGrid : Control() {
 
     // UI elements
     private var dropTargets: MutableList<HexDropTarget> = mutableListOf()
-    private lateinit var hexGridContainer: GridContainer
+    private lateinit var hexGridContainer: Container
     private lateinit var gridPlacementContainer: HBoxContainer
 
     // Packed scenes
@@ -48,11 +48,12 @@ class HexGrid : Control() {
         val gridPlacement = getGridPlacement()
         gridPlacementContainer.setPosition(gridPlacement)
 
-        gameState.company.zones[0].locations.forEachIndexed { index, location ->
-            createHex(index, location)
+        gameState.company.zones[0].hexes.forEachIndexed { index, hexData ->
+            if (hexData.location.name.isNotEmpty()) {
+                createHex(index, hexData)
+            }
         }
 
-        // set up the HQ hex, which is unlocked and has a label
 
         // connect to card dragging signals
         signalBus.draggingCard.connect { card ->
@@ -72,11 +73,11 @@ class HexGrid : Control() {
      * Create a hexagon and add it to the grid
      * Assign the hexagon's drop target to the group "hexDropTargets"
      */
-    private fun createHex(i: Int, location: Location) {
+    private fun createHex(i: Int, hexData: HexData) {
         val hex = hexScene.instantiateAs<Hex>()!!
         hex.id = i
-        hex.location = location
-        hex.hexUnlocked = location.unlocked
+        hex.location = hexData.location
+        hex.hexUnlocked = hexData.location.unlocked
         val dropTarget = hex.getNodeAs<HexDropTarget>("%HexDropTarget")!!
         dropTarget.addToGroup("hexDropTargets".asCachedStringName())
         dropTarget.setName("HexDropTarget$i")
@@ -88,8 +89,9 @@ class HexGrid : Control() {
         val boxContainer = BoxContainer()
         boxContainer.setName("Hex${i}_BoxContainer")
         boxContainer.addChild(hex)
-
-        label.text = location.name
+        boxContainer.setPosition(hexData.position)
+        label.setPosition(Vector2(-20.0, -18.0)) // TODO: center on hex
+        label.text = hexData.location.name
         hexGridContainer.addChild(boxContainer)
         hexes.add(hex)
     }
diff --git a/src/main/kuiper/hexgrid/hex_grid.tscn b/src/main/kuiper/hexgrid/hex_grid.tscn
index fdde5d3..b13bfe8 100644
--- a/src/main/kuiper/hexgrid/hex_grid.tscn
+++ b/src/main/kuiper/hexgrid/hex_grid.tscn
@@ -28,21 +28,18 @@ layout_mode = 2
 mouse_filter = 2
 theme_override_constants/margin_right = 100
 
-[node name="VBoxContainer" type="VBoxContainer" parent="GridPlacementContainer"]
+[node name="HBoxContainer" type="HBoxContainer" parent="GridPlacementContainer"]
 layout_mode = 2
 size_flags_horizontal = 3
 mouse_filter = 2
 
-[node name="HexGridContainer" type="GridContainer" parent="GridPlacementContainer/VBoxContainer"]
+[node name="HexGridContainer" type="Container" parent="GridPlacementContainer/HBoxContainer"]
 unique_name_in_owner = true
 layout_mode = 2
-size_flags_vertical = 3
+size_flags_horizontal = 3
 mouse_filter = 2
-theme_override_constants/h_separation = 225
-theme_override_constants/v_separation = 225
-columns = 5
 
-[node name="MarginContainer2" type="MarginContainer" parent="GridPlacementContainer/VBoxContainer"]
+[node name="MarginContainer2" type="MarginContainer" parent="GridPlacementContainer/HBoxContainer"]
 layout_mode = 2
 mouse_filter = 2
 theme_override_constants/margin_bottom = 200
diff --git a/src/main/kuiper/hexgrid/map/editor/HexData.kt b/src/main/kuiper/hexgrid/map/editor/HexData.kt
new file mode 100644
index 0000000..c2cfa55
--- /dev/null
+++ b/src/main/kuiper/hexgrid/map/editor/HexData.kt
@@ -0,0 +1,18 @@
+package hexgrid.map.editor
+
+import godot.core.Vector2
+import kotlinx.serialization.Serializable
+import serializers.GDVectorSerializer
+import state.Location
+
+/**
+ * Represents a single hex in a zone, consisting of a row and column, a location, and a position on screen
+ */
+@Serializable
+data class HexData(
+    var row: Int,
+    var column: Int,
+    var location: Location,
+    @Serializable(with = GDVectorSerializer::class) val position: Vector2,
+    var unlockedAtStart: Boolean = false
+)
\ No newline at end of file
diff --git a/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt b/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt
index faa4d35..e9625ff 100644
--- a/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt
+++ b/src/main/kuiper/hexgrid/map/editor/HexMapGridEditor.kt
@@ -15,10 +15,8 @@ import godot.core.connect
 import godot.extension.getNodeAs
 import hexgrid.Hex
 import hexgrid.HexMode
-import kotlinx.serialization.Serializable
 import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.json.Json
-import serializers.GDVectorSerializer
 import state.Location
 import state.Sponsor
 import technology.Science
@@ -64,7 +62,7 @@ class HexMapGridEditor : GridContainer(), LogInterface {
 
     // Data
     private var grid =
-        Array(dimension) { Array(dimension) { EditorData(dimension, dimension, Location(""), Vector2.ZERO) } }
+        Array(dimension) { Array(dimension) { HexData(dimension, dimension, Location(""), Vector2.ZERO) } }
     private var selectedRow = -1
     private var selectedCol = -1
     private var sponsor: Sponsor? = null
@@ -306,9 +304,9 @@ class HexMapGridEditor : GridContainer(), LogInterface {
     /**
      * Calculate the grid pixel coordinates for the given number of rows and columns
      */
-    private fun calculateGridCoordinates(xCount: Int, yCount: Int): Array<Array<EditorData>> {
+    private fun calculateGridCoordinates(xCount: Int, yCount: Int): Array<Array<HexData>> {
         // flat topped, evenq orientation
-        val hexCoords = Array(xCount) { Array(yCount) { EditorData(xCount, yCount, Location(""), Vector2.ZERO) } }
+        val hexCoords = Array(xCount) { Array(yCount) { HexData(xCount, yCount, Location(""), Vector2.ZERO) } }
         val radius = 75.0
         val diameter = radius * 2
         val width = diameter
@@ -320,7 +318,7 @@ class HexMapGridEditor : GridContainer(), LogInterface {
             for (j in 0 until yCount) {
                 val x = i * horizDistance
                 val y = j * height + (i % 2) * (height / 2)
-                hexCoords[i][j] = EditorData(i, j, Location(""), Vector2(x, y))
+                hexCoords[i][j] = HexData(i, j, Location(""), Vector2(x, y))
             }
         }
         return hexCoords
@@ -372,12 +370,3 @@ class HexMapGridEditor : GridContainer(), LogInterface {
         return node
     }
 }
-
-@Serializable
-data class EditorData(
-    var row: Int,
-    var column: Int,
-    var location: Location,
-    @Serializable(with = GDVectorSerializer::class) val position: Vector2,
-    var unlockedAtStart: Boolean = false
-)
diff --git a/src/main/kuiper/screens/gameSetup/GameSetup.kt b/src/main/kuiper/screens/gameSetup/GameSetup.kt
index 5d31a9a..da46daa 100644
--- a/src/main/kuiper/screens/gameSetup/GameSetup.kt
+++ b/src/main/kuiper/screens/gameSetup/GameSetup.kt
@@ -2,7 +2,6 @@ package screens.gameSetup
 
 import LogInterface
 import SignalBus
-import actions.ResourceType
 import godot.annotation.RegisterClass
 import godot.annotation.RegisterFunction
 import godot.annotation.RegisterSignal
@@ -12,7 +11,9 @@ import godot.core.signal0
 import godot.core.signal1
 import godot.extension.getNodeAs
 import loaders.DataLoader
-import state.*
+import state.GameState
+import state.Sponsor
+import state.Zone
 import technology.Technology
 
 @RegisterClass
@@ -148,7 +149,12 @@ class GameSetup : Node(), LogInterface {
         )
         zoneList[0].apply {
             description = "Your home zone, where your headquarters is located. HQ can be moved in the future."
-            locations.add(Location("${sponsor.name} HQ", true))
+            sponsor.hexGrid.forEach { row ->
+                row.forEach { data ->
+                    hexes.add(data)
+                }
+            }
+            /*locations.add(Location("${sponsor.name} HQ", true))
             locations[0].apply {
                 val hq = Building.HQ()
                 hq.sciencesProduced.putAll(sponsor.baseScienceRate)
@@ -158,7 +164,7 @@ class GameSetup : Node(), LogInterface {
             }
             for (i in 1..9) {
                 locations.add(Location("Location $i"))
-            }
+            }*/
         }
         return zoneList
     }
diff --git a/src/main/kuiper/state/Company.kt b/src/main/kuiper/state/Company.kt
index 98c4252..a61c9fa 100644
--- a/src/main/kuiper/state/Company.kt
+++ b/src/main/kuiper/state/Company.kt
@@ -177,28 +177,30 @@ class Company(var name: String) : LogInterface {
     fun doResearch(): List<Notification> {
         val notifications: MutableList<Notification> = mutableListOf()
         sciences.forEach { science ->
-            if (science.value == 0.0f) {
-                logWarning("Science doesn't have value: $science")
-                notifications.add(
-                    Notification.NoScienceWarning(
-                        science.key, "There are no ${science.key.displayName} points available to spend this turn"
+            if (science.key != Science.EUREKA) {
+                if (science.value == 0.0f) {
+                    logWarning("Science doesn't have value: $science")
+                    notifications.add(
+                        Notification.NoScienceWarning(
+                            science.key, "There are no ${science.key.displayName} points available to spend this turn"
+                        )
                     )
-                )
-            }
-            technologies.filter { it.status == TechStatus.UNLOCKED }.shuffled().forEach { technology ->
-                // only research techs that have all their requirements met
-                if (getRequiredTechsFor(technology).all { it.status == TechStatus.RESEARCHED }) {
-                    val cost = technology.researchProgress[science.key]?.cost ?: 0
-                    val currentProgress = technology.researchProgress[science.key]?.progress ?: 0
-                    val remaining = cost - currentProgress
-                    val toSpend = sciences[science.key] ?: 0.0f
-                    if (toSpend > 0.0f) {
-                        if (toSpend >= remaining) {
-                            technology.addProgress(science.key, remaining)
-                            sciences[science.key] = toSpend - remaining
-                        } else {
-                            technology.addProgress(science.key, toSpend.toInt())
-                            sciences[science.key] = 0.0f
+                }
+                technologies.filter { it.status == TechStatus.UNLOCKED }.shuffled().forEach { technology ->
+                    // only research techs that have all their requirements met
+                    if (getRequiredTechsFor(technology).all { it.status == TechStatus.RESEARCHED }) {
+                        val cost = technology.researchProgress[science.key]?.cost ?: 0
+                        val currentProgress = technology.researchProgress[science.key]?.progress ?: 0
+                        val remaining = cost - currentProgress
+                        val toSpend = sciences[science.key] ?: 0.0f
+                        if (toSpend > 0.0f) {
+                            if (toSpend >= remaining) {
+                                technology.addProgress(science.key, remaining)
+                                sciences[science.key] = toSpend - remaining
+                            } else {
+                                technology.addProgress(science.key, toSpend.toInt())
+                                sciences[science.key] = 0.0f
+                            }
                         }
                     }
                 }
@@ -282,8 +284,8 @@ class Company(var name: String) : LogInterface {
         val notifications: MutableList<Notification> = mutableListOf()
         log("Processing buildings:")
         zones.forEach { zone ->
-            zone.locations.forEach { loc ->
-                loc.buildings.forEach { building ->
+            zone.hexes.forEach { hexData ->
+                hexData.location.buildings.forEach { building ->
                     when (building.key) {
                         is Building.HQ -> {
                             val hq = building.key as Building.HQ
@@ -335,8 +337,8 @@ class Company(var name: String) : LogInterface {
             }
         }
         zones.forEach { zone ->
-            zone.locations.forEach { loc ->
-                loc.buildings.forEach { building ->
+            zone.hexes.forEach { hexData ->
+                hexData.location.buildings.forEach { building ->
                     building.key.runningCosts.filter { it.key == resourceType }.forEach { cost ->
                         sBuilder.append("[color=red]-")
                         sBuilder.append(cost.value)
diff --git a/src/main/kuiper/state/Sponsor.kt b/src/main/kuiper/state/Sponsor.kt
index 0d0b3c8..58f6630 100644
--- a/src/main/kuiper/state/Sponsor.kt
+++ b/src/main/kuiper/state/Sponsor.kt
@@ -2,7 +2,7 @@ package state
 
 import actions.ResourceType
 import godot.core.Color
-import hexgrid.map.editor.EditorData
+import hexgrid.map.editor.HexData
 import kotlinx.serialization.Serializable
 import serializers.GDColorSerializer
 import technology.Science
@@ -15,7 +15,7 @@ data class Sponsor(
     val baseScienceRate: Map<Science, Float>,
     val startingTechs: List<Int> = emptyList(),
     val hexDimensions: Pair<Int, Int> = Pair(1, 1),
-    val hexGrid: Array<Array<EditorData>> = emptyArray()
+    val hexGrid: Array<Array<HexData>> = emptyArray()
 ) {
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
diff --git a/src/main/kuiper/state/Zone.kt b/src/main/kuiper/state/Zone.kt
index b14667c..430493c 100644
--- a/src/main/kuiper/state/Zone.kt
+++ b/src/main/kuiper/state/Zone.kt
@@ -1,5 +1,6 @@
 package state
 
+import hexgrid.map.editor.HexData
 import kotlinx.serialization.Serializable
 
 /**
@@ -14,5 +15,5 @@ class Zone(val id: Int, val name: String, var active: Boolean = false) {
     // I am not sure that I want this to be a flat list, but it will do for now
     // Locations ideally would appear placed on an actual world map, with relationships between them
     // But for now, we will just have a list of locations
-    val locations = mutableListOf<Location>()
+    val hexes: MutableList<HexData> = mutableListOf()
 }

From f8445d6b07656990a9287612c153ee7fb63638e0 Mon Sep 17 00:00:00 2001
From: Liam <liamjdavison@gmail.com>
Date: Sat, 29 Mar 2025 06:36:57 +0000
Subject: [PATCH 12/14] Turns out my approach with SignalBus is incompatible
 with scene switching. Bugger.

---
 gdj/screens/Kuiper/escMenu/EscMenu.gdj        |   2 +-
 .../Kuiper/pullDownPanel/PullDownPanel.gdj    |   3 +-
 .../kuiper/actions/AvailableActionsFan.kt     |  48 +-
 src/main/kuiper/science/ResourcePanel.kt      |  36 +-
 src/main/kuiper/science/SciencePanel.kt       |  34 +-
 src/main/kuiper/science/resource_panel.tscn   |   5 +-
 src/main/kuiper/science/science_panel.tscn    |   6 +-
 .../kuiper/screens/gameSetup/GameSetup.kt     |  14 +-
 src/main/kuiper/screens/kuiper/KuiperGame.kt  | 412 +++++++++---------
 .../kuiper/screens/kuiper/escMenu/EscMenu.kt  |  15 +-
 .../screens/kuiper/escMenu/esc_menu.tscn      |   4 +-
 src/main/kuiper/screens/kuiper/game.tscn      |   2 +-
 .../kuiper/pullDownPanel/PullDownPanel.kt     |  38 +-
 .../kuiper/pullDownPanel/pulldown_panel.tscn  |   3 +-
 src/main/kuiper/state/GameState.kt            |   9 +
 15 files changed, 337 insertions(+), 294 deletions(-)

diff --git a/gdj/screens/Kuiper/escMenu/EscMenu.gdj b/gdj/screens/Kuiper/escMenu/EscMenu.gdj
index 8e858c3..a5023ca 100644
--- a/gdj/screens/Kuiper/escMenu/EscMenu.gdj
+++ b/gdj/screens/Kuiper/escMenu/EscMenu.gdj
@@ -27,6 +27,6 @@ properties = [
 functions = [
     _on_resume,
 	_on_quit,
-	_on_return_to_main_menu,
+	on_return_to_main_menu,
 	_on_save
 ]
\ No newline at end of file
diff --git a/gdj/screens/Kuiper/pullDownPanel/PullDownPanel.gdj b/gdj/screens/Kuiper/pullDownPanel/PullDownPanel.gdj
index 1699590..793d4ac 100644
--- a/gdj/screens/Kuiper/pullDownPanel/PullDownPanel.gdj
+++ b/gdj/screens/Kuiper/pullDownPanel/PullDownPanel.gdj
@@ -20,12 +20,11 @@ signals = [
 ]
 properties = [
     panel_i_d,
-	contents,
 	key
 ]
 functions = [
     _ready,
-	_recalculate_pulldown_dimensions,
+	recalculate_pulldown_dimensions,
 	_input,
 	_on_handle_gui_input,
 	_process
diff --git a/src/main/kuiper/actions/AvailableActionsFan.kt b/src/main/kuiper/actions/AvailableActionsFan.kt
index ab02e63..5c84c5e 100644
--- a/src/main/kuiper/actions/AvailableActionsFan.kt
+++ b/src/main/kuiper/actions/AvailableActionsFan.kt
@@ -70,32 +70,19 @@ class AvailableActionsFan : Node2D() {
         }
         signalBus.confirmAction.connect { _, actionWrapper ->
             actionWrapper.action?.let { action ->
-                removeCard(action.id)
+                removeCardAndPause(action)
             }
-            // when an action is confirmed, the mouse click immediately activates the card under the mouse
-            // I don't want this to happen, so I'm adding a delay to re-enable the cards after a short time
-            delayTimer.start()
-            delayTimer.timeout.connect {
-                actionCards.forEach { (_, card) -> card.enableProcessing() }
-            }
-
         }
         signalBus.cancelActionConfirmation.connect {
-            delayTimer.start()
-            delayTimer.timeout.connect {
-                actionCards.forEach { (_, card) -> card.enableProcessing() }
-            }
+            cancelActionAndPause()
         }
         signalBus.showActionConfirmation.connect { _, c ->
-            // disable all the other cards to stop double-emit when confirming/cancelling action
-            actionCards.forEach { (_, card) ->
-                if (card != c) {
-                    card.disableProcessing()
-                }
-            }
+
+            disableCards(c)
         }
     }
 
+
     @RegisterFunction
     override fun _process(delta: Double) {
     }
@@ -266,4 +253,29 @@ class AvailableActionsFan : Node2D() {
             GD.printErr("Tried to remove card $id, but it was not found")
         }
     }
+
+    private fun removeCardAndPause(action: Action) {
+        removeCard(action.id)
+        // when an action is confirmed, the mouse click immediately activates the card under the mouse
+        // I don't want this to happen, so I'm adding a delay to re-enable the cards after a short time
+        cancelActionAndPause()
+    }
+
+    private fun cancelActionAndPause() {
+        delayTimer.start()
+        delayTimer.timeout.connect {
+            actionCards.forEach { (_, card) -> card.enableProcessing() }
+        }
+    }
+
+    /**
+     * Disable all the other cards to stop double-emit when confirming/cancelling action
+     */
+    private fun disableCards(c: ActionCard) {
+        actionCards.forEach { (_, card) ->
+            if (card != c) {
+                card.disableProcessing()
+            }
+        }
+    }
 }
diff --git a/src/main/kuiper/science/ResourcePanel.kt b/src/main/kuiper/science/ResourcePanel.kt
index fcde142..2c08862 100644
--- a/src/main/kuiper/science/ResourcePanel.kt
+++ b/src/main/kuiper/science/ResourcePanel.kt
@@ -38,22 +38,7 @@ class ResourcePanel : Control() {
         pulldownControl = getNodeAs("%PulldownPanel")!!
 
         signalBus.updateResource.connect { resourceName, value ->
-            resourceType = ResourceType.valueOf(resourceName.uppercase())
-            iconRow.getNodeAs<ResourceDisplay>(resourceType.name)?.apply {
-                updateValue(value)
-                val summary = gameState.company.getCostsPerTurnSummary(resourceType)
-                panelContents.getNodeAs<RichTextLabel>("${resourceType}_summary")?.apply {
-                    val headline =
-                        "[img=25]${resourceType.spritePath}[/img] [b]${resourceType.displayName}:[/b] %.2f".format(value)
-                    text = if (summary.isNotEmpty()) {
-                        "$headline\n\t$summary"
-                    } else {
-                        headline
-                    }
-                    setFitContent(true)
-                }
-            }
-            signalBus.recalcPulldownPanelSignal.emit(panelContents)
+            updateResource(resourceName, value)
         }
     }
 
@@ -73,4 +58,23 @@ class ResourcePanel : Control() {
         panelContents.addChild(label)
         panelContents.resetSize()
     }
+
+    private fun updateResource(resourceName: String, value: Float) {
+        resourceType = ResourceType.valueOf(resourceName.uppercase())
+        iconRow.getNodeAs<ResourceDisplay>(resourceType.name)?.apply {
+            updateValue(value)
+            val summary = gameState.company.getCostsPerTurnSummary(resourceType)
+            panelContents.getNodeAs<RichTextLabel>("${resourceType}_summary")?.apply {
+                val headline =
+                    "[img=25]${resourceType.spritePath}[/img] [b]${resourceType.displayName}:[/b] %.2f".format(value)
+                text = if (summary.isNotEmpty()) {
+                    "$headline\n\t$summary"
+                } else {
+                    headline
+                }
+                setFitContent(true)
+            }
+        }
+        signalBus.recalcPulldownPanelSignal.emit(panelContents)
+    }
 }
diff --git a/src/main/kuiper/science/SciencePanel.kt b/src/main/kuiper/science/SciencePanel.kt
index f25ff3c..b42dd55 100644
--- a/src/main/kuiper/science/SciencePanel.kt
+++ b/src/main/kuiper/science/SciencePanel.kt
@@ -10,6 +10,7 @@ import godot.api.VBoxContainer
 import godot.core.Vector2
 import godot.core.connect
 import godot.extension.getNodeAs
+import godot.global.GD
 import screens.kuiper.pullDownPanel.PullDownPanel
 import technology.Science
 
@@ -35,14 +36,8 @@ class SciencePanel : Control() {
         pulldownControl = getNodeAs("%PulldownPanel")!!
 
         signalBus.updateScience.connect { scienceName, value ->
-            if (scienceName != "EUREKA") {
-                science = Science.valueOf(scienceName.uppercase())
-                iconRow.getNodeAs<ResourceDisplay>(science.name)?.apply {
-                    updateValue(value)
-                    panelContents.getNodeAs<RichTextLabel>("${science}_summary")?.apply {
-                        text = "[img=25]${science.spritePath}[/img] [b]${science.displayName}:[/b] %.2f".format(value)
-                    }
-                }
+            if (GD.isInstanceValid(this)) {
+                updateScience(scienceName, value)
             }
         }
     }
@@ -62,8 +57,27 @@ class SciencePanel : Control() {
         }
         panelContents.addChild(label)
         panelContents.resetSize()
-        // I need to get the sliding panel which contains this to recalculate its dimensions
-        signalBus.recalcPulldownPanelSignal.emit(panelContents)
     }
 
+    private fun updateScience(scienceName: String, value: Float) {
+        GD.print("Update science: $scienceName, value: $value")
+        if (scienceName != "EUREKA") {
+            science = Science.valueOf(scienceName.uppercase())
+            GD.isInstanceValid(iconRow)
+            GD.print("Icon row is valid: ${GD.isInstanceValid(iconRow)}")
+            GD.print("Looking science node ${science.name} in iconRow")
+            GD.print("Icon row has ${iconRow.getChildCount()} children")
+            iconRow.getChildren().forEach {
+                GD.print("\t${it.name}}")
+            }
+            iconRow.getNodeAs<ResourceDisplay>(science.name)?.apply {
+                updateValue(value)
+                panelContents.getNodeAs<RichTextLabel>("${science}_summary")?.apply {
+                    text = "[img=25]${science.spritePath}[/img] [b]${science.displayName}:[/b] %.2f".format(value)
+                    setFitContent(true)
+                }
+            }
+            signalBus.recalcPulldownPanelSignal.emit(panelContents)
+        }
+    }
 }
diff --git a/src/main/kuiper/science/resource_panel.tscn b/src/main/kuiper/science/resource_panel.tscn
index cd85d97..cd5217b 100644
--- a/src/main/kuiper/science/resource_panel.tscn
+++ b/src/main/kuiper/science/resource_panel.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=7 format=3 uid="uid://cun43pt1qmvtt"]
 
-[ext_resource type="Script" path="res://src/main/kuiper/science/ResourcePanel.kt" id="1_0lmnj"]
+[ext_resource type="Script" uid="uid://blx0i4062kqti" path="res://src/main/kuiper/science/ResourcePanel.kt" id="1_0lmnj"]
 [ext_resource type="PackedScene" uid="uid://dxi8kllwh6e0g" path="res://src/main/kuiper/science/resource_icon_display.tscn" id="2_uaj2p"]
 [ext_resource type="Texture2D" uid="uid://dmw5pkdm32rr3" path="res://assets/textures/icons/icon-influence-128x128.png" id="3_pfj0i"]
 [ext_resource type="Texture2D" uid="uid://38j6d388tase" path="res://assets/textures/icons/icon-coins-128x128.png" id="4_3avvt"]
@@ -46,7 +46,7 @@ resource_name = "CONSTRUCTION_MATERIALS"
 icon = ExtResource("4_cebon")
 is_science = false
 
-[node name="PulldownPanel" parent="." node_paths=PackedStringArray("contents") instance=ExtResource("9_tt8ur")]
+[node name="PulldownPanel" parent="." instance=ExtResource("9_tt8ur")]
 unique_name_in_owner = true
 custom_minimum_size = Vector2(400, 50)
 layout_mode = 2
@@ -55,7 +55,6 @@ offset_top = 40.0
 offset_right = 450.0
 offset_bottom = 90.0
 panel_i_d = "resources"
-contents = NodePath("PanelContents")
 key = 161
 
 [node name="PanelContents" type="VBoxContainer" parent="PulldownPanel"]
diff --git a/src/main/kuiper/science/science_panel.tscn b/src/main/kuiper/science/science_panel.tscn
index fc87708..031010a 100644
--- a/src/main/kuiper/science/science_panel.tscn
+++ b/src/main/kuiper/science/science_panel.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=10 format=3 uid="uid://q3iu1ngkr0tt"]
 
-[ext_resource type="Script" path="res://src/main/kuiper/science/SciencePanel.kt" id="1_p2emv"]
+[ext_resource type="Script" uid="uid://doatfj26cj70g" path="res://src/main/kuiper/science/SciencePanel.kt" id="1_p2emv"]
 [ext_resource type="PackedScene" uid="uid://dxi8kllwh6e0g" path="res://src/main/kuiper/science/resource_icon_display.tscn" id="1_u8rou"]
 [ext_resource type="Texture2D" uid="uid://dsrevsf2xlgb2" path="res://assets/textures/icons/icon-physics-128x128.png" id="2_h50u5"]
 [ext_resource type="Texture2D" uid="uid://5rdv2depis0x" path="res://assets/textures/icons/icon-astronomy-128x128.png" id="3_r4ej6"]
@@ -66,7 +66,7 @@ resource_name = "ENGINEERING"
 icon = ExtResource("7_l1ej6")
 value = 1.0
 
-[node name="PulldownPanel" parent="." node_paths=PackedStringArray("contents") instance=ExtResource("8_gn57i")]
+[node name="PulldownPanel" parent="." instance=ExtResource("8_gn57i")]
 unique_name_in_owner = true
 custom_minimum_size = Vector2(400, 50)
 layout_mode = 2
@@ -75,7 +75,7 @@ offset_top = 40.0
 offset_right = 450.0
 offset_bottom = 90.0
 panel_i_d = "sciences"
-contents = NodePath("PanelContents")
+key = 162
 
 [node name="PanelContents" type="VBoxContainer" parent="PulldownPanel"]
 unique_name_in_owner = true
diff --git a/src/main/kuiper/screens/gameSetup/GameSetup.kt b/src/main/kuiper/screens/gameSetup/GameSetup.kt
index da46daa..b2b1391 100644
--- a/src/main/kuiper/screens/gameSetup/GameSetup.kt
+++ b/src/main/kuiper/screens/gameSetup/GameSetup.kt
@@ -2,6 +2,7 @@ package screens.gameSetup
 
 import LogInterface
 import SignalBus
+import actions.ResourceType
 import godot.annotation.RegisterClass
 import godot.annotation.RegisterFunction
 import godot.annotation.RegisterSignal
@@ -10,7 +11,9 @@ import godot.core.asCachedStringName
 import godot.core.signal0
 import godot.core.signal1
 import godot.extension.getNodeAs
+import godot.global.GD
 import loaders.DataLoader
+import state.Building
 import state.GameState
 import state.Sponsor
 import state.Zone
@@ -154,17 +157,16 @@ class GameSetup : Node(), LogInterface {
                     hexes.add(data)
                 }
             }
-            /*locations.add(Location("${sponsor.name} HQ", true))
-            locations[0].apply {
+            // in the sponsor.hexGrid array, find the first element where the location.isUnlockedAtStart is true
+            val hqLocation = sponsor.hexGrid.flatten().firstOrNull { it.unlockedAtStart }
+            if (hqLocation != null) {
                 val hq = Building.HQ()
                 hq.sciencesProduced.putAll(sponsor.baseScienceRate)
                 hq.resourceGeneration[ResourceType.INFLUENCE] = 1
                 hq.resourceGeneration[ResourceType.GOLD] = 25
-                addBuilding(hq, intArrayOf(0), true)
+                val sector = GD.randiRange(0, 5)
+                hqLocation.location.addBuilding(hq, intArrayOf(sector), true)
             }
-            for (i in 1..9) {
-                locations.add(Location("Location $i"))
-            }*/
         }
         return zoneList
     }
diff --git a/src/main/kuiper/screens/kuiper/KuiperGame.kt b/src/main/kuiper/screens/kuiper/KuiperGame.kt
index 2cea56c..fae45d6 100644
--- a/src/main/kuiper/screens/kuiper/KuiperGame.kt
+++ b/src/main/kuiper/screens/kuiper/KuiperGame.kt
@@ -23,210 +23,210 @@ import kotlin.properties.Delegates
 @RegisterClass
 class KuiperGame : PanelContainer(), LogInterface {
 
-	@RegisterProperty
-	@Export
-	override var logEnabled: Boolean = true
-
-	// Global state
-	private lateinit var gameState: GameState
-	private lateinit var signalBus: SignalBus
-
-	// Signals - signals need to be valid Variant types https://docs.godotengine.org/en/stable/contributing/development/core_and_modules/variant_class.html
-	@RegisterSignal
-	val endTurnSignal: Signal0 by signal0()
-
-	@RegisterSignal
-	val escMenuSignal: Signal0 by signal0()
-
-	@RegisterSignal("card_id")
-	val cardAdded by signal1<Int>()
-
-	@RegisterSignal("width", "height")
-	val screenResized by signal2<Int, Int>()
-
-	@RegisterProperty
-	@Export
-	var groupCardsEnabled: Boolean = true
-
-	// UI flags/states
-	// Esc menu visibility trigger
-	var escMenuVisible by Delegates.observable(false) { _, _, newValue ->
-		getNodeAs<Control>("%EscMenu")?.visible = newValue
-	}
-
-	// UI elements
-	private lateinit var yearLbl: Label
-	private lateinit var zoneTabBar: TabBar
-	private lateinit var companyNameHeader: Label
-	private lateinit var sciencePanel: SciencePanel
-	private lateinit var resourcePanel: ResourcePanel
-	private lateinit var confirmAction: ConfirmAction
-	private lateinit var cardDeck: CardDeck
-	private lateinit var activeActionsFan: ActiveActionsFan
-	private lateinit var techTree: TechTree
-
-	// Called when the node enters the scene tree for the first time.
-	@RegisterFunction
-	override fun _ready() {
-		gameState = getNodeAs("/root/GameState")!!
-		signalBus = getNodeAs("/root/SignalBus")!!
-
-		// Get UI elements
-		yearLbl = getNodeAs("%Year_lbl")!!
-		zoneTabBar = getNodeAs("%EraTabBar")!!
-		companyNameHeader = getNodeAs("%ProjectKuiperHeading")!!
-		companyNameHeader.text = "Project Kuiper - ${gameState.company.name}"
-		sciencePanel = getNodeAs("%SciencePanel")!!
-		resourcePanel = getNodeAs("%ResourcePanel")!!
-		confirmAction = getNodeAs("%ConfirmActionScene")!!
-		confirmAction.cancelAction()
-		cardDeck = getNodeAs("%CardDeck")!!
-		activeActionsFan = getNodeAs("%ActiveActionsFan")!!
-		techTree = getNodeAs("%TechTree")!!
-
-		// populate pulldown panels and resource displays
-		populateZoneTabBar()
-		populateResourcePanel()
-		populateSciencePanel()
-		populateTechTree()
-
-		// create cards from actions
-		gameState.availableActions.forEach {
-			cardAdded.emit(it.id)
-		}
-
-		signalBus.showActionConfirmation.connect { hex, card ->
-			confirmAction.hex = hex
-			confirmAction.card = card
-			confirmAction.fadeIn()
-			getTree()?.getNodesInGroup("HexGrid".asStringName())
-				?.forEach { node -> node.setProcessMode(ProcessMode.PROCESS_MODE_DISABLED) }
-		}
-
-		signalBus.cancelActionConfirmation.connect {
-			getTree()?.getNodesInGroup("HexGrid".asStringName())
-				?.forEach { node -> node.setProcessMode(ProcessMode.PROCESS_MODE_INHERIT) }
-
-		}
-
-		// finally, update the UI
-		updateUIOnTurn()
-	}
-
-
-	// Called every frame. 'delta' is the elapsed time since the previous frame.
-	@RegisterFunction
-	override fun _process(delta: Double) {
-	}
-
-	@RegisterFunction
-	fun updateUIOnTurn() {
-		gameState.company.sciences.forEach { (science, rate) ->
-			signalBus.updateScience.emit(science.name, rate)
-		}
-		gameState.company.activeActions.forEach { action ->
-			signalBus.updateOngoingAction.emit(action.id, action.turnsRemaining)
-		}
-		gameState.company.resources.forEach { resource ->
-			signalBus.updateResource.emit(
-				resource.key.name, resource.value.toFloat()
-			)
-		}
-		yearLbl.text = "Year: ${gameState.year}"
-	}
-
-	@RegisterFunction
-	override fun _input(event: InputEvent?) {
-		if (event != null) {
-			if (event.isActionPressed("ui_cancel".asCachedStringName())) {
-				on_escape_menu()
-			}
-			if (event.isActionPressed("game_save".asCachedStringName())) {
-				on_esc_save_game()
-			}
-			if (event.isActionPressed("show_tech_tree".asCachedStringName())) {
-				toggleTechTree()
-			}
-			if (event.isActionPressed("end_turn".asCachedStringName())) {
-				on_end_turn()
-			}
-		}
-	}
-
-	@RegisterFunction
-	fun on_escape_menu() {
-		hideEscapeMenu()
-	}
-
-	@RegisterFunction
-	fun on_end_turn() {
-		gameState.nextTurn()
-		updateUIOnTurn()
-	}
-
-	@RegisterFunction
-	fun on_esc_save_game() {
-		GD.print(gameState.stateToString())
-		escMenuVisible = false
-		gameState.save()
-	}
-
-	/**
-	 * Toggle the processing mode of the given group name, between DISABLED and INHERIT
-	 * This has the effect of disabling processing (input, etc.) of all nodes and their children in the group.
-	 * Or re-enabling processing.
-	 */
-	private fun toggleGroupProcessing(groupName: StringName, enabled: Boolean) {
-		getTree()?.getNodesInGroup(groupName)?.forEach { node ->
-			if (enabled) {
-				node.processMode = ProcessMode.PROCESS_MODE_INHERIT
-			} else {
-				node.processMode = ProcessMode.PROCESS_MODE_DISABLED
-			}
-		}
-	}
-
-	/**
-	 * Show or hide the tech tree, (dis)abling all nodes in the Cards group if visible
-	 */
-	private fun toggleTechTree() {
-		techTree.visible = !techTree.visible
-		if (techTree.visible) {
-			toggleGroupProcessing("Cards".asCachedStringName(), false)
-		} else {
-			toggleGroupProcessing("Cards".asCachedStringName(), true)
-		}
-	}
-
-	private fun populateZoneTabBar() {
-		gameState.company.zones.forEachIndexed { index, zone ->
-			zoneTabBar.addTab(zone.name)
-			zoneTabBar.setTabDisabled(index, !zone.active)
-			if (!zone.active) {
-				zoneTabBar.setTabTooltip(index, zone.description)
-			}
-		}
-	}
-
-	private fun populateSciencePanel() {
-		gameState.company.sciences.forEach { (science, rate) ->
-			if (science != Science.EUREKA) {
-				sciencePanel.addScience(science, rate)
-			}
-		}
-	}
-
-	private fun populateResourcePanel() {
-		gameState.company.resources.forEach { (type, value) ->
-			resourcePanel.addResource(type, value)
-		}
-	}
-
-	private fun populateTechTree() {
-		techTree.setTechnologyTree(gameState.company.technologies)
-	}
-
-	private fun hideEscapeMenu() {
-		escMenuVisible = !escMenuVisible
-	}
+    @RegisterProperty
+    @Export
+    override var logEnabled: Boolean = true
+
+    // Global state
+    private lateinit var gameState: GameState
+    private lateinit var signalBus: SignalBus
+
+    // Signals - signals need to be valid Variant types https://docs.godotengine.org/en/stable/contributing/development/core_and_modules/variant_class.html
+    @RegisterSignal
+    val endTurnSignal: Signal0 by signal0()
+
+    @RegisterSignal
+    val escMenuSignal: Signal0 by signal0()
+
+    @RegisterSignal("card_id")
+    val cardAdded by signal1<Int>()
+
+    @RegisterSignal("width", "height")
+    val screenResized by signal2<Int, Int>()
+
+    @RegisterProperty
+    @Export
+    var groupCardsEnabled: Boolean = true
+
+    // UI flags/states
+    // Esc menu visibility trigger
+    private var escMenuVisible by Delegates.observable(false) { _, _, newValue ->
+        getNodeAs<Control>("%EscMenu")?.visible = newValue
+    }
+
+    // UI elements
+    private lateinit var yearLbl: Label
+    private lateinit var zoneTabBar: TabBar
+    private lateinit var companyNameHeader: Label
+    private lateinit var sciencePanel: SciencePanel
+    private lateinit var resourcePanel: ResourcePanel
+    private lateinit var confirmAction: ConfirmAction
+    private lateinit var cardDeck: CardDeck
+    private lateinit var activeActionsFan: ActiveActionsFan
+    private lateinit var techTree: TechTree
+
+    // Called when the node enters the scene tree for the first time.
+    @RegisterFunction
+    override fun _ready() {
+        gameState = getNodeAs("/root/GameState")!!
+        signalBus = getNodeAs("/root/SignalBus")!!
+
+        // Get UI elements
+        yearLbl = getNodeAs("%Year_lbl")!!
+        zoneTabBar = getNodeAs("%EraTabBar")!!
+        companyNameHeader = getNodeAs("%ProjectKuiperHeading")!!
+        companyNameHeader.text = "Project Kuiper - ${gameState.company.name}"
+        sciencePanel = getNodeAs("%SciencePanel")!!
+        resourcePanel = getNodeAs("%ResourcePanel")!!
+        confirmAction = getNodeAs("%ConfirmActionScene")!!
+        confirmAction.cancelAction()
+        cardDeck = getNodeAs("%CardDeck")!!
+        activeActionsFan = getNodeAs("%ActiveActionsFan")!!
+        techTree = getNodeAs("%TechTree")!!
+
+        // populate pulldown panels and resource displays
+        populateZoneTabBar()
+        populateResourcePanel()
+        populateSciencePanel()
+        populateTechTree()
+
+        // create cards from actions
+        gameState.availableActions.forEach {
+            cardAdded.emit(it.id)
+        }
+
+        signalBus.showActionConfirmation.connect { hex, card ->
+            confirmAction.hex = hex
+            confirmAction.card = card
+            confirmAction.fadeIn()
+            getTree()?.getNodesInGroup("HexGrid".asStringName())
+                ?.forEach { node -> node.setProcessMode(ProcessMode.PROCESS_MODE_DISABLED) }
+        }
+
+        signalBus.cancelActionConfirmation.connect {
+            getTree()?.getNodesInGroup("HexGrid".asStringName())
+                ?.forEach { node -> node.setProcessMode(ProcessMode.PROCESS_MODE_INHERIT) }
+
+        }
+
+        // finally, update the UI
+        updateUIOnTurn()
+    }
+
+
+    // Called every frame. 'delta' is the elapsed time since the previous frame.
+    @RegisterFunction
+    override fun _process(delta: Double) {
+    }
+
+    @RegisterFunction
+    fun updateUIOnTurn() {
+        gameState.company.sciences.forEach { (science, rate) ->
+            signalBus.updateScience.emit(science.name, rate)
+        }
+        gameState.company.activeActions.forEach { action ->
+            signalBus.updateOngoingAction.emit(action.id, action.turnsRemaining)
+        }
+        gameState.company.resources.forEach { resource ->
+            signalBus.updateResource.emit(
+                resource.key.name, resource.value.toFloat()
+            )
+        }
+        yearLbl.text = "Year: ${gameState.year}"
+    }
+
+    @RegisterFunction
+    override fun _input(event: InputEvent?) {
+        if (event != null) {
+            if (event.isActionPressed("ui_cancel".asCachedStringName())) {
+                on_escape_menu()
+            }
+            if (event.isActionPressed("game_save".asCachedStringName())) {
+                on_esc_save_game()
+            }
+            if (event.isActionPressed("show_tech_tree".asCachedStringName())) {
+                toggleTechTree()
+            }
+            if (event.isActionPressed("end_turn".asCachedStringName())) {
+                on_end_turn()
+            }
+        }
+    }
+
+    @RegisterFunction
+    fun on_escape_menu() {
+        hideEscapeMenu()
+    }
+
+    @RegisterFunction
+    fun on_end_turn() {
+        gameState.nextTurn()
+        updateUIOnTurn()
+    }
+
+    @RegisterFunction
+    fun on_esc_save_game() {
+        GD.print(gameState.stateToString())
+        escMenuVisible = false
+        gameState.save()
+    }
+
+    /**
+     * Toggle the processing mode of the given group name, between DISABLED and INHERIT
+     * This has the effect of disabling processing (input, etc.) of all nodes and their children in the group.
+     * Or re-enabling processing.
+     */
+    private fun toggleGroupProcessing(groupName: StringName, enabled: Boolean) {
+        getTree()?.getNodesInGroup(groupName)?.forEach { node ->
+            if (enabled) {
+                node.processMode = ProcessMode.PROCESS_MODE_INHERIT
+            } else {
+                node.processMode = ProcessMode.PROCESS_MODE_DISABLED
+            }
+        }
+    }
+
+    /**
+     * Show or hide the tech tree, (dis)abling all nodes in the Cards group if visible
+     */
+    private fun toggleTechTree() {
+        techTree.visible = !techTree.visible
+        if (techTree.visible) {
+            toggleGroupProcessing("Cards".asCachedStringName(), false)
+        } else {
+            toggleGroupProcessing("Cards".asCachedStringName(), true)
+        }
+    }
+
+    private fun populateZoneTabBar() {
+        gameState.company.zones.forEachIndexed { index, zone ->
+            zoneTabBar.addTab(zone.name)
+            zoneTabBar.setTabDisabled(index, !zone.active)
+            if (!zone.active) {
+                zoneTabBar.setTabTooltip(index, zone.description)
+            }
+        }
+    }
+
+    private fun populateSciencePanel() {
+        gameState.company.sciences.forEach { (science, rate) ->
+            if (science != Science.EUREKA) {
+                sciencePanel.addScience(science, rate)
+            }
+        }
+    }
+
+    private fun populateResourcePanel() {
+        gameState.company.resources.forEach { (type, value) ->
+            resourcePanel.addResource(type, value)
+        }
+    }
+
+    private fun populateTechTree() {
+        techTree.setTechnologyTree(gameState.company.technologies)
+    }
+
+    private fun hideEscapeMenu() {
+        escMenuVisible = !escMenuVisible
+    }
 }
diff --git a/src/main/kuiper/screens/kuiper/escMenu/EscMenu.kt b/src/main/kuiper/screens/kuiper/escMenu/EscMenu.kt
index 0d69bd7..08279ce 100644
--- a/src/main/kuiper/screens/kuiper/escMenu/EscMenu.kt
+++ b/src/main/kuiper/screens/kuiper/escMenu/EscMenu.kt
@@ -6,18 +6,12 @@ import godot.annotation.RegisterSignal
 import godot.api.Control
 import godot.core.Signal0
 import godot.core.signal0
+import godot.extension.getNodeAs
+import state.GameState
 
 @RegisterClass
 class EscMenu : Control() {
 
-    // Pure UI elements such as buttons have inherent signals that can be connected to, such as pressed()
-    // This will call functions like _on_resume()
-    // Those functions can then emit signals that the parent node can connect to
-    // Through the registered custom signals on this node
-    // The parent node can then connect to these signals and call its own functions
-    // Therefore, I will name all inherit signal responding functions with a "_" prefix
-    // And all custom responding functions without a prefix
-
     @RegisterSignal
     val resumeSignal: Signal0 by signal0()
 
@@ -45,7 +39,10 @@ class EscMenu : Control() {
     }
 
     @RegisterFunction
-    fun _on_return_to_main_menu() {
+    fun onReturnToMainMenu() {
+        // check if there is an unsaved game in progress, or some other such sanity check
+        // is there anything I should be clearing before going to the main menu?
+        getNodeAs<GameState>("/root/GameState")?.reset()
         getTree()?.changeSceneToFile("res://src/main/kuiper/screens/mainMenu/main_menu.tscn")
     }
 
diff --git a/src/main/kuiper/screens/kuiper/escMenu/esc_menu.tscn b/src/main/kuiper/screens/kuiper/escMenu/esc_menu.tscn
index 18ebe31..63f6fff 100644
--- a/src/main/kuiper/screens/kuiper/escMenu/esc_menu.tscn
+++ b/src/main/kuiper/screens/kuiper/escMenu/esc_menu.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://bh0hxtmuthjhi"]
 
-[ext_resource type="Script" path="res://src/main/kuiper/screens/kuiper/escMenu/EscMenu.kt" id="1_eefbu"]
+[ext_resource type="Script" uid="uid://ch24nxa1da21n" path="res://src/main/kuiper/screens/kuiper/escMenu/EscMenu.kt" id="1_eefbu"]
 
 [node name="EscMenu" type="Control"]
 layout_mode = 3
@@ -53,5 +53,5 @@ text = "Quit"
 
 [connection signal="pressed" from="PanelContainer/MarginContainer/VBoxContainer/Resume" to="." method="_on_resume"]
 [connection signal="pressed" from="PanelContainer/MarginContainer/VBoxContainer/Save" to="." method="_on_save"]
-[connection signal="pressed" from="PanelContainer/MarginContainer/VBoxContainer/ExitToMainMenu" to="." method="_on_return_to_main_menu"]
+[connection signal="pressed" from="PanelContainer/MarginContainer/VBoxContainer/ExitToMainMenu" to="." method="on_return_to_main_menu"]
 [connection signal="pressed" from="PanelContainer/MarginContainer/VBoxContainer/Quit" to="." method="_on_quit"]
diff --git a/src/main/kuiper/screens/kuiper/game.tscn b/src/main/kuiper/screens/kuiper/game.tscn
index e5e574b..538e4c7 100644
--- a/src/main/kuiper/screens/kuiper/game.tscn
+++ b/src/main/kuiper/screens/kuiper/game.tscn
@@ -84,7 +84,7 @@ unique_name_in_owner = true
 z_index = 1
 custom_minimum_size = Vector2(0, 0)
 layout_mode = 2
-size_flags_horizontal = 2
+size_flags_horizontal = 3
 
 [node name="Year_lbl" type="Label" parent="AspectRatioContainer/VBoxContainer/TopRow_hbox"]
 unique_name_in_owner = true
diff --git a/src/main/kuiper/screens/kuiper/pullDownPanel/PullDownPanel.kt b/src/main/kuiper/screens/kuiper/pullDownPanel/PullDownPanel.kt
index e2993f6..b143187 100644
--- a/src/main/kuiper/screens/kuiper/pullDownPanel/PullDownPanel.kt
+++ b/src/main/kuiper/screens/kuiper/pullDownPanel/PullDownPanel.kt
@@ -11,6 +11,7 @@ import godot.core.MouseButton
 import godot.core.Vector2
 import godot.core.connect
 import godot.extension.getNodeAs
+import godot.global.GD
 import kotlin.math.roundToInt
 
 @RegisterClass
@@ -26,16 +27,14 @@ class PullDownPanel : Control() {
     /**
      * The contents of the panel, which should be any Control node
      */
-    @Export
-    @RegisterProperty
-    var contents: Control? = null
+    private var contents: Control? = null
 
     /**
      * The key that will expand or shrink the panel
      */
     @Export
     @RegisterProperty
-    var key: Key = Key.KEY_H
+    var key: Key = Key.KEY_NONE
 
     private var isExpanded = false
     private var direction: Int = 0 // -1 for shrinking, 0 for idle, 1 for expanding
@@ -56,7 +55,7 @@ class PullDownPanel : Control() {
     override fun _ready() {
         signalBus = getNodeAs("/root/SignalBus")!!
 
-        pulldownPanel = getNodeAs("VBoxContainer/PanelContainer")!!
+        pulldownPanel = getNodeAs("%PanelContainer")!!
         handle = getNodeAs("%Handle")!!
 
         // the zeroth child is the Panel node on the original scene
@@ -66,30 +65,36 @@ class PullDownPanel : Control() {
         // but if they are, we can calculate the dimensions of the panel
         if (getChildCount() > 1) {
             contents = getChild(1) as Control?
-            _recalculate_pulldown_dimensions(contents!!)
+            recalculatePulldownDimensions()
         }
 
         initialSize = pulldownPanel.size
         minHeight = pulldownPanel.getRect().size.y
         basePosition = pulldownPanel.position
 
-        signalBus.recalcPulldownPanelSignal.connect { _ ->
-            _recalculate_pulldown_dimensions(contents!!)
+        signalBus.recalcPulldownPanelSignal.connect { c ->
+            if (GD.isInstanceValid(c)) {
+                contents = c
+                recalculatePulldownDimensions()
+            }
         }
     }
 
     @RegisterFunction
-    fun _recalculate_pulldown_dimensions(control: Control) {
-        contents = control
-        contents?.let {
-            maxHeight = it.getChildren().sumOf { (it as RichTextLabel).getRect().size.y } + 50
-            maxWidth = if (it.getChildCount() == 0) {
+    fun recalculatePulldownDimensions() {
+        contents?.let { c ->
+            maxHeight = if (c.getChildCount() == 0) {
+                50.0
+            } else {
+                c.getChildren().sumOf { (it as RichTextLabel).getRect().size.y } + 50
+            }
+            maxWidth = if (c.getChildCount() == 0) {
                 50.0
             } else {
-                it.getChildren().maxOf { (it as RichTextLabel).getRect().size.x } + 50
+                c.getChildren().maxOf { (it as RichTextLabel).getRect().size.x } + 50
             }
-            it.setPosition(Vector2(this.position.x, -maxHeight))
-            avgChildHeight = (it.getRect().size.y / it.getChildCount())
+            c.setPosition(Vector2(this.position.x, -maxHeight))
+            avgChildHeight = (c.getRect().size.y / c.getChildCount())
         }
     }
 
@@ -100,6 +105,7 @@ class PullDownPanel : Control() {
     override fun _input(event: InputEvent?) {
         if (event is InputEventKey) {
             if (event.getKeycode() == key && event.pressed) {
+                GD.print("$key pressed; panel $panelID")
                 if (!isExpanded) {
                     direction = 1
                     contents?.visible = true
diff --git a/src/main/kuiper/screens/kuiper/pullDownPanel/pulldown_panel.tscn b/src/main/kuiper/screens/kuiper/pullDownPanel/pulldown_panel.tscn
index 6504599..c31ee45 100644
--- a/src/main/kuiper/screens/kuiper/pullDownPanel/pulldown_panel.tscn
+++ b/src/main/kuiper/screens/kuiper/pullDownPanel/pulldown_panel.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://cun66228bprqh"]
 
-[ext_resource type="Script" path="res://src/main/kuiper/screens/kuiper/pullDownPanel/PullDownPanel.kt" id="1_211j7"]
+[ext_resource type="Script" uid="uid://cuyemqxcjpb1h" path="res://src/main/kuiper/screens/kuiper/pullDownPanel/PullDownPanel.kt" id="1_211j7"]
 
 [node name="PulldownPanel" type="Control"]
 custom_minimum_size = Vector2(200, 50)
@@ -17,6 +17,7 @@ offset_right = 40.0
 offset_bottom = 40.0
 
 [node name="PanelContainer" type="PanelContainer" parent="VBoxContainer"]
+unique_name_in_owner = true
 custom_minimum_size = Vector2(200, 0)
 layout_mode = 2
 
diff --git a/src/main/kuiper/state/GameState.kt b/src/main/kuiper/state/GameState.kt
index f43b4cc..95a1bb9 100644
--- a/src/main/kuiper/state/GameState.kt
+++ b/src/main/kuiper/state/GameState.kt
@@ -82,6 +82,15 @@ class GameState : Node(), LogInterface {
         return "GameState(sponsor=${sponsor?.name}, ${company.name}, ${company.sciences.size} sciences, year=$year)"
     }
 
+    fun reset() {
+        log("GameState: Resetting game state")
+        year = 1980
+        company = Company("Kuiper")
+        sponsor = null
+        availableActions.clear()
+        notifications.clear()
+    }
+
     @Transient
     private val json = Json {
         prettyPrint = true

From d105b6325c35fb2ebba580f5faf8971020af7327 Mon Sep 17 00:00:00 2001
From: Liam <liamjdavison@gmail.com>
Date: Sat, 29 Mar 2025 08:40:41 +0000
Subject: [PATCH 13/14] Deleted the pulldown panels for science and resources.
 I really want them but the implementation was very poor.

---
 gdj/SignalBus.gdj                             |   1 -
 .../Kuiper/pullDownPanel/PullDownPanel.gdj    |  32 ---
 src/main/kuiper/SignalBus.kt                  |   4 -
 .../kuiper/actions/card_rotation_curve.tres   |   2 +-
 src/main/kuiper/science/ResourcePanel.kt      |  20 --
 src/main/kuiper/science/SciencePanel.kt       |  13 --
 src/main/kuiper/science/resource_panel.tscn   |  25 +--
 src/main/kuiper/science/science_panel.tscn    |  24 +-
 .../kuiper/pullDownPanel/PullDownPanel.kt     | 212 ------------------
 .../kuiper/pullDownPanel/pulldown_panel.tscn  |  31 ---
 .../pullDownPanel/pulldown_panel_test.tscn    |  58 -----
 .../kuiper/technology/tree/tech_tree.tscn     |   4 +-
 12 files changed, 7 insertions(+), 419 deletions(-)
 delete mode 100644 gdj/screens/Kuiper/pullDownPanel/PullDownPanel.gdj
 delete mode 100644 src/main/kuiper/screens/kuiper/pullDownPanel/PullDownPanel.kt
 delete mode 100644 src/main/kuiper/screens/kuiper/pullDownPanel/pulldown_panel.tscn
 delete mode 100644 src/main/kuiper/screens/kuiper/pullDownPanel/pulldown_panel_test.tscn

diff --git a/gdj/SignalBus.gdj b/gdj/SignalBus.gdj
index 491fa96..2fe2674 100644
--- a/gdj/SignalBus.gdj
+++ b/gdj/SignalBus.gdj
@@ -17,7 +17,6 @@ signals = [
     on_screen_resized,
 	dragging_card,
 	dropped_card,
-	recalc_pulldown_panel_signal,
 	card_on_hex,
 	card_off_hex,
 	show_action_confirmation,
diff --git a/gdj/screens/Kuiper/pullDownPanel/PullDownPanel.gdj b/gdj/screens/Kuiper/pullDownPanel/PullDownPanel.gdj
deleted file mode 100644
index 1699590..0000000
--- a/gdj/screens/Kuiper/pullDownPanel/PullDownPanel.gdj
+++ /dev/null
@@ -1,32 +0,0 @@
-// THIS FILE IS GENERATED! DO NOT EDIT OR DELETE IT. EDIT OR DELETE THE ASSOCIATED SOURCE CODE FILE INSTEAD
-// Note: You can however freely move this file inside your godot project if you want. Keep in mind however, that if you rename the originating source code file, this file will be deleted and regenerated as a new file instead of being updated! Other modifications to the source file however, will result in this file being updated.
-
-registeredName = PullDownPanel
-fqName = screens.kuiper.pullDownPanel.PullDownPanel
-relativeSourcePath = src/main/kuiper/screens/kuiper/pullDownPanel/PullDownPanel.kt
-baseType = Control
-supertypes = [
-    godot.api.Control,
-	godot.api.CanvasItem,
-	godot.api.Node,
-	godot.api.Object,
-	godot.core.KtObject,
-	godot.common.interop.NativeWrapper,
-	godot.common.interop.NativePointer,
-	kotlin.Any
-]
-signals = [
-    
-]
-properties = [
-    panel_i_d,
-	contents,
-	key
-]
-functions = [
-    _ready,
-	_recalculate_pulldown_dimensions,
-	_input,
-	_on_handle_gui_input,
-	_process
-]
\ No newline at end of file
diff --git a/src/main/kuiper/SignalBus.kt b/src/main/kuiper/SignalBus.kt
index bfca66c..bff3863 100644
--- a/src/main/kuiper/SignalBus.kt
+++ b/src/main/kuiper/SignalBus.kt
@@ -34,10 +34,6 @@ class SignalBus : Node() {
     @RegisterSignal("card")
     val droppedCard by signal1<ActionCard>()
 
-    // signals relating to pulldown panels
-    @RegisterSignal("panel_name")
-    val recalcPulldownPanelSignal by signal1<Control>()
-
     // Signals relating to hexes
     @RegisterSignal("hex")
     val cardOnHex by signal1<Hex>()
diff --git a/src/main/kuiper/actions/card_rotation_curve.tres b/src/main/kuiper/actions/card_rotation_curve.tres
index 9208c50..b5b7206 100644
--- a/src/main/kuiper/actions/card_rotation_curve.tres
+++ b/src/main/kuiper/actions/card_rotation_curve.tres
@@ -1,6 +1,6 @@
 [gd_resource type="Curve" format=3 uid="uid://d2x7gnrh830bd"]
 
 [resource]
-min_value = -1.0
+_limits = [-1.0, 1.0, 0.0, 1.0]
 _data = [Vector2(0, -1), 0.0, 2.19231, 0, 0, Vector2(0.5, 0), 0.0, 0.0, 0, 0, Vector2(1, 1), 2.41154, 0.0, 0, 0]
 point_count = 3
diff --git a/src/main/kuiper/science/ResourcePanel.kt b/src/main/kuiper/science/ResourcePanel.kt
index fcde142..e41ec8d 100644
--- a/src/main/kuiper/science/ResourcePanel.kt
+++ b/src/main/kuiper/science/ResourcePanel.kt
@@ -7,11 +7,9 @@ import godot.annotation.RegisterFunction
 import godot.api.Control
 import godot.api.HBoxContainer
 import godot.api.RichTextLabel
-import godot.api.VBoxContainer
 import godot.core.Vector2
 import godot.core.connect
 import godot.extension.getNodeAs
-import screens.kuiper.pullDownPanel.PullDownPanel
 import state.GameState
 
 @RegisterClass
@@ -22,9 +20,7 @@ class ResourcePanel : Control() {
     private lateinit var gameState: GameState
 
     // UI elements
-    private lateinit var panelContents: VBoxContainer
     private lateinit var iconRow: HBoxContainer
-    private lateinit var pulldownControl: PullDownPanel
 
     private var resourceType: ResourceType = ResourceType.GOLD
 
@@ -34,26 +30,12 @@ class ResourcePanel : Control() {
         gameState = getNodeAs("/root/GameState")!!
 
         iconRow = getNodeAs("%ResourcePanel")!!
-        panelContents = getNodeAs("%PanelContents")!!
-        pulldownControl = getNodeAs("%PulldownPanel")!!
 
         signalBus.updateResource.connect { resourceName, value ->
             resourceType = ResourceType.valueOf(resourceName.uppercase())
             iconRow.getNodeAs<ResourceDisplay>(resourceType.name)?.apply {
                 updateValue(value)
-                val summary = gameState.company.getCostsPerTurnSummary(resourceType)
-                panelContents.getNodeAs<RichTextLabel>("${resourceType}_summary")?.apply {
-                    val headline =
-                        "[img=25]${resourceType.spritePath}[/img] [b]${resourceType.displayName}:[/b] %.2f".format(value)
-                    text = if (summary.isNotEmpty()) {
-                        "$headline\n\t$summary"
-                    } else {
-                        headline
-                    }
-                    setFitContent(true)
-                }
             }
-            signalBus.recalcPulldownPanelSignal.emit(panelContents)
         }
     }
 
@@ -70,7 +52,5 @@ class ResourcePanel : Control() {
             setName("${res.name}_summary")
             text = "[img=25]${res.spritePath}[/img] [b]${res.displayName}:[/b] $rate"
         }
-        panelContents.addChild(label)
-        panelContents.resetSize()
     }
 }
diff --git a/src/main/kuiper/science/SciencePanel.kt b/src/main/kuiper/science/SciencePanel.kt
index f25ff3c..3285d7e 100644
--- a/src/main/kuiper/science/SciencePanel.kt
+++ b/src/main/kuiper/science/SciencePanel.kt
@@ -6,11 +6,9 @@ import godot.annotation.RegisterFunction
 import godot.api.Control
 import godot.api.HBoxContainer
 import godot.api.RichTextLabel
-import godot.api.VBoxContainer
 import godot.core.Vector2
 import godot.core.connect
 import godot.extension.getNodeAs
-import screens.kuiper.pullDownPanel.PullDownPanel
 import technology.Science
 
 @RegisterClass
@@ -20,9 +18,7 @@ class SciencePanel : Control() {
     private lateinit var signalBus: SignalBus
 
     // UI elements
-    private lateinit var panelContents: VBoxContainer
     private lateinit var iconRow: HBoxContainer
-    private lateinit var pulldownControl: PullDownPanel
 
     private var science: Science = Science.PHYSICS
 
@@ -31,17 +27,12 @@ class SciencePanel : Control() {
         signalBus = getNodeAs("/root/SignalBus")!!
 
         iconRow = getNodeAs("%SciencePanel")!!
-        panelContents = getNodeAs("%PanelContents")!!
-        pulldownControl = getNodeAs("%PulldownPanel")!!
 
         signalBus.updateScience.connect { scienceName, value ->
             if (scienceName != "EUREKA") {
                 science = Science.valueOf(scienceName.uppercase())
                 iconRow.getNodeAs<ResourceDisplay>(science.name)?.apply {
                     updateValue(value)
-                    panelContents.getNodeAs<RichTextLabel>("${science}_summary")?.apply {
-                        text = "[img=25]${science.spritePath}[/img] [b]${science.displayName}:[/b] %.2f".format(value)
-                    }
                 }
             }
         }
@@ -60,10 +51,6 @@ class SciencePanel : Control() {
             setName("${science.name}_summary")
             text = "[img=25]${science.spritePath}[/img] [b]${science.displayName}:[/b] %.2f".format(rate)
         }
-        panelContents.addChild(label)
-        panelContents.resetSize()
-        // I need to get the sliding panel which contains this to recalculate its dimensions
-        signalBus.recalcPulldownPanelSignal.emit(panelContents)
     }
 
 }
diff --git a/src/main/kuiper/science/resource_panel.tscn b/src/main/kuiper/science/resource_panel.tscn
index cd85d97..317521a 100644
--- a/src/main/kuiper/science/resource_panel.tscn
+++ b/src/main/kuiper/science/resource_panel.tscn
@@ -1,11 +1,10 @@
-[gd_scene load_steps=7 format=3 uid="uid://cun43pt1qmvtt"]
+[gd_scene load_steps=6 format=3 uid="uid://cun43pt1qmvtt"]
 
-[ext_resource type="Script" path="res://src/main/kuiper/science/ResourcePanel.kt" id="1_0lmnj"]
+[ext_resource type="Script" uid="uid://blx0i4062kqti" path="res://src/main/kuiper/science/ResourcePanel.kt" id="1_0lmnj"]
 [ext_resource type="PackedScene" uid="uid://dxi8kllwh6e0g" path="res://src/main/kuiper/science/resource_icon_display.tscn" id="2_uaj2p"]
 [ext_resource type="Texture2D" uid="uid://dmw5pkdm32rr3" path="res://assets/textures/icons/icon-influence-128x128.png" id="3_pfj0i"]
 [ext_resource type="Texture2D" uid="uid://38j6d388tase" path="res://assets/textures/icons/icon-coins-128x128.png" id="4_3avvt"]
 [ext_resource type="Texture2D" uid="uid://dfddb2niatyjy" path="res://assets/textures/icons/icon-conmats-128x128.png" id="4_cebon"]
-[ext_resource type="PackedScene" uid="uid://cun66228bprqh" path="res://src/main/kuiper/screens/kuiper/pullDownPanel/pulldown_panel.tscn" id="9_tt8ur"]
 
 [node name="Container" type="Control"]
 custom_minimum_size = Vector2(430, 0)
@@ -45,23 +44,3 @@ layout_mode = 2
 resource_name = "CONSTRUCTION_MATERIALS"
 icon = ExtResource("4_cebon")
 is_science = false
-
-[node name="PulldownPanel" parent="." node_paths=PackedStringArray("contents") instance=ExtResource("9_tt8ur")]
-unique_name_in_owner = true
-custom_minimum_size = Vector2(400, 50)
-layout_mode = 2
-offset_left = 50.0
-offset_top = 40.0
-offset_right = 450.0
-offset_bottom = 90.0
-panel_i_d = "resources"
-contents = NodePath("PanelContents")
-key = 161
-
-[node name="PanelContents" type="VBoxContainer" parent="PulldownPanel"]
-unique_name_in_owner = true
-visible = false
-z_index = 4
-custom_minimum_size = Vector2(200, 0)
-layout_mode = 1
-offset_right = 400.0
diff --git a/src/main/kuiper/science/science_panel.tscn b/src/main/kuiper/science/science_panel.tscn
index fc87708..fd375e8 100644
--- a/src/main/kuiper/science/science_panel.tscn
+++ b/src/main/kuiper/science/science_panel.tscn
@@ -1,6 +1,6 @@
-[gd_scene load_steps=10 format=3 uid="uid://q3iu1ngkr0tt"]
+[gd_scene load_steps=9 format=3 uid="uid://q3iu1ngkr0tt"]
 
-[ext_resource type="Script" path="res://src/main/kuiper/science/SciencePanel.kt" id="1_p2emv"]
+[ext_resource type="Script" uid="uid://doatfj26cj70g" path="res://src/main/kuiper/science/SciencePanel.kt" id="1_p2emv"]
 [ext_resource type="PackedScene" uid="uid://dxi8kllwh6e0g" path="res://src/main/kuiper/science/resource_icon_display.tscn" id="1_u8rou"]
 [ext_resource type="Texture2D" uid="uid://dsrevsf2xlgb2" path="res://assets/textures/icons/icon-physics-128x128.png" id="2_h50u5"]
 [ext_resource type="Texture2D" uid="uid://5rdv2depis0x" path="res://assets/textures/icons/icon-astronomy-128x128.png" id="3_r4ej6"]
@@ -8,7 +8,6 @@
 [ext_resource type="Texture2D" uid="uid://chboy3ckqgt2q" path="res://assets/textures/icons/icon-psychology-128x128.png" id="5_7qcjk"]
 [ext_resource type="Texture2D" uid="uid://b4305gkr4kvle" path="res://assets/textures/icons/icon-maths-128x128.png" id="6_aw2mt"]
 [ext_resource type="Texture2D" uid="uid://dl3780ti5pvsa" path="res://assets/textures/icons/icon-engineering-128x128.png" id="7_l1ej6"]
-[ext_resource type="PackedScene" uid="uid://cun66228bprqh" path="res://src/main/kuiper/screens/kuiper/pullDownPanel/pulldown_panel.tscn" id="8_gn57i"]
 
 [node name="Container" type="Control"]
 custom_minimum_size = Vector2(430, 0)
@@ -65,22 +64,3 @@ layout_mode = 2
 resource_name = "ENGINEERING"
 icon = ExtResource("7_l1ej6")
 value = 1.0
-
-[node name="PulldownPanel" parent="." node_paths=PackedStringArray("contents") instance=ExtResource("8_gn57i")]
-unique_name_in_owner = true
-custom_minimum_size = Vector2(400, 50)
-layout_mode = 2
-offset_left = 50.0
-offset_top = 40.0
-offset_right = 450.0
-offset_bottom = 90.0
-panel_i_d = "sciences"
-contents = NodePath("PanelContents")
-
-[node name="PanelContents" type="VBoxContainer" parent="PulldownPanel"]
-unique_name_in_owner = true
-visible = false
-z_index = 4
-custom_minimum_size = Vector2(200, 0)
-layout_mode = 1
-offset_right = 400.0
diff --git a/src/main/kuiper/screens/kuiper/pullDownPanel/PullDownPanel.kt b/src/main/kuiper/screens/kuiper/pullDownPanel/PullDownPanel.kt
deleted file mode 100644
index e2993f6..0000000
--- a/src/main/kuiper/screens/kuiper/pullDownPanel/PullDownPanel.kt
+++ /dev/null
@@ -1,212 +0,0 @@
-package screens.kuiper.pullDownPanel
-
-import SignalBus
-import godot.annotation.Export
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
-import godot.annotation.RegisterProperty
-import godot.api.*
-import godot.core.Key
-import godot.core.MouseButton
-import godot.core.Vector2
-import godot.core.connect
-import godot.extension.getNodeAs
-import kotlin.math.roundToInt
-
-@RegisterClass
-class PullDownPanel : Control() {
-
-    // Globals
-    private lateinit var signalBus: SignalBus
-
-    @Export
-    @RegisterProperty
-    var panelID: String = ""
-
-    /**
-     * The contents of the panel, which should be any Control node
-     */
-    @Export
-    @RegisterProperty
-    var contents: Control? = null
-
-    /**
-     * The key that will expand or shrink the panel
-     */
-    @Export
-    @RegisterProperty
-    var key: Key = Key.KEY_H
-
-    private var isExpanded = false
-    private var direction: Int = 0 // -1 for shrinking, 0 for idle, 1 for expanding
-    private var maxHeight: Double = 25.0
-    private var maxWidth: Double = 100.0
-    private var minHeight = 25.0
-    private var contentMinY = 0.0
-    private var isDragging = false
-    private var initialSize = Vector2(0.0, 0.0)
-    private var avgChildHeight: Double = 0.0
-    private var basePosition = Vector2(0.0, 0.0)
-
-    private lateinit var handle: ColorRect
-    private lateinit var pulldownPanel: PanelContainer
-
-
-    @RegisterFunction
-    override fun _ready() {
-        signalBus = getNodeAs("/root/SignalBus")!!
-
-        pulldownPanel = getNodeAs("VBoxContainer/PanelContainer")!!
-        handle = getNodeAs("%Handle")!!
-
-        // the zeroth child is the Panel node on the original scene
-        // the first child is the contents added to the game scene
-
-        // if the contents are not set, we can't do anything yet
-        // but if they are, we can calculate the dimensions of the panel
-        if (getChildCount() > 1) {
-            contents = getChild(1) as Control?
-            _recalculate_pulldown_dimensions(contents!!)
-        }
-
-        initialSize = pulldownPanel.size
-        minHeight = pulldownPanel.getRect().size.y
-        basePosition = pulldownPanel.position
-
-        signalBus.recalcPulldownPanelSignal.connect { _ ->
-            _recalculate_pulldown_dimensions(contents!!)
-        }
-    }
-
-    @RegisterFunction
-    fun _recalculate_pulldown_dimensions(control: Control) {
-        contents = control
-        contents?.let {
-            maxHeight = it.getChildren().sumOf { (it as RichTextLabel).getRect().size.y } + 50
-            maxWidth = if (it.getChildCount() == 0) {
-                50.0
-            } else {
-                it.getChildren().maxOf { (it as RichTextLabel).getRect().size.x } + 50
-            }
-            it.setPosition(Vector2(this.position.x, -maxHeight))
-            avgChildHeight = (it.getRect().size.y / it.getChildCount())
-        }
-    }
-
-    /**
-     * If the [key] is pressed, expand or shrink the panel
-     */
-    @RegisterFunction
-    override fun _input(event: InputEvent?) {
-        if (event is InputEventKey) {
-            if (event.getKeycode() == key && event.pressed) {
-                if (!isExpanded) {
-                    direction = 1
-                    contents?.visible = true
-                } else {
-                    direction = -1
-                }
-            }
-        }
-    }
-
-    /**
-     * If the mouse is dragged, resize the panel. It will be clamped to the appropriate size
-     */
-    @RegisterFunction
-    fun _on_handle_gui_input(event: InputEvent) {
-        if (event is InputEventMouseMotion) {
-            if (isDragging) {
-                pulldownPanel.setSize(
-                    Vector2(
-                        maxWidth,
-                        (pulldownPanel.getRect().size.y + event.relative.y).coerceIn(minHeight, maxHeight)
-                    )
-                )
-                handle.setPosition(
-                    Vector2(
-                        handle.position.x,
-                        (handle.position.y + event.relative.y).coerceIn(minHeight, maxHeight)
-                    )
-                )
-                contents?.setPosition(
-                    Vector2(
-                        contents!!.position.x,
-                        (contents!!.position.y + event.relative.y).coerceIn(
-                            minHeight - maxHeight,
-                            contentMinY + minHeight
-                        )
-                    )
-                )
-            }
-        }
-        if (event is InputEventMouseButton) {
-            if (event.getButtonIndex() == MouseButton.MOUSE_BUTTON_LEFT) {
-                if (event.doubleClick) {
-                    // double click to expand or shrink the panel
-                    direction = if (isExpanded) -1 else 1
-                }
-                isDragging = event.pressed
-                if (isDragging) {
-                    contents?.visible = true
-                }
-            }
-        }
-        // If we've shrunk the panel to its minimum size, hide the contents
-        if (pulldownPanel.size.y == initialSize.y) {
-            isExpanded = false
-            direction = 0
-            if (!isDragging) {
-                contents?.visible = false
-            }
-        }
-    }
-
-    /**
-     * Process the expansion or shrinking of the panel
-     */
-    @RegisterFunction
-    override fun _process(delta: Double) {
-        val currentY = pulldownPanel.getRect().size.y
-        when (direction) {
-            1 -> {
-                // expanding
-                if (currentY < maxHeight) {
-                    pulldownPanel.setSize(
-                        Vector2(
-                            maxWidth,
-                            currentY + avgChildHeight
-                        )
-                    )
-                    handle.setPosition(Vector2(handle.position.x, currentY + handle.getRect().size.y))
-                    contents?.setPosition(Vector2(contents!!.position.x, currentY + avgChildHeight - maxHeight))
-                } else {
-                    direction = 0
-                    isExpanded = true
-                }
-            }
-
-            0 -> {
-                // do nothing
-            }
-
-            -1 -> {
-                // shrinking
-                if (currentY.roundToInt() > minHeight) {
-                    pulldownPanel.setSize(
-                        Vector2(
-                            maxWidth,
-                            currentY - avgChildHeight
-                        )
-                    )
-                    handle.setPosition(Vector2(handle.position.x, currentY - handle.getRect().size.y))
-                    contents?.setPosition(Vector2(contents!!.position.x, contents!!.position.y - avgChildHeight))
-                } else {
-                    direction = 0
-                    contents?.visible = false
-                    isExpanded = false
-                }
-            }
-        }
-    }
-}
diff --git a/src/main/kuiper/screens/kuiper/pullDownPanel/pulldown_panel.tscn b/src/main/kuiper/screens/kuiper/pullDownPanel/pulldown_panel.tscn
deleted file mode 100644
index 6504599..0000000
--- a/src/main/kuiper/screens/kuiper/pullDownPanel/pulldown_panel.tscn
+++ /dev/null
@@ -1,31 +0,0 @@
-[gd_scene load_steps=2 format=3 uid="uid://cun66228bprqh"]
-
-[ext_resource type="Script" path="res://src/main/kuiper/screens/kuiper/pullDownPanel/PullDownPanel.kt" id="1_211j7"]
-
-[node name="PulldownPanel" type="Control"]
-custom_minimum_size = Vector2(200, 50)
-layout_mode = 3
-anchors_preset = 0
-offset_right = 200.0
-offset_bottom = 50.0
-script = ExtResource("1_211j7")
-
-[node name="VBoxContainer" type="VBoxContainer" parent="."]
-custom_minimum_size = Vector2(200, 25)
-layout_mode = 0
-offset_right = 40.0
-offset_bottom = 40.0
-
-[node name="PanelContainer" type="PanelContainer" parent="VBoxContainer"]
-custom_minimum_size = Vector2(200, 0)
-layout_mode = 2
-
-[node name="Handle" type="ColorRect" parent="VBoxContainer"]
-unique_name_in_owner = true
-custom_minimum_size = Vector2(50, 25)
-layout_mode = 2
-size_flags_horizontal = 4
-size_flags_vertical = 4
-mouse_default_cursor_shape = 9
-
-[connection signal="gui_input" from="VBoxContainer/Handle" to="." method="_on_handle_gui_input"]
diff --git a/src/main/kuiper/screens/kuiper/pullDownPanel/pulldown_panel_test.tscn b/src/main/kuiper/screens/kuiper/pullDownPanel/pulldown_panel_test.tscn
deleted file mode 100644
index 924cff2..0000000
--- a/src/main/kuiper/screens/kuiper/pullDownPanel/pulldown_panel_test.tscn
+++ /dev/null
@@ -1,58 +0,0 @@
-[gd_scene load_steps=2 format=3 uid="uid://5unxo5wmblfy"]
-
-[ext_resource type="PackedScene" uid="uid://cun66228bprqh" path="res://src/main/kuiper/screens/kuiper/pullDownPanel/pulldown_panel.tscn" id="1_0f0k1"]
-
-[node name="PulldownPanelTest" type="Control"]
-layout_mode = 3
-anchors_preset = 0
-
-[node name="PulldownPanel" parent="." instance=ExtResource("1_0f0k1")]
-layout_mode = 1
-key = 174
-
-[node name="VBoxContainer2" type="VBoxContainer" parent="PulldownPanel"]
-visible = false
-clip_contents = true
-layout_mode = 1
-offset_right = 63.0
-offset_bottom = 266.0
-
-[node name="Label" type="Label" parent="PulldownPanel/VBoxContainer2"]
-layout_mode = 2
-text = "First"
-
-[node name="Label2" type="Label" parent="PulldownPanel/VBoxContainer2"]
-layout_mode = 2
-text = "Second"
-
-[node name="Label3" type="Label" parent="PulldownPanel/VBoxContainer2"]
-layout_mode = 2
-text = "Third"
-
-[node name="Label4" type="Label" parent="PulldownPanel/VBoxContainer2"]
-layout_mode = 2
-text = "Forth"
-
-[node name="Label5" type="Label" parent="PulldownPanel/VBoxContainer2"]
-layout_mode = 2
-text = "Fifth"
-
-[node name="Label6" type="Label" parent="PulldownPanel/VBoxContainer2"]
-layout_mode = 2
-text = "Sixth"
-
-[node name="Label7" type="Label" parent="PulldownPanel/VBoxContainer2"]
-layout_mode = 2
-text = "Seventh"
-
-[node name="Label8" type="Label" parent="PulldownPanel/VBoxContainer2"]
-layout_mode = 2
-text = "Eighth"
-
-[node name="Label9" type="Label" parent="PulldownPanel/VBoxContainer2"]
-layout_mode = 2
-text = "Nineth"
-
-[node name="Label10" type="Label" parent="PulldownPanel/VBoxContainer2"]
-layout_mode = 2
-text = "Tenth"
diff --git a/src/main/kuiper/technology/tree/tech_tree.tscn b/src/main/kuiper/technology/tree/tech_tree.tscn
index 700ddcc..2b185f8 100644
--- a/src/main/kuiper/technology/tree/tech_tree.tscn
+++ b/src/main/kuiper/technology/tree/tech_tree.tscn
@@ -1,8 +1,8 @@
 [gd_scene load_steps=5 format=3 uid="uid://bwnqinqcecnfq"]
 
 [ext_resource type="Theme" uid="uid://dsva635j2ykyg" path="res://assets/themes/tech_tree_theme.tres" id="1_1lu2s"]
-[ext_resource type="Script" path="res://src/main/kuiper/technology/tree/TechTree.kt" id="2_bcl7q"]
-[ext_resource type="Script" path="res://src/main/kuiper/technology/tree/TechSummaryPanel.kt" id="3_40ni6"]
+[ext_resource type="Script" uid="uid://ce1viyuwvuuv8" path="res://src/main/kuiper/technology/tree/TechTree.kt" id="2_bcl7q"]
+[ext_resource type="Script" uid="uid://dxtv1ih2i8t4l" path="res://src/main/kuiper/technology/tree/TechSummaryPanel.kt" id="3_40ni6"]
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_tema1"]
 bg_color = Color(0.2706, 0.0641286, 0.258458, 1)

From 5c69c8d45b5589024c29bf02f7a68c635d65b22b Mon Sep 17 00:00:00 2001
From: Liam <liamjdavison@gmail.com>
Date: Sat, 29 Mar 2025 08:45:07 +0000
Subject: [PATCH 14/14] Randomly place HQ on a sector at startup.

---
 src/main/kuiper/screens/gameSetup/GameSetup.kt | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/kuiper/screens/gameSetup/GameSetup.kt b/src/main/kuiper/screens/gameSetup/GameSetup.kt
index da46daa..b2b1391 100644
--- a/src/main/kuiper/screens/gameSetup/GameSetup.kt
+++ b/src/main/kuiper/screens/gameSetup/GameSetup.kt
@@ -2,6 +2,7 @@ package screens.gameSetup
 
 import LogInterface
 import SignalBus
+import actions.ResourceType
 import godot.annotation.RegisterClass
 import godot.annotation.RegisterFunction
 import godot.annotation.RegisterSignal
@@ -10,7 +11,9 @@ import godot.core.asCachedStringName
 import godot.core.signal0
 import godot.core.signal1
 import godot.extension.getNodeAs
+import godot.global.GD
 import loaders.DataLoader
+import state.Building
 import state.GameState
 import state.Sponsor
 import state.Zone
@@ -154,17 +157,16 @@ class GameSetup : Node(), LogInterface {
                     hexes.add(data)
                 }
             }
-            /*locations.add(Location("${sponsor.name} HQ", true))
-            locations[0].apply {
+            // in the sponsor.hexGrid array, find the first element where the location.isUnlockedAtStart is true
+            val hqLocation = sponsor.hexGrid.flatten().firstOrNull { it.unlockedAtStart }
+            if (hqLocation != null) {
                 val hq = Building.HQ()
                 hq.sciencesProduced.putAll(sponsor.baseScienceRate)
                 hq.resourceGeneration[ResourceType.INFLUENCE] = 1
                 hq.resourceGeneration[ResourceType.GOLD] = 25
-                addBuilding(hq, intArrayOf(0), true)
+                val sector = GD.randiRange(0, 5)
+                hqLocation.location.addBuilding(hq, intArrayOf(sector), true)
             }
-            for (i in 1..9) {
-                locations.add(Location("Location $i"))
-            }*/
         }
         return zoneList
     }