1.18 - Sprite updates to Ravens and Ants (#8089)

* fix raven SE sprite wings

* revisions to fire ant sprites to make more distinct from each other

* fix flame positioning

* minor soldier ant sprite update

* add IPF arg to MISSILE_FRAME_FIRE_BREATH for use in fire ants

* update copyrights.csv

copyrights.csv

@@ -1,9 +1,20 @@
 Date,File,License,Author - Real Name(other name);Real Name(other name);etc,Notes,Needs Update,MD5
-2016/03/06,data/core/images/terrain/cave/earthy-wall-rough-chasm-concave-tr.png,GNU GPL v2+,J.W. Bjerk(Eleazar);(doofus-01),,,e0eaa3635085e92a91fbd606a6ae0c76
-2016/03/06,data/core/images/terrain/cave/earthy-wall-rough-chasm-convex-bl.png,GNU GPL v2+,J.W. Bjerk(Eleazar);(doofus-01),,,e8f6c7756374d6ceace61dd42e73f915
-2016/03/06,data/core/images/terrain/cave/wall-rough-chasm-concave-tr.png,GNU GPL v2+,unknown;(doofus-01),,,5282852d646ce25a2580573b3b040c10
-2016/03/06,data/core/images/terrain/cave/wall-rough-chasm-convex-bl.png,GNU GPL v2+,unknown;(doofus-01),,,52c32eb0fb530ede080185b1a327b2f2
-2016/03/06,data/core/images/terrain/cave/wall-rough-chasm-convex-br.png,GNU GPL v2+,unknown;(doofus-01),,,1bb8f808c1fe3622a9589dc73103dd46
+2023/12/09,data/core/images/units/monsters/ant/fire-ant-defend1.png,CC BY-SA 4.0,(doofus-01),,,d6339f75b5254c2b3691204805e03da0
+2023/12/09,data/core/images/units/monsters/ant/fire-ant-defend2.png,CC BY-SA 4.0,(doofus-01),,,c5e810856ce34b1f0c90a1fd16d60315
+2023/12/09,data/core/images/units/monsters/ant/fire-ant.png,CC BY-SA 4.0,(doofus-01),,,ce7b9a2caf7fa0dd0497f66b9529fe26
+2023/12/10,data/core/images/units/monsters/ant/fire-queen-defend1.png,CC BY-SA 4.0,(doofus-01),,,03a501d183d124d0700a1e2f6321ce2e
+2023/12/10,data/core/images/units/monsters/ant/fire-queen-defend2.png,CC BY-SA 4.0,(doofus-01),,,7ab60674e404847368ffed8f147ff1cc
+2023/12/09,data/core/images/units/monsters/ant/fire-queen.png,CC BY-SA 4.0,(doofus-01),,,38515e245501449778ca4770e42d9315
+2023/12/09,data/core/images/units/monsters/ant/firebane-ant-defend1.png,CC BY-SA 4.0,(doofus-01),,,896a29f059d240400734833c655d5095
+2023/12/09,data/core/images/units/monsters/ant/firebane-ant-defend2.png,CC BY-SA 4.0,(doofus-01),,,4f0161bf368cd582f5e3b49abed3eedb
+2023/12/09,data/core/images/units/monsters/ant/firebane-ant.png,CC BY-SA 4.0,(doofus-01),,,3696d917ca4e534cdf6cc97c89375f35
+2023/12/09,data/core/images/units/monsters/ant/firebomb-ant-defend1.png,CC BY-SA 4.0,(doofus-01),,,06414f1b2c715a82b338b33673bebd2a
+2023/12/09,data/core/images/units/monsters/ant/firebomb-ant-defend2.png,CC BY-SA 4.0,(doofus-01),,,171bebeca859ce0f42c3e3e2c67d6021
+2023/12/09,data/core/images/units/monsters/ant/firebomb-ant.png,CC BY-SA 4.0,(doofus-01),,,af87a1dd619020085b01de34970ed67b
+2023/12/09,data/core/images/units/monsters/ant/soldier-defend.png,CC BY-SA 4.0,(doofus-01),,,a557340b46f8011e3adc17d3f023870e
+2023/12/09,data/core/images/units/monsters/ant/soldier.png,CC BY-SA 4.0,(doofus-01),,,da128c61863e44efcb9750f51d5a602d
+2023/12/03,data/core/images/units/monsters/raven/raven-soar.png,CC BY-SA 4.0,(doofus-01),,,67f260a70ea0139b2bdc5d693c619eaf
+2023/12/03,data/core/images/units/monsters/raven/raven.png,CC BY-SA 4.0,(doofus-01),,,baeb6003203eef308afde9db2db5431a
 2013/06/09,attic/character-box.png,GNU GPL v2+,Jordà Polo(ettin),,,077f1c18956286b064986790287ed9e6
 2011/03/11,attic/clasher-attack-mace.png,GNU GPL v2+,unknown,,,5d80af2990022162b7e09bd2a6c2af31
 2008/02/11,attic/credit-map.jpg,GNU GPL v2+,unknown,,,64ee878b38eb7b46e9fc9449bc95ae64
@@ -5398,6 +5409,8 @@ Date,File,License,Author - Real Name(other name);Real Name(other name);etc,Notes
 2016/03/06,data/core/images/terrain/cave/earthy-wall-rough-chasm-concave-l.png,GNU GPL v2+,J.W. Bjerk(Eleazar),,,dd4d5a284ab9f3d3a19018a244fceff2
 2016/03/06,data/core/images/terrain/cave/earthy-wall-rough-chasm-concave-r.png,GNU GPL v2+,J.W. Bjerk(Eleazar),,,46fb3fc314d1c92f0a8586d7a1c0946f
 2016/03/06,data/core/images/terrain/cave/earthy-wall-rough-chasm-concave-tl.png,GNU GPL v2+,J.W. Bjerk(Eleazar),,,6e96c7f238df0b26c42dfc11a47f7d8e
+2016/03/06,data/core/images/terrain/cave/earthy-wall-rough-chasm-concave-tr.png,GNU GPL v2+,J.W. Bjerk(Eleazar);(doofus-01),,,e0eaa3635085e92a91fbd606a6ae0c76
+2016/03/06,data/core/images/terrain/cave/earthy-wall-rough-chasm-convex-bl.png,GNU GPL v2+,J.W. Bjerk(Eleazar);(doofus-01),,,e8f6c7756374d6ceace61dd42e73f915
 2016/03/06,data/core/images/terrain/cave/earthy-wall-rough-chasm-convex-br.png,GNU GPL v2+,J.W. Bjerk(Eleazar),,,bd2297512ac73023d37b9f256cb131c0
 2016/03/06,data/core/images/terrain/cave/earthy-wall-rough-chasm-convex-l.png,GNU GPL v2+,J.W. Bjerk(Eleazar),,,9c5737e2549773e1c89052fb17bb83c5
 2016/03/06,data/core/images/terrain/cave/earthy-wall-rough-chasm-convex-r.png,GNU GPL v2+,J.W. Bjerk(Eleazar),,,c25987af246e7d4cf82dfcfbfee2bbed
@@ -5474,6 +5487,9 @@ Date,File,License,Author - Real Name(other name);Real Name(other name);etc,Notes
 2016/03/06,data/core/images/terrain/cave/wall-rough-chasm-concave-l.png,GNU GPL v2+,unknown,,,b5b48400e7984d82847f700ad86ec4ff
 2016/03/06,data/core/images/terrain/cave/wall-rough-chasm-concave-r.png,GNU GPL v2+,unknown,,,4d0f2c29de7279935f73fdf522765eaf
 2016/03/06,data/core/images/terrain/cave/wall-rough-chasm-concave-tl.png,GNU GPL v2+,unknown,,,8900939ad6c83db95c27c8c0576ea48a
+2016/03/06,data/core/images/terrain/cave/wall-rough-chasm-concave-tr.png,GNU GPL v2+,unknown;(doofus-01),,,5282852d646ce25a2580573b3b040c10
+2016/03/06,data/core/images/terrain/cave/wall-rough-chasm-convex-bl.png,GNU GPL v2+,unknown;(doofus-01),,,52c32eb0fb530ede080185b1a327b2f2
+2016/03/06,data/core/images/terrain/cave/wall-rough-chasm-convex-br.png,GNU GPL v2+,unknown;(doofus-01),,,1bb8f808c1fe3622a9589dc73103dd46
 2016/03/06,data/core/images/terrain/cave/wall-rough-chasm-convex-l.png,GNU GPL v2+,unknown,,,d7e53d9fbcd026d84eadb46a31658e64
 2016/03/06,data/core/images/terrain/cave/wall-rough-chasm-convex-r.png,GNU GPL v2+,unknown,,,19da91d5268f5657faccb4cd1635e61e
 2016/03/06,data/core/images/terrain/cave/wall-rough-chasm-convex-tl.png,GNU GPL v2+,unknown,,,45c1c36578460dbaf6db2ac5a3f8e1e8
@@ -13052,8 +13068,6 @@ Date,File,License,Author - Real Name(other name);Real Name(other name);etc,Notes
 2022/12/31,data/core/images/units/monsters/ant/ant.png,GNU GPL v2+,unknown;(doofus-01),,,3716ea2996129bbaef4f7f82277790db
 2023/09/10,data/core/images/units/monsters/ant/ant_egg.png,CC BY-SA 4.0,(doofus-01),,,819a6bf32bfd48de9f6a7faa67d80e71
 2023/09/10,data/core/images/units/monsters/ant/ant_red-egg.png,CC BY-SA 4.0,(doofus-01),,,5a08a7c1c930c3bfc593131c718c1f57
-2020/09/20,data/core/images/units/monsters/ant/fire-ant-defend1.png,CC BY-SA 4.0,(doofus-01),,,5cbaafe9f7dc841cf768345c387b4499
-2020/09/20,data/core/images/units/monsters/ant/fire-ant-defend2.png,CC BY-SA 4.0,(doofus-01),,,cd2c1cb0d48449b5b3648572432cc2ef
 2020/09/20,data/core/images/units/monsters/ant/fire-ant-flame1.png,CC BY-SA 4.0,(doofus-01),,,3517546dba8a498d49bc1fb8ef8bd6a2
 2020/09/20,data/core/images/units/monsters/ant/fire-ant-flame10.png,CC BY-SA 4.0,(doofus-01),,,6ca25b0c9f717cf0296e2e1fc789b214
 2020/09/20,data/core/images/units/monsters/ant/fire-ant-flame11.png,CC BY-SA 4.0,(doofus-01),,,863fff96e357e802626cff0cc688544d
@@ -13067,24 +13081,12 @@ Date,File,License,Author - Real Name(other name);Real Name(other name);etc,Notes
 2020/09/20,data/core/images/units/monsters/ant/fire-ant-flame8.png,CC BY-SA 4.0,(doofus-01),,,72d515228e626e58d33fa6ea05457a15
 2020/09/20,data/core/images/units/monsters/ant/fire-ant-flame9.png,CC BY-SA 4.0,(doofus-01),,,e17e4c85a67df02e10e76aa1aefc7f7b
 2020/09/20,data/core/images/units/monsters/ant/fire-ant-glow.png,CC BY-SA 4.0,(doofus-01),,,b17bb2146be7b6e573e51ea0a7db93f7
-2022/12/31,data/core/images/units/monsters/ant/fire-ant.png,CC BY-SA 4.0,(doofus-01),,,1402a23259367b3eff95f39f27a1c3da
-2023/09/10,data/core/images/units/monsters/ant/fire-queen-defend1.png,CC BY-SA 4.0,(doofus-01),,,b419f91f14bfd88639b84b25b44cae99
-2023/09/10,data/core/images/units/monsters/ant/fire-queen-defend2.png,CC BY-SA 4.0,(doofus-01),,,5d775e8b2046b3b8146ccb7f325d4af9
-2023/09/10,data/core/images/units/monsters/ant/fire-queen.png,CC BY-SA 4.0,(doofus-01),,,1bed1e84a44bfa63ab869e093ae48133
-2022/12/31,data/core/images/units/monsters/ant/firebane-ant-defend1.png,CC BY-SA 4.0,(doofus-01),,,f184e4562bea4239618c4cae9df7e3a0
-2022/12/31,data/core/images/units/monsters/ant/firebane-ant-defend2.png,CC BY-SA 4.0,(doofus-01),,,47dcd4b29eca28b7a7205dbf3d23ff85
-2022/12/31,data/core/images/units/monsters/ant/firebane-ant.png,CC BY-SA 4.0,(doofus-01),,,34c388dc78732826bfd9449f91ca92e5
-2022/12/31,data/core/images/units/monsters/ant/firebomb-ant-defend1.png,CC BY-SA 4.0,(doofus-01),,,f6f11b76b0841b063caf54a3bb945d87
-2022/12/31,data/core/images/units/monsters/ant/firebomb-ant-defend2.png,CC BY-SA 4.0,(doofus-01),,,0c39deeaa14fa41aa9779f2d663316fe
-2022/12/31,data/core/images/units/monsters/ant/firebomb-ant.png,CC BY-SA 4.0,(doofus-01),,,82b2c4698b6986cc67beb025ccd5abf2
 2023/09/10,data/core/images/units/monsters/ant/queen-attack1.png,CC BY-SA 4.0,(doofus-01),,,a82082d2c16d3b1756fe9594922c6f91
 2023/09/10,data/core/images/units/monsters/ant/queen-attack2.png,CC BY-SA 4.0,(doofus-01),,,3c664898aba1e58ae130287aaf3e27aa
 2023/09/10,data/core/images/units/monsters/ant/queen-defend.png,CC BY-SA 4.0,(doofus-01),,,45346ad04568fd233b5d5b4ee094f92f
 2023/09/10,data/core/images/units/monsters/ant/queen-defend2.png,CC BY-SA 4.0,(doofus-01),,,ac61e7194d334e5dadc98ca786884d52
 2023/09/10,data/core/images/units/monsters/ant/queen.png,CC BY-SA 4.0,(doofus-01),,,a9a3a80998b5290bfffd4852cb8c1022
 2023/08/13,data/core/images/units/monsters/ant/soldier-attack.png,CC BY-SA 4.0,(doofus-01),,,e9ceec06b7fb29882e79393ada343e14
-2023/08/13,data/core/images/units/monsters/ant/soldier-defend.png,CC BY-SA 4.0,(doofus-01),,,1fb82eece49a54594fc6e80a2f828d3d
-2023/08/13,data/core/images/units/monsters/ant/soldier.png,CC BY-SA 4.0,(doofus-01),,,fa4b66f1f986eabb02d82d3e4d785e27
 2020/09/20,data/core/images/units/monsters/bear/bear-2claws1.png,CC BY-SA 4.0,(doofus-01),,,553c7409cca794f50fbb08ed0af77ff9
 2020/09/20,data/core/images/units/monsters/bear/bear-2claws2.png,CC BY-SA 4.0,(doofus-01),,,a58a4a39f6107214ee07e75227c29d0a
 2020/09/20,data/core/images/units/monsters/bear/bear-2claws3.png,CC BY-SA 4.0,(doofus-01),,,a6cdb32889e5310fbe3b6cd229df1750
@@ -13522,8 +13524,6 @@ Date,File,License,Author - Real Name(other name);Real Name(other name);etc,Notes
 2023/09/30,data/core/images/units/monsters/raven/raven-hit2.png,CC BY-SA 4.0,(doofus-01),,,87a9a9d2312e6fb83ac2edc8743f60e3
 2023/09/30,data/core/images/units/monsters/raven/raven-ne.png,CC BY-SA 4.0,(doofus-01),,,2efea2a5dfc9fca266533093fa0cf696
 2023/09/30,data/core/images/units/monsters/raven/raven-shadow.png,CC BY-SA 4.0,(doofus-01),,,f60be5ce6f5f2fffaf5fb5e4ef0fdf85
-2023/09/30,data/core/images/units/monsters/raven/raven-soar.png,CC BY-SA 4.0,(doofus-01),,,5d39f00b8045eda042b9e5cfe54e3cfb
-2023/09/30,data/core/images/units/monsters/raven/raven.png,CC BY-SA 4.0,(doofus-01),,,3ce63deb17b1a7a48327f3c986cc00ef
 2023/09/30,data/core/images/units/monsters/roc-attack.png,CC BY-SA 4.0,(doofus-01),,,a86807ef6baa1f5cba8e01ee912276cd
 2023/09/30,data/core/images/units/monsters/roc-defend1.png,CC BY-SA 4.0,(doofus-01),,,df5b1462888535d3be9dc3c6fa5643d1
 2023/09/30,data/core/images/units/monsters/roc-defend2.png,CC BY-SA 4.0,(doofus-01),,,da6530cd2ba1111e35f972453a104962

data/core/macros/animation-utils.cfg

@@ -310,6 +310,8 @@
 
 #define MISSILE_FRAME_FIRE_BREATH N_OFFSET_POSITION S_OFFSET_POSITION N_DIAGONAL_OFFSET_POSITION S_DIAGONAL_OFFSET_POSITION
     # Animate a projectile for a fire-breath attack.
+#arg IPF
+#endarg
 
     missile_start_time=-400
 
@@ -317,7 +319,7 @@
         direction=n
 
         [missile_frame]
-            halo=projectiles/fire-breath-n-[1~5].png:80
+            halo=projectiles/fire-breath-n-[1~5].png{IPF}:80
             halo_x,halo_y={N_OFFSET_POSITION}
         [/missile_frame]
     [/if]
@@ -325,7 +327,7 @@
         direction=s
 
         [missile_frame]
-            halo=projectiles/fire-breath-s-[1~5].png:80
+            halo=projectiles/fire-breath-s-[1~5].png{IPF}:80
             halo_x,halo_y={S_OFFSET_POSITION}
         [/missile_frame]
     [/else]
@@ -333,7 +335,7 @@
         direction=ne,nw
 
         [missile_frame]
-            halo=projectiles/fire-breath-ne-[1~5].png:80
+            halo=projectiles/fire-breath-ne-[1~5].png{IPF}:80
             halo_x,halo_y={N_DIAGONAL_OFFSET_POSITION}
         [/missile_frame]
     [/else]
@@ -341,7 +343,7 @@
         direction=se,sw
 
         [missile_frame]
-            halo=projectiles/fire-breath-se-[1~5].png:80
+            halo=projectiles/fire-breath-se-[1~5].png{IPF}:80
             halo_x,halo_y={S_DIAGONAL_OFFSET_POSITION}
         [/missile_frame]
     [/else]

data/core/units/monsters/Ant_Fire.cfg

@@ -4,7 +4,7 @@
 units/monsters/ant/#enddef
 
 #define STATIC_IMAGE_TEMP
-{PATH_TEMP}fire-ant.png~BLIT({PATH_TEMP}fire-ant-glow.png,0,0)#enddef
+{PATH_TEMP}fire-ant.png~BLIT({PATH_TEMP}fire-ant-glow.png~CROP(15,12,14,18),18,16)#enddef
 
 [unit_type]
     id=Fire Ant
@@ -27,6 +27,8 @@ units/monsters/ant/#enddef
             image={PATH_TEMP}fire-ant-flame[1~12].png:[80*12]
             auto_vflip=no
             layer=11
+            directional_x=3
+            halo_x,halo_y=4,1
         [/flame_frame]
         [frame]
             image={PATH_TEMP}fire-ant.png:960
@@ -97,7 +99,7 @@ units/monsters/ant/#enddef
             name=fire
         [/filter_attack]
         start_time=-100
-        {MISSILE_FRAME_FIRE_BREATH (0,-4~-36) (0,4~36) (12~36,-4~-36) (12~36,4~36)}
+        {MISSILE_FRAME_FIRE_BREATH (0,4~-32) (0,-4~32) (0~24,4~-32) (0~24,-4~32) IPF="~SCALE_INTO_SHARP(42,42)"}
         [frame]
             image={PATH_TEMP}fire-ant.png:200
         [/frame]

data/core/units/monsters/Ant_Fire_Queen.cfg

@@ -4,7 +4,7 @@
 units/monsters/ant/#enddef
 
 #define STATIC_IMAGE_TEMP
-{PATH_TEMP}fire-queen.png~BLIT({PATH_TEMP}fire-ant-glow.png,0,0)#enddef
+{PATH_TEMP}fire-queen.png~BLIT({PATH_TEMP}fire-ant-glow.png~CROP(15,12,14,18),7,13)#enddef
 
 [unit_type]
     id=Fire Ant Queen
@@ -25,6 +25,8 @@ units/monsters/ant/#enddef
         [flame_frame]
             halo={PATH_TEMP}fire-ant-glow.png~O(0.7):960
             image={PATH_TEMP}fire-ant-flame[1~12].png:[80*12]
+            directional_x=-7
+            halo_x=-7
             auto_vflip=no
             layer=11
         [/flame_frame]
@@ -107,7 +109,7 @@ units/monsters/ant/#enddef
             name=fire
         [/filter_attack]
         start_time=-100
-        {MISSILE_FRAME_FIRE_BREATH (0,-4~-36) (0,4~36) (12~36,-4~-36) (12~36,4~36)}
+        {MISSILE_FRAME_FIRE_BREATH (0,4~-32) (0,-4~32) (0~24,4~-32) (0~24,-4~32) IPF="~SCALE_INTO_SHARP(72,72)"}
         [frame]
             image={PATH_TEMP}fire-queen.png:200
         [/frame]

data/core/units/monsters/Ant_Firebane.cfg

@@ -4,7 +4,7 @@
 units/monsters/ant/#enddef
 
 #define STATIC_IMAGE_TEMP
-{PATH_TEMP}firebane-ant.png~BLIT({PATH_TEMP}fire-ant-glow.png,0,0)#enddef
+{PATH_TEMP}firebane-ant.png~BLIT({PATH_TEMP}fire-ant-glow.png~CROP(15,12,14,18),14,15)#enddef
 
 [unit_type]
     id=Firebane Ant
@@ -98,7 +98,7 @@ units/monsters/ant/#enddef
             name=fire
         [/filter_attack]
         start_time=-100
-        {MISSILE_FRAME_FIRE_BREATH (0,-4~-36) (0,4~36) (12~36,-4~-36) (12~36,4~36)}
+        {MISSILE_FRAME_FIRE_BREATH (0,4~-32) (0,-4~32) (0~24,4~-32) (0~24,-4~32) IPF="~SCALE_INTO_SHARP(60,60)"}
         [frame]
             image={PATH_TEMP}firebane-ant.png:200
         [/frame]

data/core/units/monsters/Ant_Firebomb.cfg

@@ -24,6 +24,8 @@ units/monsters/ant/#enddef
         [flame_frame]
             halo={PATH_TEMP}fire-ant-glow.png~O(0.7):960
             image={PATH_TEMP}fire-ant-flame[1~12].png:[80*12]
+            halo_x,halo_y=-2,-1
+            directional_x=-2
             auto_vflip=no
             layer=11
         [/flame_frame]
@@ -103,7 +105,7 @@ units/monsters/ant/#enddef
             name=fire
         [/filter_attack]
         start_time=-100
-        {MISSILE_FRAME_FIRE_BREATH (0,-4~-36) (0,4~36) (12~36,-4~-36) (12~36,4~36)}
+        {MISSILE_FRAME_FIRE_BREATH (0,4~-32) (0,-4~32) (0~24,4~-32) (0~24,-4~32) IPF="~SCALE_INTO_SHARP(60,60)"}
         [frame]
             image={PATH_TEMP}firebomb-ant.png:200
         [/frame]