critical fixes, and new EE Drakes

data/ELE_data/abilities/shadow_walk.cfg

@@ -5,9 +5,7 @@
         value={VALUE}
         id=AE_ele_shadow_walk
         name= _ "shadow-walk"
-        description= _ "This unit regenerates {VALUE}hp and damages surrounding enemy units by {POWER}hp while its its night."
-        name_inactive= _ "shadow-walk"
-        description_inactive= _ "This unit regenerates {VALUE}hp while its its night."
+        description= _ "This unit regenerates {VALUE}hp and damages surrounding enemy units by {POWER}hp while its night."
         [filter]
             [filter_location]
                 time_of_day=chaotic

data/ME_data/weapon_specials/grouping.cfg

@@ -18,7 +18,7 @@
 #enddef
 
 #define AE_MRC_WEAPON_SPECIAL_GROUPING_1
-    [damage]
+    [dummy]
         name= _ "grouping +1"
         special_note={SPECIAL_NOTES_GROUPING}
         description=_"When this unit is adjacent to another unit with grouping, it increases its damage by one, for every other unit next to it with grouping."
@@ -30,7 +30,7 @@
                 [/has_attack]
             [/filter_adjacent]
         [/filter_self]
-    [/damage]
+    [/dummy]
     {AE_MRC_DAMAGE_GROUPING 1 1}
     {AE_MRC_DAMAGE_GROUPING 2 2}
     {AE_MRC_DAMAGE_GROUPING 3 3}
@@ -40,11 +40,19 @@
 #enddef
 
 #define AE_MRC_WEAPON_SPECIAL_GROUPING_2
-    [damage]
+    [dummy]
         name= _ "grouping +2"
         special_note={SPECIAL_NOTES_GROUPING}
         description=_"When this unit is adjacent to another unit with grouping, it increases its damage by two, for every other unit next to it with grouping."
-    [/damage]
+        [filter_self]
+            [filter_adjacent]
+                is_enemy=no
+                [has_attack]
+                    special_id=AE_mrc_grouping
+                [/has_attack]
+            [/filter_adjacent]
+        [/filter_self]
+    [/dummy]
     {AE_MRC_DAMAGE_GROUPING 1 2}
     {AE_MRC_DAMAGE_GROUPING 2 4}
     {AE_MRC_DAMAGE_GROUPING 3 6}

data/utils/faction_lists.cfg

@@ -3,7 +3,7 @@ AE_side_def_drakes,AE_side_def_dunefolk,AE_side_def_knalga,AE_side_def_loyalists
 #define BEEM_FACTIONS
 AE_side_bem_anakes,AE_side_bem_calydonians,AE_side_bem_woodwarriors #enddef
 #define EE_FACTIONS
-AE_side_ext_chaos,AE_side_ext_darkelves,AE_side_ext_dwarves,AE_side_ext_loyalist,AE_side_ext_monsters,AE_side_ext_northerns,AE_side_ext_outlaws,AE_side_ext_undead #enddef
+AE_side_ext_chaos,AE_side_ext_darkelves,AE_side_ext_drakes,AE_side_ext_dwarves,AE_side_ext_loyalist,AE_side_ext_monsters,AE_side_ext_northerns,AE_side_ext_outlaws,AE_side_ext_undead #enddef
 #define AE_FACTIONS
 AE_side_agl_darklegion,AE_side_agl_desertelves,AE_side_agl_frozen,AE_side_agl_steelhive,AE_side_agl_yokai,AE_side_agl_Deep_Elves #enddef
 #define ME_FACTIONS

eras/ageless_era.cfg

@@ -8,7 +8,7 @@
     {AE_LOAD_REQUIRED_EVENTS_RESOURCE}
     description=_ "The largest era ever made featuring Default Era with the Dunefolk faction, Extended Era, Archaic Era, the Era of the Future, Eternal Era, BEEM, the Era of Four Moons, the Yokai faction, the Dark Legion, the Desert Elves, the Steelhive faction, Millennium Era, the Deep Elves, the Era of Myths, Feudal Era, Imperial Era, the Era of Strife, the Era of Magic, the Era of Chaos, Rashy Era, and Mercenaries Era."
     {~add-ons/Ageless_Era/eras/era_events/_main.cfg}
