Update to serial 210328

[homeland.git] / src / homeland.inf

diff --git a/src/homeland.inf b/src/homeland.inf
index eefeecabada91ab75a683b9f0087969b4903878b..e06781f1fe7a5a118f4fdcc4657c5c20d064988c 100644 (file)
--- a/src/homeland.inf
+++ b/src/homeland.inf
@@ -1,4 +1,5 @@
-! Copyright (C) 2019, 2020 Jason Self <j@jxself.org>
+!% $OMIT_UNUSED_ROUTINES=1
+! Copyright (C) 2019, 2020, 2021 Jason Self <j@jxself.org>
 !
 ! This file is free software: you may copy, redistribute and/or
 ! modify it under the terms of the GNU Affero General Public License
@@ -22,7 +23,7 @@ Constant Headline
     ^Ongoing development: https://jxself.org/git/?p=homeland.git
     ^Send bugs and feedback by email to j@@64jxself.org.
     ^IFID AC0898CB-0668-4853-9EB9-757958D4AF56
-    ^Copyright (C) 2019, 2020 Jason Self
+    ^Copyright (C) 2019, 2020, 2021 Jason Self
     ^You can change and share this game under the terms of the GNU 
     Affero General Public License as published by the Free Software 
     Foundation (FSF), either version 3 of the License, or (at your 
@@ -34,19 +35,13 @@ Constant Headline
 Include "parser";
 Include "verblib";
 Release 0;
-Serial "200523";
-Include "src/objects/intro/kitchen.inf";
-Include "src/objects/intro/livingroom.inf";
-Include "src/objects/intro/bedroom.inf";
-Include "src/objects/intro/grandlivingroom.inf";
-Include "src/objects/intro/sidewalk.inf";
-Include "src/objects/intro/frontporch.inf";
-Include "src/objects/intro/neighborlivingroom.inf";
-Include "src/objects/intro/backyard.inf";
-Include "src/objects/intro/neighborkitchen.inf";
-
-Include "src/objects/overworld/campsite.inf";
-Include "src/objects/overworld/westofcampsite.inf";
+Serial "210328";
+
+Include "src/intro.inf";
+
+Include "src/overworld.inf";
+
+Include "src/globals.inf";
 
 [ DeathMessage;
     if (deadflag == 3)
@@ -74,7 +69,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 
@@ -122,15 +117,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.^";
@@ -153,6 +148,9 @@ Verb 'Help'
 Verb 'Clue'
     * -> Help;
 
+Verb 'Hint'
+    * -> Help;
+
 Verb 'xyzzy'
     * -> Xyzzy;