mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add Powered Lifthill to Giga Coaster (#19276) 

Co-authored-by: Gymnasiast <m.o.steenbeek@gmail.com>
This commit is contained in:
AuraSpecs 2023-04-11 11:44:05 +02:00 committed by GitHub
parent 681f22748d
commit d8f9bc3146
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 73 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@ -1,5 +1,6 @@
0.4.5 (in development)
------------------------------------------------------------------------
- Feature: [#19276] Add Powered Lifthill to Giga Coaster.
- Feature: [#19446] Add new color options to color dropdown.
- Feature: [#19547] Add large sloped turns to hybrid coaster and single rail coaster.
- Feature: [OpenMusic#25] Added Prehistoric ride music style.

56
resources/g2/sprites.json
View File

@ -2313,6 +2313,30 @@
{
"path": "track/intamin/booster_2.png"
},
{
"path": "track/intamin/liftbooster_0.png",
"x_offset": -21,
"y_offset": -20,
"palette": "keep"
},
{
"path": "track/intamin/liftbooster_1.png",
"x_offset": -21,
"y_offset": -4,
"palette": "keep"
},
{
"path": "track/intamin/liftbooster_2.png",
"x_offset": -22,
"y_offset": -4,
"palette": "keep"
},
{
"path": "track/intamin/liftbooster_3.png",
"x_offset": -22,
"y_offset": -20,
"palette": "keep"
},
{
"path": "track/bm/booster_1.png"
},
@ -4576,96 +4600,96 @@
"path": "track/flume/25-60-down-nesw.png",
"x_offset": -26,
"y_offset": -39,
"palette" : "keep"
"palette": "keep"
},
{
"path": "track/flume/25-60-down-nwse.png",
"x_offset": -28,
"y_offset": -39,
"palette" : "keep"
"palette": "keep"
},
{
"path": "track/flume/25-60-down-nesw-back-water.png",
"y_offset": -23,
"palette" : "keep"
"palette": "keep"
},
{
"path": "track/flume/25-60-down-nesw-back.png",
"x_offset": -26,
"y_offset": -12,
"palette" : "keep"
"palette": "keep"
},
{
"path": "track/flume/25-60-down-nwse-back-water.png",
"x_offset": -25,
"y_offset": -22,
"palette" : "keep"
"palette": "keep"
},
{
"path": "track/flume/25-60-down-nwse-back.png",
"x_offset": -10,
"y_offset": -12,
"palette" : "keep"
"palette": "keep"
},
{
"path": "track/flume/60-down-nesw.png",
"x_offset": -27,
"y_offset": -71,
"palette" : "keep"
"palette": "keep"
},
{
"path": "track/flume/60-down-nwse.png",
"x_offset": -28,
"y_offset": -70,
"palette" : "keep"
"palette": "keep"
},
{
"path": "track/flume/60-down-nesw-back.png",
"x_offset": -26,
"y_offset": -53,
"palette" : "keep"
"palette": "keep"
},
{
"path": "track/flume/60-down-nwse-back.png",
"x_offset": -27,
"y_offset": -55,
"palette" : "keep"
"palette": "keep"
},
{
"path": "track/flume/60-25-down-nesw.png",
"x_offset": -27,
"y_offset": -39,
"palette" : "keep"
"palette": "keep"
},
{
"path": "track/flume/60-25-down-nwse.png",
"x_offset": -28,
"y_offset": -39,
"palette" : "keep"
"palette": "keep"
},
{
"path": "track/flume/60-25-down-nesw-back-water.png",
"x_offset": -20,
"y_offset": -6,
"palette" : "keep"
"palette": "keep"
},
{
"path": "track/flume/60-25-down-nesw-back.png",
"x_offset": -27,
"y_offset": -22,
"palette" : "keep"
"palette": "keep"
},
{
"path": "track/flume/60-25-down-nwse-back-water.png",
"x_offset": 2,
"y_offset": -6,
"palette" : "keep"
"palette": "keep"
},
{
"path": "track/flume/60-25-down-nwse-back.png",
"x_offset": -26,
"y_offset": -22,
"palette" : "keep"
"palette": "keep"
},
{
"path": "support/flat_to_steep_1_1.png",

BIN
resources/g2/track/intamin/liftbooster_0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
resources/g2/track/intamin/liftbooster_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
resources/g2/track/intamin/liftbooster_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
resources/g2/track/intamin/liftbooster_3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

27
src/openrct2/ride/coaster/GigaCoaster.cpp
View File

@ -9380,6 +9380,31 @@ static void GigaRCTrackBooster(
PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
}
static void GigaRCTrackPoweredLift(
PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
const TrackElement& trackElement)
{
PaintAddImageAsParentRotated(
session, direction, session.TrackColours[SCHEME_TRACK].WithIndex(SPR_G2_GIGA_RC_POWERED_LIFT_0 + direction),
{ 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } });
if (TrackPaintUtilShouldPaintSupports(session.MapPosition))
{
MetalASupportsPaintSetup(session, METAL_SUPPORTS_TUBES, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
}
if (direction == 0 || direction == 3)
{
PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
}
else
{
PaintUtilPushTunnelRotated(session, direction, height + 8, TUNNEL_SQUARE_8);
}
PaintUtilSetSegmentSupportHeight(
session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
}
TRACK_PAINT_FUNCTION GetTrackPaintFunctionGigaRC(int32_t trackType)
{
switch (trackType)
@ -9663,6 +9688,8 @@ TRACK_PAINT_FUNCTION GetTrackPaintFunctionGigaRC(int32_t trackType)
case TrackElemType::Booster:
return GigaRCTrackBooster;
case TrackElemType::PoweredLift:
return GigaRCTrackPoweredLift;
}
return nullptr;
}

2
src/openrct2/ride/coaster/meta/GigaCoaster.h
View File

@ -19,7 +19,7 @@ constexpr const RideTypeDescriptor GigaCoasterRTD =
{
SET_FIELD(AlternateType, RIDE_TYPE_NULL),
SET_FIELD(Category, RIDE_CATEGORY_ROLLERCOASTER),
SET_FIELD(EnabledTrackPieces, {TRACK_STRAIGHT, TRACK_STATION_END, TRACK_LIFT_HILL, TRACK_FLAT_ROLL_BANKING, TRACK_SLOPE, TRACK_SLOPE_STEEP_UP, TRACK_SLOPE_STEEP_DOWN, TRACK_SLOPE_CURVE, TRACK_SLOPE_CURVE_STEEP, TRACK_S_BEND, TRACK_CURVE_SMALL, TRACK_CURVE, TRACK_HELIX_SMALL, TRACK_BRAKES, TRACK_ON_RIDE_PHOTO, TRACK_BLOCK_BRAKES, TRACK_SLOPE_ROLL_BANKING, TRACK_SLOPE_STEEP_LONG, TRACK_LIFT_HILL_CABLE, TRACK_BOOSTER}),
SET_FIELD(EnabledTrackPieces, {TRACK_STRAIGHT, TRACK_STATION_END, TRACK_LIFT_HILL, TRACK_FLAT_ROLL_BANKING, TRACK_SLOPE, TRACK_SLOPE_STEEP_UP, TRACK_SLOPE_STEEP_DOWN, TRACK_SLOPE_CURVE, TRACK_SLOPE_CURVE_STEEP, TRACK_S_BEND, TRACK_CURVE_SMALL, TRACK_CURVE, TRACK_HELIX_SMALL, TRACK_BRAKES, TRACK_ON_RIDE_PHOTO, TRACK_BLOCK_BRAKES, TRACK_SLOPE_ROLL_BANKING, TRACK_SLOPE_STEEP_LONG, TRACK_LIFT_HILL_CABLE, TRACK_BOOSTER, TRACK_POWERED_LIFT}),
SET_FIELD(ExtraTrackPieces, {}),
SET_FIELD(CoveredTrackPieces, {}),
SET_FIELD(StartTrackPiece, TrackElemType::EndStation),

4
src/openrct2/sprites.h
View File

@ -1148,6 +1148,10 @@ enum
SPR_G2_GIGA_RC_BOOSTER_NE_SW,
SPR_G2_GIGA_RC_BOOSTER_NW_SE,
SPR_G2_GIGA_RC_POWERED_LIFT_0,
SPR_G2_GIGA_RC_POWERED_LIFT_1,
SPR_G2_GIGA_RC_POWERED_LIFT_2,
SPR_G2_GIGA_RC_POWERED_LIFT_3,
SPR_G2_BM_BOOSTER_NE_SW,
SPR_G2_BM_BOOSTER_NW_SE,