mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2025-05-10 03:04:06 +00:00
Merge branch 'master' of https://github.com/zenorogue/hyperrogue
This commit is contained in:
commit
f271ba6b4d
@ -593,9 +593,7 @@ EX void applyBoxes() {
|
|||||||
|
|
||||||
for(int i=0; i<43; i++) {
|
for(int i=0; i<43; i++) {
|
||||||
if(loading) kills[i] = 0;
|
if(loading) kills[i] = 0;
|
||||||
bool fake =
|
bool fake = (i == moREMOVED || i == moLesserM || i == moTentacletail);
|
||||||
i == moLesserM || i == moNone || i == moWolfMoved || i == moTentacletail ||
|
|
||||||
i == moIvyNext;
|
|
||||||
if(i == moWormtail) applyBoxM(moCrystalSage);
|
if(i == moWormtail) applyBoxM(moCrystalSage);
|
||||||
else if(i == moWormwait) applyBoxM(moFireFairy);
|
else if(i == moWormwait) applyBoxM(moFireFairy);
|
||||||
else if(i == moTentacleEscaping) applyBoxM(moMiner);
|
else if(i == moTentacleEscaping) applyBoxM(moMiner);
|
||||||
@ -603,6 +601,7 @@ EX void applyBoxes() {
|
|||||||
else if(i == moTentaclewait) applyBoxOrb(itOrbThorns);
|
else if(i == moTentaclewait) applyBoxOrb(itOrbThorns);
|
||||||
else if(i == moGreater) applyBoxOrb(itOrbDragon);
|
else if(i == moGreater) applyBoxOrb(itOrbDragon);
|
||||||
else if(i == moGreaterM) applyBoxOrb(itOrbIllusion);
|
else if(i == moGreaterM) applyBoxOrb(itOrbIllusion);
|
||||||
|
else if(i == moWolfMoved) applyBoxM(moWorldTurtle);
|
||||||
else applyBoxM(eMonster(i), fake);
|
else applyBoxM(eMonster(i), fake);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user