diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 5daba9bd3c..45760dcd97 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -7,6 +7,7 @@ - Improved: [#24921] The command line sprite build command now prints out the images table entry for the compiled sprite file. - Improved: [#24953] Opening the Scenario Editor, Track Designer or Track Designs Manager now display the progress bar. - Improved: [#25027] Land style dropdown now has tooltips with the name of the land types. +- Improved: [#25057] The progress window now has a Go Karts variant. - Change: [#23351] Diagonal sloped Go-Kart track can no longer be built without cheats if the karts do not have sprites for them. - Change: [#24606] Increase Misc Entity limit from 1600 to 3200. - Change: [#24974] Raise the Go-Karts maximum support height to allow 2 large sloped turns to be built on flat ground. diff --git a/resources/g2/loader/loader_gokarts_supports.png b/resources/g2/loader/loader_gokarts_supports.png new file mode 100644 index 0000000000..1fa2c814a0 Binary files /dev/null and b/resources/g2/loader/loader_gokarts_supports.png differ diff --git a/resources/g2/loader/loader_gokarts_track.png b/resources/g2/loader/loader_gokarts_track.png new file mode 100644 index 0000000000..c1d0d7d25e Binary files /dev/null and b/resources/g2/loader/loader_gokarts_track.png differ diff --git a/resources/g2/loader/loader_gokarts_vehicles.png b/resources/g2/loader/loader_gokarts_vehicles.png new file mode 100644 index 0000000000..3d96ec13e0 Binary files /dev/null and b/resources/g2/loader/loader_gokarts_vehicles.png differ diff --git a/resources/g2/sprites.json b/resources/g2/sprites.json index 5bb9197e33..d69b3c6fb4 100644 --- a/resources/g2/sprites.json +++ b/resources/g2/sprites.json @@ -519,6 +519,17 @@ { "path": "loader/loader_wooden_vehicle.png" }, + { + "path": "loader/loader_gokarts_supports.png", + "y": 5 + }, + { + "path": "loader/loader_gokarts_track.png", + "y": 9 + }, + { + "path": "loader/loader_gokarts_vehicles.png" + }, { "path": "palette_map/palette_map_dark_olive_dark.png", "palette": "keep", diff --git a/src/openrct2-ui/windows/ProgressWindow.cpp b/src/openrct2-ui/windows/ProgressWindow.cpp index 7aecdda972..05f1c51568 100644 --- a/src/openrct2-ui/windows/ProgressWindow.cpp +++ b/src/openrct2-ui/windows/ProgressWindow.cpp @@ -44,7 +44,7 @@ namespace OpenRCT2::Ui::Windows ImageId vehicle; }; - static std::array kVehicleStyles = { { + static std::array kVehicleStyles = { { { ImageId{SPR_G2_LOADER_HYBRID_SUPPORTS, COLOUR_LIGHT_ORANGE, COLOUR_DARK_BROWN }, ImageId{SPR_G2_LOADER_HYBRID_TRACK, COLOUR_LIGHT_ORANGE, COLOUR_LIGHT_ORANGE }, @@ -60,6 +60,11 @@ namespace OpenRCT2::Ui::Windows ImageId{SPR_G2_LOADER_WOODEN_TRACK, COLOUR_BORDEAUX_RED, COLOUR_BLACK }, ImageId{SPR_G2_LOADER_WOODEN_VEHICLE, COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_SATURATED_BROWN} }, + { + ImageId{SPR_G2_LOADER_GO_KARTS_SUPPORTS, COLOUR_DARK_BROWN, COLOUR_DARK_BROWN }, + ImageId{SPR_G2_LOADER_GO_KARTS_TRACK, COLOUR_BLACK, COLOUR_BLACK }, + ImageId{SPR_G2_LOADER_GO_KARTS_VEHICLES } + }, } }; static uint8_t nextStyle = 0; diff --git a/src/openrct2/SpriteIds.h b/src/openrct2/SpriteIds.h index 14180d2485..48a2c17f99 100644 --- a/src/openrct2/SpriteIds.h +++ b/src/openrct2/SpriteIds.h @@ -1014,6 +1014,9 @@ enum : ImageIndex SPR_G2_LOADER_WOODEN_SUPPORTS, SPR_G2_LOADER_WOODEN_TRACK, SPR_G2_LOADER_WOODEN_VEHICLE, + SPR_G2_LOADER_GO_KARTS_SUPPORTS, + SPR_G2_LOADER_GO_KARTS_TRACK, + SPR_G2_LOADER_GO_KARTS_VEHICLES, // G2 Palette maps