From 107241f9252c28e44a4ae97be4738ba71c59d68e Mon Sep 17 00:00:00 2001
From: Howard Abrams <howard.abrams@gmail.com>
Date: Sun, 2 Mar 2025 10:25:28 -0800
Subject: [PATCH] Better help messages.

---
 commands/drinkables.py            | 16 ++++++++++++----
 commands/sittables.py             |  6 ++++--
 server/conf/connection_screens.py | 13 +++++++------
 typeclasses/fishing.py            |  4 +++-
 4 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/commands/drinkables.py b/commands/drinkables.py
index bc91784..22f9fe0 100755
--- a/commands/drinkables.py
+++ b/commands/drinkables.py
@@ -6,7 +6,9 @@ import random
 
 class CmdDrinkTea(Command):
     """
-    Drink tea.
+    If you are holding a teacup, and it has a liquid, you may drink your tea.
+
+    This doesn't tell others of this particular activity.
     """
     key = "drink"
     aliases = "sip"
@@ -16,7 +18,9 @@ class CmdDrinkTea(Command):
 
 class CmdMakeTea(Command):
     """
-    Make a pot of magical tea.
+    make [tea-type]
+
+    Make a pot of magical tea. If you do not specify a particular type of tea (or if it doesn't know what type of tea you suggest), the pot will choose something special for the occasion.
     """
     key = "make"
     aliases = ["make tea"]
@@ -30,7 +34,9 @@ class CmdMakeTea(Command):
 
 class CmdFillTeacup(Command):
     """
-    Fill the teacup with whatever is in the teapot.
+    Fill the teacup with whatever tea is in the teapot.
+
+    See 'make tea' for details on getting some tea in the teapot.
     """
     key = "fill"
     aliases = "pour"
@@ -40,7 +46,9 @@ class CmdFillTeacup(Command):
 
 class CmdGetTeacup(Command):
     """
-    Get a teacup.
+    Get a teacup from the trolley.
+
+    Each cup is special, but not necessarily unique.
     """
     key = "get teacup"
     aliases = ["get cup", "pickup cup", "pickup teacup", "take cup", "take teacup"]
diff --git a/commands/sittables.py b/commands/sittables.py
index 7391e52..d49af5e 100755
--- a/commands/sittables.py
+++ b/commands/sittables.py
@@ -4,7 +4,9 @@ from evennia import Command, CmdSet
 
 class CmdSit(Command):
     """
-    Sit down.
+    If the place you are at has something worthy of of your tushy, you will sit down there-on.
+
+    Sure, you can attempt to 'sit' anywhere.
     """
     key = "sit"
     def func(self):
@@ -12,7 +14,7 @@ class CmdSit(Command):
 
 class CmdStand(Command):
      """
-     Stand up.
+     If you are sitting, you will stand up. You may need to do this in order to leave.
      """
      key = "stand"
      locks = "cmd:sitsonthis()"
diff --git a/server/conf/connection_screens.py b/server/conf/connection_screens.py
index 55c73e6..0204d05 100644
--- a/server/conf/connection_screens.py
+++ b/server/conf/connection_screens.py
@@ -34,19 +34,20 @@ You followed his instructions. Head to the city park, and on the woodsy side, tu
 
 Just keep following the red kerchiefs, until...
 
-Welcome to the World of |g{}|n, version {}!
+Welcome to the World of |g{}|n!
 
 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 (in the lower boxed area if you are on the web):
+If you have an existing account, connect to it by typing (in the lower boxed area if you are on the web) the following (without the <>'s):
 
-  |wconnect <username> <password>|n
+|wconnect <username> <password>|n
 
-If you need to create an account, (in the box at the bottom of the screen) type the following (without the <>'s):
+Where "username" is the name of your account and your character's name you wish to assume. Please get creative with your password. 😉
+If you need to create an account, (once again, in the box at the bottom of the screen) type the following (without the <>'s):
 
-  |wcreate <username> <password>|n
+|wcreate <username> <password>|n
 
-If you have spaces in your username, enclose it in quotes.
+If you have spaces in your username or password, enclose it in quotes.
 
 After you've logged in Enter |whelp me start|n for more the getting started guide.
 
diff --git a/typeclasses/fishing.py b/typeclasses/fishing.py
index 5ae7f7e..539306d 100755
--- a/typeclasses/fishing.py
+++ b/typeclasses/fishing.py
@@ -28,7 +28,9 @@ class Fishing(Enum):
 
 class CmdThrowFish(Command):
     """
-    Throw the fish back in the water.
+    Throw the fish, if you are holding one, back in the water.
+
+    A helper can escort the fish to the nearest body of water if you aren't adjacent to one.
     """
     key = "throw"