Update to serial number 200614

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;
 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";
 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/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)
 
 [ DeathMessage;
     if (deadflag == 3)


@@ -75,7 +87,7 @@ Include "src/objects/overworld/westofcampsite.inf";
 ];
 
 [ Initialise;
 ];
 
 [ Initialise;

-    Location = Kitchen;
+    Location = kitchen;

     print "^It happened again.^^";
     print 
         "While reading the morning newspaper, there was another small 
     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...^";
     }
             "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?^";
     }
         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.^";
     }
         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.^";
         print 
             "The poker looks like it could make an effective 
             weapon.^";

diff --git a/src/objects/globals.inf b/src/objects/globals.inf
new file mode 100644 (file)
index 0000000..6e65652
--- /dev/null
+++ b/src/objects/globals.inf
@@ -0,0 +1,102 @@
+! Copyright (C) 2019, 2020 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
+! as published by the Free Software Foundation, either version 3 of
+! the License, or (at your option) any later version.
+!
+! This file is distributed in the hope that it will be useful, but
+! WITHOUT ANY WARRANTY; without even the implied warranty of
+! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+! Affero General Public License for more details.
+!
+! You should have received a copy of the GNU Affero General Public
+! License along with this file. If not, see https://gnu.org/licenses/
+
+Object  sky "sky" g58
+  with  name 'sky',
+        found_in backyard frontporch kitchen sidewalk g58 g60 h70,
+  has   scenery;
+
+Object  forest "forest" g58
+  with  name 'forest',
+        found_in g58 g59,
+  has   scenery;
+
+Object  hills "hills" campsite
+  with  name 'hill' 'hills',
+        found_in campsite g58,
+  has   scenery;
+
+Object  field "grassy field" campsite
+  with  name 'grassy' 'field',
+        found_in campsite g58,
+  has   scenery;
+
+Object  sun "sun" sidewalk
+  with  name 'sun',
+        found_in sidewalk backyard campsite g58 g59 h70,
+  has   scenery;
+
+Object  clouds "clouds" sidewalk
+  with  name 'cloud' 'clouds',
+        found_in sidewalk backyard h78,
+  has   scenery;
+
+Object  grass "grass" backyard
+  with  name 'green' 'grass' 'meadow' 'sod' 'turf' 'lawn',
+        found_in backyard campsite westofcampsite h70,
+  has   scenery;
+
+Object  tree "tree" sidewalk
+  with  name 'tree' 'trees' 'evergreen' 'evergreen' 'leaves' 'leaf',
+        found_in sidewalk backyard campsite,
+        description 
+            "Standing strong, majestic and tall, as if reaching for
+            the sky. There are countless numbers of sun-drenched
+            leaves, each a deep green.",
+        before [;
+          Climb:
+            print_ret 
+                "Despite your best efforts you're not able to.
+                There's no branch low enough to grab.";
+          Taste:
+            print_ret "It tastes like wood.";
+          Touch:
+            print_ret "The trunk of the free feels rough to the touch.";
+          Take, Pull, Push, PushDir, Turn:
+            print_ret 
+                "The tree is firmly anchored into the ground by a
+                healthy root system. It's not going anywhere.";
+          Drink:
+            print_ret "The tree is not a liquid.";
+          Blow:
+            print_ret "You huff and you puff but nothing happens.";
+          Burn:
+            print_ret "Only you can prevent forest fires.";
+          Buy:
+            print_ret "The tree is not for sale.";
+          JumpOver:
+            print_ret 
+                "Since when did you gain the ability to jump over
+                trees in a single bound?";
+        ],
+  has   scenery;
+
+Object  livestocktracks "livestock tracks" westofcampsite
+  with  name 'livestock' 'track' 'tracks',
+        found_in westofcampsite g59,
+  has   scenery;
+
+Object  creek "slow-moving creek" g59
+  with  name 'creek',
+        found_in g59 g60,
+  has   scenery;
+
+Object  ridge "high ridge" g60
+  with  name 'high' 'ridge',
+        description 
+            "Perched high up on the ridge is a single 
+            tan and maroon building.",
+        found_in g60 h70,
+  has   scenery;
\ No newline at end of file

