Update to include more room per the challenge

ButteredToast4.inform/Source/story.ni

@@ -30,6 +30,8 @@ Chapter 2 - Figures and Tables
 Figure of Mr Linendot is the file "mr_linendot.jpg".
 Figure of Marshie is the file "marshie.jpg".
 Figure of Melkior is the file "melkior.jpg".
+Figure of the Burning Tower of Plargh is the file "plargh.jpg".
+Figure of Dogs Playing Yahtzee is the file "dogs_playing_yahtzee.jpg".
 
 Table of Television Responses
 Response
@@ -118,6 +120,10 @@ Chapter 3 - Rooms and Doors
 Dungeon 1 Meet & Greet Room is a room. The description is "The meet and greet room has stone walls and granite floors and ceilings.".
 Pie Room is a room. The description is "[if unvisited]A voice says 'This is the pie room! Take one pie but only one pie. Mwhahahahahaha!' There are a large assortment of pies laid out in the room, but most don't seem appetizing. The floors, walls, and ceiling appear to be carved out of granite. There is an opening to the southwest on the southwest side of the room.[Otherwise]There are a large assortment of pies laid out in the room, but most don't seem appetizing. The floors, walls, and ceiling appear to be carved out of granite. There is an opening on the southwest side of the room.".
 Fluffy Puff Path is a room. It is southwest of Pie Room. The description is "You are in a slightly curving path that is literally carved out of the rock. It leads to the south.".
+Aquarium is a room. It is south of Fluffy Puff Path. The description is "You find yourself in a giant cavern carved out of the living rock. Situated in the room is an aquarium full of water about the height of the tall ceiling and wrapping around the room with arches allowing for access to the southern exit. From the west and east, sounds of water trickling can be heard. The giant aquarium has branches leading in both of those directions.".
+Western Aquarium is a room. It is west of Aquarium. The description is "The western area of the aquarium leads into this room that is carved from the stone and the ginormous aquarium ends here.".
+Eastern Aquarium is a room. It is east of Aquarium. The description is "The eastern area of the aqaurium leads into this room that is carved from the stone and the ginormous aquarium ends here.".
+Hall of Pictures is a room. It is south of Aquarium. The description is "The long passageway continues in an L-shaped pattern to the west. Inside it are several pictures and paintings, most of which are of no consequence and are quite boring.".
 
 Pie Room Door is a door. It is southeast of Dungeon 1 Meet & Greet Room. It is northwest of Pie Room. It is closed and locked. The description is "The rock door has fading words scrawled on them that say 'Speak the lines and dots and you may enter.'".
 
@@ -148,10 +154,18 @@ Chapter 5 - Things
 The ring of awesomeness is a thing. It is wearable. The description is "An awesome-looking ring that fits your finger perfectly.".
 BBQ Burnt Ends is a thing. It is edible. The description is "The BBQ burnt ends are a Kansas City specialty. They look so good and that they should be eaten before getting too cold.".
 ye flask is a thing. It is fixed in place. The description is "It is a flask containing some unknown liquid."
-Can of Rubarb Pepso is a thing. The description is "A can of 'delicious', 'refreshing', 'rubarb' Pepso, the only flavored cola made with real pepsin.".
+Can of Rhubarb Pepso is a thing. The description is "A can of 'delicious', 'refreshing', rhubarb Pepso, the only flavored cola made with real pepsin.".
 TV is a thing. It is fixed in place. It is in Dungeon 1 Meet & Greet Room. The description is "This television has a black shell surrounding a touch screen. The touch screen currently says 'Touch Me!'".
 blueberry floor pie is a thing. It is edible. It is in the Pie Room. The description is "This floor pie is flavored blueberry.".
 cherry floor pie is a thing. It is edible. It is in the Pie Room. The description is "This floor pie is flavored cherry.".
+Fountain is a container. It is fixed in place. It is in the Western Aquarium. The description is "An ornate stonework fountain that seems to have an endless supply of water pouring out of it.".
+Bucket is a container. It is in the Western Aquarium. The bucket can be empty or full. The bucket is empty. The description is "An old metal bucket. However, to poor Liza's chagrin, there is no hole in this here bucket. [if full]It is currently full[otherwise]It is currently empty.".
+Ginormous aquarium is a container. It is in the Aquarium. The description is "A ginormous aquarium. Fish that are easily spooked swim about inside. It has two tributaries branching off to the east and west. There is a hole in it to allow insertion of things."
+Goldfish is an animal. Understand "fish" as goldfish. It is in Eastern Aquarium. The description is "Yup. It's a goldfish that just happens to be golden colored. [if goldfish is in bucket]The goldfish seems content if such a thing can be said of fish.[otherwise]It is flopping about on the floor and seems to be struggling.".
+Painting of the Tower of Plargh is a thing. It is fixed in place. It is in the Hall of Pictures. The description is "The picture depicts the Tower of Plargh burning to the ground and a multitude surrounding it. They are cheering and waving banners and flags.".
+Painting of the Mirren Lisa is a thing. It is fixed in place. It is in the Hall of Pictures. The description is "The artist took some liberties and combined the Mona Lisa with Helen Mirren. They did a great job of it!".
+Photo of a Deaf Zeppelin is a thing. It is fixed in place. It is in the Hall of Pictures. The description is "For whatever reason, the photographer took an arthouse picture of a figure that looks like an old timey zeppelin but with hearing aids attached to the side.".
+Painting of Dogs Playing Yahtzee is a thing. It is in the Hall of Pictures. The description is "It's dogs! And they're dressed up in cute people clothes and playing Yahtzee!".
 
 Chapter 6 - Actions
 
