[Client] Added ending locations

Getting an ending (other than White) also does not send you to the credits.

3 files changed, 22 insertions, 0 deletions

@@ -51,4 +51,16 @@ func _ready():
 
                 get_parent().add_child.call_deferred(locationListener)
 
+        for ending in gamedata.objects.get_endings():
+                var room = gamedata.objects.get_rooms()[ending.get_room_id()]
+                if room.get_map_id() != map_id:
+                        continue
+
+                var locationListener = ap.SCRIPT_locationListener.new()
+                locationListener.location_id = ending.get_ap_id()
+                locationListener.name = "locationListener_%d" % ending.get_ap_id()
+                locationListener.senders.append(NodePath("/root/scene/" + ending.get_path()))
+
+                get_parent().add_child.call_deferred(locationListener)
+
         super._ready()
@@ -42,6 +42,7 @@ func _ready():
                 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/player.gd"))
                 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/saver.gd"))
                 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/teleportListener.gd"))
+                installScriptExtension(ResourceLoader.load("user://maps/Archipelago/worldportListener.gd"))
 
                 var proto_script = load("user://maps/Archipelago/generated/proto.gd")
                 var gamedata_script = load("user://maps/Archipelago/gamedata.gd")
@@ -145,6 +146,7 @@ func connectionSuccessful():
         clearResourceCache("res://objects/nodes/door.tscn")
         clearResourceCache("res://objects/nodes/listeners/animationListener.tscn")
         clearResourceCache("res://objects/nodes/listeners/teleportListener.tscn")
+        clearResourceCache("res://objects/nodes/listeners/worldportListener.tscn")
         clearResourceCache("res://objects/nodes/player.tscn")
         clearResourceCache("res://objects/nodes/saver.tscn")
 
@@ -0,0 +1,8 @@
+extends "res://scripts/nodes/listeners/worldportListener.gd"
+
+
+func changeScene():
+        if exit == "menus/credits":
+                return
+
+        super.changeScene()