Merge branch 'development' into MUSHclient

fiendish · Apr 19, 2018 · 3166ec2 · 3166ec2
2 parents bb6ce64 + 35eb628
commit 3166ec2
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/MUSHclient/AardwolfPackageChanges.txt b/MUSHclient/AardwolfPackageChanges.txt
@@ -1,5 +1,8 @@
 Aardwolf Client Package Major Changes List
 
+r1992 snapshot
+- misc change: Using 'resetaard' will now tell the user about 'aard layout help'.
+
 r1991 snapshot
 - bug fix: Ignore sleeping status telopt during login. It arrives at the wrong time.
 

diff --git a/MUSHclient/worlds/plugins/aard_GMCP_mapper.xml b/MUSHclient/worlds/plugins/aard_GMCP_mapper.xml
@@ -819,7 +819,10 @@ directions = {}
 function reset_aard()
    mapper.reset_pos()
    SaveState()
+   prev_quiet_backups = quiet_backups
+   quiet_backups = true
    OnPluginInstall()
+   quiet_backups = prev_quiet_backups
 end
 
 convert_direction = {

diff --git a/MUSHclient/worlds/plugins/aard_layout.xml b/MUSHclient/worlds/plugins/aard_layout.xml
@@ -24,22 +24,23 @@
 
 <alias
    script="LayoutCommand"
-   match="^aard layout( lock| unlock| save| forget| restore| list| help)?( .*)?"
+   match="^aard layout( lock| unlock| save| forget| restore| list| help| reset)?( .*)?"
    regexp="y"
    enabled="y"
    sequence="100"
    ignore_case="y"
 ></alias>
 
 <alias
-   script="reset_aard"
+   script="reset_main"
    match="resetmain"
    enabled="y"
    sequence="100"
    ignore_case="y"
 ></alias>
 
 <alias
+   name="resetaard"
    script="reset_aard"
    match="resetaard"
    enabled="y"
@@ -75,6 +76,7 @@ MIN_SIZE         = 50
 require "serialize"
 
 function LayoutHelp()
+   print("")
    print("Aardwolf MUSHclient Layout Command Help")
    print("--------------------------------------------------------------------------------")
    print("aard layout lock               :  prevent dragging miniwindows")
@@ -84,6 +86,7 @@ function LayoutHelp()
    print("aard layout forget <keyword>   :  forget the layout for the given keyword")
    print("aard layout list               :  list all stored layout keywords")
    print("aard layout help               :  show this command help")
+   print("aard layout reset              :  like resetaard, but better")
    print("")
    LockStatus()
    print("")
@@ -123,6 +126,11 @@ function LayoutCommand(name, line, wildcards)
       else
          LayoutHelp()
       end
+   elseif wildcards[1] == " reset" then
+      reset_main()
+      EnableAlias("resetaard", false)
+      Execute("resetaard")
+      EnableAlias("resetaard", true)
    elseif wildcards[1] == "" or wildcards[1] == " help" then
       LayoutHelp()
    end
@@ -345,6 +353,11 @@ function SaveEnabled()
 end
 
 function reset_aard()
+   reset_main()
+   LayoutHelp()
+end
+
+function reset_main()
    textrect_left = default_left
    textrect_right = default_right
    textrect_top = default_top