Update to revamp to use KCMO instead of San Francisco

ButteredToast3.inform/Source/story.ni

@@ -16,6 +16,7 @@
 The story description is "Who will win in the epic battle: Good Person or Bad Person? Choose one and determine the fates.".
 The story headline is "An interactive fiction determining the fates of at least two individuals".
 Release along with cover art, an interpreter, library card, and the source text.
+Include Menus by Emily Short. Include Basic Help Menu by Emily Short.
 The release number is 1.
 
 The player has a number called current score.
@@ -44,90 +45,66 @@ When play begins:
 Figure of Melkior is the file "melkior.jpg".
 Figure of Buckethead is the file "buckethead.jpg".
 
+[
+	TABLES
+]
+
+Table of Melkior Responses
+Response
+"Melkior says 'You will kneel before me and Lord Death!'"
+"Melkior says 'Would you like to try some of this black ichor?'"
+"Melkior says 'I cannot believe that I was defeated by a dwarf and a multi-armed human.'"
+"Melkior says 'Lord Death, save me!'"
+"Melkior says 'Ailusherai! I will find you!'"
+
+Table of Hank the Wino King Rants
+Rant
+"Hank the Wino King frowns. 'The rich oppress things.'"
+"Hank the Wino King says 'The rich subjugate things. Look no further than Christianity!'"
+"Hank the Wino King exclaims 'One of these days people will rise up in droves against the wealthy.'"
+"Hank the Wino King furrows his brow, the deep lines showing his age, and says 'They say 'eat the rich' when I say 'let's just take their cash from them and run'.'"
+
 [
 	ROOMS AND DOORS
 ]
 
-[ San Francisco, 1895 ]
+[ Country Club Plaza ]
+Summit & Jefferson is a room. The description is "The westernmost city block on the Country Club Plaza contains parking and is surrounded by Summit, 47th, Jefferson, and 48th streets. There are two blocks: one to the east and one to the southeast.".
 
-Central Embarcadero is a room. Central Embarcadero is south of North Embarcadero. The description of Central Embarcadero is "The Embarcadero looks like a warf straight from 20 years in the future. It extends north and south along a curve. Shops are along it. West is the rest of San Francisco."
+Jefferson & Nichols North is a room. It is east of Summit & Jefferson. The description is "The city block of the Country Club Plaza contains several shops and is surrounded by Jefferson, 47th, Pennsylvania, and Nichols. There are blocks to the northeast, east, southeast, south, and west.".
+Jefferson & Nichols South is a room. It is southeast of Summit & Jefferson. It is south of Jefferson & Nichols North. The description is "The city block of the Country Club Plaza contains several shops and is surrounded by Jefferson, Nichols, Pennsylvania, and 48th. There are blocks to the north, northeast, east, south, and northwest.".
+Jefferson & 48th is a room. It is south of Jefferson & Nichols South. The description is "The city block of the Country Club Plaza contains several shops and is surrounded by Jefferson, 48th, Pennsylvania, and Ward Parkway. There are blocks to the north and northeast.".
 
-North Embarcadero is a room. The description of North Embarcadero is "The northern side of the Embarcadero trails off into the beach. There are several shops continue flowing from the southern direction. West is the rest of San Francisco. South is the Embarcadero."
+Pennsylvania & West 46th Terrace is a room. It is northeast of Jefferson & Nichols North. The description is "The city block of the Country Club Plaza contains several shops and is surrounded by Pennsylvania, West West 46th Terrace, Broadway, and 47th. There are blocks to the southwest, south, southeast and east.".
+Pennsylvania & 47th is a room. It is east of Jefferson & Nichols North. It is northeast of Jefferson & Nichols South. It is south of Pennsylvania & West 46th Terrace. The description is "The city block of the Country Club Plaza contains several shops and is surrounded by Pennsylvania, 47th, Broadway, and Nichols. There are blocks to the north, northeast, east, southeast, south, southwest, and west.".
+Pennsylvania & Nichols is a room. It is east of Jefferson & Nichols South. It is southeast of Jefferson & Nichols North. It is south of Pennsylvania & 47th. It is northeast of Jefferson & 48th. The description is "The city block of the Country Club Plaza contains several shops and is surrounded by Pennsylvania, Nichols, Broadway, and Ward Parkway. There are blocks to the north, northeast, east, west, and northwest.".
 
