mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2025-01-22 10:21:57 -05:00
Code Issues Projects Releases Packages Wiki Activity

Add RCTC Booster offsets into sprites.json

Browse source 
Co-authored-by: Gymnasiast <m.o.steenbeek@gmail.com>
This commit is contained in:
Harry Hopkinson 2024-01-26 08:37:00 +00:00 committed by GitHub
parent 73183f6736
commit a14d471530
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 30 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
resources/g2/sprites.json
View file

@ -2656,10 +2656,14 @@
"palette": "keep"
},
{
"path": "track/intamin/booster_1.png"
"path": "track/intamin/booster_1.png",
"x_offset": -22,
"y_offset": -4
},
{
"path": "track/intamin/booster_2.png"
"path": "track/intamin/booster_2.png",
"x_offset": -22,
"y_offset": -4
},
{
"path": "track/intamin/brake_horizontal_background_open.png",
@ -6286,10 +6290,14 @@
"palette": "keep"
},
{
"path": "track/mini/booster_1.png"
"path": "track/mini/booster_1.png",
"x_offset": -22,
"y_offset": -4
},
{
"path": "track/mini/booster_2.png"
"path": "track/mini/booster_2.png",
"x_offset": -22,
"y_offset": -4
},
{
"path": "track/bm/brake_horizontal.png",
@ -6328,10 +6336,14 @@
"palette": "keep"
},
{
"path": "track/bm/booster_1.png"
"path": "track/bm/booster_1.png",
"x_offset": -25,
"y_offset": -5
},
{
"path": "track/bm/booster_2.png"
"path": "track/bm/booster_2.png",
"x_offset": -25,
"y_offset": -5
},
{
"path": "track/railway/quarter_turn_3_tiles_sw_se_part_3.png",

14
src/openrct2/ride/coaster/BolligerMabillardTrack.hpp
View file

@ -12637,25 +12637,19 @@ void BolligerMabillardTrackBooster(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
const TrackElement& trackElement)
{
// These offsets could be moved to the g2.dat file when that supports offsets.
int8_t ne_sw_offsetX = 8;
int8_t ne_sw_offsetY = -17;
int8_t nw_se_offsetX = -17;
int8_t nw_se_offsetY = 8;
switch (direction)
{
case 0:
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours.WithIndex(SPR_G2_BM_BOOSTER_NE_SW),
{ ne_sw_offsetX, ne_sw_offsetY, height }, { { 0, 6, height }, { 32, 20, 3 } });
session, direction, session.TrackColours.WithIndex(SPR_G2_BM_BOOSTER_NE_SW), { 0, 0, height },
{ { 0, 6, height }, { 32, 20, 3 } });
break;
case 1:
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours.WithIndex(SPR_G2_BM_BOOSTER_NW_SE),
{ nw_se_offsetX, nw_se_offsetY, height }, { { 0, 6, height }, { 32, 20, 3 } });
session, direction, session.TrackColours.WithIndex(SPR_G2_BM_BOOSTER_NW_SE), { 0, 0, height },
{ { 0, 6, height }, { 32, 20, 3 } });
break;
}
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))

14
src/openrct2/ride/coaster/GigaCoaster.cpp
View file

@ -9453,25 +9453,19 @@ static void GigaRCTrackBooster(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
const TrackElement& trackElement)
{
// These offsets could be moved to the g2.dat file when that supports offsets.
int8_t ne_sw_offsetX = 7;
int8_t ne_sw_offsetY = -15;
int8_t nw_se_offsetX = -15;
int8_t nw_se_offsetY = 7;
switch (direction)
{
case 0:
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_RC_BOOSTER_NE_SW),
{ ne_sw_offsetX, ne_sw_offsetY, height }, { { 0, 6, height }, { 32, 20, 3 } });
session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_RC_BOOSTER_NE_SW), { 0, 0, height },
{ { 0, 6, height }, { 32, 20, 3 } });
break;
case 1:
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_RC_BOOSTER_NW_SE),
{ nw_se_offsetX, nw_se_offsetY, height }, { { 0, 6, height }, { 32, 20, 3 } });
session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_RC_BOOSTER_NW_SE), { 0, 0, height },
{ { 0, 6, height }, { 32, 20, 3 } });
break;
}
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))

14
src/openrct2/ride/coaster/MiniRollerCoaster.cpp
View file

@ -9508,19 +9508,13 @@ static void MiniRCTrackBooster(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
const TrackElement& trackElement)
{
// These offsets could be moved to the g2.dat file when that supports offsets.
int8_t ne_sw_offsetX = 7;
int8_t ne_sw_offsetY = -15;
int8_t nw_se_offsetX = -15;
int8_t nw_se_offsetY = 7;
switch (direction)
{
case 0:
case 2:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours.WithIndex(SPR_G2_MINI_RC_BOOSTER_NE_SW),
{ ne_sw_offsetX, ne_sw_offsetY, height }, { { 0, 6, height }, { 32, 20, 3 } });
session, direction, session.TrackColours.WithIndex(SPR_G2_MINI_RC_BOOSTER_NE_SW), { 0, 0, height },
{ { 0, 6, height }, { 32, 20, 3 } });
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
MetalASupportsPaintSetup(
@ -9530,8 +9524,8 @@ static void MiniRCTrackBooster(
case 1:
case 3:
PaintAddImageAsParentRotated(
session, direction, session.TrackColours.WithIndex(SPR_G2_MINI_RC_BOOSTER_NW_SE),
{ nw_se_offsetX, nw_se_offsetY, height }, { { 0, 6, height }, { 32, 20, 3 } });
session, direction, session.TrackColours.WithIndex(SPR_G2_MINI_RC_BOOSTER_NW_SE), { 0, 0, height },
{ { 0, 6, height }, { 32, 20, 3 } });
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
MetalASupportsPaintSetup(