-    {RANDOM_WITHOUT_ZWS ({BFW_FACTIONS},AE_side_ext_loyalist,AE_side_ext_sylvans,AE_side_ext_dwarves,AE_side_ext_outlaws,AE_side_ext_northerns,AE_side_ext_undead,AE_side_agl_desertelves,AE_side_imp_cavernei,AE_side_chs_sylvans,AE_side_chs_wildhumans,AE_RHY_Regis,AE_RHY_Dwarves,AE_RHY_Undead) "Defaultlike" AE_set_notdefaultlike}
+    {RANDOM_WITHOUT_ZWS ({BFW_FACTIONS},AE_side_ext_loyalist,AE_side_ext_sylvans,AE_side_ext_drakes,AE_side_ext_dwarves,AE_side_ext_outlaws,AE_side_ext_northerns,AE_side_ext_undead,AE_side_agl_desertelves,AE_side_imp_cavernei,AE_side_chs_sylvans,AE_side_chs_wildhumans,AE_RHY_Regis,AE_RHY_Dwarves,AE_RHY_Undead) "Defaultlike" AE_set_notdefaultlike}
     {RANDOM_ONLY_ZWS {AE_BALANCED_FACTIONS} "Balanced" AE_set_balanced} # needs zero width space
     [multiplayer_side]
         id=AE_set_notdefault

eras/ageless_heroes.cfg

@@ -8,7 +8,7 @@
     {AE_LOAD_REQUIRED_EVENTS_RESOURCE}
     description=_ "The largest era ever made featuring Default Era with the Dunefolk faction, Extended Era, Archaic Era, the Era of the Future, Eternal Era, BEEM, the Era of Four Moons, the Yokai faction, the Dark Legion, the Desert Elves, the Steelhive faction, Millennium Era, the Deep Elves, the Era of Myths, Feudal Era, Imperial Era, the Era of Strife, the Era of Magic, the Era of Chaos, Rashy Era, and Mercenaries Era."
     {~add-ons/Ageless_Era/eras/era_events/_main.cfg}
-    {RANDOM_WITHOUT_ZWS ({BFW_FACTIONS},AE_side_ext_loyalist,AE_side_ext_sylvans,AE_side_ext_dwarves,AE_side_ext_outlaws,AE_side_ext_northerns,AE_side_ext_undead,AE_side_agl_desertelves,AE_side_imp_cavernei,AE_side_chs_sylvans,AE_side_chs_wildhumans,AE_RHY_Regis,AE_RHY_Dwarves,AE_RHY_Undead) "Defaultlike" AE_set_notdefaultlike}
+    {RANDOM_WITHOUT_ZWS ({BFW_FACTIONS},AE_side_ext_loyalist,AE_side_ext_sylvans,AE_side_ext_drakes,AE_side_ext_dwarves,AE_side_ext_outlaws,AE_side_ext_northerns,AE_side_ext_undead,AE_side_agl_desertelves,AE_side_imp_cavernei,AE_side_chs_sylvans,AE_side_chs_wildhumans,AE_RHY_Regis,AE_RHY_Dwarves,AE_RHY_Undead) "Defaultlike" AE_set_notdefaultlike}
     {RANDOM_ONLY_ZWS {AE_BALANCED_FACTIONS} "Balanced" AE_set_balanced} # needs zero width space
     [multiplayer_side]
         id=AE_set_notdefault

factions/RPG/RPG-EE.cfg

@@ -28,6 +28,16 @@
 
 #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
 
+[multiplayer_side]
+    id=AE_side_ext_drakes
+	name= "EE - " + _ "Drakes"
+    image="units/drakes/apprentice.png"
+    type=AE_ext_drake_Apprentice
+    leader=Drake Burner,Drake Clasher,AE_ext_drake_Glider,AE_ext_drake_Fighter,Saurian Skirmisher,Saurian Augur,AE_ext_drake_Apprentice
+    random_leader=AE_ext_drake_Apprentice
+    terrain_liked=Hh, Ha, Ds, Ss
+[/multiplayer_side]
+
 ## | Dwarves - RPG
 
 [multiplayer_side]

factions/default/default-EE.cfg

@@ -37,6 +37,16 @@
 
 #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
 
