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

diff --git a/menu b/menu
index 951df54..495fce9 100644
--- a/menu
+++ b/menu
@@ -1,10 +1,9 @@
-[control]
+[__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 +12,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 +56,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
@@ -95,6 +93,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