Fix loop sprites

This commit is contained in:
X123M3-256 2023-07-15 11:36:24 +01:00
parent 5bbbd97b71
commit 63f8e3ab56
21 changed files with 48 additions and 16 deletions

View File

@ -3186,18 +3186,18 @@
{
"path": "track/intamin/left_vertical_loop_1_2.png",
"x_offset": -26,
"y_offset": -43,
"y_offset": -111,
"palette": "keep"
},
{
"path": "track/intamin/left_vertical_loop_1_3.png",
"x_offset": -47,
"y_offset": -91,
"x_offset": -22,
"y_offset": -84,
"palette": "keep"
},
{
"path": "track/intamin/left_vertical_loop_1_4.png",
"x_offset": -37,
"x_offset": -32,
"y_offset": 9,
"palette": "keep"
},
@ -3246,7 +3246,7 @@
{
"path": "track/intamin/left_vertical_loop_3_4.png",
"x_offset": -22,
"y_offset": 5,
"y_offset": 3,
"palette": "keep"
},
{
@ -3264,12 +3264,12 @@
{
"path": "track/intamin/left_vertical_loop_4_3.png",
"x_offset": -4,
"y_offset": -95,
"y_offset": -87,
"palette": "keep"
},
{
"path": "track/intamin/left_vertical_loop_4_4.png",
"x_offset": 1,
"x_offset": -13,
"y_offset": 17,
"palette": "keep"
},
@ -3287,13 +3287,13 @@
},
{
"path": "track/intamin/right_vertical_loop_1_3.png",
"x_offset": -31,
"y_offset": -95,
"x_offset": -20,
"y_offset": -86,
"palette": "keep"
},
{
"path": "track/intamin/right_vertical_loop_1_4.png",
"x_offset": -22,
"x_offset": -21,
"y_offset": 16,
"palette": "keep"
},
@ -3311,13 +3311,13 @@
},
{
"path": "track/intamin/right_vertical_loop_2_3.png",
"x_offset": -20,
"y_offset": -94,
"x_offset": -23,
"y_offset": -100,
"palette": "keep"
},
{
"path": "track/intamin/right_vertical_loop_2_4.png",
"x_offset": -21,
"x_offset": -16,
"y_offset": 5,
"palette": "keep"
},
@ -3342,7 +3342,7 @@
{
"path": "track/intamin/right_vertical_loop_3_4.png",
"x_offset": -27,
"y_offset": -3,
"y_offset": 0,
"palette": "keep"
},
{
@ -3354,13 +3354,13 @@
{
"path": "track/intamin/right_vertical_loop_4_2.png",
"x_offset": -11,
"y_offset": -44,
"y_offset": -111,
"palette": "keep"
},
{
"path": "track/intamin/right_vertical_loop_4_3.png",
"x_offset": 1,
"y_offset": -87,
"y_offset": -83,
"palette": "keep"
},
{

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 932 B

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 966 B

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 9.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 14 KiB

View File

@ -10238,21 +10238,29 @@ static void GigaRCTrackLeftVerticalLoop(
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 1),
{ 0, 0, height }, { 32, 26, 3 });
MetalASupportsPaintSetup(
session, MetalSupportType::Tubes, 4, 26, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 5),
{ 0, 14, height }, { 32, 2, 63 });
MetalBSupportsPaintSetup(
session, MetalSupportType::Tubes, 4, 11, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 9),
{ 0, 6, height }, { 32, 26, 3 });
MetalBSupportsPaintSetup(
session, MetalSupportType::Tubes, 4, 14, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 13),
{ 0, 6, height }, { 32, 26, 3 });
MetalASupportsPaintSetup(
session, MetalSupportType::Tubes, 4, 5, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
PaintUtilSetSegmentSupportHeight(
@ -10390,21 +10398,29 @@ static void GigaRCTrackLeftVerticalLoop(
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 9),
{ 0, 6, height }, { 32, 26, 3 });
MetalBSupportsPaintSetup(
session, MetalSupportType::Tubes, 4, 14, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 13),
{ 0, 6, height }, { 32, 26, 3 });
MetalASupportsPaintSetup(
session, MetalSupportType::Tubes, 4, 5, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 1),
{ 0, 0, height }, { 32, 26, 3 });
MetalASupportsPaintSetup(
session, MetalSupportType::Tubes, 4, 26, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 5),
{ 0, 14, height }, { 32, 2, 63 });
MetalBSupportsPaintSetup(
session, MetalSupportType::Tubes, 4, 11, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
PaintUtilSetSegmentSupportHeight(
@ -10507,21 +10523,29 @@ static void GigaRCTrackRightVerticalLoop(
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 17),
{ 0, 6, height }, { 32, 26, 3 });
MetalASupportsPaintSetup(
session, MetalSupportType::Tubes, 4, 5, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 21),
{ 0, 6, height }, { 32, 26, 3 });
MetalBSupportsPaintSetup(
session, MetalSupportType::Tubes, 4, 14, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 25),
{ 0, 14, height }, { 32, 2, 63 });
MetalBSupportsPaintSetup(
session, MetalSupportType::Tubes, 4, 11, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 29),
{ 0, 0, height }, { 32, 26, 3 });
MetalASupportsPaintSetup(
session, MetalSupportType::Tubes, 4, 26, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);
@ -10643,21 +10667,29 @@ static void GigaRCTrackRightVerticalLoop(
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 25),
{ 0, 14, height }, { 32, 2, 63 });
MetalBSupportsPaintSetup(
session, MetalSupportType::Tubes, 4, 11, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 1:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 29),
{ 0, 0, height }, { 32, 26, 3 });
MetalASupportsPaintSetup(
session, MetalSupportType::Tubes, 4, 26, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 17),
{ 0, 6, height }, { 32, 26, 3 });
MetalASupportsPaintSetup(
session, MetalSupportType::Tubes, 4, 5, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 21),
{ 0, 6, height }, { 32, 26, 3 });
MetalBSupportsPaintSetup(
session, MetalSupportType::Tubes, 4, 14, height, session.TrackColours[SCHEME_SUPPORTS]);
break;
}
PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20);