X-Git-Url: https://mudpy.org/gitweb?p=mudpy.git;a=blobdiff_plain;f=menu;h=c6d439c05d77291f69048d1cafac456c8b8d2ec4;hp=951df5425ae7212eb6f4e3e01c640419c9da524a;hb=e34437c01ef4ca0e2413bd08a76dd11b690c49a5;hpb=7a6aa3bc9d4a51bf19f3a967c736e532952d887f

diff --git a/menu b/menu
index 951df54..c6d439c 100644
--- a/menu
+++ b/menu
@@ -1,10 +1,13 @@
-[control]
+# Copyright (c) 2004-2009 Jeremy Stanley <fungi@yuggoth.org>. Permission
+# to use, copy, modify, and distribute this software is granted under
+# terms provided in the LICENSE file distributed with this software.
+
+[__control__]
 read_only = yes
 
 [menu:activate_avatar]
-action = user.avatar = universe.contents[user.account.getlist("avatars")[int(choice)-1]]
+action = user.activate_avatar_by_index(int(choice)-1)
 action_a = pass
-branch = active
 branch_a = main_utility
 choice_a = abort selection
 create = dict([(str(x+1),y) for x,y in enumerate(user.list_avatar_names())])
@@ -13,11 +16,10 @@ description = This is the list of avatars available for you to awaken.
 prompt = Whom would you like to awaken?
 
 [menu:active]
-prompt = >
 
 [menu:checking_new_account_name]
-action_d = user.account.delete()
-action_g = user.account.delete()
+action_d = user.account.destroy()
+action_g = user.account.destroy()
 branch_d = disconnecting
 branch_g = entering_account_name
 branch_n = entering_new_password
@@ -58,7 +60,7 @@ description = Your new avatar needs a name. This will be the name with which $(t
 prompt = Choose a name for $(tpop):
 
 [menu:delete_account]
-action_y = user.delete()
+action_y = user.destroy()
 branch_n = main_utility
 branch_y = disconnecting
 choice_n = no, don't delete my account
@@ -75,7 +77,7 @@ branch_a = main_utility
 choice_a = abort selection
 create = dict([(str(x+1),y) for x,y in enumerate(user.list_avatar_names())])
 default = a
-description = This is the list of avatars available for you to awaken.
+description = This is the list of avatars available for you to delete.
 prompt = Whom would you like to delete?
 
 [menu:disconnecting]
@@ -85,7 +87,7 @@ description = $(red)Disconnecting...$(nrm)
 prompt = $(red)Closing your previous connection...$(nrm)$(eol)
 
 [menu:entering_account_name]
-description = Welcome to the mudpy example...
+description = $(inc:login.txt)
 error_bad_name = Your account name needs to contain only digits (0-9) and letters (a-z).
 prompt = Identify yourself:
 
@@ -95,6 +97,8 @@ error_weak = That is a weak password... Try something at least 7 characters long
 prompt = Enter a new password for "$(account)":
 error_differs = The two passwords did not match. Try again...
 
+[menu:initial]
+
 [menu:main_utility]
 action_c = user.new_avatar()
 branch_a = activate_avatar
@@ -110,7 +114,7 @@ choice_p = permanently remove your account
 demand_a = user.account.getlist("avatars")
 demand_c = len(user.account.getlist("avatars")) < universe.categories["internal"]["limits"].getint("max_avatars")
 demand_d = user.account.getlist("avatars")
-description = From here you can awaken, create and delete avatars. An avatar is your persona in the world of Example. You can also leave or permanently delete your account.
+description = $(red)$(inc:banner.txt)$(nrm)$(eol)$(eol)From here you can awaken, create and delete avatars. An avatar is your persona in the world of Example. You can also leave or permanently delete your account.
 prompt = What would you like to do?
 
 [menu:verifying_new_password]