Merge remote-tracking branch 'aquileia/DM_fix'

data/campaigns/Delfadors_Memoirs/scenarios/21_Clash_at_the_Manor.cfg

@@ -58,6 +58,21 @@
     [event]
         name=prestart
         {ELVISH_NPCS_REAPPEAR}
+        [object]
+            silent=yes
+            duration=scenario
+            [filter]
+                id=Kalenz
+            [/filter]
+            [effect]
+                apply_to=attack
+                name=sword
+                #textdomain wesnoth-units
+                set_description=_"greatsword"
+                #textdomain wesnoth-dm
+                set_icon=attacks/greatsword-orcish.png
+            [/effect]
+        [/object]
     [/event]
     #### /Delfador's code ####
 
@@ -151,6 +166,37 @@
         {HIGHLIGHT_IMAGE 18 33 scenery/signpost.png ()}
     [/event]
 
+    [event]
+        name=recruit,recall
+        first_time_only=no
+        [filter]
+            race=elf
+            [not]
+                type=Elvish Shaman, Elvish Druid, Elvish Shyde, Elvish Sorceress, Elvish Enchantress, Elvish Sylph
+            [/not]
+        [/filter]
+        [object]
+            silent=yes
+            duration=scenario
+            [effect]
+                apply_to=attack
+                name=sword
+                set_icon=attacks/sword-orcish.png
+            [/effect]
+            [effect]
+                [filter]
+                    type=Elvish Hero, Elvish Champion, Elvish Marshal
+                [/filter]
+                apply_to=attack
+                name=sword
+                #textdomain wesnoth-units
+                set_description=_"greatsword"
+                #textdomain wesnoth-dm
+                set_icon=attacks/greatsword-orcish.png
+            [/effect]
+        [/object]
+    [/event]
+
     # next code lifted from Silent Siege in Unstoppable Legion (not
     # tested); the idea is to make the riders head for the signposts
     [event]