diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/04_The_Siege_of_Barag_Gor.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/04_The_Siege_of_Barag_Gor.cfg index 4cdafdf44a3..5745c2a9cde 100644 --- a/data/campaigns/Son_Of_The_Black_Eye/scenarios/04_The_Siege_of_Barag_Gor.cfg +++ b/data/campaigns/Son_Of_The_Black_Eye/scenarios/04_The_Siege_of_Barag_Gor.cfg @@ -174,9 +174,9 @@ {GENERIC_UNIT 3 "Orcish Grunt" 25 15} {GUARDIAN} {GENERIC_UNIT 3 "Orcish Grunt" 22 16} {GUARDIAN} - {ORCISH_SHAMAN 22 14 Pirk _"Pirk"} - {OLD_ORCISH_SHAMAN 22 15 Gork _"Gork"} - {NOVICE_ORCISH_SHAMAN 21 15 Vraurk _"Vraurk"} + {ORCISH_SHAMAN 3 22 14 Pirk _"Pirk"} + {OLD_ORCISH_SHAMAN 3 22 15 Gork _"Gork"} + {NOVICE_ORCISH_SHAMAN 3 21 15 Vraurk _"Vraurk"} # wmllint: recognize Pirk # wmllint: recognize Gork # wmllint: recognize Vraurk diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/09_Shan_Taum_the_Smug.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/09_Shan_Taum_the_Smug.cfg index 2a8e6a0f8c0..5098331e9d1 100644 --- a/data/campaigns/Son_Of_The_Black_Eye/scenarios/09_Shan_Taum_the_Smug.cfg +++ b/data/campaigns/Son_Of_The_Black_Eye/scenarios/09_Shan_Taum_the_Smug.cfg @@ -156,9 +156,9 @@ [event] name=victory cutscene - {OLD_ORCISH_SHAMAN 32 30 Fabstep _"Fabstep"} - {OLD_ORCISH_SHAMAN 32 30 Klebar _"Klebar"} - {OLD_ORCISH_SHAMAN 32 30 Echarp _"Echarp"} + {OLD_ORCISH_SHAMAN 1 32 30 Fabstep _"Fabstep"} + {OLD_ORCISH_SHAMAN 1 32 30 Klebar _"Klebar"} + {OLD_ORCISH_SHAMAN 1 32 30 Echarp _"Echarp"} # wmllint: recognize Fabstep # wmllint: recognize Klebar # wmllint: recognize Echarp diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/11_Clash_of_Armies.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/11_Clash_of_Armies.cfg index c0f40c78f5c..ffa97976eb8 100644 --- a/data/campaigns/Son_Of_The_Black_Eye/scenarios/11_Clash_of_Armies.cfg +++ b/data/campaigns/Son_Of_The_Black_Eye/scenarios/11_Clash_of_Armies.cfg @@ -1090,9 +1090,9 @@ [event] name=time over - {ORCISH_SHAMAN 11 1 Pirk _"Pirk"} - {OLD_ORCISH_SHAMAN 11 1 Gork _"Gork"} - {NOVICE_ORCISH_SHAMAN 11 1 Vraurk _"Vraurk"} + {ORCISH_SHAMAN 1 11 1 Pirk _"Pirk"} + {OLD_ORCISH_SHAMAN 1 11 1 Gork _"Gork"} + {NOVICE_ORCISH_SHAMAN 1 11 1 Vraurk _"Vraurk"} {UNIT 1 "Orcish Warrior" 11 1 role=greathordeprops} {UNIT 1 "Orcish Warrior" 11 1 role=greathordeprops} {UNIT 1 "Orcish Crossbowman" 11 1 role=greathordeprops} diff --git a/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg b/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg index 3249f40e775..f2163a6d3d7 100644 --- a/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg +++ b/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg @@ -1,12 +1,12 @@ #textdomain wesnoth-sotbe -#define OLD_ORCISH_SHAMAN X Y ID_STRING NAME_STRING +#define OLD_ORCISH_SHAMAN SIDE X Y ID_STRING NAME_STRING [unit] id={ID_STRING} name={NAME_STRING} type=Old Orcish Shaman profile=portraits/old_orcish_shaman.png - side=1 + side={SIDE} x={X} y={Y} random_traits=no @@ -17,13 +17,13 @@ [/unit] #enddef -#define NOVICE_ORCISH_SHAMAN X Y ID_STRING NAME_STRING +#define NOVICE_ORCISH_SHAMAN SIDE X Y ID_STRING NAME_STRING [unit] id={ID_STRING} name={NAME_STRING} type=Novice Orcish Shaman profile=portraits/young_orcish_shaman.png - side=1 + side={SIDE} x={X} y={Y} random_traits=no @@ -34,13 +34,13 @@ [/unit] #enddef -#define ORCISH_SHAMAN X Y ID_STRING NAME_STRING +#define ORCISH_SHAMAN SIDE X Y ID_STRING NAME_STRING [unit] id={ID_STRING} name={NAME_STRING} type=Orcish Shaman profile=portraits/orcish_shaman.png - side=1 + side={SIDE} x={X} y={Y} random_traits=no