diff --git a/src/objects/intro/backyard.inf b/src/objects/intro/backyard.inf
index c82291f971acf4dd2bed69bc913f87a1cd77b289..ff9e0350cd04f1288156f9163826c7b3f59c38e2 100644 (file)
--- a/src/objects/intro/backyard.inf
+++ b/src/objects/intro/backyard.inf
@@ -39,16 +39,6 @@ Object  backyard "Back Yard"
         w_to "Their fence is too high to climb over in that direction.",
   has   light;
 
         w_to "Their fence is too high to climb over in that direction.",
   has   light;
 

-Object  grass "grass" backyard
-  with  name 'green' 'grass' 'meadow' 'sod' 'turf' 'lawn',
-        found_in backyard campsite westofcampsite,
-  has   scenery;
-
-Object  sky "sky" backyard
-  with  name 'sky',
-        found_in backyard frontporch kitchen sidewalk,
-  has   scenery;
-

 Object  leaves "leaves" backyard
   with  name 'leaf' 'leaves',
         found_in backyard sidewalk,
 Object  leaves "leaves" backyard
   with  name 'leaf' 'leaves',
         found_in backyard sidewalk,

diff --git a/src/objects/intro/bedroom.inf b/src/objects/intro/bedroom.inf
index 832e5cfe7da3d46234130175408f7d7857a972fe..d0017d783874bbdd3f89b34d713f40975c90e011 100644 (file)
--- a/src/objects/intro/bedroom.inf
+++ b/src/objects/intro/bedroom.inf
@@ -39,10 +39,10 @@ Object  painting "painting" bedroom
         before [;
           Insert:
             if (second == box)
         before [;
           Insert:
             if (second == box)

-            print_ret (The) self, " is too big to fit.";
+                print_ret (The) self, " is too big to fit.";

         ],
         name 'painting' 'paint' 'picture' 'of' 'aragain' 'falls',
         ],
         name 'painting' 'paint' 'picture' 'of' 'aragain' 'falls',

-       has scenery;
+  has   scenery;

 
 Object  bed "bed" bedroom
   with  name 'bed' 'twin',
 
 Object  bed "bed" bedroom
   with  name 'bed' 'twin',


@@ -65,16 +65,18 @@ Object  box "dented steel box" bed
 Object  directional "compass" box
   with  name 'compass',
         description [;
 Object  directional "compass" box
   with  name 'compass',
         description [;

-            if (location == bedroom || location == kitchen || 
-            location == backyard || location == neighborkitchen || 
-            location == neighborlivingroom)
-                print 
-                    "Ordinarily you'd expect a compass to point north 
-                    but this one is spinning wildly in every 
-                    direction.^";
-            if (location == livingroom || location == sidewalk)
+            if (location == livingroom || location == sidewalk) {

                 print "The compass is pointing west.^";
                 print "The compass is pointing west.^";

-            if (location == frontporch)
+                rtrue;
+            }
+            if (location == frontporch) {

                 print "The compass is pointing southeast.^";
                 print "The compass is pointing southeast.^";

+                rtrue;
+            }
+            else
+                print 
+                    "Ordinarily you'd expect a compass to point north
+                    but this one is spinning wildly in every
+                    direction.^";

         ],
         ;
\ No newline at end of file
         ],
         ;
\ No newline at end of file

diff --git a/src/objects/intro/kitchen.inf b/src/objects/intro/kitchen.inf
index 51dfc7c422b4b2e56a86532b871c783688add8e5..01298e3e3b11ab3e3518e78d5a3e6eda3ebb6a8a 100644 (file)
--- a/src/objects/intro/kitchen.inf
+++ b/src/objects/intro/kitchen.inf
@@ -43,9 +43,9 @@ Object  wall "wall" kitchen
   with  name 'yellow' 'wall' 'walls',
         description [;
             if (location == kitchen)
   with  name 'yellow' 'wall' 'walls',
         description [;
             if (location == kitchen)

-                print 
-                    "The walls are painted a buttery yellow and 
-                    broken up by celery green curtains on the 
+                print
+                    "The walls are painted a buttery yellow and
+                    broken up by celery green curtains on the

                     windows.^";
             else
                 print "You see nothing special about the walls.^";
                     windows.^";
             else
                 print "You see nothing special about the walls.^";

diff --git a/src/objects/intro/neighborlivingroom.inf b/src/objects/intro/neighborlivingroom.inf
index e53fc43a818c6f435dbec03498cb93a33adcbaa1..d1318a77ae10bee8074388f12f876c3b34d03025 100644 (file)
--- a/src/objects/intro/neighborlivingroom.inf
+++ b/src/objects/intro/neighborlivingroom.inf
@@ -91,6 +91,11 @@ Object  redbutton "red button" neighborlivingroom
                     hear a small explosive sound as they impact your 
                     chest. You feel a little disoriented as it 
                     teleports you away.^";
                     hear a small explosive sound as they impact your 
                     chest. You feel a little disoriented as it 
                     teleports you away.^";

+                move box to bed ;
+                move directional to box ;
+                move newspaper to table ;
+                move letter to island ;
+                move poker to fireplace ;

                 PlayerTo(campsite);
                 rtrue;
             }
                 PlayerTo(campsite);
                 rtrue;
             }

