From e8a7200740019de07a535f23060195621cfada8b Mon Sep 17 00:00:00 2001
From: Trevor L <80716066+TRPG0@users.noreply.github.com>
Date: Sat, 28 Oct 2023 13:47:14 -0600
Subject: [PATCH] Blasphemous: Include ranged attack in logic for all
 difficulties (#2271)

---
 worlds/blasphemous/Options.py             | 1 +
 worlds/blasphemous/Rules.py               | 8 +++++---
 worlds/blasphemous/docs/en_Blasphemous.md | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/worlds/blasphemous/Options.py b/worlds/blasphemous/Options.py
index ea304d22..127a1dc7 100644
--- a/worlds/blasphemous/Options.py
+++ b/worlds/blasphemous/Options.py
@@ -67,6 +67,7 @@ class StartingLocation(ChoiceIsRandom):
 
 class Ending(Choice):
     """Choose which ending is required to complete the game.
+    Talking to Tirso in Albero will tell you the selected ending for the current game.
     Ending A: Collect all thorn upgrades.
     Ending C: Collect all thorn upgrades and the Holy Wound of Abnegation."""
     display_name = "Ending"
diff --git a/worlds/blasphemous/Rules.py b/worlds/blasphemous/Rules.py
index 4218fa94..5d882921 100644
--- a/worlds/blasphemous/Rules.py
+++ b/worlds/blasphemous/Rules.py
@@ -578,11 +578,12 @@ def rules(blasphemousworld):
             or state.has("Purified Hand of the Nun", player)
             or state.has("D01Z02S03[NW]", player) 
             and (
-                can_cross_gap(state, logic, player, 1)
+                can_cross_gap(state, logic, player, 2)
                 or state.has("Lorquiana", player)
                 or aubade(state, player)
                 or state.has("Cantina of the Blue Rose", player)
                 or charge_beam(state, player)
+                or state.has("Ranged Skill", player)
             )
         ))
     set_rule(world.get_location("Albero: Lvdovico's 1st reward", player),
@@ -702,10 +703,11 @@ def rules(blasphemousworld):
     # Items
     set_rule(world.get_location("WotBC: Cliffside Child of Moonlight", player),
         lambda state: (
-            can_cross_gap(state, logic, player, 1)
+            can_cross_gap(state, logic, player, 2)
             or aubade(state, player)
             or charge_beam(state, player)
-            or state.has_any({"Lorquiana", "Cante Jondo of the Three Sisters", "Cantina of the Blue Rose", "Cloistered Ruby"}, player)
+            or state.has_any({"Lorquiana", "Cante Jondo of the Three Sisters", "Cantina of the Blue Rose", \
+                              "Cloistered Ruby", "Ranged Skill"}, player)
             or precise_skips_allowed(logic)
         ))
     # Doors
diff --git a/worlds/blasphemous/docs/en_Blasphemous.md b/worlds/blasphemous/docs/en_Blasphemous.md
index 15223213..1ff7f5a9 100644
--- a/worlds/blasphemous/docs/en_Blasphemous.md
+++ b/worlds/blasphemous/docs/en_Blasphemous.md
@@ -19,6 +19,7 @@ In addition, there are other changes to the game that make it better optimized f
 - The Apodictic Heart of Mea Culpa can be unequipped.
 - Dying with the Immaculate Bead is unnecessary, it is automatically upgraded to the Weight of True Guilt.
 - If the option is enabled, the 34 corpses in game will have their messages changed to give hints about certain items and locations. The Shroud of Dreamt Sins is not required to hear them.
+- Talking to Tirso in Albero will tell you the selected ending for the current game.
 
 ## What has been changed about the side quests?