diff --git a/data/campaigns/Descent_Into_Darkness/_main.cfg b/data/campaigns/Descent_Into_Darkness/_main.cfg index 4c6e2932b54..3f73f4d746e 100644 --- a/data/campaigns/Descent_Into_Darkness/_main.cfg +++ b/data/campaigns/Descent_Into_Darkness/_main.cfg @@ -43,9 +43,13 @@ name = "Blarumyrran" comment = "story images" [/entry] + [entry] + name = "Emilien Rotival (LordBob)" + comment = "current portraits" + [/entry] [entry] name= "theycallmerooster" - comment = "portraits" + comment = "old portraits" [/entry] [/about] [/campaign] diff --git a/data/campaigns/Descent_Into_Darkness/images/campaign_image.png b/data/campaigns/Descent_Into_Darkness/images/campaign_image.png index 1653d873de6..a6957174404 100644 Binary files a/data/campaigns/Descent_Into_Darkness/images/campaign_image.png and b/data/campaigns/Descent_Into_Darkness/images/campaign_image.png differ diff --git a/data/campaigns/Descent_Into_Darkness/images/portraits/darken_volk.png b/data/campaigns/Descent_Into_Darkness/images/portraits/darken_volk.png index 5c77cd2395b..023a6b4adf1 100644 Binary files a/data/campaigns/Descent_Into_Darkness/images/portraits/darken_volk.png and b/data/campaigns/Descent_Into_Darkness/images/portraits/darken_volk.png differ diff --git a/data/campaigns/Descent_Into_Darkness/images/portraits/dela.png b/data/campaigns/Descent_Into_Darkness/images/portraits/dela.png index 019267b1a93..4695804a9dc 100644 Binary files a/data/campaigns/Descent_Into_Darkness/images/portraits/dela.png and b/data/campaigns/Descent_Into_Darkness/images/portraits/dela.png differ diff --git a/data/campaigns/Descent_Into_Darkness/images/portraits/drogan.png b/data/campaigns/Descent_Into_Darkness/images/portraits/drogan.png new file mode 100644 index 00000000000..da63b665c08 Binary files /dev/null and b/data/campaigns/Descent_Into_Darkness/images/portraits/drogan.png differ diff --git a/data/campaigns/Descent_Into_Darkness/images/portraits/malin_lich.png b/data/campaigns/Descent_Into_Darkness/images/portraits/malin_lich.png new file mode 100644 index 00000000000..3fed5b6352f Binary files /dev/null and b/data/campaigns/Descent_Into_Darkness/images/portraits/malin_lich.png differ diff --git a/data/campaigns/Descent_Into_Darkness/images/portraits/malin_old-decay.png b/data/campaigns/Descent_Into_Darkness/images/portraits/malin_old-decay.png new file mode 100644 index 00000000000..9b1396bca9a Binary files /dev/null and b/data/campaigns/Descent_Into_Darkness/images/portraits/malin_old-decay.png differ diff --git a/data/campaigns/Descent_Into_Darkness/images/portraits/malin_old.png b/data/campaigns/Descent_Into_Darkness/images/portraits/malin_old.png new file mode 100644 index 00000000000..da20ce6d64a Binary files /dev/null and b/data/campaigns/Descent_Into_Darkness/images/portraits/malin_old.png differ diff --git a/data/campaigns/Descent_Into_Darkness/images/portraits/malin_young.png b/data/campaigns/Descent_Into_Darkness/images/portraits/malin_young.png new file mode 100644 index 00000000000..06662392e09 Binary files /dev/null and b/data/campaigns/Descent_Into_Darkness/images/portraits/malin_young.png differ diff --git a/data/campaigns/Descent_Into_Darkness/images/portraits/malinlich.png b/data/campaigns/Descent_Into_Darkness/images/portraits/malinlich.png deleted file mode 100644 index 11e5d32f46b..00000000000 Binary files a/data/campaigns/Descent_Into_Darkness/images/portraits/malinlich.png and /dev/null differ diff --git a/data/campaigns/Descent_Into_Darkness/images/portraits/malold.png b/data/campaigns/Descent_Into_Darkness/images/portraits/malold.png deleted file mode 100644 index 9e87710bad0..00000000000 Binary files a/data/campaigns/Descent_Into_Darkness/images/portraits/malold.png and /dev/null differ diff --git a/data/campaigns/Descent_Into_Darkness/images/portraits/malyoung.png b/data/campaigns/Descent_Into_Darkness/images/portraits/malyoung.png deleted file mode 100644 index 4f05da76e26..00000000000 Binary files a/data/campaigns/Descent_Into_Darkness/images/portraits/malyoung.png and /dev/null differ diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg index 257f08d23bc..69af51caca6 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg @@ -69,7 +69,7 @@ type=Apprentice Mage id=Malin Keshar name=_ "Malin Keshar" - profile=portraits/malyoung.png + profile=portraits/malin_young.png unrenamable=yes canrecruit=yes recruit=Walking Corpse @@ -107,6 +107,7 @@ type=Sergeant id=Drogan name=_ "Drogan" + profile=portraits/drogan.png unrenamable=yes {GOLD 50 25 25} canrecruit=yes diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg index 22a1d9f35c2..d420da1b079 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg @@ -41,6 +41,7 @@ type=Apprentice Mage id=Malin Keshar name=_ "Malin Keshar" + profile=portraits/malin_young.png unrenamable=yes canrecruit=yes recruit=Walking Corpse,Vampire Bat diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg index 86b90ee8c7e..7b72730b3a1 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg @@ -37,6 +37,7 @@ type=Apprentice Mage id=Malin Keshar name=_ "Malin Keshar" + profile=portraits/malin_young.png unrenamable=yes canrecruit=yes recruit=Walking Corpse,Vampire Bat,Ghost,Ghoul diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/04_Beginning_of_the_Revenge.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/04_Beginning_of_the_Revenge.cfg index bd66085ca83..1c07171acbb 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/04_Beginning_of_the_Revenge.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/04_Beginning_of_the_Revenge.cfg @@ -42,6 +42,7 @@ type=Apprentice Mage id=Malin Keshar name=_ "Malin Keshar" + profile=portraits/malin_old.png unrenamable=yes canrecruit=yes recruit=Walking Corpse,Vampire Bat,Ghost,Ghoul,Skeleton Archer,Skeleton @@ -141,7 +142,7 @@ id=Darken Volk [/recall] - {MODIFY_UNIT (id=Malin Keshar) profile (portraits/malold.png)} + {MODIFY_UNIT (id=Malin Keshar) profile (portraits/malin_old.png)} [/event] [event] diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg index aab5f384ab3..d05ae0a2643 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg @@ -48,6 +48,7 @@ type=Apprentice Mage id=Malin Keshar name=_ "Malin Keshar" + profile=portraits/malin_old.png unrenamable=yes canrecruit=yes recruit=Walking Corpse,Vampire Bat,Ghost,Ghoul,Skeleton Archer,Skeleton,Dark Adept DiD diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg index 688c51f371b..83a3812642f 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg @@ -36,6 +36,7 @@ type=Apprentice Mage id=Malin Keshar name=_ "Malin Keshar" + profile=portraits/malin_old.png unrenamable=yes canrecruit=yes recruit=Walking Corpse,Vampire Bat,Ghost,Ghoul,Skeleton Archer,Skeleton,Dark Adept DiD @@ -76,6 +77,7 @@ type=Lieutenant id=Drogan name=_ "Drogan" + profile=portraits/drogan.png {GOLD 16 30 45} canrecruit=yes recruit=Spearman,Bowman @@ -96,11 +98,11 @@ type=Frontier Baroness id=Dela Keshar name=_ "Dela Keshar" + profile=portraits/dela.png gold=200 income=25 canrecruit=yes recruit=Spearman,Bowman,Swordsman,Pikeman,Longbowman,Thug,Poacher,Footpad - profile=portraits/dela.png [ai] [protect_unit] id=Drogan diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg index 16ed4998565..f789bd63598 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg @@ -49,6 +49,7 @@ type=Apprentice Mage id=Malin Keshar name=_ "Malin Keshar" + profile=portraits/malin_old.png unrenamable=yes canrecruit=yes recruit=Walking Corpse,Vampire Bat,Ghost,Ghoul,Skeleton Archer,Skeleton,Dark Adept DiD diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg index a4730c2863c..a6c1a9d7fa3 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg @@ -24,6 +24,7 @@ type=Apprentice Mage id=Malin Keshar name=_ "Malin Keshar" + profile=portraits/malin_old.png unrenamable=yes canrecruit=yes recruit= diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg index 37072587fd5..8fb60e7435a 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg @@ -23,6 +23,7 @@ type=Apprentice Mage id=Malin Keshar name=_ "Malin Keshar" + profile=portraits/malin_old.png unrenamable=yes canrecruit=yes recruit= diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg index 68350528caa..b755790c0f5 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg @@ -41,6 +41,7 @@ type=Apprentice Mage id=Malin Keshar name=_ "Malin Keshar" + profile=portraits/malin_old-decay.png unrenamable=yes canrecruit=yes recruit=Walking Corpse,Vampire Bat,Ghost,Ghoul,Skeleton Archer,Skeleton,Dark Adept DiD @@ -181,6 +182,8 @@ # Scenario variables {VARIABLE bookX -1} {VARIABLE bookY -1} + + {MODIFY_UNIT (id=Malin Keshar) profile (portraits/malin_old-decay.png)} [/event] [event] diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg index 4b791ead9af..422bdad6f6d 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg @@ -48,6 +48,7 @@ type=Apprentice Mage id=Malin Keshar name=_ "Malin Keshar" + profile=portraits/malin_old-decay.png unrenamable=yes canrecruit=yes recruit=Walking Corpse,Vampire Bat,Ghost,Ghoul,Skeleton Archer,Skeleton,Dark Adept DiD @@ -162,7 +163,7 @@ type=Dark Mage side=1 x,y=3,34 - profile=portraits/malold.png + profile=portraits/malin_old-decay.png unrenamable=yes canrecruit=yes [/unit] @@ -400,7 +401,7 @@ name=_ "Mal Keshar" unrenamable=yes canrecruit=yes - profile=portraits/malinlich.png + profile=portraits/malin_lich.png x,y=6,31 hitpoints=9 facing=se diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/12_Endless_Night.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/12_Endless_Night.cfg index 400ccd768d6..93e339e6c9d 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/12_Endless_Night.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/12_Endless_Night.cfg @@ -30,12 +30,12 @@ type=Lich id=Mal Keshar name=_ "Mal Keshar" + profile=portraits/malin_lich.png unrenamable=yes canrecruit=yes recruit=Walking Corpse,Vampire Bat,Ghost,Ghoul,Skeleton Archer,Skeleton,Dark Adept gold=200 save_id=Malin Keshar - profile=portraits/malinlich.png {FLAG_VARIANT undead} [/side]