From ca8d39ecad2e44262bd41ac72058078e341718c1 Mon Sep 17 00:00:00 2001
From: Zach Parks <zach@alliware.com>
Date: Fri, 28 Jun 2024 20:09:49 -0500
Subject: [PATCH] Fix logic issue with Mario Wings to the Sky not requiring
 cannon.

---
 docs/changelogs/1.2.1.json             | 3 +++
 pack_root/manifest.json                | 2 +-
 pack_root/scripts/logic/stages/bob.lua | 2 +-
 versions.json                          | 8 ++++++++
 4 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 docs/changelogs/1.2.1.json

diff --git a/docs/changelogs/1.2.1.json b/docs/changelogs/1.2.1.json
new file mode 100644
index 0000000..29bd6b7
--- /dev/null
+++ b/docs/changelogs/1.2.1.json
@@ -0,0 +1,3 @@
+[
+    "Fix logic issue with Mario Wings to the Sky not requiring cannon."
+]
diff --git a/pack_root/manifest.json b/pack_root/manifest.json
index d8d0446..a9d35e9 100644
--- a/pack_root/manifest.json
+++ b/pack_root/manifest.json
@@ -3,7 +3,7 @@
     "platform": "pc",
     "game_name": "Super Mario 64",
     "package_uid": "pharware-sm64-pack",
-    "package_version": "1.2.0",
+    "package_version": "1.2.1",
     "min_poptracker_version": "0.25.5",
     "versions_url": "https://raw.githubusercontent.com/ThePhar/APSM64TrackerPack/main/versions.json",
     "author": "Phar",
diff --git a/pack_root/scripts/logic/stages/bob.lua b/pack_root/scripts/logic/stages/bob.lua
index 948413a..70072a4 100644
--- a/pack_root/scripts/logic/stages/bob.lua
+++ b/pack_root/scripts/logic/stages/bob.lua
@@ -11,7 +11,7 @@ end
 function CanAccessBOBWings()
     return GetAccessibility({
         (HasCannon(course) and HasCap("WC")),
-        (math.min(StrictCannonAccessibilityLevel(), StrictCapAccessibilityLevel())),
+        (HasCannon(course) and StrictCapAccessibilityLevel()),
     })
 end
 
diff --git a/versions.json b/versions.json
index c9756b8..7782633 100644
--- a/versions.json
+++ b/versions.json
@@ -1,5 +1,13 @@
 {
     "versions": [
+        {
+            "package_version": "1.2.1",
+            "download_url": "https://github.com/ThePhar/APSM64TrackerPack/releases/download/1.2.1/PharAPSM64_1.2.1.zip",
+            "sha256": "0cfa30f73fc28ed6a1dd1b8fcbfbfd06653410f86507085b3141218e6d7de1f4",
+            "changelog": [
+                "Fix logic issue with Mario Wings to the Sky not requiring cannon."
+            ]
+        },
         {
             "package_version": "1.2.0",
             "download_url": "https://github.com/ThePhar/APSM64TrackerPack/releases/download/1.2.0/PharAPSM64_1.2.0.zip",