diff --git a/src/objects/intro/sidewalk.inf b/src/objects/intro/sidewalk.inf
index 8a8611a05006d7f991d75ca95e9b02359928781a..b58226b3bc91f84f448c10d99f832bce9e4d3737 100644 (file)
--- a/src/objects/intro/sidewalk.inf
+++ b/src/objects/intro/sidewalk.inf
@@ -51,51 +51,6 @@ Object  Sidewalk "Sidewalk"
         w_to frontdoor,
   has   light;
 
         w_to frontdoor,
   has   light;
 

-Object  sun "sun" sidewalk
-  with  name 'sun',
-        found_in sidewalk backyard campsite,
-  has   scenery;
-
-Object  clouds "clouds" sidewalk
-  with  name 'cloud' 'clouds',
-        found_in sidewalk backyard,
-  has   scenery;
-
-Object  tree "tree" sidewalk
-  with  name 'tree' 'trees' 'evergreen' 'evergreen' 'leaves' 'leaf',
-        found_in sidewalk backyard campsite,
-        description 
-            "Standing strong, majestic and tall, as if reaching for 
-            the sky. There are countless numbers of sun-drenched 
-            leaves, each a deep green.",
-        before [;
-          Climb:
-            print_ret 
-                "Despite your best efforts you're not able to. 
-                There's no branch low enough to grab.";
-          Taste:
-            print_ret "It tastes like wood.";
-          Touch:
-            print_ret "The trunk of the free feels rough to the touch.";
-          Take, Pull, Push, PushDir, Turn:
-            print_ret 
-                "The tree is firmly anchored into the ground by a 
-                healthy root system. It's not going anywhere.";
-          Drink:
-            print_ret "The tree is not a liquid.";
-          Blow:
-            print_ret "You huff and you puff but nothing happens.";
-          Burn:
-            print_ret "Only you can prevent forest fires.";
-          Buy:
-            print_ret "The tree is not for sale.";
-          JumpOver:
-            print_ret 
-                "Since when did you gain the ability to jump over 
-                trees in a single bound?";
-        ],
-  has   scenery;
-

 Object  street "street" sidewalk
   with  name 'street' 'road',
         description "It's your typical street.",
 Object  street "street" sidewalk
   with  name 'street' 'road',
         description "It's your typical street.",


@@ -142,4 +97,4 @@ Object  licenseplateframe "license plate holder" sidewalk
           Take, Pull, Push, PushDir, Turn:
             print_ret (The) self, " is firmly attached to the car.";
         ],
           Take, Pull, Push, PushDir, Turn:
             print_ret (The) self, " is firmly attached to the car.";
         ],

-  has   scenery;
+  has   scenery;
\ No newline at end of file

diff --git a/src/objects/overworld/campsite.inf b/src/objects/overworld/campsite.inf
index d49c33aade32fe101830c83e3f11b4e91663bd1e..172c5881442fb96a6d0dd016f8a7c5243991a3da 100644 (file)
--- a/src/objects/overworld/campsite.inf
+++ b/src/objects/overworld/campsite.inf
@@ -25,12 +25,21 @@ Object  campsite "Campsite"
             hills and grassy fields appears to continue on in all 
             directions, leading to some trees in the distance in an 
             area that appears to be heavily wooded.",
             hills and grassy fields appears to continue on in all 
             directions, leading to some trees in the distance in an 
             area that appears to be heavily wooded.",

+        n_to g59,
+        nw_to g58,
+        ne_to g60,

         w_to westofcampsite,
         w_to westofcampsite,

+        e_to h70,
+        s_to g79,
+        se_to h80,
+        sw_to h78,

         before [;
           Listen:
             print_ret 
         before [;
           Listen:
             print_ret 

-                "You hear chanting from right behind you but looking 
-                around you see no one is there.^";
+                "You listen and hear several raspy coughs nearby... 
+                all coming from the log. You also hear chanting from 
+                right behind you but looking around you see no one is 
+                there.";

         ],
         u_to 
             "That's the sky. Not sure how you plan to get there but 
         ],
         u_to 
             "That's the sky. Not sure how you plan to get there but 