@@ -210,7 +224,24 @@ Instead of taking while the noun is ye flask:
 
 [ Game progressing features ]
 
-Before going to a room (called new room) while the location of the player is Fluffy Puff Path and new room is not Pie Room:
+Instead of inserting when the noun is bucket:
+	if the second noun is the fountain and the bucket is empty:
+		say "You use the bucket on the water fountain and it's now full.";
+		increase the score of the player by 10;
+		now the bucket is full;
+	if the second noun is the ginormous aquarium and the goldfish is in the bucket and the bucket is full:
+		say "When you place the bucket into the ginormous aquarium, the bucket slowly dissolves and the goldfish swims quickly amongst the other fish and is soon indistiguishable from the other golden goldfish there.";
+		remove the goldfish from play;
+		remove the bucket from play;
+		increase the score of the player by 10.
+
+Instead of inserting when the noun is goldfish and the second noun is bucket and the bucket is full:
+	say "You place the struggling goldfish into the bucket, which causes it to swim around and seem happier.";
+	now the goldfish is in the bucket;
+	increase the score of the player by 10.
+
+
+Before going to a room (called new room) while the location of the player is Fluffy Puff Path and new room is not Pie Room and the location of Marshie is Fluffy Puff Path:
 	if Marshie does not have a blueberry floor pie or Marshie does not have a cherry floor pie:
 		say "Marshie frowns and says 'I don't have me a floor pie!'. At that moment, he opens his eyes and shoots blue fire right onto you and you incinerate into dust.";
 		end the story;
@@ -220,10 +251,11 @@ Before going to a room (called new room) while the location of the player is Flu
 Carry out talking when the noun is Marshie:
 	say "I really hungry. I could go for some pie right about now.".
 
-Carry out talking when the noun is Mr Linendot and player is not carrying Can of Rubarb Pepso:
-	say "Mr Linendot says 'Have this can of 'rubarb' pepso on the house!'";
-	move can of rubarb pepso to location of the player;
-	silently try taking the can of rubarb pepso.
+Carry out talking when the noun is Mr Linendot and player is not carrying Can of Rhubarb Pepso:
+	say "Mr Linendot says 'Have this can of rhubarb pepso on the house!'";
+	increase the score of the player by 10;
+	move can of rhubarb pepso to location of the player;
+	silently try taking the can of rhubarb pepso.
 
 [ What if you take more than one pie from the pie room ]
 Carry out taking:
@@ -240,6 +272,7 @@ Carry out taking:
 After giving to Marshie:
 	if the noun is cherry floor pie or the noun is blueberry floor pie:
 		say "The pie magically starts floating from your hand into Marshie's open maw and is consumed in one bite.[paragraph break]Marshie smiles, says 'Thank you!', and floats away.";
+		increase the score of the player by 10;
 		remove Marshie from play;
 	otherwise:
 		continue the action.
@@ -276,6 +309,12 @@ After examining Mr Linendot:
 After examining Marshie:
 	display the Figure of Marshie.
 
+After examining the Painting of the Tower of Plargh:
+	display the Figure of the Burning Tower of Plargh.
+
+After examining Painting of Dogs Playing Yahtzee:
+	display the Figure of Dogs Playing Yahtzee.
+
 [
 After examining Burnt Ends BBQ:
 	display the Figure of BBQ.
@@ -297,4 +336,5 @@ Chapter 7 - The Game
 
 Chapter 8 - Tests
 
-test happypath with "x mr / x tv / x door / talk to mr / se / x cherry / x blueberry".
+test happypath with "x mr / x tv / x door / talk to mr / se / x cherry / x blueberry / get cherry / sw / x marshie / give pie to marshie / s / w / x bucket / x fountain / get bucket / insert bucket into fountain / e / e / x goldfish / put goldfish into bucket / w / put bucket into ginormous aquarium / s / x Painting of the Tower of Plargh
+/ x Painting of Mirren Lisa / x Photo of a Deaf Zeppelin / x Painting of Dogs Playing Yahtzee / take Painting of Dogs Playing Yahtzee".