wire in the 2nd devling faction. This means

- new unit ids: They use the prefix EOM2_ - a 2nd race: not neccessary, but will group them together in the wiki - including them as faction into the era they are not added into the pool of random factions - the movetypes will still be used in common (with the prefix EOM_) so both factions would benefit from a change in it
sevu · Oct 19, 2017 · a5b09b3 · a5b09b3
1 parent 512e9ce
commit a5b09b3
Show file tree

Hide file tree

Showing 29 changed files with 116 additions and 63 deletions.
diff --git a/EOM_eras.cfg b/EOM_eras.cfg
@@ -6,6 +6,22 @@
     {~add-ons/Era_of_Myths/factions/{FACTION}-{ERA}.cfg}
 #enddef
 
+# This is a modification of the mainline RANDOM_SIDE macro, which
+# excludes the older flavor of the devlings faction from random selection
+
+#textdomain wesnoth-multiplayer
+#undef  RANDOM_SIDE
+#define RANDOM_SIDE
+    [multiplayer_side]
+        id=Random
+        name= _"Random"
+        image="units/random-dice.png"
+        random_faction=yes
+        except=EOM_original_devlings,POWER_original_devlings
+    [/multiplayer_side]
+#enddef
+#textdomain wesnoth-Era_of_Myths
+
 # This is a modification of the mainline 1.12 QUICK_4MP_LEADERS macro, which gives to
 # elementals the trait emerald instead of quick
 
@@ -92,6 +108,7 @@
 # This is a modification of the mainline 1.12 QUICK_4MP_LEADERS macro, which gives to
 # weak devling leaders the legendary trait, and to the overgrown devling leaders other ones.
 
+# This macro applies only to the rebalanced devlings
 #define STRONG_DEVLING_LEADERS
     [event]
         name=prestart
@@ -214,6 +231,7 @@ Windsongs"
     {EOM_SIDE EOM vampires}
     {EOM_SIDE EOM wargs}
     {EOM_SIDE EOM windsong}
+    {EOM_SIDE EOM devlings-original}
 
     {QUICK_4MP_LEADERS}
     {TURNS_OVER_ADVANTAGE}
@@ -258,6 +276,7 @@ Windsongs"
     {EOM_SIDE POWER vampires}
     {EOM_SIDE POWER wargs}
     {EOM_SIDE POWER windsong}
+    {EOM_SIDE POWER devlings-original}
 
     {QUICK_4MP_LEADERS}
     {TURNS_OVER_ADVANTAGE}
@@ -278,6 +297,7 @@ Windsongs"
     {EOM_SIDE EOM vampires}
     {EOM_SIDE EOM wargs}
     {EOM_SIDE EOM windsong}
+    {EOM_SIDE EOM devlings-original}
     {multiplayer/factions/loyalists-default.cfg}
     {multiplayer/factions/rebels-default.cfg}
     {multiplayer/factions/northerners-default.cfg}
@@ -305,6 +325,7 @@ Windsongs"
     {EOM_SIDE POWER vampires}
     {EOM_SIDE POWER wargs}
     {EOM_SIDE POWER windsong}
+    {EOM_SIDE POWER devlings-original}
     {multiplayer/factions/loyalists-aoh.cfg}
     {multiplayer/factions/rebels-aoh.cfg}
     {multiplayer/factions/northerners-aoh.cfg}
@@ -335,5 +356,6 @@ Windsongs"
 [/era]
 
 #undef EOM_SIDE
+#undef RANDOM_SIDE
 #undef QUICK_4MP_LEADERS
 #undef STRONG_DEVLING_LEADERS
diff --git a/factions/devlings-EOM.cfg b/factions/devlings-EOM.cfg
@@ -2,7 +2,7 @@
 
 [multiplayer_side]
     id=EOM_devlings
