From 7c84d2e554f41c46cc7d7e6b99e0e0d5b939eb5f Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Thu, 3 Jan 2019 01:59:12 +0100 Subject: [PATCH] achievements/leaderboards for the new lands/modes --- achievement.cpp | 28 ++++++++++++++++++++++++++-- bigstuff.cpp | 2 +- hyper.h | 2 +- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/achievement.cpp b/achievement.cpp index 65914670..c0f78a5b 100644 --- a/achievement.cpp +++ b/achievement.cpp @@ -3,7 +3,7 @@ namespace hr { -#define NUMLEADER 78 +#define NUMLEADER 82 bool offlineMode = false; @@ -62,7 +62,11 @@ const char* leadernames[NUMLEADER] = { "Lava Lilies", // 74 "Turquoises", // 75 "Chrysoberyls", // 76 - "Tasty Jellies" // 77 + "Tasty Jellies", // 77 + "Sphalerites", // 78 + "Shining Gems", // 79 + "Meteorites", // 80 + "Racing Official Track", // 81 }; #define LB_STATISTICS 62 @@ -213,6 +217,10 @@ void achievement_collection(eItem it, int prevgold, int newgold) { if(it == itRuins) achievement_gain("RUIN1"); if(it == itSwitch) achievement_gain("JELLZ1"); + + if(it == itBrownian) achievement_gain("BROWN1"); + if(it == itVarTreasure) achievement_gain("RADIO1"); + if(it == itWest) achievement_gain("FREEFALL1"); } // 32 @@ -290,6 +298,10 @@ void achievement_collection(eItem it, int prevgold, int newgold) { if(it == itRuins) achievement_gain("RUIN2"); if(it == itSwitch) achievement_gain("JELLZ2"); + + if(it == itBrownian) achievement_gain("BROWN2"); + if(it == itVarTreasure) achievement_gain("RADIO2"); + if(it == itWest) achievement_gain("FREEFALL2"); } if(q == (inv::on ? 50 : 25)) { @@ -357,6 +369,10 @@ void achievement_collection(eItem it, int prevgold, int newgold) { if(it == itRuins) achievement_gain("RUIN3"); if(it == itSwitch) achievement_gain("JELLZ3"); + + if(it == itBrownian) achievement_gain("BROWN3"); + if(it == itVarTreasure) achievement_gain("RADIO3"); + if(it == itWest) achievement_gain("FREEFALL3"); } if(q == 50 && !inv::on) { @@ -421,6 +437,10 @@ void achievement_collection(eItem it, int prevgold, int newgold) { if(it == itRuins) achievement_gain("RUIN4"); if(it == itSwitch) achievement_gain("JELLZ4"); + + if(it == itBrownian) achievement_gain("BROWN4"); + if(it == itVarTreasure) achievement_gain("RADIO4"); + if(it == itWest) achievement_gain("FREEFALL4"); } if(it == itOrbYendor) { @@ -564,6 +584,10 @@ void improveItemScores() { improve_score(76, itRuins); improve_score(77, itSwitch); + + improve_score(78, itBrownian); + improve_score(79, itVarTreasure); + improve_score(80, itWest); } int next_stat_tick; diff --git a/bigstuff.cpp b/bigstuff.cpp index 0f291853..645e9613 100644 --- a/bigstuff.cpp +++ b/bigstuff.cpp @@ -1137,7 +1137,7 @@ void buildBigStuff(cell *c, cell *from) { hrand(2000) < (PURE ? 500 : 1000) && !tactic::on && !racing::on && !yendor::on))) createAlternateMap(c, 2, hsA); - if(c->land == laOcean && deepOcean && !generatingEquidistant && hrand(10000) < 20 && no_barriers_in_radius(c, 2) && !weirdhyperbolic) + if(c->land == laOcean && deepOcean && !generatingEquidistant && hrand(10000) < 20 && no_barriers_in_radius(c, 2) && hyperbolic && !quotient) brownian::init_further(c); if(c->land == laCaribbean && horo_ok() && ctof(c) && !c->master->alt) diff --git a/hyper.h b/hyper.h index f2ee75e0..20f554c7 100644 --- a/hyper.h +++ b/hyper.h @@ -159,7 +159,7 @@ void addMessage(string s, char spamtype = 0); #define LB_YENDOR_CHALLENGE 40 #define LB_PURE_TACTICS 41 -#define NUMLEADER 78 +#define NUMLEADER 82 #define LB_PURE_TACTICS_SHMUP 49 #define LB_PURE_TACTICS_COOP 50