Merge pull request #218 from fiendish/development

r1820

MUSHclient/AardwolfPackageChanges.txt

@@ -1,5 +1,14 @@
 Aardwolf Client Package Major Changes List
 
+r1820 snapshot:
+- new feature: You can now command 'mapper cexits thisroom' to see cexits in the current room.
+- bug fix: ASCII map plugin will no longer request a map update automatically if the player is in note mode or sleeping.
+- misc change: map DB should be slightly smaller
+- new feature: rooms in the GMCP mapper can now be flagged to ignore when your stored exits don't match those sent by the MUD so your changed exits don't get forcibly overriden.
+- bug fix: the mapper database corruption alert message points to the new wiki location for information.
+- misc change: some GMCP mapper right-click options now use submenus to directly access options instead of a popup dialog.
+- misc change: updated to MUSHclient 4.98 ( see release notes http://www.mushclient.com/scripts/showrelnote.php )
+
 r1816 snapshot:
 - bug fix: #alias and #trigger world aliases were broken. Apparently world aliases and triggers can't be made with equal signs in the name. Sigh. Oops. Nobody reported this? Maybe nobody uses them.
 

MUSHclient/locale/Localize_template.lua

@@ -1,6 +1,6 @@
 -- MUSHclient localization file
 
--- Written: Tuesday, 07 April 2015 at 10:45:55
+-- Written: Sunday, 10 May 2015 at 09:46:04
 
 -- Static messages
 
@@ -598,9 +598,9 @@ messages = {
 
 -- /cygdrive/c/source/mushclient/dialogs/world_prefs/prefspropertypages.cpp:5250
 
--- /cygdrive/c/source/mushclient/evaluate.cpp:690
+-- /cygdrive/c/source/mushclient/evaluate.cpp:692
 
--- /cygdrive/c/source/mushclient/evaluate.cpp:791
+-- /cygdrive/c/source/mushclient/evaluate.cpp:793
   ["Insufficient memory to do this operation"] =
     "",
 
@@ -1048,29 +1048,29 @@ messages = {
   ["The world TCP/IP address cannot be blank."] =
     "",
 
--- /cygdrive/c/source/mushclient/evaluate.cpp:598
+-- /cygdrive/c/source/mushclient/evaluate.cpp:600
   ["Replace existing triggers?\nIf you reply \"No\", then triggers from the file will be added to existing triggers"] =
     "",
 
--- /cygdrive/c/source/mushclient/evaluate.cpp:607
+-- /cygdrive/c/source/mushclient/evaluate.cpp:609
   ["Replace existing aliases?\nIf you reply \"No\", then aliases from the file will be added to existing aliases"] =
     "",
 
--- /cygdrive/c/source/mushclient/evaluate.cpp:616
+-- /cygdrive/c/source/mushclient/evaluate.cpp:618
   ["Replace existing timers?\nIf you reply \"No\", then timers from the file will be added to existing timers"] =
     "",
 
--- /cygdrive/c/source/mushclient/evaluate.cpp:671
+-- /cygdrive/c/source/mushclient/evaluate.cpp:673
 
 -- /cygdrive/c/source/mushclient/serialize.cpp:58
   ["File does not have a valid MUSHclient XML signature."] =
     "",
 
--- /cygdrive/c/source/mushclient/evaluate.cpp:785
+-- /cygdrive/c/source/mushclient/evaluate.cpp:787
   ["Unable to create the requested file"] =
     "",
 
--- /cygdrive/c/source/mushclient/evaluate.cpp:797
+-- /cygdrive/c/source/mushclient/evaluate.cpp:799
   ["There was a problem in the data format"] =
     "",
 
@@ -1830,7 +1830,7 @@ formatted = {
       return ""
     end,  -- function
 
--- /cygdrive/c/source/mushclient/ProcessPreviousLine.cpp:1144
+-- /cygdrive/c/source/mushclient/ProcessPreviousLine.cpp:1146
   ["Trigger: %s"] =
     function (a)
 
@@ -2361,7 +2361,7 @@ formatted = {
 
 -- /cygdrive/c/source/mushclient/doc.cpp:881
 
--- /cygdrive/c/source/mushclient/evaluate.cpp:683
+-- /cygdrive/c/source/mushclient/evaluate.cpp:685
   ["Unable to open or read %s"] =
     function (a)
 
@@ -3202,14 +3202,14 @@ formatted = {
       return ""
     end,  -- function
 
--- /cygdrive/c/source/mushclient/evaluate.cpp:696
+-- /cygdrive/c/source/mushclient/evaluate.cpp:698
   ["The file %s is not in the correct format"] =
     function (a)
 
       return ""
     end,  -- function
 
--- /cygdrive/c/source/mushclient/evaluate.cpp:960
+-- /cygdrive/c/source/mushclient/evaluate.cpp:962
 
 -- /cygdrive/c/source/mushclient/mushview.cpp:5863
   ["Alias: %s"] =
@@ -3218,7 +3218,7 @@ formatted = {
       return ""
     end,  -- function
 
--- /cygdrive/c/source/mushclient/evaluate.cpp:991
+-- /cygdrive/c/source/mushclient/evaluate.cpp:993
 
 -- /cygdrive/c/source/mushclient/mushview.cpp:5793
   ["processing alias \"%s\""] =

MUSHclient/mushclient_readme.txt

@@ -1,7 +1,7 @@
-MUSHclient version 4.96
+MUSHclient version 4.98
 =======================
 
-Tuesday, 2nd December 2014
+Sunday, 10th May 2015
 
 
 Author: Nick Gammon

MUSHclient/worlds/plugins/aard_ASCII_map.xml

@@ -179,8 +179,13 @@ function reset_aard()
    OnPluginInstall()
 end
 
-function request_new_map()
-   SendNoEcho ("map")
+function request_new_map(notice)
+   if can_request_map then
+      if notice then
+         Note("Requesting Map Update")
+      end
+      SendNoEcho ("map")
+   end
 end
 
 roomnum = ""
@@ -473,6 +478,7 @@ end -- right_click_menu
 -- Called when plugin receives telnet data - main entry point for actually running
 -- the plugin.
 --=================================================================================
+can_request_map = false
 function OnPluginBroadcast (msg, id, name, text)
    -- Look for GMCP handler.
    if (id == '3e7dedbe37e44942dd46d264') then
@@ -492,12 +498,16 @@ function OnPluginBroadcast (msg, id, name, text)
             process_coords()
          end
          if page_built == false and (GetOption("enable_triggers") == 1) then
-            Note("Requesting Map Update")
-            SendNoEcho("map")
+            request_new_map(true)
          end
       elseif (text == "comm.repop") then
-         Note("Requesting Map Update")
-         SendNoEcho("map")
+         request_new_map(true)
+      elseif (text == "char.status") then
+         local char_state = gmcp("char.status.state")
+         can_request_map = (char_state == 3 or char_state == 11)
+         if can_request_map and not page_built then
+            request_new_map()
+         end
       end
    elseif (id == "462b665ecb569efbf261422f" and msg==996 and text == "re-register z") then
       CallPlugin("462b665ecb569efbf261422f", "registerMiniwindow", win)
@@ -660,7 +670,7 @@ function OnPluginConnect()
    TelnetOptionOff(TELOPT_QUIET)
    TelnetOptionOn(TELOPT_AUTOMAP) -- does this do anything?
    Send_GMCP_Packet("maptype "..maptype)
-   Send_GMCP_Packet("request room")
+   Send_GMCP_Packet("request char")
 end
 
 ---------------------------------------------------------------------------------