Add steep drops to the Log Flume

distribution/changelog.txt

@@ -1,6 +1,7 @@
 0.4.3 (in development)
 ------------------------------------------------------------------------
 - Feature: [#17782] The Flying Coaster now has access to boosters and can draw outside loops.
+- Feature: [#17997] The Log Flume can now draw steep pieces down (if vehicle allows it).
 - Feature: [#18312, objects#220, OpenSFX#13] New sound effects for the Hybrid and Single Rail roller coasters.
 - Feature: [objects#173] Add alpine coaster vehicle.
 - Feature: [objects#221] Add two extra jungle walls.

resources/g2/sprites.json

@@ -4423,6 +4423,101 @@
         "y_offset": -29,
         "palette": "keep"
     },
+    {
+        "path": "track/flume/25-60-down-nesw.png",
+        "x_offset": -26,
+        "y_offset": -39,
+        "palette" : "keep"
+    },
+    {
+        "path": "track/flume/25-60-down-nwse.png",
+        "x_offset": -28,
+        "y_offset": -39,
+		"palette" : "keep"
+    },
+    {
+        "path": "track/flume/25-60-down-nesw-back-water.png",
+        "y_offset": -23,
+		"palette" : "keep"
+    },
+    {
+        "path": "track/flume/25-60-down-nesw-back.png",
+        "x_offset": -26,
+        "y_offset": -12,
+		"palette" : "keep"
+    },
+    {
+        "path": "track/flume/25-60-down-nwse-back-water.png",
+        "x_offset": -25,
+        "y_offset": -22,
+		"palette" : "keep"
+    },
+    {
+        "path": "track/flume/25-60-down-nwse-back.png",
+        "x_offset": -10,
+        "y_offset": -12,
+		"palette" : "keep"
+    },
+    {
+        "path": "track/flume/60-down-nesw.png",
+        "x_offset": -27,
+        "y_offset": -71,
+        "palette" : "keep"
+    },
+    {
+        "path": "track/flume/60-down-nwse.png",
+        "x_offset": -28,
+        "y_offset": -70,
+        "palette" : "keep"
+    },
+    {
+        "path": "track/flume/60-down-nesw-back.png",
+        "x_offset": -26,
+        "y_offset": -53,
+        "palette" : "keep"
+    },
+    {
+        "path": "track/flume/60-down-nwse-back.png",
+        "x_offset": -27,
+        "y_offset": -55,
+		"palette" : "keep"
+    },
+    {
+        "path": "track/flume/60-25-down-nesw.png",
+        "x_offset": -27,
+        "y_offset": -39,
+        "palette" : "keep"
+    },
+    {
+        "path": "track/flume/60-25-down-nwse.png",
+        "x_offset": -28,
+        "y_offset": -39,
+		"palette" : "keep" 
+    },
+    {
+        "path": "track/flume/60-25-down-nesw-back-water.png",
+        "x_offset": -20,
+        "y_offset": -6,
+        "palette" : "keep"
+    },
+    {
+        "path": "track/flume/60-25-down-nesw-back.png",
+        "x_offset": -27,
+        "y_offset": -22,
+        "palette" : "keep"
+    },
+    {
+        "path": "track/flume/60-25-down-nwse-back-water.png",
+        "x_offset": 2,
+        "y_offset": -6,
+		"palette" : "keep"
+    },
+    {
+        "path": "track/flume/60-25-down-nwse-back.png",
+        "x_offset": -26,
+        "y_offset": -22,
+		"palette" : "keep"
+    },
     {
         "path": "support/flat_to_steep_1_1.png",
         "x_offset": -32,

src/openrct2/network/NetworkBase.cpp

@@ -43,7 +43,7 @@
 // It is used for making sure only compatible builds get connected, even within
 // single OpenRCT2 version.
 
-#define NETWORK_STREAM_VERSION "9"
+#define NETWORK_STREAM_VERSION "10"
 
 #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
 

src/openrct2/ride/water/LogFlume.cpp

@@ -10,6 +10,7 @@
 #include "../../interface/Viewport.h"
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"
+#include "../../sprites.h"
 #include "../Track.h"
 #include "../TrackPaint.h"
 
@@ -849,6 +850,128 @@ static void paint_log_flume_track_reverser(
     PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20);
 }
 
+// Steep Additions added by OpenRCT2
+
+static void log_flume_track_25_down_60(
+    PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const TrackElement& trackElement)
+{
+    static constexpr const uint32_t imageIds[4][2] = {
+        { SPR_G2_FLUME_25_60_NW_SE_BACK, SPR_G2_FLUME_25_60_NW_SE_BACK_WATER },
+        { SPR_G2_EMPTY, SPR_G2_FLUME_25_60_NW_SE },
+        { SPR_G2_EMPTY, SPR_G2_FLUME_25_60_NE_SW },
+        { SPR_G2_FLUME_25_60_NE_SW_BACK, SPR_G2_FLUME_25_60_NE_SW_BACK_WATER },
+    };
+
+    auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][0]);
+    auto frontImageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][1]);
+
+    PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 42 }, { 0, 27, height + 4 });
+    PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { 32, 20, 0 }, { 0, 6, height });
+
+    if (direction == 1 || direction == 2)
+    {
+        if (track_paint_util_should_paint_supports(session.MapPosition))
+        {
+            MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
+        }
+
+        PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_14);
+    }
+    else
+    {
+        if (track_paint_util_should_paint_supports(session.MapPosition))
+        {
+            MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 8, height + 12, session.TrackColours[SCHEME_SUPPORTS]);
+        }
+
+        PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_2);
+    }
+    PaintUtilSetSegmentSupportHeight(
+        session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
+    PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
+}
+
+static void log_flume_track_60_down(
+    PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const TrackElement& trackElement)
+{
+    static constexpr const uint32_t imageIds[4][2] = {
+        { SPR_G2_FLUME_60_NW_SE_BACK, SPR_G2_EMPTY },
+        { SPR_G2_EMPTY, SPR_G2_FLUME_60_NW_SE },
+        { SPR_G2_EMPTY, SPR_G2_FLUME_60_NE_SW },
+        { SPR_G2_FLUME_60_NE_SW_BACK, SPR_G2_EMPTY },
+    };
+
+    auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][0]);
+    auto frontImageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][1]);
+
+    PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 98 }, { 0, 27, height + 4 });
+    PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { 32, 20, 2 }, { 0, 6, height });
+
+    if (direction == 1 || direction == 2)
+    {
+        if (track_paint_util_should_paint_supports(session.MapPosition))
+        {
+            MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
+        }
+
+        PaintUtilPushTunnelRotated(session, direction, height - 8, TUNNEL_SQUARE_7);
+    }
+    else
+    {
+        if (track_paint_util_should_paint_supports(session.MapPosition))
+        {
+            MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 8, height + 12, session.TrackColours[SCHEME_SUPPORTS]);
+        }
+
+        PaintUtilPushTunnelRotated(session, direction, height + 56, TUNNEL_SQUARE_8);
+    }
+    PaintUtilSetSegmentSupportHeight(
+        session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
+    PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
+}
+
+static void log_flume_track_60_down_25(
+    PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const TrackElement& trackElement)
+{
+    static constexpr const uint32_t imageIds[4][2] = {
+        { SPR_G2_FLUME_60_25_NW_SE_BACK, SPR_G2_FLUME_60_25_NW_SE_BACK_WATER },
+        { SPR_G2_EMPTY, SPR_G2_FLUME_60_25_NW_SE },
+        { SPR_G2_EMPTY, SPR_G2_FLUME_60_25_NE_SW },
+        { SPR_G2_FLUME_60_25_NE_SW_BACK, SPR_G2_FLUME_60_25_NE_SW_BACK_WATER },
+    };
+
+    auto imageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][0]);
+    auto frontImageId = session.TrackColours[SCHEME_TRACK].WithIndex(imageIds[direction][1]);
+
+    PaintAddImageAsParentRotated(session, direction, imageId, { 0, 0, height }, { 32, 1, 42 }, { 0, 27, height + 4 });
+    PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { 32, 20, 0 }, { 0, 6, height });
+
+    if (direction == 1 || direction == 2)
+    {
+        PaintUtilPushTunnelRotated(session, direction, height, TUNNEL_1);
+
+        if (track_paint_util_should_paint_supports(session.MapPosition))
+        {
+            MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 8, height, session.TrackColours[SCHEME_SUPPORTS]);
+        }
+    }
+    else
+    {
+        PaintUtilPushTunnelRotated(session, direction, height + 24, TUNNEL_SQUARE_FLAT);
+
+        if (track_paint_util_should_paint_supports(session.MapPosition))
+        {
+            MetalASupportsPaintSetup(session, METAL_SUPPORTS_BOXED, 4, 8, height + 8, session.TrackColours[SCHEME_SUPPORTS]);
+        }
+    }
+    PaintUtilSetSegmentSupportHeight(
+        session, PaintUtilRotateSegments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
+    PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20);
+}
+
 TRACK_PAINT_FUNCTION get_track_paint_function_log_flume(int32_t trackType)
 {
     switch (trackType)
@@ -884,6 +1007,14 @@ TRACK_PAINT_FUNCTION get_track_paint_function_log_flume(int32_t trackType)
             return paint_log_flume_track_on_ride_photo;
         case TrackElemType::LogFlumeReverser:
             return paint_log_flume_track_reverser;
+
+            // Added by OpenRCT2
+        case TrackElemType::Down25ToDown60:
+            return log_flume_track_25_down_60;
+        case TrackElemType::Down60:
+            return log_flume_track_60_down;
+        case TrackElemType::Down60ToDown25:
+            return log_flume_track_60_down_25;
     }
 
     return nullptr;

