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

fixed the interaction of Orb of Chaos and Orb of Time

Browse Source
This commit is contained in:
Zeno Rogue 2020-03-25 13:45:45 +01:00
parent f9580d29f6
commit a967de75e0
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pcmove.cpp
View File

@ -553,16 +553,22 @@ void apply_chaos() {
changes.ccell(cb); changes.ccell(cb);
gcell coa = *ca; gcell coa = *ca;
gcell cob = *cb; gcell cob = *cb;
if(ca->monst != cb->monst)
markOrb(itOrbChaos);
if(ca->wall != cb->wall)
markOrb(itOrbChaos);
if(ca->item != cb->item)
markOrb(itOrbChaos);
copy_metadata(ca, &cob); copy_metadata(ca, &cob);
copy_metadata(cb, &coa); copy_metadata(cb, &coa);
if(!switch_lhu_in(ca->land)) ca->LHU = coa.LHU; if(!switch_lhu_in(ca->land)) ca->LHU = coa.LHU;
if(!switch_lhu_in(cb->land)) cb->LHU = cob.LHU; if(!switch_lhu_in(cb->land)) cb->LHU = cob.LHU;
int sa = ca->mondir - ((cwt+1)+wstep).spin; int sa = ca->mondir - ((cwt+1)+wstep).spin;
int sb = cb->mondir - ((cwt-1)+wstep).spin; int sb = cb->mondir - ((cwt-1)+wstep).spin;
if(!(isFriendly(ca) && markOrb(itOrbEmpathy))) if(ca->monst && !(isFriendly(ca) && markOrb(itOrbEmpathy)))
ca->stuntime = min(ca->stuntime + 3, 15); ca->stuntime = min(ca->stuntime + 3, 15), markOrb(itOrbChaos);
if(!(isFriendly(cb) && markOrb(itOrbEmpathy))) if(cb->monst && !(isFriendly(cb) && markOrb(itOrbEmpathy)))
cb->stuntime = min(cb->stuntime + 3, 15); cb->stuntime = min(cb->stuntime + 3, 15), markOrb(itOrbChaos);
ca->monmirror = !ca->monmirror; ca->monmirror = !ca->monmirror;
cb->monmirror = !cb->monmirror; cb->monmirror = !cb->monmirror;
if(ca->mondir < ca->type) if(ca->mondir < ca->type)