mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-25 01:20:37 +00:00
Code Issues Releases Wiki Activity

removed tactic::trailer

Browse Source
This commit is contained in:
Zeno Rogue 2020-03-27 19:57:57 +01:00
parent 32baf01192
commit 63c9cc1060
5 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bigstuff.cpp
View File

@ -1359,7 +1359,7 @@ EX int wallchance(cell *c, bool deepOcean) {
l == laCrossroads4 ? (weirdhyperbolic ? 5000 : 0) : l == laCrossroads4 ? (weirdhyperbolic ? 5000 : 0) :
(l == laMirror && !yendor::generating) ? 6000 : (l == laMirror && !yendor::generating) ? 6000 :
l == laTerracotta ? 250 : l == laTerracotta ? 250 :
(tactic::on && !tactic::trailer) ? 0 : tactic::on ? 0 :
racing::on ? 0 : racing::on ? 0 :
l == laCaribbean ? 500 : l == laCaribbean ? 500 :
(l == laWarpSea || l == laWarpCoast) ? 500 : (l == laWarpSea || l == laWarpCoast) ? 500 :

4
landlock.cpp
View File

@ -154,7 +154,7 @@ EX void countHyperstoneQuest(int& i1, int& i2) {
EX bool hyperstonesUnlocked() { EX bool hyperstonesUnlocked() {
int i1, i2; int i1, i2;
if(tactic::on && isCrossroads(specialland) && !tactic::trailer) return true; if(tactic::on && isCrossroads(specialland)) return true;
countHyperstoneQuest(i1, i2); countHyperstoneQuest(i1, i2);
return i1 == i2; return i1 == i2;
} }
@ -331,7 +331,7 @@ EX eLand getNewLand(eLand old) {
} }
#endif #endif
if(tactic::on && !(tactic::trailer && old == specialland)) return specialland; if(tactic::on) return specialland;
if((weirdhyperbolic || cheater) && specialland != old && specialland != laCrossroads4 && specialland != laIce && !chaosmode && old != laBarrier && !isCyclic(specialland) && specialland != laBrownian) if((weirdhyperbolic || cheater) && specialland != old && specialland != laCrossroads4 && specialland != laIce && !chaosmode && old != laBarrier && !isCyclic(specialland) && specialland != laBrownian)
return specialland; return specialland;

1
orbgen.cpp
View File

@ -518,7 +518,6 @@ EX void placeLocalOrbs(cell *c) {
int ch = hrand(oi.lchance); int ch = hrand(oi.lchance);
if(ch == 1 && chaosmode && hrand(2) == 0 && items[treasureType(oi.l)] * landMultiplier(oi.l) >= (11+hrand(15))) if(ch == 1 && chaosmode && hrand(2) == 0 && items[treasureType(oi.l)] * landMultiplier(oi.l) >= (11+hrand(15)))
ch = 0; ch = 0;
if(tactic::trailer && ch < 5) ch = 0;
int tc = items[treasureType(oi.l)] * landMultiplier(oi.l); int tc = items[treasureType(oi.l)] * landMultiplier(oi.l);
int tcmin = treasureForLocal(); int tcmin = treasureForLocal();
if(inv::on) { if(inv::on) {

16
system.cpp
View File

@ -75,7 +75,6 @@ EX hookset<bool()> *hooks_welcome_message;
/** Print the welcome message during the start of game. Depends on the current mode and other settings. */ /** Print the welcome message during the start of game. Depends on the current mode and other settings. */
EX void welcomeMessage() { EX void welcomeMessage() {
if(callhandlers(false, hooks_welcome_message)) return; if(callhandlers(false, hooks_welcome_message)) return;
else if(tactic::trailer) return;
#if CAP_TOUR #if CAP_TOUR
else if(tour::on) return; // displayed by tour else if(tour::on) return; // displayed by tour
#endif #endif
@ -138,10 +137,6 @@ EX void welcomeMessage() {
#endif #endif
} }
int trailer_cash0 = 5;
int trailer_cash1 = 15;
bool trailer_safety = true;
/** These hooks are called at the start of initgame. */ /** These hooks are called at the start of initgame. */
EX hookset<void()> *hooks_initgame; EX hookset<void()> *hooks_initgame;
@ -231,9 +226,6 @@ EX void initgame() {
if(hiitemsMax(itWine) >= 25) items[itWine] = min(hiitemsMax(itWine), 50); if(hiitemsMax(itWine) >= 25) items[itWine] = min(hiitemsMax(itWine), 50);
} }
if(tactic::on && tactic::trailer)
items[treasureType(firstland)] = trailer_cash0;
yendor::lastchallenge = yendor::challenge; yendor::lastchallenge = yendor::challenge;
if(shmup::on) shmup::init(); if(shmup::on) shmup::init();
@ -273,9 +265,7 @@ EX void initgame() {
// extern int sightrange; sightrange = 9; // extern int sightrange; sightrange = 9;
// cwt.at->land = laHell; items[itHell] = 10; // cwt.at->land = laHell; items[itHell] = 10;
for(int i=BARLEV; i>=7 - getDistLimit() - genrange_bonus; i--) { for(int i=BARLEV; i>=7 - getDistLimit() - genrange_bonus; i--) {
if(tactic::trailer && cwt.at->land != laClearing) safety = trailer_safety;
setdist(cwt.at, i, NULL); setdist(cwt.at, i, NULL);
if(tactic::trailer) safety = false;
currentmap->verify(); currentmap->verify();
} }
@ -309,9 +299,6 @@ EX void initgame() {
multi::whereto[i].d = MD_UNDECIDED; multi::whereto[i].d = MD_UNDECIDED;
} }
if(tactic::on && tactic::trailer)
items[treasureType(firstland)] = trailer_cash1;
yendor::init(3); yendor::init(3);
peace::simon::init(); peace::simon::init();
@ -1037,8 +1024,7 @@ EX void saveStats(bool emergency IS(false)) {
#if ISMOBILE==0 #if ISMOBILE==0
DEBB(DF_INIT, ("Game statistics saved to ", scorefile)); DEBB(DF_INIT, ("Game statistics saved to ", scorefile));
if(!tactic::trailer) addMessage(XLAT("Game statistics saved to %1", scorefile));
addMessage(XLAT("Game statistics saved to %1", scorefile));
#endif #endif
fclose(f); fclose(f);
} }

1
yendor.cpp
View File

@ -807,7 +807,6 @@ EX namespace yendor {
#define MAXTAC 20 #define MAXTAC 20
EX namespace tactic { EX namespace tactic {
EX bool trailer = false;
EX bool on = false; EX bool on = false;
EX int id; EX int id;