From 22b43a8e3d7fc2b72788e7a1c44add0b48c9ad79 Mon Sep 17 00:00:00 2001
From: Justus Lind <DeamonHunter@users.noreply.github.com>
Date: Thu, 1 Aug 2024 00:26:50 +1000
Subject: [PATCH] Rename completion_condition to jak_completion_condition (#41)

---
 worlds/jakanddaxter/Client.py              |  8 +++++++-
 worlds/jakanddaxter/JakAndDaxterOptions.py |  2 +-
 worlds/jakanddaxter/Regions.py             | 14 +++++++-------
 worlds/jakanddaxter/__init__.py            |  2 +-
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/worlds/jakanddaxter/Client.py b/worlds/jakanddaxter/Client.py
index 6968a7a8ca..f1464a1ffd 100644
--- a/worlds/jakanddaxter/Client.py
+++ b/worlds/jakanddaxter/Client.py
@@ -119,12 +119,18 @@ class JakAndDaxterContext(CommonContext):
             else:
                 orbsanity_bundle = 1
 
+            # Keep compatibility with 0.0.8 at least for now
+            if "completion_condition" in slot_data:
+                goal_id = slot_data["completion_condition"]
+            else:
+                goal_id = slot_data["jak_completion_condition"]
+
             self.repl.setup_options(orbsanity_option,
                                     orbsanity_bundle,
                                     slot_data["fire_canyon_cell_count"],
                                     slot_data["mountain_pass_cell_count"],
                                     slot_data["lava_tube_cell_count"],
-                                    slot_data["completion_condition"])
+                                    goal_id)
 
             # Because Orbsanity and the orb traders in the game are intrinsically linked, we need the server
             # to track our trades at all times to support async play. "Retrieved" will tell us the orbs we lost,
diff --git a/worlds/jakanddaxter/JakAndDaxterOptions.py b/worlds/jakanddaxter/JakAndDaxterOptions.py
index 4e4ac0d25f..718fe6ff45 100644
--- a/worlds/jakanddaxter/JakAndDaxterOptions.py
+++ b/worlds/jakanddaxter/JakAndDaxterOptions.py
@@ -112,4 +112,4 @@ class JakAndDaxterOptions(PerGameCommonOptions):
     fire_canyon_cell_count: FireCanyonCellCount
     mountain_pass_cell_count: MountainPassCellCount
     lava_tube_cell_count: LavaTubeCellCount
-    completion_condition: CompletionCondition
+    jak_completion_condition: CompletionCondition
diff --git a/worlds/jakanddaxter/Regions.py b/worlds/jakanddaxter/Regions.py
index 9089981f35..6d016bad2c 100644
--- a/worlds/jakanddaxter/Regions.py
+++ b/worlds/jakanddaxter/Regions.py
@@ -108,25 +108,25 @@ def create_regions(multiworld: MultiWorld, options: JakAndDaxterOptions, player:
     lt.connect(gmc)  # gmc->fb connection defined internally by GolAndMaiasCitadelRegions.
 
     # Set the completion condition.
-    if options.completion_condition == CompletionCondition.option_cross_fire_canyon:
+    if options.jak_completion_condition == CompletionCondition.option_cross_fire_canyon:
         multiworld.completion_condition[player] = lambda state: state.can_reach(rv, "Region", player)
 
-    elif options.completion_condition == CompletionCondition.option_cross_mountain_pass:
+    elif options.jak_completion_condition == CompletionCondition.option_cross_mountain_pass:
         multiworld.completion_condition[player] = lambda state: state.can_reach(vc, "Region", player)
 
-    elif options.completion_condition == CompletionCondition.option_cross_lava_tube:
+    elif options.jak_completion_condition == CompletionCondition.option_cross_lava_tube:
         multiworld.completion_condition[player] = lambda state: state.can_reach(gmc, "Region", player)
 
-    elif options.completion_condition == CompletionCondition.option_defeat_dark_eco_plant:
+    elif options.jak_completion_condition == CompletionCondition.option_defeat_dark_eco_plant:
         multiworld.completion_condition[player] = lambda state: state.can_reach(fjp, "Region", player)
 
-    elif options.completion_condition == CompletionCondition.option_defeat_klaww:
+    elif options.jak_completion_condition == CompletionCondition.option_defeat_klaww:
         multiworld.completion_condition[player] = lambda state: state.can_reach(mp, "Region", player)
 
-    elif options.completion_condition == CompletionCondition.option_defeat_gol_and_maia:
+    elif options.jak_completion_condition == CompletionCondition.option_defeat_gol_and_maia:
         multiworld.completion_condition[player] = lambda state: state.can_reach(fb, "Region", player)
 
-    elif options.completion_condition == CompletionCondition.option_open_100_cell_door:
+    elif options.jak_completion_condition == CompletionCondition.option_open_100_cell_door:
         multiworld.completion_condition[player] = lambda state: state.can_reach(fd, "Region", player)
 
     # As a final sanity check on these options, verify that we have enough locations to allow us to cross
diff --git a/worlds/jakanddaxter/__init__.py b/worlds/jakanddaxter/__init__.py
index 148f730516..733539fd9c 100644
--- a/worlds/jakanddaxter/__init__.py
+++ b/worlds/jakanddaxter/__init__.py
@@ -185,4 +185,4 @@ class JakAndDaxterWorld(World):
                                     "fire_canyon_cell_count",
                                     "mountain_pass_cell_count",
                                     "lava_tube_cell_count",
-                                    "completion_condition")
+                                    "jak_completion_condition")