feat: hatbot navigation restored!

via metroTravelPoints implementation, which is a bit clunky. Also we're spawning on playerSpawnPoints instead of node-pathed elevators.
russmatney · Oct 27, 2024 · 162d716 · 162d716
1 parent 80fb5c8
commit 162d716
Show file tree

Hide file tree

Showing 9 changed files with 368 additions and 159 deletions.
diff --git a/data.pandora b/data.pandora
@@ -13,22 +13,14 @@
 			},
 			{
 				"_category_id": "",
+				"_generate_ids": true,
 				"_icon_color": "eb4f4fff",
 				"_id": "45",
 				"_ids_generation_class": "MetroTravelPointIds",
 				"_index": 0,
 				"_name": "MetroTravelPoint",
 				"_script_path": "res://src/core/metro/MetroTravelPointEntity.gd"
 			},
-			{
-				"_category_id": "45",
-				"_generate_ids": true,
-				"_icon_color": "ffffff00",
-				"_id": "46",
-				"_ids_generation_class": "DemoLandTravelPointIds",
-				"_index": 0,
-				"_name": "DemoLandTravelPoint"
-			},
 			{
 				"_category_id": "",
 				"_generate_ids": true,
@@ -272,110 +264,6 @@
 					}
 				}
 			},
-			{
-				"_category_id": "46",
-				"_icon_color": "ffffff00",
-				"_id": "47",
-				"_index": 0,
-				"_name": "Area01Door01",
-				"_property_overrides": {
-					"destination_zone": {
-						"type": "resource",
-						"value": "res://src/games/demoland/zones/area01/Area01.tscn"
-					}
-				}
-			},
-			{
-				"_category_id": "46",
-				"_icon_color": "ffffff00",
-				"_id": "54",
-				"_index": 0,
-				"_name": "Area02Door01",
-				"_property_overrides": {
-					"destination_zone": {
-						"type": "resource",
-						"value": "res://src/games/demoland/zones/area02/Area02.tscn"
-					}
-				}
-			},
-			{
-				"_category_id": "46",
-				"_icon_color": "ffffff00",
-				"_id": "55",
-				"_index": 0,
-				"_name": "Area03Door01",
-				"_property_overrides": {
-					"destination_zone": {
-						"type": "resource",
-						"value": "res://src/games/demoland/zones/Area03.tscn"
-					}
-				}
-			},
-			{
-				"_category_id": "46",
-				"_icon_color": "ffffff00",
-				"_id": "56",
-				"_index": 0,
-				"_name": "Area04Door01",
-				"_property_overrides": {
-					"destination_zone": {
-						"type": "resource",
-						"value": "res://src/games/demoland/zones/Area04.tscn"
-					}
-				}
-			},
-			{
-				"_category_id": "46",
-				"_icon_color": "ffffff00",
-				"_id": "57",
-				"_index": 0,
-				"_name": "Area05Door01",
-				"_property_overrides": {
-					"destination_zone": {
-						"type": "resource",
-						"value": "res://src/games/demoland/zones/Area05.tscn"
-					}
-				}
-			},
-			{
-				"_category_id": "46",
-				"_icon_color": "ffffff00",
-				"_id": "58",
-				"_index": 0,
-				"_name": "Area06Door01",
-				"_property_overrides": {
-					"destination_zone": {
-						"type": "resource",
-						"value": "res://src/games/demoland/zones/Area06PurpleStone.tscn"
-					}
-				}
-			},
-			{
-				"_category_id": "46",
-				"_icon_color": "ffffff00",
-				"_id": "59",
-				"_index": 0,
-				"_name": "Area07Door01",
-				"_property_overrides": {
-					"destination_zone": {
-						"type": "resource",
-						"value": "res://src/games/demoland/zones/Area07GrassyCave.tscn"
-					}
-				}
-			},
-			{
-				"_category_id": "46",
-				"_icon_color": "ffffff00",
-				"_id": "60",
-				"_index": 0,
-				"_name": "Area08Door01",
-				"_property_overrides": {
-					"destination_zone": {
-						"type": "resource",
-						"value": "res://src/games/demoland/zones/Area08AllTheThings.tscn"
-					}
-				}
-			},
 			{
 				"_category_id": "69",
 				"_icon_color": "ffffff00",
@@ -2258,6 +2146,210 @@
 						"value": "res://src/dino/levels/tower/TowerLevelGen.gd"
 					}
 				}
