Merge branch 'development'

Conflicts:
	MUSHclient/AardwolfPackageChanges.txt

MUSHclient/AardwolfPackageChanges.txt

@@ -1,5 +1,9 @@
 Aardwolf Client Package Major Changes List
 
+r1946 snapshot
+- bug fix: Channel transitions and hidden map requests were causing extra blank lines to appear sometimes. Those should be gone now.
+- misc change: The color of the border ring around the dot in the alignment indicator in the health bars plugin sometimes didn't coordinate with the chosen alignment color. It is calculated differently now and should match more reliably.
+
 r1944 snapshot
 - misc change: Display an indicator of having the non-visual version in 'checkversion' output.
 

MUSHclient/worlds/plugins/aard_ASCII_map.xml

@@ -79,7 +79,7 @@ and made more awesomer.
    name="map_start"
    sequence="100"
    send_to="12"
-><send>StopEvaluatingTriggers(true)</send>
+><send>StopEvaluatingTriggers()</send>
 </trigger>
 
 <trigger
@@ -90,7 +90,7 @@ and made more awesomer.
    omit_from_output="y"
    sequence="10"
    send_to="12"
-><send>StopEvaluatingTriggers(true)</send>
+><send>StopEvaluatingTriggers()</send>
 </trigger>
 
 <trigger
@@ -101,8 +101,11 @@ and made more awesomer.
    name="map_end"
    sequence="5"
    send_to="12"
-><send>StopEvaluatingTriggers(true)</send></trigger>
-
+><send>
+StopEvaluatingTriggers()
+EnableTriggerGroup("end_gag", true)
+</send>
+</trigger>
 <trigger
    enabled="y"
    match="You open *."
@@ -161,6 +164,37 @@ and made more awesomer.
 ><send>EnableTriggerGroup("room_change", true)</send>
 </trigger>
 
+<trigger
+enabled="n"
+match="^$"
+regexp="y"
+name="end_gag_omit"
+group="end_gag"
+omit_from_output="y"
+sequence="100"
+send_to="12"
+>
+<send>
+EnableTriggerGroup("end_gag", false)
+</send>
+</trigger>
+
+<trigger
+enabled="n"
+match=".+"
+regexp="y"
+name="end_gag_keep"
+group="end_gag"
+omit_from_output="n"
+sequence="101"
+send_to="12"
+>
+<send>
+EnableTriggerGroup("end_gag", false)
+</send>
+</trigger>
+
+
 </triggers>
 
 <script>
@@ -223,7 +257,8 @@ requesting = false
 function request_new_map()
    if GetTimerOption("activity_timer", "enabled") == 1 and can_request_map and not requesting and kinda_busy == 0 then
       requesting = true
-      SendNoEcho ("map")
+      SendNoEcho("map")
+      EnableTriggerGroup("end_gag", true)
    end
 end
 
@@ -913,7 +948,7 @@ function OnPluginInstall(skip_requests)
       return
    end -- they didn't enable us last time
 
-   SetOption("utf_8", 1)
+   SetOption("utf_8", 1)  -- needed for alternate maptypes in output
 
    -- update on reload
    if IsConnected() and not skip_requests then

MUSHclient/worlds/plugins/aard_chat_echo.xml

@@ -270,6 +270,7 @@ function echo_msg(msg)
    if compact_mode ~= "set" then
       Simulate("\r\n")
    end
+   EnableTriggerGroup("end_gag", true) -- gags trailing blank line
 end
 
 function OnPluginListChanged ()
@@ -328,7 +329,7 @@ function OnPluginBroadcast (msg, id, name, text)
 end
 
 function untagged_info (name, line, wildcards, styles)
-   EnableTriggerGroup("end_gag", true) -- gags the trailing blank line if compact is off
+   EnableTriggerGroup("end_gag", true) -- gags trailing blank line
 end
 
 function chat_echo (toggle)

MUSHclient/worlds/plugins/aard_health_bars_gmcp.xml

@@ -43,6 +43,7 @@ require "movewindow"
 require "gauge"
 require "gmcphelper"
 require "serialize"
+require "colors"
 
 background_colour     = 0x000000
 border_color          = 0xcccccc
@@ -288,6 +289,13 @@ function DisplayStatsPage()
          if alignment ~= nil then
             zeroed_alignment = alignment+2500
             bar_colour = ((zeroed_alignment<=1625 and showBar[bar][4]) or ((zeroed_alignment>=3375 and showBar[bar][5]) or 0xcccccc))
+            if bar_colour ~= prev_bar_colour then
+               local bch = string.format("%06X", bar_colour)
+               local reverse = "#"..bch:sub(5,6)..bch:sub(3,4)..bch:sub(1,2)
+               local c = colors.new(reverse):hue_offset(-15):lighten_by(0.60):to_rgb()
+               dark_bar_colour = ColourNameToRGB(c)
+            end
+            prev_bar_colour = bar_colour
             if showLabels == 1 then
                if stacked == 1 then
                   WindowText(win, font_id, showBar[bar][1], xpos,  ypos, 0, 0, bar_colour, false)
@@ -297,7 +305,7 @@ function DisplayStatsPage()
             end
             if graphicalMode == 1 then
                WindowLine (win, xpos+label_width+math.max(0,line_height/2), math.ceil(ypos+line_height/2), xpos+label_width+math.max(0,bar_width-line_height/2), math.ceil(ypos+line_height/2), bar_colour, 0+0x0200, 2)