+[multiplayer_side]
+    id=AE_side_ext_drakes
+	name= "EE - " + _ "Drakes"
+    image="units/drakes/flare.png"
+    type=Drake Flare
+    leader=Drake Flare,Fire Drake,Drake Arbiter,Drake Thrasher,Drake Warrior,Saurian Oracle,Saurian Soothsayer,AE_ext_drake_Sword_Drake,AE_ext_drake_Druid
+    recruit=Drake Burner,Drake Clasher,AE_ext_drake_Glider,AE_ext_drake_Fighter,Saurian Skirmisher,Saurian Augur,AE_ext_drake_Apprentice
+    terrain_liked=Hh, Ha, Ds, Ss
+[/multiplayer_side]
+
 ## | Dwarves - Default
 
 [multiplayer_side]

factions/heroes/heroes-EE.cfg

@@ -39,6 +39,19 @@
 
 #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
 
+[multiplayer_side]
+    id=AE_side_ext_drakes
+    name= "EE - " + _ "Drakes"
+    image="units/drakes/flameheart.png"
+    type=Drake Flameheart
+    leader=Drake Flameheart,Inferno Drake,Drake Enforcer,Drake Warden,Drake Blademaster,Saurian Soothsayer,Saurian Oracle,AE_ext_drake_Sword_Master,AE_ext_drake_Master_Druid
+    recruit=Drake Burner,Fire Drake,Drake Clasher,AE_ext_drake_Glider,AE_ext_drake_Fighter,Saurian Skirmisher,Saurian Augur,Drake Warrior,Drake Flare,Drake Thrasher,Sky Drake,Drake Arbiter,Saurian Ambusher,Saurian Soothsayer,Saurian Oracle,AE_ext_drake_Ranger,AE_ext_drake_Sword_Drake,AE_ext_drake_Apprentice,AE_ext_drake_Druid
+    terrain_liked=Hh, Ha, Ds, Ss
+    [ai]
+        recruitment_pattern=fighter,fighter,archer,healer,scout,scout
+    [/ai]
+[/multiplayer_side]
+
 ## | Dwarves - Heroes
 
 [multiplayer_side]

text/special_notes-ME.cfg

@@ -12,7 +12,7 @@ _" If the enemy is on flammable terrain, this unit can deal more damage, or less
 _" This unit has an attack which hurts bystanders of a battle by 2." #enddef
 
 #define SPECIAL_NOTES_GROUPING
-_" When beeing adjacent to other units with grouping, this unit's damage increases for each of them by 1." #enddef
+_" When being adjacent to other units with grouping, this unit's damage increases for each of them." #enddef
 
 #define SPECIAL_NOTES_BLOCK
 _" This unit increases the resistances of nearby units by 20." #enddef

units/AoA_units/empire/Apprenti_enchanteur.cfg

@@ -31,7 +31,8 @@
         [specials]
             {WEAPON_SPECIAL_MAGICAL}
         [/specials]
-		[attack]
+    [/attack]
+    [attack]
         name=enchantement
         description=_"basic enchantment"
         type=arcane
@@ -43,7 +44,6 @@
             {WEAPON_SPECIAL_MAGICAL}
         [/specials]
     [/attack]
-    [/attack]
     {SWORD_SOUND}
     [female]
         name= _"female^Enchanter apprentice"

units/AoA_units/gobmon/armor_1.cfg

@@ -1,24 +1,23 @@
-#textdomain wesnoth-ageless-era
+#textdomain wesnoth-Ageless_Era
 [unit_type]
-    id=EA_goblin_armor_1
+    id=AE_goblin_armor_1
     name= _ "Goblin Sentinel"
     race=gobmon
     gender=male
-    image="units/halflings/armor_1.png"
-    {MAGENTA_IS_THE_TEAM_COLOR}
+    image="units/gobmon/armor_1.png"
     hitpoints=48
     movement_type=orcishfoot
     movement=4
     level=2
     experience=66
-    advances_to=EA_goblin_armor_2
+    advances_to=AE_goblin_armor_2
     alignment=chaotic
     cost=23
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "this unit been added as an extra, art taken from grafted era"
     die_sound={SOUND_LIST:GOBLIN_DIE}
