mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-25 01:20:37 +00:00
Code Issues Releases Wiki Activity

fixed Camelot accessibility help

Browse Source
This commit is contained in:
Zeno Rogue 2020-08-20 16:12:25 +02:00
parent 644d20cd89
commit a4b7819fff
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
content.cpp
View File

@ -1186,7 +1186,7 @@ LAND( 0xFFFF00, "Land of Power", laPower, ZERO, itPower, RESERVED,
LAND( 0xD0D0D0, "Camelot", laCamelot, ZERO | LF_CYCLIC, itHolyGrail, RESERVED, camelothelp ) LAND( 0xD0D0D0, "Camelot", laCamelot, ZERO | LF_CYCLIC, itHolyGrail, RESERVED, camelothelp )
NATIVE((m == moKnight || m == moHedge || m == moFlailer || m == moLancer) ? 1 : 0) 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 ) LAND( 0xD000D0, "Temple of Cthulhu", laTemple, ZERO | LF_CYCLIC, itGrimoire, RESERVED, templehelp )
NATIVE((m == moTentacle || m == moCultist || m == moPyroCultist || m == moCultistLeader) ? 1 : 0) 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 ITEMS_TOTAL
#undef ACCONLY #undef ACCONLY
#undef ACCONLY2 #undef ACCONLY2
#undef ACCONLY3
#undef ACCONLYF #undef ACCONLYF

1
help.cpp
View File

@ -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); } { 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 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 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); #define ACCONLYF(z) s += XLAT("Accessible only from %the1 (until finished).\n", z);
#include "content.cpp" #include "content.cpp"

1
landlock.cpp
View File

@ -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 ITEMS_TOTAL(list, z) { int total = 0; for(eItem x: list) total += items[x]; if(total < z) return false; }
#define ACCONLY(x) #define ACCONLY(x)
#define ACCONLY2(x,y) #define ACCONLY2(x,y)
#define ACCONLY3(x,y,z)
#define ACCONLYF(x) #define ACCONLYF(x)
#include "content.cpp" #include "content.cpp"