mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-10 17:42:29 +01:00
Code Issues Releases Wiki Activity

Add up25even wooden support transition type

Browse Source
This commit is contained in:
mix
2025-10-11 17:27:38 +01:00
parent 363bb34286
commit c1c78aed1a
12 changed files with 61 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
resources/tracks/sprites.json
View File

@@ -24634,6 +24634,26 @@
"y": -7,
"palette": "keep"
},
{
"path": "support/wooden/truss/up_25_even_1.png",
"x": -32,
"y": -16
},
{
"path": "support/wooden/truss/up_25_even_2.png",
"x": -32,
"y": -1
},
{
"path": "support/wooden/truss/up_25_even_3.png",
"x": -32,
"y": -1
},
{
"path": "support/wooden/truss/up_25_even_4.png",
"x": -32,
"y": -16
},
{
"path": "support/wooden/truss/flat_to_steep_1_1.png",
"x": -32,
@@ -24794,6 +24814,26 @@
"x": -32,
"y": -17
},
{
"path": "support/wooden/mine/up_25_even_1.png",
"x": -24,
"y": -12
},
{
"path": "support/wooden/mine/up_25_even_2.png",
"x": -24,
"y": 4
},
{
"path": "support/wooden/mine/up_25_even_3.png",
"x": -24,
"y": 3
},
{
"path": "support/wooden/mine/up_25_even_4.png",
"x": -24,
"y": -12
},
{
"path": "support/wooden/mine/flat_to_steep_1_1.png",
"x": -24,

BIN
resources/tracks/support/wooden/mine/up_25_even_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
resources/tracks/support/wooden/mine/up_25_even_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
resources/tracks/support/wooden/mine/up_25_even_3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
resources/tracks/support/wooden/mine/up_25_even_4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
resources/tracks/support/wooden/truss/up_25_even_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
resources/tracks/support/wooden/truss/up_25_even_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
resources/tracks/support/wooden/truss/up_25_even_3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
resources/tracks/support/wooden/truss/up_25_even_4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

6
src/openrct2/SpriteIds.h
View File

@@ -1641,9 +1641,11 @@ enum : ImageIndex
// G2 Supports
SPR_TRACKS_SUPPORT_BEGIN = SPR_TRACKS_GO_KARTS_END,
SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_FLAT_TO_STEEP = SPR_TRACKS_SUPPORT_BEGIN,
SPR_TRACKS_SUPPORT_WOODEN_TRUSS_UP_25_EVEN = SPR_TRACKS_SUPPORT_BEGIN,
SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_FLAT_TO_STEEP = SPR_TRACKS_SUPPORT_WOODEN_TRUSS_UP_25_EVEN + 4,
SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_STEEP_TO_FLAT = SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_FLAT_TO_STEEP + 16,
SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_FLAT_TO_STEEP = SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_STEEP_TO_FLAT + 16,
SPR_TRACKS_SUPPORT_WOODEN_MINE_UP_25_EVEN = SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_STEEP_TO_FLAT + 16,
SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_FLAT_TO_STEEP = SPR_TRACKS_SUPPORT_WOODEN_MINE_UP_25_EVEN + 4,
SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_STEEP_TO_FLAT = SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_FLAT_TO_STEEP + 16,
SPR_TRACKS_SUPPORT_END = SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_STEEP_TO_FLAT + 16,

30
src/openrct2/paint/support/WoodenSupports.cpp
View File

@@ -70,13 +70,14 @@ static constexpr ImagesByTransitionTypeArray WoodenCurveSupportImageIds0 = { {
{ 3477, 3478, 3479, 3480 }, // up25DegToUp60Deg
{ 3481, 3482, 3483, 3484 }, // up60DegToUp25Deg
{ 3485, 3486, 3487, 3488 }, // up60Deg
{ 3489, 3490, 3491, 3492 }, // path
{ 3493, 3494, 3495, 3496 }, // flatToUp60Deg
{ 3497, 3498, 3499, 3500 }, // up60DegToFlat
{ 3501, 3502, 3503, 3504 }, // flatToUp25DegRailway
{ 3505, 3506, 3507, 3508 }, // up25DegToFlatRailway
{ 3509, 3510, 3511, 3512 }, // up25DegRailway
{ 3513, 3513, 3513, 3513 }, // scenery
{ SPR_TRACKS_SUPPORT_WOODEN_TRUSS_UP_25_EVEN, SPR_TRACKS_SUPPORT_WOODEN_TRUSS_UP_25_EVEN + 1,
SPR_TRACKS_SUPPORT_WOODEN_TRUSS_UP_25_EVEN + 2, SPR_TRACKS_SUPPORT_WOODEN_TRUSS_UP_25_EVEN + 3 }, // up25even
{ 3493, 3494, 3495, 3496 }, // flatToUp60Deg
{ 3497, 3498, 3499, 3500 }, // up60DegToFlat
{ 3501, 3502, 3503, 3504 }, // flatToUp25DegRailway
{ 3505, 3506, 3507, 3508 }, // up25DegToFlatRailway
{ 3509, 3510, 3511, 3512 }, // up25DegRailway
{ 3513, 3513, 3513, 3513 }, // scenery
{ SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_FLAT_TO_STEEP, SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_FLAT_TO_STEEP + 1,
SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_FLAT_TO_STEEP + 2,
SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_FLAT_TO_STEEP + 3 }, // flatToUp60DegLongBaseSeq0
@@ -110,13 +111,14 @@ static constexpr ImagesByTransitionTypeArray WoodenCurveSupportImageIds1 = { {
{ 3693, 3694, 3695, 3696 }, // up25DegToUp60Deg
{ 3697, 3698, 3699, 3700 }, // up60DegToUp25Deg
{ 3701, 3702, 3703, 3704 }, // up60Deg
{ 3705, 3706, 3707, 3708 }, // path
{ 3709, 3710, 3711, 3712 }, // flatToUp60Deg
{ 3713, 3714, 3715, 3716 }, // up60DegToFlat
{ 3717, 3718, 3719, 3720 }, // flatToUp25DegRailway
{ 3721, 3722, 3723, 3724 }, // up25DegToFlatRailway
{ 3725, 3726, 3727, 3728 }, // up25DegRailway
{ 3729, 3729, 3729, 3729 }, // scenery
{ SPR_TRACKS_SUPPORT_WOODEN_MINE_UP_25_EVEN, SPR_TRACKS_SUPPORT_WOODEN_MINE_UP_25_EVEN + 1,
SPR_TRACKS_SUPPORT_WOODEN_MINE_UP_25_EVEN + 2, SPR_TRACKS_SUPPORT_WOODEN_MINE_UP_25_EVEN + 3 }, // up25even
{ 3709, 3710, 3711, 3712 }, // flatToUp60Deg
{ 3713, 3714, 3715, 3716 }, // up60DegToFlat
{ 3717, 3718, 3719, 3720 }, // flatToUp25DegRailway
{ 3721, 3722, 3723, 3724 }, // up25DegToFlatRailway
{ 3725, 3726, 3727, 3728 }, // up25DegRailway
{ 3729, 3729, 3729, 3729 }, // scenery
{ SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_FLAT_TO_STEEP, SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_FLAT_TO_STEEP + 1,
SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_FLAT_TO_STEEP + 2,
SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_FLAT_TO_STEEP + 3 }, // flatToUp60DegLongBaseSeq0

1
src/openrct2/paint/support/WoodenSupports.h
View File

@@ -46,6 +46,7 @@ enum class WoodenSupportTransitionType : uint8_t
up25DegToUp60Deg = 3,
up60DegToUp25Deg = 4,
up60Deg = 5,
up25even = 6,
flatToUp60Deg = 7,
up60DegToFlat = 8,
flatToUp25DegRailway = 9,