Correct a small direction error in a description

[homeland.git] / src / homeland.inf

diff --git a/src/homeland.inf b/src/homeland.inf
index 0defe48bc5e6d487a823f0b4d93b59b90436e647..1e346a4e05e6c5063980f9a073b7fbd196766d22 100644 (file)
--- a/src/homeland.inf
+++ b/src/homeland.inf
@@ -1,6 +1,7 @@
-! Copyright (C) 2019 Jason Self <j@jxself.org>
+!% $OMIT_UNUSED_ROUTINES=1
+! Copyright (C) 2019, 2020, 2021, 2022 Jason Self <j@jxself.org>
 !
-! This file is free software: you may copy, redistribute gand/or
+! This file is free software: you may copy, redistribute and/or
 ! modify it under the terms of the GNU Affero General Public License
 ! as published by the Free Software Foundation, either version 3 of
 ! the License, or (at your option) any later version.
@@ -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 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,17 +35,13 @@ Constant Headline
 Include "parser";
 Include "verblib";
 Release 0;
-Serial "190728";
-Include "src/objects/kitchen.inf";
-Include "src/objects/livingroom.inf";
-Include "src/objects/bedroom.inf";
-Include "src/objects/grandlivingroom.inf";
-Include "src/objects/sidewalk.inf";
-Include "src/objects/frontporch.inf";
-Include "src/objects/neighborlivingroom.inf";
-Include "src/objects/backyard.inf";
-Include "src/objects/neighborkitchen.inf";
-Include "src/objects/campsite.inf";
+Serial "220206";
+
+Include "src/intro.inf";
+
+Include "src/overworld.inf";
+
+Include "src/globals.inf";
 
 [ DeathMessage;
     if (deadflag == 3)
@@ -72,14 +69,14 @@ Include "src/objects/campsite.inf";
 ];
 
 [ Initialise;
-    Location = Kitchen;
+    Location = kitchen;
     print "^It happened again.^^";
     print 
         "While reading the morning newspaper, there was another small 
         explosion from your neighbor's home. This time you were able 
-        to see a series of three bright blue sparks that your friends 
-        were talking about from your kitchen window through the 
-        curtains covering their living room windows.^^";
+        to see the series of three bright blue sparks that your 
+        friends were talking about from your kitchen window through 
+        the curtains covering their living room window.^^";
     print 
         "You crane your neck out the window to look, but all is 
         quiet. ~What's going on over there?~ you wonder.^^";
@@ -120,15 +117,15 @@ Include "src/objects/campsite.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.^";
@@ -151,6 +148,9 @@ Verb 'Help'
 Verb 'Clue'
     * -> Help;
 
+Verb 'Hint'
+    * -> Help;
+
 Verb 'xyzzy'
     * -> Xyzzy;