X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=src%2Fsnowed-in.inf;h=7c28a9dd8595fbf4c2224b39193c5c5c4bd33154;hb=HEAD;hp=a75e04222304908670c40af1b843c7a69e8dc99d;hpb=d3298d5a5c6837d8684670b3e00955a9e8db7212;p=snowed-in.git

diff --git a/src/snowed-in.inf b/src/snowed-in.inf
index a75e042..7c28a9d 100644
--- a/src/snowed-in.inf
+++ b/src/snowed-in.inf
@@ -18,6 +18,7 @@ Array UUID_ARRAY string "UUID://DE9FA2E5-4EC7-4166-9218-E56EFA1DF40F//";
 #Ifdef UUID_ARRAY;
 #Endif;
 Global lantern_fuel_left = 20;
+Global flashlight_battery_power_left = 50;
 Global body_temperature = 20;
 Global cabin_has_electricity = 1;
 Global forest_location = 1;
@@ -43,7 +44,9 @@ Constant Headline
 Include "parser";
 Include "verblib";
 Release 4;
-Serial "220809";
+Serial "221129";
+
+Include "src/hotel.inf";
 
 Object  mainroom "Main Room"
   with  description 
@@ -520,9 +523,10 @@ Object  snowsuit "snowsuit" suitcase
             }
         ],
         daemon [;
-            if (location ~= mainroom && location ~= office && location ~=
-            kitchenette && location ~= bedroom && location ~= thedark &&
-            snowsuit hasnt worn) {
+            if (location == northofcabin || location == southofcabin ||
+            location == westofcabin || location == truckspot || location
+            == backpacklocation || location == forest && snowsuit hasnt
+            worn) {
                 body_temperature = --body_temperature;
             }
             if (location == mainroom || location == office || location ==
@@ -602,9 +606,10 @@ Object  snowshoes "snowshoes" bedroom
                 knees.";
         ],
         daemon [;
-            if (location ~= mainroom && location ~= office && location ~=
-            kitchenette && location ~= bedroom && location ~= thedark &&
-            location ~= eastofcabin && snowshoes hasnt worn) {
+            if (location == northofcabin || location == southofcabin ||
+            location == westofcabin || location == truckspot || location
+            == backpacklocation || location == forest && snowshoes hasnt
+            worn) {
                 deadflag = 3;
             }
         ],
@@ -715,7 +720,7 @@ Object  flashlight "flashlight" backpack
             }
             give flashlight light;
           SwitchOff:
-            give lantern ~light;
+            give flashlight ~light;
         ],
   has   switchable;
 
@@ -867,12 +872,12 @@ Object  flashlight "flashlight" backpack
                 yourself at a console. The hallucination quickly 
                 fades.";
           15:
-            deadflag = 2;
-            print_ret 
+            print
                 "You see something in the distance but can't make it 
                 out. You walk toward it to find out that it's the 
                 hotel. You collapse in the lobby as the hotel staff 
-                rush over to you.";
+                rush over to you.^";
+                PlayerTo(lobby1);
         }
     }
 ];
@@ -1093,10 +1098,10 @@ Object  snowmobile "snowmobile" thedark
             snowmobile_location = random(14);
             if (location == forest && forest_location == snowmobile_location)
             {
-                deadflag = 2;
-                print_ret 
+                print
                     "A snowmobile approaches. The person says they 
-                    saw your light and came to rescue you.";
+                    saw your light and came to rescue you.^";
+                PlayerTo(lobby1);
             }
             return true;
         ],