+			},
+			{
+				"_category_id": "45",
+				"_icon_color": "ffffff00",
+				"_id": "213",
+				"_index": 0,
+				"_name": "HatBotLevelZeroToLandingSite",
+				"_property_overrides": {
+					"destination_node_path": {
+						"type": "string",
+						"value": "Reception/ToLandingSite"
+					},
+					"destination_zone": {
+						"type": "resource",
+						"value": "res://src/games/hatbot/zones/LevelZero.tscn"
+					}
+				}
+			},
+			{
+				"_category_id": "45",
+				"_icon_color": "ffffff00",
+				"_id": "214",
+				"_index": 0,
+				"_name": "HatBotLevelZeroToTheKingdom",
+				"_property_overrides": {
+					"destination_node_path": {
+						"type": "string",
+						"value": "SecretEntrance/ToTheKingdom"
+					},
+					"destination_zone": {
+						"type": "resource",
+						"value": "res://src/games/hatbot/zones/LevelZero.tscn"
+					}
+				}
+			},
+			{
+				"_category_id": "45",
+				"_icon_color": "ffffff00",
+				"_id": "215",
+				"_index": 0,
+				"_name": "HatBotLandingSiteToZero",
+				"_property_overrides": {
+					"destination_node_path": {
+						"type": "string",
+						"value": "FromZero/ToZero"
+					},
+					"destination_zone": {
+						"type": "resource",
+						"value": "res://src/games/hatbot/zones/TheLandingSite.tscn"
+					}
+				}
+			},
+			{
+				"_category_id": "45",
+				"_icon_color": "ffffff00",
+				"_id": "216",
+				"_index": 0,
+				"_name": "HatBotLandingSiteToKingdomBack",
+				"_property_overrides": {
+					"destination_node_path": {
+						"type": "string",
+						"value": "SubLandingElevator/ToKingdomBack"
+					},
+					"destination_zone": {
+						"type": "resource",
+						"value": "res://src/games/hatbot/zones/TheLandingSite.tscn"
+					}
+				}
+			},
+			{
+				"_category_id": "45",
+				"_icon_color": "ffffff00",
+				"_id": "217",
+				"_index": 0,
+				"_name": "HatBotLandingSiteToSimulation",
+				"_property_overrides": {
+					"destination_node_path": {
+						"type": "string",
+						"value": "ToSimulation/ToSimulation"
+					},
+					"destination_zone": {
+						"type": "resource",
+						"value": "res://src/games/hatbot/zones/TheLandingSite.tscn"
+					}
+				}
+			},
+			{
+				"_category_id": "45",
+				"_icon_color": "ffffff00",
+				"_id": "218",
+				"_index": 0,
+				"_name": "HatBotLandingSiteToVolcano",
+				"_property_overrides": {
+					"destination_node_path": {
+						"type": "string",
+						"value": "ToVolcano/ToVolcano"
+					},
+					"destination_zone": {
+						"type": "resource",
+						"value": "res://src/games/hatbot/zones/TheLandingSite.tscn"
+					}
+				}
+			},
+			{
+				"_category_id": "45",
+				"_icon_color": "ffffff00",
+				"_id": "219",
+				"_index": 0,
+				"_name": "HatBotSimulationToLandingSite",
+				"_property_overrides": {
+					"destination_node_path": {
+						"type": "string",
+						"value": "ToLandingSite/ToLandingSite"
+					},
+					"destination_zone": {
+						"type": "resource",
+						"value": "res://src/games/hatbot/zones/Simulation.tscn"
+					}
+				}
+			},
+			{
+				"_category_id": "45",
+				"_icon_color": "ffffff00",
+				"_id": "220",
+				"_index": 0,
+				"_name": "HatBotSimulationToKingdom",
+				"_property_overrides": {
+					"destination_node_path": {
+						"type": "string",
+						"value": "ToKingdom/ToKingdom"
+					},
+					"destination_zone": {
+						"type": "resource",
+						"value": "res://src/games/hatbot/zones/Simulation.tscn"
+					}
+				}
+			},
+			{
+				"_category_id": "45",
+				"_icon_color": "ffffff00",
+				"_id": "221",
+				"_index": 0,
+				"_name": "HatBotKingdomToSimulation",
+				"_property_overrides": {
+					"destination_node_path": {
+						"type": "string",
+						"value": "ToSimulation/ToSimulation"
+					},
+					"destination_zone": {
+						"type": "resource",
+						"value": "res://src/games/hatbot/zones/TheKingdom.tscn"
+					}
+				}
+			},
+			{
+				"_category_id": "45",
+				"_icon_color": "ffffff00",
+				"_id": "222",
+				"_index": 0,
+				"_name": "HatBotKingdomToLandingSite",
+				"_property_overrides": {
+					"destination_node_path": {
+						"type": "string",
+						"value": "ToLandingSite/ToLandingSite"
+					},
+					"destination_zone": {
+						"type": "resource",
+						"value": "res://src/games/hatbot/zones/TheKingdom.tscn"
+					}
+				}
+			},
+			{
+				"_category_id": "45",
+				"_icon_color": "ffffff00",
+				"_id": "223",
+				"_index": 0,
+				"_name": "HatBotKingdomToLevelZero",
+				"_property_overrides": {
+					"destination_node_path": {
+						"type": "string",
+						"value": "SecretEndgameRoomToLevelZero/ToLevelZero"
+					},
+					"destination_zone": {
+						"type": "resource",
+						"value": "res://src/games/hatbot/zones/TheKingdom.tscn"
+					}
+				}
+			},
+			{
+				"_category_id": "45",
+				"_icon_color": "ffffff00",
+				"_id": "224",
+				"_index": 0,
+				"_name": "HatBotVolcanoToLandingSite",
+				"_property_overrides": {
+					"destination_node_path": {
+						"type": "string",
+						"value": "ToLandingSite/ToLandingSite"
+					},
+					"destination_zone": {
+						"type": "resource",
+						"value": "res://src/games/hatbot/zones/Volcano.tscn"
+					}
+				}
 			}
 		],
 		"_properties": [
@@ -2587,7 +2679,7 @@
 	},
 	"_id_generator": {
 		"_ids_by_context": {
-			"default": 211
+			"default": 224
 		}
 	}
 }
