mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-03-30 07:17:03 +00:00
Code Issues Releases Wiki Activity

charge help, and fixed a bug in help in weird geometry warped cells

Browse Source
This commit is contained in:
Zeno Rogue 2020-03-01 02:34:27 +01:00
parent 89fe310154
commit 62734bbfc5
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
complex.cpp
View File

@ -192,9 +192,11 @@ EX namespace elec {
EX bool havecharge, haveelec, havethunder; EX bool havecharge, haveelec, havethunder;
EX bool afterOrb; // extra charge from the Orb of Lightning EX bool afterOrb; // extra charge from the Orb of Lightning
#if HDR
enum eCharge { enum eCharge {
ecCharged, ecGrounded, ecIsolator, ecConductor ecCharged, ecGrounded, ecIsolator, ecConductor
}; };
#endif
bool conduct(eCharge cf, eCharge ct) { bool conduct(eCharge cf, eCharge ct) {
if(ct == ecIsolator) return false; if(ct == ecIsolator) return false;
@ -202,7 +204,7 @@ EX namespace elec {
return ct != cf; return ct != cf;
} }
eCharge getCharge(cell *c) { EX eCharge getCharge(cell *c) {
bool ao = afterOrb && c->ligon; bool ao = afterOrb && c->ligon;
/* not yet generated */ /* not yet generated */

11
help.cpp
View File

@ -935,7 +935,16 @@ EX void describeMouseover() {
appendHelp(string("\n\n") + XLAT(warpdesc)); appendHelp(string("\n\n") + XLAT(warpdesc));
if(S7 != 7 || !BITRUNCATED) if(c->item != itOrb37) if(S7 != 7 || !BITRUNCATED) if(c->item != itOrb37)
help += "\n\n" + other_geometry() + forbidden_unmarked(); appendHelp("\n\n" + other_geometry() + forbidden_unmarked());
}
if(isElectricLand(c) || isElectricLand(cwt.at->land)) {
using namespace elec;
eCharge ch = getCharge(c);
if(ch == ecCharged) appendHelp("\n\nThis cell is charged.");
if(ch == ecGrounded) appendHelp("\n\nThis cell is grounded.");
if(ch == ecConductor) appendHelp("\n\nThis cell is currently conductive.");
if(ch == ecIsolator) appendHelp("\n\nThis cell is currently not conductive.");
} }
} }
else { else {