mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-06-08 01:14:07 +00:00
Code Issues Releases Wiki Activity

dice:: now work correctly in non-orientable spaces

Browse Source
This commit is contained in:
Zeno Rogue 2021-06-16 11:12:42 +02:00
parent ca6eb9d8ef
commit e6dd27f5bf
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
complex2.cpp
View File

@ -963,6 +963,7 @@ EX namespace dice {
struct die_structure *which; struct die_structure *which;
int val; int val;
int dir; int dir;
bool mirrored;
int happy(); int happy();
}; };
#endif #endif
@ -1113,12 +1114,11 @@ EX namespace dice {
auto& dw = dd.which; auto& dw = dd.which;
int si = isize(dw->sides[val]); int si = dw->facesides;
if(t % si) { println(hlog, "error: bad roll"); return dd; } if(t % si) { println(hlog, "error: bad roll"); return dd; }
int sideid = (rdir - dir) * si / t; int sideid = gmod((rdir - dir) * (dd.mirrored?-1:1) * si / t, si);
if(sideid < 0) sideid += si;
int val1 = dw->sides[val][sideid]; int val1 = dw->sides[val][sideid];
@ -1131,10 +1131,13 @@ EX namespace dice {
int rdir1 = mi.rev_dir_force(); int rdir1 = mi.rev_dir_force();
int dir1 = rdir1 - sideid1 * t1 / si1; bool mirror1 = dd.mirrored ^ mi.mirror();
int dir1 = rdir1 - (mirror1?-1:1) * sideid1 * t1 / si1;
dir1 = gmod(dir1, t1); dir1 = gmod(dir1, t1);
dd.mirrored = mirror1;
dd.val = val1; dd.val = val1;
dd.dir = dir1; dd.dir = dir1;
return dd; return dd;
@ -1211,6 +1214,7 @@ EX namespace dice {
#endif #endif
shiftmatrix V1 = V * ddspin(c, dir) * spin(M_PI); shiftmatrix V1 = V * ddspin(c, dir) * spin(M_PI);
if(dd.mirrored) V1 = V1 * MirrorY;
// loop: // loop:

3
mapeditor.cpp
View File

@ -677,6 +677,7 @@ EX namespace mapstream {
f.write_char(dice::get_die_id(dat.which)); f.write_char(dice::get_die_id(dat.which));
f.write_char(dat.val); f.write_char(dat.val);
f.write_char(dat.dir); f.write_char(dat.dir);
f.write_char(dat.mirrored);
} }
// f.write_char(c->barleft); // f.write_char(c->barleft);
// f.write_char(c->barright); // f.write_char(c->barright);
@ -833,6 +834,8 @@ EX namespace mapstream {
dat.which = dice::get_by_id(f.read_char()); dat.which = dice::get_by_id(f.read_char());
dat.val = f.read_char(); dat.val = f.read_char();
dat.dir = fixspin(rspin, f.read_char(), c->type, f.vernum); dat.dir = fixspin(rspin, f.read_char(), c->type, f.vernum);
if(f.vernum >= 0xA902)
dat.mirrored = f.read_char();
} }
// c->barleft = (eLand) f.read_char(); // c->barleft = (eLand) f.read_char();
// c->barright = (eLand) f.read_char(); // c->barright = (eLand) f.read_char();