mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-24 13:27:17 +00:00
Code Issues Releases Wiki Activity

Merge pull request #270 from jruderman/drc2

Browse Source 
Dice hover map now indicates hardness with color
This commit is contained in:
Zeno Rogue 2021-07-31 20:36:13 +02:00 committed by GitHub
commit ed1a1dc37c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
complex2.cpp
View File

@ -911,6 +911,7 @@ EX namespace dice {
int faces; int faces;
int facesides; int facesides;
int order; int order;
int highest_hardness;
die_structure(int ord, const vector<vector<int>>& v) { die_structure(int ord, const vector<vector<int>>& v) {
sides = v; sides = v;
spins = sides; spins = sides;
@ -933,6 +934,9 @@ EX namespace dice {
for(int i=0; i<faces; i++) for(int i=0; i<faces; i++)
for(int j: sides[i]) for(int j: sides[i])
hardness[i] = min(hardness[i], hardness[j]+1); hardness[i] = min(hardness[i], hardness[j]+1);
highest_hardness = 0;
for(int i=0; i<faces; i++)
highest_hardness = max(highest_hardness, hardness[i]);
} }
}; };
@ -1201,7 +1205,11 @@ EX namespace dice {
visit(c, dd, V); visit(c, dd, V);
for(int i=0; i<isize(data); i++) { for(int i=0; i<isize(data); i++) {
auto dat = data[i]; auto dat = data[i];
queuestr(fpp ? dat.V * zpush(cgi.FLOOR) : dat.V, .5, its(dat.dd.val+1), 0xFF8000FF); int wa = dw->hardness[dat.dd.val];
int wb = dw->highest_hardness;
unsigned int red = ((wa * 0x00) + ((wb-wa) * 0xff)) / wb;
color_t col = 0xFF0000FF + (red << 16);
queuestr(fpp ? dat.V * zpush(cgi.FLOOR) : dat.V, .5, its(dat.dd.val+1), col);
if(i <= 22) if(i <= 22)
forCellIdEx(c2, id, dat.c) if(can_roll(si, dat.dd.dir, movei(dat.c, id)) && !visited.count(c2)) { forCellIdEx(c2, id, dat.c) if(can_roll(si, dat.dd.dir, movei(dat.c, id)) && !visited.count(c2)) {
auto re = roll_effect(movei(dat.c, id), dat.dd); auto re = roll_effect(movei(dat.c, id), dat.dd);