Wire in events for new core abilities

data/core/_main.cfg

@@ -7,6 +7,7 @@
     code=<<
 wesnoth.dofile 'lua/wml-tags.lua'
 wesnoth.dofile 'lua/feeding.lua'
+wesnoth.dofile 'lua/stun.lua'
 wesnoth.dofile 'lua/backwards-compatibility.lua'
 >>
 [/lua]

data/core/macros/abilities.cfg

@@ -273,6 +273,9 @@ Enemy units cannot see this unit while it is in deep water, except if they have
         female_name= _ "female^formation"
         description= _ "This unit gains a +10% bonus to defense when another unit with the same ability is adjacent to it. However, this cannot raise the unit’s defense above 70%."
     [/dummy]
+[/abilities]
+{ABILITY_FORMATION_EVENTS}
+[+abilities]
 #enddef
 
 #define ABILITY_DISENGAGE
@@ -284,6 +287,9 @@ Enemy units cannot see this unit while it is in deep water, except if they have
         female_name= _ "female^disengage"
         description= _ "If this unit doesn’t move before attacking, it will retain its movement points after the attack."
     [/dummy]
+[/abilities]
+{ABILITY_DISENGAGE_EVENTS}
+[+abilities]
 #enddef
 
 #weapons specials
@@ -462,6 +468,11 @@ Enemy units cannot see this unit while it is in deep water, except if they have
         name= _ "daze"
         description= _ "When hit with this attack, an enemy suffers a 10% penalty both to their defense and chance to hit for one turn, except for magical attacks."
     [/dummy]
+[/specials]
+[/attack]
+{WEAPON_SPECIAL_DAZE_EVENTS}
+[+attack]
+[+specials]
 #enddef
 
 #define WEAPON_SPECIAL_STUN
@@ -471,11 +482,17 @@ Enemy units cannot see this unit while it is in deep water, except if they have
         description= _ "This attack hits so hard that the opponent is dazed and can no longer enforce a zone of control. The effect wears off on the opponent’s next turn."
         multiply=1
     [/damage]
+[/specials]
+[/attack]
+{WEAPON_SPECIAL_STUN_EVENTS}
+[+attack]
+[+specials]
 #enddef
 
 # TODO: Figure out where to put these
 #define ABILITY_DISENGAGE_EVENTS
     [event]
+        id=ability_disengage_event
         name=attack end
         first_time_only=no
 
@@ -983,6 +1000,7 @@ Enemy units cannot see this unit while it is in deep water, except if they have
 
 #define WEAPON_SPECIAL_STUN_EVENTS
     [event]
+        id=weapon_special_stun_event_1
         name=attacker_hits
         first_time_only=no
 
@@ -1030,6 +1048,7 @@ Enemy units cannot see this unit while it is in deep water, except if they have
     [/event]
 
     [event]
+        id=weapon_special_stun_event_2
         name=defender_hits
         first_time_only=no
 
@@ -1077,6 +1096,7 @@ Enemy units cannot see this unit while it is in deep water, except if they have
     [/event]
 
     [event]
+        id=weapon_special_stun_event_3
         name=side turn end
         first_time_only=no
 
@@ -1101,25 +1121,4 @@ Enemy units cannot see this unit while it is in deep water, except if they have
 
         {CLEAR_VARIABLE stunned}
     [/event]
-
-    [lua]
-        code=<<
-        local _ = wesnoth.textdomain "wesnoth-dw"
-        local old_unit_status = wesnoth.theme_items.unit_status
-
-        function wesnoth.theme_items.unit_status()
-            local u = wesnoth.get_displayed_unit()
-            if not u then return {} end
-            local s = old_unit_status()
-
-            if u.status.stunned then
-                table.insert(s, { "element",  { image = "misc/stunned-status-icon.png",
-                                                tooltip = _"stunned: This unit is stunned. It cannot enforce its Zone of Control."
-                } } )
-            end
-
-            return s
-        end
-        >>
-    [/lua]
 #enddef

data/lua/stun.lua

@@ -0,0 +1,16 @@
+local _ = wesnoth.textdomain "wesnoth"
+local old_unit_status = wesnoth.theme_items.unit_status
+
+function wesnoth.theme_items.unit_status()
+	local u = wesnoth.get_displayed_unit()
+	if not u then return {} end
+	local s = old_unit_status()
+
+	if u.status.stunned then
+		table.insert(s, { "element",  { image = "misc/stunned-status-icon.png",
+										tooltip = _"stunned: This unit is stunned. It cannot enforce its Zone of Control."
+		} } )
+	end
+
+	return s
+end