X-Git-Url: https://mudpy.org/gitweb?p=mudpy.git;a=blobdiff_plain;f=share%2Fmenu.yaml;h=3350e8f048694c640faf82cbc9bbc92a6403e29c;hp=2f756b03c90aadf992e1cc1df6a49abceb6c0650;hb=13138cabcedc52b00eb49b1a6b4e0818469bee74;hpb=1e9fd62ecb7c3f1563d674cb6417272524a516be

diff --git a/share/menu.yaml b/share/menu.yaml
index 2f756b0..3350e8f 100644
--- a/share/menu.yaml
+++ b/share/menu.yaml
@@ -1,13 +1,13 @@
 ---
-_copy: Copyright (c) 2004-2017 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.
+_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.
 
 _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: user.activate_avatar_by_index(int(user.choice)-1)
 menu.activate_avatar.action_a: pass
 menu.activate_avatar.branch_a: main_utility
 menu.activate_avatar.choice_a: abort selection
@@ -15,10 +15,10 @@ menu.activate_avatar.create: dict([(str(x+1),y) for x,y in
     enumerate(user.list_avatar_names())])
 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.active.prompt: ">"
 
 menu.checking_new_account_name.action_d: user.account.destroy()
 menu.checking_new_account_name.action_g: user.account.destroy()
@@ -39,7 +39,8 @@ 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: user.avatar.set("gender",
+    user.menu_choices[user.choice])
 menu.choose_gender.branch: choose_name
 menu.choose_gender.choice_f: female
 menu.choose_gender.choice_m: male
@@ -47,7 +48,8 @@ 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: user.avatar.set("name",
+    user.menu_choices[user.choice])
 menu.choose_name.branch: main_utility
 menu.choose_name.branch_g: choose_name
 menu.choose_name.choice_g: generate more names
@@ -78,7 +80,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
@@ -108,7 +110,7 @@ menu.entering_new_password.prompt: 'Enter a new password for "$(account)":'
 menu.entering_new_password.error_differs: The two passwords did not match. Try
     again...
 
-menu.active.initial:
+menu.telopt_negotiation.prompt:
 
 menu.main_utility.action_c: user.new_avatar()
 menu.main_utility.branch_a: activate_avatar