-    name= _"Devlings"
+    name= _"Devlings" + " " + _ "(rebalanced)"
     image=devlings/blasphemists.png
     # {MAGENTA_IS_THE_TEAM_COLOR}
     type=EOM_Blasphemists

diff --git a/factions/devlings-POWER.cfg b/factions/devlings-POWER.cfg
@@ -2,7 +2,7 @@
 
 [multiplayer_side]
     id=POWER_devlings
-    name= _"Devlings"
+    name= _"Devlings" + " " + _ "(rebalanced)"
     image=devlings/offenders.png
     # {MAGENTA_IS_THE_TEAM_COLOR}
     type=EOM_Offenders

diff --git a/factions/devlings-original-EOM.cfg b/factions/devlings-original-EOM.cfg
@@ -0,0 +1,15 @@
+#textdomain wesnoth-Era_of_Myths
+
+[multiplayer_side]
+    id=EOM_original_devlings
+    name= _"Devlings" + " " + _ "(original)"
+    image=devlings/flyers.png
+    # {MAGENTA_IS_THE_TEAM_COLOR}
+    type=EOM2_Blasphemists
+    leader=EOM_Devling_Soldier,EOM2_Devling_Warrior,EOM2_Offenders,EOM2_Staplers
+    recruit=EOM2_Flappers,EOM2_Sneak,EOM2_Cursers,EOM2_Overgrown_Devling,EOM2_Nailers
+    terrain_liked=Ss # Swamp
+    [ai]
+        recruitment_pattern=fighter,archer,mixed fighter,fighter,mixed fighter,scout
+    [/ai]
+[/multiplayer_side]
diff --git a/factions/devlings-original-POWER.cfg b/factions/devlings-original-POWER.cfg
@@ -0,0 +1,15 @@
+#textdomain wesnoth-Era_of_Myths
+
+[multiplayer_side]
+    id=POWER_original_devlings
+    name= _"Devlings" + " " + _ "(original)"
+    image=devlings/attackers.png
+    # {MAGENTA_IS_THE_TEAM_COLOR}
+    type=EOM2_Offenders
+    leader=EOM2_Devling_Chief,EOM2_Devling_Hero,EOM2_Abusers
+    recruit=EOM2_Devling_Soldier,EOM2_Devling_Warrior,EOM2_Blasphemists,EOM2_Lurker,EOM2_Flyers,EOM2_Spikers,EOM2_Flappers,EOM2_Sneak,EOM2_Cursers,EOM2_Overgrown_Devling,EOM2_Nailers
+    terrain_liked=Ss # Swamp
+    [ai]
+        recruitment_pattern=fighter,fighter,mixed fighter,fighter,mixed fighter,scout
+    [/ai]
+[/multiplayer_side]
diff --git a/images/icons/unit-groups/race_EOM2_devling_30-pressed.png b/images/icons/unit-groups/race_EOM2_devling_30-pressed.png
diff --git a/images/icons/unit-groups/race_EOM2_devling_30.png b/images/icons/unit-groups/race_EOM2_devling_30.png
diff --git a/units/devlings-original/a1_Flappers.cfg b/units/devlings-original/a1_Flappers.cfg
@@ -1,17 +1,17 @@
 #textdomain wesnoth-Era_of_Myths
 
 [unit_type]
-    id=EOM_Flappers
+    id=EOM2_Flappers
     name= _ "Flappers"
-    race=EOM_devling
+    race=EOM2_devling
     image="devlings/flappers.png"
     hitpoints=30
     movement_type=EOM_devlingflyer
     movement=8
     experience=34
     level=1
     alignment=chaotic
-    advances_to=EOM_Flyers
+    advances_to=EOM2_Flyers
     cost=15
     usage=scout
     description= _ "Some devlings are of a slightly different breed, and grow wings, and can spit fire."

diff --git a/units/devlings-original/a2_Flyers.cfg b/units/devlings-original/a2_Flyers.cfg
@@ -1,17 +1,17 @@
 #textdomain wesnoth-Era_of_Myths
 
 [unit_type]
