about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--Archipelago/load.gd4
-rw-r--r--Archipelago/location.gd4
2 files changed, 4 insertions, 4 deletions
diff --git a/Archipelago/load.gd b/Archipelago/load.gd index 8cc9120..4c6c178 100644 --- a/Archipelago/load.gd +++ b/Archipelago/load.gd
@@ -115,10 +115,12 @@ func _load():
115 var panels_parent = self.get_node("Panels") 115 var panels_parent = self.get_node("Panels")
116 var location_script = ResourceLoader.load("user://maps/Archipelago/location.gd") 116 var location_script = ResourceLoader.load("user://maps/Archipelago/location.gd")
117 for location_id in gamedata.panel_ids_by_location_id.keys(): 117 for location_id in gamedata.panel_ids_by_location_id.keys():
118 if !(gamedata.classification_by_location_id[location_id] & apclient._location_classification_bit):
119 continue
120
118 var location = location_script.new() 121 var location = location_script.new()
119 location.ap_id = location_id 122 location.ap_id = location_id
120 location.name = "AP_location_%d" % location.ap_id 123 location.name = "AP_location_%d" % location.ap_id
121 location.classification = gamedata.classification_by_location_id[location_id]
122 self.add_child(location) 124 self.add_child(location)
123 125
124 var panels = gamedata.panel_ids_by_location_id[location_id] 126 var panels = gamedata.panel_ids_by_location_id[location_id]
diff --git a/Archipelago/location.gd b/Archipelago/location.gd index 7e76427..b85b5c4 100644 --- a/Archipelago/location.gd +++ b/Archipelago/location.gd
@@ -4,7 +4,6 @@ var ap_name = ""
4var ap_id = 0 4var ap_id = 0
5var total = 0 5var total = 0
6var solved = 0 6var solved = 0
7var classification = 0
8var ran = false 7var ran = false
9 8
10 9
@@ -15,5 +14,4 @@ func handle_correct():
15 ran = true 14 ran = true
16 15
17 var apclient = global.get_node("Archipelago") 16 var apclient = global.get_node("Archipelago")
18 if classification & apclient._location_classification_bit: 17 apclient.sendLocation(ap_id)
19 apclient.sendLocation(ap_id)