diff --git a/src/objects/overworld/g58.inf b/src/objects/overworld/g58.inf
new file mode 100644 (file)
index 0000000..d750363
--- /dev/null
+++ b/src/objects/overworld/g58.inf
@@ -0,0 +1,31 @@
+! Copyright (C) 2020 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 
+! as published by the Free Software Foundation, either version 3 of 
+! the License, or (at your option) any later version.
+!
+! This file is distributed in the hope that it will be useful, but
+! WITHOUT ANY WARRANTY; without even the implied warranty of
+! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+! Affero General Public License for more details.
+!
+! You should have received a copy of the GNU Affero General Public
+! License along with this file. If not, see https://gnu.org/licenses/
+
+Object  g58 "Grassy Meadow"
+  with  description 
+            "The sky is bright and blue and you can feel the warmth 
+            of the sun. You hear birds singing and see the glowing 
+            colors of day. The lush grass is soft. A small wind blows 
+            the grass around, creating an illusion of shifting 
+            colors. The area is very picturesque and everything about 
+            it feels very natural. There's a slight incline but not 
+            anything that would make it difficult. To the north and 
+            east, a forest obscures the horizon. The trees cast 
+            shadows on the grass. There are small hills and grassy 
+            fields in all other directions.",
+        s_to westofcampsite,
+        e_to g59,
+        se_to campsite,
+  has   light;
\ No newline at end of file

diff --git a/src/objects/overworld/g59.inf b/src/objects/overworld/g59.inf
new file mode 100644 (file)
index 0000000..4ae4d18
--- /dev/null
+++ b/src/objects/overworld/g59.inf
@@ -0,0 +1,35 @@
+! Copyright (C) 2020 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 
+! as published by the Free Software Foundation, either version 3 of 
+! the License, or (at your option) any later version.
+!
+! This file is distributed in the hope that it will be useful, but
+! WITHOUT ANY WARRANTY; without even the implied warranty of
+! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+! Affero General Public License for more details.
+!
+! You should have received a copy of the GNU Affero General Public
+! License along with this file. If not, see https://gnu.org/licenses/
+
+Object  g59 "Grassy Meadow"
+  with  description 
+            "A garden overflows from the east. All around you are 
+            beautiful flowers of many colors, red, yellow, blue, 
+            purple, and brown. Some are pastel, others darker. The 
+            sun is brightly shining through it all, enveloping the 
+            entire setting in rich and warm color. Everything feels 
+            strong and substantial here, a wonderland from a 
+            fairytale garden. The air is crisp and cool. Birds can be 
+            heard in the distance, as their beautiful melodies call 
+            to you. Well-worn livestock tracks come from the 
+            northeast and join up with a slow-moving creek from the 
+            east. Both go to the southwest. There's a forest to the 
+            north.",
+        s_to campsite,
+        se_to h70,
+        e_to g60,
+        w_to g58,
+        sw_to westofcampsite,
+  has   light;
\ No newline at end of file