-    id=EOM_Flyers
+    id=EOM2_Flyers
     name= _ "Flyers"
-    race=EOM_devling
+    race=EOM2_devling
     image="devlings/flyers.png"
     hitpoints=39
     movement_type=EOM_devlingflyer
     movement=9
     experience=70
     level=2
     alignment=chaotic
-    advances_to=EOM_Attackers
+    advances_to=EOM2_Attackers
     cost=27
     usage=scout
     description= _ "Devlings are dangerous without wings, and even more dangerous with."

diff --git a/units/devlings-original/a3_Attackers.cfg b/units/devlings-original/a3_Attackers.cfg
@@ -1,9 +1,9 @@
 #textdomain wesnoth-Era_of_Myths
 
 [unit_type]
-    id=EOM_Attackers
+    id=EOM2_Attackers
     name= _ "Attackers"
-    race=EOM_devling
+    race=EOM2_devling
     image="devlings/attackers.png"
     hitpoints=53
     movement_type=EOM_devlingflyer

diff --git a/units/devlings-original/b0_Nailers.cfg b/units/devlings-original/b0_Nailers.cfg
@@ -1,9 +1,9 @@
 #textdomain wesnoth-Era_of_Myths
 
 [unit_type]
-    id=EOM_Nailers
+    id=EOM2_Nailers
     name= _ "Nailers"
-    race=EOM_devling
+    race=EOM2_devling
     ignore_race_traits=yes
     {TRAIT_BRAWNY}
     {TRAIT_BRAINY}
@@ -19,7 +19,7 @@
     level=1
     upkeep=0
     alignment=chaotic
-    advances_to=EOM_Spikers
+    advances_to=EOM2_Spikers
     cost=10
     usage=fighter
     description= _ "All craftsmen know that if they leave their tools lying about they will get lost, though few know why. Though small devlings have a knack for doing lots of damage with simple tools."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LOW_UPKEEP}

diff --git a/units/devlings-original/b1_Spikers.cfg b/units/devlings-original/b1_Spikers.cfg
@@ -1,9 +1,9 @@
 #textdomain wesnoth-Era_of_Myths
 
 [unit_type]
-    id=EOM_Spikers
+    id=EOM2_Spikers
     name= _ "Spikers"
-    race=EOM_devling
+    race=EOM2_devling
     ignore_race_traits=yes
     {TRAIT_BRAWNY}
     {TRAIT_BRAINY}
@@ -19,7 +19,7 @@
     level=2
     upkeep=1
     alignment=chaotic
-    advances_to=EOM_Staplers
+    advances_to=EOM2_Staplers
     cost=24
     usage=fighter
     description= _ "Devlings are small knaves. They often use tricks to distract their enemies before taking a swing. They may be small but certainly not harmless carrying around a large club or hammer."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LOW_UPKEEP}

diff --git a/units/devlings-original/b2_Staplers.cfg b/units/devlings-original/b2_Staplers.cfg
@@ -1,9 +1,9 @@
 #textdomain wesnoth-Era_of_Myths
 
 [unit_type]
-    id=EOM_Staplers
+    id=EOM2_Staplers
     name= _ "Staplers"
-    race=EOM_devling
+    race=EOM2_devling
     ignore_race_traits=yes
     {TRAIT_BRAWNY}
     {TRAIT_BRAINY}

diff --git a/units/devlings-original/c1_Overgrown.cfg b/units/devlings-original/c1_Overgrown.cfg
@@ -1,9 +1,9 @@
 #textdomain wesnoth-Era_of_Myths
 
 [unit_type]
-    id=EOM_Overgrown_Devling
+    id=EOM2_Overgrown_Devling
     name= _ "Overgrown"
-    race=EOM_devling
+    race=EOM2_devling
     image="devlings/overgrown.png"
     profile="portraits/devlings/overgrown.png"
     small_profile="portraits/devlings/overgrown.png~SCALE(205,205)"
