Merge branch 'feature/ds3_use_slotdata' into feature/main_candidate

WebHostLib/downloads.py

@@ -81,8 +81,6 @@ def download_slot_file(room_id, player_id: int):
             fname = f"AP_{app.jinja_env.filters['suuid'](room_id)}_SP.apv6"
         elif slot_data.game == "Super Mario 64":
             fname = f"AP_{app.jinja_env.filters['suuid'](room_id)}_SP.apsm64ex"
-        elif slot_data.game == "Dark Souls III":
-            fname = f"AP_{app.jinja_env.filters['suuid'](room_id)}.json"
         else:
             return "Game download not supported."
         return send_file(io.BytesIO(slot_data.data), as_attachment=True, download_name=fname)

WebHostLib/templates/macros.html

@@ -43,9 +43,6 @@
                         {% elif patch.game | supports_apdeltapatch %}
                         <a href="{{ url_for("download_patch", patch_id=patch.id, room_id=room.id) }}" download>
                             Download Patch File...</a>
-                        {% elif patch.game == "Dark Souls III" %}
-                        <a href="{{ url_for("download_slot_file", room_id=room.id, player_id=patch.player_id) }}" download>
-                            Download JSON File...</a>
                         {% else %}
                             No file to download for this game.
                         {% endif %}

WebHostLib/upload.py

@@ -80,11 +80,6 @@ def upload_zip_to_db(zfile: zipfile.ZipFile, owner=None, meta={"race": False}, s
             slots.add(Slot(data=zfile.open(file, "r").read(), player_name=slot_name,
                            player_id=int(slot_id[1:]), game="Ocarina of Time"))
 
-        elif file.filename.endswith(".json"):
-            _, seed_name, slot_id, slot_name = file.filename.split('.')[0].split('-', 3)
-            slots.add(Slot(data=zfile.open(file, "r").read(), player_name=slot_name,
-                           player_id=int(slot_id[1:]), game="Dark Souls III"))
-
         elif file.filename.endswith(".txt"):
             spoiler = zfile.open(file, "r").read().decode("utf-8-sig")
 

worlds/dark_souls_3/__init__.py

@@ -1,6 +1,7 @@
 # world/dark_souls_3/__init__.py
 import json
 import os
+from typing import Dict
 
 from .Options import dark_souls_options
 from .data.items_data import weapons_upgrade_5_table, weapons_upgrade_10_table, item_dictionary_table, key_items_list
@@ -237,7 +238,9 @@ class DarkSouls3World(World):
         for i in range(item_pool_len, total_required_locations):
             self.world.itempool += [self.create_item("Soul of an Intrepid Hero")]
 
-    def generate_output(self, output_directory: str):
+    def fill_slot_data(self) -> Dict[str, object]:
+        slot_data: Dict[str, object] = {}
+
         # Depending on the specified option, modify items hexadecimal value to add an upgrade level
         item_dictionary = item_dictionary_table.copy()
         if self.world.randomize_weapons_level[self.player]:
@@ -271,7 +274,7 @@ class DarkSouls3World(World):
                 else:
                     locations_target.append(0)
 
-        data = {
+        slot_data = {
             "options": {
                 "auto_equip": self.world.auto_equip[self.player].value,
                 "lock_equip": self.world.lock_equip[self.player].value,
@@ -290,10 +293,10 @@ class DarkSouls3World(World):
             "itemsAddress": items_address
         }
 
-        # generate the file
-        filename = f"AP-{self.world.seed_name}-P{self.player}-{self.world.player_name[self.player]}.json"
-        with open(os.path.join(output_directory, filename), 'w') as outfile:
-            json.dump(data, outfile)
+        return slot_data
+
+    def generate_output(self, output_directory: str):
+        pass
 
 
 class DarkSouls3Location(Location):