-South Embarcadero is a room. It is south of Central Embarcadero. The description of South Embarcadero is "The southern side of the Embarcadero trails off into the beach. More shops line the pathways. West is the rest of San Francisco. North is the Embarcadero."
+Broadway & West 46th Terrace is a room. It is east of Pennsylvania & West 46th Terrace. It is northeast of Pennsylvania & 47th. The description is "The city block of the Country Club Plaza contains several shops and is surrounded by Broadway, West West 46th Terrace, Wornall, and 47th. There are blocks to the east, southeast, south, southwest, and west.".
+Broadway & 47th is a room. It is south of Broadway & West 46th Terrace. It is southeast of Pennsylvania & West 46th Terrace. It is east of Pennsylvania & 47th. It is northeast of Pennsylvania & Nichols. The description is "The city block of the Country Club Plaza contains several shops and is surrounded by Broadway, 47th, Central, and Nichols. There are blocks to the north, northeast, east, southeast, south, southwest, west, and northwest.".
+Broadway & Nichols is a room. It is southeast of Pennsylvania & 47th. It is south of Broadway & Pennsylvania. It is east of Pennsylvania & Nichols. The description is "The city block of the Country Club Plaza contains several shops and is surrounded by Broadway, Nichols, Central, and Ward Parkway. There are blocks to the north, northeast, east, west, and northwest.".
 
-Lombard Street is a room. Lombard Street is west of North Embarcadero. The description of Lombard Street is "The twisty road is an iconic roadway that was the intention of the residents during the 1920s to prevent issues that arose with the steep hill. It is not supposed to be here during your time. The only way to go is east and west"
+47th & Wornall is a room. It is east of Broadway & West 46th Terrace. It is northeast of Broadway & 47th. The description is "The city block of the Country Club Plaza contains several shops and is surrounded by Wornall, Wyandotte, and 47th. There are blocks to the east, southeast, south, southwest, and west.".
+Central & 47th is a room. It is south of 47th & Wornall. It is southeast of Broadway & West 46th Terrace. It is east of Broadway & 47th. It is northeast of Broadway & Nichols. The description is "The city block of the Country Club Plaza contains several shops and is surrounded by Central, 47th, Wyandotte, and Nichols. There are blocks to the north, northeast, east, south, southwest, west, and northwest.".
+Central & Nichols is a room. It is southeast of Broadway & 47th. It is south of Central & 47th. It is east of Broadway & Nichols. The description is "The city block of the Country Club Plaza contains several shops and is surrounded by Central, Nichols, Wyandotte, and Ward Parkway. There are blocks to the north, east, west, and northwest.".
 