@@ -13,7 +13,7 @@
     experience=36
     level=1
     alignment=chaotic
-    advances_to=EOM_Devling_Warrior,EOM_Devling_Soldier
+    advances_to=EOM2_Devling_Warrior,EOM2_Devling_Soldier
     cost=14
     usage=mixed fighter
     description= _ "Some devlings grow to be almost as tall as a dwarf. These devlings are solid fighters, and provide a bit of toughness to the devling arsenal."

diff --git a/units/devlings-original/c2_Soldier.cfg b/units/devlings-original/c2_Soldier.cfg
@@ -1,9 +1,9 @@
 #textdomain wesnoth-Era_of_Myths
 
 [unit_type]
-    id=EOM_Devling_Soldier
+    id=EOM2_Devling_Soldier
     name= _ "Soldier"
-    race=EOM_devling
+    race=EOM2_devling
     image="devlings/soldier.png"
     profile="portraits/devlings/overgrown.png"
     small_profile="portraits/devlings/overgrown.png~SCALE(205,205)"
@@ -13,7 +13,7 @@
     experience=50
     level=2
     alignment=chaotic
-    advances_to=EOM_Devling_Chief
+    advances_to=EOM2_Devling_Chief
     cost=28
     usage=mixed fighter
     description= _ "Much of devling philosophy is quite simple. Life is about hurting other people as much as possible. Overgrown devlings may not be as bright as their smaller kin, but after awhile they figure out they can hurt others more if they pick up a pointy stick. Though, they might never figure out that they are supposed to be stabbing with it rather than slicing..."

diff --git a/units/devlings-original/c2_Warrior.cfg b/units/devlings-original/c2_Warrior.cfg
@@ -1,9 +1,9 @@
 #textdomain wesnoth-Era_of_Myths
 
 [unit_type]
-    id=EOM_Devling_Warrior
+    id=EOM2_Devling_Warrior
     name= _ "Warrior"
-    race=EOM_devling
+    race=EOM2_devling
     image="devlings/warrior.png"
     profile="portraits/devlings/overgrown.png"
     small_profile="portraits/devlings/overgrown.png~SCALE(205,205)"
@@ -13,7 +13,7 @@
     experience=46
     level=2
     alignment=chaotic
-    advances_to=EOM_Devling_Hero
+    advances_to=EOM2_Devling_Hero
     cost=28
     usage=fighter
     description= _ "Much of devling philosophy is quite simple. Life is about hurting other people as much as possible. Overgrown devlings may not be as bright as their smaller kin, but after awhile they figure out they can hurt others more if they pick up a club."

diff --git a/units/devlings-original/c3_Chief.cfg b/units/devlings-original/c3_Chief.cfg
@@ -1,9 +1,9 @@
 #textdomain wesnoth-Era_of_Myths
 
 [unit_type]
-    id=EOM_Devling_Chief
+    id=EOM2_Devling_Chief
     name= _ "Chief"
-    race=EOM_devling
+    race=EOM2_devling
     image="devlings/chief.png"
     profile="portraits/devlings/overgrown.png"
     small_profile="portraits/devlings/overgrown.png~SCALE(205,205)"
@@ -13,7 +13,7 @@
     experience=120
     level=3
     alignment=chaotic
-    advances_to=EOM_Grand_Devling_Chief
+    advances_to=EOM2_Grand_Devling_Chief
     cost=43
     usage=mixed fighter
     description= _ "The Devlings Chiefs may look burly compared to their lesser kin but are fierce warriors. Upon their bodies are hung trophies from their latest battles. However they still have not figured out that spears are supposed to be stabbing weapons, but more than make up for that with brute muscle."

diff --git a/units/devlings-original/c3_Hero.cfg b/units/devlings-original/c3_Hero.cfg
@@ -1,9 +1,9 @@
 #textdomain wesnoth-Era_of_Myths
 
 [unit_type]
