From c98c5afc2b88bf21dbc5c34fc3eee19ab6d10918 Mon Sep 17 00:00:00 2001
From: Matt Popovich <popovich.matt@gmail.com>
Date: Sat, 3 Jan 2026 13:30:09 -0500
Subject: [PATCH 1/2] Uses .yaml files for configuration, can be choosen via
 ENV variable #11

---
 Dockerfile             |   2 +-
 README.md              |  17 +++++-
 battler.py             |   2 +-
 configs/__init__.py    |  93 +++++++++++++++++++++++++++++
 configs/iPhone11.py    | 131 -----------------------------------------
 configs/iPhone11.yaml  |  87 +++++++++++++++++++++++++++
 configs/iPhoneMax.py   | 131 -----------------------------------------
 configs/iPhoneMax.yaml |  89 ++++++++++++++++++++++++++++
 modifyFavorite.py      |   2 +-
 trader.py              |   2 +-
 10 files changed, 287 insertions(+), 269 deletions(-)
 delete mode 100644 configs/iPhone11.py
 create mode 100644 configs/iPhone11.yaml
 delete mode 100644 configs/iPhoneMax.py
 create mode 100644 configs/iPhoneMax.yaml

diff --git a/Dockerfile b/Dockerfile
index b5cb543..a9e44e1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ FROM python:3.13.6-bullseye
 RUN apt-get update && apt-get upgrade -y
 
 # Unit testing
-RUN pip3 install --upgrade pytest
+RUN pip3 install --upgrade pytest pyyaml
 
 # Set working directory
 WORKDIR /app
diff --git a/README.md b/README.md
index 4bb8447..747cb29 100644
--- a/README.md
+++ b/README.md
@@ -2,10 +2,10 @@
 PokemonGo Bot via screen mirroring
 
 ### About
