From 770f0572eaf948d8a47684dbb2efad3695aa9871 Mon Sep 17 00:00:00 2001
From: massimilianodelliubaldini
 <8584296+massimilianodelliubaldini@users.noreply.github.com>
Date: Tue, 10 Dec 2024 17:06:56 -0500
Subject: [PATCH] Light cleanup: fix icons, add bug report page, remove py 3.8
 code.

---
 worlds/jakanddaxter/__init__.py                 |  16 +++-------------
 .../icons/{egg.ico => precursor_orb.ico}        | Bin
 .../icons/{egg.png => precursor_orb.png}        | Bin
 3 files changed, 3 insertions(+), 13 deletions(-)
 rename worlds/jakanddaxter/icons/{egg.ico => precursor_orb.ico} (100%)
 rename worlds/jakanddaxter/icons/{egg.png => precursor_orb.png} (100%)

diff --git a/worlds/jakanddaxter/__init__.py b/worlds/jakanddaxter/__init__.py
index 005a42fae4b4..7d952714d6a2 100644
--- a/worlds/jakanddaxter/__init__.py
+++ b/worlds/jakanddaxter/__init__.py
@@ -4,7 +4,6 @@
 import settings
 from Options import OptionGroup
 
-from Utils import local_path
 from BaseClasses import (Item,
                          ItemClassification as ItemClass,
                          Tutorial,
@@ -43,9 +42,9 @@ def launch_client():
 components.append(Component("Jak and Daxter Client",
                             func=launch_client,
                             component_type=Type.CLIENT,
-                            icon="egg"))
+                            icon="precursor_orb"))
 
-icon_paths["egg"] = local_path("worlds", "jakanddaxter", "icons", "egg.png")
+icon_paths["precursor_orb"] = f"ap:{__name__}/icons/precursor_orb.png"
 
 
 class JakAndDaxterSettings(settings.Group):
@@ -82,6 +81,7 @@ class JakAndDaxterWebWorld(WebWorld):
     )
 
     tutorials = [setup_en]
+    bug_report_page = "https://github.com/ArchipelaGOAL/Archipelago/issues"
 
     option_groups = [
         OptionGroup("Orbsanity", [
@@ -410,16 +410,6 @@ def remove(self, state: CollectionState, item: Item) -> bool:
             # Ditto everything else.
             else:
                 state.prog_items[self.player]["Reachable Orbs Fresh"] = False
-
-            # TODO - Python 3.8 compatibility, remove this block when no longer required.
-            if state.prog_items[self.player]["Tradeable Orbs"] < 1:
-                del state.prog_items[self.player]["Tradeable Orbs"]
-            if state.prog_items[self.player]["Reachable Orbs"] < 1:
-                del state.prog_items[self.player]["Reachable Orbs"]
-            for level in level_table:
-                if state.prog_items[self.player][f"{level} Reachable Orbs".strip()] < 1:
-                    del state.prog_items[self.player][f"{level} Reachable Orbs".strip()]
-
         return change
 
     def fill_slot_data(self) -> Dict[str, Any]:
diff --git a/worlds/jakanddaxter/icons/egg.ico b/worlds/jakanddaxter/icons/precursor_orb.ico
similarity index 100%
rename from worlds/jakanddaxter/icons/egg.ico
rename to worlds/jakanddaxter/icons/precursor_orb.ico
diff --git a/worlds/jakanddaxter/icons/egg.png b/worlds/jakanddaxter/icons/precursor_orb.png
similarity index 100%
rename from worlds/jakanddaxter/icons/egg.png
rename to worlds/jakanddaxter/icons/precursor_orb.png