diff --git a/typeclasses/readables.py b/typeclasses/readables.py
index 12520ae..ce9bfdc 100755
--- a/typeclasses/readables.py
+++ b/typeclasses/readables.py
@@ -127,8 +127,6 @@ class CmdSetRead(CmdSet):
class CmdSetBook(CmdSet):
- priority = 2
-
def at_cmdset_creation(self):
self.add(CmdReadBook)
self.add(CmdBurnBook)
diff --git a/world/version1.ev b/world/version1.ev
index 90ce7d9..427077b 100644
--- a/world/version1.ev
+++ b/world/version1.ev
@@ -841,28 +841,6 @@ Looks good for being out in the weather.
@set sign/get_err_msg = "This granny knot holding the sign to the chair is serious. You can't take it."
# Fishing Pole:8 ends here
-# The Boat
-
-# A boat on the sea is a separate room.
-
-
-# [[file:../../../projects/mud.org::*The Boat][The Boat:1]]
-@dig/teleport Leaf Boat;mp08:typeclasses.rooms_weather.TimeWeatherRoom
-# The Boat:1 ends here
-
-
-
-# And describe sailing on it.:
-
-
-# [[file:../../../projects/mud.org::*The Boat][The Boat:2]]
-@desc here = The lavender sea is tranquil as the giant leaf floats along an invisible current.
-The morning sun peaks above the collosal trees and the snowcapped mountains beyond.
-The afternoon sun peaks out briefly from misty clouds.
-The evening sun begins to set on a watery horizon.
-The moon peaks out from behind wispy clouds.
-# The Boat:2 ends here
-
# The Island
# The boat should land on a distant island.
@@ -877,63 +855,9 @@ Looks good for being out in the weather.
# [[file:../../../projects/mud.org::*The Island][The Island:2]]
-@teleport mp09
-#
@desc here = Vibrant green moss covers the island's gray rock. Wandering around the conifers you encounter giant statues of armored knights surrounding a huge, empty throne. An inscription at the base reads, ᚦ ᚮ ᚱ
# The Island:2 ends here
-# Connecting
-# Create an exit for getting /into/ the boat:
-
-
-# [[file:../../../projects/mud.org::*Connecting][Connecting:1]]
-@teleport mp06
-#
-@open leaf-like boat;leaf boat;boat;leaf = mp08
-# Connecting:1 ends here
-
-
-
-# And describe the boat first:
-
-
-# [[file:../../../projects/mud.org::*Connecting][Connecting:2]]
-@desc boat = A giant leaf, tipped on all sides look like it could be a boat. Doesn't seem to be an oar, or even a rudder, but...
-# Connecting:2 ends here
-
-# [[file:../../../projects/mud.org::*Connecting][Connecting:3]]
-@set boat/traverse_msg = "You step into the large leaf shaped like a boat, and push off from the shore into the sea..."
-# Connecting:3 ends here
-
-
-
-# Now jump into the boat,
-
-
-# [[file:../../../projects/mud.org::*Connecting][Connecting:4]]
-@teleport mp08
-#
-@open shore;island;dock = mp09
-# Connecting:4 ends here
-
-
-
-# And exiting the boat:
-
-
-# [[file:../../../projects/mud.org::*Connecting][Connecting:5]]
-@set shore/traverse_msg = "When the boat stops, you step off..."
-# Connecting:5 ends here
-
-
-
-# Are they going to look before getting off?
-
-
-# [[file:../../../projects/mud.org::*Connecting][Connecting:6]]
-@desc shore = You seem to have arrived at some island.
-# Connecting:6 ends here
-
# Forest Path
# Return to the forest:
diff --git a/world/version2.ev b/world/version2.ev
index 0007144..9899d2d 100644
--- a/world/version2.ev
+++ b/world/version2.ev
@@ -80,7 +80,9 @@
# [[file:../../../projects/mud-rpg.org::*Portal][Portal:4]]
-@desc/portal_open here = You notice a glowing orb... and then another, and another. The field, filled with the soft light, illuminates another path...
+@desc/portal_open here = A large waterfall cascades on the far side of this meadow creating a stream that meanders through the tall grass and large yellow flowers. They nod their sleepy heads to you as you pass by in the twilight. A gap in the trees show how you can return to the footpath in the forest.
+
+You also notice a glowing orb... and then another, and another. The field, filled with soft light, illuminates another path...
# Portal:4 ends here
# Closing the Portal
@@ -92,7 +94,7 @@
# Closing the Portal:1 ends here
# [[file:../../../projects/mud-rpg.org::*Closing the Portal][Closing the Portal:2]]
-@tag/del Frog Meadow = portal_open:roomstate
+@roomstate portal_open
# Closing the Portal:2 ends here
# Bartender
@@ -276,9 +278,30 @@ give chalkboard to shrub
# [[file:../../../projects/mud-rpg.org::*Cocktails][Cocktails:6]]
-@set bartender/triggers:session1 =
-{"prep1": {"desc": "Single preparation step for making a cocktail", "timer": 1, "events": [ "The bartender grabs a << few ^ couple of >> << bottles ^ jars ^ bottles ^ odd containers >> from << the shelf ^ a locked chest ^ a wooden box >>."]},
-{"prep2": {"desc": "Preparation steps for making a cocktail", "timer": 1, "events": [ "The bartender grabs a << few ^ couple of >> << bottles ^ jars ^ bottles ^ odd containers >> from << the shelf ^ a locked chest ^ a wooden box >>.", "<< He ^ The bartender >> then shakes and strains the << drink ^ concoction ^ elixir >> into a cocktail glass.", ]},
-{"prep3": {"desc": "Preparation steps for making a cocktail", "timer": 1, "events": [ "The bartender grabs a << few ^ couple of >> << bottles ^ jars ^ bottles ^ odd containers >> from << the shelf ^ a locked chest ^ a wooden box >>.", "<< He ^ The bartender >> then shakes and strains the << drink ^ concoction ^ elixir >> into a cocktail glass.", "He carefully, garnishes the << drink ^ cocktail >>."]},
+@set bartender/triggers:session1 = {
+ "prep1": {
+ "desc": "Single preparation step for making a cocktail",
+ "timer": 1,
+ "events": [
+ "The bartender grabs a << few ^ couple of >> << bottles ^ jars ^ bottles ^ odd containers >> from << the shelf ^ a locked chest ^ a wooden box >>."
+ ]
+ },
+ "prep2": {
+ "desc": "Preparation steps for making a cocktail",
+ "timer": 5,
+ "events": [
+ "The bartender grabs a << few ^ couple of >> << bottles ^ jars ^ bottles ^ odd containers >> from << the shelf ^ a locked chest ^ a wooden box >>.",
+ "<< He ^ The bartender >> shakes and strains the << drink ^ concoction ^ elixir >> into a cocktail glass."
+ ]
+ },
+ "prep3": {
+ "desc": "Preparation steps for making a cocktail",
+ "timer": 4,
+ "events": [
+ "The bartender grabs a << few ^ couple of >> << bottles ^ jars ^ bottles ^ odd containers >> from << the shelf ^ a locked chest ^ a wooden box >>.",
+ "<< He ^ The bartender >> then shakes and strains the << drink ^ concoction ^ elixir >> into a cocktail glass.",
+ "He carefully, garnishes the << drink ^ cocktail >>."
+ ]
+ }
}
# Cocktails:6 ends here