From 12d21161bffd2b51965b4938c37cb6dfea26f2a4 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Sun, 3 Dec 2017 19:12:15 +0100
Subject: [PATCH] one more special case in orb unlock descs

---
 help.cpp     | 3 ++-
 landlock.cpp | 6 ++++++
 menus.cpp    | 4 ++--
 orbgen.cpp   | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/help.cpp b/help.cpp
index 68d5abff..cb96879b 100644
--- a/help.cpp
+++ b/help.cpp
@@ -146,7 +146,8 @@ void describeOrb(string& help, const orbinfo& oi) {
   if(inv::on) return;
   eOrbLandRelation olr = getOLR(oi.orb, getPrizeLand());
   eItem tr = treasureType(oi.l);
-  help += "\n\n" + XLAT(olrDescriptions[olr], cwt.c->land, tr, treasureType(cwt.c->land));
+  eItem tt = treasureTypeUnlock(cwt.c->land, oi.orb);
+  help += "\n\n" + XLAT(olrDescriptions[olr], cwt.c->land, tr, tt);
   int t = items[tr] * landMultiplier(oi.l);
   if(t >= 25)
   if(olr == olrPrize25 || olr == olrPrize3 || olr == olrGuest || olr == olrMonster || olr == olrAlways) {
diff --git a/landlock.cpp b/landlock.cpp
index be3e0bd3..886a3b07 100644
--- a/landlock.cpp
+++ b/landlock.cpp
@@ -300,6 +300,12 @@ eItem treasureType(eLand l) {
   return itNone;
   }
 
+eItem treasureTypeUnlock(eLand l, eItem u) {
+  if(u != itOrbLove && l == laPrincessQuest)
+    return itPalace;
+  return treasureType(l);
+  }
+
 eLand landof(eItem it) {
   for(int i=0; i<landtypes; i++) if(treasureType(eLand(i)) == it) return eLand(i);
   return laNone;
diff --git a/menus.cpp b/menus.cpp
index 5f4337e0..ab9cfede 100644
--- a/menus.cpp
+++ b/menus.cpp
@@ -108,7 +108,7 @@ void showOverview() {
         getcstat = 3000+waMirror;
       if(getcstat == 3000+waMirror)
         mouseovers = XLAT(
-          olrDescriptions[getOLR(io, cwt.c->land)], cwt.c->land, it, treasureType(cwt.c->land));
+          olrDescriptions[getOLR(io, cwt.c->land)], cwt.c->land, it, treasureTypeUnlock(curland, io));
       }
     else if(io) {
       if(lv >= 25) col = 0xFFD500;
@@ -125,7 +125,7 @@ void showOverview() {
         getcstat = 2000+io;
       if(getcstat == 2000+io)
         mouseovers = XLAT(
-          olrDescriptions[getOLR(io, curland)], curland, it, treasureType(curland));
+          olrDescriptions[getOLR(io, curland)], curland, it, treasureTypeUnlock(curland, io));
       }
     }
 
diff --git a/orbgen.cpp b/orbgen.cpp
index 2b0d8287..bdf6b4b7 100644
--- a/orbgen.cpp
+++ b/orbgen.cpp
@@ -233,7 +233,7 @@ eOrbLandRelation getOLR(eItem it, eLand l) {
     return olrUseless;
    if(it == itOrbNature && l == laWineyard)
     return olrDangerous;
-  if(it == itOrbFrog && l == laPrincessQuest)
+  if((it == itOrbFrog || it == itOrbDiscord) && l == laPrincessQuest)
     return olrGuest;
   if(it == itOrbDragon && l == laRlyeh)
     return olrMonster;