diff --git a/src/objects/overworld/g60.inf b/src/objects/overworld/g60.inf
new file mode 100644 (file)
index 0000000..98cd028
--- /dev/null
+++ b/src/objects/overworld/g60.inf
@@ -0,0 +1,99 @@
+! Copyright (C) 2020 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 
+! as published by the Free Software Foundation, either version 3 of 
+! the License, or (at your option) any later version.
+!
+! This file is distributed in the hope that it will be useful, but
+! WITHOUT ANY WARRANTY; without even the implied warranty of
+! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+! Affero General Public License for more details.
+!
+! You should have received a copy of the GNU Affero General Public
+! License along with this file. If not, see https://gnu.org/licenses/
+
+Object  g60 "Grassy Meadow"
+  with  description 
+            "It's a beautiful sunny day. The sky is a brilliant blue 
+            without a cloud in sight. Nearby is a large oak tree, 
+            with a small shed and a small garden. The tree has a 
+            twisted, heavy trunk. The branches are splashed with 
+            green and yellow leaves as the tree reaches toward the 
+            sky, casting its shadow around the meadow. The area smells 
+            fresh and has a peaceful feel about it. A high ridge to 
+            the east appears unclimbable. A creek slowly moves down 
+            the ridge and winds through the grassy meadow toward the 
+            east.",
+        s_to h70,
+        e_to 
+            "The ridge is so steep that you'd first need to find 
+            climbing equipment to be able to continue in that 
+            direction.",
+        up_to 
+            "The ridge is so steep that you'd first need to find 
+            climbing equipment to be able to continue in that 
+            direction.",
+        w_to g59,
+        sw_to campsite,
+  has   light;
+
+Object  garden "small garden" g60
+  with  name 'garden' 'flowers',
+        found_in g59 g60,
+        description 
+            "The garden contains beautiful flowers of many colors, 
+            red, yellow, blue, purple, and brown. Some are pastel, 
+            others darker.",
+  has   scenery;
+
+Object  shed2 "shed" g60
+  with  name 'shed',
+        description 
+            "It's a rickety-looking building made of thin wood. It 
+            has no windows but there's a large opening where a door 
+            should be. It's possible to enter the shed.",
+        before [;
+          Enter:
+            PlayerTo(shed);
+            rtrue;
+        ],
+  has   scenery;
+
+Object  oaktree "oak tree" g60
+  with  name 'oak' 'tree',
+        description 
+            "The tree has a twisted, heavy trunk. The branches are 
+            splashed with green and yellow leaves as the tree reaches 
+            toward the sky, casting its shadow around the meadow.",
+        before [;
+          Climb:
+            print_ret 
+                "As soon as you make it halfway up the tree, your 
+                muscles begin to tremble and shake violently, throwing 
+                your entire body against the bark of the tree and 
+                making it difficult to continue to ascend, especially 
+                without the use of climbing equipment. You go back 
+                down to the ground.";
+          Taste:
+            print_ret "It tastes like wood.";
+          Touch:
+            print_ret "The trunk of the free feels rough to the touch.";
+          Take, Pull, Push, PushDir, Turn:
+            print_ret 
+                "The tree is firmly anchored into the ground by a
+                healthy root system. It's not going anywhere.";
+          Drink:
+            print_ret "The tree is not a liquid.";
+          Blow:
+            print_ret "You huff and you puff but nothing happens.";
+          Burn:
+            print_ret "Only you can prevent forest fires.";
+          Buy:
+            print_ret "The tree is not for sale.";
+          JumpOver:
+            print_ret 
+                "Since when did you gain the ability to jump over
+                trees in a single bound?";
+        ],
+  has   scenery;
\ No newline at end of file

diff --git a/src/objects/overworld/g77.inf b/src/objects/overworld/g77.inf
new file mode 100644 (file)
index 0000000..31e62b5
--- /dev/null
+++ b/src/objects/overworld/g77.inf
@@ -0,0 +1,34 @@
+! Copyright (C) 2020 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 
+! as published by the Free Software Foundation, either version 3 of 
+! the License, or (at your option) any later version.
+!
+! This file is distributed in the hope that it will be useful, but
+! WITHOUT ANY WARRANTY; without even the implied warranty of
+! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+! Affero General Public License for more details.
+!
+! You should have received a copy of the GNU Affero General Public
+! License along with this file. If not, see https://gnu.org/licenses/
+
+Object  g77 "Grassy Meadow"
+  with  description 
+            "You are standing in a grassy meadow. Sunlight beats down 
+            on you. It is nearly 70 degrees. The crystal clear sky is 
+            a rich hue of blue and perfect for gazing at. The soft 
+            green grass wafts gently in the breeze. You are 
+            completely enveloped in the wonder of nature yet there is 
+            a sense of eeriness in the air. To the north, a large 
+            forest obscures the horizon. A narrow and winding road 
+            leads to what appear to be ancient ruins in the northwest. 
+            A steep hill is to the south. Other than the road, the 
+            area seems completely untouched.",
+        s_to 
+            "The ridge is so steep that you'd first need to find
+            climbing equipment to be able to continue in that
+            direction.",
+        e_to h78,
+        ne_to westofcampsite,
+  has   light;
\ No newline at end of file

