From 2a57b19f936b64561cd97f8b8563df17fab1e3ec Mon Sep 17 00:00:00 2001 From: doofus-01 <13510196+doofus-01@users.noreply.github.com> Date: Mon, 23 Dec 2024 20:13:06 -0800 Subject: [PATCH] race=transport to race=ship --- data/core/units.cfg | 2 +- data/core/units/boats/Derelict_Galleon.cfg | 2 +- data/core/units/boats/Fireship.cfg | 32 ++++++++++++++++++++- data/core/units/boats/Pirate_Galleon.cfg | 2 +- data/core/units/boats/Transport_Galleon.cfg | 2 +- 5 files changed, 35 insertions(+), 5 deletions(-) diff --git a/data/core/units.cfg b/data/core/units.cfg index 54cc139ce3337..c95d174241ead 100644 --- a/data/core/units.cfg +++ b/data/core/units.cfg @@ -289,7 +289,7 @@ Saurians live spectacularly short lives by comparison to most of the other races [/race] [race] - id=transport + id=ship help_taxonomy=mechanical name= _ "race^Ship" plural_name= _ "race+plural^Ships" diff --git a/data/core/units/boats/Derelict_Galleon.cfg b/data/core/units/boats/Derelict_Galleon.cfg index d8f4c62dbc85e..b4378f4f54cd3 100644 --- a/data/core/units/boats/Derelict_Galleon.cfg +++ b/data/core/units/boats/Derelict_Galleon.cfg @@ -2,7 +2,7 @@ [unit_type] id=Derelict Hulk name= _ "Derelict Hulk" - race=transport + race=ship profile="portraits/transport/derelict-hulk.webp" image="units/transport/derelict-galleon.png" hitpoints=24 diff --git a/data/core/units/boats/Fireship.cfg b/data/core/units/boats/Fireship.cfg index c633c64257376..46ac320db87cf 100644 --- a/data/core/units/boats/Fireship.cfg +++ b/data/core/units/boats/Fireship.cfg @@ -2,7 +2,7 @@ [unit_type] id=Fireship name= _ "Fireship" - race=transport + race=ship image="halo/transport/fireship-back-glow.png~BLIT(units/transport/fireship.png)~BLIT(units/transport/flames/fireship-2.png)" profile="portraits/transport/fireship.webp" hitpoints=12 @@ -48,6 +48,36 @@ layer=42 [/flames_frame] [/standing_anim] + [standing_anim] + start_time=0 + terrain_type=S*,*^V* + boat_start_time=0 + boat_y=-1:250,-1~0:490,0:250,0~-1:490 + flames_start_time=0 + flames_y=-1:250,-1~0:490,0:250,0~-1:490 + flames_directional_x=1:350,0:390,-1:350,0:390 + [frame] + image="halo/transport/fireship-back-glow.png:1480" + layer=9 + [/frame] + [boat_frame] + image="units/transport/fireship-[port,mid,starboard,mid].png:[350,390,350,390]" + auto_vflip=no + image_mod=~MASK(units/transport/pirate-galleon-mask.png) + primary=yes + layer=40 + [/boat_frame] + [fire_frame] + image="units/transport/fireship-back-fire[1,2,1,2,1,2,1,2].png:[185*8]" + auto_vflip=no + layer=41 + [/fire_frame] + [flames_frame] + image="units/transport/flames/fireship-[1~9,1~9].png:[82*10,86,82*7]" + auto_vflip=no + layer=42 + [/flames_frame] + [/standing_anim] [movement_anim] start_time=0 boat_start_time=0 diff --git a/data/core/units/boats/Pirate_Galleon.cfg b/data/core/units/boats/Pirate_Galleon.cfg index 84e78dee4fad5..f58860b250d96 100644 --- a/data/core/units/boats/Pirate_Galleon.cfg +++ b/data/core/units/boats/Pirate_Galleon.cfg @@ -2,7 +2,7 @@ [unit_type] id=Pirate Galleon name= _ "Pirate Galleon" - race=transport + race=ship image="units/transport/pirate-galleon.png" # ideally, we have "crew" that make sense for dialogs, and "mechanical" that depicts the transport # but for now, we just have "crew" diff --git a/data/core/units/boats/Transport_Galleon.cfg b/data/core/units/boats/Transport_Galleon.cfg index 687a8f5f7d0f3..0066fae783966 100644 --- a/data/core/units/boats/Transport_Galleon.cfg +++ b/data/core/units/boats/Transport_Galleon.cfg @@ -2,7 +2,7 @@ [unit_type] id=Transport Galleon name= _ "Transport Galleon" - race=transport + race=ship image="units/transport/transport-galleon.png" # ideally, we have "crew" that make sense for dialogs, and "mechanical" that depicts the transport # but for now, we just have "crew"