Relocate delete_account menu function

[mudpy.git] / share / menu.yaml

diff --git a/share/menu.yaml b/share/menu.yaml
index e2f75e1..b66074e 100644 (file)
--- a/share/menu.yaml
+++ b/share/menu.yaml
@@ -1,5 +1,5 @@
 ---
-_copy: Copyright (c) 2004-2018 mudpy authors. Permission to use, copy,
+_copy: Copyright (c) 2004-2019 mudpy authors. Permission to use, copy,
     modify, and distribute this software is granted under terms
     provided in the LICENSE file distributed with this software.
 
@@ -7,21 +7,22 @@ _desc: This is the standard library of menu definitions.
 
 _lock: true
 
-menu.activate_avatar.action: user.activate_avatar_by_index(int(choice)-1)
-menu.activate_avatar.action_a: pass
+menu.activate_avatar.action: mudpy.menu.activate_avatar_action(user)
+menu.activate_avatar.action_a: mudpy.menu.activate_avatar_action_a(user)
 menu.activate_avatar.branch_a: main_utility
 menu.activate_avatar.choice_a: abort selection
-menu.activate_avatar.create: dict([(str(x+1),y) for x,y in
-    enumerate(user.list_avatar_names())])
+menu.activate_avatar.create: mudpy.menu.activate_avatar_create(user)
 menu.activate_avatar.default: "1"
 menu.activate_avatar.description: This is the list of avatars available for you
-  to awaken.
+    to awaken.
 menu.activate_avatar.prompt: Whom would you like to awaken?
 
 menu.active.prompt: ">"
 
-menu.checking_new_account_name.action_d: user.account.destroy()
-menu.checking_new_account_name.action_g: user.account.destroy()
+menu.checking_new_account_name.action_d:
+    mudpy.menu.checking_new_account_name_action_d(user)
+menu.checking_new_account_name.action_g:
+    mudpy.menu.checking_new_account_name_action_g(user)
 menu.checking_new_account_name.branch_d: disconnecting
 menu.checking_new_account_name.branch_g: entering_account_name
 menu.checking_new_account_name.branch_n: entering_new_password
@@ -39,7 +40,7 @@ menu.checking_password.echo: false
 menu.checking_password.error_incorrect: Incorrect password, please try again...
 menu.checking_password.prompt: "Password:"
 
-menu.choose_gender.action: user.avatar.set("gender", user.menu_choices[choice])
+menu.choose_gender.action: mudpy.menu.choose_gender_action(user)
 menu.choose_gender.branch: choose_name
 menu.choose_gender.choice_f: female
 menu.choose_gender.choice_m: male
@@ -47,17 +48,17 @@ menu.choose_gender.description: First, your new avatar needs a birth gender.
     Avatars are one of male or female at birth.
 menu.choose_gender.prompt: "Pick a birth gender for your new avatar:"
 
-menu.choose_name.action: user.avatar.set("name", user.menu_choices[choice])
+menu.choose_name.action: mudpy.menu.choose_name_action(user)
 menu.choose_name.branch: main_utility
 menu.choose_name.branch_g: choose_name
 menu.choose_name.choice_g: generate more names
-menu.choose_name.create_1: random_name()
-menu.choose_name.create_2: random_name()
-menu.choose_name.create_3: random_name()
-menu.choose_name.create_4: random_name()
-menu.choose_name.create_5: random_name()
-menu.choose_name.create_6: random_name()
-menu.choose_name.create_7: random_name()
+menu.choose_name.create_1: mudpy.menu.choose_name_create_1(user)
+menu.choose_name.create_2: mudpy.menu.choose_name_create_2(user)
+menu.choose_name.create_3: mudpy.menu.choose_name_create_3(user)
+menu.choose_name.create_4: mudpy.menu.choose_name_create_4(user)
+menu.choose_name.create_5: mudpy.menu.choose_name_create_5(user)
+menu.choose_name.create_6: mudpy.menu.choose_name_create_6(user)
+menu.choose_name.create_7: mudpy.menu.choose_name_create_7(user)
 menu.choose_name.default: g
 menu.choose_name.description: Your new avatar needs a name. This will be the
     name with which $(tpsp) grew up, and will initially be the name by which
@@ -66,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,7 +79,7 @@ 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(choice)-1])
+    user.account.get("avatars")[int(user.choice)-1])
 menu.delete_avatar.action_a: pass
 menu.delete_avatar.branch: main_utility
 menu.delete_avatar.branch_a: main_utility