From a4b7819fff12b58706dd019495b9fac65f6e5c70 Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Thu, 20 Aug 2020 16:12:25 +0200 Subject: [PATCH] fixed Camelot accessibility help --- content.cpp | 3 ++- help.cpp | 1 + landlock.cpp | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/content.cpp b/content.cpp index c8ab69f1..3fdeb50d 100644 --- a/content.cpp +++ b/content.cpp @@ -1186,7 +1186,7 @@ LAND( 0xFFFF00, "Land of Power", laPower, ZERO, itPower, RESERVED, LAND( 0xD0D0D0, "Camelot", laCamelot, ZERO | LF_CYCLIC, itHolyGrail, RESERVED, camelothelp ) NATIVE((m == moKnight || m == moHedge || m == moFlailer || m == moLancer) ? 1 : 0) - REQ(ITEMS(itEmerald, U5) ACCONLY2(laCrossroads, laCrossroads3)) + REQ(ITEMS(itEmerald, U5) ACCONLY3(laCrossroads, laCrossroads3, laCrossroads4)) LAND( 0xD000D0, "Temple of Cthulhu", laTemple, ZERO | LF_CYCLIC, itGrimoire, RESERVED, templehelp ) NATIVE((m == moTentacle || m == moCultist || m == moPyroCultist || m == moCultistLeader) ? 1 : 0) @@ -1674,4 +1674,5 @@ MONSTER( '*', 0, "vertex", moRogueviz, ZERO | CF_TECHNICAL, RESERVED, moN #undef ITEMS_TOTAL #undef ACCONLY #undef ACCONLY2 +#undef ACCONLY3 #undef ACCONLYF diff --git a/help.cpp b/help.cpp index 40be1742..1cedb2f6 100644 --- a/help.cpp +++ b/help.cpp @@ -664,6 +664,7 @@ void add_reqs(eLand l, string& s) { { int now = 0; string t = ""; for(eItem i: list) { if(t!="") t += " + "; t += XLATN(iinf[i].name); now += items[i]; } s += XLAT("Treasure required: %1 x %2.\n", its(z), t); buteol(s, now, z); } #define ACCONLY(z) s += XLAT("Accessible only from %the1.\n", z); #define ACCONLY2(z,x) s += XLAT("Accessible only from %the1 or %the2.\n", z, x); + #define ACCONLY3(z,y,x) s += XLAT("Accessible only from %the1 or %the2.\n", z, y, x); #define ACCONLYF(z) s += XLAT("Accessible only from %the1 (until finished).\n", z); #include "content.cpp" diff --git a/landlock.cpp b/landlock.cpp index cd58366e..7e7c1643 100644 --- a/landlock.cpp +++ b/landlock.cpp @@ -124,6 +124,7 @@ EX bool landUnlocked(eLand l) { #define ITEMS_TOTAL(list, z) { int total = 0; for(eItem x: list) total += items[x]; if(total < z) return false; } #define ACCONLY(x) #define ACCONLY2(x,y) + #define ACCONLY3(x,y,z) #define ACCONLYF(x) #include "content.cpp"