-Market Street is a room. Market Street is west of Lombard Street. The description of Market Street is "This is a busy street lined with many shops and businesses. The street has the appearance of cleanliness. It goes east and southwest. There are buildings to the west and south."
+Wyandotte & West 46th Terrace is a room. It is east of 47th & Wornall. It is northeast of Central & 47th. The description is "The city block of the Country Club Plaza contains several shops and is surrounded by Wyandotte, West 46th Terrace, Mill Creek Parkway, and Emmanuel Cleaver II Blvd. There are blocks to the south, southwest, and west.".
-
+Wyandotte & Emmanuel Cleaver II Blvd is a room. It is southeast of Central & 47th. It is south of Wyandotte & West 46th Terrace. It is east of Central & Nichols. The description is "The city block of the Country Club Plaza contains several shops and is surrounded by Wyandotte, Emmanuel Cleave II Blvd, Mill Creek Parkway, and Ward Parkway. There are blocks to the northwest, north, and west.".
-North Market Street Entrance is a door. It is north of Market Street. It is south of Cafe du Nord. The description of North Market Street Entrance is "The door is fancy looking and has the words 'Cafe du Nord' across the top."
-
-Cafe du Nord is a room. It is north of North Market Street Entrance. The description of Cafe du Nord is "For more than 100 years, Cafe Du Nord has maintained its intimate mood of a speakeasy with rich, dark colors of red and black. The main door is to the east."  
-
-Wayfare Tavern is a room. It is west of Central Embarcadero. It is south of Lombard Street. The description of Wayfare Tavern is "This is some sort of attempt at a tavern for the purposes of serving drinks. It looks inviting. There are paths east and north. There is a giant, decorative wall to the west would have a famililar esthetic to Chung He."
-
-Omni San Francisco Hotel is a room. It is south of Wayfare Tavern. It is west of South Embarcadero. The description of Omni San Francisco Hotel is "The Omni San Francisco Hotel looks like an excellent place to stay if you wanted to. There is a path southwest. There is a path back to the Embarcadero to the east. There is a path north. There is a giant, decorative wall to the west would have a famililar esthetic to Chung He."
-
-Dragon Gate is a door. It is north of Gateway. It is locked. It is south of Chinatown. The description of the Dragon Gate is "The style of the Dragon Gate is as familiar to Chung He as the decorative wall."
-
-Gateway is a room. It is southwest of Omni San Francisco. The description of Gateway is "You stand before a giant gate connecting the walls."
-
-Chinatown is a room. The description of Chinatown is "Chinatown is one of the oldest Chinese-centric areas in San Francisco and spans several city blocks. It is surrounded by a decorative wall that seems oddly familiar to Chung He."
-
-[ Cat House, Main Floor ]
-
-Cat House Lobby is a room. The description of Cat House Lobby is "This is the lobby to the Cat House. It is a well-kept, Victorian-style lobby. People are milling in and out, heads bowed and hands covering their faces in attempts to avoid eye contact. There are doorways to the north-east and north-west."
-
-Cat House Room 3 is a room. It is northeast of Cat House Lobby. It is west of Cat House Kitchen. The description of the Cat House Room 3 is "The room has various erotic pictures hung on the wall. You're too embarassed to view them any more than a passing glance. There are a rooms to the east and a room to the west and south-west."
-
-Cat House Kitchen is a room. The description of the Cat House Kitchen is "The kitchen has all the ameneties to prepare the most indulgent of foods. There is a room to the west."
-
-Cat House Sun Room is a room. It is east of Cat House Room 1. It is west of Cat House Room 3. The description of Cat House Sun Room is "The sun room is bright and shiny thanks to well placed windows that let the light of our famous, shining star in. There are exits to the east and the west. There is an exit leading outside to the north."
-
-Cat House Room 1 is a room. It is northwest of Cat House Lobby. It is west of Cat House Sun Room. The description of Cat House Room 1 is "The room has various erotic pictures hung on the wall. You're too embarassed to view them any more than a passing glance. THere are doorways to the south-east and east. There are stairs leading up."
-
-Victorian Gate is a door. It is west of Market Street. It is east of Cat House Lobby. It is locked. The description of Victorian Gate is "The gate to the cat house is ornate wrought iron. It has a sign in decorative Victorian lettering that says 'Speak Friend and Enter. I, Narvi, made them. Celebrimbor of Hollin drew these signs.'"
-
-[ Cat House, Upper Floor ]
-
-Cat House Upper Hallway 1 is a room. It is above Cat House Room 1. The description of Cat House Upper Hallway 1 is "The hallway extends to the east. It is lined with rooms of people making strange sounds inside. There are stairs leading down."
-
-Cat House Upper Hallway 2 is a room. It is east of Cat House Upper Hallway 1. The description of Cat House Upper Hallway 2 is "The hallway extends to the east. It is lined with rooms of people making strange sounds inside."
-
-Cat House Upper Hallway 3 is a room. It is east of Cat House Upper Hallway 2. The description of Cat House Upper Hallway 3 is "The hallway extends to the east. It is lined with rooms of people making strange sounds inside."
-
-Cat House Upper Hallway 4 is a room. It is east of Cat House Upper Hallway 3. The description of Cat House Upper Hallway 4 is "The hallway terminates here. It is lined with rooms of people making strange sounds inside."
-
-[ Cat House Backyard ]
-
-Cat House Backyard is a room. It is north of Cat House Sun Room. The description of the Cat House Backyard is "The backyard is quite spacious. In the middle of the yard is a blue-green algae covered open sewer lagoon. There is a small, cramped-looking tool shed, as well."
-
-Dilapidated Door is a door. It is west of Cat House Backyard. The description of the Dilapidated  Door is "This dilapidated door with a rusty door handle leads into the tool shed."
-
-Tool Shed is a room. It is west of the Dilapidated Door. The description of the Tool Shed is "The interior of the tool shed seems to be much larger than the outside would appear to conversabilityey. There is enough room to accommodate at least three Hummers, but you wouldn't have an idea of what that vehicle as it's 1895!"
 
 [ Other Places ]
 
