bug: temperature should not be the total of N torches, but that of 1 …

…torch
goblinhack · Jun 16, 2023 · 4d171c3 · 4d171c3
1 parent 42bff3f
commit 4d171c3
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -1,8 +1,6 @@
 <!-- Bugs                                                                                                                                         -->
 <!-- ------                                                                                                                                       -->
 <!-- Maybe auto-pause when damage taken? (Like walking on lava)                                                                                   -->
-<!-- I died by being burn alive by some "beacon of light" / brazier.                                                                              -->
-<!-- crash when falling - try to repro                                                                                                            -->
 <!-- ------                                                                                                                                       -->
 <!--                                                                                                                                              -->
 <!-- Performance                                                                                                                                  -->

diff --git a/build/VERSION b/build/VERSION
@@ -1 +1 @@
-export MYVER="0.0.6"
+export MYVER="0.0.7"
diff --git a/python/things/dungeon/rock_lava.py b/python/things/dungeon/rock_lava.py
@@ -61,7 +61,7 @@ def tp_init(
     my.is_very_hard(self, True)
     my.is_wall(self, True)
     my.noise_blocker(self, True)
-    my.temperature(self, -100)
+    my.temperature(self, 100)
     my.text_a_or_an(self, "the")
     my.text_description_short(self, "Melting rock.")
     my.tick_prio(self, my.MAP_TICK_PRIO_NORMAL)

diff --git a/src/game_player.cpp b/src/game_player.cpp
@@ -243,6 +243,13 @@ void Game::place_player(void)
         auto w = level->thing_new("axe", point(x, y));
         t->carry(w, carry_options);
       }
+      level->thing_new("torch", point(x + 1, y));
+      level->thing_new("torch", point(x + 1, y));
+      level->thing_new("torch", point(x + 1, y));
+      {
+        auto w = level->thing_new("staff_energy", point(x, y));
+        t->carry(w, carry_options);
+      }
       if (1) {
         auto w = level->thing_new("torch", point(x, y));
         t->carry(w, carry_options);

diff --git a/src/thing_temperature.cpp b/src/thing_temperature.cpp
@@ -10,6 +10,8 @@ void Thing::temperature_tick(void)
 {
   TRACE_NO_INDENT();
 
+  int  location_temp_max = 0;
+  int  location_temp_min = 0;
   int  location_temp     = 0;
   bool location_temp_set = false;
 
@@ -167,9 +169,23 @@ void Thing::temperature_tick(void)
     // consider the torch.
     //
     if (abs(t->temperature) >= TEMPERATURE_THRESHOLD) {
-      location_temp += t->temperature;
+      if (! location_temp_max) {
+        location_temp_max = t->temperature;
+        location_temp_min = t->temperature;
+      } else {
+        location_temp_max = std::max(location_temp_max, (int) t->temperature);
+        location_temp_min = std::min(location_temp_min, (int) t->temperature);
+      }
       location_temp_set = true;
 
+      if (location_temp_max && location_temp_min) {
+        location_temp = (location_temp_max + location_temp_min) / 2;
+      } else if (location_temp_max) {
+        location_temp = location_temp_max;
+      } else {
+        location_temp = location_temp_min;
+      }
+
       dbg("Location temp now %d due to %s (%d)", location_temp, t->to_short_string().c_str(), t->temperature);
 
       if (location_temp > TEMPERATURE_MAX) {