Skip to content

Commit

Permalink
Fix a few visual bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
@Areldir
Areldir committed Mar 17, 2024
1 parent 3b28519 commit cb3ac71
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
30 changes: 15 additions & 15 deletions res/assets/Graphics/monuments.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -516,26 +516,26 @@
</image>
<!-- Note: Ceres Grand Temple construction 01-05 are the 0%, 25%, 50%, 75% and 100% construction phases respectively -->
<image id="Ceres Complex Const 01" width="418" height="234" isometric="true">
<layer src="Grand_Temple_Construction_Base_01" x="0" y="15"/>
<layer group="this" image="Grand_Temple_Construction_Base_01" x="0" y="15"/>
<layer group="this" image="Ceres_LT_0" x="90" y="60"/>
</image>
<image id="Ceres Complex Const 02" width="418" height="234" isometric="true">
<layer src="Grand_Temple_Construction_Base_01" x="0" y="15"/>
<layer group="this" image="Grand_Temple_Construction_Base_01" x="0" y="15"/>
<layer src="Ceres_GT_Construction_Shadow_01" x="166" y="41"/>
<layer group="this" image="Ceres_LT_25" x="90" y="0"/>
</image>
<image id="Ceres Complex Const 03" width="418" height="234" isometric="true">
<layer src="Grand_Temple_Construction_Base_01" x="0" y="15"/>
<layer group="this" image="Grand_Temple_Construction_Base_01" x="0" y="15"/>
<layer src="Ceres_GT_Construction_Shadow_01" x="166" y="41"/>
<layer group="this" image="Ceres_LT_50" x="90" y="0"/>
</image>
<image id="Ceres Complex Const 04" width="418" height="234" isometric="true">
<layer src="Grand_Temple_Construction_Base_01" x="0" y="15"/>
<layer group="this" image="Grand_Temple_Construction_Base_01" x="0" y="15"/>
<layer src="Ceres_GT_Construction_Shadow_02" x="166" y="41"/>
<layer group="this" image="Ceres_LT_75" x="90" y="0"/>
</image>
<image id="Ceres Complex Const 05" width="418" height="234" isometric="true">
<layer src="Grand_Temple_Construction_Base_01" x="0" y="15"/>
<layer group="this" image="Grand_Temple_Construction_Base_01" x="0" y="15"/>
<layer src="Ceres_GT_Construction_Shadow_02" x="166" y="41"/>
<layer group="71" image="1" x="90" y="0"/>
</image>
Expand Down Expand Up @@ -628,26 +628,26 @@
</image>
<!-- Note: Mars Grand Temple construction 01-05 are the 0%, 25%, 50%, 75% and 100% construction phases respectively -->
<image id="Mars Complex Const 01" width="418" height="223" isometric="true">
<layer src="Grand_Temple_Construction_Base_01" x="0" y="4"/>
<layer group="this" image="Grand_Temple_Construction_Base_01" x="0" y="4"/>
<layer group="this" image="Mars_LT_0" x="90" y="49"/>
</image>
<image id="Mars Complex Const 02" width="418" height="223" isometric="true">
<layer src="Grand_Temple_Construction_Base_01" x="0" y="4"/>
<layer group="this" image="Grand_Temple_Construction_Base_01" x="0" y="4"/>
<layer src="Mars_GT_Construction_Shadow_01" x="163" y="22"/>
<layer group="this" image="Mars_LT_25" x="90" y="0"/>
</image>
<image id="Mars Complex Const 03" width="418" height="223" isometric="true">
<layer src="Grand_Temple_Construction_Base_01" x="0" y="4"/>
<layer group="this" image="Grand_Temple_Construction_Base_01" x="0" y="4"/>
<layer src="Mars_GT_Construction_Shadow_02" x="163" y="22"/>
<layer group="this" image="Mars_LT_50" x="90" y="0"/>
</image>
<image id="Mars Complex Const 04" width="418" height="223" isometric="true">
<layer src="Grand_Temple_Construction_Base_01" x="0" y="4"/>
<layer group="this" image="Grand_Temple_Construction_Base_01" x="0" y="4"/>
<layer src="Mars_GT_Construction_Shadow_02" x="163" y="22"/>
<layer group="this" image="Mars_LT_75" x="90" y="0"/>
</image>
<image id="Mars Complex Const 05" width="418" height="223" isometric="true">
<layer src="Grand_Temple_Construction_Base_01" x="0" y="4"/>
<layer group="this" image="Grand_Temple_Construction_Base_01" x="0" y="4"/>
<layer src="Mars_GT_Construction_Shadow_03" x="163" y="22"/>
<layer group="74" image="1" x="90" y="0"/>
</image>
Expand Down Expand Up @@ -1062,26 +1062,26 @@
</image>
<!-- Note: Venus Grand Temple construction 01-05 are the 0%, 25%, 50%, 75% and 100% construction phases respectively -->
<image id="Venus Complex Const 01" width="418" height="219" isometric="true">
<layer src="Grand_Temple_Construction_Base_01" x="0" y="0"/>
<layer group="this" image="Grand_Temple_Construction_Base_01" x="0" y="0"/>
<layer group="this" image="Venus_LT_0" x="90" y="45"/>
</image>
<image id="Venus Complex Const 02" width="418" height="219" isometric="true">
<layer src="Grand_Temple_Construction_Base_01" x="0" y="0"/>
<layer group="this" image="Grand_Temple_Construction_Base_01" x="0" y="0"/>
<layer src="Venus_GT_Construction_Shadow_01" x="172" y="28"/>
<layer group="this" image="Venus_LT_25" x="90" y="2"/>
</image>
<image id="Venus Complex Const 03" width="418" height="219" isometric="true">
<layer src="Grand_Temple_Construction_Base_01" x="0" y="0"/>
<layer group="this" image="Grand_Temple_Construction_Base_01" x="0" y="0"/>
<layer src="Venus_GT_Construction_Shadow_01" x="172" y="28"/>
<layer group="this" image="Venus_LT_50" x="90" y="2"/>
</image>
<image id="Venus Complex Const 04" width="418" height="219" isometric="true">
<layer src="Grand_Temple_Construction_Base_01" x="0" y="0"/>
<layer group="this" image="Grand_Temple_Construction_Base_01" x="0" y="0"/>
<layer src="Venus_GT_Construction_Shadow_02" x="172" y="28"/>
<layer group="this" image="Venus_LT_75" x="90" y="2"/>
</image>
<image id="Venus Complex Const 05" width="418" height="219" isometric="true">
<layer src="Grand_Temple_Construction_Base_01" x="0" y="0"/>
<layer group="this" image="Grand_Temple_Construction_Base_01" x="0" y="0"/>
<layer src="Venus_GT_Construction_Shadow_02" x="172" y="28"/>
<layer group="75" image="1" x="90" y="2"/>
</image>
Expand Down
6 changes: 3 additions & 3 deletions src/widget/city_without_overlay.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -593,13 +593,13 @@ static void draw_granary_stores(const image *img, const building *b, int x, int

static void draw_ceres_module_crops(int x, int y, int image_offset, color_t color_mask)
{
int image_id = assets_get_image_id("Health_Culture", "Ceres Module 1 Crop");
int image_id = assets_get_image_id("Monuments", "Ceres Module 1 Crop");
image_draw(image_id + image_offset, x, y, color_mask, draw_context.scale);
}

static void draw_neptune_fountain(int x, int y, int image_offset, color_t color_mask)
{
int image_id = assets_get_image_id("Health_Culture", "Neptune Module 2 Fountain");
int image_id = assets_get_image_id("Monuments", "Neptune Module 2 Fountain");
image_draw(image_id + image_offset, x, y, color_mask, draw_context.scale);
}

Expand Down Expand Up @@ -653,7 +653,7 @@ static void draw_animation(int x, int y, int grid_offset)
int festival_id = calc_bound(city_festival_games_active(), 0, 4);
int extra_x = festival_id ? 57 : 127;
int extra_y = festival_id ? 12 : 93;
int overlay_id = assets_get_image_id("Health_Culture", "Col Base Overlay") + festival_id;
int overlay_id = assets_get_image_id("Monuments", "Col Base Overlay") + festival_id;
image_draw(overlay_id, x + extra_x, y + extra_y - y_offset, color_mask, draw_context.scale);
}
}
Expand Down

0 comments on commit cb3ac71

Please sign in to comment.