From 57e7057cc7196914e3477ac73aaf73966c2195ac Mon Sep 17 00:00:00 2001 From: Jason Self Date: Sun, 29 Mar 2020 10:37:32 -0700 Subject: [PATCH] Update to serial 200329 --- src/homeland.inf | 36 +++++---- src/objects/campsite.inf | 34 -------- src/objects/{ => intro}/backyard.inf | 4 +- src/objects/{ => intro}/bedroom.inf | 17 ++-- src/objects/{ => intro}/frontporch.inf | 2 +- src/objects/{ => intro}/grandlivingroom.inf | 2 +- src/objects/{ => intro}/kitchen.inf | 42 ++++++---- src/objects/{ => intro}/livingroom.inf | 2 +- src/objects/{ => intro}/neighborkitchen.inf | 6 +- .../{ => intro}/neighborlivingroom.inf | 53 ++++++++++--- src/objects/{ => intro}/sidewalk.inf | 10 +-- src/objects/overworld/campsite.inf | 77 +++++++++++++++++++ src/objects/overworld/westofcampsite.inf | 31 ++++++++ 13 files changed, 219 insertions(+), 97 deletions(-) delete mode 100644 src/objects/campsite.inf rename src/objects/{ => intro}/backyard.inf (95%) rename src/objects/{ => intro}/bedroom.inf (87%) rename src/objects/{ => intro}/frontporch.inf (96%) rename src/objects/{ => intro}/grandlivingroom.inf (97%) rename src/objects/{ => intro}/kitchen.inf (71%) rename src/objects/{ => intro}/livingroom.inf (98%) rename src/objects/{ => intro}/neighborkitchen.inf (94%) rename src/objects/{ => intro}/neighborlivingroom.inf (74%) rename src/objects/{ => intro}/sidewalk.inf (94%) create mode 100644 src/objects/overworld/campsite.inf create mode 100644 src/objects/overworld/westofcampsite.inf diff --git a/src/homeland.inf b/src/homeland.inf index 0defe48..bb97de1 100644 --- a/src/homeland.inf +++ b/src/homeland.inf @@ -1,6 +1,6 @@ -! Copyright (C) 2019 Jason Self +! Copyright (C) 2019, 2020 Jason Self ! -! 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 +22,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 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 +34,19 @@ 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 "200329"; +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"; [ DeathMessage; if (deadflag == 3) @@ -77,9 +79,9 @@ Include "src/objects/campsite.inf"; 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.^^"; diff --git a/src/objects/campsite.inf b/src/objects/campsite.inf deleted file mode 100644 index 039a7c1..0000000 --- a/src/objects/campsite.inf +++ /dev/null @@ -1,34 +0,0 @@ -! Copyright (C) 2019 Jason Self -! -! This file is free software: you may copy, redistribute gand/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 campsite "Campsite" - with description [; - print - "You are at an old campsite set among some low-lying - hills. Healthy, dark green grass carpets the ground - except around an old firepit.^^"; - print - "You can see a log (on which are a copper lantern and - a diary) here.^^"; - print - "The diary is old and worn. The pages are tattered - and yellowed, and most of the writing has faded due to - exposure to the elements. In reviewing the pages you - recognize it as your neighbor's handwriting and can - make out a single passage: ~The humming... the - humming... I can't make it stop.~"; - deadflag = 3; - ], - has light; \ No newline at end of file diff --git a/src/objects/backyard.inf b/src/objects/intro/backyard.inf similarity index 95% rename from src/objects/backyard.inf rename to src/objects/intro/backyard.inf index 9d10c70..4755b6d 100644 --- a/src/objects/backyard.inf +++ b/src/objects/intro/backyard.inf @@ -1,6 +1,6 @@ ! Copyright (C) 2019 Jason Self ! -! 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. @@ -59,7 +59,7 @@ Object scratches "scratches" backyard has scenery; Object house "neighbor's house" backyard - with name 'house' 'home' 'building', + with name 'neighbor' 'neighbors' 'house' 'home' 'building', found_in backyard frontporch kitchen sidewalk, has scenery; diff --git a/src/objects/bedroom.inf b/src/objects/intro/bedroom.inf similarity index 87% rename from src/objects/bedroom.inf rename to src/objects/intro/bedroom.inf index 5d4a221..7edec20 100644 --- a/src/objects/bedroom.inf +++ b/src/objects/intro/bedroom.inf @@ -1,6 +1,6 @@ ! Copyright (C) 2019 Jason Self ! -! 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. @@ -15,8 +15,8 @@ Object bedroom "Bedroom" with description - "The green-beige walls are reminiscent of a hospital. On - the wall is a painting. The livingroom is to the north.", + "The green-beige walls are reminiscent of a hospital. The + livingroom is to the north.", n_to livingroom, cant_go "Since when did you get the ability to walk through @@ -27,13 +27,12 @@ Object painting "painting" bedroom with description "It's a picture of Aragain Falls, the most breathtaking and awesome waterfall in the known lands.", - name 'painting' 'paint', - Before [; - Take: - print_ret "It looks so nice, perhaps it's better to leave - it where it is."; + before [; + Insert: + if (second == box) + print_ret (The) self, " is too big to fit."; ], - has scenery; + name 'painting' 'paint' 'picture' 'of' 'aragain' 'falls'; Object bed "twin-sized bed" bedroom with name 'bed' 'twin', diff --git a/src/objects/frontporch.inf b/src/objects/intro/frontporch.inf similarity index 96% rename from src/objects/frontporch.inf rename to src/objects/intro/frontporch.inf index f883ca5..e85bef2 100644 --- a/src/objects/frontporch.inf +++ b/src/objects/intro/frontporch.inf @@ -1,6 +1,6 @@ ! Copyright (C) 2019 Jason Self ! -! 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. diff --git a/src/objects/grandlivingroom.inf b/src/objects/intro/grandlivingroom.inf similarity index 97% rename from src/objects/grandlivingroom.inf rename to src/objects/intro/grandlivingroom.inf index 926f1b6..11b0071 100644 --- a/src/objects/grandlivingroom.inf +++ b/src/objects/intro/grandlivingroom.inf @@ -1,6 +1,6 @@ ! Copyright (C) 2019 Jason Self ! -! 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. diff --git a/src/objects/kitchen.inf b/src/objects/intro/kitchen.inf similarity index 71% rename from src/objects/kitchen.inf rename to src/objects/intro/kitchen.inf index 166d642..51dfc7c 100644 --- a/src/objects/kitchen.inf +++ b/src/objects/intro/kitchen.inf @@ -1,6 +1,6 @@ ! Copyright (C) 2019 Jason Self ! -! 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. @@ -15,14 +15,17 @@ Object kitchen "Kitchen" with description - "You are in the kitchen and in front of the window that - looks out on to your neighbor's back yard. It's a small - simple kitchen, but adequately lit by natural light from - the outside. The walls are painted a buttery yellow and - broken up by celery green curtains on the windows, which - move slightly in a small breeze you cannot feel. The floor - is highly polished, having received a fresh coat - yesterday afternoon. The livingroom is to the east.", + "This looks like a restaurant-quality kitchen. It's small + but full of natural light coming in through the large + window, adding a nice sense of a warm glow. Despite the + small size it has a high ceiling, and the room was set up + into a rectangular shape. The layout allows for easy + access. The walls are painted a buttery yellow and broken + up by celery green curtains on the window. The highly + polished floor ties everything together to create a + feeling of comfort and elegance. It's the perfect example + of well-balanced home design. The livingroom is to the + east.", n_to window, cant_go "You walk smack into one of those buttery yellow walls I described.", @@ -42,9 +45,8 @@ Object wall "wall" kitchen if (location == kitchen) print "The walls are painted a buttery yellow and - broken up by celery green curtains on the windows, - which move slightly in a small breeze you cannot - feel.^"; + broken up by celery green curtains on the + windows.^"; else print "You see nothing special about the walls.^"; ], @@ -79,7 +81,18 @@ Object newspaper "newspaper" table with name 'newspaper' 'paper', description "It's your favorite newspaper: U.S. News And Grue Report, - which also airs on TV."; + which also airs on TV. The headline story says ~The GUE's + redesigned 100 zorkmid bill makes history today, becoming + the first ever zorkmid to feature a woman on the front. + The bill is set to become legal tender next year, with + the decision finalized by the Governor yesterday.~ + ~I have enthusiastically embraced this bold new way of + designing money, showing a woman's face. I believe this + landmark achievement will stimulate public confidence in + our monetary system and will help build the GUE's + creative capabilities,~ the Governor said. The next + story talks about how a local resident has won the + carrot-growing contest for the third time in a row."; Object window "window" kitchen with name 'window' 'windows', @@ -132,8 +145,7 @@ Object window "window" kitchen has scenery door openable; Object curtains "curtains" kitchen - with name 'curtain' 'curtains' 'green curtains' 'celery' 'celery green' - 'celery green curtains', + with name 'celery' 'green' 'curtain' 'curtains', description "Celery green in color, you see nothing special about the curtains.", before [; diff --git a/src/objects/livingroom.inf b/src/objects/intro/livingroom.inf similarity index 98% rename from src/objects/livingroom.inf rename to src/objects/intro/livingroom.inf index 9010e8a..e7a473e 100644 --- a/src/objects/livingroom.inf +++ b/src/objects/intro/livingroom.inf @@ -1,6 +1,6 @@ ! Copyright (C) 2019 Jason Self ! -! 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. diff --git a/src/objects/neighborkitchen.inf b/src/objects/intro/neighborkitchen.inf similarity index 94% rename from src/objects/neighborkitchen.inf rename to src/objects/intro/neighborkitchen.inf index 193d828..a81851d 100644 --- a/src/objects/neighborkitchen.inf +++ b/src/objects/intro/neighborkitchen.inf @@ -1,6 +1,6 @@ ! Copyright (C) 2019 Jason Self ! -! 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. @@ -68,6 +68,10 @@ Object poker "poker" fireplace before [; Take, Pull, Push, PushDir, Remove: give poker ~concealed; + if (poker hasnt visited) { + score = score + 1; + give poker visited; + } if (player in neighborlivingroom) { if (bluebutton has on) machine.shoot(); diff --git a/src/objects/neighborlivingroom.inf b/src/objects/intro/neighborlivingroom.inf similarity index 74% rename from src/objects/neighborlivingroom.inf rename to src/objects/intro/neighborlivingroom.inf index 1feaaae..601a6ea 100644 --- a/src/objects/neighborlivingroom.inf +++ b/src/objects/intro/neighborlivingroom.inf @@ -1,6 +1,6 @@ ! Copyright (C) 2019 Jason Self ! -! 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. @@ -15,17 +15,19 @@ Object neighborlivingroom "Neighbor's Livingroom" with description - "You are in your neighor's livingroom. It seems that no + "You are in your neighbor's livingroom. It seems that no one has lived here in a long time, even though you saw your neighbor here last week. All of the furniture has - been removed and the air smells stale. There's another - room to the north. A door is to the east.^^A machine as - tall as you sits in the center of their livingroom. It - consists of three transparent spheres joined together - containing machinery. A barrel with a small aperture comes - out of the farthest sphere, pointing down and to the wall. - The entire thing rests on a shiny metal platform allowing - it to rotate and tilt with ease.", + been removed and the air smells stale. A large bay window + enclosed by sheer cobalt blue curtains allowing light to + come through. There's another room to the north. A door is + to the east.^^A machine as tall as you sits in the center + of their livingroom. It consists of three transparent + spheres joined together containing machinery. A barrel + with a small aperture comes out of the farthest sphere, + pointing down and to the wall. The entire thing rests on + a shiny metal platform allowing it to rotate and tilt with + ease.", w_to neighborkitchen, e_to neighbordoor, n_to grandlivingroom, @@ -38,6 +40,34 @@ Object neighborlivingroom "Neighbor's Livingroom" ], has light; +Object neighborwindow "window" neighborlivingroom + with name 'large' 'bay' 'window' 'windows', + description "A large bay window enclosed by sheer cobalt blue + curtains allowing light to come through.", + before [; + Go: + print_ret "The window is not something you can go through."; + Open, Close: + print_ret "This isn't the type of window that can be + opened or closed."; + ], + has scenery; + +Object neighborcurtains "curtains" neighborlivingroom + with name 'cobalt' 'blue' 'curtain' 'curtains', + description + "Cobalt blue in color, the curtains have been decorated with + intricate embroidery.", + before [; + Take, Pull, Push, PushDir: + print_ret "Don't you think they look nice where they are?"; + ], + has scenery openable pluralname; + +Object embroidery "embroidery" neighborlivingroom + with name 'embroidery' 'pattern' 'patterns', + has scenery; + Object redbutton "red button" neighborlivingroom with name 'red' 'red button' 'button' 'buttons', before [; @@ -83,7 +113,8 @@ Object bluebutton "blue button" neighborlivingroom } else { give bluebutton ~on; - print_ret "You push the blue button."; + print_ret "You push the blue button. The machine + sounds like it powers down."; } } else { diff --git a/src/objects/sidewalk.inf b/src/objects/intro/sidewalk.inf similarity index 94% rename from src/objects/sidewalk.inf rename to src/objects/intro/sidewalk.inf index c2d0136..3770904 100644 --- a/src/objects/sidewalk.inf +++ b/src/objects/intro/sidewalk.inf @@ -1,6 +1,6 @@ ! Copyright (C) 2019 Jason Self ! -! 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. @@ -59,10 +59,10 @@ Object clouds "clouds" sidewalk Object tree "tree" sidewalk with name 'tree' 'trees' 'evergreen' 'evergreen' 'leaves' 'leaf', - found_in sidewalk backyard, + found_in sidewalk backyard campsite, description "Standing strong, majestic and tall, as if reaching for - the sky. There are countless numbers of sundrenched + the sky. There are countless numbers of sun-drenched leaves, each a deep green.", before [; Climb: @@ -114,9 +114,9 @@ Object car "car" sidewalk FrobozzCo International.", before [; Unlock: - print_ret "The car is locked, and there is aparently no key."; + print_ret "The car is locked, and there is apparently no key."; Open: - print_ret "The car is locked, and there is aparently no key."; + print_ret "The car is locked, and there is apparently no key."; Climb: print_ret "I'm not sure that FrobozzCo International would diff --git a/src/objects/overworld/campsite.inf b/src/objects/overworld/campsite.inf new file mode 100644 index 0000000..5c1a604 --- /dev/null +++ b/src/objects/overworld/campsite.inf @@ -0,0 +1,77 @@ +! Copyright (C) 2019, 2020 Jason Self +! +! 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 campsite "Campsite" + with description + "You are at an old campsite set among some low-lying + hills. Healthy, dark green grass carpets the ground + except around an old fire pit.", + w_to westofcampsite, + before [; + Listen: + print_ret + "You 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 + maybe you know something I don't.", + d_to "That's the ground. Since when are you able to move through it?", + has light; + +Object firepit "firepit" campsite + with name 'fire' 'firepit' 'pit', + description + "The fire pit is small and nothing more than an + indentation in the ground. It reeks of old campfires.", + has scenery; + +Object log "log" campsite + with name 'log' 'wood', + description + "It's the remnant of a tree uprooted by a storm. Someone + has taken the time to shape it flat and square for + sitting. Slightly recessed into the ground, it's a + combination of cinnamon and caramel brown. Deep scratches + and ominous stains mar the surface.", + has supporter enterable static; + +Object diary "diary" + with name 'diary' 'book', + description + "The diary is old and worn. The pages are tattered and + yellowed, and most of the writing has faded due to + exposure to the elements over the years. In reviewing the + pages you can make out a single passage: ~The humming... + the humming... I can't make it stop.~", + has ; + +Object lantern "copper lantern" log + with name 'lantern' 'copper', + description + "This is an exceptionally beautiful oil lamp. About + eleven inches high, with a base of about 5 inches or so in + diameter and a large, brass-closed hook at the top. The + glass in the lamp has a Fresnel type of design, which is + used to distribute light widely. The words ~Manufactured + By The Frobozz Magic Lantern Company~ are engraved in the + base.^", + after [; + SwitchOn: + give lantern light; + SwitchOff: + give lantern ~light; + ], + has switchable; \ No newline at end of file diff --git a/src/objects/overworld/westofcampsite.inf b/src/objects/overworld/westofcampsite.inf new file mode 100644 index 0000000..1cf633b --- /dev/null +++ b/src/objects/overworld/westofcampsite.inf @@ -0,0 +1,31 @@ +! Copyright (C) 2019 Jason Self +! +! 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 westofcampsite "West Of Campsite" + with description + "You're in an area of flat grassland just east of a + forest. There is a circle of dead grass near recent + livestock tracks in some mud. A flock of birds fly + overhead and disappear into the forest.", + before [; + Listen: + print_ret + "You hear strange whispers but looking around see no + one.^"; + ], + e_to campsite, + cant_go + "That area has not yet been implemented in this game.", + has light; \ No newline at end of file -- 2.31.1