mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-06-27 15:32:53 +00:00
Code Issues Releases Wiki Activity

unlimited modecodes

Browse Source
This commit is contained in:
Zeno Rogue 2017-08-18 01:40:07 +02:00
parent f9cd83b8a7
commit 5095826bee
3 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
game.cpp
View File

@ -86,7 +86,8 @@ extern void DEBT(const char *buf);
bool eq(short a, short b) { return a==b; } bool eq(short a, short b) { return a==b; }
// game state // game state
int items[ittypes], hiitems[MODECODES][ittypes], kills[motypes], explore[10], exploreland[10][landtypes], landcount[landtypes]; int items[ittypes], kills[motypes], explore[10], exploreland[10][landtypes], landcount[landtypes];
map<modecode_t, array<int, ittypes> > hiitems;
bool orbused[ittypes], lastorbused[ittypes]; bool orbused[ittypes], lastorbused[ittypes];
bool playermoved = true; // center on the PC? bool playermoved = true; // center on the PC?
bool flipplayer = true; // flip the player image after move, do not flip after attack bool flipplayer = true; // flip the player image after move, do not flip after attack

5
hyper.h
View File

@ -546,7 +546,10 @@ bool isAlchAny(cell *c);
extern cellwalker cwt; // player character position extern cellwalker cwt; // player character position
extern int sval; extern int sval;
extern int items[ittypes], hiitems[MODECODES][ittypes], kills[motypes], explore[10], exploreland[10][landtypes], landcount[landtypes]; extern int items[ittypes], kills[motypes], explore[10], exploreland[10][landtypes], landcount[landtypes];
typedef int modecode_t;
extern map<modecode_t, array<int, ittypes> > hiitems;
extern eLand firstland, specialland; extern eLand firstland, specialland;
bool pseudohept(cell *c); bool pseudohept(cell *c);

40
yendor.cpp
View File

@ -7,11 +7,9 @@
namespace peace { extern bool on; } namespace peace { extern bool on; }
#define MODECODES 255
int hiitemsMax(eItem it) { int hiitemsMax(eItem it) {
int mx = 0; int mx = 0;
for(int i=0; i<MODECODES; i++) if(hiitems[i][it] > mx) mx = hiitems[i][it]; for(auto& a: hiitems) if(a.second[it] > mx) mx = a.second[it];
return mx; return mx;
} }
@ -53,8 +51,8 @@ namespace yendor {
int lastchallenge; int lastchallenge;
#define YENDORLEVELS 30 #define YENDORLEVELS 30
int bestscore[MODECODES][YENDORLEVELS]; map<modecode_t, array<int, YENDORLEVELS>> bestscore;
#define YF_DEAD 1 #define YF_DEAD 1
#define YF_WALLS 2 #define YF_WALLS 2
@ -584,15 +582,17 @@ namespace tactic {
bool trailer = false; bool trailer = false;
bool on = false; bool on = false;
int id; int id;
int recordsum[MODECODES][landtypes];
int lsc[MODECODES][landtypes][MAXTAC]; map<modecode_t, array<int, landtypes>> recordsum;
map<modecode_t, array<array<int, MAXTAC>, landtypes> > lsc;
eLand lasttactic; eLand lasttactic;
struct scoredata { struct scoredata {
string username; string username;
int scores[landtypes]; int scores[landtypes];
}; };
vector<scoredata> scoreboard[MODECODES]; map<modecode_t, vector<scoredata>> scoreboard;
int chances(eLand l) { int chances(eLand l) {
if(modecode() != 0 && l != laCamelot) return 3; if(modecode() != 0 && l != laCamelot) return 3;
@ -719,7 +719,7 @@ namespace tactic {
if(unlocked || autocheat) { if(unlocked || autocheat) {
for(int ii=0; ii<ch; ii++) for(int ii=0; ii<ch; ii++)
if(displayfrZ(xr*(24+2*ii), i0, 1, (vf-4)*4/5, lsc[xc][l][ii] >= 0 ? its(lsc[xc][l][ii]) : "-", col, 16)) if(displayfrZ(xr*(24+2*ii), i0, 1, (vf-4)*4/5, lsc[xc][l][ii] > 0 ? its(lsc[xc][l][ii]) : "-", col, 16))
getcstat = 1000 + i1; getcstat = 1000 + i1;
if(displayfrZ(xr*(24+2*10), i0, 1, (vf-4)*4/5, if(displayfrZ(xr*(24+2*10), i0, 1, (vf-4)*4/5,
@ -842,13 +842,8 @@ int newmodecode = 255;
int modecode() { int modecode() {
#if CAP_SAVE #if CAP_SAVE
if(anticheat::tampered || cheater) return 6; if(anticheat::tampered || cheater) return 6;
#if CAP_TOUR
if(tour::on) return 6;
#endif #endif
if(quotient) return 6;
#endif
if(peace::on) return 6;
if(inv::on) return 254; // no code yet
int xcode = 0; int xcode = 0;
if(shmup::on) xcode += 2; if(shmup::on) xcode += 2;
@ -867,7 +862,20 @@ int modecode() {
int np = numplayers()-1; if(np<0 || np>5) np=5; int np = numplayers()-1; if(np<0 || np>5) np=5;
return modecodetable[xcode][np]; int mct = modecodetable[xcode][np];
if(geometry == gTorus) mct += 512;
if(geometry == gQuotient) mct += 1024;
if(geometry == gQuotient2) mct += 1536;
#if CAP_INV
if(inv::on) mct += 2048;
#endif
if(peace::on) mct += 4096;
#if CAP_TOUR
if(tour::on) mct += 8192;
#endif
if(numplayers() == 7) mct += 16384;
return mct;
} }
void buildmodetable() { void buildmodetable() {