src/openrct2/ride/water/meta/LogFlume.h

@@ -19,7 +19,7 @@ constexpr const RideTypeDescriptor LogFlumeRTD =
 {
     SET_FIELD(AlternateType, RIDE_TYPE_NULL),
     SET_FIELD(Category, RIDE_CATEGORY_WATER),
-    SET_FIELD(EnabledTrackPieces, {TRACK_STRAIGHT, TRACK_STATION_END, TRACK_SLOPE, TRACK_S_BEND, TRACK_CURVE_SMALL, TRACK_ON_RIDE_PHOTO, TRACK_LOG_FLUME_REVERSER}),
+    SET_FIELD(EnabledTrackPieces, {TRACK_STRAIGHT, TRACK_STATION_END, TRACK_SLOPE, TRACK_S_BEND, TRACK_CURVE_SMALL, TRACK_ON_RIDE_PHOTO, TRACK_LOG_FLUME_REVERSER, TRACK_SLOPE_STEEP_DOWN}),
     SET_FIELD(ExtraTrackPieces, {}),
     SET_FIELD(CoveredTrackPieces, {}),
     SET_FIELD(StartTrackPiece, TrackElemType::EndStation),
@@ -37,7 +37,7 @@ constexpr const RideTypeDescriptor LogFlumeRTD =
     SET_FIELD(NameConvention, { RideComponentType::Boat, RideComponentType::Track, RideComponentType::Station }),
     SET_FIELD(EnumName, nameof(RIDE_TYPE_LOG_FLUME)),
     SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_CONTROL_FAILURE)),
