Skip to content

Commit

Permalink
Further optimisation of monument construction assets
Browse files Browse the repository at this point in the history
  • Loading branch information
@Areldir
Areldir committed Mar 17, 2024
1 parent 41e3ccf commit 077f899
Show file tree
Hide file tree
Showing 35 changed files with 147 additions and 146 deletions.
Binary file added res/assets/Graphics/Construction/5x5_Construction_Borders.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 ...ment/Circus_Construction_01_Back_Part.png → ...tion/Circus_Construction_01_Back_Part.png
View file
File renamed without changes
0 ...ent/Circus_Construction_01_Front_Part.png → ...ion/Circus_Construction_01_Front_Part.png
View file
File renamed without changes
0 ...nt/Circus_Construction_01_Middle_Part.png → ...on/Circus_Construction_01_Middle_Part.png
View file
File renamed without changes
0 ...nt/Circus_Construction_01_R_Back_Part.png → ...on/Circus_Construction_01_R_Back_Part.png
View file
File renamed without changes
0 ...t/Circus_Construction_01_R_Front_Part.png → ...n/Circus_Construction_01_R_Front_Part.png
View file
File renamed without changes
0 .../Circus_Construction_01_R_Middle_Part.png → .../Circus_Construction_01_R_Middle_Part.png
View file
File renamed without changes
0 ...ment/Circus_Construction_02_Back_Part.png → ...tion/Circus_Construction_02_Back_Part.png
View file
File renamed without changes
0 ...ent/Circus_Construction_02_Front_Part.png → ...ion/Circus_Construction_02_Front_Part.png
View file
File renamed without changes
0 ...nt/Circus_Construction_02_Middle_Part.png → ...on/Circus_Construction_02_Middle_Part.png
View file
File renamed without changes
0 ...nt/Circus_Construction_02_R_Back_Part.png → ...on/Circus_Construction_02_R_Back_Part.png
View file
File renamed without changes
0 ...t/Circus_Construction_02_R_Front_Part.png → ...n/Circus_Construction_02_R_Front_Part.png
View file
File renamed without changes
0 .../Circus_Construction_02_R_Middle_Part.png → .../Circus_Construction_02_R_Middle_Part.png
View file
File renamed without changes
0 ...ment/Circus_Construction_03_Back_Part.png → ...tion/Circus_Construction_03_Back_Part.png
View file
File renamed without changes
0 ...ent/Circus_Construction_03_Front_Part.png → ...ion/Circus_Construction_03_Front_Part.png
View file
File renamed without changes
0 ...nt/Circus_Construction_03_Middle_Part.png → ...on/Circus_Construction_03_Middle_Part.png
View file
File renamed without changes
0 ...nt/Circus_Construction_03_R_Back_Part.png → ...on/Circus_Construction_03_R_Back_Part.png
View file
File renamed without changes
0 ...t/Circus_Construction_03_R_Front_Part.png → ...n/Circus_Construction_03_R_Front_Part.png
View file
File renamed without changes
0 .../Circus_Construction_03_R_Middle_Part.png → .../Circus_Construction_03_R_Middle_Part.png
View file
File renamed without changes
0 ...ment/Circus_Construction_04_Back_Part.png → ...tion/Circus_Construction_04_Back_Part.png
View file
File renamed without changes
0 ...ent/Circus_Construction_04_Front_Part.png → ...ion/Circus_Construction_04_Front_Part.png
View file
File renamed without changes
0 ...nt/Circus_Construction_04_Middle_Part.png → ...on/Circus_Construction_04_Middle_Part.png
View file
File renamed without changes
0 ...nt/Circus_Construction_04_R_Back_Part.png → ...on/Circus_Construction_04_R_Back_Part.png
View file
File renamed without changes
0 ...t/Circus_Construction_04_R_Front_Part.png → ...n/Circus_Construction_04_R_Front_Part.png
View file
File renamed without changes
0 .../Circus_Construction_04_R_Middle_Part.png → .../Circus_Construction_04_R_Middle_Part.png
View file
File renamed without changes
Binary file added res/assets/Graphics/Construction/Colosseum_Construction_01.png
View file
0 ...nment/Colosseum_Construction_Phase_02.png → ...onstruction/Colosseum_Construction_02.png
View file
File renamed without changes
0 ...nment/Colosseum_Construction_Phase_03.png → ...onstruction/Colosseum_Construction_03.png
View file
File renamed without changes
0 ...nment/Colosseum_Construction_Phase_04.png → ...onstruction/Colosseum_Construction_04.png
View file
File renamed without changes
Binary file removed res/assets/Graphics/Entertainment/Colosseum_Construction_Phase_01.png
View file
Diff not rendered.
Binary file removed res/assets/Graphics/Entertainment/Construction_Base_5x5.png
View file
Diff not rendered.
138 changes: 138 additions & 0 deletions res/assets/Graphics/construction.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,144 @@
<layer src="4x4_Construction_Borders" x="0" y="9"/>
<layer src="Great_Library_Construction_01" x="0" y="0"/>
</image>
<!-- Note: Entertainment Monument/s -->
<!-- Note: Circus 0% construction phases -->
<image id="Circus NESW 01" width="298" height="159" isometric="true">
<layer group="this" image="5x5_Construction_Footprint" x="0" y="9"/>
<layer src="Circus_Construction_01_Back_Part" x="0" y="0"/>
</image>
<image id="Circus NWSE 01" width="298" height="159" isometric="true">
<layer group="this" image="5x5_Construction_Footprint" x="0" y="9"/>
<layer src="Circus_Construction_01_R_Back_Part" x="0" y="0"/>
</image>
<image id="Circus NESW 02" isometric="true">
<layer group="this" image="5x5_Construction_Footprint" x="0" y="0"/>
<layer src="Circus_Construction_01_Middle_Part" x="0" y="0"/>
</image>
<image id="Circus NWSE 02" isometric="true">
<layer group="this" image="5x5_Construction_Footprint" x="0" y="0"/>
<layer src="Circus_Construction_01_R_Middle_Part" x="0" y="0"/>
</image>
<image id="Circus NESW 03" isometric="true">
<layer group="this" image="5x5_Construction_Footprint" x="0" y="0"/>
<layer src="Circus_Construction_01_Front_Part" x="0" y="0"/>
</image>
<image id="Circus NWSE 03" isometric="true">
<layer group="this" image="5x5_Construction_Footprint" x="0" y="0"/>
<layer src="Circus_Construction_01_R_Front_Part" x="0" y="0"/>
</image>
<!-- Note: Circus 25% construction phases -->
<image id="Circus NESW 13" width="298" height="156" isometric="true">
<layer group="213" image="0" part="footprint" x="0" y="-79"/>
<layer src="Circus_Construction_02_Back_Part"/>
</image>
<image id="Circus NWSE 13" width="298" height="155" isometric="true">
<layer group="214" image="0" part="footprint" x="0" y="-79"/>
<layer src="Circus_Construction_02_R_Back_Part"/>
</image>
<image id="Circus NESW 12" width="298" height="150" isometric="true">
<layer group="213" image="2" part="footprint" x="0" y="-31"/>
<layer src="Circus_Construction_02_Middle_Part"/>
</image>
<image id="Circus NWSE 12" width="298" height="150" isometric="true">
<layer group="214" image="2" part="footprint" x="0" y="-31"/>
<layer src="Circus_Construction_02_R_Middle_Part"/>
</image>
<image id="Circus NESW 11" width="298" height="150" isometric="true">
<layer group="213" image="4" part="footprint" x="0" y="-31"/>
<layer src="Circus_Construction_02_Front_Part"/>
</image>
<image id="Circus NWSE 11" width="298" height="150" isometric="true">
<layer group="214" image="4" part="footprint" x="0" y="-32"/>
<layer src="Circus_Construction_02_R_Front_Part"/>
</image>
<!-- Note: Circus 50% construction phases -->
<image id="Circus NESW 23" width="298" height="179" isometric="true">
<layer group="213" image="0" part="footprint" x="0" y="-56"/>
<layer src="Circus_Construction_03_Back_Part"/>
</image>
<image id="Circus NWSE 23" width="298" height="178" isometric="true">
<layer group="214" image="0" part="footprint" x="0" y="-56"/>
<layer src="Circus_Construction_03_R_Back_Part"/>
</image>
<image id="Circus NESW 22" width="298" height="164" isometric="true">
<layer group="213" image="2" part="footprint" x="0" y="-17"/>
<layer src="Circus_Construction_03_Middle_Part"/>
</image>
<image id="Circus NWSE 22" width="298" height="164" isometric="true">
<layer group="214" image="2" part="footprint" x="0" y="-17"/>
<layer src="Circus_Construction_03_R_Middle_Part"/>
</image>
<image id="Circus NESW 21" width="298" height="165" isometric="true">
<layer group="213" image="4" part="footprint" x="0" y="-16"/>
<layer src="Circus_Construction_03_Front_Part"/>
</image>
<image id="Circus NWSE 21" width="298" height="165" isometric="true">
<layer group="214" image="4" part="footprint" x="0" y="-17"/>
<layer src="Circus_Construction_03_R_Front_Part"/>
</image>
<!-- Note: Circus 75% construction phases -->
<image id="Circus NESW 33" width="298" height="210" isometric="true">
<layer group="213" image="0" part="footprint" x="0" y="-25"/>
<layer src="Circus_Construction_04_Back_Part"/>
</image>
<image id="Circus NWSE 33" width="298" height="208" isometric="true">
<layer group="214" image="0" part="footprint" x="0" y="-26"/>
<layer src="Circus_Construction_04_R_Back_Part"/>
</image>
<image id="Circus NESW 32" width="298" height="181" isometric="true">
<layer group="213" image="2" x="0" y="0"/>
<layer src="Circus_Construction_04_Middle_Part" y="2"/>
</image>
<image id="Circus NWSE 32" width="298" height="181" isometric="true">
<layer group="214" image="2" part="footprint" x="0" y="0"/>
<layer src="Circus_Construction_04_R_Middle_Part"/>
</image>
<image id="Circus NESW 31" width="298" height="181" isometric="true">
<layer group="213" image="4" part="footprint" x="0" y="0"/>
<layer src="Circus_Construction_04_Front_Part"/>
</image>
<image id="Circus NWSE 31" width="298" height="181" isometric="true">
<layer group="214" image="4" part="footprint" x="0" y="-1"/>
<layer src="Circus_Construction_04_R_Front_Part"/>
</image>
<!-- Note: Circus 100% construction phases -->
<image id="Circus NESW 41" isometric="true">
<layer group="213" image="0" x="0" y="0"/>
</image>
<image id="Circus NWSE 41" isometric="true">
<layer group="214" image="0" x="0" y="0"/>
</image>
<image id="Circus NESW 42" isometric="true">
<layer group="213" image="2" x="0" y="0"/>
</image>
<image id="Circus NWSE 42" isometric="true">
<layer group="214" image="2" x="0" y="0"/>
</image>
<image id="Circus NESW 43" isometric="true">
<layer group="213" image="4" x="0" y="0"/>
</image>
<image id="Circus NWSE 43" isometric="true">
<layer group="214" image="4" x="0" y="0"/>
</image>
<!-- Note: Colosseum 0%, 25%, 50% and 75% construction phases respectively -->
<image id="Colosseum_Construction_01" width="298" height="159" isometric="true">
<layer group="this" image="5x5_Construction_Footprint" x="0" y="9"/>
<layer src="5x5_Construction_Borders" x="0" y="9"/>
<layer src="Colosseum_Construction_01" x="0" y="0"/>
</image>
<image id="Colosseum_Construction_02" width="298" height="154" isometric="true">
<layer group="48" image="0" part="footprint" x="0" y="-59"/>
<layer src="Colosseum_Construction_02" x="0" y="0"/>
</image>
<image id="Colosseum_Construction_03" width="298" height="173" isometric="true">
<layer group="48" image="0" part="footprint" x="0" y="-40"/>
<layer src="Colosseum_Construction_03" x="0" y="0"/>
</image>
<image id="Colosseum_Construction_04" width="298" height="186" isometric="true">
<layer group="48" image="0" part="footprint" x="0" y="-27"/>
<layer src="Colosseum_Construction_04" x="0" y="0"/>
</image>
<!-- Note: Logistics Monument/s -->
<!-- Note: Caravanserai 0% construction phase -->
<image id="Caravanserai_Construction_01" width="238" height="129" isometric="true">
Expand Down
138 changes: 0 additions & 138 deletions res/assets/Graphics/entertainment.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,6 @@
<!DOCTYPE assetlist>
<!-- Unless specifically mentioned, all assets created by Areldir -->
<assetlist name="Entertainment">
<!-- Note: Construction base reference asset (DO NOT USE!) -->
<image id="Cons_Base_5x5" src="Construction_Base_5x5" isometric="true"/>
<!-- Note: Colosseum 0%, 25%, 50% and 75% construction phases respectively -->
<image id="Coloseum Cons 01" width="298" height="160" isometric="true">
<layer group="this" image="Cons_Base_5x5" x="0" y="10"/>
<layer src="Colosseum_Construction_Phase_01" x="0" y="0"/>
</image>
<image id="Coloseum Cons 02" width="298" height="154" isometric="true">
<layer group="48" image="0" part="footprint" x="0" y="-59"/>
<layer src="Colosseum_Construction_Phase_02" x="0" y="0"/>
</image>
<image id="Coloseum Cons 03" width="298" height="173" isometric="true">
<layer group="48" image="0" part="footprint" x="0" y="-40"/>
<layer src="Colosseum_Construction_Phase_03" x="0" y="0"/>
</image>
<image id="Coloseum Cons 04" width="298" height="186" isometric="true">
<layer group="48" image="0" part="footprint" x="0" y="-27"/>
<layer src="Colosseum_Construction_Phase_04" x="0" y="0"/>
</image>
<!-- Note: Colosseum ON state -->
<image id="Coloseum ON" width="298" height="213" isometric="true">
<layer group="48" y="0"/>
Expand Down Expand Up @@ -143,125 +124,6 @@
<image src="Naumachia_Overlay"/>
<image src="Imperial_Games_Overlay"/>
<image src="Executions_Overlay"/>
<!-- Note: Circus 0% construction phase -->
<image id="Circus NESW 01" width="298" height="159" isometric="true">
<layer group="this" image="Cons_Base_5x5" x="0" y="9"/>
<layer src="Circus_Construction_01_Back_Part" x="0" y="0"/>
</image>
<image id="Circus NWSE 01" width="298" height="159" isometric="true">
<layer group="this" image="Cons_Base_5x5" x="0" y="9"/>
<layer src="Circus_Construction_01_R_Back_Part" x="0" y="0"/>
</image>
<image id="Circus NESW 02" isometric="true">
<layer group="this" image="Cons_Base_5x5" x="0" y="0"/>
<layer src="Circus_Construction_01_Middle_Part" x="0" y="0"/>
</image>
<image id="Circus NWSE 02" isometric="true">
<layer group="this" image="Cons_Base_5x5" x="0" y="0"/>
<layer src="Circus_Construction_01_R_Middle_Part" x="0" y="0"/>
</image>
<image id="Circus NESW 03" isometric="true">
<layer group="this" image="Cons_Base_5x5" x="0" y="0"/>
<layer src="Circus_Construction_01_Front_Part" x="0" y="0"/>
</image>
<image id="Circus NWSE 03" isometric="true">
<layer group="this" image="Cons_Base_5x5" x="0" y="0"/>
<layer src="Circus_Construction_01_R_Front_Part" x="0" y="0"/>
</image>
<!-- Note: Circus 25% construction phase -->
<image id="Circus NESW 13" width="298" height="156" isometric="true">
<layer group="213" image="0" part="footprint" x="0" y="-79"/>
<layer src="Circus_Construction_02_Back_Part"/>
</image>
<image id="Circus NWSE 13" width="298" height="155" isometric="true">
<layer group="214" image="0" part="footprint" x="0" y="-79"/>
<layer src="Circus_Construction_02_R_Back_Part"/>
</image>
<image id="Circus NESW 12" width="298" height="150" isometric="true">
<layer group="213" image="2" part="footprint" x="0" y="-31"/>
<layer src="Circus_Construction_02_Middle_Part"/>
</image>
<image id="Circus NWSE 12" width="298" height="150" isometric="true">
<layer group="214" image="2" part="footprint" x="0" y="-31"/>
<layer src="Circus_Construction_02_R_Middle_Part"/>
</image>
<image id="Circus NESW 11" width="298" height="150" isometric="true">
<layer group="213" image="4" part="footprint" x="0" y="-31"/>
<layer src="Circus_Construction_02_Front_Part"/>
</image>
<image id="Circus NWSE 11" width="298" height="150" isometric="true">
<layer group="214" image="4" part="footprint" x="0" y="-32"/>
<layer src="Circus_Construction_02_R_Front_Part"/>
</image>
<!-- Note: Circus 50% construction phase -->
<image id="Circus NESW 23" width="298" height="179" isometric="true">
<layer group="213" image="0" part="footprint" x="0" y="-56"/>
<layer src="Circus_Construction_03_Back_Part"/>
</image>
<image id="Circus NWSE 23" width="298" height="178" isometric="true">
<layer group="214" image="0" part="footprint" x="0" y="-56"/>
<layer src="Circus_Construction_03_R_Back_Part"/>
</image>
<image id="Circus NESW 22" width="298" height="164" isometric="true">
<layer group="213" image="2" part="footprint" x="0" y="-17"/>
<layer src="Circus_Construction_03_Middle_Part"/>
</image>
<image id="Circus NWSE 22" width="298" height="164" isometric="true">
<layer group="214" image="2" part="footprint" x="0" y="-17"/>
<layer src="Circus_Construction_03_R_Middle_Part"/>
</image>
<image id="Circus NESW 21" width="298" height="165" isometric="true">
<layer group="213" image="4" part="footprint" x="0" y="-16"/>
<layer src="Circus_Construction_03_Front_Part"/>
</image>
<image id="Circus NWSE 21" width="298" height="165" isometric="true">
<layer group="214" image="4" part="footprint" x="0" y="-17"/>
<layer src="Circus_Construction_03_R_Front_Part"/>
</image>
<!-- Note: Circus 75% construction phase for NE-SW Orientation -->
<image id="Circus NESW 33" width="298" height="210" isometric="true">
<layer group="213" image="0" part="footprint" x="0" y="-25"/>
<layer src="Circus_Construction_04_Back_Part"/>
</image>
<image id="Circus NWSE 33" width="298" height="208" isometric="true">
<layer group="214" image="0" part="footprint" x="0" y="-26"/>
<layer src="Circus_Construction_04_R_Back_Part"/>
</image>
<image id="Circus NESW 32" width="298" height="181" isometric="true">
<layer group="213" image="2" x="0" y="0"/>
<layer src="Circus_Construction_04_Middle_Part" y="2"/>
</image>
<image id="Circus NWSE 32" width="298" height="181" isometric="true">
<layer group="214" image="2" part="footprint" x="0" y="0"/>
<layer src="Circus_Construction_04_R_Middle_Part"/>
</image>
<image id="Circus NESW 31" width="298" height="181" isometric="true">
<layer group="213" image="4" part="footprint" x="0" y="0"/>
<layer src="Circus_Construction_04_Front_Part"/>
</image>
<image id="Circus NWSE 31" width="298" height="181" isometric="true">
<layer group="214" image="4" part="footprint" x="0" y="-1"/>
<layer src="Circus_Construction_04_R_Front_Part"/>
</image>
<!-- Note: Circus 100% construction phase for NE-SW Orientation Front, middle and back respectively -->
<image id="Circus NESW 41" isometric="true">
<layer group="213" image="0" x="0" y="0"/>
</image>
<image id="Circus NWSE 41" isometric="true">
<layer group="214" image="0" x="0" y="0"/>
</image>
<image id="Circus NESW 42" isometric="true">
<layer group="213" image="2" x="0" y="0"/>
</image>
<image id="Circus NWSE 42" isometric="true">
<layer group="214" image="2" x="0" y="0"/>
</image>
<image id="Circus NESW 43" isometric="true">
<layer group="213" image="4" x="0" y="0"/>
</image>
<image id="Circus NWSE 43" isometric="true">
<layer group="214" image="4" x="0" y="0"/>
</image>
<!-- Note: Arena Off Variant -->
<image id="Arena OFF" src="Arena_Off" isometric="true"/>
<!-- Note: Arena ON animation frames (DO NOT USE!) -->
Expand Down
5 changes: 3 additions & 2 deletions res/assets/Graphics/health_education.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0"?>
<!DOCTYPE assetlist>
<!-- Assets created by Areldir based on concept art by Tomasz -->
<!-- Unless specifically mentioned, all assets created by Areldir -->
<assetlist name="Health_Education">
<!-- Assets for school and library upgrades created by Areldir based on concept art by Tomasz -->
<!-- Note: School Upgrade Asset -->
<image id="Upgraded_School" width="118" height="110" isometric="true">
<layer group="41" x="0" y="18"/>
Expand All @@ -16,7 +17,6 @@
<layer group="this" image="Library Ref 01" x="0" y="29"/>
<layer src="Library_Downgrade_State" x="22" y="0"/>
</image>
<!-- Assets created by Areldir -->
<!-- Note: Fix for Academy pixel clipping -->
<image id="Academy_Fix" isometric="true">
<layer group="43" image="0" x="0" y="0"/>
Expand All @@ -27,6 +27,7 @@
<layer group="43" image="0" x="0" y="0"/>
<layer src="Academy_Upgrade_State" x="6" y="20"/>
</image>
<!-- Assets for doctor created by Ouaz -->
<!-- Note: Doctor Healing animation frames 01-11 -->
<image id="Doctor heal" src="Doctor_heal_plague_01"/>
<image src="Doctor_heal_plague_02"/>
Expand Down
12 changes: 6 additions & 6 deletions src/building/image.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,13 @@ int building_image_get(const building *b)
case BUILDING_COLOSSEUM:
switch (b->monument.phase) {
case MONUMENT_START:
return assets_get_image_id("Entertainment", "Coloseum Cons 01");
return assets_get_image_id("Construction", "Colosseum_Construction_01");
case 2:
return assets_get_image_id("Entertainment", "Coloseum Cons 02");
return assets_get_image_id("Construction", "Colosseum_Construction_02");
case 3:
return assets_get_image_id("Entertainment", "Coloseum Cons 03");
return assets_get_image_id("Construction", "Colosseum_Construction_03");
case 4:
return assets_get_image_id("Entertainment", "Coloseum Cons 04");
return assets_get_image_id("Construction", "Colosseum_Construction_04");
default:
switch (city_festival_games_active()) {
case 1:
Expand Down Expand Up @@ -484,10 +484,10 @@ int building_image_get(const building *b)
}
} else {
if (orientation == DIR_0_TOP || orientation == DIR_4_BOTTOM) {
image_id = assets_get_image_id("Entertainment", "Circus NWSE 01") +
image_id = assets_get_image_id("Construction", "Circus NWSE 01") +
((phase - 1) * phase_offset);
} else {
image_id = assets_get_image_id("Entertainment", "Circus NESW 01") +
image_id = assets_get_image_id("Construction", "Circus NESW 01") +
((phase - 1) * phase_offset);
}
}
Expand Down

0 comments on commit 077f899

Please sign in to comment.