-    {DEFENSE_ANIM "units/halflings/armor_1.png" "units/halflings/armor_1.png" {SOUND_LIST:HALFLING_HIT} }
-	
+    {DEFENSE_ANIM "units/gobmon/armor_1.png" "units/gobmon/armor_1.png" ()}
+
 	[resistance]
 	    blade=80
 		pierce=70
@@ -27,7 +26,7 @@
 		cold=90
         fire=110
     [/resistance]
-	
+
     [attack]
         name=spear
         description={STR_SPEAR}
@@ -44,19 +43,19 @@
         [frame]
             begin=-200
             end=-150
-            image="units/halflings/armor_1.png"
+            image="units/gobmon/armor_1.png"
         [/frame]
         [frame]
             begin=-150
             end=-100
-            image="units/halflings/armor_1.png"
+            image="units/gobmon/armor_1.png"
         [/frame]
         [if]
             hits=yes
             [frame]
                 begin=-100
                 end=50
-                image="units/halflings/armor_1.png"
+                image="units/gobmon/armor_1.png"
                 sound=spear.ogg
             [/frame]
         [/if]
@@ -65,19 +64,19 @@
             [frame]
                 begin=-100
                 end=50
-                image="units/halflings/armor_1.png"
+                image="units/gobmon/armor_1.png"
                 sound=spear-miss.ogg
             [/frame]
         [/else]
         [frame]
             begin=50
             end=75
-            image="units/halflings/armor_1.png"
+            image="units/gobmon/armor_1.png"
         [/frame]
         [frame]
             begin=75
             end=150
-            image="units/halflings/armor_1.png"
+            image="units/gobmon/armor_1.png"
         [/frame]
     [/attack_anim]
 [/unit_type]

units/AoA_units/gobmon/armor_2.cfg

@@ -1,11 +1,10 @@
-#textdomain wesnoth-ageless-era
+#textdomain wesnoth-Ageless_Era
 [unit_type]
-    id=EA_goblin_armor_2
+    id=AE_goblin_armor_2
     name= _ "Goblin Bulwark"
     race=gobmon
     gender=male
-    image="units/halflings/armor_2.png"
-    {MAGENTA_IS_THE_TEAM_COLOR}
+    image="units/gobmon/armor_2.png"
     hitpoints=63
     movement_type=orcishfoot
     movement=4
@@ -17,12 +16,12 @@
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "this unit been added as an extra, art taken from grafted era"
     die_sound={SOUND_LIST:GOBLIN_DIE}
-    {DEFENSE_ANIM "units/halflings/armor_2.png" "units/halflings/armor_2.png" {SOUND_LIST:HALFLING_HIT} }
-	
+    {DEFENSE_ANIM "units/gobmon/armor_2.png" "units/gobmon/armor_2.png" ()}
+
 	[abilities]
         {AE_CHS_ABILITY_PROTECTION_LEVEL_2}
     [/abilities]
-	
+
 	[resistance]
 	    blade=80
 		pierce=70
@@ -31,7 +30,7 @@
 		cold=80
         fire=110
     [/resistance]
-	
+
     [attack]
         name=spear
         description={STR_SPEAR}
@@ -51,19 +50,19 @@
         [frame]
             begin=-200
             end=-150
-            image="units/halflings/armor_2.png"
+            image="units/gobmon/armor_2.png"
         [/frame]
         [frame]
             begin=-150
             end=-100
-            image="units/halflings/armor_2.png"
+            image="units/gobmon/armor_2.png"
         [/frame]
         [if]
             hits=yes
             [frame]
                 begin=-100
                 end=50
-                image="units/halflings/armor_2.png"
+                image="units/gobmon/armor_2.png"
                 sound=spear.ogg
             [/frame]
         [/if]
@@ -72,19 +71,19 @@
             [frame]
                 begin=-100
                 end=50
-                image="units/halflings/armor_2.png"
+                image="units/gobmon/armor_2.png"
                 sound=spear-miss.ogg
             [/frame]
         [/else]
         [frame]
             begin=50
             end=75
-            image="units/halflings/armor_2.png"
+            image="units/gobmon/armor_2.png"
         [/frame]
         [frame]
             begin=75
             end=150
-            image="units/halflings/armor_2.png"
+            image="units/gobmon/armor_2.png"
         [/frame]
     [/attack_anim]
 [/unit_type]