diff --git a/src/objects/overworld/g79.inf b/src/objects/overworld/g79.inf
new file mode 100644 (file)
index 0000000..337e787
--- /dev/null
+++ b/src/objects/overworld/g79.inf
@@ -0,0 +1,67 @@
+! Copyright (C) 2020 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 
+! as published by the Free Software Foundation, either version 3 of 
+! the License, or (at your option) any later version.
+!
+! This file is distributed in the hope that it will be useful, but
+! WITHOUT ANY WARRANTY; without even the implied warranty of
+! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+! Affero General Public License for more details.
+!
+! You should have received a copy of the GNU Affero General Public
+! License along with this file. If not, see https://gnu.org/licenses/
+
+Object  g79 "Small Hill"
+  with  description 
+            "You are on a small hill, and from here it feels as if you 
+            can see for miles around. A garden used to exist here, now 
+            now overgrown. Under the foliage are hundreds of stands 
+            of wildflowers, along with yellow hedges. The wind causes 
+            a 100-foot-high metal spiral to slowly rotate and make a 
+            low, whistling sound. A rusty metal bench is here, which 
+            faces out over the former garden. There's a dense forest 
+            to the south. The height of this hill makes it possible to 
+            see farmland in the distance with an orchard and evidence 
+            of old animal activity.",
+        n_to campsite,
+        e_to h80,
+        w_to h78,
+        ne_to h70,
+        nw_to westofcampsite,
+        cant_go "The forest is so dense that you'd first need to find 
+                a machete to be able to continue in that direction.",
+  has   light;
+
+Object  garden2 "garden" g79
+  with  name 'garden',
+        description
+            "It's an old garden, now overgrown.",
+  has   scenery;
+
+Object  wildflowers "wildflowers" g79
+  with  name 'wild' 'flower' 'flowers' 'foliage',
+  has   scenery;
+
+Object  yellowhedges "yellow hedges" g79
+  with  name 'yellow' 'hedge' 'hedges',
+        description
+            "They look like they need trimming but they are doing 
+            their best. The wind is just making them dance a little.",
+  has   scenery pluralname;
+
+Object  rustymetalbench "rusty metal bench" g79
+  with  name 'metal' 'bench',
+        description
+            "You can't see it very well since it is partly hidden by 
+            some of the overgrowth brush but it's so rusty that you 
+            might get tetanus just from looking at it.",
+  has   scenery supporter enterable static;
+
+Object  spiral "100-foot-high metal spiral" g79
+  with  name 'metal' 'spiral',
+        description
+            "It seems so old and rusted that it could fall at any 
+            minute as it slowly rotates in the wind.",
+  has   scenery;
\ No newline at end of file

diff --git a/src/objects/overworld/h70.inf b/src/objects/overworld/h70.inf
new file mode 100644 (file)
index 0000000..6c31306
--- /dev/null
+++ b/src/objects/overworld/h70.inf
@@ -0,0 +1,79 @@
+! Copyright (C) 2020 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 
+! as published by the Free Software Foundation, either version 3 of 
+! the License, or (at your option) any later version.
+!
+! This file is distributed in the hope that it will be useful, but
+! WITHOUT ANY WARRANTY; without even the implied warranty of
+! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+! Affero General Public License for more details.
+!
+! You should have received a copy of the GNU Affero General Public
+! License along with this file. If not, see https://gnu.org/licenses/
+
+Object  h70 "Grassy Meadow"
+  with  description [;
+            print 
+                "The sun shines brightly in a cloudless sky of a 
+                brilliant blue. You feel the sun's rays creating a 
+                pleasant warmth. A soft breeze comes from the south, 
+                bringing a delicate clean-smelling spring fragrance. 
+                It smells very inviting. The grass feels warm and safe 
+                as it moves slightly in rhythm with the breeze. The 
+                grass feels slightly moist. This area seems very 
+                peaceful. A high ridge to the east appears 
+                unclimbable. Perched high up on the ridge is a single 
+                tan and maroon building. There are words carved into a 
+                large stone block to turn it into a distinct ~no 
+                trespassing~ sign.";
+            if (h70 hasnt visited)
+                print 
+                    " The only sound is the cry from a small pink and 
+                    blue bird as it scuttles about on the ground. 
+                    Startled at your approach, it flies away.";
+            new_line;
+        ],
+        n_to g60,
+        s_to h80,
+        e_to 
+            "The ridge is so steep that you'd first need to find 
+            climbing equipment to be able to continue in that 
+            direction.",
+        up_to
+            "The ridge is so steep that you'd first need to find
+            climbing equipment to be able to continue in that
+            direction.",
+        w_to campsite,
+        nw_to g59,
+        sw_to g79,
+  has   light;
+
+Object  tanmaroonbuilding "tan and maroon building" h70
+  with  name 'tan' 'maroon' 'building',
+        description 
+            "The tan and maroon building appears to be very solidly 
+            constructed. The roof is steeply pitched. The windows are 
+            very narrow and deep set yet still reveal someone walking 
+            around inside.",
+before [;
+          Enter:
+            print_ret
+                "The tan and maroon building is so far up the high 
+                ridge that you'd first need to find climbing equipment 
+                to be able to do that.";
+],
+  has   scenery;
+
+Object  largestoneblock "large stone block" h70
+  with  name 'large' 'stone' 'block',
+        description
+            "There are words carved into a large stone block that 
+            read: ~No Trespassing!~.",
+        before [;
+          Take, Pull, Push, PushDir, Turn:
+            print_ret
+                "You're unable. The large stone block is too heavy.";
+],
+  has   scenery;