diff --git a/pandora/categories.gd b/pandora/categories.gd
@@ -13,7 +13,3 @@ const DINOENTITY = "131"
 const DINOTILES = "179"
 
 
-class MetroTravelPointCategories:
-	const DEMOLANDTRAVELPOINT = "46"
-
-
diff --git a/pandora/metro_travel_point_ids.gd b/pandora/metro_travel_point_ids.gd
@@ -2,4 +2,15 @@
 class_name MetroTravelPointIds
 
 
-const AREA01DOOR01 = "47"
+const HATBOTLEVELZEROTOLANDINGSITE = "213"
+const HATBOTLEVELZEROTOTHEKINGDOM = "214"
+const HATBOTLANDINGSITETOZERO = "215"
+const HATBOTLANDINGSITETOKINGDOMBACK = "216"
+const HATBOTLANDINGSITETOSIMULATION = "217"
+const HATBOTLANDINGSITETOVOLCANO = "218"
+const HATBOTSIMULATIONTOLANDINGSITE = "219"
+const HATBOTSIMULATIONTOKINGDOM = "220"
+const HATBOTKINGDOMTOSIMULATION = "221"
+const HATBOTKINGDOMTOLANDINGSITE = "222"
+const HATBOTKINGDOMTOLEVELZERO = "223"
+const HATBOTVOLCANOTOLANDINGSITE = "224"
diff --git a/src/core/metro/Metro.gd b/src/core/metro/Metro.gd
@@ -16,6 +16,9 @@ func load_zone(zone_scene_or_path, spawn_node_path=null):
 		zone_scene = load(zone_scene_or_path)
 	else:
 		zone_scene = zone_scene_or_path
+	if not zone_scene:
+		Log.warn("no zone_scene to load!", zone_scene_or_path)
+		return
 	var zone_scene_inst = zone_scene.instantiate()
 	current_zone = zone_scene_inst