-    SET_FIELD(Heights, { 9, 24, 7, 9, }),
+    SET_FIELD(Heights, { 10, 24, 7, 9, }),
     SET_FIELD(MaxMass, 255),
     SET_FIELD(LiftData, { OpenRCT2::Audio::SoundId::Null, 5, 5 }),
     SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_log_flume),

src/openrct2/sprites.h

@@ -1190,9 +1190,26 @@ enum
     SPR_G2_LIM_LAUNCHED_TRACK_SMALL_FLAT_TO_STEEP = SPR_G2_LIM_LAUNCHED_TRACK_LARGE_ZERO_G_ROLL + 40,
     SPR_G2_LIM_LAUNCHED_TRACK_END = SPR_G2_LIM_LAUNCHED_TRACK_SMALL_FLAT_TO_STEEP + 20,
 
+    SPR_G2_FLUME_25_60_NE_SW = SPR_G2_LIM_LAUNCHED_TRACK_END,
+    SPR_G2_FLUME_25_60_NW_SE,
+    SPR_G2_FLUME_25_60_NE_SW_BACK_WATER,
+    SPR_G2_FLUME_25_60_NE_SW_BACK,
+    SPR_G2_FLUME_25_60_NW_SE_BACK_WATER,
+    SPR_G2_FLUME_25_60_NW_SE_BACK,
+    SPR_G2_FLUME_60_NE_SW,
+    SPR_G2_FLUME_60_NW_SE,
+    SPR_G2_FLUME_60_NE_SW_BACK,
+    SPR_G2_FLUME_60_NW_SE_BACK,
+    SPR_G2_FLUME_60_25_NE_SW,
+    SPR_G2_FLUME_60_25_NW_SE,
+    SPR_G2_FLUME_60_25_NE_SW_BACK_WATER,
+    SPR_G2_FLUME_60_25_NE_SW_BACK,
+    SPR_G2_FLUME_60_25_NW_SE_BACK_WATER,
+    SPR_G2_FLUME_60_25_NW_SE_BACK,
+
     // G2 Supports
 
-    SPR_G2_SUPPORT_BEGIN = SPR_G2_LIM_LAUNCHED_TRACK_END,
+    SPR_G2_SUPPORT_BEGIN,
     SPR_G2_SUPPORT_END = SPR_G2_SUPPORT_BEGIN + 32,
 
     // G2 New track types