Update the DEPRECATED macro and [deprecated_message] ActionWML to und…

…erstand deprecation levels

data/core/macros/deprecated-utils.cfg

@@ -5,11 +5,23 @@
 
 #wmllint: markcheck off
 #define DEPRECATE MACRO_NAME VERSION_NAME
-    # Tag macros for removal, where VERSION_NAME is the the next development series from the date of deprecation.
+    # Tag ActionWML macros for removal, where VERSION_NAME is the the next development series from the date of deprecation.
     [deprecated_message]
-        message="Macro '" + {MACRO_NAME} + "' is scheduled for removal in Wesnoth " + {VERSION_NAME} + "."
+		what={MACRO_NAME}
+		level=2
+		version={VERSION_NAME}
     [/deprecated_message]
 #enddef
+
+#define DEPRECATE_ACTION_MACRO MACRO_NAME LEVEL VERSION MESSAGE
+    # Tag ActionWML macros for removal, where VERSION is the the next development series from the date of deprecation.
+	[deprecated_message]
+		what={MACRO_NAME}
+		level={LEVEL}
+		version={VERSION_NAME}
+		message={MESSAGE}
+	[/deprecated_message]
+#enddef
 #wmllint: markcheck on
 
 #define MAGENTA_IS_THE_TEAM_COLOR
@@ -382,6 +394,6 @@ _"No gold carried over to the next scenario."#enddef
 #define NO_INTERRUPT_NO_UNDO
     # This can be used in mid-movement events (enter_hex and exit_hex) to cause
     # no interruption of movement, yet prevent the move from being undone.
-	{DEPRECATE "NO_INTERRUPT_NO_UNDO" "1.16"}
+	{DEPRECATE_ACTION_MACRO "NO_INTERRUPT_NO_UNDO" 3 "1.16" ""}
 #enddef
 

data/lua/wml-tags.lua

@@ -888,8 +888,15 @@ function wml_actions.sound_source(cfg)
 end
 
 function wml_actions.deprecated_message(cfg)
+	if type(cfg.level) ~= "number" or cfg.level < 1 or cfg.level > 4 then
+		local _ = wesnoth.textdomain "wesnoth"
+		helper.wml_error(_"Invalid deprecation level (should be 1-4)")
+	end
+	wesnoth.deprecation_message(cfg.what, cfg.level, cfg.version, cfg.message or '')
 	if not wesnoth.game_config.debug then return end
-	wesnoth.log('wml', cfg.message)
+	if cfg.level > 1 then
+		wesnoth.log('wml', cfg.message)
+	end
 end
 
 function wml_actions.wml_message(cfg)

data/scenario-test.cfg

@@ -3351,7 +3351,10 @@ Result:
             x,y=10, 10
         [/filter]
         [deprecated_message]
+            what="Deprecation Test"
             message="Moving to this location is no longer supported... bye bye"
+            level=3
+            version=1.0
         [/deprecated_message]
         [kill]
             x,y=10,10