Merge pull request #4047 from nemaara/portraits

Add/move around mainline unit portraits

changelog.md

@@ -69,6 +69,8 @@
    * Saurian warriors are now female. (issue #3392)
    * Giant Scorpion now has 20% resistance to arcane and 0% to all other resists
    * Added Sand Scuttler variation to the Giant Scorpion with same resists as original unit
+   * Move Fire Dragon portrait from TRoW and SoF to core
+   * Move Orcish Leader portraits to Orcish Ruler and use grunt variation portrait for Leader
  ### WML engine
    * Support formula= key in [variable] ConditionalWML
    * Support to_location in [move_unit], taking a special location ID
@@ -152,6 +154,8 @@
      * S2: add dehydration explanation to objectives
  ### Miscellaneous and bug fixes
      * Update various references of mermen to merfolk or mer
+ ### Units
+   * Add new Water Serpent portrait
 
 ## Version 1.14.6+dev
  ### Campaigns

data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg

@@ -69,7 +69,6 @@
         type=Fire Dragon
         id=Khrakrahs
         name= _ "Khrakrahs"
-        profile=portraits/khrakrahs.png
         side=3
         canrecruit=yes
         controller=ai

data/campaigns/The_Rise_Of_Wesnoth/scenarios/17a_The_Dragon.cfg

@@ -364,9 +364,6 @@
             [/variable]
             [then]
                 {NAMED_LOYAL_UNIT 6 (Fire Dragon) 20 27 ("Shek'kahan") ( _ "Shek’kahan")}
-                [+unit]
-                    profile=portraits/shekkahan.png
-                [/unit]
 
                 [set_variable]
                     name=dragon_awake
@@ -399,9 +396,6 @@
             [/variable]
             [then]
                 {NAMED_LOYAL_UNIT 6 (Fire Dragon) 20 27 ("Shek'kahan") ( _ "Shek’kahan")}
-                [+unit]
-                    profile=portraits/shekkahan.png
-                [/unit]
 
                 [set_variable]
                     name=dragon_awake

data/core/units/monsters/Fire_Dragon.cfg

@@ -3,6 +3,7 @@
     id=Fire Dragon
     name= _ "Fire Dragon"
     race=monster
+    profile="portraits/monsters/fire-dragon.png"
     # workaround to cut the transparent part when displayed in the help
     image="units/monsters/fire-dragon.png~CROP(3,0,154,154)"
     [standing_anim]

data/core/units/monsters/Water_Serpent.cfg

@@ -5,6 +5,7 @@
     name= _ "Water Serpent"
     race=monster
     image="units/monsters/water-serpent.png"
+    profile="portraits/monsters/water-serpent.png"
     [standing_anim]
         start_time=0
         direction=s,sw,se

data/core/units/orcs/Leader.cfg

@@ -4,7 +4,7 @@
     name= _ "Orcish Leader"
     race=orc
     image="units/orcs/leader.png"
-    profile="portraits/orcs/leader.png"
+    profile="portraits/orcs/grunt-6.png"
     {LEADING_ANIM "units/orcs/leader-lead-2.png" "units/orcs/leader-lead-1.png" 0,-30}
     hitpoints=45
     movement_type=orcishfoot

data/core/units/orcs/Ruler.cfg

@@ -4,7 +4,7 @@
     name= _ "Orcish Ruler"
     race=orc
     image="units/orcs/ruler.png"
-    profile="portraits/orcs/leader.png"
+    profile="portraits/orcs/ruler.png"
     {LEADING_ANIM "units/orcs/ruler-lead-2.png" "units/orcs/ruler-lead-1.png" 0,-30}
     hitpoints=60
     movement_type=orcishfoot

data/tools/wmllint

@@ -926,6 +926,9 @@ linechanges = (
         ("Saree", "Dune Swiftrider"),
         ("Jawal", "Dune Windrider")
 
+        ("images/portraits/orcs/leader.png", "images/portraits/ors/ruler.png"),
+        ("images/portraits/orcs/leader-2.png", "images/portraits/ors/ruler-2.png"),
+
         )
 
 def validate_on_pop(tagstack, closer, filename, lineno):