units/AoA_units/mork-darf/Traqueur.cfg

@@ -20,19 +20,19 @@
     [movement_costs]
         frozen=1
 		swamp_water=2
-    [/movement_costs
-	
+    [/movement_costs]
+
 	[resistance]
         blade=90
         impact=90
 		pierce=90
     [/resistance]
-	
+
     [defense]
 		swamp_water=50
         forest=40
     [/defense]
-	
+
 	[abilities]
         {ABILITY_AMBUSH}
     [/abilities]

units/EE_units/_units.cfg

@@ -2,6 +2,7 @@
 
 {GET_AE_UNITS EE_units/chaos}
 {GET_AE_UNITS EE_units/dark_elves}
+{GET_AE_UNITS EE_units/drakes}
 {GET_AE_UNITS EE_units/dwarves}
 {GET_AE_UNITS EE_units/ice_wyrms}
 {GET_AE_UNITS EE_units/monsters}

units/EE_units/chaos/Abomination.cfg

@@ -20,9 +20,7 @@
     cost=55
     usage=fighter
     undead_variation=troll
-    description= _ "This unit is from Extended Era. Its coding and art were done by the Various people who created Extended Era.
-
-Drenched in the blood of its enemies, an abomination bears little resemblance to the mutation it was created from. Enemy generals have been known to order full blown retreats at the mere sight of such a monster. An abomination's giant pus-laden body can withstand a dizzying amount of punishment, making it almost impossible to take down. This, combined with incredible raw strength, has turned abominations into veritable killing machines, something their chaos masters delight in."
+    description={AE_EE_UNIT_NOTICE}+_"Drenched in the blood of its enemies, an abomination bears little resemblance to the mutation it was created from. Enemy generals have been known to order full blown retreats at the mere sight of such a monster. An abomination's giant pus-laden body can withstand a dizzying amount of punishment, making it almost impossible to take down. This, combined with incredible raw strength, has turned abominations into veritable killing machines, something their chaos masters delight in."
     die_sound={SOUND_LIST:TROLL_DIE}
     {DEFENSE_ANIM "units/chaos/abomination.png" "units/chaos/abomination.png" {SOUND_LIST:TROLL_HIT} }
     [resistance]

units/EE_units/chaos/Blood_Knight.cfg

@@ -19,9 +19,7 @@
         blade=80
     [/resistance]
     cost=57
-    description= _ "This unit is from Extended Era. Its coding and art were done by the Various people who created Extended Era.
- 
-Ultimate mastery comes with the greatest sacrifice. Dark Knights open their veins and let their blood flow. If taste of their blood satisfies the Chaos Lords, they promote them to the rank of Blood Knights, supreme warriors of Chaos."
+    description={AE_EE_UNIT_NOTICE}+_"Ultimate mastery comes with the greatest sacrifice. Dark Knights open their veins and let their blood flow. If taste of their blood satisfies the Chaos Lords, they promote them to the rank of Blood Knights, supreme warriors of Chaos."
     {DEFENSE_ANIM "units/chaos/blood-knight-defend.png" "units/chaos/blood-knight.png" {SOUND_LIST:HUMAN_HIT} }
     die_sound={SOUND_LIST:HUMAN_DIE}
 

units/EE_units/chaos/Chaos_Daemon.cfg

@@ -18,9 +18,7 @@
     cost=31
     usage=mixed fighter
     undead_variation=drake
-    description= _ "This unit is from Extended Era. Its coding and art were done by the Various people who created Extended Era.
-
-The lesser demons are the gift of the Gods of Chaos to those who have shown to be worthy enough to recieve aid from their sides, though barely any tougher than the average human the lesser demons can easily turn the tide of a battle due to the combination of their nible movement and tough fighting..."
+    description={AE_EE_UNIT_NOTICE}+_"The lesser demons are the gift of the Gods of Chaos to those who have shown to be worthy enough to recieve aid from their sides, though barely any tougher than the average human the lesser demons can easily turn the tide of a battle due to the combination of their nible movement and tough fighting..."
     {DEFENSE_ANIM "units/chaos/demonlore-defend.png" "units/chaos/demonlore.png" {SOUND_LIST:DRAKE_HIT} }
     die_sound=drake-die.ogg
     [resistance]