X-Git-Url: https://mudpy.org/gitweb?p=mudpy.git;a=blobdiff_plain;f=share%2Fmenu.yaml;h=2857c38fd704d5d2157c6992b399b7c7f0d85d3f;hp=87176eb86c5e54ceccdb17cfcf521d2e30c7dd3b;hb=85e648fc1e7c1d4ee40836bcd617d731a7fb7094;hpb=8fbf63c8248e18576464d265e00178eea9f6a4ef

diff --git a/share/menu.yaml b/share/menu.yaml
index 87176eb..2857c38 100644
--- a/share/menu.yaml
+++ b/share/menu.yaml
@@ -67,7 +67,7 @@ menu.choose_name.description: Your new avatar needs a name. This will be the
     unremarkable name forever.
 menu.choose_name.prompt: "Choose a name for $(tpop):"
 
-menu.delete_account.action_y: user.destroy()
+menu.delete_account.action_y: mudpy.menu.delete_account_action_y(user)
 menu.delete_account.branch_n: main_utility
 menu.delete_account.branch_y: disconnecting
 menu.delete_account.choice_n: no, don't delete my account
@@ -78,14 +78,12 @@ menu.delete_account.description: By deleting your account, all your avatars
 menu.delete_account.prompt: Are you certain you wish to permanently delete your
     account?
 
-menu.delete_avatar.action: user.delete_avatar(
-    user.account.get("avatars")[int(user.choice)-1])
-menu.delete_avatar.action_a: pass
+menu.delete_avatar.action: mudpy.menu.delete_avatar_action(user)
+menu.delete_avatar.action_a: mudpy.menu.delete_avatar_action_a(user)
 menu.delete_avatar.branch: main_utility
 menu.delete_avatar.branch_a: main_utility
 menu.delete_avatar.choice_a: abort selection
-menu.delete_avatar.create: dict([(str(x+1),y) for x,y in
-    enumerate(user.list_avatar_names())])
+menu.delete_avatar.create: mudpy.menu.delete_avatar_create(user)
 menu.delete_avatar.default: a
 menu.delete_avatar.description: This is the list of avatars available for you
     to delete.
@@ -111,7 +109,7 @@ menu.entering_new_password.error_differs: The two passwords did not match. Try
 
 menu.telopt_negotiation.prompt:
 
-menu.main_utility.action_c: user.new_avatar()
+menu.main_utility.action_c: mudpy.menu.main_utility_action_c(user)
 menu.main_utility.branch_a: activate_avatar
 menu.main_utility.branch_c: choose_gender
 menu.main_utility.branch_d: delete_avatar
@@ -122,10 +120,9 @@ menu.main_utility.choice_c: create a new avatar
 menu.main_utility.choice_d: delete an unwanted avatar
 menu.main_utility.choice_l: leave for now
 menu.main_utility.choice_p: permanently remove your account
-menu.main_utility.demand_a: user.account.get("avatars")
-menu.main_utility.demand_c: len(user.account.get("avatars")) <
-    universe.contents["mudpy.limit"].get("avatars")
-menu.main_utility.demand_d: user.account.get("avatars")
+menu.main_utility.demand_a: mudpy.menu.main_utility_demand_a(user)
+menu.main_utility.demand_c: mudpy.menu.main_utility_demand_c(user)
+menu.main_utility.demand_d: mudpy.menu.main_utility_demand_d(user)
 menu.main_utility.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. You can also leave or permanently delete your account.