From d5d630dcf04eed5a001c776ab18a6831da7c449e Mon Sep 17 00:00:00 2001
From: Doug Hoskisson <beauxq@users.noreply.github.com>
Date: Sun, 1 Oct 2023 16:13:30 -0700
Subject: [PATCH] Zillion: change test detection for running tests with
 multiprocessing (#2243)

---
 worlds/zillion/__init__.py      |  2 +-
 worlds/zillion/config.py        | 17 -----------------
 worlds/zillion/requirements.txt |  2 +-
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/worlds/zillion/__init__.py b/worlds/zillion/__init__.py
index 7c927c10..f5e04b4e 100644
--- a/worlds/zillion/__init__.py
+++ b/worlds/zillion/__init__.py
@@ -10,7 +10,6 @@ import logging
 
 from BaseClasses import ItemClassification, LocationProgressType, \
     MultiWorld, Item, CollectionState, Entrance, Tutorial
-from .config import detect_test
 from .logic import cs_to_zz_locs
 from .region import ZillionLocation, ZillionRegion
 from .options import ZillionStartChar, zillion_options, validate
@@ -25,6 +24,7 @@ from zilliandomizer.system import System
 from zilliandomizer.logic_components.items import RESCUE, items as zz_items, Item as ZzItem
 from zilliandomizer.logic_components.locations import Location as ZzLocation, Req
 from zilliandomizer.options import Chars
+from zilliandomizer.patch import detect_test
 
 from ..AutoWorld import World, WebWorld
 
diff --git a/worlds/zillion/config.py b/worlds/zillion/config.py
index db61d0c4..ca02f9a9 100644
--- a/worlds/zillion/config.py
+++ b/worlds/zillion/config.py
@@ -2,20 +2,3 @@ import os
 
 base_id = 8675309
 zillion_map = os.path.join(os.path.dirname(__file__), "empty-zillion-map-row-col-labels-281.png")
-
-
-def detect_test() -> bool:
-    """
-    Parts of generation that are in unit tests need the rom.
-    This is to detect whether we are running unit tests
-    so we can work around the need for the rom.
-    """
-    import __main__
-    try:
-        if "test" in __main__.__file__:
-            return True
-    except AttributeError:
-        # In some environments, __main__ doesn't have __file__
-        # We'll assume that's not unit tests.
-        pass
-    return False
diff --git a/worlds/zillion/requirements.txt b/worlds/zillion/requirements.txt
index 2af057de..4858ef31 100644
--- a/worlds/zillion/requirements.txt
+++ b/worlds/zillion/requirements.txt
@@ -1 +1 @@
-zilliandomizer @ git+https://github.com/beauxq/zilliandomizer@4b27d115269db25fe73b0471b73495f41df1323c#0.5.3
+zilliandomizer @ git+https://github.com/beauxq/zilliandomizer@d7122bcbeda40da5db26d60fad06246a1331706f#0.5.4