diff --git a/src/objects/overworld/h78.inf b/src/objects/overworld/h78.inf
new file mode 100644 (file)
index 0000000..7559cba
--- /dev/null
+++ b/src/objects/overworld/h78.inf
@@ -0,0 +1,44 @@
+! Copyright (C) 2020 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 
+! as published by the Free Software Foundation, either version 3 of 
+! the License, or (at your option) any later version.
+!
+! This file is distributed in the hope that it will be useful, but
+! WITHOUT ANY WARRANTY; without even the implied warranty of
+! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+! Affero General Public License for more details.
+!
+! You should have received a copy of the GNU Affero General Public
+! License along with this file. If not, see https://gnu.org/licenses/
+
+Object  h78 "Small Hill"
+  with  description 
+            "You are on a small hill, and from here it feels as if 
+            you can see for miles around. It feels like a quiet and 
+            beautiful place. The sky is clear except for some large 
+            white clouds far away on the horizon in the bright 
+            expanse of sky. The wind blows through your hair as if in 
+            blessing. In the far distance is a lake surrounded by 
+            trees and hills. It is so beautiful, you feel as if 
+            you can see your reflection in the still water. There's a 
+            dense forest to the south.",
+        n_to westofcampsite,
+        ne_to campsite,
+        e_to g79,
+        w_to g77,
+        s_to "The forest is so dense that you'd first need to find 
+                a machete to be able to continue in that direction.",
+  has   light;
+
+Object  greenstone "thin green stone" h78
+  with  name 'thing' 'green' 'stone',
+        description
+            "The thin green stone is engraved with a message: ~Know 
+            that it is everywhere. Know that it is yours alone and 
+            that it will go on forever.~";
+
+Object  lake "lake" h78
+  with  name 'lake' 'water',
+  has   scenery;
\ No newline at end of file

diff --git a/src/objects/overworld/h80.inf b/src/objects/overworld/h80.inf
new file mode 100644 (file)
index 0000000..10ebc01
--- /dev/null
+++ b/src/objects/overworld/h80.inf
@@ -0,0 +1,39 @@
+! Copyright (C) 2020 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 
+! as published by the Free Software Foundation, either version 3 of 
+! the License, or (at your option) any later version.
+!
+! This file is distributed in the hope that it will be useful, but
+! WITHOUT ANY WARRANTY; without even the implied warranty of
+! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+! Affero General Public License for more details.
+!
+! You should have received a copy of the GNU Affero General Public
+! License along with this file. If not, see https://gnu.org/licenses/
+
+Object  h80 "Grassy Meadow"
+  with  description 
+            "This is a pretty, quiet place. There are wide swaths of 
+            open space with green fields and blue skies that seem to 
+            meander on to the north and west, and a densely packed 
+            forest to the south and east. The air is warm. The forest 
+            seems sleepy while the sun shines through the trees, but 
+            there's something wrong. Something is happening to the 
+            landscape around you; it is changing. You hear an eerie 
+            breeze coming from the direction of the forest, which is 
+            in direct opposition to the normal wind direction of this 
+            area.",
+        before [;
+          Listen:
+            print_ret 
+                "You hear an audible moan nearby but looking around 
+                see no one.^";
+        ],
+        n_to h70,
+        nw_to campsite,
+        w_to g79,
+        cant_go "The forest is so dense that you'd first need to find 
+                a machete to be able to continue in that direction.",
+  has   light;
\ No newline at end of file

