mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-02-20 04:50:10 +00:00
Code Issues Releases Wiki Activity

removed no longer productive 'overgenerate', improved the down/up limits of sightrange_bonus

Browse Source
This commit is contained in:
Zeno Rogue 2018-04-10 20:25:56 +02:00
parent e41bc0b3b9
commit ebda963d68
8 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.cpp
View File

@ -651,7 +651,7 @@ void showGraphConfig() {
XLAT("+5 = move instantly")); XLAT("+5 = move instantly"));
if(xuni == 'r') { if(xuni == 'r') {
dialog::editNumber(sightrange_bonus, -3, allowIncreasedSight() ? 3 : 0, 1, 0, XLAT("sight range"), dialog::editNumber(sightrange_bonus, -5, allowIncreasedSight() ? 3 : 0, 1, 0, XLAT("sight range"),
XLAT("Roughly 42% cells are on the edge of your sight range. Reducing " XLAT("Roughly 42% cells are on the edge of your sight range. Reducing "
"the sight range makes HyperRogue work faster, but also makes " "the sight range makes HyperRogue work faster, but also makes "
"the game effectively harder.")); "the game effectively harder."));

6
dialogs.cpp
View File

@ -612,10 +612,10 @@ namespace dialog {
// if(ne.editwhat == &whatever) resetGeometry(); // if(ne.editwhat == &whatever) resetGeometry();
if(ne.intval == &sightrange_bonus && sightrange_bonus < -3) if(ne.intval == &sightrange_bonus && sightrange_bonus < 1-getDistLimit())
*ne.editwhat = sightrange_bonus = -3, affect('v'); *ne.editwhat = sightrange_bonus = 1-getDistLimit(), affect('v');
int msr = allowIncreasedSight() ? 10 : 0; int msr = allowIncreasedSight() ? gp::dist_2() * 5 : 0;
if(ne.intval == &sightrange_bonus && sightrange_bonus > msr) if(ne.intval == &sightrange_bonus && sightrange_bonus > msr)
*ne.editwhat = sightrange_bonus = msr, affect('v'); *ne.editwhat = sightrange_bonus = msr, affect('v');

2
game.cpp
View File

@ -3046,8 +3046,6 @@ void bfs() {
for(int i=0; i<qtemp; i++) temps[i]->monst = tempval[i]; for(int i=0; i<qtemp; i++) temps[i]->monst = tempval[i];
buildAirmap(); buildAirmap();
if(overgenerate) doOvergenerate();
} }
bool makeEmpty(cell *c) { bool makeEmpty(cell *c) {

2
graph.cpp
View File

@ -39,7 +39,6 @@ eItem orbToTarget;
eMonster monsterToSummon; eMonster monsterToSummon;
int sightrange_bonus = 0; int sightrange_bonus = 0;
bool overgenerate = false; // generate a bigger area with high sightrange
string mouseovers; string mouseovers;
@ -5304,6 +5303,7 @@ void drawthemap() {
(!playermoved) ? sr+1 : sr + 4; (!playermoved) ? sr+1 : sr + 4;
if(S3>3) maxreclevel+=2; if(S3>3) maxreclevel+=2;
if(gp::on) maxreclevel += gp::dist_2();
drawrec(viewctr, maxreclevel, hsOrigin, cview()); drawrec(viewctr, maxreclevel, hsOrigin, cview());
} }

1
hyper.h
View File

@ -1628,7 +1628,6 @@ extern cell *recallCell;
extern eLand cheatdest; extern eLand cheatdest;
void cheatMoveTo(eLand l); void cheatMoveTo(eLand l);
extern bool overgenerate;
void doOvergenerate(); void doOvergenerate();
void collectMessage(cell *c2, eItem which); void collectMessage(cell *c2, eItem which);

2
hypgraph.cpp
View File

@ -546,7 +546,7 @@ void drawrec(const heptspin& hs, int lev, hstate s, const transmatrix& V) {
hstate s2 = transition(s, d); hstate s2 = transition(s, d);
if(s2 == hsError) continue; if(s2 == hsError) continue;
heptspin hs2 = hs + d + wstep; heptspin hs2 = hs + d + wstep;
drawrec(hs2, lev-2, s2, V * heptmove[d]); drawrec(hs2, lev-gp::dist_2(), s2, V * heptmove[d]);
} }
} }

5
landgen.cpp
View File

@ -19,9 +19,8 @@ bool chaosUnlocked = false;
bool chaosAchieved = false; bool chaosAchieved = false;
void doOvergenerate() { void doOvergenerate() {
if(overgenerate) for(int i=0; i<numplayers(); i++)
for(int i=0; i<numplayers(); i++) setdist(playerpos(i), 7 - getDistLimit() - genrange_bonus, NULL);
setdist(playerpos(i), 7 - getDistLimit() - genrange_bonus, NULL);
} }
bool notDippingFor(eItem i) { bool notDippingFor(eItem i) {

4
rogueviz.cpp
View File

@ -1385,8 +1385,8 @@ void fixparam() {
void rvvideo(const char *fname) { void rvvideo(const char *fname) {
if(kind == kCollatz) { if(kind == kCollatz) {
pngformat = 2; pngformat = 2;
sightrange = 12; sightrange_bonus = 3;
overgenerate = true; genrange_bonus = 3;
dronemode = true; vid.camera_angle = -45; rog3 = true; patterns::whichShape = '8'; dronemode = true; vid.camera_angle = -45; rog3 = true; patterns::whichShape = '8';
vid.aurastr = 512; vid.aurastr = 512;
long long reached = 763ll; long long reached = 763ll;