-Poorly Lit Room is a room. The description of Poorly Lit Room is "You are in a poorly lit room and it is difficult to see most features. Those that are visible are blurry."
+Poorly Lit Room is a room. The description of Poorly Lit Room is "You are in a poorly lit room and it is difficult to see most features. Those that are visible are blurry.".
-
-Fairborn Residence is a room. It is southwest of Market Street. The description of Fairborn Residence is "A dilapidated house that houses the Fairborn clan. There is a porch on the front with pillars buckling under the weight of holding the porch roof up."
-
-Morgan Alford's Law Office is a room. It is south of Market Street. The description of Morgan Alford's Law Office is "A fancy looking building that looks like it recently sprung up. The single floor building has a white exterior, a solitary door, and a solitary window."
-
-Courtroom is a room. The description of the Courtroom is "This your typical old-timey courtroom complete with large, mahogony judge's bench. Additionally, everything that people would interact with appears to be made of mahogony."
 
 [
 	ACTORS
 ]
 
-The Narrator is a person. They are in Poorly Lit Room. The significance of the Narrator is significant. The description of Narrator is "The narrator is well-dressed and young looking. However, what their true form is beguiling. They look like they urgently want to speak with you.".
+The Narrator is a person. They are in Poorly Lit Room. The significance of the Narrator is significant. The description is "The narrator is well-dressed and young looking. However, what their true form is beguiling. They look like they urgently want to speak with you.".
-Wallaby Fits is a person. The significance of Wallaby Fits is significant. The seeability of Wallaby Fits is unseen. The conversability of Wallaby Fits is unspoken. They are in Omni San Francisco Hotel. The description of Wallaby Fits is "A tall, lanky, balding man who looks grumpy and could start going into an invective fit at any moment.".
+Amelia is a person. The description of Amelia is "Amelia is a slender woman wearing ruined aviator clothes. She has sandy blonde hair. She is totally drunk and appears to almost always be that way.".
-Amelia is a person in Cafe du Nord. The description of Amelia is "Amelia is a slender woman wearing ruined aviator clothes. She has sandy blonde hair. She is totally drunk and appears to almost always be that way.".
+Darcon is a person. The description is "He looks like a typical retail worker wearing a blue vest, white shirt, and blue pants. He is quietly muttering obscenities into his drink."
-Wayfare Tavern Barkeep is a person. They are in Wayfare Tavern. The significance of the Wayfare Tavern Barkeep is significant. The description of Wayfare Tavern Barkeep is "The barkeep is your generic barkeep. He has a closely shaved head. A dark, waxed moustache and dark goatee. He seems to always be cleaning a beer mug with a rag despite the fact he serves people from other mugs found in the bar.".
+Buckethead is a person. The description is "That's right. THE Buckethead! He appears to be staring at his chickens, which are aimlessly pecking at and scratching the floor.".
-Darcon is a person. They are in the Wayfare Tavern. The description of Darcon is "He looks like a typical retail worker wearing a blue vest, white shirt, and blue pants. He is quietly muttering obscenities into his drink."
+Mr Linendot is a person. The description is "He has lines for limbs and dots for joints. His perfectly circular head only has dots for eyes and a line for a mouth.".
-Buckethead is a person. They are in Cat House Lobby. The description of Buckethead is "That's right. THE Buckethead! He appears to be staring at his chickens, which are aimlessly pecking at and scratching the floor.".
+Melkior is a person. They are in Broadway & 4th. The description is "He is an Eldarim turned undead after pledging his life to Death himself. He is currently held together it would seem by just simple rags. There are severely damaged parts on his body from previous battles.".
-Mr Linendot is a person. They are in North Embarcadero. The description of Mr Linendot is "He has lines for limbs and dots for joints. His perfectly circular head only has dots for eyes and a line for a mouth.".
+Hank the Wino King is a person. They are in Central & 4th. The description is "A dishevelled man stands before you with long, matted, brown hair. The odor that eminates from them is an assault on the senses. Their long coat is greasy and grimey."
-Melkior is a person. They are in Central Embarcadero. The description of Melkior is "He is an Eldarim turned undead after pledging his life to Death himself. He is currently held together it would seem by just simple rags. There are severely damaged parts on his body from previous battles.".
 
 [
 	THINGS
@@ -140,6 +117,7 @@ The wide-brimmed hat of irregularity is a thing. It is wearable. The description
 The fluffy cape of the damned is a thing. It is wearable. The description of the fluffy cape of the damned is "A fluffy, deep red cloak that one wears if they're of a certain profession.".
 The diamond topped cane of justice is a thing. It is wearable. The description of the diamond topped cane of justice is "This can is black with gold tracings and a diamond top for a handle.".
 The platform shoes of righteousness is a thing. It is wearable. The description of the platform shoes of righteousness is "These black shoes elevate you through extending the player to new heights."
+
 [ Other Things ]
 
 ye flask is a thing. The description of ye flask is "It is a flask containing some unknown liquid."
@@ -162,20 +140,18 @@ Before taking something when the noun is a thing and the significance of the nou
 Before dropping something when the noun is a thing and the significance of the noun is significant:
 	decrease the current score of the player by 5.
 
-Understand "say mellon" as saying mellon. Saying mellon is an action applying to nothing.
-After saying mellon when the location of the player is Market Street:
-		say "The Victorian Gate unlocks and opens up.";
-		now the Victorian Gate is unlocked.
-		[ increase the current score of the player by 10. ]
-
 After reading a command:
 	let N be "[the player's command]";
 	if N is "take over kingdom",
 		say "What kingdom, you dumple!?".
 
-After speech when noun is Wallaby Fits:
+After speech when noun is Melkior:
-	say "Wallaby Fits looks up and says 'I don’t want to talk to you no more, you empty-headed animal food trough wiper. I fart in your general direction! Your mother was a hamster and your father smelt of elderberries!'";
+	let rr be a random number from 1 to number of rows in Table of Melkior Responses;
-	say "Wallaby Fits goes back to what he was doing which is none of your concern."
+	say "[Response in row rr of Table of Melkior Responses]".
+
+After speech when noun is Hank the Wino King:
+	let rr be a random number from 1 to number of rows in Table of Hank the Wino King Rants;
+	say "[Response in row rr of Table of Hank the Wino King Rants]".
 
 [ For displaying figures ]
 
@@ -223,16 +199,8 @@ After speech when the noun is Narrator and The Beginning is happening:
 	increase the current score of the player by 10.
 The player is in Poorly Lit Room.
 
-[ San Francisco, 1895 ]
+[ Act I ]
-San Francisco 1895 is a scene. San Francisco 1895 begins when The Beginning ends.
+Act I is a scene. Act I begins when The Beginning ends.
-
-When San Francisco 1895 begins:
-	move the player to Central Embarcadero.
-
-After speech when the noun is Darcon:
-	say "Chung He looks at Darcon and says 'I'm looking for my husband. Have you seen him?'";
-	say "Darcon eyes Chung He up and down with a curious glance. He grunts 'Looking for your husband? Chinese fella? Yeah, I seen 'im. He went to Chinatown.'";
-	say "An loud, ominous sound of a large gate unlocking booms through the area.";
-	now the Dragon Gate is unlocked;
-	increase the current score of the player by 10.
 
+When Act I begins:
+	move the player to Summit & Jefferson.

Makefile

@@ -1,7 +1,6 @@
-BUILDDIR := build
-DISTDIR := dist
 SRCDIR := .
-TARGETS := ButteredToast ButteredToast2 ButteredToast3
+
+include Targets
 
 all: $(TARGETS)
 
@@ -20,6 +19,9 @@ $(TARGETS): %.inform
 clean_inform:
 	echo $(SRCDIR)/$(TARGET_NAME)/Build
 
+web:
+	$(foreach TARGET_NAME, $(TARGETS), - python3 $(IF)/blorbtool.py $(TARGET_NAME).gblorb giload $(TARGET_NAME).materials/Release/interpreter interpreter && echo `pwd` && cp $(TARGET_NAME).gblorb "$(TARGET_NAME).materials/Release/`cat $(TARGET_NAME).inform/Release.blurb | grep -Eo -m1 '([^\"]+\.gblorb)' | sed -e 's/\( \)/\\ /g'`" )
+
 clean:
 	$(foreach TARGET_NAME, $(TARGETS), - rm -rf $(SRCDIR)/$(TARGET_NAME).inform/Build - rm -rf $(SRCDIR)/$(TARGET_NAME).materials/Release $(SRCDIR)/$(TARGET_NAME).inform/Index $(SRCDIR)/$(TARGET_NAME).inform/*.plist $(SRCDIR)/$(TARGET_NAME).inform/*.iFiction $(SRCDIR)/$(TARGET_NAME).inform/*.blurb )
 	- rm *.gblorb

Targets

@@ -0,0 +1 @@
+TARGETS := ButteredToast ButteredToast2 ButteredToast3