From e946b83cd7b43f1c1da70961b76b32c0a2a40284 Mon Sep 17 00:00:00 2001 From: Elvish_Hunter Date: Wed, 29 Aug 2012 09:38:34 +0000 Subject: [PATCH] DW: removed duplicated loyalty overlay --- changelog | 3 +++ .../Dead_Water/images/overlays/loyal-icon.png | Bin 170 -> 0 bytes .../Dead_Water/scenarios/01_Invasion.cfg | 2 +- data/campaigns/Dead_Water/scenarios/02_Flight.cfg | 6 +++--- .../campaigns/Dead_Water/scenarios/04_Slavers.cfg | 6 +++--- .../Dead_Water/scenarios/06_Uncharted_Islands.cfg | 2 +- .../Dead_Water/scenarios/10_The_Flaming_Sword.cfg | 6 +++--- .../Dead_Water/scenarios/11_Getting_Help.cfg | 4 ++-- .../campaigns/Dead_Water/scenarios/12_Revenge.cfg | 6 +++--- 9 files changed, 19 insertions(+), 16 deletions(-) delete mode 100644 data/campaigns/Dead_Water/images/overlays/loyal-icon.png diff --git a/changelog b/changelog index 724176e49d8..f5059b06304 100644 --- a/changelog +++ b/changelog @@ -1,5 +1,8 @@ Version 1.11.0+svn: * Campaigns: + * Dead Water: + * Removed duplicated loyalty overlay (that now is in core), and used + {IS_LOYAL} macro * Under the Burning Suns: * Keep a spawned unit from disappearing on reload in scenario 6b * Language and i18n: diff --git a/data/campaigns/Dead_Water/images/overlays/loyal-icon.png b/data/campaigns/Dead_Water/images/overlays/loyal-icon.png deleted file mode 100644 index a7ed3bf303f31c1f015a3b166606ce3b0ae78c0d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!g`O^sAr-gYUf9U%5FpYPD1E~r znW6O-pVnMUorN14B6AjmN43PT3i&*k^Ta#u-RplW3=domdKI;Vst E0O?*k9RL6T diff --git a/data/campaigns/Dead_Water/scenarios/01_Invasion.cfg b/data/campaigns/Dead_Water/scenarios/01_Invasion.cfg index 04735fb77a5..63df407f118 100644 --- a/data/campaigns/Dead_Water/scenarios/01_Invasion.cfg +++ b/data/campaigns/Dead_Water/scenarios/01_Invasion.cfg @@ -323,7 +323,7 @@ [/modifications] facing=se animate=yes - overlays=overlays/loyal-icon.png + {IS_LOYAL} profile=portraits/transparent/gwabbo.png [/unit] diff --git a/data/campaigns/Dead_Water/scenarios/02_Flight.cfg b/data/campaigns/Dead_Water/scenarios/02_Flight.cfg index 5448edb727d..41af4f8c6db 100644 --- a/data/campaigns/Dead_Water/scenarios/02_Flight.cfg +++ b/data/campaigns/Dead_Water/scenarios/02_Flight.cfg @@ -459,7 +459,7 @@ _f , _f , _f , _f , _f , _f side=1 x=$x1 y=$y1 - overlays=overlays/loyal-icon.png + {IS_LOYAL} [/unit] [if] @@ -556,7 +556,7 @@ _f , _f , _f , _f , _f , _f side=1 x=$x1 y=$y1 - overlays=overlays/loyal-icon.png + {IS_LOYAL} [/unit] [if] @@ -661,7 +661,7 @@ _f , _f , _f , _f , _f , _f side=1 x=$x1 y=$y1 - overlays=overlays/loyal-icon.png + {IS_LOYAL} [/unit] [message] diff --git a/data/campaigns/Dead_Water/scenarios/04_Slavers.cfg b/data/campaigns/Dead_Water/scenarios/04_Slavers.cfg index 944bc262aeb..e6caaed9bc3 100644 --- a/data/campaigns/Dead_Water/scenarios/04_Slavers.cfg +++ b/data/campaigns/Dead_Water/scenarios/04_Slavers.cfg @@ -354,7 +354,7 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - overlays=overlays/loyal-icon.png + {IS_LOYAL} [/unit] [message] @@ -645,7 +645,7 @@ {TRAIT_LOYAL} {TRAIT_INTELLIGENT} [/modifications] - overlays=overlays/loyal-icon.png + {IS_LOYAL} [/unit] [message] @@ -709,7 +709,7 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - overlays=overlays/loyal-icon.png + {IS_LOYAL} [/unit] [if] diff --git a/data/campaigns/Dead_Water/scenarios/06_Uncharted_Islands.cfg b/data/campaigns/Dead_Water/scenarios/06_Uncharted_Islands.cfg index 208399c488d..b9c3f726130 100644 --- a/data/campaigns/Dead_Water/scenarios/06_Uncharted_Islands.cfg +++ b/data/campaigns/Dead_Water/scenarios/06_Uncharted_Islands.cfg @@ -310,7 +310,7 @@ {TRAIT_LOYAL} {TRAIT_HEALTHY} [/modifications] - overlays=overlays/loyal-icon.png + {IS_LOYAL} animate=yes [/unit] [message] diff --git a/data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg b/data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg index b6608f4e115..520e59c8547 100644 --- a/data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg +++ b/data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg @@ -503,7 +503,7 @@ {TRAIT_LOYAL} {TRAIT_DEXTROUS} [/modifications] - overlays=overlays/loyal-icon.png + {IS_LOYAL} [/unit] [unit] type=Thug @@ -516,7 +516,7 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - overlays=overlays/loyal-icon.png + {IS_LOYAL} [/unit] [unit] type=Thug @@ -529,7 +529,7 @@ {TRAIT_LOYAL} {TRAIT_QUICK} [/modifications] - overlays=overlays/loyal-icon.png + {IS_LOYAL} [/unit] {CLEAR_VARIABLE Siddry_stored} diff --git a/data/campaigns/Dead_Water/scenarios/11_Getting_Help.cfg b/data/campaigns/Dead_Water/scenarios/11_Getting_Help.cfg index 530d0deeeaf..beb0bdea0e1 100644 --- a/data/campaigns/Dead_Water/scenarios/11_Getting_Help.cfg +++ b/data/campaigns/Dead_Water/scenarios/11_Getting_Help.cfg @@ -209,7 +209,7 @@ [unit_overlay] x=$Tyegea_stored.x y=$Tyegea_stored.y - image=overlays/loyal-icon.png + image=misc/loyal-icon.png [/unit_overlay] [clear_variable] name=Tyegea_stored @@ -241,7 +241,7 @@ [unit_overlay] x=$Cylanna_stored.x y=$Cylanna_stored.y - image=overlays/loyal-icon.png + image=misc/loyal-icon.png [/unit_overlay] [clear_variable] name=Cylanna_stored diff --git a/data/campaigns/Dead_Water/scenarios/12_Revenge.cfg b/data/campaigns/Dead_Water/scenarios/12_Revenge.cfg index ad1b4400d59..6e0fa97c1e1 100644 --- a/data/campaigns/Dead_Water/scenarios/12_Revenge.cfg +++ b/data/campaigns/Dead_Water/scenarios/12_Revenge.cfg @@ -501,7 +501,7 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - overlays=overlays/loyal-icon.png + {IS_LOYAL} [/unit] [unit] side=1 @@ -514,7 +514,7 @@ {TRAIT_INTELLIGENT} [/modifications] experience=10 - overlays=overlays/loyal-icon.png + {IS_LOYAL} [/unit] [unit] side=1 @@ -527,7 +527,7 @@ {TRAIT_STRONG} [/modifications] experience=32 - overlays=overlays/loyal-icon.png + {IS_LOYAL} [/unit] [message] speaker=Nebthun