diff --git a/src/objects/overworld/house.inf b/src/objects/overworld/house.inf
new file mode 100644 (file)
index 0000000..3f66ee9
--- /dev/null
+++ b/src/objects/overworld/house.inf
@@ -0,0 +1,22 @@
+! Copyright (C) 2020 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 
+! as published by the Free Software Foundation, either version 3 of 
+! the License, or (at your option) any later version.
+!
+! This file is distributed in the hope that it will be useful, but
+! WITHOUT ANY WARRANTY; without even the implied warranty of
+! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+! Affero General Public License for more details.
+!
+! You should have received a copy of the GNU Affero General Public
+! License along with this file. If not, see https://gnu.org/licenses/
+
+Object  oldhouse "House"
+  with  description 
+            "It's an old, two-story house with a wide front porch 
+            that wraps around the entire first floor. The roof is tall 
+            and spindly, like it's ready to collapse inward from old 
+            age at any moment. The interior of the house is dark and 
+            quiet compared to the bright afternoon outside.";
\ No newline at end of file

diff --git a/src/objects/overworld/shed.inf b/src/objects/overworld/shed.inf
new file mode 100644 (file)
index 0000000..a60cfdd
--- /dev/null
+++ b/src/objects/overworld/shed.inf
@@ -0,0 +1,22 @@
+! Copyright (C) 2020 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 
+! as published by the Free Software Foundation, either version 3 of 
+! the License, or (at your option) any later version.
+!
+! This file is distributed in the hope that it will be useful, but
+! WITHOUT ANY WARRANTY; without even the implied warranty of
+! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+! Affero General Public License for more details.
+!
+! You should have received a copy of the GNU Affero General Public
+! License along with this file. If not, see https://gnu.org/licenses/
+
+Object  shed "Shed"
+  with  description 
+            "This small shed is a rickety-looking building made of 
+            thin wood. It has no windows but there's a large opening 
+            where a door should be. The exit is to the east.",
+        e_to g60,
+  has   light;
\ No newline at end of file

diff --git a/src/objects/overworld/westofcampsite.inf b/src/objects/overworld/westofcampsite.inf
index a1830ca28517e063edca8d63d47cf13aebd2b92a..d1e1482ddd8c64f5c4ee6fcbff2dddfc7cc237ce 100644 (file)
--- a/src/objects/overworld/westofcampsite.inf
+++ b/src/objects/overworld/westofcampsite.inf
@@ -14,19 +14,25 @@
 ! License along with this file. If not, see https://gnu.org/licenses/
 
 Object  westofcampsite "West Of Campsite"
 ! License along with this file. If not, see https://gnu.org/licenses/
 
 Object  westofcampsite "West Of Campsite"

-  with  description 
-            "You're in an area of sweet smelling green ankle high 
+  with  description [;
+            print "You're in an area of sweet smelling green ankle 
+high 

             grassland just east of a forest. Livestock tracks form a 
             grassland just east of a forest. Livestock tracks form a 

-            well-worn path coming from the northeast, ending at a 
-            small pond. Filled with water lilies, the pond seems 
-            quiet and serene. You look to forest edge and see a clear 
-            path east and northeast leading deep into the forest. On 
-            both sides there is dense undergrowth with only small 
-            paths through it. The trees are ancient with thick vines 
-            hanging from them and across the path. All other 
-            directions take you to low-lying hills and grassy fields. 
-            A flock of birds fly overhead and disappear into the 
-            forest.",
+            well-worn path next to a creek, both coming from the 
+            northeast, and ending at a small pond. Filled with water 
+            lilies, the pond seems quiet and serene. You look to the 
+            forest edge and see a clear path east and northeast 
+            leading deep into the forest. On both sides there is 
+            dense undergrowth with only a small path through it. The 
+            trees are ancient with thick vines hanging from them and 
+            across the path. All other directions take you to 
+            low-lying hills and grassy fields.";
+            if (westofcampsite hasnt visited)
+                print
+                    " A flock of birds fly overhead and disappear into 
+                    the forest.";
+            new_line;
+        ],

         before [;
           Listen:
             print_ret 
         before [;
           Listen:
             print_ret 


@@ -63,11 +69,6 @@ Object  pond "pond" westofcampsite
         ],
   has   scenery;
 
         ],
   has   scenery;
 

-Object  livestocktracks "livestock tracks" westofcampsite
-  with  name 'livestock' 'track' 'tracks',
-        found_in westofcampsite,
-  has   scenery;
-

 Object  vines "vines" westofcampsite
   with  name 'vine' 'vines',
   has   scenery;
\ No newline at end of file
 Object  vines "vines" westofcampsite
   with  name 'vine' 'vines',
   has   scenery;
\ No newline at end of file