mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2024-12-25 17:40:36 +00:00
Merge pull request #352 from jlmjlm/gal21b
Make tortoise if first 21/21 tile created in > 100 turns.
This commit is contained in:
commit
17c254e2b4
@ -2513,6 +2513,7 @@ EX namespace tortoise {
|
|||||||
EX map<cell*, int> emap;
|
EX map<cell*, int> emap;
|
||||||
EX map<cell*, int> babymap;
|
EX map<cell*, int> babymap;
|
||||||
EX int last;
|
EX int last;
|
||||||
|
EX int last21tort;
|
||||||
|
|
||||||
#if HDR
|
#if HDR
|
||||||
enum tflag {
|
enum tflag {
|
||||||
|
@ -1801,11 +1801,13 @@ EX void giantLandSwitch(cell *c, int d, cell *from) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
ONEMPTY {
|
ONEMPTY {
|
||||||
if(hrand_monster(ls::hv_structure() ? 8000 : 4000) < (peace::on ? 750 : 50 + items[itBabyTortoise]*2 + yendor::hardness() * 6) && !safety) {
|
bool mk21tor = (tortoise::seek() && !((tortoise::getb(c) ^ tortoise::seekbits) & tortoise::mask) && (turncount > tortoise::last21tort + 100));
|
||||||
|
if((mk21tor || hrand_monster(ls::hv_structure() ? 8000 : 4000) < (peace::on ? 750 : 50 + items[itBabyTortoise]*2 + yendor::hardness() * 6)) && !safety) {
|
||||||
c->monst = moTortoise;
|
c->monst = moTortoise;
|
||||||
c->hitpoints = 3;
|
c->hitpoints = 3;
|
||||||
auto val = tortoise::getb(c);
|
auto val = tortoise::getb(c);
|
||||||
tortoise::emap[c] = val;
|
tortoise::emap[c] = val;
|
||||||
|
if (mk21tor) tortoise::last21tort = turncount;
|
||||||
}
|
}
|
||||||
else if(ls::hv_structure() && hrand(10000) <= 250) {
|
else if(ls::hv_structure() && hrand(10000) <= 250) {
|
||||||
c->item = itCompass;
|
c->item = itCompass;
|
||||||
|
@ -377,6 +377,7 @@ EX void initgame() {
|
|||||||
sagephase = 0; hardcoreAt = 0;
|
sagephase = 0; hardcoreAt = 0;
|
||||||
timerstopped = false;
|
timerstopped = false;
|
||||||
savecount = 0; savetime = 0;
|
savecount = 0; savetime = 0;
|
||||||
|
tortoise::last21tort = 0;
|
||||||
cheater = 0;
|
cheater = 0;
|
||||||
if(autocheat) cheater = 1;
|
if(autocheat) cheater = 1;
|
||||||
if(!wfc::use_eclectic) cheater = 1;
|
if(!wfc::use_eclectic) cheater = 1;
|
||||||
|
Loading…
Reference in New Issue
Block a user