2 files changed, 23 insertions, 6 deletions

@@ -1,7 +1,7 @@
 "Your life, and the lives of those who believe in you. Are you willing to put it all on the line?"\nThose words echoed in the child's head more than any other as he put his hands on the lamp. Through it, he could feel the sun's enormous presence far below him. Its power was palpable; a gentle thrumming that tickled his fingers. It was strong -- stronger and nearer than it had been with the other lamps.\nUp close, it felt like all there was.
 The lamp was light in his hands. Without a word he pulled, and light poured out. He closed his eyes and all he saw was light.
 The child was nowhere when he awoke. Bright, white emptiness stretched out in all directions. He gulped as he looked around, and felt that emptiness resonate in his chest.\n"Hello?" he called out. No one answered.
-Trembling, the child pushed himself to his feet. He'd been through countless battles, been spat on by people he used to trust, and even took down the immortal ruler of the world. He told himself he could handle whatever this was.\nThe only difference was that now he had to do them alone.
+Trembling, the child pushed himself to his feet. He'd been through countless battles to get here, seen and done things no child should ever have to see and do, all because he was the only one who could save the world. He told himself he could handle whatever this was.\nThe only difference was that he hadn't been alone then.
 The child took a step. His bare foot thudded against an invisible ground. When nothing further happened, he kept going. "Choose a direction and just walk," he thought. There was nothing else to do.\n"Is anyone out there?"
 The child's steps turned inside out. The ground flipped over and curved in on itself. He felt a headache start to come on, and it only grew when something finally did appear.\nA black spiral, twisting out from beneath him. He climbed and climbed, and his feet hurt and his chest ached and his arms curled. Yet he still continued. Somehow he felt like nothing would ever be able to stop him again.\nOne foot after another he climbed and watched the matter splay out before him. This thing he'd found, it was immense. It was infinite.\nIt was the Sun.
 "Pure hearted one," the Sun said without saying, not a roaring voice but a subtle understanding planted in the child's mind. "We meet at last."\nThe child gulped. Throughout all that time searching for and lighting the lamps, he hadn't considered what would actually happen if he won. But now here he was, facing infinity itself, and it dawned on him the Sun had probably been sealed away for a good reason.\nWould saving the world be worth the consequences?
@@ -229,7 +229,7 @@ bool Game::movePlayer(int x, int y)
     moveProgress.start(1000/6);
     dirtyLighting = true;
 
-    std::cout << player_x << "," << player_y << std::endl;
+    //std::cout << player_x << "," << player_y << std::endl;
 
     int chunkX, chunkY, old_chunkX, old_chunkY;
     toChunkPos(player_x, player_y, chunkX, chunkY);
@@ -345,6 +345,7 @@ void Game::recalculateLighting()
 }
 
 void Game::recalculateRender() {
+  bool placedSignNear = false;
   for (int y = map.getTop(); y < map.getBottom(); y++)
   {
     for (int x = map.getLeft(); x < map.getRight(); x++)
@@ -373,9 +374,22 @@ void Game::recalculateRender() {
               TilesetIndex(21, 3),
               TilesetIndex(22, 3)};
 
-            if (/*renderDesc == 0 &&*/ !storyDone && !(x == player_x && y == player_y) && std::bernoulli_distribution(0.005)(rng)) {
+            double likelihood = 0.005;
+            bool tryNear = false;
+            if (nextSignIndex < (litSpots / 1000 + 1) && std::sqrt(std::pow(x-player_x, 2)+std::pow(y-player_y, 2)) < 30) {
+              if (placedSignNear) {
+                likelihood = 0.05;
+              } else {
+                likelihood = 0.1;
+                tryNear = true;
+              }
+            }
+            if (/*renderDesc == 0 &&*/ !storyDone && !(x == player_x && y == player_y) && map.at(x,y).text.empty() && std::bernoulli_distribution(likelihood)(rng)) {
               map.at(x,y).renderId = TilesetIndex(24, 13);
               map.at(x,y).sign = true;
+              if (tryNear) {
+                placedSignNear = true;
+              }
             } else {
               map.at(x,y).renderId = furnishings.at(std::uniform_int_distribution<int>(0, furnishings.size()-1)(rng));
               map.at(x,y).sign = false;
@@ -792,6 +806,7 @@ void Game::updatePlaying(size_t frameTime) {
               }
 
               sign.displayMessage(lookTile.text);
+              clearedSigns = false;
             } else {
               performDash();
             }
@@ -1106,17 +1121,19 @@ void Game::update(size_t frameTime) {
   } else if (sign.signDisplayState != SignInstructionState::Hidden) {
     sign.update(frameTime, *this);
 
-    if (!clearedSigns && storyDone && sign.signDisplayState == SignInstructionState::FadingOut) {
+    if (!clearedSigns && sign.signDisplayState == SignInstructionState::FadingOut) {
       for (int y = map.getTop(); y < map.getBottom(); y++) {
         for (int x = map.getLeft(); x < map.getRight(); x++) {
-          if (map.at(x,y).sign) {
+          if (map.at(x,y).sign && (storyDone || map.at(x,y).text.empty())) {
             map.at(x,y).sign = false;
             map.at(x,y).renderId = -1;
           }
         }
       }
 
-      muxer.playSound("dash");
+      if (storyDone) {
+        muxer.playSound("dash");
+      }
       clearedSigns = true;
     }
   } else {