Skip to content

Commit

Permalink
Light cleanup: fix icons, add bug report page, remove py 3.8 code.
Browse files Browse the repository at this point in the history
  • Loading branch information
massimilianodelliubaldini committed Dec 10, 2024
1 parent d4b50c2 commit 770f057
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 13 deletions.
16 changes: 3 additions & 13 deletions worlds/jakanddaxter/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import settings
from Options import OptionGroup

from Utils import local_path
from BaseClasses import (Item,
ItemClassification as ItemClass,
Tutorial,
Expand Down Expand Up @@ -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):
Expand Down Expand Up @@ -82,6 +81,7 @@ class JakAndDaxterWebWorld(WebWorld):
)

tutorials = [setup_en]
bug_report_page = "https://github.com/ArchipelaGOAL/Archipelago/issues"

option_groups = [
OptionGroup("Orbsanity", [
Expand Down Expand Up @@ -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]:
Expand Down
File renamed without changes.
File renamed without changes

0 comments on commit 770f057

Please sign in to comment.