Merge branch 'development'

MUSHclient/AardwolfPackageChanges.txt

@@ -1,5 +1,8 @@
 Aardwolf Client Package Major Changes List
 
+r1914 snapshot:
+- bug fix: A few of the new client settings that are force-enabled will only be activated once instead of every launch, but for real this time.
+
 r1913 snapshot
 - new feature: The inventory serials plugin now does vault items too.
 

MUSHclient/lua/aard_requirements.lua

@@ -1,29 +1,16 @@
-require "gmcphelper"
+require "gmcphelper" -- https://github.com/fiendish/aardwolfclientpackage/wiki/Using-GMCP
 require "checkplugin"
 
+-- Guarantee various useful world file settings
+SetOption("omit_date_from_save_files", 1)  -- slightly less clutter in settings files
+SetOption("utf_8", 1)  -- needed for alternate maptypes in main output
+
 -- Load plugins which are either necessary for the package to function or unobjectionably utile.
-do_plugin_check_now("520bc4f29806f7af0017985f", "Hyperlink_URL2") -- make hyperlinks from urls
 do_plugin_check_now("162bba4a5ecef2bb32b5652f", "aard_package_update_checker") -- package update checker
 do_plugin_check_now("abc1a0944ae4af7586ce88dc", "aard_repaint_buffer") -- repaint buffer
 do_plugin_check_now("3e7dedbe37e44942dd46d264", "aard_GMCP_handler")    -- GMCP handler
 do_plugin_check_now("462b665ecb569efbf261422f", "aard_miniwindow_z_order_monitor") -- z order manager
 do_plugin_check_now("55616ea13339bc68e963e1f8", "aard_chat_echo") -- gmcp channels in main display
+do_plugin_check_now("520bc4f29806f7af0017985f", "Hyperlink_URL2") -- make hyperlinks from urls
 
--- Activate various useful world file settings
-
--- These get activated always
-SetOption("omit_date_from_save_files", 1)  -- slightly less clutter in settings files
-SetOption("utf_8", 1)  -- needed for alternate maptypes in main output
-
--- These get activated at least once, but not after that
-aardclient_settings_to_activate_at_least_once = {
-   "show_underline",  -- needed for hyperlink underlining
-   "underline_hyperlinks"  -- oddly enough also needed for hyperlink underlining
-}
 
-for i,v in ipairs(aardclient_settings_to_activate_at_least_once) do
-   if GetVariable("aardclient_activated_"..v) ~= "done" then
-      SetOption (v, 1)
-      SetVariable("aardclient_activated_"..v, "done")
-   end
-end

MUSHclient/worlds/plugins/Hyperlink_URL2.xml

@@ -12,7 +12,8 @@
   date_written="2006-04-01" 
   date_modified="2010-12-22"
   requires="4.42"
-  version="3.1">
+  save_state="y"
+  version="3.2">
 
 <description trim="y">
 <![CDATA[
@@ -83,6 +84,22 @@ You now have a line with detected URLs changed into hyperlinks, and the original
 
 -- CODE SECTION --
 
+function OnPluginInstall()
+   -- These get activated at least once, but not after that
+   client_settings_to_activate_at_least_once = {
+      "show_underline",  -- needed for showing underlines
+      "underline_hyperlinks"  -- used to modulate the 7th flag to hyperlink calls
+   }
+
+   for i,v in ipairs(client_settings_to_activate_at_least_once) do
+      if GetVariable("client_activated_"..v) ~= "done" then
+         SetOption(v, 1)
+         SetVariable("client_activated_"..v, "done")
+      end
+   end
+   DoAfterSpecial(1, 'Save("")', sendto.script)
+end
+
 -- Returns an array {start, end, text}
 function findURLs(text)
 	local URLs = {}
@@ -206,6 +223,7 @@ function onURL (name, line, wildcards, styles)
 				,RGBColourToName(v.textcolour) -- Foreground color
 				,RGBColourToName(v.backcolour) -- Background color
 				,1 -- Boolean: Open as a URL?
+				,GetOption("underline_hyperlinks") == 0 and true or false
 			)
 		else
 			ColourTell(

MUSHclient/worlds/plugins/aard_package_update_checker.xml

@@ -45,6 +45,7 @@ You can also run a manual check by typing:    package update check
    local succ, version, msg = aard_extras.PackageVersionExtended()
    if succ then
       ColourNote("white", "blue", msg)
+      remember()
    else
       ColourNote("white","red", msg)
    end
@@ -67,6 +68,13 @@ download_url = "https://fiendish.github.io/aardwolfclientpackage/"
 window_title = "Aardwolf MUSHclient Package Update Checker"
 ErrorMessage = ""
 
+function remember()
+   ColourTell("yellow", "", "Remember, the latest development release is always available at: ")
+   Hyperlink(download_url, download_url, "Installer Download Page", "yellow", "", true)
+   Note("")
+   Note("")
+end
+
 -- converts special character codes in html source to their ascii
 -- equivalents for display. Also specially escapes things that need to be.
 function convertHTMLcodesToStandardText(str)
@@ -210,6 +218,7 @@ function showUpdate()
          return false
       else
          ColourNote("yellow", "", "Your package version r"..local_version.." appears to be up-to-date.")
+         remember()
       end
    else
       ErrorMessage = "Impossible Error"