From 2be1a50ae178a6de7e22919b369a47e236a6d0a2 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Tue, 30 Apr 2024 22:21:59 +0100
Subject: [PATCH] Allow Chao Keying large tiles if the only touching locked
 tiles are Big Challenges

Defuses the 12-long chain scenario in a relatively fair way
---
 src/m_cond.c                  | 4 ++--
 src/menus/extras-challenges.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/m_cond.c b/src/m_cond.c
index e63da18cf..981e062b0 100644
--- a/src/m_cond.c
+++ b/src/m_cond.c
@@ -405,8 +405,8 @@ static void M_ChallengeGridExtraDataAdjacencyRules(challengegridextradata_t *ext
 	{
 		extradata->flags |= CHE_HINT;
 	}
-	// Adjacent locked tile, prevent 10x key skip.
-	else
+	// Adjacent locked small tile, prevent 10x key skip.
+	else if (unlockables[adjacent].majorunlock == false)
 	{
 		extradata->flags &= ~CHE_ALLCLEAR;
 	}
diff --git a/src/menus/extras-challenges.c b/src/menus/extras-challenges.c
index b27198539..8308fae1c 100644
--- a/src/menus/extras-challenges.c
+++ b/src/menus/extras-challenges.c
@@ -507,7 +507,7 @@ static void M_ChallengesTutorial(UINT8 option)
 				"to break open Big Challenge tiles.\n"
 				"\n"
 				"You'll also need to unlock\n"
-				"the surrounding tiles first.\n"
+				"any surrounding small tiles first.\n"
 				), NULL, MM_NOTHING, NULL, NULL);
 			gamedata->majorkeyskipattempted = true;
 			break;