Fix CRs in batchcommand file

server/conf/connection_screens.py

@@ -25,16 +25,29 @@ from django.conf import settings
 from evennia import utils
 
 CONNECTION_SCREEN = """
-|b==============================================================|n
+Wha...what is this place?
- Welcome to |g{}|n, version {}!
+
+You followed his instructions. Head to the city park, and on the woodsy side, turn left at the lamp post. Peer in the brambles and when you see the red handkerchief tied to branch, follow it ...
+
+Just keep following the red kerchiefs, until...
+
+|b----------------------------------------------------|n
+
+ Welcome to the World of |g{}|n, version {}!
+
+ This is a game. One that hearkens back to earlier age, where, with limited graphics, we created worlds built of words. A story game where you type instructions to manipulate the story.
 
  If you have an existing account, connect to it by typing:
       |wconnect <username> <password>|n
+
  If you need to create an account, type (without the <>'s):
       |wcreate <username> <password>|n
 
  If you have spaces in your username, enclose it in quotes.
- Enter |whelp|n for more info. |wlook|n will re-show this screen.
+
-|b==============================================================|n""".format(
+ After you've logged in Enter |whelp me|n for more info.
+
+|b----------------------------------------------------|n
+""".format(
     settings.SERVERNAME, utils.get_evennia_version("short")
 )

web/static/webclient/css/custom.css

@@ -60,6 +60,12 @@ textarea.inputfield:focus {
     background-size: 34px;
 }
 
+.color-010 {
+    font-weight: bold;
+    font-size: 21px;
+    color: #008020;
+}
+
 .color-014 {
     font-weight: bold;
     font-size: 24px;

world/version1.ev

@@ -16,10 +16,7 @@
 
 
 # [[file:../../../projects/mud.org::*Character: Dabble][Character: Dabble:2]]
-@desc self = A small, hunched old man with a gray vandyke and an eye
+@desc self = A small, hunched old man with a gray vandyke and an eye twinkle. Spectacles perched precariously on the end of his hooked nose, wobble with his head. A jaunty crimson cap contrasts with his dark brown cloak.
-  twinkle. Spectacles perched precariously on the end of his hooked
-  nose, wobble with his head. A jaunty crimson cap contrasts with his
-  dark brown cloak.
 # Character: Dabble:2 ends here
 
 
@@ -30,18 +27,10 @@
 @name here = The Forest;mp01
 # The Forest:1 ends here
 
-
-
 # The description will take advantage of the /seasons/ and /times/ of the day:
 
-
 # [[file:../../../projects/mud.org::*The Forest][The Forest:2]]
-@desc here = A giant, moss-covered boulder stands among immense trees
+@desc here = A giant, moss-covered boulder stands among immense trees that etch the sky and slice the clouds in the <evening>darkening twilight</evening><morning>awakening dawn</morning><afternoon>lazy afternoon</afternoon><night>night sky</night>. A footpath winds around the giant, moss-covered tree roots to the East and West. To the south, a dock lounges on a large pond.
-  that etch the sky and slice the clouds in the <evening>darkening
-  twilight</evening><morning>awakening dawn</morning><afternoon>lazy
-  afternoon</afternoon><night>night sky</night>. A footpath winds around
-  the giant, moss-covered tree roots to the East and West. To the south,
-  a dock lounges on a large pond.
 # The Forest:2 ends here
 
 
@@ -57,8 +46,7 @@
 # More details about the room that describes aspects of the boulder in the =desc= above. First, the symbol:
 
 # [[file:../../../projects/mud.org::*Boulder][Boulder:1]]
-@detail symbol = You move an ivy runner to see three curves join
+@detail symbol = You move an ivy runner to see three curves join together as if it were three legs.
-  together as if it were three legs.
 # Boulder:1 ends here
 
 
@@ -99,10 +87,7 @@
 # The ability to /climb/ the boulder isn’t immediately obvious, so let’s make it a bit of a secret:
 
 # [[file:../../../projects/mud.org::*Boulder][Boulder:6]]
-@desc boulder = A boulder with patches of moss and delicate clover.
+@desc boulder = A boulder with patches of moss and delicate clover. A carved symbol and even some runes try to hide behind tendrils of ivy as if keeping a secret. Wait! You notice a foot hold, and then another. You can |bclimb|n this boulder!
-  A carved symbol and even some runes try to hide behind tendrils of ivy
-  as if keeping a secret. Wait! You notice a foot hold, and then
-  another. You can |bclimb|n this boulder!
 # Boulder:6 ends here
 
 
@@ -154,8 +139,7 @@
 # And a description of the climb:
 
 # [[file:../../../projects/mud.org::*Top of Boulder][Top of Boulder:4]]
-@desc climb = The climb seemed easy, but you're not sure you can
+@desc climb = The climb seemed easy, but you're not sure you can handle the footholds going the other way around.
-  handle the footholds going the other way around.
 # Top of Boulder:4 ends here
 
 
@@ -198,10 +182,7 @@
 # And a lovely message about why you can’t steal moss:
 
 # [[file:../../../projects/mud.org::*Top of Boulder][Top of Boulder:10]]
-@set moss/get_err_msg = The moss is a bryophyte, and as such, has
+@set moss/get_err_msg = The moss is a bryophyte, and as such, has attached itself to boulder by rhizoids, which are one cell thick root structures. While this helps with water absorption, you didn't think you were going to get a biology lesson, did you? tl;dr You can't get it.
-   attached itself to boulder by rhizoids, which are one cell thick root
-   structures. While this helps with water absorption, you didn't think
-   you were going to get a biology lesson, did you? tl;dr You can't get it.
 # Top of Boulder:10 ends here
 
 
@@ -223,8 +204,7 @@
 # And a nice journey message to go east out of the forest:
 
 # [[file:../../../projects/mud.org::*Field][Field:3]]
-@set east/traverse_msg = "The mossy tree roots that borders this
+@set east/traverse_msg = "The mossy tree roots that borders this footpath begin to thin out to clover and flowers..."
-footpath begin to thin out to clover and flowers..."
 # Field:3 ends here
 
 
@@ -249,12 +229,7 @@ east
 
 
 # [[file:../../../projects/mud.org::*Field][Field:6]]
-@desc here = The giant trees ring this meadow full of tall grass and
+@desc here = The giant trees ring this meadow full of tall grass and large yellow flowers, who nod their heads to you as you pass by in the <evening>darkening twilight</evening><morning>awakening dawn</morning><afternoon>lazy afternoon</afternoon><night>night sky</night>. A gap in the trees show how you can return to the footpath in the forest.
-  large yellow flowers, who nod their heads to you as you pass by in the
-  <evening>darkening twilight</evening><morning>awakening
-  dawn</morning><afternoon>lazy afternoon</afternoon><night>night
-  sky</night>. A gap in the trees show how you can return to the
-  footpath in the forest.
 # Field:6 ends here
 
 
@@ -365,16 +340,6 @@ Looks good for being out in the weather.
 
 # First we need to make a =PermanentObject= (from the regular =Object=), but one that offers a
 
-
-# [[file:../../../projects/mud.org::*Fishing Pole][Fishing Pole:1]]
-@create/drop fishing pole;pole:typeclasses.things.FishingPole
-@desc pole = A nice pole for catching fish. It even has a hook.
-@detail hook = One of those shiny lures, made from gold coins. Curiouser.
-@detail water = Despite the weather, the water looks fine. Perhaps there is a hole
-# Fishing Pole:1 ends here
-
-
-
 # Return to the forest:
 
 # [[file:../../../projects/mud.org::*Forest Path][Forest Path:1]]
@@ -392,8 +357,7 @@ Looks good for being out in the weather.
 # With a nice message about wandering:
 
 # [[file:../../../projects/mud.org::*Forest Path][Forest Path:3]]
-@set west/traverse_msg = "You meander between mossy tree roots along a
+@set west/traverse_msg = "You meander between mossy tree roots along a footpath for a while..."
-footpath for a while..."
 # Forest Path:3 ends here
 
 
@@ -424,9 +388,7 @@ west
 
 
 # [[file:../../../projects/mud.org::*Forest Path][Forest Path:7]]
-@desc here = Moss-covered tree roots border the meandering footpath. A
+@desc here = Moss-covered tree roots border the meandering footpath. A red door with a round top lies at the base of a giant tree, a carved sign over it reads, Dabblers.
-  red door with a round top lies at the base of a giant tree, a carved
-  sign over it reads, Dabblers.
 # Forest Path:7 ends here
 
 
@@ -535,8 +497,7 @@ How else are you going to knock on a door?"
 # And an error message if the ring is not with the goblin:
 
 # [[file:../../../projects/mud.org::*Knocker][Knocker:13]]
-@set here/knock_err_msg = "This door knocker is defective, as it
+@set here/knock_err_msg = "This door knocker is defective, as it doesn't have a ring to...er, do the knockin'."
-doesn't have a ring to...er, do the knockin'."
 # Knocker:13 ends here
 
 # [[file:../../../projects/mud.org::*Cozy Tea House][Cozy Tea House:1]]
@@ -547,10 +508,7 @@ doesn't have a ring to...er, do the knockin'."
 # The door description should match the artwork on the website:
 
 # [[file:../../../projects/mud.org::*Red Door][Red Door:1]]
-@desc red door = A painted red door where the round top of the door
+@desc red door = A painted red door where the round top of the door fits snugly in the bark of the tree. Along with a large brass doorknob, the door sports the most curious door knocker in the shape of a goblin's face.
-  fits snugly in the bark of the tree. Along with a large brass
-  doorknob, the door sports the most curious door knocker in the shape
-  of a goblin's face.
 # Red Door:1 ends here
 
 
@@ -610,13 +568,9 @@ doesn't have a ring to...er, do the knockin'."
 # And the best description ever:
 
 # [[file:../../../projects/mud.org::*Inside][Inside:5]]
-@desc here = An enormous stone hearth overshadows this round room with
+@desc here = An enormous stone hearth overshadows this round room with dark paneling. A subtle smell of tea and incense. Large, overstuffed chairs sit invitingly by the fireplace. Oddly angled shelves with books and knickknackery adorn the walls while a trolley supports a large kettle, cups and scones.
-  dark paneling. A subtle smell of tea and incense. Large, overstuffed
-  chairs sit invitingly by the fireplace. Oddly angled shelves with
-  books and knickknackery adorn the walls while a trolley supports a
-  large kettle, cups and scones.
 # Inside:5 ends here
-
+#ZZ
 
 
 # Since we want the description to include the state of the fire, we need some /parts/ to assemble. Still not sure how this should be done.
@@ -626,26 +580,19 @@ doesn't have a ring to...er, do the knockin'."
 @set here/initial_desc = "You found a cozy, cornerless room."
 
 # Ravenous State
-@set here/fire_out = "The room is dim, but you see large, overstuffed chairs placed
+@set here/fire_out = "The room is dim, but you see large, overstuffed chairs placed by a dark fireplace in a large stone hearth. Perhaps you could light a fire?"
-  by a dark fireplace in a large stone hearth. Perhaps you could light a fire?"
 
 # Hungry State
-@set here/fire_dim = "Large, overstuffed chairs sit invitingly close to the
+@set here/fire_dim = "Large, overstuffed chairs sit invitingly close to the dimly glowing embers in the fireplace of a stone hearth."
-  dimly glowing embers in the fireplace of a stone hearth."
 
 # Fed State
-@set here/fire_on = "Large, overstuffed chairs sit invitingly by a fire casting
+@set here/fire_on = "Large, overstuffed chairs sit invitingly by a fire casting shadows that dance on the dark paneling."
-  shadows that dance on the dark paneling."
 
 # Full State
-@set here/fire_full = "Large, overstuffed chairs slightly shield you
+@set here/fire_full = "Large, overstuffed chairs slightly shield you from the bright light of the roaring fire in the fireplace of a stone hearth."
-  from the bright light of the roaring fire in the fireplace of a stone hearth."
 
 # And a final description:
-@set here/final_desc = "Oddly angled shelves with books and
+@set here/final_desc = "Oddly angled shelves with books and knickknackery adorn the walls around a tapestry. The subtle smell of wood smoke, incense and tea leads you to a trolley supporting a large teapot, cups and freshly baked scones."
-  knickknackery adorn the walls around a tapestry. The subtle smell of
-  wood smoke, incense and tea leads you to a trolley supporting a large
-  teapot, cups and freshly baked scones."
 # Inside:6 ends here
 
 
@@ -655,11 +602,7 @@ doesn't have a ring to...er, do the knockin'."
 # Let’s come up with a lot of descriptions:
 
 # [[file:../../../projects/mud.org::*Inside][Inside:7]]
-@detail tapestry = The muted colors of the tapestry either show its
+@detail tapestry = The muted colors of the tapestry either show its age or its location over the sometimes smokey hearth. It shows a gallant stag surrounded by woodland creatures. A racoon holds aloft a gold box while a wolf has a gnarled staff. A raven perched on the stag's antlers grips a blue ball in its beak.
-  age or its location over the sometimes smokey hearth. It shows a
-  gallant stag surrounded by woodland creatures. A racoon holds aloft a
-  gold box while a wolf has a gnarled staff. A raven perched on the
-  stag's antlers grips a blue ball in its beak.
 # Inside:7 ends here
 
 
@@ -667,8 +610,8 @@ doesn't have a ring to...er, do the knockin'."
 # We should describe all the objects in the tapestry, eh?
 
 # [[file:../../../projects/mud.org::*Inside][Inside:8]]
-@detail raven = The raven winks at you, and says, “Nevermore.” Really?
+@detail raven = The raven winks at you, and says, “Nevermore.”
-  It probably didn't. Your eyes must be playing trickster.
+Really? It probably didn't. Your eyes must be playing trickster.
 # Inside:8 ends here
 
 
@@ -719,17 +662,14 @@ doesn't have a ring to...er, do the knockin'."
 # And a description that will be overridden:
 
 # [[file:../../../projects/mud.org::*Fireplace][Fireplace:3]]
-@desc fireplace = A stone fireplace with a carved wooden mantel supporting
+@desc fireplace = A stone fireplace with a carved wooden mantel supporting small pictures, some books and a black statue.
-  small pictures, some books and a black statue.
 # Fireplace:3 ends here
 
 
 # Since we mentioned some details, we better mention them:
 
 # [[file:../../../projects/mud.org::*Fireplace][Fireplace:4]]
-@detail pictures = Two small framed pictures perch above the fireplace
+@detail pictures = Two small framed pictures perch above the fireplace mantle. One is of a satyr playing a saxophone, and the other is of a fish with a big smile.
-  mantle. One is of a satyr playing a saxophone, and the other is of a
-  fish with a big smile.
 # Fireplace:4 ends here
 
 
@@ -737,8 +677,7 @@ doesn't have a ring to...er, do the knockin'."
 # This reference in this detail is obviously, only for me:
 
 # [[file:../../../projects/mud.org::*Fireplace][Fireplace:5]]
-@detail statue = A small, black statue of a salamander curled around a
+@detail statue = A small, black statue of a salamander curled around a book, engraved with a title, "Seeing Stones".
-  book, engraved with a title, "Seeing Stones".
 # Fireplace:5 ends here
 
 
@@ -746,9 +685,7 @@ doesn't have a ring to...er, do the knockin'."
 # I imagine a giant picture over the fireplace … need to do something interesting with it.
 
 # [[file:../../../projects/mud.org::*Fireplace][Fireplace:6]]
-@detail picture = Above the fireplace is a large, somewhat abstract
+@detail picture;painting = Above the fireplace is a large, somewhat abstract painting stretching its arm-like branches with shadowing that looks like a yawn.
-  painting stretching its arm-like branches with shadowing that looks
-  like a yawn.
 # Fireplace:6 ends here
 
 
@@ -758,9 +695,7 @@ doesn't have a ring to...er, do the knockin'."
 
 
 # [[file:../../../projects/mud.org::*Knickknacks][Knickknacks:1]]
-@detail knickknacks;things;knick-knacks;doodads;stuff;crap = An odd
+@detail knickknacks;things;knick-knacks;doodads;stuff;crap = An odd assortment of knickknacks and doodads that decorate the minimal space between the askewed books on the skewampus shelves.
-  assortment of knickknacks and doodads that decorate the minimal
-  space between the askewed books on the skewampus shelves.
 # Knickknacks:1 ends here
 
 
@@ -768,10 +703,7 @@ doesn't have a ring to...er, do the knockin'."
 # We mentioned shelves of books:
 
 # [[file:../../../projects/mud.org::*Books][Books:1]]
-@detail shelves;bookshelf;bookshelves = Shelves at various angles
+@detail shelves;bookshelf;bookshelves = Shelves at various angles embellish the walls of this small, cozy room. Leatherbound books weigh each shelf, while some stacks of books support other shelves. Dabbler has decorated some shelves with odd trinkets.
-  embellish the walls of this small, cozy room. Leatherbound books
-  weigh each shelf, while some stacks of books support other shelves.
-  Dabbler has decorated some shelves with odd trinkets.
 # Books:1 ends here
 
 
@@ -802,8 +734,7 @@ doesn't have a ring to...er, do the knockin'."
 # We mentioned a /trolley/ with tea, cups and scones:
 
 # [[file:../../../projects/mud.org::*Tea Service][Tea Service:1]]
-@detail trolley = A tea trolley, complete with a small collection of
+@detail trolley = A tea trolley, complete with a small collection of teacups, a magical teapot, as well as an assortment of scones and pastries.
-  teacups, a magical teapot, as well as an assortment of scones and pastries.
 # Tea Service:1 ends here