From d0a271878b5258e85d228ed98bcb7cdb294fc051 Mon Sep 17 00:00:00 2001
From: Arthur O'Dwyer <arthur.j.odwyer@gmail.com>
Date: Mon, 30 Oct 2017 18:17:12 -0700
Subject: [PATCH 1/2] Implement the "gain Orb of Yendor" keyboard shortcut.

Alternatively, we could just remove this option from the menu
(it's not implemented prior to this patch).
---
 debug.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/debug.cpp b/debug.cpp
index 2f32876e..9fa162f5 100644
--- a/debug.cpp
+++ b/debug.cpp
@@ -185,6 +185,10 @@ bool applyCheat(char u, cell *c = NULL) {
       }
     cheater++; addMessage(XLAT("Collected the keys!"));
     }
+  if(u == 'Y'-64) {
+    yendor::collected(cwt.c);
+    cheater++;
+    }
   if(u == 'P') {
     items[itSavedPrincess]++;
     princess::saved = true;
@@ -319,7 +323,6 @@ void showCheatMenu() {
   dialog::addItem(XLAT("gain kills"), 'K');
   dialog::addItem(XLAT("Hyperstone Quest"), 'C');
   dialog::addItem(XLAT("summon orbs"), 'O');
-  dialog::addItem(XLAT("gain Orb of Yendor"), 'Y');
   dialog::addItem(XLAT("summon lots of treasure"), 'T'-64);
   dialog::addItem(XLAT("Safety (quick save)"), 'S');
   dialog::addItem(XLAT("Select the land ---"), 'L');
@@ -328,6 +331,7 @@ void showCheatMenu() {
   dialog::addItem(XLAT("deplete orb powers"), 'M');
   dialog::addItem(XLAT("save a Princess"), 'P');
   dialog::addItem(XLAT("unlock Orbs of Yendor"), 'Y');
+  dialog::addItem(XLAT("gain Orb of Yendor"), 'Y'-64);
   dialog::addItem(XLAT("switch ghost timer"), 'G'-64);
   dialog::addItem(XLAT("switch web display"), 'W'-64);
   dialog::addItem(XLAT("peaceful mode"), 'P'-64);

From 5c8d117f875f71a76645684f9e53783ff3c7f1a1 Mon Sep 17 00:00:00 2001
From: Arthur O'Dwyer <arthur.j.odwyer@gmail.com>
Date: Mon, 30 Oct 2017 18:44:54 -0700
Subject: [PATCH 2/2] Show "Return to the normal game" in the Yendor menu iff
 Yendor mode is on.

This eliminates the need to explain why it's a no-op half of the time.
---
 yendor.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/yendor.cpp b/yendor.cpp
index 8bdeb694..6d403cfb 100644
--- a/yendor.cpp
+++ b/yendor.cpp
@@ -488,7 +488,8 @@ namespace yendor {
       }
 
     dialog::addBreak(60);
-    dialog::addItem(XLAT("Return to the normal game"), '0');
+    if (yendor::on)
+      dialog::addItem(XLAT("Return to the normal game"), '0');
     dialog::addSelItem(XLAT(
       easy ? "Challenges do not get harder" : "Each challenge gets harder after each victory"),
       " " + XLAT(easy ? "easy" : "challenge"), '1');