Update to serial number 200614

[homeland.git] / src / homeland.inf

diff --git a/src/homeland.inf b/src/homeland.inf
index e69a9f0d98ece8abf7070ce9ab2829f687d0c8d4..83685c698ae42feb411ee9ecdf39fa42f1145daf 100644 (file)
--- a/src/homeland.inf
+++ b/src/homeland.inf
@@ -35,7 +35,7 @@ Constant Headline
 Include "parser";
 Include "verblib";
 Release 0;
-Serial "200604";
+Serial "200614";
 Include "src/objects/intro/kitchen.inf";
 Include "src/objects/intro/livingroom.inf";
 Include "src/objects/intro/bedroom.inf";
@@ -48,6 +48,18 @@ Include "src/objects/intro/neighborkitchen.inf";
 
 Include "src/objects/overworld/campsite.inf";
 Include "src/objects/overworld/westofcampsite.inf";
+Include "src/objects/overworld/shed.inf";
+Include "src/objects/overworld/house.inf";
+Include "src/objects/overworld/g58.inf";
+Include "src/objects/overworld/g59.inf";
+Include "src/objects/overworld/g60.inf";
+Include "src/objects/overworld/g77.inf";
+Include "src/objects/overworld/g79.inf";
+Include "src/objects/overworld/h70.inf";
+Include "src/objects/overworld/h78.inf";
+Include "src/objects/overworld/h80.inf";
+
+Include "src/objects/globals.inf";
 
 [ DeathMessage;
     if (deadflag == 3)
@@ -75,7 +87,7 @@ Include "src/objects/overworld/westofcampsite.inf";
 ];
 
 [ Initialise;
-    Location = Kitchen;
+    Location = kitchen;
     print "^It happened again.^^";
     print 
         "While reading the morning newspaper, there was another small 
@@ -123,15 +135,15 @@ Include "src/objects/overworld/westofcampsite.inf";
             "That window in your kitchen seems just large enough to 
             climb through...^";
     }
-    if (television hasnt on && television.watch_count < 3) {
+    if (location == backyard || location == bedroom || location == frontporch || location == grandlivingroom || location == kitchen || location == livingroom || location == neighborkitchen || location == neighborlivingroom || location == sidewalk && television hasnt on && television.watch_count < 3) {
         print "I wonder what's on TV?^";
     }
-    if (television has on && television.watch_count < 3) {
+    if (location == backyard || location == bedroom || location == frontporch || location == grandlivingroom || location == kitchen || location == livingroom || location == neighborkitchen || location == neighborlivingroom || location == sidewalk && television has on && television.watch_count < 3) {
         print 
             "The TV show U.S. News And Grue Report is usually very 
             informative.^";
     }
-    if (TestScope(poker)) {
+    if (location == backyard || location == bedroom || location == frontporch || location == grandlivingroom || location == kitchen || location == livingroom || location == neighborkitchen || location == neighborlivingroom || location == sidewalk && TestScope(poker)) {
         print 
             "The poker looks like it could make an effective 
             weapon.^";