Merge pull request #2 from gaithern/adding-journal-checks

Adding journal checks
gaithern · Nov 19, 2023 · 062cad5 · 062cad5
2 parents 8e3ad14 + 91b4e73
commit 062cad5
Show file tree

Hide file tree

Showing 8 changed files with 673 additions and 720 deletions.
diff --git a/data/lua/connector_khcom.lua b/data/lua/connector_khcom.lua
diff --git a/worlds/khcom/Client.py b/worlds/khcom/Client.py
@@ -156,7 +156,8 @@ async def game_watcher(ctx: KHCOMContext):
             for file in files:
                 if file.find("send") > -1:
                     st = file.split("send", -1)[1]
-                    sending = sending+[(int(st))]
+                    if st != "nil":
+                        sending = sending+[(int(st))]
                 if file.find("victory") > -1:
                     victory = True
         ctx.locations_checked = sending

diff --git a/worlds/khcom/Items.py b/worlds/khcom/Items.py
diff --git a/worlds/khcom/Locations.py b/worlds/khcom/Locations.py
diff --git a/worlds/khcom/Options.py b/worlds/khcom/Options.py
@@ -2,12 +2,6 @@
 
 from Options import Choice, Range, Option, Toggle, DeathLink, DefaultOnToggle, OptionSet
 
-class EnemyCards(Toggle):
-    """
-    Should progression checks be included for enemy cards?
-    """
-    display_name = "Enemy Cards Checks Hold Progression"
-
 class PrioritizeBosses(Toggle):
     """
     Should boss location prioritize holding friend cards?
@@ -16,6 +10,5 @@ class PrioritizeBosses(Toggle):
 
 
 khcom_options: Dict[str, type(Option)] = {
-    "enemy_cards": EnemyCards,
     "prioritize_bosses": PrioritizeBosses,
 }
diff --git a/worlds/khcom/Regions.py b/worlds/khcom/Regions.py
diff --git a/worlds/khcom/Rules.py b/worlds/khcom/Rules.py
diff --git a/worlds/khcom/__init__.py b/worlds/khcom/__init__.py
@@ -3,11 +3,12 @@
 from BaseClasses import Tutorial
 from worlds.AutoWorld import WebWorld, World
 from .Items import KHCOMItem, KHCOMItemData, event_item_table, get_items_by_category, item_table
-from .Locations import KHCOMLocation, location_table
+from .Locations import KHCOMLocation, location_table, get_locations_by_category
 from .Options import khcom_options
 from .Regions import create_regions
 from .Rules import set_rules
 from worlds.LauncherComponents import Component, components, Type, launch_subprocess
+import random
 
 
 
@@ -54,15 +55,23 @@ def fill_slot_data(self) -> dict:
 
     def create_items(self):
         item_pool: List[KHCOMItem] = []
+        starting_locations = get_locations_by_category("Starting")
+        starting_locations = random.sample(list(starting_locations.keys()),3)
+        starting_worlds = get_items_by_category("World Unlocks")
+        starting_worlds = random.sample(list(starting_worlds.keys()),3)
+        i = 0
+        while i < 3:
+            self.multiworld.get_location(starting_locations[i], self.player).place_locked_item(self.create_item(starting_worlds[i]))
+            i = i + 1
         total_locations = len(self.multiworld.get_unfilled_locations(self.player))
         for name, data in item_table.items():
             quantity = data.max_quantity
 
             # Ignore filler, it will be added in a later stage.
             if data.category == "Filler":
                 continue
-
-            item_pool += [self.create_item(name) for _ in range(0, quantity)]
+            if name not in starting_worlds:
+                item_pool += [self.create_item(name) for _ in range(0, quantity)]
 
         # Fill any empty locations with filler items.
         while len(item_pool) < total_locations:
@@ -74,7 +83,7 @@ def get_filler_item_name(self) -> str:
         fillers = get_items_by_category("Filler")
         weights = [data.weight for data in fillers.values()]
         return self.multiworld.random.choices([filler for filler in fillers.keys()], weights, k=1)[0]
-
+        
     def create_item(self, name: str) -> KHCOMItem:
         data = item_table[name]
         return KHCOMItem(name, data.classification, data.code, self.player)