-               WindowCircleOp (win, 1, xpos+label_width+(zeroed_alignment/5000)*(bar_width-line_height), ypos, xpos+label_width+(zeroed_alignment/5000)*(bar_width-line_height)+line_height, ypos+line_height, bar_colour/2, 0, 2, bar_colour, 0)
+               WindowCircleOp (win, 1, xpos+label_width+(zeroed_alignment/5000)*(bar_width-line_height), ypos, xpos+label_width+(zeroed_alignment/5000)*(bar_width-line_height)+line_height, ypos+line_height, dark_bar_colour, 0, 2, bar_colour, 0)
 
                -- add ticks at alignment change boundaries
                local tick_1 = xpos + label_width + (-874 + 2500) / 5000 * (bar_width);

MUSHclient/worlds/plugins/aard_package_update_checker.xml

@@ -58,7 +58,6 @@ You can also run a manual check by typing:    package update check
 <![CDATA[
 
 aard_extras = require "aard_lua_extras"
-require "aard_lua_ffi"
 async = require "async"
 require "json"
 require "wait"
@@ -69,7 +68,7 @@ window_title = "Aardwolf MUSHclient Package Update Checker"
 ErrorMessage = ""
 
 function remember()
-   ColourTell("yellow", "", "Remember, the latest development release is always available at: ")
+   ColourTell("yellow", "", "Remember, the latest development snapshot is always available at: ")
    Hyperlink(download_url, download_url, "Installer Download Page", "yellow", "", true)
    Note("")
    Note("")
@@ -117,16 +116,18 @@ function updateDialog(message,list)
       ColourNote("cyan", "", "  |               Aardwolf MUSHclient Package Update Checker                 |")
       ColourNote("cyan", "", "  +--------------------------------------------------------------------------+")
       ColourNote("cyan", "", "  |                                                                          |")
-      ColourNote("cyan", "", "  |  You have chosen to ignore version r"..latest_version.."."..string.rep(" ",74-string.len("| You have chosen to ignore version r"..latest_version..".")).."|")
-      ColourNote("cyan", "", "  |  You will be alerted again when another snapshot is released.            |")
+      local ignoreline = "  |  You have chosen to ignore the r"..latest_version.." snapshot."
+      ColourNote("cyan", "", ignoreline..string.rep(" ",77-string.len(ignoreline)).."|")
+      ColourNote("cyan", "", "  |  You will not be alerted again for this version.                         |")
       ColourNote("cyan", "", "  |                                                                          |")
-      ColourNote("cyan", "", "  |  Remember, you can always get the latest development release at:         |")
+      ColourNote("cyan", "", "  |  Remember, you can always get the latest development snapshot at:        |")
       ColourTell("cyan", "", "  |  ")
       Hyperlink(download_url, download_url, "Installer Download Page", "cyan", "", true)
       ColourNote("cyan", "", string.rep(" ", 71-string.len(download_url)).." |")
       ColourNote("cyan", "", "  |                                                                          |")
       ColourNote("cyan", "", "  +--------------------------------------------------------------------------+")
       Note("")
+      SetVariable("last_cancel", os.time())
       SetVariable("ignore_before_version", latest_version)
    end
 end
@@ -139,7 +140,7 @@ function errorMessage(msg)
    if msg:find("plugin network") then
       Execute("checkversion")
    end
-   ColourNote("white","red", "\nThe latest development release is always available at:")
+   ColourNote("white","red", "\nThe latest development snapshot is always available at:")
    Hyperlink(download_url, download_url, "Installer Download Page", "white", "red", true)
    Note("")
    Note("")
@@ -156,12 +157,17 @@ function OnPluginListChanged()
 end
 
 function manualCheck()
+   SetVariable("last_cancel", 0)
    SetVariable("ignore_before_version", 0)
    DeleteTemporaryTimers()
    async.doAsyncRemoteRequest(version_url, main, "HTTPS", 120)
 end
 
 function main(retval, page, status, headers, full_status, request_url)
+   last_cancel = tonumber(GetVariable("last_cancel")) or os.time()
+   if (os.time() - last_cancel) < (60*60*24*7) then -- wait at least a week between update prompts
+      return
+   end
    ignore_before_version = tonumber(GetVariable("ignore_before_version")) or 0
    SetStatus("Checking online for Aardwolf MUSHclient Package updates")
    ErrorMessage = ""
@@ -211,7 +217,7 @@ function showUpdate()
       if local_version < latest_version then
          final_update_list = (string.match(update_list,"(.*)r"..local_version.." snapshot") or "<ERROR! Please don't modify your "..aard_extras.version_file.." file>\r\n")
          final_update_list = "( Get it from: "..download_url.." )\r\n\r\n"..convertHTMLcodesToStandardText(final_update_list)
-         message = "There is a new Aardwolf MUSHclient Package version available. You currently have version r"..local_version.." and the newest version is r"..latest_version..".\n\nThe major differences between your version and the latest version are:"
+         message = "There is a new Aardwolf MUSHclient Package snapshot available. You currently have version r"..local_version.." and the newest version is r"..latest_version..".\n\nThe major differences between your version and the latest version are:"
          updateDialog(message,final_update_list)
       elseif local_version > latest_version then
          ErrorMessage = "The Aardwolf MUSHclient Package update checker has detected that you have a version NEWER than what is available online! Contact Fiendish about this message, because clearly this situation is impossible. :/"