-    id=EOM_Devling_Hero
+    id=EOM2_Devling_Hero
     name= _ "Hero"
-    race=EOM_devling
+    race=EOM2_devling
     image="devlings/hero.png"
     profile="portraits/devlings/overgrown.png"
     small_profile="portraits/devlings/overgrown.png~SCALE(205,205)"
@@ -13,7 +13,7 @@
     experience=120
     level=3
     alignment=chaotic
-    advances_to=EOM_Grand_Devling_Hero
+    advances_to=EOM2_Grand_Devling_Hero
     cost=43
     usage=fighter
     description= _ "Eventually a deviling can become proficient enough to be revered by his kindred as a hero. Unfortunately devlings tend to forget any hero who dies, so he won't have a legacy, but while he lives he'll have a sort of ironic glory."

diff --git a/units/devlings-original/c4_Grand_Chief.cfg b/units/devlings-original/c4_Grand_Chief.cfg
@@ -1,9 +1,9 @@
 #textdomain wesnoth-Era_of_Myths
 
 [unit_type]
-    id=EOM_Grand_Devling_Chief
+    id=EOM2_Grand_Devling_Chief
     name= _ "Grand Chief"
-    race=EOM_devling
+    race=EOM2_devling
     image="devlings/grand_chief.png"
     profile="portraits/devlings/overgrown.png"
     small_profile="portraits/devlings/overgrown.png~SCALE(205,205)"

diff --git a/units/devlings-original/c4_Grand_Hero.cfg b/units/devlings-original/c4_Grand_Hero.cfg
@@ -1,9 +1,9 @@
 #textdomain wesnoth-Era_of_Myths
 
 [unit_type]
-    id=EOM_Grand_Devling_Hero
+    id=EOM2_Grand_Devling_Hero
     name= _ "Grand Hero"
-    race=EOM_devling
+    race=EOM2_devling
     image="devlings/grand_hero.png"
     profile="portraits/devlings/overgrown.png"
     small_profile="portraits/devlings/overgrown.png~SCALE(205,205)"

diff --git a/units/devlings-original/d0_Sneak.cfg b/units/devlings-original/d0_Sneak.cfg
@@ -1,9 +1,9 @@
 #textdomain wesnoth-Era_of_Myths
 
 [unit_type]
-    id=EOM_Sneak
+    id=EOM2_Sneak
     name= _ "Sneak"
-    race=EOM_devling
+    race=EOM2_devling
     ignore_race_traits=yes
     {TRAIT_BRAWNY}
     {TRAIT_BRAINY}
@@ -16,7 +16,7 @@
     experience=23
     level=0
     alignment=chaotic
-    advances_to=EOM_Lurker
+    advances_to=EOM2_Lurker
     cost=8
     usage=scout
     description= _ "Devilings small size allows them to swiftly slip around enemies, and stick sharp objects into vulnerable places."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SKIRMISHER}+{SPECIAL_NOTES_BACKSTAB}

diff --git a/units/devlings-original/d1_Lurker.cfg b/units/devlings-original/d1_Lurker.cfg
@@ -1,17 +1,17 @@
 #textdomain wesnoth-Era_of_Myths
 
 [unit_type]
-    id=EOM_Lurker
+    id=EOM2_Lurker
     name= _ "Lurker"
-    race=EOM_devling
+    race=EOM2_devling
     image="devlings/lurker.png"
     hitpoints=25
     movement_type=EOM_devlingelusive
     movement=6
     experience=35
     level=1
     alignment=chaotic
-    advances_to=EOM_Ninja
+    advances_to=EOM2_Ninja
     cost=14
     usage=scout
     description= _ "Devilings who practice sticking knives into peoples backs long enough get even better at it."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SKIRMISHER}+{SPECIAL_NOTES_BACKSTAB}