1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-25 01:20:37 +00:00

fixed cheatmarking

This commit is contained in:
Zeno Rogue 2018-04-14 09:34:33 +02:00
parent 66c166a81c
commit 15e26435f9
2 changed files with 9 additions and 9 deletions

View File

@ -90,7 +90,7 @@ void initgame() {
bool use_special_land = bool use_special_land =
!safety && !safety &&
(peace::on || tactic::on || geometry || gp::on); (peace::on || tactic::on || geometry || gp::on || randomPatternsMode || yendor::on);
if(use_special_land) firstland = specialland; if(use_special_land) firstland = specialland;
@ -251,7 +251,7 @@ void initgame() {
#if CAP_INV #if CAP_INV
if(inv::on) inv::init(); if(inv::on) inv::init();
#endif #endif
if(!randomPatternsMode && !tactic::on && !yendor::on && !peace::on) { if(!use_special_land) {
if(firstland != (princess::challenge ? laPalace : laIce)) cheater++; if(firstland != (princess::challenge ? laPalace : laIce)) cheater++;
} }
welcomeMessage(); welcomeMessage();

View File

@ -303,20 +303,20 @@ namespace yendor {
won = false; won = false;
if(!easy) items[itOrbYendor] = bestscore[modecode()][challenge]; if(!easy) items[itOrbYendor] = bestscore[modecode()][challenge];
chaosmode = (clev().flags & YF_CHAOS); chaosmode = (clev().flags & YF_CHAOS);
specialland = firstland = clev().l; specialland = clev().l;
if(clev().flags & YF_START_AL) { if(clev().flags & YF_START_AL) {
firstland = laAlchemist; specialland = laAlchemist;
items[itElixir] = 50; items[itElixir] = 50;
items[itFeather] = 50; items[itFeather] = 50;
} }
if(firstland == laPower) if(specialland == laPower)
items[itOrbSpeed] = 60, items[itOrbWinter] = 60; items[itOrbSpeed] = 60, items[itOrbWinter] = 60;
if(clev().flags & YF_START_CR) { if(clev().flags & YF_START_CR) {
firstland = laCrossroads; specialland = laCrossroads;
} }
if(firstland == laGraveyard) items[itBone] = 10; if(specialland == laGraveyard) items[itBone] = 10;
if(firstland == laEmerald) items[itEmerald] = 10; if(specialland == laEmerald) items[itEmerald] = 10;
if(firstland == laCocytus) items[itFjord] = 10; if(specialland == laCocytus) items[itFjord] = 10;
if(!euclid) { if(!euclid) {
if(clev().flags & YF_DEAD) items[itGreenStone] = 100; if(clev().flags & YF_DEAD) items[itGreenStone] = 100;
if(clev().flags & YF_DEAD5) items[itGreenStone] = 5; if(clev().flags & YF_DEAD5) items[itGreenStone] = 5;