More merge issues fixes

WebHostLib/templates/multitracker.html

@@ -39,7 +39,6 @@
         </div>
 
         <div id="tables-container">
-
         {%- for team, players in room_players.items() -%}
             <div class="table-wrapper">
                 <table id="checks-table" class="table non-unique-item-table">

worlds/AutoWorld.py

@@ -11,13 +11,13 @@
 from typing import (Any, Callable, ClassVar, Dict, FrozenSet, List, Mapping,
                     Optional, Set, TextIO, Tuple, TYPE_CHECKING, Type, Union)
 
-from BaseClasses import CollectionState
 from Options import PerGameCommonOptions
+from BaseClasses import CollectionState
 
 if TYPE_CHECKING:
     import random
     from BaseClasses import MultiWorld, Item, Location, Tutorial, Region, Entrance
-    from . import GamePackage
+    from . import GamesPackage
     from settings import Group
 
 perf_logger = logging.getLogger("performance")
@@ -493,14 +493,14 @@ def get_region(self, region_name: str) -> "Region":
         return self.multiworld.get_region(region_name, self.player)
 
     @classmethod
-    def get_data_package_data(cls) -> GamePackage:
+    def get_data_package_data(cls) -> GamesPackage:
         sorted_item_name_groups = {
             name: sorted(cls.item_name_groups[name]) for name in sorted(cls.item_name_groups)
         }
         sorted_location_name_groups = {
             name: sorted(cls.location_name_groups[name]) for name in sorted(cls.location_name_groups)
         }
-        res: GamePackage = {
+        res: GamesPackage = {
             # sorted alphabetically
             "item_name_groups": sorted_item_name_groups,
             "item_name_to_id": cls.item_name_to_id,
@@ -517,7 +517,7 @@ class LogicMixin(metaclass=AutoLogicRegister):
     pass
 
 
-def data_package_checksum(data: "GamePackage") -> str:
+def data_package_checksum(data: "GamesPackage") -> str:
     """Calculates the data package checksum for a game from a dict"""
     assert "checksum" not in data, "Checksum already in data"
     assert sorted(data) == list(data), "Data not ordered"

worlds/clique/Items.py

@@ -15,16 +15,16 @@ class CliqueItemData(NamedTuple):
 
 item_data_table: Dict[str, CliqueItemData] = {
     "Feeling of Satisfaction": CliqueItemData(
-        code=0x1A,  # Purposely changed to test #1933; Overlaps with "Magic Mirror" in ALTTP.
+        code=69696969,
         type=ItemClassification.progression,
     ),
     "Button Activation": CliqueItemData(
-        code=0x14,  # Purposely changed to test #1933; Overlaps with "Flute" in ALTTP.
+        code=69696968,
         type=ItemClassification.progression,
         can_create=lambda multiworld, player: bool(getattr(multiworld, "hard_mode")[player]),
     ),
     "A Cool Filler Item (No Satisfaction Guaranteed)": CliqueItemData(
-        code=0x4B,  # Purposely changed to test #1933; Overlaps with "Pegasus Boots" in ALTTP.
+        code=69696967,
         can_create=lambda multiworld, player: False  # Only created from `get_filler_item_name`.
     ),
     "The Urge to Push": CliqueItemData(

worlds/clique/Locations.py

@@ -17,11 +17,11 @@ class CliqueLocationData(NamedTuple):
 location_data_table: Dict[str, CliqueLocationData] = {
     "The Big Red Button": CliqueLocationData(
         region="The Button Realm",
-        address=0xE9BC,  # Purposely changed to test #1933; Overlaps with "Link's House" chest in ALTTP.
+        address=69696969,
     ),
     "The Item on the Desk": CliqueLocationData(
         region="The Button Realm",
-        address=0xE9CE,  # Purposely changed to test #1933; Overlaps with "Kakariko Tavern" chest in ALTTP.
+        address=69696968,
         can_create=lambda multiworld, player: bool(getattr(multiworld, "hard_mode")[player]),
     ),
     "In the Player's Mind": CliqueLocationData(

worlds/cv64/__init__.py

@@ -62,7 +62,6 @@ class CV64World(World):
     options: CV64Options
     settings: typing.ClassVar[CV64Settings]
     topology_present = True
-    data_version = 1
 
     item_name_to_id = get_item_names_to_ids()
     location_name_to_id = get_location_names_to_ids()

worlds/doom_ii/__init__.py

@@ -43,7 +43,6 @@ class DOOM2World(World):
     options: DOOM2Options
     game = "DOOM II"
     web = DOOM2Web()
-    data_version = 3
     required_client_version = (0, 3, 9)
 
     item_name_to_id = {data["name"]: item_id for item_id, data in Items.item_table.items()}

worlds/ffmq/__init__.py

@@ -56,8 +56,6 @@ class FFMQWorld(World):
     create_regions = create_regions
     set_rules = set_rules
     stage_set_rules = stage_set_rules
-
-    data_version = 1
 
     web = FFMQWebWorld()
     # settings: FFMQSettings
@@ -216,4 +214,3 @@ def extend_hint_information(self, hint_data):
                                         hint_data[self.player][location.address] += f"/{hint}"
                                     else:
                                         hint_data[self.player][location.address] = hint
-

worlds/generic/__init__.py

@@ -1,6 +1,5 @@
 from typing import NamedTuple, Union
 import logging
-from typing import NamedTuple, Union
 
 from BaseClasses import Item, ItemClassification, Tutorial
 from NetUtils import SlotType

worlds/heretic/__init__.py

@@ -41,7 +41,6 @@ class HereticWorld(World):
     options: HereticOptions
     game = "Heretic"
     web = HereticWeb()
-    data_version = 3
     required_client_version = (0, 3, 9)
 
     item_name_to_id = {data["name"]: item_id for item_id, data in Items.item_table.items()}

worlds/kh2/__init__.py

@@ -42,13 +42,15 @@ class KH2World(World):
     """
     game = "Kingdom Hearts 2"
     web = KingdomHearts2Web()
+
     required_client_version = (0, 4, 4)
     options_dataclass = KingdomHearts2Options
     options: KingdomHearts2Options
     item_name_to_id = {item: item_id
                        for item_id, item in enumerate(item_dictionary_table.keys(), 0x130000)}
     location_name_to_id = {item: location
                            for location, item in enumerate(all_locations.keys(), 0x130000)}
+
     item_name_groups = item_groups
     location_name_groups = location_groups
 

worlds/lingo/__init__.py

@@ -35,7 +35,6 @@ class LingoWorld(World):
 
     base_id = 444400
     topology_present = True
-    data_version = 1
 
     options_dataclass = LingoOptions
     options: LingoOptions

worlds/pokemon_emerald/__init__.py

@@ -86,7 +86,6 @@ class PokemonEmeraldWorld(World):
     item_name_groups = ITEM_GROUPS
     location_name_groups = LOCATION_GROUPS
 
-    data_version = 2
     required_client_version = (0, 4, 6)
 
     badge_shuffle_info: Optional[List[Tuple[PokemonEmeraldLocation, PokemonEmeraldItem]]]

worlds/shorthike/__init__.py

@@ -28,7 +28,6 @@ class ShortHikeWorld(World):
 
     game = "A Short Hike"
     web = ShortHikeWeb()
-    data_version = 2
 
     item_name_to_id = {item["name"]: item["id"] for item in item_table}
     location_name_to_id = {loc["name"]: loc["id"] for loc in location_table}