-Using [screen mirroring](https://support.apple.com/en-us/120421), click on repeatable locations with random delays and random click accuracy.
+Using iPhone/Mac [screen mirroring](https://support.apple.com/en-us/120421), click on repeatable locations with random delays and random click accuracy in order to automate repetitive PokemonGo Tasks.
 
 ### Configuration
-Edit the coordinates for your system in [`config.py`](config.py). I'd recommend placing the screen mirroring application in an easily repeatable location (Ex. bottom right of screen).
+Edit the `anchor` point for your system in one of the `.yaml` files in [`configs/`](/configs). I'd recommend placing the screen mirroring application in an easily repeatable location (Ex. bottom right of screen). The anchor point should be the center of the red 'x' on the top left of the screen mirroring window.
 
 The coordinates of the current mouse position can be easily obtained via `cmd` + `shift` + `4`.
 <!--
@@ -17,7 +17,18 @@ The easiest way to find out the color at a certain location is by using macOS's
 
 ### Dependencies
 * Python
-* [cliclick](https://github.com/BlueM/cliclick)
+* [cliclick](https://github.com/BlueM/cliclick) ([`brew install cliclick`](https://formulae.brew.sh/formula/cliclick))
+* [pyyaml](https://pypi.org/project/PyYAML/)
+  * ```shell
+    python3 -m venv myenv
+    source myenv/bin/activate
+    pip3 install pyyaml
+    ```
+
+### Examples
+* `CONFIG=iPhone11.yaml python3 trader.py`
+* `CONFIG=iPhoneMax.yaml python3 modifyFavorite.py`
+* `python3 battler.py --master --lose` and `python3 battler.py --win`
 
 ### Supported bot actions
 * Trading
diff --git a/battler.py b/battler.py
index 146515a..0580fa8 100644
--- a/battler.py
+++ b/battler.py
@@ -25,7 +25,7 @@
 import sys
 
 # Custom imports
-from configs.iPhone11 import coordinates
+from configs import coordinates
 from functions.cliclick import Cliclick
 import functions.utils as utils
 
diff --git a/configs/__init__.py b/configs/__init__.py
index e69de29..67bd835 100644
--- a/configs/__init__.py
+++ b/configs/__init__.py
@@ -0,0 +1,93 @@
+import yaml
+import os
+from pathlib import Path
+
+# Default config file name if none is specified
+DEFAULT_CONFIG_NAME = "iPhoneMax.yaml"
+
+# The directory containing the config files (this package's directory)
+CONFIG_DIR = Path(__file__).parent
+
+
+def load_config(config_name: str | None = None) -> dict:
+    """
+    Load a config YAML file and return the computed coordinates dictionary.
+
+    Args:
+        config_name: Name of the YAML file (without path).
+                     If None, uses CONFIG environment variable
+                     If no CONFIG environment variable, uses DEFAULT_CONFIG_NAME
+
+    Returns:
+        Dictionary of coordinates with the anchor added to them
+    """
+    if config_name is None:
+        config_name = os.getenv("CONFIG")
+        if config_name is None:
+            print(
+                f"No CONFIG environment variable set, using the default of CONFIG={DEFAULT_CONFIG_NAME}"
+            )
+            config_name = DEFAULT_CONFIG_NAME
+
+    config_path = CONFIG_DIR / config_name
+
+    if not config_path.exists():
+        raise FileNotFoundError(f"Config file not found: {config_name}")
+
+    with open(config_path, "r") as f:
+        config = yaml.safe_load(f)
+
+    anchor_x = config["anchor"]["x"]
+    anchor_y = config["anchor"]["y"]
+    offsets = config["offsets"]
+
+    def get_coordinate_plus_anchor(offset_key: str) -> list[int]:
+        """
+        Get coordinates of offset_key, add the anchor, and return
+        """
+        offset = offsets[offset_key]
+        return [anchor_x + offset["x"], anchor_y + offset["y"]]
+
+    # coordinate key : yaml key
+    key_mapping = {
+        "start_battle_coordinates": "start_battle",
+        "start_trade_coordinates": "start_trade",
+        "first_trade_pokemon_coordinates": "first_trade_pokemon",
+        "between_first_second_pokemon": "between_first_second_pokemon",
+        "next_button_coordinates": "next_button",
+        "confirm_button_coordinates": "confirm_button",
+        "pokemon_details_left_health_white": "pokemon_details_left_health_white",
+        "x_button_coordinates": "x_button",
+        "start_drag_next_poke": "start_drag_next_poke",
+        "end_drag_next_poke": "end_drag_next_poke",
+        "modify_favorite": "modify_favorite",
+        "lets_do_it_coordinates": "lets_do_it",
+        "great_league_coordinates": "great_league",
+        "ultra_league_coordinates": "ultra_league",
+        "master_league_coordinates": "master_league",
+        "lets_battle_coordinates": "lets_battle",
+        "first_pokemon_in_party_coordinates": "first_pokemon_in_party",
+        "use_party_coordinates": "use_party",
+        "rematch_coordinates": "rematch",
+        "sort_button_coordinates": "sort_button",
+        "first_pokemon_coordinates": "first_pokemon",
+        "second_pokemon_coordinates": "second_pokemon",
+        "third_pokemon_coordinates": "third_pokemon",
+        "done_button_coordinates": "done_button",
+    }
+
+    coordinates = {
+        coordinate_key: get_coordinate_plus_anchor(yaml_key)
+        for coordinate_key, yaml_key in key_mapping.items()
+    }
+
+    # Add everything else from the YAML that is NOT 'anchor' or 'offsets'
+    for key, value in config.items():
+        if key not in {"anchor", "offsets"}:
+            coordinates[key] = value
+
+    return coordinates
+
+
+# Load config
+coordinates = load_config()
diff --git a/configs/iPhone11.py b/configs/iPhone11.py
deleted file mode 100644
index ff1d554..0000000
--- a/configs/iPhone11.py
+++ /dev/null
@@ -1,131 +0,0 @@
-"""
-This is a config file for screen mirroring with an iPhone 11 with a "Larger" view window.
-To use this with an iPhone 11, the only thing you should modify is the `anchor` variable.
-"""
-
-from Point import Point
-
-# Red 'x' in the top left of the mirroring window
-anchor = Point(1311, 213)  # MacBook Air
-
-# Individual offset values with a "larger" view
-#   iPhone Mirroring -> View -> Larger
-start_battle_offset = Point(286, 633)
-start_trade_offset = Point(129, 636)
-first_trade_pokemon_offset = Point(55, 276)
-between_first_second_pokemon_offset = Point(109, 275)  # unused
-next_button_offset = Point(176, 704)
-confirm_button_offset = Point(36, 437)
-pokemon_details_left_health_white_offset = Point(39, 366)  # unused
-x_button_offset = Point(175, 782)
-start_drag_next_poke_offset = Point(322, 497)
-end_drag_next_poke_offset = Point(29, 497)
-modify_favorite_offset = Point(325, 81)
-lets_do_it_offset = Point(172, 515)
-great_league_offset = Point(174, 391)
-ultra_league_offset = Point(175, 507)
-master_league_offset = Point(176, 628)
-lets_battle_offset = Point(171, 506)
-first_pokemon_in_party_offset = Point(73, 615)
-use_party_offset = Point(188, 746)
-rematch_offset = Point(171, 537)
-sort_button_offset = Point(310, 702)  # unused
-first_pokemon_offset = Point(56, 353)
-second_pokemon_offset = Point(174, 353)
-third_pokemon_offset = Point(291, 353)
-done_button_offset = Point(260, 796)
-
-# Recreated configuration using anchor + individual offsets
-coordinates = {
-    "start_battle_coordinates": [
-        anchor.x + start_battle_offset.x,
-        anchor.y + start_battle_offset.y,
-    ],
-    "start_trade_coordinates": [
-        anchor.x + start_trade_offset.x,
-        anchor.y + start_trade_offset.y,
-    ],
-    "first_trade_pokemon_coordinates": [
-        anchor.x + first_trade_pokemon_offset.x,
-        anchor.y + first_trade_pokemon_offset.y,
-    ],
-    "between_first_second_pokemon": [
-        anchor.x + between_first_second_pokemon_offset.x,
-        anchor.y + between_first_second_pokemon_offset.y,
-    ],
-    "next_button_coordinates": [
-        anchor.x + next_button_offset.x,
-        anchor.y + next_button_offset.y,
-    ],
-    "confirm_button_coordinates": [
-        anchor.x + confirm_button_offset.x,
-        anchor.y + confirm_button_offset.y,
-    ],
-    "pokemon_details_left_health_white": [
-        anchor.x + pokemon_details_left_health_white_offset.x,
-        anchor.y + pokemon_details_left_health_white_offset.y,
-    ],
-    "x_button_coordinates": [anchor.x + x_button_offset.x, anchor.y + x_button_offset.y],
-    "start_drag_next_poke": [
-        anchor.x + start_drag_next_poke_offset.x,
-        anchor.y + start_drag_next_poke_offset.y,
-    ],
-    "end_drag_next_poke": [
-        anchor.x + end_drag_next_poke_offset.x,
-        anchor.y + end_drag_next_poke_offset.y,
-    ],
-    "modify_favorite": [
-        anchor.x + modify_favorite_offset.x,
-        anchor.y + modify_favorite_offset.y,
-    ],
-    "lets_do_it_coordinates": [
-        anchor.x + lets_do_it_offset.x,
-        anchor.y + lets_do_it_offset.y,
-    ],
-    "great_league_coordinates": [
-        anchor.x + great_league_offset.x,
-        anchor.y + great_league_offset.y,
-    ],
-    "ultra_league_coordinates": [
-        anchor.x + ultra_league_offset.x,
-        anchor.y + ultra_league_offset.y,
-    ],
-    "master_league_coordinates": [
-        anchor.x + master_league_offset.x,
-        anchor.y + master_league_offset.y,
-    ],
-    "lets_battle_coordinates": [
-        anchor.x + lets_battle_offset.x,
-        anchor.y + lets_battle_offset.y,
-    ],
-    "first_pokemon_in_party_coordinates": [
-        anchor.x + first_pokemon_in_party_offset.x,
-        anchor.y + first_pokemon_in_party_offset.y,
-    ],
-    "use_party_coordinates": [
-        anchor.x + use_party_offset.x,
-        anchor.y + use_party_offset.y,
-    ],
-    "rematch_coordinates": [anchor.x + rematch_offset.x, anchor.y + rematch_offset.y],
-    "sort_button_coordinates": [
-        anchor.x + sort_button_offset.x,
-        anchor.y + sort_button_offset.y,
-    ],
-    "first_pokemon_coordinates": [
-        anchor.x + first_pokemon_offset.x,
-        anchor.y + first_pokemon_offset.y,
-    ],
-    "second_pokemon_coordinates": [
-        anchor.x + second_pokemon_offset.x,
-        anchor.y + second_pokemon_offset.y,
-    ],
-    "third_pokemon_coordinates": [
-        anchor.x + third_pokemon_offset.x,
-        anchor.y + third_pokemon_offset.y,
-    ],
-    "done_button_coordinates": [
-        anchor.x + done_button_offset.x,
-        anchor.y + done_button_offset.y,
-    ],
-    "change_prng": True,
-}
diff --git a/configs/iPhone11.yaml b/configs/iPhone11.yaml
new file mode 100644
index 0000000..d7d5dca
--- /dev/null
+++ b/configs/iPhone11.yaml
@@ -0,0 +1,87 @@
+# This is a config file for screen mirroring with an iPhone 11 with a "Larger"
+# view window. To use this with an iPhone 11, the only thing you should modify
+# is the `anchor` variable.
+
+# Red 'x' in the top left of the mirroring window
+anchor:
+  # MacBook Air
+  x: 1311
+  y: 213
+
+# Individual offset values with a "larger" view
+#   iPhone Mirroring -> View -> Larger
+offsets:
+  start_battle:
+    x: 286
+    y: 633
+  start_trade:
+    x: 129
+    y: 636
+  first_trade_pokemon:
+    x: 55
+    y: 276
+  between_first_second_pokemon: # unused
+    x: 109
+    y: 275
+  next_button:
+    x: 176
+    y: 704
+  confirm_button:
+    x: 36
+    y: 437
+  pokemon_details_left_health_white:  # unused
+    x: 39
+    y: 366
+  x_button:
+    x: 175
+    y: 782
+  start_drag_next_poke:
+    x: 322
+    y: 497
+  end_drag_next_poke:
+    x: 29
+    y: 497
+  modify_favorite:
+    x: 325
+    y: 81
+  lets_do_it:
+    x: 172
+    y: 515
+  great_league:
+    x: 174
+    y: 391
+  ultra_league:
+    x: 175
+    y: 507
+  master_league:
+    x: 176
+    y: 628
+  lets_battle:
+    x: 171
+    y: 506
+  first_pokemon_in_party:
+    x: 73
+    y: 615
+  use_party:
+    x: 188
+    y: 746
+  rematch:
+    x: 171
+    y: 537
+  sort_button:  # unused
+    x: 310
+    y: 702
+  first_pokemon:
+    x: 56
+    y: 353
+  second_pokemon:
+    x: 174
+    y: 353
+  third_pokemon:
+    x: 291
+    y: 353
+  done_button:
+    x: 260
+    y: 796
+
+change_prng: False
diff --git a/configs/iPhoneMax.py b/configs/iPhoneMax.py
deleted file mode 100644
index 1638a19..0000000
--- a/configs/iPhoneMax.py
+++ /dev/null
@@ -1,131 +0,0 @@
-"""
-This is a config file for screen mirroring with an iPhone 15 Pro Max.
-To use this with an iPhone 15 Pro Max, the only thing you should modify is the `anchor` variable.
-"""
-
-from Point import Point
-
-# Red 'x' in the top left of the mirroring window
-anchor = Point(3115, 695)  # 36" windscreen monitor
-anchor = Point(1595, 335)  # 1080p monitor
-
-# Individual offset values
-start_battle_offset = Point(262, 590)
-start_trade_offset = Point(112, 568)  # TODO: Update this since remote trades were added
-first_trade_pokemon_offset = Point(46, 258)
-between_first_second_pokemon_offset = Point(98, 252)  # unused
-next_button_offset = Point(153, 626)
-confirm_button_offset = Point(26, 391)
-pokemon_details_left_health_white_offset = Point(31, 326)  # unused
-x_button_offset = Point(153, 694)
-start_drag_next_poke_offset = Point(281, 437)
-end_drag_next_poke_offset = Point(32, 437)
-modify_favorite_offset = Point(286, 75)
-lets_do_it_offset = Point(150, 459)
-great_league_offset = Point(157, 347)
-ultra_league_offset = Point(157, 452)
-master_league_offset = Point(157, 556)
-lets_battle_offset = Point(150, 451)
-first_pokemon_in_party_offset = Point(63, 547)
-use_party_offset = Point(151, 664)
-rematch_offset = Point(153, 479)
-sort_button_offset = Point(273, 625)  # unused
-first_pokemon_offset = Point(45, 331)
-second_pokemon_offset = Point(152, 331)
-third_pokemon_offset = Point(258, 331)
-done_button_offset = Point(228, 707)
-
-# Recreated configuration using anchor + individual offsets
-coordinates = {
-    "start_battle_coordinates": [
-        anchor.x + start_battle_offset.x,
-        anchor.y + start_battle_offset.y,
-    ],
-    "start_trade_coordinates": [
-        anchor.x + start_trade_offset.x,
-        anchor.y + start_trade_offset.y,
-    ],
-    "first_trade_pokemon_coordinates": [
-        anchor.x + first_trade_pokemon_offset.x,
-        anchor.y + first_trade_pokemon_offset.y,
-    ],
-    "between_first_second_pokemon": [
-        anchor.x + between_first_second_pokemon_offset.x,
-        anchor.y + between_first_second_pokemon_offset.y,
-    ],
-    "next_button_coordinates": [
-        anchor.x + next_button_offset.x,
-        anchor.y + next_button_offset.y,
-    ],
-    "confirm_button_coordinates": [
-        anchor.x + confirm_button_offset.x,
-        anchor.y + confirm_button_offset.y,
-    ],
-    "pokemon_details_left_health_white": [
-        anchor.x + pokemon_details_left_health_white_offset.x,
-        anchor.y + pokemon_details_left_health_white_offset.y,
-    ],
-    "x_button_coordinates": [anchor.x + x_button_offset.x, anchor.y + x_button_offset.y],
-    "start_drag_next_poke": [
-        anchor.x + start_drag_next_poke_offset.x,
-        anchor.y + start_drag_next_poke_offset.y,
-    ],
-    "end_drag_next_poke": [
-        anchor.x + end_drag_next_poke_offset.x,
-        anchor.y + end_drag_next_poke_offset.y,
-    ],
-    "modify_favorite": [
-        anchor.x + modify_favorite_offset.x,
-        anchor.y + modify_favorite_offset.y,
-    ],
-    "lets_do_it_coordinates": [
-        anchor.x + lets_do_it_offset.x,
-        anchor.y + lets_do_it_offset.y,
-    ],
-    "great_league_coordinates": [
-        anchor.x + great_league_offset.x,
-        anchor.y + great_league_offset.y,
-    ],
-    "ultra_league_coordinates": [
-        anchor.x + ultra_league_offset.x,
-        anchor.y + ultra_league_offset.y,
-    ],
-    "master_league_coordinates": [
-        anchor.x + master_league_offset.x,
-        anchor.y + master_league_offset.y,
-    ],
-    "lets_battle_coordinates": [
-        anchor.x + lets_battle_offset.x,
-        anchor.y + lets_battle_offset.y,
-    ],
-    "first_pokemon_in_party_coordinates": [
-        anchor.x + first_pokemon_in_party_offset.x,
-        anchor.y + first_pokemon_in_party_offset.y,
-    ],
-    "use_party_coordinates": [
-        anchor.x + use_party_offset.x,
-        anchor.y + use_party_offset.y,
-    ],
-    "rematch_coordinates": [anchor.x + rematch_offset.x, anchor.y + rematch_offset.y],
-    "sort_button_coordinates": [
-        anchor.x + sort_button_offset.x,
-        anchor.y + sort_button_offset.y,
-    ],
-    "first_pokemon_coordinates": [
-        anchor.x + first_pokemon_offset.x,
-        anchor.y + first_pokemon_offset.y,
-    ],
-    "second_pokemon_coordinates": [
-        anchor.x + second_pokemon_offset.x,
-        anchor.y + second_pokemon_offset.y,
-    ],
-    "third_pokemon_coordinates": [
-        anchor.x + third_pokemon_offset.x,
-        anchor.y + third_pokemon_offset.y,
-    ],
-    "done_button_coordinates": [
-        anchor.x + done_button_offset.x,
-        anchor.y + done_button_offset.y,
-    ],
-    "change_prng": False,
-}
diff --git a/configs/iPhoneMax.yaml b/configs/iPhoneMax.yaml
new file mode 100644
index 0000000..79f5eae
--- /dev/null
+++ b/configs/iPhoneMax.yaml
@@ -0,0 +1,89 @@
+# This is a config file for screen mirroring with an iPhone 15 Pro Max.
+# To use this with an iPhone 15 Pro Max, the only thing you should modify is the `anchor` variable.
+
+# Red 'x' in the top left of the mirroring window
+anchor:
+  # For 36" widescreen monitor
+  # x: 3115
+  # y: 695
+
+  # For 1080p monitor
+  x: 1595
+  y: 335
+
+# Individual offset values
+offsets:
+  start_battle:
+    x: 262
+    y: 590
+  start_trade:  # TODO: Update this since remote trades were added
+    x: 112
+    y: 568
+  first_trade_pokemon:
+    x: 46
+    y: 258
+  between_first_second_pokemon: # unused
+    x: 98
+    y: 252
+  next_button:
+    x: 153
+    y: 626
+  confirm_button:
+    x: 26
+    y: 391
+  pokemon_details_left_health_white:  # unused
+    x: 31
+    y: 326
+  x_button:
+    x: 153
+    y: 694
+  start_drag_next_poke:
+    x: 281
+    y: 437
+  end_drag_next_poke:
+    x: 32
+    y: 437
+  modify_favorite:
+    x: 286
+    y: 75
+  lets_do_it:
+    x: 150
+    y: 459
+  great_league:
+    x: 157
+    y: 347
+  ultra_league:
+    x: 157
+    y: 452
+  master_league:
+    x: 157
+    y: 556
+  lets_battle:
+    x: 150
+    y: 451
+  first_pokemon_in_party:
+    x: 63
+    y: 547
+  use_party:
+    x: 151
+    y: 664
+  rematch:
+    x: 153
+    y: 479
+  sort_button:  # unused
+    x: 273
+    y: 625
+  first_pokemon:
+    x: 45
+    y: 331
+  second_pokemon:
+    x: 152
+    y: 331
+  third_pokemon:
+    x: 258
+    y: 331
+  done_button:
+    x: 228
+    y: 707
+
+change_prng: False
diff --git a/modifyFavorite.py b/modifyFavorite.py
index f68c05d..d0a0afa 100644
--- a/modifyFavorite.py
+++ b/modifyFavorite.py
@@ -7,7 +7,7 @@
 
 import random
 import time
-from configs.iPhone11 import coordinates
+from configs import coordinates
 from functions.cliclick import Cliclick
 import datetime
 
diff --git a/trader.py b/trader.py
index f6630fd..6b4e8ef 100644
--- a/trader.py
+++ b/trader.py
@@ -13,7 +13,7 @@
 import datetime
 
 # Custom imports
-from configs.iPhone11 import coordinates
+from configs import coordinates
 from functions.cliclick import Cliclick
 import functions.utils as utils
 

From 8c0f1c25fa8ba1d14777614ae2e3028c2621fce5 Mon Sep 17 00:00:00 2001
From: Matt Popovich <popovich.matt@gmail.com>
Date: Sat, 3 Jan 2026 13:32:38 -0500
Subject: [PATCH 2/2] Fix comment

---
 tests/test_utils_random_sleep.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_utils_random_sleep.py b/tests/test_utils_random_sleep.py
index 7dffe4e..a62d26a 100644
--- a/tests/test_utils_random_sleep.py
+++ b/tests/test_utils_random_sleep.py
@@ -1,5 +1,5 @@
 """
-Test utils.py's randomize_location function.
+Test utils.py's random_sleep function.
 """
 
 from functions.utils import random_sleep