diff --git a/resources/g2/sprites.json b/resources/g2/sprites.json index add34824c1..e696d4e681 100644 --- a/resources/g2/sprites.json +++ b/resources/g2/sprites.json @@ -2691,3635 +2691,3635 @@ "palette": "keep" }, { - "path": "track/intamin/booster_1.png", + "path": "track/lattice_triangle/booster_1.png", "x": -22, "y": -4 }, { - "path": "track/intamin/booster_2.png", + "path": "track/lattice_triangle/booster_2.png", "x": -22, "y": -4 }, { - "path": "track/intamin/brake_horizontal_background_open.png", + "path": "track/lattice_triangle/brake_horizontal_background_open.png", "x": -32, "y": -5, "palette": "keep" }, { - "path": "track/intamin/brake_horizontal_background_closed.png", + "path": "track/lattice_triangle/brake_horizontal_background_closed.png", "x": -32, "y": -5, "palette": "keep" }, { - "path": "track/intamin/brake_horizontal_foreground.png", + "path": "track/lattice_triangle/brake_horizontal_foreground.png", "x": -30, "y": 8, "palette": "keep" }, { - "path": "track/intamin/brake_vertical_background.png", + "path": "track/lattice_triangle/brake_vertical_background.png", "x": -14, "y": -10, "palette": "keep" }, { - "path": "track/intamin/brake_vertical_foreground_open.png", + "path": "track/lattice_triangle/brake_vertical_foreground_open.png", "x": -13, "y": -9, "palette": "keep" }, { - "path": "track/intamin/brake_vertical_foreground_closed.png", + "path": "track/lattice_triangle/brake_vertical_foreground_closed.png", "x": -13, "y": -9, "palette": "keep" }, { - "path": "track/intamin/liftbooster_0.png", + "path": "track/lattice_triangle/liftbooster_0.png", "x": -21, "y": -20, "palette": "keep" }, { - "path": "track/intamin/liftbooster_1.png", + "path": "track/lattice_triangle/liftbooster_1.png", "x": -21, "y": -4, "palette": "keep" }, { - "path": "track/intamin/liftbooster_2.png", + "path": "track/lattice_triangle/liftbooster_2.png", "x": -22, "y": -4, "palette": "keep" }, { - "path": "track/intamin/liftbooster_3.png", + "path": "track/lattice_triangle/liftbooster_3.png", "x": -22, "y": -20, "palette": "keep" }, { - "path": "track/intamin/steep_to_vertical_up_1.png", + "path": "track/lattice_triangle/steep_to_vertical_up_1.png", "x": -21, "y": -54, "palette": "keep" }, { - "path": "track/intamin/steep_to_vertical_up_2.png", + "path": "track/lattice_triangle/steep_to_vertical_up_2.png", "x": -21, "y": -53, "palette": "keep" }, { - "path": "track/intamin/steep_to_vertical_up_3.png", + "path": "track/lattice_triangle/steep_to_vertical_up_3.png", "x": -10, "y": -53, "palette": "keep" }, { - "path": "track/intamin/steep_to_vertical_up_4.png", + "path": "track/lattice_triangle/steep_to_vertical_up_4.png", "x": -10, "y": -54, "palette": "keep" }, { - "path": "track/intamin/vertical_to_steep_up_1.png", + "path": "track/lattice_triangle/vertical_to_steep_up_1.png", "x": -6, "y": -60, "palette": "keep" }, { - "path": "track/intamin/vertical_to_steep_up_2.png", + "path": "track/lattice_triangle/vertical_to_steep_up_2.png", "x": -6, "y": -44, "palette": "keep" }, { - "path": "track/intamin/vertical_to_steep_up_3.png", + "path": "track/lattice_triangle/vertical_to_steep_up_3.png", "x": -25, "y": -44, "palette": "keep" }, { - "path": "track/intamin/vertical_to_steep_up_4.png", + "path": "track/lattice_triangle/vertical_to_steep_up_4.png", "x": -25, "y": -61, "palette": "keep" }, { - "path": "track/intamin/vertical_1.png", + "path": "track/lattice_triangle/vertical_1.png", "x": -6, "y": -30, "palette": "keep" }, { - "path": "track/intamin/vertical_2.png", + "path": "track/lattice_triangle/vertical_2.png", "x": -6, "y": -29, "palette": "keep" }, { - "path": "track/intamin/vertical_3.png", + "path": "track/lattice_triangle/vertical_3.png", "x": -10, "y": -29, "palette": "keep" }, { - "path": "track/intamin/vertical_4.png", + "path": "track/lattice_triangle/vertical_4.png", "x": -10, "y": -30, "palette": "keep" }, { - "path": "track/intamin/vertical_twist_left_up_1.png", + "path": "track/lattice_triangle/vertical_twist_left_up_1.png", "x": -10, "y": -95, "palette": "keep" }, { - "path": "track/intamin/vertical_twist_left_up_2_1.png", + "path": "track/lattice_triangle/vertical_twist_left_up_2_1.png", "x": -6, "y": -94, "palette": "keep" }, { - "path": "track/intamin/vertical_twist_left_up_2_2.png", + "path": "track/lattice_triangle/vertical_twist_left_up_2_2.png", "x": -6, "y": -45, "palette": "keep" }, { - "path": "track/intamin/vertical_twist_left_up_3.png", + "path": "track/lattice_triangle/vertical_twist_left_up_3.png", "x": -10, "y": -93, "palette": "keep" }, { - "path": "track/intamin/vertical_twist_left_up_4_1.png", + "path": "track/lattice_triangle/vertical_twist_left_up_4_1.png", "x": -13, "y": -44, "palette": "keep" }, { - "path": "track/intamin/vertical_twist_left_up_4_2.png", + "path": "track/lattice_triangle/vertical_twist_left_up_4_2.png", "x": -13, "y": -93, "palette": "keep" }, { - "path": "track/intamin/vertical_twist_right_up_1_1.png", + "path": "track/lattice_triangle/vertical_twist_right_up_1_1.png", "x": -6, "y": -45, "palette": "keep" }, { - "path": "track/intamin/vertical_twist_right_up_1_2.png", + "path": "track/lattice_triangle/vertical_twist_right_up_1_2.png", "x": -6, "y": -93, "palette": "keep" }, { - "path": "track/intamin/vertical_twist_right_up_2.png", + "path": "track/lattice_triangle/vertical_twist_right_up_2.png", "x": -10, "y": -93, "palette": "keep" }, { - "path": "track/intamin/vertical_twist_right_up_3_1.png", + "path": "track/lattice_triangle/vertical_twist_right_up_3_1.png", "x": -13, "y": -94, "palette": "keep" }, { - "path": "track/intamin/vertical_twist_right_up_3_2.png", + "path": "track/lattice_triangle/vertical_twist_right_up_3_2.png", "x": -13, "y": -45, "palette": "keep" }, { - "path": "track/intamin/vertical_twist_right_up_4.png", + "path": "track/lattice_triangle/vertical_twist_right_up_4.png", "x": -10, "y": -94, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_left_1_1.png", + "path": "track/lattice_triangle/barrel_roll_left_1_1.png", "x": -22, "y": 4, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_left_1_2.png", + "path": "track/lattice_triangle/barrel_roll_left_1_2.png", "x": -17, "y": 4, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_left_1_3.png", + "path": "track/lattice_triangle/barrel_roll_left_1_3.png", "x": -22, "y": 3, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_left_1_4.png", + "path": "track/lattice_triangle/barrel_roll_left_1_4.png", "x": -20, "y": -21, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_left_1_5.png", + "path": "track/lattice_triangle/barrel_roll_left_1_5.png", "x": 0, "y": 0, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_left_1_6.png", + "path": "track/lattice_triangle/barrel_roll_left_1_6.png", "x": -11, "y": -31, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_left_2_1.png", + "path": "track/lattice_triangle/barrel_roll_left_2_1.png", "x": -22, "y": -4, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_left_2_2.png", + "path": "track/lattice_triangle/barrel_roll_left_2_2.png", "x": -20, "y": 4, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_left_2_3.png", + "path": "track/lattice_triangle/barrel_roll_left_2_3.png", "x": -28, "y": -5, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_left_2_4.png", + "path": "track/lattice_triangle/barrel_roll_left_2_4.png", "x": -28, "y": -8, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_left_2_5.png", + "path": "track/lattice_triangle/barrel_roll_left_2_5.png", "x": 10, "y": -1, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_left_2_6.png", + "path": "track/lattice_triangle/barrel_roll_left_2_6.png", "x": -32, "y": -21, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_left_3_1.png", + "path": "track/lattice_triangle/barrel_roll_left_3_1.png", "x": -29, "y": -4, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_left_3_2.png", + "path": "track/lattice_triangle/barrel_roll_left_3_2.png", "x": 10, "y": 8, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_left_3_3.png", + "path": "track/lattice_triangle/barrel_roll_left_3_3.png", "x": -26, "y": -16, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_left_3_4.png", + "path": "track/lattice_triangle/barrel_roll_left_3_4.png", "x": -28, "y": -13, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_left_3_5.png", + "path": "track/lattice_triangle/barrel_roll_left_3_5.png", "x": -1, "y": -16, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_left_3_6.png", + "path": "track/lattice_triangle/barrel_roll_left_3_6.png", "x": -22, "y": -29, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_left_4_1.png", + "path": "track/lattice_triangle/barrel_roll_left_4_1.png", "x": -15, "y": -15, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_left_4_2.png", + "path": "track/lattice_triangle/barrel_roll_left_4_2.png", "x": 13, "y": 23, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_left_4_3.png", + "path": "track/lattice_triangle/barrel_roll_left_4_3.png", "x": -12, "y": -23, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_left_4_4.png", + "path": "track/lattice_triangle/barrel_roll_left_4_4.png", "x": -10, "y": -31, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_left_4_5.png", + "path": "track/lattice_triangle/barrel_roll_left_4_5.png", "x": -12, "y": -16, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_left_4_6.png", + "path": "track/lattice_triangle/barrel_roll_left_4_6.png", "x": -22, "y": -31, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_right_1_1.png", + "path": "track/lattice_triangle/barrel_roll_right_1_1.png", "x": -22, "y": -15, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_right_1_2.png", + "path": "track/lattice_triangle/barrel_roll_right_1_2.png", "x": -17, "y": 22, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_right_1_3.png", + "path": "track/lattice_triangle/barrel_roll_right_1_3.png", "x": -26, "y": -23, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_right_1_4.png", + "path": "track/lattice_triangle/barrel_roll_right_1_4.png", "x": -15, "y": -31, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_right_1_5.png", + "path": "track/lattice_triangle/barrel_roll_right_1_5.png", "x": -22, "y": -12, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_right_1_6.png", + "path": "track/lattice_triangle/barrel_roll_right_1_6.png", "x": -26, "y": -31, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_right_2_1.png", + "path": "track/lattice_triangle/barrel_roll_right_2_1.png", "x": -22, "y": -4, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_right_2_2.png", + "path": "track/lattice_triangle/barrel_roll_right_2_2.png", "x": -17, "y": 9, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_right_2_3.png", + "path": "track/lattice_triangle/barrel_roll_right_2_3.png", "x": -7, "y": -15, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_right_2_4.png", + "path": "track/lattice_triangle/barrel_roll_right_2_4.png", "x": 14, "y": -12, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_right_2_5.png", + "path": "track/lattice_triangle/barrel_roll_right_2_5.png", "x": -7, "y": -16, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_right_2_6.png", + "path": "track/lattice_triangle/barrel_roll_right_2_6.png", "x": -6, "y": -28, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_right_3_1.png", + "path": "track/lattice_triangle/barrel_roll_right_3_1.png", "x": -2, "y": -4, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_right_3_2.png", + "path": "track/lattice_triangle/barrel_roll_right_3_2.png", "x": -4, "y": 4, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_right_3_3.png", + "path": "track/lattice_triangle/barrel_roll_right_3_3.png", "x": 0, "y": 0, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_right_3_4.png", + "path": "track/lattice_triangle/barrel_roll_right_3_4.png", "x": 0, "y": -8, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_right_3_5.png", + "path": "track/lattice_triangle/barrel_roll_right_3_5.png", "x": 0, "y": 0, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_right_3_6.png", + "path": "track/lattice_triangle/barrel_roll_right_3_6.png", "x": -22, "y": -21, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_right_4_1.png", + "path": "track/lattice_triangle/barrel_roll_right_4_1.png", "x": -12, "y": 4, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_right_4_2.png", + "path": "track/lattice_triangle/barrel_roll_right_4_2.png", "x": -25, "y": 5, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_right_4_3.png", + "path": "track/lattice_triangle/barrel_roll_right_4_3.png", "x": 8, "y": 14, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_right_4_4.png", + "path": "track/lattice_triangle/barrel_roll_right_4_4.png", "x": -28, "y": -21, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_right_4_5.png", + "path": "track/lattice_triangle/barrel_roll_right_4_5.png", "x": 0, "y": 0, "palette": "keep" }, { - "path": "track/intamin/barrel_roll_right_4_6.png", + "path": "track/lattice_triangle/barrel_roll_right_4_6.png", "x": -22, "y": -31, "palette": "keep" }, { - "path": "track/intamin/half_loop_1_1.png", + "path": "track/lattice_triangle/half_loop_1_1.png", "x": -28, "y": -22, "palette": "keep" }, { - "path": "track/intamin/half_loop_1_2.png", + "path": "track/lattice_triangle/half_loop_1_2.png", "x": -23, "y": -40, "palette": "keep" }, { - "path": "track/intamin/half_loop_1_3.png", + "path": "track/lattice_triangle/half_loop_1_3.png", "x": -13, "y": -92, "palette": "keep" }, { - "path": "track/intamin/half_loop_1_4.png", + "path": "track/lattice_triangle/half_loop_1_4.png", "x": -22, "y": 13, "palette": "keep" }, { - "path": "track/intamin/half_loop_2_1.png", + "path": "track/lattice_triangle/half_loop_2_1.png", "x": -16, "y": -18, "palette": "keep" }, { - "path": "track/intamin/half_loop_2_2.png", + "path": "track/lattice_triangle/half_loop_2_2.png", "x": 1, "y": -37, "palette": "keep" }, { - "path": "track/intamin/half_loop_2_3.png", + "path": "track/lattice_triangle/half_loop_2_3.png", "x": -38, "y": -114, "palette": "keep" }, { - "path": "track/intamin/half_loop_2_4.png", + "path": "track/lattice_triangle/half_loop_2_4.png", "x": -22, "y": 1, "palette": "keep" }, { - "path": "track/intamin/half_loop_3_1.png", + "path": "track/lattice_triangle/half_loop_3_1.png", "x": -29, "y": -9, "palette": "keep" }, { - "path": "track/intamin/half_loop_3_2.png", + "path": "track/lattice_triangle/half_loop_3_2.png", "x": -30, "y": -33, "palette": "keep" }, { - "path": "track/intamin/half_loop_3_3.png", + "path": "track/lattice_triangle/half_loop_3_3.png", "x": -2, "y": -121, "palette": "keep" }, { - "path": "track/intamin/half_loop_3_4.png", + "path": "track/lattice_triangle/half_loop_3_4.png", "x": -29, "y": -7, "palette": "keep" }, { - "path": "track/intamin/half_loop_4_1.png", + "path": "track/lattice_triangle/half_loop_4_1.png", "x": -13, "y": -22, "palette": "keep" }, { - "path": "track/intamin/half_loop_4_2.png", + "path": "track/lattice_triangle/half_loop_4_2.png", "x": -14, "y": -44, "palette": "keep" }, { - "path": "track/intamin/half_loop_4_3.png", + "path": "track/lattice_triangle/half_loop_4_3.png", "x": 4, "y": -101, "palette": "keep" }, { - "path": "track/intamin/half_loop_4_4.png", + "path": "track/lattice_triangle/half_loop_4_4.png", "x": 1, "y": 4, "palette": "keep" }, { - "path": "track/intamin/left_vertical_loop_1_1.png", + "path": "track/lattice_triangle/left_vertical_loop_1_1.png", "x": -28, "y": -25, "palette": "keep" }, { - "path": "track/intamin/left_vertical_loop_1_2.png", + "path": "track/lattice_triangle/left_vertical_loop_1_2.png", "x": -26, "y": -111, "palette": "keep" }, { - "path": "track/intamin/left_vertical_loop_1_3.png", + "path": "track/lattice_triangle/left_vertical_loop_1_3.png", "x": -22, "y": -84, "palette": "keep" }, { - "path": "track/intamin/left_vertical_loop_1_4.png", + "path": "track/lattice_triangle/left_vertical_loop_1_4.png", "x": -32, "y": 9, "palette": "keep" }, { - "path": "track/intamin/left_vertical_loop_2_1.png", + "path": "track/lattice_triangle/left_vertical_loop_2_1.png", "x": -15, "y": -26, "palette": "keep" }, { - "path": "track/intamin/left_vertical_loop_2_2.png", + "path": "track/lattice_triangle/left_vertical_loop_2_2.png", "x": 1, "y": -32, "palette": "keep" }, { - "path": "track/intamin/left_vertical_loop_2_3.png", + "path": "track/lattice_triangle/left_vertical_loop_2_3.png", "x": -34, "y": -114, "palette": "keep" }, { - "path": "track/intamin/left_vertical_loop_2_4.png", + "path": "track/lattice_triangle/left_vertical_loop_2_4.png", "x": -6, "y": -3, "palette": "keep" }, { - "path": "track/intamin/left_vertical_loop_3_1.png", + "path": "track/lattice_triangle/left_vertical_loop_3_1.png", "x": -25, "y": -110, "palette": "keep" }, { - "path": "track/intamin/left_vertical_loop_3_2.png", + "path": "track/lattice_triangle/left_vertical_loop_3_2.png", "x": -19, "y": -51, "palette": "keep" }, { - "path": "track/intamin/left_vertical_loop_3_3.png", + "path": "track/lattice_triangle/left_vertical_loop_3_3.png", "x": 11, "y": -94, "palette": "keep" }, { - "path": "track/intamin/left_vertical_loop_3_4.png", + "path": "track/lattice_triangle/left_vertical_loop_3_4.png", "x": -22, "y": 3, "palette": "keep" }, { - "path": "track/intamin/left_vertical_loop_4_1.png", + "path": "track/lattice_triangle/left_vertical_loop_4_1.png", "x": -15, "y": -20, "palette": "keep" }, { - "path": "track/intamin/left_vertical_loop_4_2.png", + "path": "track/lattice_triangle/left_vertical_loop_4_2.png", "x": -20, "y": -41, "palette": "keep" }, { - "path": "track/intamin/left_vertical_loop_4_3.png", + "path": "track/lattice_triangle/left_vertical_loop_4_3.png", "x": -4, "y": -87, "palette": "keep" }, { - "path": "track/intamin/left_vertical_loop_4_4.png", + "path": "track/lattice_triangle/left_vertical_loop_4_4.png", "x": -13, "y": 17, "palette": "keep" }, { - "path": "track/intamin/right_vertical_loop_1_1.png", + "path": "track/lattice_triangle/right_vertical_loop_1_1.png", "x": -27, "y": -20, "palette": "keep" }, { - "path": "track/intamin/right_vertical_loop_1_2.png", + "path": "track/lattice_triangle/right_vertical_loop_1_2.png", "x": -27, "y": -41, "palette": "keep" }, { - "path": "track/intamin/right_vertical_loop_1_3.png", + "path": "track/lattice_triangle/right_vertical_loop_1_3.png", "x": -20, "y": -86, "palette": "keep" }, { - "path": "track/intamin/right_vertical_loop_1_4.png", + "path": "track/lattice_triangle/right_vertical_loop_1_4.png", "x": -21, "y": 16, "palette": "keep" }, { - "path": "track/intamin/right_vertical_loop_2_1.png", + "path": "track/lattice_triangle/right_vertical_loop_2_1.png", "x": -16, "y": -9, "palette": "keep" }, { - "path": "track/intamin/right_vertical_loop_2_2.png", + "path": "track/lattice_triangle/right_vertical_loop_2_2.png", "x": -7, "y": -51, "palette": "keep" }, { - "path": "track/intamin/right_vertical_loop_2_3.png", + "path": "track/lattice_triangle/right_vertical_loop_2_3.png", "x": -23, "y": -100, "palette": "keep" }, { - "path": "track/intamin/right_vertical_loop_2_4.png", + "path": "track/lattice_triangle/right_vertical_loop_2_4.png", "x": -16, "y": 5, "palette": "keep" }, { - "path": "track/intamin/right_vertical_loop_3_1.png", + "path": "track/lattice_triangle/right_vertical_loop_3_1.png", "x": -46, "y": -26, "palette": "keep" }, { - "path": "track/intamin/right_vertical_loop_3_2.png", + "path": "track/lattice_triangle/right_vertical_loop_3_2.png", "x": -41, "y": -32, "palette": "keep" }, { - "path": "track/intamin/right_vertical_loop_3_3.png", + "path": "track/lattice_triangle/right_vertical_loop_3_3.png", "x": 8, "y": -114, "palette": "keep" }, { - "path": "track/intamin/right_vertical_loop_3_4.png", + "path": "track/lattice_triangle/right_vertical_loop_3_4.png", "x": -27, "y": 0, "palette": "keep" }, { - "path": "track/intamin/right_vertical_loop_4_1.png", + "path": "track/lattice_triangle/right_vertical_loop_4_1.png", "x": -10, "y": -25, "palette": "keep" }, { - "path": "track/intamin/right_vertical_loop_4_2.png", + "path": "track/lattice_triangle/right_vertical_loop_4_2.png", "x": -11, "y": -111, "palette": "keep" }, { - "path": "track/intamin/right_vertical_loop_4_3.png", + "path": "track/lattice_triangle/right_vertical_loop_4_3.png", "x": 1, "y": -83, "palette": "keep" }, { - "path": "track/intamin/right_vertical_loop_4_4.png", + "path": "track/lattice_triangle/right_vertical_loop_4_4.png", "x": -9, "y": 9, "palette": "keep" }, { - "path": "track/intamin/quarter_loop_up_1_1.png", + "path": "track/lattice_triangle/quarter_loop_up_1_1.png", "x": -18, "y": -55, "palette": "keep" }, { - "path": "track/intamin/quarter_loop_up_1_2.png", + "path": "track/lattice_triangle/quarter_loop_up_1_2.png", "x": 0, "y": -43, "palette": "keep" }, { - "path": "track/intamin/quarter_loop_up_1_3.png", + "path": "track/lattice_triangle/quarter_loop_up_1_3.png", "x": -22, "y": -23, "palette": "keep" }, { - "path": "track/intamin/quarter_loop_up_2_1.png", + "path": "track/lattice_triangle/quarter_loop_up_2_1.png", "x": -24, "y": -79, "palette": "keep" }, { - "path": "track/intamin/quarter_loop_up_2_2.png", + "path": "track/lattice_triangle/quarter_loop_up_2_2.png", "x": -32, "y": -66, "palette": "keep" }, { - "path": "track/intamin/quarter_loop_up_2_3.png", + "path": "track/lattice_triangle/quarter_loop_up_2_3.png", "x": -22, "y": -31, "palette": "keep" }, { - "path": "track/intamin/quarter_loop_up_3_1.png", + "path": "track/lattice_triangle/quarter_loop_up_3_1.png", "x": -10, "y": -78, "palette": "keep" }, { - "path": "track/intamin/quarter_loop_up_3_2.png", + "path": "track/lattice_triangle/quarter_loop_up_3_2.png", "x": -21, "y": -68, "palette": "keep" }, { - "path": "track/intamin/quarter_loop_up_3_3.png", + "path": "track/lattice_triangle/quarter_loop_up_3_3.png", "x": -11, "y": -31, "palette": "keep" }, { - "path": "track/intamin/quarter_loop_up_4_1.png", + "path": "track/lattice_triangle/quarter_loop_up_4_1.png", "x": -10, "y": -56, "palette": "keep" }, { - "path": "track/intamin/quarter_loop_up_4_2.png", + "path": "track/lattice_triangle/quarter_loop_up_4_2.png", "x": -28, "y": -43, "palette": "keep" }, { - "path": "track/intamin/quarter_loop_up_4_3.png", + "path": "track/lattice_triangle/quarter_loop_up_4_3.png", "x": -32, "y": -23, "palette": "keep" }, { - "path": "track/intamin/corkscrew_left_1_1.png", + "path": "track/lattice_triangle/corkscrew_left_1_1.png", "x": -22, "y": -71, "palette": "keep" }, { - "path": "track/intamin/corkscrew_left_1_2.png", + "path": "track/lattice_triangle/corkscrew_left_1_2.png", "x": -20, "y": -36, "palette": "keep" }, { - "path": "track/intamin/corkscrew_left_1_3.png", + "path": "track/lattice_triangle/corkscrew_left_1_3.png", "x": -22, "y": -31, "palette": "keep" }, { - "path": "track/intamin/corkscrew_left_2_1.png", + "path": "track/lattice_triangle/corkscrew_left_2_1.png", "x": -22, "y": -4, "palette": "keep" }, { - "path": "track/intamin/corkscrew_left_2_2.png", + "path": "track/lattice_triangle/corkscrew_left_2_2.png", "x": -32, "y": -36, "palette": "keep" }, { - "path": "track/intamin/corkscrew_left_2_3.png", + "path": "track/lattice_triangle/corkscrew_left_2_3.png", "x": -21, "y": -31, "palette": "keep" }, { - "path": "track/intamin/corkscrew_left_3_1.png", + "path": "track/lattice_triangle/corkscrew_left_3_1.png", "x": -31, "y": -9, "palette": "keep" }, { - "path": "track/intamin/corkscrew_left_3_2.png", + "path": "track/lattice_triangle/corkscrew_left_3_2.png", "x": -3, "y": -24, "palette": "keep" }, { - "path": "track/intamin/corkscrew_left_3_3.png", + "path": "track/lattice_triangle/corkscrew_left_3_3.png", "x": -19, "y": -19, "palette": "keep" }, { - "path": "track/intamin/corkscrew_left_4_1.png", + "path": "track/lattice_triangle/corkscrew_left_4_1.png", "x": -32, "y": -39, "palette": "keep" }, { - "path": "track/intamin/corkscrew_left_4_2.png", + "path": "track/lattice_triangle/corkscrew_left_4_2.png", "x": -34, "y": -21, "palette": "keep" }, { - "path": "track/intamin/corkscrew_left_4_3.png", + "path": "track/lattice_triangle/corkscrew_left_4_3.png", "x": -22, "y": -22, "palette": "keep" }, { - "path": "track/intamin/corkscrew_right_1_1.png", + "path": "track/lattice_triangle/corkscrew_right_1_1.png", "x": -22, "y": -39, "palette": "keep" }, { - "path": "track/intamin/corkscrew_right_1_2.png", + "path": "track/lattice_triangle/corkscrew_right_1_2.png", "x": -8, "y": -22, "palette": "keep" }, { - "path": "track/intamin/corkscrew_right_1_3.png", + "path": "track/lattice_triangle/corkscrew_right_1_3.png", "x": -20, "y": -22, "palette": "keep" }, { - "path": "track/intamin/corkscrew_right_2_1.png", + "path": "track/lattice_triangle/corkscrew_right_2_1.png", "x": -22, "y": -9, "palette": "keep" }, { - "path": "track/intamin/corkscrew_right_2_2.png", + "path": "track/lattice_triangle/corkscrew_right_2_2.png", "x": -13, "y": -24, "palette": "keep" }, { - "path": "track/intamin/corkscrew_right_2_3.png", + "path": "track/lattice_triangle/corkscrew_right_2_3.png", "x": -22, "y": -19, "palette": "keep" }, { - "path": "track/intamin/corkscrew_right_3_1.png", + "path": "track/lattice_triangle/corkscrew_right_3_1.png", "x": -7, "y": -4, "palette": "keep" }, { - "path": "track/intamin/corkscrew_right_3_2.png", + "path": "track/lattice_triangle/corkscrew_right_3_2.png", "x": -22, "y": -36, "palette": "keep" }, { - "path": "track/intamin/corkscrew_right_3_3.png", + "path": "track/lattice_triangle/corkscrew_right_3_3.png", "x": -22, "y": -31, "palette": "keep" }, { - "path": "track/intamin/corkscrew_right_4_1.png", + "path": "track/lattice_triangle/corkscrew_right_4_1.png", "x": -27, "y": -65, "palette": "keep" }, { - "path": "track/intamin/corkscrew_right_4_2.png", + "path": "track/lattice_triangle/corkscrew_right_4_2.png", "x": -3, "y": -36, "palette": "keep" }, { - "path": "track/intamin/corkscrew_right_4_3.png", + "path": "track/lattice_triangle/corkscrew_right_4_3.png", "x": -26, "y": -31, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_left_1_1.png", + "path": "track/lattice_triangle/large_corkscrew_left_1_1.png", "x": -22, "y": -12, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_left_1_2.png", + "path": "track/lattice_triangle/large_corkscrew_left_1_2.png", "x": -21, "y": -72, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_left_1_3.png", + "path": "track/lattice_triangle/large_corkscrew_left_1_3.png", "x": -28, "y": -40, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_left_1_4.png", + "path": "track/lattice_triangle/large_corkscrew_left_1_4.png", "x": -23, "y": -52, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_left_1_5.png", + "path": "track/lattice_triangle/large_corkscrew_left_1_5.png", "x": -22, "y": -39, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_left_2_1.png", + "path": "track/lattice_triangle/large_corkscrew_left_2_1.png", "x": -22, "y": -4, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_left_2_2.png", + "path": "track/lattice_triangle/large_corkscrew_left_2_2.png", "x": -32, "y": -15, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_left_2_3.png", + "path": "track/lattice_triangle/large_corkscrew_left_2_3.png", "x": -23, "y": -50, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_left_2_4.png", + "path": "track/lattice_triangle/large_corkscrew_left_2_4.png", "x": -18, "y": -56, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_left_2_5.png", + "path": "track/lattice_triangle/large_corkscrew_left_2_5.png", "x": -14, "y": -39, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_left_3_1.png", + "path": "track/lattice_triangle/large_corkscrew_left_3_1.png", "x": -16, "y": -4, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_left_3_2.png", + "path": "track/lattice_triangle/large_corkscrew_left_3_2.png", "x": -19, "y": -17, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_left_3_3.png", + "path": "track/lattice_triangle/large_corkscrew_left_3_3.png", "x": 10, "y": -33, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_left_3_4.png", + "path": "track/lattice_triangle/large_corkscrew_left_3_4.png", "x": -8, "y": -38, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_left_3_5.png", + "path": "track/lattice_triangle/large_corkscrew_left_3_5.png", "x": -16, "y": -30, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_left_4_1.png", + "path": "track/lattice_triangle/large_corkscrew_left_4_1.png", "x": -24, "y": -11, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_left_4_2.png", + "path": "track/lattice_triangle/large_corkscrew_left_4_2.png", "x": -23, "y": -27, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_left_4_3.png", + "path": "track/lattice_triangle/large_corkscrew_left_4_3.png", "x": -14, "y": -13, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_left_4_4.png", + "path": "track/lattice_triangle/large_corkscrew_left_4_4.png", "x": -29, "y": -36, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_left_4_5.png", + "path": "track/lattice_triangle/large_corkscrew_left_4_5.png", "x": -22, "y": -33, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_right_1_1.png", + "path": "track/lattice_triangle/large_corkscrew_right_1_1.png", "x": -22, "y": -11, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_right_1_2.png", + "path": "track/lattice_triangle/large_corkscrew_right_1_2.png", "x": -22, "y": -27, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_right_1_3.png", + "path": "track/lattice_triangle/large_corkscrew_right_1_3.png", "x": -20, "y": -13, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_right_1_4.png", + "path": "track/lattice_triangle/large_corkscrew_right_1_4.png", "x": -28, "y": -37, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_right_1_5.png", + "path": "track/lattice_triangle/large_corkscrew_right_1_5.png", "x": -32, "y": -33, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_right_2_1.png", + "path": "track/lattice_triangle/large_corkscrew_right_2_1.png", "x": -22, "y": -4, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_right_2_2.png", + "path": "track/lattice_triangle/large_corkscrew_right_2_2.png", "x": -16, "y": -17, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_right_2_3.png", + "path": "track/lattice_triangle/large_corkscrew_right_2_3.png", "x": -24, "y": -32, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_right_2_4.png", + "path": "track/lattice_triangle/large_corkscrew_right_2_4.png", "x": -16, "y": -38, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_right_2_5.png", + "path": "track/lattice_triangle/large_corkscrew_right_2_5.png", "x": -22, "y": -30, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_right_3_1.png", + "path": "track/lattice_triangle/large_corkscrew_right_3_1.png", "x": -29, "y": -4, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_right_3_2.png", + "path": "track/lattice_triangle/large_corkscrew_right_3_2.png", "x": -16, "y": -15, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_right_3_3.png", + "path": "track/lattice_triangle/large_corkscrew_right_3_3.png", "x": -25, "y": -50, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_right_3_4.png", + "path": "track/lattice_triangle/large_corkscrew_right_3_4.png", "x": -28, "y": -56, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_right_3_5.png", + "path": "track/lattice_triangle/large_corkscrew_right_3_5.png", "x": -22, "y": -39, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_right_4_1.png", + "path": "track/lattice_triangle/large_corkscrew_right_4_1.png", "x": -26, "y": -12, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_right_4_2.png", + "path": "track/lattice_triangle/large_corkscrew_right_4_2.png", "x": -11, "y": -68, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_right_4_3.png", + "path": "track/lattice_triangle/large_corkscrew_right_4_3.png", "x": 10, "y": -40, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_right_4_4.png", + "path": "track/lattice_triangle/large_corkscrew_right_4_4.png", "x": -17, "y": -52, "palette": "keep" }, { - "path": "track/intamin/large_corkscrew_right_4_5.png", + "path": "track/lattice_triangle/large_corkscrew_right_4_5.png", "x": -24, "y": -39, "palette": "keep" }, { - "path": "track/intamin/small_turn_left_bank_to_gentle_up_1_1.png", + "path": "track/lattice_triangle/small_turn_left_bank_to_gentle_up_1_1.png", "x": -26, "y": -20, "palette": "keep" }, { - "path": "track/intamin/small_turn_left_bank_to_gentle_up_1_2.png", + "path": "track/lattice_triangle/small_turn_left_bank_to_gentle_up_1_2.png", "x": -16, "y": -15, "palette": "keep" }, { - "path": "track/intamin/small_turn_left_bank_to_gentle_up_2_1.png", + "path": "track/lattice_triangle/small_turn_left_bank_to_gentle_up_2_1.png", "x": 3, "y": -5, "palette": "keep" }, { - "path": "track/intamin/small_turn_left_bank_to_gentle_up_2_2.png", + "path": "track/lattice_triangle/small_turn_left_bank_to_gentle_up_2_2.png", "x": -17, "y": -7, "palette": "keep" }, { - "path": "track/intamin/small_turn_left_bank_to_gentle_up_2_3.png", + "path": "track/lattice_triangle/small_turn_left_bank_to_gentle_up_2_3.png", "x": -38, "y": -15, "palette": "keep" }, { - "path": "track/intamin/small_turn_left_bank_to_gentle_up_3_1.png", + "path": "track/lattice_triangle/small_turn_left_bank_to_gentle_up_3_1.png", "x": -18, "y": -11, "palette": "keep" }, { - "path": "track/intamin/small_turn_left_bank_to_gentle_up_3_2.png", + "path": "track/lattice_triangle/small_turn_left_bank_to_gentle_up_3_2.png", "x": -5, "y": -4, "palette": "keep" }, { - "path": "track/intamin/small_turn_left_bank_to_gentle_up_4_1.png", + "path": "track/lattice_triangle/small_turn_left_bank_to_gentle_up_4_1.png", "x": -26, "y": -12, "palette": "keep" }, { - "path": "track/intamin/small_turn_left_bank_to_gentle_up_4_2.png", + "path": "track/lattice_triangle/small_turn_left_bank_to_gentle_up_4_2.png", "x": -28, "y": 1, "palette": "keep" }, { - "path": "track/intamin/small_turn_right_bank_to_gentle_up_1_1.png", + "path": "track/lattice_triangle/small_turn_right_bank_to_gentle_up_1_1.png", "x": -29, "y": -12, "palette": "keep" }, { - "path": "track/intamin/small_turn_right_bank_to_gentle_up_1_2.png", + "path": "track/lattice_triangle/small_turn_right_bank_to_gentle_up_1_2.png", "x": -26, "y": 1, "palette": "keep" }, { - "path": "track/intamin/small_turn_right_bank_to_gentle_up_2_1.png", + "path": "track/lattice_triangle/small_turn_right_bank_to_gentle_up_2_1.png", "x": -13, "y": -11, "palette": "keep" }, { - "path": "track/intamin/small_turn_right_bank_to_gentle_up_2_2.png", + "path": "track/lattice_triangle/small_turn_right_bank_to_gentle_up_2_2.png", "x": -28, "y": -4, "palette": "keep" }, { - "path": "track/intamin/small_turn_right_bank_to_gentle_up_3_1.png", + "path": "track/lattice_triangle/small_turn_right_bank_to_gentle_up_3_1.png", "x": -38, "y": -6, "palette": "keep" }, { - "path": "track/intamin/small_turn_right_bank_to_gentle_up_3_2.png", + "path": "track/lattice_triangle/small_turn_right_bank_to_gentle_up_3_2.png", "x": -38, "y": -6, "palette": "keep" }, { - "path": "track/intamin/small_turn_right_bank_to_gentle_up_3_3.png", + "path": "track/lattice_triangle/small_turn_right_bank_to_gentle_up_3_3.png", "x": -16, "y": -15, "palette": "keep" }, { - "path": "track/intamin/small_turn_right_bank_to_gentle_up_4_1.png", + "path": "track/lattice_triangle/small_turn_right_bank_to_gentle_up_4_1.png", "x": -6, "y": -20, "palette": "keep" }, { - "path": "track/intamin/small_turn_right_bank_to_gentle_up_4_2.png", + "path": "track/lattice_triangle/small_turn_right_bank_to_gentle_up_4_2.png", "x": -18, "y": -15, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_left_1_1.png", + "path": "track/lattice_triangle/medium_half_loop_left_1_1.png", "x": -22, "y": -34, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_left_1_2.png", + "path": "track/lattice_triangle/medium_half_loop_left_1_2.png", "x": -21, "y": -51, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_left_1_3.png", + "path": "track/lattice_triangle/medium_half_loop_left_1_3.png", "x": -29, "y": -100, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_left_1_4.png", + "path": "track/lattice_triangle/medium_half_loop_left_1_4.png", "x": -44, "y": -128, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_left_1_5.png", + "path": "track/lattice_triangle/medium_half_loop_left_1_5.png", "x": -21, "y": -37, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_left_2_1.png", + "path": "track/lattice_triangle/medium_half_loop_left_2_1.png", "x": -22, "y": -12, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_left_2_2.png", + "path": "track/lattice_triangle/medium_half_loop_left_2_2.png", "x": 0, "y": -34, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_left_2_3.png", + "path": "track/lattice_triangle/medium_half_loop_left_2_3.png", "x": 0, "y": -87, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_left_2_4.png", + "path": "track/lattice_triangle/medium_half_loop_left_2_4.png", "x": -30, "y": -148, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_left_2_5.png", + "path": "track/lattice_triangle/medium_half_loop_left_2_5.png", "x": -22, "y": -47, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_left_3_1.png", + "path": "track/lattice_triangle/medium_half_loop_left_3_1.png", "x": -23, "y": -7, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_left_3_2.png", + "path": "track/lattice_triangle/medium_half_loop_left_3_2.png", "x": 0, "y": -13, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_left_3_3.png", + "path": "track/lattice_triangle/medium_half_loop_left_3_3.png", "x": -3, "y": -59, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_left_3_4.png", + "path": "track/lattice_triangle/medium_half_loop_left_3_4.png", "x": -32, "y": -154, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_left_3_5.png", + "path": "track/lattice_triangle/medium_half_loop_left_3_5.png", "x": -17, "y": -47, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_left_4_1.png", + "path": "track/lattice_triangle/medium_half_loop_left_4_1.png", "x": -23, "y": -19, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_left_4_2.png", + "path": "track/lattice_triangle/medium_half_loop_left_4_2.png", "x": -25, "y": -26, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_left_4_3.png", + "path": "track/lattice_triangle/medium_half_loop_left_4_3.png", "x": -30, "y": -31, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_left_4_4.png", + "path": "track/lattice_triangle/medium_half_loop_left_4_4.png", "x": -10, "y": -129, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_left_4_5.png", + "path": "track/lattice_triangle/medium_half_loop_left_4_5.png", "x": -28, "y": -40, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_right_1_1.png", + "path": "track/lattice_triangle/medium_half_loop_right_1_1.png", "x": -22, "y": -19, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_right_1_2.png", + "path": "track/lattice_triangle/medium_half_loop_right_1_2.png", "x": -19, "y": -26, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_right_1_3.png", + "path": "track/lattice_triangle/medium_half_loop_right_1_3.png", "x": -17, "y": -31, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_right_1_4.png", + "path": "track/lattice_triangle/medium_half_loop_right_1_4.png", "x": -26, "y": -129, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_right_1_5.png", + "path": "track/lattice_triangle/medium_half_loop_right_1_5.png", "x": -22, "y": -40, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_right_2_1.png", + "path": "track/lattice_triangle/medium_half_loop_right_2_1.png", "x": -22, "y": -7, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_right_2_2.png", + "path": "track/lattice_triangle/medium_half_loop_right_2_2.png", "x": -32, "y": -13, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_right_2_3.png", + "path": "track/lattice_triangle/medium_half_loop_right_2_3.png", "x": -32, "y": -59, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_right_2_4.png", + "path": "track/lattice_triangle/medium_half_loop_right_2_4.png", "x": -25, "y": -154, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_right_2_5.png", + "path": "track/lattice_triangle/medium_half_loop_right_2_5.png", "x": -21, "y": -47, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_right_3_1.png", + "path": "track/lattice_triangle/medium_half_loop_right_3_1.png", "x": -32, "y": -12, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_right_3_2.png", + "path": "track/lattice_triangle/medium_half_loop_right_3_2.png", "x": -32, "y": -34, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_right_3_3.png", + "path": "track/lattice_triangle/medium_half_loop_right_3_3.png", "x": -32, "y": -87, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_right_3_4.png", + "path": "track/lattice_triangle/medium_half_loop_right_3_4.png", "x": -10, "y": -148, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_right_3_5.png", + "path": "track/lattice_triangle/medium_half_loop_right_3_5.png", "x": -12, "y": -47, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_right_4_1.png", + "path": "track/lattice_triangle/medium_half_loop_right_4_1.png", "x": -23, "y": -34, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_right_4_2.png", + "path": "track/lattice_triangle/medium_half_loop_right_4_2.png", "x": -16, "y": -51, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_right_4_3.png", + "path": "track/lattice_triangle/medium_half_loop_right_4_3.png", "x": -3, "y": -100, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_right_4_4.png", + "path": "track/lattice_triangle/medium_half_loop_right_4_4.png", "x": -32, "y": -128, "palette": "keep" }, { - "path": "track/intamin/medium_half_loop_right_4_5.png", + "path": "track/lattice_triangle/medium_half_loop_right_4_5.png", "x": -32, "y": -37, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_left_1_1.png", + "path": "track/lattice_triangle/large_half_loop_left_1_1.png", "x": -22, "y": -29, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_left_1_2.png", + "path": "track/lattice_triangle/large_half_loop_left_1_2.png", "x": -18, "y": -42, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_left_1_3.png", + "path": "track/lattice_triangle/large_half_loop_left_1_3.png", "x": -19, "y": -70, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_left_1_4.png", + "path": "track/lattice_triangle/large_half_loop_left_1_4.png", "x": -24, "y": -85, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_left_1_5.png", + "path": "track/lattice_triangle/large_half_loop_left_1_5.png", "x": -16, "y": -70, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_left_1_6.png", + "path": "track/lattice_triangle/large_half_loop_left_1_6.png", "x": -9, "y": -183, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_left_1_7.png", + "path": "track/lattice_triangle/large_half_loop_left_1_7.png", "x": -21, "y": -20, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_left_2_1.png", + "path": "track/lattice_triangle/large_half_loop_left_2_1.png", "x": -22, "y": -5, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_left_2_2.png", + "path": "track/lattice_triangle/large_half_loop_left_2_2.png", "x": -6, "y": -9, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_left_2_3.png", + "path": "track/lattice_triangle/large_half_loop_left_2_3.png", "x": -9, "y": -27, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_left_2_4.png", + "path": "track/lattice_triangle/large_half_loop_left_2_4.png", "x": -8, "y": -94, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_left_2_5.png", + "path": "track/lattice_triangle/large_half_loop_left_2_5.png", "x": -32, "y": -130, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_left_2_6.png", + "path": "track/lattice_triangle/large_half_loop_left_2_6.png", "x": -25, "y": -197, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_left_2_7.png", + "path": "track/lattice_triangle/large_half_loop_left_2_7.png", "x": -22, "y": -31, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_left_3_1.png", + "path": "track/lattice_triangle/large_half_loop_left_3_1.png", "x": -24, "y": -3, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_left_3_2.png", + "path": "track/lattice_triangle/large_half_loop_left_3_2.png", "x": -32, "y": -9, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_left_3_3.png", + "path": "track/lattice_triangle/large_half_loop_left_3_3.png", "x": -29, "y": -38, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_left_3_4.png", + "path": "track/lattice_triangle/large_half_loop_left_3_4.png", "x": -7, "y": -61, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_left_3_5.png", + "path": "track/lattice_triangle/large_half_loop_left_3_5.png", "x": -7, "y": -117, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_left_3_6.png", + "path": "track/lattice_triangle/large_half_loop_left_3_6.png", "x": -22, "y": -197, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_left_3_7.png", + "path": "track/lattice_triangle/large_half_loop_left_3_7.png", "x": -28, "y": -32, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_left_4_1.png", + "path": "track/lattice_triangle/large_half_loop_left_4_1.png", "x": -24, "y": -18, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_left_4_2.png", + "path": "track/lattice_triangle/large_half_loop_left_4_2.png", "x": -30, "y": -21, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_left_4_3.png", + "path": "track/lattice_triangle/large_half_loop_left_4_3.png", "x": -32, "y": -52, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_left_4_4.png", + "path": "track/lattice_triangle/large_half_loop_left_4_4.png", "x": -32, "y": -84, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_left_4_5.png", + "path": "track/lattice_triangle/large_half_loop_left_4_5.png", "x": 16, "y": -62, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_left_4_6.png", + "path": "track/lattice_triangle/large_half_loop_left_4_6.png", "x": -16, "y": -186, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_left_4_7.png", + "path": "track/lattice_triangle/large_half_loop_left_4_7.png", "x": -24, "y": -22, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_right_1_1.png", + "path": "track/lattice_triangle/large_half_loop_right_1_1.png", "x": -22, "y": -18, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_right_1_2.png", + "path": "track/lattice_triangle/large_half_loop_right_1_2.png", "x": -18, "y": -21, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_right_1_3.png", + "path": "track/lattice_triangle/large_half_loop_right_1_3.png", "x": -13, "y": -52, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_right_1_4.png", + "path": "track/lattice_triangle/large_half_loop_right_1_4.png", "x": 0, "y": -84, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_right_1_5.png", + "path": "track/lattice_triangle/large_half_loop_right_1_5.png", "x": -32, "y": -62, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_right_1_6.png", + "path": "track/lattice_triangle/large_half_loop_right_1_6.png", "x": -19, "y": -186, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_right_1_7.png", + "path": "track/lattice_triangle/large_half_loop_right_1_7.png", "x": -22, "y": -22, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_right_2_1.png", + "path": "track/lattice_triangle/large_half_loop_right_2_1.png", "x": -22, "y": -3, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_right_2_2.png", + "path": "track/lattice_triangle/large_half_loop_right_2_2.png", "x": -13, "y": -9, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_right_2_3.png", + "path": "track/lattice_triangle/large_half_loop_right_2_3.png", "x": -6, "y": -38, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_right_2_4.png", + "path": "track/lattice_triangle/large_half_loop_right_2_4.png", "x": -16, "y": -61, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_right_2_5.png", + "path": "track/lattice_triangle/large_half_loop_right_2_5.png", "x": -23, "y": -117, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_right_2_6.png", + "path": "track/lattice_triangle/large_half_loop_right_2_6.png", "x": -17, "y": -197, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_right_2_7.png", + "path": "track/lattice_triangle/large_half_loop_right_2_7.png", "x": -21, "y": -32, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_right_3_1.png", + "path": "track/lattice_triangle/large_half_loop_right_3_1.png", "x": -26, "y": -5, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_right_3_2.png", + "path": "track/lattice_triangle/large_half_loop_right_3_2.png", "x": -30, "y": -9, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_right_3_3.png", + "path": "track/lattice_triangle/large_half_loop_right_3_3.png", "x": -29, "y": -27, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_right_3_4.png", + "path": "track/lattice_triangle/large_half_loop_right_3_4.png", "x": -32, "y": -94, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_right_3_5.png", + "path": "track/lattice_triangle/large_half_loop_right_3_5.png", "x": 16, "y": -130, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_right_3_6.png", + "path": "track/lattice_triangle/large_half_loop_right_3_6.png", "x": 0, "y": -197, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_right_3_7.png", + "path": "track/lattice_triangle/large_half_loop_right_3_7.png", "x": -17, "y": -31, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_right_4_1.png", + "path": "track/lattice_triangle/large_half_loop_right_4_1.png", "x": -24, "y": -29, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_right_4_2.png", + "path": "track/lattice_triangle/large_half_loop_right_4_2.png", "x": -25, "y": -42, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_right_4_3.png", + "path": "track/lattice_triangle/large_half_loop_right_4_3.png", "x": -21, "y": -70, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_right_4_4.png", + "path": "track/lattice_triangle/large_half_loop_right_4_4.png", "x": -5, "y": -85, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_right_4_5.png", + "path": "track/lattice_triangle/large_half_loop_right_4_5.png", "x": -7, "y": -70, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_right_4_6.png", + "path": "track/lattice_triangle/large_half_loop_right_4_6.png", "x": -32, "y": -183, "palette": "keep" }, { - "path": "track/intamin/large_half_loop_right_4_7.png", + "path": "track/lattice_triangle/large_half_loop_right_4_7.png", "x": -31, "y": -20, "palette": "keep" }, { - "path": "track/intamin/zero_g_roll_left_1_1.png", + "path": "track/lattice_triangle/zero_g_roll_left_1_1.png", "x": -22, "y": -15, "palette": "keep" }, { - "path": "track/intamin/zero_g_roll_left_1_2.png", + "path": "track/lattice_triangle/zero_g_roll_left_1_2.png", "x": -10, "y": -16, "palette": "keep" }, { - "path": "track/intamin/zero_g_roll_left_1_3.png", + "path": "track/lattice_triangle/zero_g_roll_left_1_3.png", "x": -11, "y": -26, "palette": "keep" }, { - "path": "track/intamin/zero_g_roll_left_1_4.png", + "path": "track/lattice_triangle/zero_g_roll_left_1_4.png", "x": -19, "y": -31, "palette": "keep" }, { - "path": "track/intamin/zero_g_roll_left_2_1.png", + "path": "track/lattice_triangle/zero_g_roll_left_2_1.png", "x": -22, "y": -3, "palette": "keep" }, { - "path": "track/intamin/zero_g_roll_left_2_2.png", + "path": "track/lattice_triangle/zero_g_roll_left_2_2.png", "x": -22, "y": -4, "palette": "keep" }, { - "path": "track/intamin/zero_g_roll_left_2_3.png", + "path": "track/lattice_triangle/zero_g_roll_left_2_3.png", "x": -23, "y": -18, "palette": "keep" }, { - "path": "track/intamin/zero_g_roll_left_2_4.png", + "path": "track/lattice_triangle/zero_g_roll_left_2_4.png", "x": -21, "y": -18, "palette": "keep" }, { - "path": "track/intamin/zero_g_roll_left_3_1.png", + "path": "track/lattice_triangle/zero_g_roll_left_3_1.png", "x": -20, "y": -11, "palette": "keep" }, { - "path": "track/intamin/zero_g_roll_left_3_2.png", + "path": "track/lattice_triangle/zero_g_roll_left_3_2.png", "x": -22, "y": -25, "palette": "keep" }, { - "path": "track/intamin/zero_g_roll_left_3_3.png", + "path": "track/lattice_triangle/zero_g_roll_left_3_3.png", "x": -11, "y": -18, "palette": "keep" }, { - "path": "track/intamin/zero_g_roll_left_3_4.png", + "path": "track/lattice_triangle/zero_g_roll_left_3_4.png", "x": -23, "y": -27, "palette": "keep" }, { - "path": "track/intamin/zero_g_roll_left_4_1.png", + "path": "track/lattice_triangle/zero_g_roll_left_4_1.png", "x": -15, "y": -27, "palette": "keep" }, { - "path": "track/intamin/zero_g_roll_left_4_2.png", + "path": "track/lattice_triangle/zero_g_roll_left_4_2.png", "x": -11, "y": -45, "palette": "keep" }, { - "path": "track/intamin/zero_g_roll_left_4_3.png", + "path": "track/lattice_triangle/zero_g_roll_left_4_3.png", "x": -3, "y": -12, "palette": "keep" }, { - "path": "track/intamin/zero_g_roll_left_4_4.png", + "path": "track/lattice_triangle/zero_g_roll_left_4_4.png", "x": -21, "y": -31, "palette": "keep" }, { - "path": "track/intamin/zero_g_roll_right_1_1.png", + "path": "track/lattice_triangle/zero_g_roll_right_1_1.png", "x": -22, "y": -27, "palette": "keep" }, { - "path": "track/intamin/zero_g_roll_right_1_2.png", + "path": "track/lattice_triangle/zero_g_roll_right_1_2.png", "x": -27, "y": -45, "palette": "keep" }, { - "path": "track/intamin/zero_g_roll_right_1_3.png", + "path": "track/lattice_triangle/zero_g_roll_right_1_3.png", "x": -22, "y": -16, "palette": "keep" }, { - "path": "track/intamin/zero_g_roll_right_1_4.png", + "path": "track/lattice_triangle/zero_g_roll_right_1_4.png", "x": -27, "y": -31, "palette": "keep" }, { - "path": "track/intamin/zero_g_roll_right_2_1.png", + "path": "track/lattice_triangle/zero_g_roll_right_2_1.png", "x": -22, "y": -11, "palette": "keep" }, { - "path": "track/intamin/zero_g_roll_right_2_2.png", + "path": "track/lattice_triangle/zero_g_roll_right_2_2.png", "x": -17, "y": -25, "palette": "keep" }, { - "path": "track/intamin/zero_g_roll_right_2_3.png", + "path": "track/lattice_triangle/zero_g_roll_right_2_3.png", "x": -13, "y": -18, "palette": "keep" }, { - "path": "track/intamin/zero_g_roll_right_2_4.png", + "path": "track/lattice_triangle/zero_g_roll_right_2_4.png", "x": -11, "y": -27, "palette": "keep" }, { - "path": "track/intamin/zero_g_roll_right_3_1.png", + "path": "track/lattice_triangle/zero_g_roll_right_3_1.png", "x": 3, "y": -3, "palette": "keep" }, { - "path": "track/intamin/zero_g_roll_right_3_2.png", + "path": "track/lattice_triangle/zero_g_roll_right_3_2.png", "x": -9, "y": -4, "palette": "keep" }, { - "path": "track/intamin/zero_g_roll_right_3_3.png", + "path": "track/lattice_triangle/zero_g_roll_right_3_3.png", "x": -11, "y": -18, "palette": "keep" }, { - "path": "track/intamin/zero_g_roll_right_3_4.png", + "path": "track/lattice_triangle/zero_g_roll_right_3_4.png", "x": -21, "y": -18, "palette": "keep" }, { - "path": "track/intamin/zero_g_roll_right_4_1.png", + "path": "track/lattice_triangle/zero_g_roll_right_4_1.png", "x": -20, "y": -15, "palette": "keep" }, { - "path": "track/intamin/zero_g_roll_right_4_2.png", + "path": "track/lattice_triangle/zero_g_roll_right_4_2.png", "x": -35, "y": -16, "palette": "keep" }, { - "path": "track/intamin/zero_g_roll_right_4_3.png", + "path": "track/lattice_triangle/zero_g_roll_right_4_3.png", "x": -24, "y": -26, "palette": "keep" }, { - "path": "track/intamin/zero_g_roll_right_4_4.png", + "path": "track/lattice_triangle/zero_g_roll_right_4_4.png", "x": -22, "y": -31, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_left_1_1.png", + "path": "track/lattice_triangle/large_zero_g_roll_left_1_1.png", "x": -21, "y": -47, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_left_1_2.png", + "path": "track/lattice_triangle/large_zero_g_roll_left_1_2.png", "x": -23, "y": -36, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_left_1_3.png", + "path": "track/lattice_triangle/large_zero_g_roll_left_1_3.png", "x": -15, "y": -52, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_left_1_4.png", + "path": "track/lattice_triangle/large_zero_g_roll_left_1_4.png", "x": -13, "y": -40, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_left_1_5.png", + "path": "track/lattice_triangle/large_zero_g_roll_left_1_5.png", "x": -17, "y": -31, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_left_2_1.png", + "path": "track/lattice_triangle/large_zero_g_roll_left_2_1.png", "x": -21, "y": -42, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_left_2_2.png", + "path": "track/lattice_triangle/large_zero_g_roll_left_2_2.png", "x": -25, "y": -30, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_left_2_3.png", + "path": "track/lattice_triangle/large_zero_g_roll_left_2_3.png", "x": -32, "y": -24, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_left_2_4.png", + "path": "track/lattice_triangle/large_zero_g_roll_left_2_4.png", "x": -29, "y": -19, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_left_3_1.png", + "path": "track/lattice_triangle/large_zero_g_roll_left_3_1.png", "x": -10, "y": -33, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_left_3_2.png", + "path": "track/lattice_triangle/large_zero_g_roll_left_3_2.png", "x": -18, "y": -31, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_left_3_3.png", + "path": "track/lattice_triangle/large_zero_g_roll_left_3_3.png", "x": -27, "y": -40, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_left_3_4.png", + "path": "track/lattice_triangle/large_zero_g_roll_left_3_4.png", "x": -24, "y": -33, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_left_3_5.png", + "path": "track/lattice_triangle/large_zero_g_roll_left_3_5.png", "x": 1, "y": -12, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_left_3_6.png", + "path": "track/lattice_triangle/large_zero_g_roll_left_3_6.png", "x": -22, "y": -25, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_left_4_1.png", + "path": "track/lattice_triangle/large_zero_g_roll_left_4_1.png", "x": -15, "y": -48, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_left_4_2.png", + "path": "track/lattice_triangle/large_zero_g_roll_left_4_2.png", "x": -14, "y": -48, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_left_4_3.png", + "path": "track/lattice_triangle/large_zero_g_roll_left_4_3.png", "x": -10, "y": -33, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_left_4_4.png", + "path": "track/lattice_triangle/large_zero_g_roll_left_4_4.png", "x": -9, "y": -42, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_left_4_5.png", + "path": "track/lattice_triangle/large_zero_g_roll_left_4_5.png", "x": -21, "y": -31, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_right_1_1.png", + "path": "track/lattice_triangle/large_zero_g_roll_right_1_1.png", "x": -21, "y": -48, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_right_1_2.png", + "path": "track/lattice_triangle/large_zero_g_roll_right_1_2.png", "x": -31, "y": -48, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_right_1_3.png", + "path": "track/lattice_triangle/large_zero_g_roll_right_1_3.png", "x": -31, "y": -33, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_right_1_4.png", + "path": "track/lattice_triangle/large_zero_g_roll_right_1_4.png", "x": -30, "y": -42, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_right_1_5.png", + "path": "track/lattice_triangle/large_zero_g_roll_right_1_5.png", "x": -32, "y": -31, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_right_2_1.png", + "path": "track/lattice_triangle/large_zero_g_roll_right_2_1.png", "x": -21, "y": -33, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_right_2_2.png", + "path": "track/lattice_triangle/large_zero_g_roll_right_2_2.png", "x": -21, "y": -31, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_right_2_3.png", + "path": "track/lattice_triangle/large_zero_g_roll_right_2_3.png", "x": -24, "y": -40, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_right_2_4.png", + "path": "track/lattice_triangle/large_zero_g_roll_right_2_4.png", "x": -15, "y": -33, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_right_2_5.png", + "path": "track/lattice_triangle/large_zero_g_roll_right_2_5.png", "x": -8, "y": -11, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_right_2_6.png", + "path": "track/lattice_triangle/large_zero_g_roll_right_2_6.png", "x": -8, "y": -25, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_right_3_1.png", + "path": "track/lattice_triangle/large_zero_g_roll_right_3_1.png", "x": -17, "y": -42, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_right_3_2.png", + "path": "track/lattice_triangle/large_zero_g_roll_right_3_2.png", "x": -11, "y": -30, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_right_3_3.png", + "path": "track/lattice_triangle/large_zero_g_roll_right_3_3.png", "x": -5, "y": -24, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_right_3_4.png", + "path": "track/lattice_triangle/large_zero_g_roll_right_3_4.png", "x": -21, "y": -19, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_right_4_1.png", + "path": "track/lattice_triangle/large_zero_g_roll_right_4_1.png", "x": -23, "y": -47, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_right_4_2.png", + "path": "track/lattice_triangle/large_zero_g_roll_right_4_2.png", "x": -6, "y": -26, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_right_4_3.png", + "path": "track/lattice_triangle/large_zero_g_roll_right_4_3.png", "x": -32, "y": -52, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_right_4_4.png", + "path": "track/lattice_triangle/large_zero_g_roll_right_4_4.png", "x": -26, "y": -40, "palette": "keep" }, { - "path": "track/intamin/large_zero_g_roll_right_4_5.png", + "path": "track/lattice_triangle/large_zero_g_roll_right_4_5.png", "x": -22, "y": -31, "palette": "keep" }, { - "path": "track/intamin/small_flat_to_steep_up_1.png", + "path": "track/lattice_triangle/small_flat_to_steep_up_1.png", "x": -22, "y": -28, "palette": "keep" }, { - "path": "track/intamin/small_flat_to_steep_up_2_1.png", + "path": "track/lattice_triangle/small_flat_to_steep_up_2_1.png", "x": -22, "y": -10, "palette": "keep" }, { - "path": "track/intamin/small_flat_to_steep_up_2_2.png", + "path": "track/lattice_triangle/small_flat_to_steep_up_2_2.png", "x": -18, "y": -12, "palette": "keep" }, { - "path": "track/intamin/small_flat_to_steep_up_3_1.png", + "path": "track/lattice_triangle/small_flat_to_steep_up_3_1.png", "x": -6, "y": -4, "palette": "keep" }, { - "path": "track/intamin/small_flat_to_steep_up_3_2.png", + "path": "track/lattice_triangle/small_flat_to_steep_up_3_2.png", "x": -25, "y": -12, "palette": "keep" }, { - "path": "track/intamin/small_flat_to_steep_up_4.png", + "path": "track/lattice_triangle/small_flat_to_steep_up_4.png", "x": -25, "y": -29, "palette": "keep" }, { - "path": "track/intamin/small_steep_to_flat_up_1.png", + "path": "track/lattice_triangle/small_steep_to_flat_up_1.png", "x": -21, "y": -28, "palette": "keep" }, { - "path": "track/intamin/small_steep_to_flat_up_2_1.png", + "path": "track/lattice_triangle/small_steep_to_flat_up_2_1.png", "x": -12, "y": -15, "palette": "keep" }, { - "path": "track/intamin/small_steep_to_flat_up_2_2.png", + "path": "track/lattice_triangle/small_steep_to_flat_up_2_2.png", "x": -21, "y": -7, "palette": "keep" }, { - "path": "track/intamin/small_steep_to_flat_up_3_1.png", + "path": "track/lattice_triangle/small_steep_to_flat_up_3_1.png", "x": -22, "y": -15, "palette": "keep" }, { - "path": "track/intamin/small_steep_to_flat_up_3_2.png", + "path": "track/lattice_triangle/small_steep_to_flat_up_3_2.png", "x": -17, "y": -8, "palette": "keep" }, { - "path": "track/intamin/small_steep_to_flat_up_4.png", + "path": "track/lattice_triangle/small_steep_to_flat_up_4.png", "x": -22, "y": -28, "palette": "keep" }, { - "path": "track/intamin/small_flat_to_steep_up_diag_1.png", + "path": "track/lattice_triangle/small_flat_to_steep_up_diag_1.png", "x": -32, "y": -22, "palette": "keep" }, { - "path": "track/intamin/small_flat_to_steep_up_diag_2.png", + "path": "track/lattice_triangle/small_flat_to_steep_up_diag_2.png", "x": -8, "y": -10, "palette": "keep" }, { - "path": "track/intamin/small_flat_to_steep_up_diag_3.png", + "path": "track/lattice_triangle/small_flat_to_steep_up_diag_3.png", "x": -32, "y": -22, "palette": "keep" }, { - "path": "track/intamin/small_flat_to_steep_up_diag_4.png", + "path": "track/lattice_triangle/small_flat_to_steep_up_diag_4.png", "x": -8, "y": -34, "palette": "keep" }, { - "path": "track/intamin/small_steep_to_flat_up_diag_1.png", + "path": "track/lattice_triangle/small_steep_to_flat_up_diag_1.png", "x": -32, "y": -21, "palette": "keep" }, { - "path": "track/intamin/small_steep_to_flat_up_diag_2.png", + "path": "track/lattice_triangle/small_steep_to_flat_up_diag_2.png", "x": -8, "y": -15, "palette": "keep" }, { - "path": "track/intamin/small_steep_to_flat_up_diag_3.png", + "path": "track/lattice_triangle/small_steep_to_flat_up_diag_3.png", "x": -32, "y": -21, "palette": "keep" }, { - "path": "track/intamin/small_steep_to_flat_up_diag_4.png", + "path": "track/lattice_triangle/small_steep_to_flat_up_diag_4.png", "x": -8, "y": -34, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_to_diag_gentle_up_1_1.png", + "path": "track/lattice_triangle/large_turn_left_to_diag_gentle_up_1_1.png", "x": -22, "y": -16, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_to_diag_gentle_up_1_2.png", + "path": "track/lattice_triangle/large_turn_left_to_diag_gentle_up_1_2.png", "x": -31, "y": -24, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_to_diag_gentle_up_1_3.png", + "path": "track/lattice_triangle/large_turn_left_to_diag_gentle_up_1_3.png", "x": 13, "y": 8, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_to_diag_gentle_up_1_4.png", + "path": "track/lattice_triangle/large_turn_left_to_diag_gentle_up_1_4.png", "x": -13, "y": -9, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_to_diag_gentle_up_2_1.png", + "path": "track/lattice_triangle/large_turn_left_to_diag_gentle_up_2_1.png", "x": -22, "y": -5, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_to_diag_gentle_up_2_2.png", + "path": "track/lattice_triangle/large_turn_left_to_diag_gentle_up_2_2.png", "x": -32, "y": -11, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_to_diag_gentle_up_2_3.png", + "path": "track/lattice_triangle/large_turn_left_to_diag_gentle_up_2_3.png", "x": -24, "y": 14, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_to_diag_gentle_up_2_4.png", + "path": "track/lattice_triangle/large_turn_left_to_diag_gentle_up_2_4.png", "x": -32, "y": -13, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_to_diag_gentle_up_3_1.png", + "path": "track/lattice_triangle/large_turn_left_to_diag_gentle_up_3_1.png", "x": -5, "y": -3, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_to_diag_gentle_up_3_2.png", + "path": "track/lattice_triangle/large_turn_left_to_diag_gentle_up_3_2.png", "x": 8, "y": -3, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_to_diag_gentle_up_3_3.png", + "path": "track/lattice_triangle/large_turn_left_to_diag_gentle_up_3_3.png", "x": -31, "y": -1, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_to_diag_gentle_up_3_4.png", + "path": "track/lattice_triangle/large_turn_left_to_diag_gentle_up_3_4.png", "x": -8, "y": -15, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_to_diag_gentle_up_4_1.png", + "path": "track/lattice_triangle/large_turn_left_to_diag_gentle_up_4_1.png", "x": -25, "y": -17, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_to_diag_gentle_up_4_2.png", + "path": "track/lattice_triangle/large_turn_left_to_diag_gentle_up_4_2.png", "x": -26, "y": -9, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_to_diag_gentle_up_4_3.png", + "path": "track/lattice_triangle/large_turn_left_to_diag_gentle_up_4_3.png", "x": 0, "y": -15, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_to_diag_gentle_up_4_4.png", + "path": "track/lattice_triangle/large_turn_left_to_diag_gentle_up_4_4.png", "x": 0, "y": -13, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_to_diag_gentle_up_1_1.png", + "path": "track/lattice_triangle/large_turn_right_to_diag_gentle_up_1_1.png", "x": -22, "y": -17, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_to_diag_gentle_up_1_2.png", + "path": "track/lattice_triangle/large_turn_right_to_diag_gentle_up_1_2.png", "x": -18, "y": -9, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_to_diag_gentle_up_1_3.png", + "path": "track/lattice_triangle/large_turn_right_to_diag_gentle_up_1_3.png", "x": -12, "y": -15, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_to_diag_gentle_up_1_4.png", + "path": "track/lattice_triangle/large_turn_right_to_diag_gentle_up_1_4.png", "x": -32, "y": -13, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_to_diag_gentle_up_2_1.png", + "path": "track/lattice_triangle/large_turn_right_to_diag_gentle_up_2_1.png", "x": -22, "y": -3, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_to_diag_gentle_up_2_2.png", + "path": "track/lattice_triangle/large_turn_right_to_diag_gentle_up_2_2.png", "x": -34, "y": -3, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_to_diag_gentle_up_2_3.png", + "path": "track/lattice_triangle/large_turn_right_to_diag_gentle_up_2_3.png", "x": -2, "y": -1, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_to_diag_gentle_up_2_4.png", + "path": "track/lattice_triangle/large_turn_right_to_diag_gentle_up_2_4.png", "x": -13, "y": -15, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_to_diag_gentle_up_3_1.png", + "path": "track/lattice_triangle/large_turn_right_to_diag_gentle_up_3_1.png", "x": -6, "y": -5, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_to_diag_gentle_up_3_2.png", + "path": "track/lattice_triangle/large_turn_right_to_diag_gentle_up_3_2.png", "x": -8, "y": -11, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_to_diag_gentle_up_3_3.png", + "path": "track/lattice_triangle/large_turn_right_to_diag_gentle_up_3_3.png", "x": 0, "y": 14, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_to_diag_gentle_up_3_4.png", + "path": "track/lattice_triangle/large_turn_right_to_diag_gentle_up_3_4.png", "x": 0, "y": -13, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_to_diag_gentle_up_4_1.png", + "path": "track/lattice_triangle/large_turn_right_to_diag_gentle_up_4_1.png", "x": -13, "y": -16, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_to_diag_gentle_up_4_2.png", + "path": "track/lattice_triangle/large_turn_right_to_diag_gentle_up_4_2.png", "x": -3, "y": -24, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_to_diag_gentle_up_4_3.png", + "path": "track/lattice_triangle/large_turn_right_to_diag_gentle_up_4_3.png", "x": -32, "y": 8, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_to_diag_gentle_up_4_4.png", + "path": "track/lattice_triangle/large_turn_right_to_diag_gentle_up_4_4.png", "x": -8, "y": -9, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_to_orthogonal_gentle_up_1_1.png", + "path": "track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_1_1.png", "x": 0, "y": -12, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_to_orthogonal_gentle_up_1_2.png", + "path": "track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_1_2.png", "x": 0, "y": 0, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_to_orthogonal_gentle_up_1_3.png", + "path": "track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_1_3.png", "x": -32, "y": -16, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_to_orthogonal_gentle_up_1_4.png", + "path": "track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_1_4.png", "x": -31, "y": -20, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_to_orthogonal_gentle_up_2_1.png", + "path": "track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_2_1.png", "x": -8, "y": 6, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_to_orthogonal_gentle_up_2_2.png", + "path": "track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_2_2.png", "x": 0, "y": 0, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_to_orthogonal_gentle_up_2_3.png", + "path": "track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_2_3.png", "x": -7, "y": -10, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_to_orthogonal_gentle_up_2_4.png", + "path": "track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_2_4.png", "x": -19, "y": -5, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_to_orthogonal_gentle_up_3_1.png", + "path": "track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_3_1.png", "x": -32, "y": -6, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_to_orthogonal_gentle_up_3_2.png", + "path": "track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_3_2.png", "x": 0, "y": 0, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_to_orthogonal_gentle_up_3_3.png", + "path": "track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_3_3.png", "x": -17, "y": -1, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_to_orthogonal_gentle_up_3_4.png", + "path": "track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_3_4.png", "x": -22, "y": -3, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_to_orthogonal_gentle_up_4_1.png", + "path": "track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_4_1.png", "x": -9, "y": -8, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_to_orthogonal_gentle_up_4_2.png", + "path": "track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_4_2.png", "x": 0, "y": 0, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_to_orthogonal_gentle_up_4_3.png", + "path": "track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_4_3.png", "x": -21, "y": -4, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_to_orthogonal_gentle_up_4_4.png", + "path": "track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_4_4.png", "x": -22, "y": -20, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_to_orthogonal_gentle_up_1_1.png", + "path": "track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_1_1.png", "x": 0, "y": -6, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_to_orthogonal_gentle_up_1_2.png", + "path": "track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_1_2.png", "x": 0, "y": 0, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_to_orthogonal_gentle_up_1_3.png", + "path": "track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_1_3.png", "x": -32, "y": -1, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_to_orthogonal_gentle_up_1_4.png", + "path": "track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_1_4.png", "x": -32, "y": -3, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_to_orthogonal_gentle_up_2_1.png", + "path": "track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_2_1.png", "x": 0, "y": 6, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_to_orthogonal_gentle_up_2_2.png", + "path": "track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_2_2.png", "x": 0, "y": 0, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_to_orthogonal_gentle_up_2_3.png", + "path": "track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_2_3.png", "x": -16, "y": -10, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_to_orthogonal_gentle_up_2_4.png", + "path": "track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_2_4.png", "x": -22, "y": -5, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_to_orthogonal_gentle_up_3_1.png", + "path": "track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_3_1.png", "x": -32, "y": -12, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_to_orthogonal_gentle_up_3_2.png", + "path": "track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_3_2.png", "x": 0, "y": 0, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_to_orthogonal_gentle_up_3_3.png", + "path": "track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_3_3.png", "x": -11, "y": -16, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_to_orthogonal_gentle_up_3_4.png", + "path": "track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_3_4.png", "x": -22, "y": -20, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_to_orthogonal_gentle_up_4_1.png", + "path": "track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_4_1.png", "x": -8, "y": -8, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_to_orthogonal_gentle_up_4_2.png", + "path": "track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_4_2.png", "x": 0, "y": 0, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_to_orthogonal_gentle_up_4_3.png", + "path": "track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_4_3.png", "x": -6, "y": -4, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_to_orthogonal_gentle_up_4_4.png", + "path": "track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_4_4.png", "x": -24, "y": -20, "palette": "keep" }, { - "path": "track/intamin/gentle_up_to_gentle_up_left_bank_diag_1_1.png", + "path": "track/lattice_triangle/gentle_up_to_gentle_up_left_bank_diag_1_1.png", "x": -32, "y": -13, "palette": "keep" }, { - "path": "track/intamin/gentle_up_to_gentle_up_left_bank_diag_1_2.png", + "path": "track/lattice_triangle/gentle_up_to_gentle_up_left_bank_diag_1_2.png", "x": -32, "y": -13, "palette": "keep" }, { - "path": "track/intamin/gentle_up_to_gentle_up_left_bank_diag_2.png", + "path": "track/lattice_triangle/gentle_up_to_gentle_up_left_bank_diag_2.png", "x": -10, "y": -10, "palette": "keep" }, { - "path": "track/intamin/gentle_up_to_gentle_up_left_bank_diag_3.png", + "path": "track/lattice_triangle/gentle_up_to_gentle_up_left_bank_diag_3.png", "x": -32, "y": -17, "palette": "keep" }, { - "path": "track/intamin/gentle_up_to_gentle_up_left_bank_diag_4.png", + "path": "track/lattice_triangle/gentle_up_to_gentle_up_left_bank_diag_4.png", "x": -8, "y": -30, "palette": "keep" }, { - "path": "track/intamin/gentle_up_to_gentle_up_right_bank_diag_1.png", + "path": "track/lattice_triangle/gentle_up_to_gentle_up_right_bank_diag_1.png", "x": -32, "y": -17, "palette": "keep" }, { - "path": "track/intamin/gentle_up_to_gentle_up_right_bank_diag_2.png", + "path": "track/lattice_triangle/gentle_up_to_gentle_up_right_bank_diag_2.png", "x": -8, "y": -10, "palette": "keep" }, { - "path": "track/intamin/gentle_up_to_gentle_up_right_bank_diag_3_1.png", + "path": "track/lattice_triangle/gentle_up_to_gentle_up_right_bank_diag_3_1.png", "x": -31, "y": -13, "palette": "keep" }, { - "path": "track/intamin/gentle_up_to_gentle_up_right_bank_diag_3_2.png", + "path": "track/lattice_triangle/gentle_up_to_gentle_up_right_bank_diag_3_2.png", "x": -32, "y": -13, "palette": "keep" }, { - "path": "track/intamin/gentle_up_to_gentle_up_right_bank_diag_4.png", + "path": "track/lattice_triangle/gentle_up_to_gentle_up_right_bank_diag_4.png", "x": -10, "y": -30, "palette": "keep" }, { - "path": "track/intamin/gentle_up_left_bank_to_gentle_up_diag_1_1.png", + "path": "track/lattice_triangle/gentle_up_left_bank_to_gentle_up_diag_1_1.png", "x": -21, "y": -13, "palette": "keep" }, { - "path": "track/intamin/gentle_up_left_bank_to_gentle_up_diag_1_2.png", + "path": "track/lattice_triangle/gentle_up_left_bank_to_gentle_up_diag_1_2.png", "x": -32, "y": -2, "palette": "keep" }, { - "path": "track/intamin/gentle_up_left_bank_to_gentle_up_diag_2.png", + "path": "track/lattice_triangle/gentle_up_left_bank_to_gentle_up_diag_2.png", "x": -10, "y": -15, "palette": "keep" }, { - "path": "track/intamin/gentle_up_left_bank_to_gentle_up_diag_3.png", + "path": "track/lattice_triangle/gentle_up_left_bank_to_gentle_up_diag_3.png", "x": -32, "y": -13, "palette": "keep" }, { - "path": "track/intamin/gentle_up_left_bank_to_gentle_up_diag_4.png", + "path": "track/lattice_triangle/gentle_up_left_bank_to_gentle_up_diag_4.png", "x": -8, "y": -25, "palette": "keep" }, { - "path": "track/intamin/gentle_up_right_bank_to_gentle_up_diag_1.png", + "path": "track/lattice_triangle/gentle_up_right_bank_to_gentle_up_diag_1.png", "x": -32, "y": -13, "palette": "keep" }, { - "path": "track/intamin/gentle_up_right_bank_to_gentle_up_diag_2.png", + "path": "track/lattice_triangle/gentle_up_right_bank_to_gentle_up_diag_2.png", "x": -8, "y": -15, "palette": "keep" }, { - "path": "track/intamin/gentle_up_right_bank_to_gentle_up_diag_3_1.png", + "path": "track/lattice_triangle/gentle_up_right_bank_to_gentle_up_diag_3_1.png", "x": -32, "y": -13, "palette": "keep" }, { - "path": "track/intamin/gentle_up_right_bank_to_gentle_up_diag_3_2.png", + "path": "track/lattice_triangle/gentle_up_right_bank_to_gentle_up_diag_3_2.png", "x": -32, "y": -2, "palette": "keep" }, { - "path": "track/intamin/gentle_up_right_bank_to_gentle_up_diag_4.png", + "path": "track/lattice_triangle/gentle_up_right_bank_to_gentle_up_diag_4.png", "x": -10, "y": -25, "palette": "keep" }, { - "path": "track/intamin/left_bank_to_gentle_up_left_bank_diag_1.png", + "path": "track/lattice_triangle/left_bank_to_gentle_up_left_bank_diag_1.png", "x": -32, "y": -5, "palette": "keep" }, { - "path": "track/intamin/left_bank_to_gentle_up_left_bank_diag_2.png", + "path": "track/lattice_triangle/left_bank_to_gentle_up_left_bank_diag_2.png", "x": -11, "y": -14, "palette": "keep" }, { - "path": "track/intamin/left_bank_to_gentle_up_left_bank_diag_3.png", + "path": "track/lattice_triangle/left_bank_to_gentle_up_left_bank_diag_3.png", "x": -32, "y": -9, "palette": "keep" }, { - "path": "track/intamin/left_bank_to_gentle_up_left_bank_diag_4.png", + "path": "track/lattice_triangle/left_bank_to_gentle_up_left_bank_diag_4.png", "x": -6, "y": -22, "palette": "keep" }, { - "path": "track/intamin/right_bank_to_gentle_up_right_bank_diag_1.png", + "path": "track/lattice_triangle/right_bank_to_gentle_up_right_bank_diag_1.png", "x": -32, "y": -9, "palette": "keep" }, { - "path": "track/intamin/right_bank_to_gentle_up_right_bank_diag_2.png", + "path": "track/lattice_triangle/right_bank_to_gentle_up_right_bank_diag_2.png", "x": -6, "y": -13, "palette": "keep" }, { - "path": "track/intamin/right_bank_to_gentle_up_right_bank_diag_3.png", + "path": "track/lattice_triangle/right_bank_to_gentle_up_right_bank_diag_3.png", "x": -32, "y": -5, "palette": "keep" }, { - "path": "track/intamin/right_bank_to_gentle_up_right_bank_diag_4.png", + "path": "track/lattice_triangle/right_bank_to_gentle_up_right_bank_diag_4.png", "x": -11, "y": -22, "palette": "keep" }, { - "path": "track/intamin/gentle_up_left_bank_to_left_bank_diag_1.png", + "path": "track/lattice_triangle/gentle_up_left_bank_to_left_bank_diag_1.png", "x": -32, "y": -3, "palette": "keep" }, { - "path": "track/intamin/gentle_up_left_bank_to_left_bank_diag_2.png", + "path": "track/lattice_triangle/gentle_up_left_bank_to_left_bank_diag_2.png", "x": -11, "y": -15, "palette": "keep" }, { - "path": "track/intamin/gentle_up_left_bank_to_left_bank_diag_3.png", + "path": "track/lattice_triangle/gentle_up_left_bank_to_left_bank_diag_3.png", "x": -32, "y": -9, "palette": "keep" }, { - "path": "track/intamin/gentle_up_left_bank_to_left_bank_diag_4.png", + "path": "track/lattice_triangle/gentle_up_left_bank_to_left_bank_diag_4.png", "x": -6, "y": -21, "palette": "keep" }, { - "path": "track/intamin/gentle_up_right_bank_to_right_bank_diag_1.png", + "path": "track/lattice_triangle/gentle_up_right_bank_to_right_bank_diag_1.png", "x": -32, "y": -9, "palette": "keep" }, { - "path": "track/intamin/gentle_up_right_bank_to_right_bank_diag_2.png", + "path": "track/lattice_triangle/gentle_up_right_bank_to_right_bank_diag_2.png", "x": -6, "y": -15, "palette": "keep" }, { - "path": "track/intamin/gentle_up_right_bank_to_right_bank_diag_3.png", + "path": "track/lattice_triangle/gentle_up_right_bank_to_right_bank_diag_3.png", "x": -32, "y": -3, "palette": "keep" }, { - "path": "track/intamin/gentle_up_right_bank_to_right_bank_diag_4.png", + "path": "track/lattice_triangle/gentle_up_right_bank_to_right_bank_diag_4.png", "x": -11, "y": -22, "palette": "keep" }, { - "path": "track/intamin/gentle_up_left_bank_diag_1.png", + "path": "track/lattice_triangle/gentle_up_left_bank_diag_1.png", "x": -32, "y": -13, "palette": "keep" }, { - "path": "track/intamin/gentle_up_left_bank_diag_2.png", + "path": "track/lattice_triangle/gentle_up_left_bank_diag_2.png", "x": -10, "y": -15, "palette": "keep" }, { - "path": "track/intamin/gentle_up_left_bank_diag_3.png", + "path": "track/lattice_triangle/gentle_up_left_bank_diag_3.png", "x": -32, "y": -17, "palette": "keep" }, { - "path": "track/intamin/gentle_up_left_bank_diag_4.png", + "path": "track/lattice_triangle/gentle_up_left_bank_diag_4.png", "x": -6, "y": -30, "palette": "keep" }, { - "path": "track/intamin/gentle_up_right_bank_diag_1.png", + "path": "track/lattice_triangle/gentle_up_right_bank_diag_1.png", "x": -32, "y": -17, "palette": "keep" }, { - "path": "track/intamin/gentle_up_right_bank_diag_2.png", + "path": "track/lattice_triangle/gentle_up_right_bank_diag_2.png", "x": -6, "y": -15, "palette": "keep" }, { - "path": "track/intamin/gentle_up_right_bank_diag_3.png", + "path": "track/lattice_triangle/gentle_up_right_bank_diag_3.png", "x": -32, "y": -13, "palette": "keep" }, { - "path": "track/intamin/gentle_up_right_bank_diag_4.png", + "path": "track/lattice_triangle/gentle_up_right_bank_diag_4.png", "x": -10, "y": -30, "palette": "keep" }, { - "path": "track/intamin/flat_to_gentle_up_left_bank_diag_1_1.png", + "path": "track/lattice_triangle/flat_to_gentle_up_left_bank_diag_1_1.png", "x": -32, "y": -5, "palette": "keep" }, { - "path": "track/intamin/flat_to_gentle_up_left_bank_diag_1_2.png", + "path": "track/lattice_triangle/flat_to_gentle_up_left_bank_diag_1_2.png", "x": -32, "y": -5, "palette": "keep" }, { - "path": "track/intamin/flat_to_gentle_up_left_bank_diag_2.png", + "path": "track/lattice_triangle/flat_to_gentle_up_left_bank_diag_2.png", "x": -10, "y": -10, "palette": "keep" }, { - "path": "track/intamin/flat_to_gentle_up_left_bank_diag_3.png", + "path": "track/lattice_triangle/flat_to_gentle_up_left_bank_diag_3.png", "x": -32, "y": -9, "palette": "keep" }, { - "path": "track/intamin/flat_to_gentle_up_left_bank_diag_4.png", + "path": "track/lattice_triangle/flat_to_gentle_up_left_bank_diag_4.png", "x": -8, "y": -22, "palette": "keep" }, { - "path": "track/intamin/flat_to_gentle_up_right_bank_diag_1.png", + "path": "track/lattice_triangle/flat_to_gentle_up_right_bank_diag_1.png", "x": -32, "y": -9, "palette": "keep" }, { - "path": "track/intamin/flat_to_gentle_up_right_bank_diag_2.png", + "path": "track/lattice_triangle/flat_to_gentle_up_right_bank_diag_2.png", "x": -8, "y": -10, "palette": "keep" }, { - "path": "track/intamin/flat_to_gentle_up_right_bank_diag_3_1.png", + "path": "track/lattice_triangle/flat_to_gentle_up_right_bank_diag_3_1.png", "x": -31, "y": -5, "palette": "keep" }, { - "path": "track/intamin/flat_to_gentle_up_right_bank_diag_3_2.png", + "path": "track/lattice_triangle/flat_to_gentle_up_right_bank_diag_3_2.png", "x": -32, "y": -5, "palette": "keep" }, { - "path": "track/intamin/flat_to_gentle_up_right_bank_diag_4.png", + "path": "track/lattice_triangle/flat_to_gentle_up_right_bank_diag_4.png", "x": -10, "y": -22, "palette": "keep" }, { - "path": "track/intamin/gentle_up_left_bank_to_flat_diag_1_1.png", + "path": "track/lattice_triangle/gentle_up_left_bank_to_flat_diag_1_1.png", "x": -19, "y": -5, "palette": "keep" }, { - "path": "track/intamin/gentle_up_left_bank_to_flat_diag_1_2.png", + "path": "track/lattice_triangle/gentle_up_left_bank_to_flat_diag_1_2.png", "x": -32, "y": 1, "palette": "keep" }, { - "path": "track/intamin/gentle_up_left_bank_to_flat_diag_2.png", + "path": "track/lattice_triangle/gentle_up_left_bank_to_flat_diag_2.png", "x": -10, "y": -15, "palette": "keep" }, { - "path": "track/intamin/gentle_up_left_bank_to_flat_diag_3.png", + "path": "track/lattice_triangle/gentle_up_left_bank_to_flat_diag_3.png", "x": -32, "y": -6, "palette": "keep" }, { - "path": "track/intamin/gentle_up_left_bank_to_flat_diag_4.png", + "path": "track/lattice_triangle/gentle_up_left_bank_to_flat_diag_4.png", "x": -8, "y": -18, "palette": "keep" }, { - "path": "track/intamin/gentle_up_right_bank_to_flat_diag_1.png", + "path": "track/lattice_triangle/gentle_up_right_bank_to_flat_diag_1.png", "x": -32, "y": -6, "palette": "keep" }, { - "path": "track/intamin/gentle_up_right_bank_to_flat_diag_2.png", + "path": "track/lattice_triangle/gentle_up_right_bank_to_flat_diag_2.png", "x": -8, "y": -15, "palette": "keep" }, { - "path": "track/intamin/gentle_up_right_bank_to_flat_diag_3_1.png", + "path": "track/lattice_triangle/gentle_up_right_bank_to_flat_diag_3_1.png", "x": -32, "y": -5, "palette": "keep" }, { - "path": "track/intamin/gentle_up_right_bank_to_flat_diag_3_2.png", + "path": "track/lattice_triangle/gentle_up_right_bank_to_flat_diag_3_2.png", "x": -32, "y": 1, "palette": "keep" }, { - "path": "track/intamin/gentle_up_right_bank_to_flat_diag_4.png", + "path": "track/lattice_triangle/gentle_up_right_bank_to_flat_diag_4.png", "x": -9, "y": -18, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_bank_to_diag_gentle_up_1_1.png", + "path": "track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_1_1.png", "x": -18, "y": -14, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_bank_to_diag_gentle_up_1_2.png", + "path": "track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_1_2.png", "x": -27, "y": -24, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_bank_to_diag_gentle_up_1_3.png", + "path": "track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_1_3.png", "x": 17, "y": 8, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_bank_to_diag_gentle_up_1_4.png", + "path": "track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_1_4.png", "x": -10, "y": -14, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_bank_to_diag_gentle_up_2_1.png", + "path": "track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_2_1.png", "x": -22, "y": -6, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_bank_to_diag_gentle_up_2_2.png", + "path": "track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_2_2.png", "x": -32, "y": -13, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_bank_to_diag_gentle_up_2_3.png", + "path": "track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_2_3.png", "x": -24, "y": 13, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_bank_to_diag_gentle_up_2_4.png", + "path": "track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_2_4.png", "x": -32, "y": -13, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_bank_to_diag_gentle_up_3_1.png", + "path": "track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_3_1.png", "x": -7, "y": -8, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_bank_to_diag_gentle_up_3_2.png", + "path": "track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_3_2.png", "x": 1, "y": -7, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_bank_to_diag_gentle_up_3_3.png", + "path": "track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_3_3.png", "x": -32, "y": -4, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_bank_to_diag_gentle_up_3_4.png", + "path": "track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_3_4.png", "x": -10, "y": -20, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_bank_to_diag_gentle_up_4_1.png", + "path": "track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_4_1.png", "x": -23, "y": -19, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_bank_to_diag_gentle_up_4_2.png", + "path": "track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_4_2.png", "x": -24, "y": -12, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_bank_to_diag_gentle_up_4_3.png", + "path": "track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_4_3.png", "x": 0, "y": -20, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_bank_to_diag_gentle_up_4_4.png", + "path": "track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_4_4.png", "x": 0, "y": -17, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_bank_to_diag_gentle_up_1_1.png", + "path": "track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_1_1.png", "x": -23, "y": -19, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_bank_to_diag_gentle_up_1_2.png", + "path": "track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_1_2.png", "x": -20, "y": -12, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_bank_to_diag_gentle_up_1_3.png", + "path": "track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_1_3.png", "x": -14, "y": -20, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_bank_to_diag_gentle_up_1_4.png", + "path": "track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_1_4.png", "x": -32, "y": -17, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_bank_to_diag_gentle_up_2_1.png", + "path": "track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_2_1.png", "x": -19, "y": -8, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_bank_to_diag_gentle_up_2_2.png", + "path": "track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_2_2.png", "x": -31, "y": -8, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_bank_to_diag_gentle_up_2_3.png", + "path": "track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_2_3.png", "x": 10, "y": -4, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_bank_to_diag_gentle_up_2_4.png", + "path": "track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_2_4.png", "x": -8, "y": -20, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_bank_to_diag_gentle_up_3_1.png", + "path": "track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_3_1.png", "x": -7, "y": -6, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_bank_to_diag_gentle_up_3_2.png", + "path": "track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_3_2.png", "x": -8, "y": -13, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_bank_to_diag_gentle_up_3_3.png", + "path": "track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_3_3.png", "x": 0, "y": 13, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_bank_to_diag_gentle_up_3_4.png", + "path": "track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_3_4.png", "x": 0, "y": -13, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_bank_to_diag_gentle_up_4_1.png", + "path": "track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_4_1.png", "x": -18, "y": -14, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_bank_to_diag_gentle_up_4_2.png", + "path": "track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_4_2.png", "x": -6, "y": -24, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_bank_to_diag_gentle_up_4_3.png", + "path": "track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_4_3.png", "x": -32, "y": 8, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_bank_to_diag_gentle_up_4_4.png", + "path": "track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_4_4.png", "x": -10, "y": -14, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_1_1.png", + "path": "track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_1_1.png", "x": 0, "y": -10, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_1_2.png", + "path": "track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_1_2.png", "x": 0, "y": 0, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_1_3.png", + "path": "track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_1_3.png", "x": -32, "y": -14, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_1_4.png", + "path": "track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_1_4.png", "x": -29, "y": -18, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_2_1.png", + "path": "track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_2_1.png", "x": -8, "y": 1, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_2_2.png", + "path": "track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_2_2.png", "x": 0, "y": 0, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_2_3.png", + "path": "track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_2_3.png", "x": -10, "y": -10, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_2_4.png", + "path": "track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_2_4.png", "x": -17, "y": -6, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_3_1.png", + "path": "track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_3_1.png", "x": -32, "y": -11, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_3_2.png", + "path": "track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_3_2.png", "x": 0, "y": 0, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_3_3.png", + "path": "track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_3_3.png", "x": -22, "y": -6, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_3_4.png", + "path": "track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_3_4.png", "x": -26, "y": -8, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_4_1.png", + "path": "track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_4_1.png", "x": -8, "y": -8, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_4_2.png", + "path": "track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_4_2.png", "x": 0, "y": 0, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_4_3.png", + "path": "track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_4_3.png", "x": -21, "y": -4, "palette": "keep" }, { - "path": "track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_4_4.png", + "path": "track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_4_4.png", "x": -22, "y": -23, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_1_1.png", + "path": "track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_1_1.png", "x": 0, "y": -11, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_1_2.png", + "path": "track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_1_2.png", "x": 0, "y": 0, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_1_3.png", + "path": "track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_1_3.png", "x": -32, "y": -6, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_1_4.png", + "path": "track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_1_4.png", "x": -26, "y": -8, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_2_1.png", + "path": "track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_2_1.png", "x": 0, "y": 1, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_2_2.png", + "path": "track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_2_2.png", "x": 0, "y": 0, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_2_3.png", + "path": "track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_2_3.png", "x": -16, "y": -10, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_2_4.png", + "path": "track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_2_4.png", "x": -21, "y": -6, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_3_1.png", + "path": "track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_3_1.png", "x": -32, "y": -10, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_3_2.png", + "path": "track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_3_2.png", "x": 0, "y": 0, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_3_3.png", + "path": "track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_3_3.png", "x": -13, "y": -14, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_3_4.png", + "path": "track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_3_4.png", "x": -26, "y": -18, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_4_1.png", + "path": "track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_4_1.png", "x": -10, "y": -8, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_4_2.png", + "path": "track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_4_2.png", "x": 0, "y": 0, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_4_3.png", + "path": "track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_4_3.png", "x": -7, "y": -5, "palette": "keep" }, { - "path": "track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_4_4.png", + "path": "track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_4_4.png", "x": -24, "y": -22, "palette": "keep" diff --git a/resources/g2/track/intamin/barrel_roll_left_1_1.png b/resources/g2/track/lattice_triangle/barrel_roll_left_1_1.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_left_1_1.png rename to resources/g2/track/lattice_triangle/barrel_roll_left_1_1.png diff --git a/resources/g2/track/intamin/barrel_roll_left_1_2.png b/resources/g2/track/lattice_triangle/barrel_roll_left_1_2.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_left_1_2.png rename to resources/g2/track/lattice_triangle/barrel_roll_left_1_2.png diff --git a/resources/g2/track/intamin/barrel_roll_left_1_3.png b/resources/g2/track/lattice_triangle/barrel_roll_left_1_3.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_left_1_3.png rename to resources/g2/track/lattice_triangle/barrel_roll_left_1_3.png diff --git a/resources/g2/track/intamin/barrel_roll_left_1_4.png b/resources/g2/track/lattice_triangle/barrel_roll_left_1_4.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_left_1_4.png rename to resources/g2/track/lattice_triangle/barrel_roll_left_1_4.png diff --git a/resources/g2/track/intamin/barrel_roll_left_1_5.png b/resources/g2/track/lattice_triangle/barrel_roll_left_1_5.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_left_1_5.png rename to resources/g2/track/lattice_triangle/barrel_roll_left_1_5.png diff --git a/resources/g2/track/intamin/barrel_roll_left_1_6.png b/resources/g2/track/lattice_triangle/barrel_roll_left_1_6.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_left_1_6.png rename to resources/g2/track/lattice_triangle/barrel_roll_left_1_6.png diff --git a/resources/g2/track/intamin/barrel_roll_left_2_1.png b/resources/g2/track/lattice_triangle/barrel_roll_left_2_1.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_left_2_1.png rename to resources/g2/track/lattice_triangle/barrel_roll_left_2_1.png diff --git a/resources/g2/track/intamin/barrel_roll_left_2_2.png b/resources/g2/track/lattice_triangle/barrel_roll_left_2_2.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_left_2_2.png rename to resources/g2/track/lattice_triangle/barrel_roll_left_2_2.png diff --git a/resources/g2/track/intamin/barrel_roll_left_2_3.png b/resources/g2/track/lattice_triangle/barrel_roll_left_2_3.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_left_2_3.png rename to resources/g2/track/lattice_triangle/barrel_roll_left_2_3.png diff --git a/resources/g2/track/intamin/barrel_roll_left_2_4.png b/resources/g2/track/lattice_triangle/barrel_roll_left_2_4.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_left_2_4.png rename to resources/g2/track/lattice_triangle/barrel_roll_left_2_4.png diff --git a/resources/g2/track/intamin/barrel_roll_left_2_5.png b/resources/g2/track/lattice_triangle/barrel_roll_left_2_5.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_left_2_5.png rename to resources/g2/track/lattice_triangle/barrel_roll_left_2_5.png diff --git a/resources/g2/track/intamin/barrel_roll_left_2_6.png b/resources/g2/track/lattice_triangle/barrel_roll_left_2_6.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_left_2_6.png rename to resources/g2/track/lattice_triangle/barrel_roll_left_2_6.png diff --git a/resources/g2/track/intamin/barrel_roll_left_3_1.png b/resources/g2/track/lattice_triangle/barrel_roll_left_3_1.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_left_3_1.png rename to resources/g2/track/lattice_triangle/barrel_roll_left_3_1.png diff --git a/resources/g2/track/intamin/barrel_roll_left_3_2.png b/resources/g2/track/lattice_triangle/barrel_roll_left_3_2.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_left_3_2.png rename to resources/g2/track/lattice_triangle/barrel_roll_left_3_2.png diff --git a/resources/g2/track/intamin/barrel_roll_left_3_3.png b/resources/g2/track/lattice_triangle/barrel_roll_left_3_3.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_left_3_3.png rename to resources/g2/track/lattice_triangle/barrel_roll_left_3_3.png diff --git a/resources/g2/track/intamin/barrel_roll_left_3_4.png b/resources/g2/track/lattice_triangle/barrel_roll_left_3_4.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_left_3_4.png rename to resources/g2/track/lattice_triangle/barrel_roll_left_3_4.png diff --git a/resources/g2/track/intamin/barrel_roll_left_3_5.png b/resources/g2/track/lattice_triangle/barrel_roll_left_3_5.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_left_3_5.png rename to resources/g2/track/lattice_triangle/barrel_roll_left_3_5.png diff --git a/resources/g2/track/intamin/barrel_roll_left_3_6.png b/resources/g2/track/lattice_triangle/barrel_roll_left_3_6.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_left_3_6.png rename to resources/g2/track/lattice_triangle/barrel_roll_left_3_6.png diff --git a/resources/g2/track/intamin/barrel_roll_left_4_1.png b/resources/g2/track/lattice_triangle/barrel_roll_left_4_1.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_left_4_1.png rename to resources/g2/track/lattice_triangle/barrel_roll_left_4_1.png diff --git a/resources/g2/track/intamin/barrel_roll_left_4_2.png b/resources/g2/track/lattice_triangle/barrel_roll_left_4_2.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_left_4_2.png rename to resources/g2/track/lattice_triangle/barrel_roll_left_4_2.png diff --git a/resources/g2/track/intamin/barrel_roll_left_4_3.png b/resources/g2/track/lattice_triangle/barrel_roll_left_4_3.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_left_4_3.png rename to resources/g2/track/lattice_triangle/barrel_roll_left_4_3.png diff --git a/resources/g2/track/intamin/barrel_roll_left_4_4.png b/resources/g2/track/lattice_triangle/barrel_roll_left_4_4.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_left_4_4.png rename to resources/g2/track/lattice_triangle/barrel_roll_left_4_4.png diff --git a/resources/g2/track/intamin/barrel_roll_left_4_5.png b/resources/g2/track/lattice_triangle/barrel_roll_left_4_5.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_left_4_5.png rename to resources/g2/track/lattice_triangle/barrel_roll_left_4_5.png diff --git a/resources/g2/track/intamin/barrel_roll_left_4_6.png b/resources/g2/track/lattice_triangle/barrel_roll_left_4_6.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_left_4_6.png rename to resources/g2/track/lattice_triangle/barrel_roll_left_4_6.png diff --git a/resources/g2/track/intamin/barrel_roll_right_1_1.png b/resources/g2/track/lattice_triangle/barrel_roll_right_1_1.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_right_1_1.png rename to resources/g2/track/lattice_triangle/barrel_roll_right_1_1.png diff --git a/resources/g2/track/intamin/barrel_roll_right_1_2.png b/resources/g2/track/lattice_triangle/barrel_roll_right_1_2.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_right_1_2.png rename to resources/g2/track/lattice_triangle/barrel_roll_right_1_2.png diff --git a/resources/g2/track/intamin/barrel_roll_right_1_3.png b/resources/g2/track/lattice_triangle/barrel_roll_right_1_3.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_right_1_3.png rename to resources/g2/track/lattice_triangle/barrel_roll_right_1_3.png diff --git a/resources/g2/track/intamin/barrel_roll_right_1_4.png b/resources/g2/track/lattice_triangle/barrel_roll_right_1_4.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_right_1_4.png rename to resources/g2/track/lattice_triangle/barrel_roll_right_1_4.png diff --git a/resources/g2/track/intamin/barrel_roll_right_1_5.png b/resources/g2/track/lattice_triangle/barrel_roll_right_1_5.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_right_1_5.png rename to resources/g2/track/lattice_triangle/barrel_roll_right_1_5.png diff --git a/resources/g2/track/intamin/barrel_roll_right_1_6.png b/resources/g2/track/lattice_triangle/barrel_roll_right_1_6.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_right_1_6.png rename to resources/g2/track/lattice_triangle/barrel_roll_right_1_6.png diff --git a/resources/g2/track/intamin/barrel_roll_right_2_1.png b/resources/g2/track/lattice_triangle/barrel_roll_right_2_1.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_right_2_1.png rename to resources/g2/track/lattice_triangle/barrel_roll_right_2_1.png diff --git a/resources/g2/track/intamin/barrel_roll_right_2_2.png b/resources/g2/track/lattice_triangle/barrel_roll_right_2_2.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_right_2_2.png rename to resources/g2/track/lattice_triangle/barrel_roll_right_2_2.png diff --git a/resources/g2/track/intamin/barrel_roll_right_2_3.png b/resources/g2/track/lattice_triangle/barrel_roll_right_2_3.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_right_2_3.png rename to resources/g2/track/lattice_triangle/barrel_roll_right_2_3.png diff --git a/resources/g2/track/intamin/barrel_roll_right_2_4.png b/resources/g2/track/lattice_triangle/barrel_roll_right_2_4.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_right_2_4.png rename to resources/g2/track/lattice_triangle/barrel_roll_right_2_4.png diff --git a/resources/g2/track/intamin/barrel_roll_right_2_5.png b/resources/g2/track/lattice_triangle/barrel_roll_right_2_5.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_right_2_5.png rename to resources/g2/track/lattice_triangle/barrel_roll_right_2_5.png diff --git a/resources/g2/track/intamin/barrel_roll_right_2_6.png b/resources/g2/track/lattice_triangle/barrel_roll_right_2_6.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_right_2_6.png rename to resources/g2/track/lattice_triangle/barrel_roll_right_2_6.png diff --git a/resources/g2/track/intamin/barrel_roll_right_3_1.png b/resources/g2/track/lattice_triangle/barrel_roll_right_3_1.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_right_3_1.png rename to resources/g2/track/lattice_triangle/barrel_roll_right_3_1.png diff --git a/resources/g2/track/intamin/barrel_roll_right_3_2.png b/resources/g2/track/lattice_triangle/barrel_roll_right_3_2.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_right_3_2.png rename to resources/g2/track/lattice_triangle/barrel_roll_right_3_2.png diff --git a/resources/g2/track/intamin/barrel_roll_right_3_3.png b/resources/g2/track/lattice_triangle/barrel_roll_right_3_3.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_right_3_3.png rename to resources/g2/track/lattice_triangle/barrel_roll_right_3_3.png diff --git a/resources/g2/track/intamin/barrel_roll_right_3_4.png b/resources/g2/track/lattice_triangle/barrel_roll_right_3_4.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_right_3_4.png rename to resources/g2/track/lattice_triangle/barrel_roll_right_3_4.png diff --git a/resources/g2/track/intamin/barrel_roll_right_3_5.png b/resources/g2/track/lattice_triangle/barrel_roll_right_3_5.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_right_3_5.png rename to resources/g2/track/lattice_triangle/barrel_roll_right_3_5.png diff --git a/resources/g2/track/intamin/barrel_roll_right_3_6.png b/resources/g2/track/lattice_triangle/barrel_roll_right_3_6.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_right_3_6.png rename to resources/g2/track/lattice_triangle/barrel_roll_right_3_6.png diff --git a/resources/g2/track/intamin/barrel_roll_right_4_1.png b/resources/g2/track/lattice_triangle/barrel_roll_right_4_1.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_right_4_1.png rename to resources/g2/track/lattice_triangle/barrel_roll_right_4_1.png diff --git a/resources/g2/track/intamin/barrel_roll_right_4_2.png b/resources/g2/track/lattice_triangle/barrel_roll_right_4_2.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_right_4_2.png rename to resources/g2/track/lattice_triangle/barrel_roll_right_4_2.png diff --git a/resources/g2/track/intamin/barrel_roll_right_4_3.png b/resources/g2/track/lattice_triangle/barrel_roll_right_4_3.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_right_4_3.png rename to resources/g2/track/lattice_triangle/barrel_roll_right_4_3.png diff --git a/resources/g2/track/intamin/barrel_roll_right_4_4.png b/resources/g2/track/lattice_triangle/barrel_roll_right_4_4.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_right_4_4.png rename to resources/g2/track/lattice_triangle/barrel_roll_right_4_4.png diff --git a/resources/g2/track/intamin/barrel_roll_right_4_5.png b/resources/g2/track/lattice_triangle/barrel_roll_right_4_5.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_right_4_5.png rename to resources/g2/track/lattice_triangle/barrel_roll_right_4_5.png diff --git a/resources/g2/track/intamin/barrel_roll_right_4_6.png b/resources/g2/track/lattice_triangle/barrel_roll_right_4_6.png similarity index 100% rename from resources/g2/track/intamin/barrel_roll_right_4_6.png rename to resources/g2/track/lattice_triangle/barrel_roll_right_4_6.png diff --git a/resources/g2/track/intamin/booster_1.png b/resources/g2/track/lattice_triangle/booster_1.png similarity index 100% rename from resources/g2/track/intamin/booster_1.png rename to resources/g2/track/lattice_triangle/booster_1.png diff --git a/resources/g2/track/intamin/booster_2.png b/resources/g2/track/lattice_triangle/booster_2.png similarity index 100% rename from resources/g2/track/intamin/booster_2.png rename to resources/g2/track/lattice_triangle/booster_2.png diff --git a/resources/g2/track/intamin/brake_horizontal_background_closed.png b/resources/g2/track/lattice_triangle/brake_horizontal_background_closed.png similarity index 100% rename from resources/g2/track/intamin/brake_horizontal_background_closed.png rename to resources/g2/track/lattice_triangle/brake_horizontal_background_closed.png diff --git a/resources/g2/track/intamin/brake_horizontal_background_open.png b/resources/g2/track/lattice_triangle/brake_horizontal_background_open.png similarity index 100% rename from resources/g2/track/intamin/brake_horizontal_background_open.png rename to resources/g2/track/lattice_triangle/brake_horizontal_background_open.png diff --git a/resources/g2/track/intamin/brake_horizontal_foreground.png b/resources/g2/track/lattice_triangle/brake_horizontal_foreground.png similarity index 100% rename from resources/g2/track/intamin/brake_horizontal_foreground.png rename to resources/g2/track/lattice_triangle/brake_horizontal_foreground.png diff --git a/resources/g2/track/intamin/brake_vertical_background.png b/resources/g2/track/lattice_triangle/brake_vertical_background.png similarity index 100% rename from resources/g2/track/intamin/brake_vertical_background.png rename to resources/g2/track/lattice_triangle/brake_vertical_background.png diff --git a/resources/g2/track/intamin/brake_vertical_foreground_closed.png b/resources/g2/track/lattice_triangle/brake_vertical_foreground_closed.png similarity index 100% rename from resources/g2/track/intamin/brake_vertical_foreground_closed.png rename to resources/g2/track/lattice_triangle/brake_vertical_foreground_closed.png diff --git a/resources/g2/track/intamin/brake_vertical_foreground_open.png b/resources/g2/track/lattice_triangle/brake_vertical_foreground_open.png similarity index 100% rename from resources/g2/track/intamin/brake_vertical_foreground_open.png rename to resources/g2/track/lattice_triangle/brake_vertical_foreground_open.png diff --git a/resources/g2/track/intamin/corkscrew_left_1_1.png b/resources/g2/track/lattice_triangle/corkscrew_left_1_1.png similarity index 100% rename from resources/g2/track/intamin/corkscrew_left_1_1.png rename to resources/g2/track/lattice_triangle/corkscrew_left_1_1.png diff --git a/resources/g2/track/intamin/corkscrew_left_1_2.png b/resources/g2/track/lattice_triangle/corkscrew_left_1_2.png similarity index 100% rename from resources/g2/track/intamin/corkscrew_left_1_2.png rename to resources/g2/track/lattice_triangle/corkscrew_left_1_2.png diff --git a/resources/g2/track/intamin/corkscrew_left_1_3.png b/resources/g2/track/lattice_triangle/corkscrew_left_1_3.png similarity index 100% rename from resources/g2/track/intamin/corkscrew_left_1_3.png rename to resources/g2/track/lattice_triangle/corkscrew_left_1_3.png diff --git a/resources/g2/track/intamin/corkscrew_left_2_1.png b/resources/g2/track/lattice_triangle/corkscrew_left_2_1.png similarity index 100% rename from resources/g2/track/intamin/corkscrew_left_2_1.png rename to resources/g2/track/lattice_triangle/corkscrew_left_2_1.png diff --git a/resources/g2/track/intamin/corkscrew_left_2_2.png b/resources/g2/track/lattice_triangle/corkscrew_left_2_2.png similarity index 100% rename from resources/g2/track/intamin/corkscrew_left_2_2.png rename to resources/g2/track/lattice_triangle/corkscrew_left_2_2.png diff --git a/resources/g2/track/intamin/corkscrew_left_2_3.png b/resources/g2/track/lattice_triangle/corkscrew_left_2_3.png similarity index 100% rename from resources/g2/track/intamin/corkscrew_left_2_3.png rename to resources/g2/track/lattice_triangle/corkscrew_left_2_3.png diff --git a/resources/g2/track/intamin/corkscrew_left_3_1.png b/resources/g2/track/lattice_triangle/corkscrew_left_3_1.png similarity index 100% rename from resources/g2/track/intamin/corkscrew_left_3_1.png rename to resources/g2/track/lattice_triangle/corkscrew_left_3_1.png diff --git a/resources/g2/track/intamin/corkscrew_left_3_2.png b/resources/g2/track/lattice_triangle/corkscrew_left_3_2.png similarity index 100% rename from resources/g2/track/intamin/corkscrew_left_3_2.png rename to resources/g2/track/lattice_triangle/corkscrew_left_3_2.png diff --git a/resources/g2/track/intamin/corkscrew_left_3_3.png b/resources/g2/track/lattice_triangle/corkscrew_left_3_3.png similarity index 100% rename from resources/g2/track/intamin/corkscrew_left_3_3.png rename to resources/g2/track/lattice_triangle/corkscrew_left_3_3.png diff --git a/resources/g2/track/intamin/corkscrew_left_4_1.png b/resources/g2/track/lattice_triangle/corkscrew_left_4_1.png similarity index 100% rename from resources/g2/track/intamin/corkscrew_left_4_1.png rename to resources/g2/track/lattice_triangle/corkscrew_left_4_1.png diff --git a/resources/g2/track/intamin/corkscrew_left_4_2.png b/resources/g2/track/lattice_triangle/corkscrew_left_4_2.png similarity index 100% rename from resources/g2/track/intamin/corkscrew_left_4_2.png rename to resources/g2/track/lattice_triangle/corkscrew_left_4_2.png diff --git a/resources/g2/track/intamin/corkscrew_left_4_3.png b/resources/g2/track/lattice_triangle/corkscrew_left_4_3.png similarity index 100% rename from resources/g2/track/intamin/corkscrew_left_4_3.png rename to resources/g2/track/lattice_triangle/corkscrew_left_4_3.png diff --git a/resources/g2/track/intamin/corkscrew_right_1_1.png b/resources/g2/track/lattice_triangle/corkscrew_right_1_1.png similarity index 100% rename from resources/g2/track/intamin/corkscrew_right_1_1.png rename to resources/g2/track/lattice_triangle/corkscrew_right_1_1.png diff --git a/resources/g2/track/intamin/corkscrew_right_1_2.png b/resources/g2/track/lattice_triangle/corkscrew_right_1_2.png similarity index 100% rename from resources/g2/track/intamin/corkscrew_right_1_2.png rename to resources/g2/track/lattice_triangle/corkscrew_right_1_2.png diff --git a/resources/g2/track/intamin/corkscrew_right_1_3.png b/resources/g2/track/lattice_triangle/corkscrew_right_1_3.png similarity index 100% rename from resources/g2/track/intamin/corkscrew_right_1_3.png rename to resources/g2/track/lattice_triangle/corkscrew_right_1_3.png diff --git a/resources/g2/track/intamin/corkscrew_right_2_1.png b/resources/g2/track/lattice_triangle/corkscrew_right_2_1.png similarity index 100% rename from resources/g2/track/intamin/corkscrew_right_2_1.png rename to resources/g2/track/lattice_triangle/corkscrew_right_2_1.png diff --git a/resources/g2/track/intamin/corkscrew_right_2_2.png b/resources/g2/track/lattice_triangle/corkscrew_right_2_2.png similarity index 100% rename from resources/g2/track/intamin/corkscrew_right_2_2.png rename to resources/g2/track/lattice_triangle/corkscrew_right_2_2.png diff --git a/resources/g2/track/intamin/corkscrew_right_2_3.png b/resources/g2/track/lattice_triangle/corkscrew_right_2_3.png similarity index 100% rename from resources/g2/track/intamin/corkscrew_right_2_3.png rename to resources/g2/track/lattice_triangle/corkscrew_right_2_3.png diff --git a/resources/g2/track/intamin/corkscrew_right_3_1.png b/resources/g2/track/lattice_triangle/corkscrew_right_3_1.png similarity index 100% rename from resources/g2/track/intamin/corkscrew_right_3_1.png rename to resources/g2/track/lattice_triangle/corkscrew_right_3_1.png diff --git a/resources/g2/track/intamin/corkscrew_right_3_2.png b/resources/g2/track/lattice_triangle/corkscrew_right_3_2.png similarity index 100% rename from resources/g2/track/intamin/corkscrew_right_3_2.png rename to resources/g2/track/lattice_triangle/corkscrew_right_3_2.png diff --git a/resources/g2/track/intamin/corkscrew_right_3_3.png b/resources/g2/track/lattice_triangle/corkscrew_right_3_3.png similarity index 100% rename from resources/g2/track/intamin/corkscrew_right_3_3.png rename to resources/g2/track/lattice_triangle/corkscrew_right_3_3.png diff --git a/resources/g2/track/intamin/corkscrew_right_4_1.png b/resources/g2/track/lattice_triangle/corkscrew_right_4_1.png similarity index 100% rename from resources/g2/track/intamin/corkscrew_right_4_1.png rename to resources/g2/track/lattice_triangle/corkscrew_right_4_1.png diff --git a/resources/g2/track/intamin/corkscrew_right_4_2.png b/resources/g2/track/lattice_triangle/corkscrew_right_4_2.png similarity index 100% rename from resources/g2/track/intamin/corkscrew_right_4_2.png rename to resources/g2/track/lattice_triangle/corkscrew_right_4_2.png diff --git a/resources/g2/track/intamin/corkscrew_right_4_3.png b/resources/g2/track/lattice_triangle/corkscrew_right_4_3.png similarity index 100% rename from resources/g2/track/intamin/corkscrew_right_4_3.png rename to resources/g2/track/lattice_triangle/corkscrew_right_4_3.png diff --git a/resources/g2/track/intamin/flat_to_gentle_up_left_bank_diag_1_1.png b/resources/g2/track/lattice_triangle/flat_to_gentle_up_left_bank_diag_1_1.png similarity index 100% rename from resources/g2/track/intamin/flat_to_gentle_up_left_bank_diag_1_1.png rename to resources/g2/track/lattice_triangle/flat_to_gentle_up_left_bank_diag_1_1.png diff --git a/resources/g2/track/intamin/flat_to_gentle_up_left_bank_diag_1_2.png b/resources/g2/track/lattice_triangle/flat_to_gentle_up_left_bank_diag_1_2.png similarity index 100% rename from resources/g2/track/intamin/flat_to_gentle_up_left_bank_diag_1_2.png rename to resources/g2/track/lattice_triangle/flat_to_gentle_up_left_bank_diag_1_2.png diff --git a/resources/g2/track/intamin/flat_to_gentle_up_left_bank_diag_2.png b/resources/g2/track/lattice_triangle/flat_to_gentle_up_left_bank_diag_2.png similarity index 100% rename from resources/g2/track/intamin/flat_to_gentle_up_left_bank_diag_2.png rename to resources/g2/track/lattice_triangle/flat_to_gentle_up_left_bank_diag_2.png diff --git a/resources/g2/track/intamin/flat_to_gentle_up_left_bank_diag_3.png b/resources/g2/track/lattice_triangle/flat_to_gentle_up_left_bank_diag_3.png similarity index 100% rename from resources/g2/track/intamin/flat_to_gentle_up_left_bank_diag_3.png rename to resources/g2/track/lattice_triangle/flat_to_gentle_up_left_bank_diag_3.png diff --git a/resources/g2/track/intamin/flat_to_gentle_up_left_bank_diag_4.png b/resources/g2/track/lattice_triangle/flat_to_gentle_up_left_bank_diag_4.png similarity index 100% rename from resources/g2/track/intamin/flat_to_gentle_up_left_bank_diag_4.png rename to resources/g2/track/lattice_triangle/flat_to_gentle_up_left_bank_diag_4.png diff --git a/resources/g2/track/intamin/flat_to_gentle_up_right_bank_diag_1.png b/resources/g2/track/lattice_triangle/flat_to_gentle_up_right_bank_diag_1.png similarity index 100% rename from resources/g2/track/intamin/flat_to_gentle_up_right_bank_diag_1.png rename to resources/g2/track/lattice_triangle/flat_to_gentle_up_right_bank_diag_1.png diff --git a/resources/g2/track/intamin/flat_to_gentle_up_right_bank_diag_2.png b/resources/g2/track/lattice_triangle/flat_to_gentle_up_right_bank_diag_2.png similarity index 100% rename from resources/g2/track/intamin/flat_to_gentle_up_right_bank_diag_2.png rename to resources/g2/track/lattice_triangle/flat_to_gentle_up_right_bank_diag_2.png diff --git a/resources/g2/track/intamin/flat_to_gentle_up_right_bank_diag_3_1.png b/resources/g2/track/lattice_triangle/flat_to_gentle_up_right_bank_diag_3_1.png similarity index 100% rename from resources/g2/track/intamin/flat_to_gentle_up_right_bank_diag_3_1.png rename to resources/g2/track/lattice_triangle/flat_to_gentle_up_right_bank_diag_3_1.png diff --git a/resources/g2/track/intamin/flat_to_gentle_up_right_bank_diag_3_2.png b/resources/g2/track/lattice_triangle/flat_to_gentle_up_right_bank_diag_3_2.png similarity index 100% rename from resources/g2/track/intamin/flat_to_gentle_up_right_bank_diag_3_2.png rename to resources/g2/track/lattice_triangle/flat_to_gentle_up_right_bank_diag_3_2.png diff --git a/resources/g2/track/intamin/flat_to_gentle_up_right_bank_diag_4.png b/resources/g2/track/lattice_triangle/flat_to_gentle_up_right_bank_diag_4.png similarity index 100% rename from resources/g2/track/intamin/flat_to_gentle_up_right_bank_diag_4.png rename to resources/g2/track/lattice_triangle/flat_to_gentle_up_right_bank_diag_4.png diff --git a/resources/g2/track/intamin/gentle_up_left_bank_diag_1.png b/resources/g2/track/lattice_triangle/gentle_up_left_bank_diag_1.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_left_bank_diag_1.png rename to resources/g2/track/lattice_triangle/gentle_up_left_bank_diag_1.png diff --git a/resources/g2/track/intamin/gentle_up_left_bank_diag_2.png b/resources/g2/track/lattice_triangle/gentle_up_left_bank_diag_2.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_left_bank_diag_2.png rename to resources/g2/track/lattice_triangle/gentle_up_left_bank_diag_2.png diff --git a/resources/g2/track/intamin/gentle_up_left_bank_diag_3.png b/resources/g2/track/lattice_triangle/gentle_up_left_bank_diag_3.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_left_bank_diag_3.png rename to resources/g2/track/lattice_triangle/gentle_up_left_bank_diag_3.png diff --git a/resources/g2/track/intamin/gentle_up_left_bank_diag_4.png b/resources/g2/track/lattice_triangle/gentle_up_left_bank_diag_4.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_left_bank_diag_4.png rename to resources/g2/track/lattice_triangle/gentle_up_left_bank_diag_4.png diff --git a/resources/g2/track/intamin/gentle_up_left_bank_to_flat_diag_1_1.png b/resources/g2/track/lattice_triangle/gentle_up_left_bank_to_flat_diag_1_1.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_left_bank_to_flat_diag_1_1.png rename to resources/g2/track/lattice_triangle/gentle_up_left_bank_to_flat_diag_1_1.png diff --git a/resources/g2/track/intamin/gentle_up_left_bank_to_flat_diag_1_2.png b/resources/g2/track/lattice_triangle/gentle_up_left_bank_to_flat_diag_1_2.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_left_bank_to_flat_diag_1_2.png rename to resources/g2/track/lattice_triangle/gentle_up_left_bank_to_flat_diag_1_2.png diff --git a/resources/g2/track/intamin/gentle_up_left_bank_to_flat_diag_2.png b/resources/g2/track/lattice_triangle/gentle_up_left_bank_to_flat_diag_2.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_left_bank_to_flat_diag_2.png rename to resources/g2/track/lattice_triangle/gentle_up_left_bank_to_flat_diag_2.png diff --git a/resources/g2/track/intamin/gentle_up_left_bank_to_flat_diag_3.png b/resources/g2/track/lattice_triangle/gentle_up_left_bank_to_flat_diag_3.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_left_bank_to_flat_diag_3.png rename to resources/g2/track/lattice_triangle/gentle_up_left_bank_to_flat_diag_3.png diff --git a/resources/g2/track/intamin/gentle_up_left_bank_to_flat_diag_4.png b/resources/g2/track/lattice_triangle/gentle_up_left_bank_to_flat_diag_4.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_left_bank_to_flat_diag_4.png rename to resources/g2/track/lattice_triangle/gentle_up_left_bank_to_flat_diag_4.png diff --git a/resources/g2/track/intamin/gentle_up_left_bank_to_gentle_up_diag_1_1.png b/resources/g2/track/lattice_triangle/gentle_up_left_bank_to_gentle_up_diag_1_1.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_left_bank_to_gentle_up_diag_1_1.png rename to resources/g2/track/lattice_triangle/gentle_up_left_bank_to_gentle_up_diag_1_1.png diff --git a/resources/g2/track/intamin/gentle_up_left_bank_to_gentle_up_diag_1_2.png b/resources/g2/track/lattice_triangle/gentle_up_left_bank_to_gentle_up_diag_1_2.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_left_bank_to_gentle_up_diag_1_2.png rename to resources/g2/track/lattice_triangle/gentle_up_left_bank_to_gentle_up_diag_1_2.png diff --git a/resources/g2/track/intamin/gentle_up_left_bank_to_gentle_up_diag_2.png b/resources/g2/track/lattice_triangle/gentle_up_left_bank_to_gentle_up_diag_2.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_left_bank_to_gentle_up_diag_2.png rename to resources/g2/track/lattice_triangle/gentle_up_left_bank_to_gentle_up_diag_2.png diff --git a/resources/g2/track/intamin/gentle_up_left_bank_to_gentle_up_diag_3.png b/resources/g2/track/lattice_triangle/gentle_up_left_bank_to_gentle_up_diag_3.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_left_bank_to_gentle_up_diag_3.png rename to resources/g2/track/lattice_triangle/gentle_up_left_bank_to_gentle_up_diag_3.png diff --git a/resources/g2/track/intamin/gentle_up_left_bank_to_gentle_up_diag_4.png b/resources/g2/track/lattice_triangle/gentle_up_left_bank_to_gentle_up_diag_4.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_left_bank_to_gentle_up_diag_4.png rename to resources/g2/track/lattice_triangle/gentle_up_left_bank_to_gentle_up_diag_4.png diff --git a/resources/g2/track/intamin/gentle_up_left_bank_to_left_bank_diag_1.png b/resources/g2/track/lattice_triangle/gentle_up_left_bank_to_left_bank_diag_1.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_left_bank_to_left_bank_diag_1.png rename to resources/g2/track/lattice_triangle/gentle_up_left_bank_to_left_bank_diag_1.png diff --git a/resources/g2/track/intamin/gentle_up_left_bank_to_left_bank_diag_2.png b/resources/g2/track/lattice_triangle/gentle_up_left_bank_to_left_bank_diag_2.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_left_bank_to_left_bank_diag_2.png rename to resources/g2/track/lattice_triangle/gentle_up_left_bank_to_left_bank_diag_2.png diff --git a/resources/g2/track/intamin/gentle_up_left_bank_to_left_bank_diag_3.png b/resources/g2/track/lattice_triangle/gentle_up_left_bank_to_left_bank_diag_3.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_left_bank_to_left_bank_diag_3.png rename to resources/g2/track/lattice_triangle/gentle_up_left_bank_to_left_bank_diag_3.png diff --git a/resources/g2/track/intamin/gentle_up_left_bank_to_left_bank_diag_4.png b/resources/g2/track/lattice_triangle/gentle_up_left_bank_to_left_bank_diag_4.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_left_bank_to_left_bank_diag_4.png rename to resources/g2/track/lattice_triangle/gentle_up_left_bank_to_left_bank_diag_4.png diff --git a/resources/g2/track/intamin/gentle_up_right_bank_diag_1.png b/resources/g2/track/lattice_triangle/gentle_up_right_bank_diag_1.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_right_bank_diag_1.png rename to resources/g2/track/lattice_triangle/gentle_up_right_bank_diag_1.png diff --git a/resources/g2/track/intamin/gentle_up_right_bank_diag_2.png b/resources/g2/track/lattice_triangle/gentle_up_right_bank_diag_2.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_right_bank_diag_2.png rename to resources/g2/track/lattice_triangle/gentle_up_right_bank_diag_2.png diff --git a/resources/g2/track/intamin/gentle_up_right_bank_diag_3.png b/resources/g2/track/lattice_triangle/gentle_up_right_bank_diag_3.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_right_bank_diag_3.png rename to resources/g2/track/lattice_triangle/gentle_up_right_bank_diag_3.png diff --git a/resources/g2/track/intamin/gentle_up_right_bank_diag_4.png b/resources/g2/track/lattice_triangle/gentle_up_right_bank_diag_4.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_right_bank_diag_4.png rename to resources/g2/track/lattice_triangle/gentle_up_right_bank_diag_4.png diff --git a/resources/g2/track/intamin/gentle_up_right_bank_to_flat_diag_1.png b/resources/g2/track/lattice_triangle/gentle_up_right_bank_to_flat_diag_1.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_right_bank_to_flat_diag_1.png rename to resources/g2/track/lattice_triangle/gentle_up_right_bank_to_flat_diag_1.png diff --git a/resources/g2/track/intamin/gentle_up_right_bank_to_flat_diag_2.png b/resources/g2/track/lattice_triangle/gentle_up_right_bank_to_flat_diag_2.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_right_bank_to_flat_diag_2.png rename to resources/g2/track/lattice_triangle/gentle_up_right_bank_to_flat_diag_2.png diff --git a/resources/g2/track/intamin/gentle_up_right_bank_to_flat_diag_3_1.png b/resources/g2/track/lattice_triangle/gentle_up_right_bank_to_flat_diag_3_1.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_right_bank_to_flat_diag_3_1.png rename to resources/g2/track/lattice_triangle/gentle_up_right_bank_to_flat_diag_3_1.png diff --git a/resources/g2/track/intamin/gentle_up_right_bank_to_flat_diag_3_2.png b/resources/g2/track/lattice_triangle/gentle_up_right_bank_to_flat_diag_3_2.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_right_bank_to_flat_diag_3_2.png rename to resources/g2/track/lattice_triangle/gentle_up_right_bank_to_flat_diag_3_2.png diff --git a/resources/g2/track/intamin/gentle_up_right_bank_to_flat_diag_4.png b/resources/g2/track/lattice_triangle/gentle_up_right_bank_to_flat_diag_4.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_right_bank_to_flat_diag_4.png rename to resources/g2/track/lattice_triangle/gentle_up_right_bank_to_flat_diag_4.png diff --git a/resources/g2/track/intamin/gentle_up_right_bank_to_gentle_up_diag_1.png b/resources/g2/track/lattice_triangle/gentle_up_right_bank_to_gentle_up_diag_1.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_right_bank_to_gentle_up_diag_1.png rename to resources/g2/track/lattice_triangle/gentle_up_right_bank_to_gentle_up_diag_1.png diff --git a/resources/g2/track/intamin/gentle_up_right_bank_to_gentle_up_diag_2.png b/resources/g2/track/lattice_triangle/gentle_up_right_bank_to_gentle_up_diag_2.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_right_bank_to_gentle_up_diag_2.png rename to resources/g2/track/lattice_triangle/gentle_up_right_bank_to_gentle_up_diag_2.png diff --git a/resources/g2/track/intamin/gentle_up_right_bank_to_gentle_up_diag_3_1.png b/resources/g2/track/lattice_triangle/gentle_up_right_bank_to_gentle_up_diag_3_1.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_right_bank_to_gentle_up_diag_3_1.png rename to resources/g2/track/lattice_triangle/gentle_up_right_bank_to_gentle_up_diag_3_1.png diff --git a/resources/g2/track/intamin/gentle_up_right_bank_to_gentle_up_diag_3_2.png b/resources/g2/track/lattice_triangle/gentle_up_right_bank_to_gentle_up_diag_3_2.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_right_bank_to_gentle_up_diag_3_2.png rename to resources/g2/track/lattice_triangle/gentle_up_right_bank_to_gentle_up_diag_3_2.png diff --git a/resources/g2/track/intamin/gentle_up_right_bank_to_gentle_up_diag_4.png b/resources/g2/track/lattice_triangle/gentle_up_right_bank_to_gentle_up_diag_4.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_right_bank_to_gentle_up_diag_4.png rename to resources/g2/track/lattice_triangle/gentle_up_right_bank_to_gentle_up_diag_4.png diff --git a/resources/g2/track/intamin/gentle_up_right_bank_to_right_bank_diag_1.png b/resources/g2/track/lattice_triangle/gentle_up_right_bank_to_right_bank_diag_1.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_right_bank_to_right_bank_diag_1.png rename to resources/g2/track/lattice_triangle/gentle_up_right_bank_to_right_bank_diag_1.png diff --git a/resources/g2/track/intamin/gentle_up_right_bank_to_right_bank_diag_2.png b/resources/g2/track/lattice_triangle/gentle_up_right_bank_to_right_bank_diag_2.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_right_bank_to_right_bank_diag_2.png rename to resources/g2/track/lattice_triangle/gentle_up_right_bank_to_right_bank_diag_2.png diff --git a/resources/g2/track/intamin/gentle_up_right_bank_to_right_bank_diag_3.png b/resources/g2/track/lattice_triangle/gentle_up_right_bank_to_right_bank_diag_3.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_right_bank_to_right_bank_diag_3.png rename to resources/g2/track/lattice_triangle/gentle_up_right_bank_to_right_bank_diag_3.png diff --git a/resources/g2/track/intamin/gentle_up_right_bank_to_right_bank_diag_4.png b/resources/g2/track/lattice_triangle/gentle_up_right_bank_to_right_bank_diag_4.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_right_bank_to_right_bank_diag_4.png rename to resources/g2/track/lattice_triangle/gentle_up_right_bank_to_right_bank_diag_4.png diff --git a/resources/g2/track/intamin/gentle_up_to_gentle_up_left_bank_diag_1_1.png b/resources/g2/track/lattice_triangle/gentle_up_to_gentle_up_left_bank_diag_1_1.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_to_gentle_up_left_bank_diag_1_1.png rename to resources/g2/track/lattice_triangle/gentle_up_to_gentle_up_left_bank_diag_1_1.png diff --git a/resources/g2/track/intamin/gentle_up_to_gentle_up_left_bank_diag_1_2.png b/resources/g2/track/lattice_triangle/gentle_up_to_gentle_up_left_bank_diag_1_2.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_to_gentle_up_left_bank_diag_1_2.png rename to resources/g2/track/lattice_triangle/gentle_up_to_gentle_up_left_bank_diag_1_2.png diff --git a/resources/g2/track/intamin/gentle_up_to_gentle_up_left_bank_diag_2.png b/resources/g2/track/lattice_triangle/gentle_up_to_gentle_up_left_bank_diag_2.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_to_gentle_up_left_bank_diag_2.png rename to resources/g2/track/lattice_triangle/gentle_up_to_gentle_up_left_bank_diag_2.png diff --git a/resources/g2/track/intamin/gentle_up_to_gentle_up_left_bank_diag_3.png b/resources/g2/track/lattice_triangle/gentle_up_to_gentle_up_left_bank_diag_3.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_to_gentle_up_left_bank_diag_3.png rename to resources/g2/track/lattice_triangle/gentle_up_to_gentle_up_left_bank_diag_3.png diff --git a/resources/g2/track/intamin/gentle_up_to_gentle_up_left_bank_diag_4.png b/resources/g2/track/lattice_triangle/gentle_up_to_gentle_up_left_bank_diag_4.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_to_gentle_up_left_bank_diag_4.png rename to resources/g2/track/lattice_triangle/gentle_up_to_gentle_up_left_bank_diag_4.png diff --git a/resources/g2/track/intamin/gentle_up_to_gentle_up_right_bank_diag_1.png b/resources/g2/track/lattice_triangle/gentle_up_to_gentle_up_right_bank_diag_1.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_to_gentle_up_right_bank_diag_1.png rename to resources/g2/track/lattice_triangle/gentle_up_to_gentle_up_right_bank_diag_1.png diff --git a/resources/g2/track/intamin/gentle_up_to_gentle_up_right_bank_diag_2.png b/resources/g2/track/lattice_triangle/gentle_up_to_gentle_up_right_bank_diag_2.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_to_gentle_up_right_bank_diag_2.png rename to resources/g2/track/lattice_triangle/gentle_up_to_gentle_up_right_bank_diag_2.png diff --git a/resources/g2/track/intamin/gentle_up_to_gentle_up_right_bank_diag_3_1.png b/resources/g2/track/lattice_triangle/gentle_up_to_gentle_up_right_bank_diag_3_1.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_to_gentle_up_right_bank_diag_3_1.png rename to resources/g2/track/lattice_triangle/gentle_up_to_gentle_up_right_bank_diag_3_1.png diff --git a/resources/g2/track/intamin/gentle_up_to_gentle_up_right_bank_diag_3_2.png b/resources/g2/track/lattice_triangle/gentle_up_to_gentle_up_right_bank_diag_3_2.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_to_gentle_up_right_bank_diag_3_2.png rename to resources/g2/track/lattice_triangle/gentle_up_to_gentle_up_right_bank_diag_3_2.png diff --git a/resources/g2/track/intamin/gentle_up_to_gentle_up_right_bank_diag_4.png b/resources/g2/track/lattice_triangle/gentle_up_to_gentle_up_right_bank_diag_4.png similarity index 100% rename from resources/g2/track/intamin/gentle_up_to_gentle_up_right_bank_diag_4.png rename to resources/g2/track/lattice_triangle/gentle_up_to_gentle_up_right_bank_diag_4.png diff --git a/resources/g2/track/intamin/half_loop_1_1.png b/resources/g2/track/lattice_triangle/half_loop_1_1.png similarity index 100% rename from resources/g2/track/intamin/half_loop_1_1.png rename to resources/g2/track/lattice_triangle/half_loop_1_1.png diff --git a/resources/g2/track/intamin/half_loop_1_2.png b/resources/g2/track/lattice_triangle/half_loop_1_2.png similarity index 100% rename from resources/g2/track/intamin/half_loop_1_2.png rename to resources/g2/track/lattice_triangle/half_loop_1_2.png diff --git a/resources/g2/track/intamin/half_loop_1_3.png b/resources/g2/track/lattice_triangle/half_loop_1_3.png similarity index 100% rename from resources/g2/track/intamin/half_loop_1_3.png rename to resources/g2/track/lattice_triangle/half_loop_1_3.png diff --git a/resources/g2/track/intamin/half_loop_1_4.png b/resources/g2/track/lattice_triangle/half_loop_1_4.png similarity index 100% rename from resources/g2/track/intamin/half_loop_1_4.png rename to resources/g2/track/lattice_triangle/half_loop_1_4.png diff --git a/resources/g2/track/intamin/half_loop_2_1.png b/resources/g2/track/lattice_triangle/half_loop_2_1.png similarity index 100% rename from resources/g2/track/intamin/half_loop_2_1.png rename to resources/g2/track/lattice_triangle/half_loop_2_1.png diff --git a/resources/g2/track/intamin/half_loop_2_2.png b/resources/g2/track/lattice_triangle/half_loop_2_2.png similarity index 100% rename from resources/g2/track/intamin/half_loop_2_2.png rename to resources/g2/track/lattice_triangle/half_loop_2_2.png diff --git a/resources/g2/track/intamin/half_loop_2_3.png b/resources/g2/track/lattice_triangle/half_loop_2_3.png similarity index 100% rename from resources/g2/track/intamin/half_loop_2_3.png rename to resources/g2/track/lattice_triangle/half_loop_2_3.png diff --git a/resources/g2/track/intamin/half_loop_2_4.png b/resources/g2/track/lattice_triangle/half_loop_2_4.png similarity index 100% rename from resources/g2/track/intamin/half_loop_2_4.png rename to resources/g2/track/lattice_triangle/half_loop_2_4.png diff --git a/resources/g2/track/intamin/half_loop_3_1.png b/resources/g2/track/lattice_triangle/half_loop_3_1.png similarity index 100% rename from resources/g2/track/intamin/half_loop_3_1.png rename to resources/g2/track/lattice_triangle/half_loop_3_1.png diff --git a/resources/g2/track/intamin/half_loop_3_2.png b/resources/g2/track/lattice_triangle/half_loop_3_2.png similarity index 100% rename from resources/g2/track/intamin/half_loop_3_2.png rename to resources/g2/track/lattice_triangle/half_loop_3_2.png diff --git a/resources/g2/track/intamin/half_loop_3_3.png b/resources/g2/track/lattice_triangle/half_loop_3_3.png similarity index 100% rename from resources/g2/track/intamin/half_loop_3_3.png rename to resources/g2/track/lattice_triangle/half_loop_3_3.png diff --git a/resources/g2/track/intamin/half_loop_3_4.png b/resources/g2/track/lattice_triangle/half_loop_3_4.png similarity index 100% rename from resources/g2/track/intamin/half_loop_3_4.png rename to resources/g2/track/lattice_triangle/half_loop_3_4.png diff --git a/resources/g2/track/intamin/half_loop_4_1.png b/resources/g2/track/lattice_triangle/half_loop_4_1.png similarity index 100% rename from resources/g2/track/intamin/half_loop_4_1.png rename to resources/g2/track/lattice_triangle/half_loop_4_1.png diff --git a/resources/g2/track/intamin/half_loop_4_2.png b/resources/g2/track/lattice_triangle/half_loop_4_2.png similarity index 100% rename from resources/g2/track/intamin/half_loop_4_2.png rename to resources/g2/track/lattice_triangle/half_loop_4_2.png diff --git a/resources/g2/track/intamin/half_loop_4_3.png b/resources/g2/track/lattice_triangle/half_loop_4_3.png similarity index 100% rename from resources/g2/track/intamin/half_loop_4_3.png rename to resources/g2/track/lattice_triangle/half_loop_4_3.png diff --git a/resources/g2/track/intamin/half_loop_4_4.png b/resources/g2/track/lattice_triangle/half_loop_4_4.png similarity index 100% rename from resources/g2/track/intamin/half_loop_4_4.png rename to resources/g2/track/lattice_triangle/half_loop_4_4.png diff --git a/resources/g2/track/intamin/large_corkscrew_left_1_1.png b/resources/g2/track/lattice_triangle/large_corkscrew_left_1_1.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_left_1_1.png rename to resources/g2/track/lattice_triangle/large_corkscrew_left_1_1.png diff --git a/resources/g2/track/intamin/large_corkscrew_left_1_2.png b/resources/g2/track/lattice_triangle/large_corkscrew_left_1_2.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_left_1_2.png rename to resources/g2/track/lattice_triangle/large_corkscrew_left_1_2.png diff --git a/resources/g2/track/intamin/large_corkscrew_left_1_3.png b/resources/g2/track/lattice_triangle/large_corkscrew_left_1_3.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_left_1_3.png rename to resources/g2/track/lattice_triangle/large_corkscrew_left_1_3.png diff --git a/resources/g2/track/intamin/large_corkscrew_left_1_4.png b/resources/g2/track/lattice_triangle/large_corkscrew_left_1_4.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_left_1_4.png rename to resources/g2/track/lattice_triangle/large_corkscrew_left_1_4.png diff --git a/resources/g2/track/intamin/large_corkscrew_left_1_5.png b/resources/g2/track/lattice_triangle/large_corkscrew_left_1_5.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_left_1_5.png rename to resources/g2/track/lattice_triangle/large_corkscrew_left_1_5.png diff --git a/resources/g2/track/intamin/large_corkscrew_left_2_1.png b/resources/g2/track/lattice_triangle/large_corkscrew_left_2_1.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_left_2_1.png rename to resources/g2/track/lattice_triangle/large_corkscrew_left_2_1.png diff --git a/resources/g2/track/intamin/large_corkscrew_left_2_2.png b/resources/g2/track/lattice_triangle/large_corkscrew_left_2_2.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_left_2_2.png rename to resources/g2/track/lattice_triangle/large_corkscrew_left_2_2.png diff --git a/resources/g2/track/intamin/large_corkscrew_left_2_3.png b/resources/g2/track/lattice_triangle/large_corkscrew_left_2_3.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_left_2_3.png rename to resources/g2/track/lattice_triangle/large_corkscrew_left_2_3.png diff --git a/resources/g2/track/intamin/large_corkscrew_left_2_4.png b/resources/g2/track/lattice_triangle/large_corkscrew_left_2_4.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_left_2_4.png rename to resources/g2/track/lattice_triangle/large_corkscrew_left_2_4.png diff --git a/resources/g2/track/intamin/large_corkscrew_left_2_5.png b/resources/g2/track/lattice_triangle/large_corkscrew_left_2_5.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_left_2_5.png rename to resources/g2/track/lattice_triangle/large_corkscrew_left_2_5.png diff --git a/resources/g2/track/intamin/large_corkscrew_left_3_1.png b/resources/g2/track/lattice_triangle/large_corkscrew_left_3_1.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_left_3_1.png rename to resources/g2/track/lattice_triangle/large_corkscrew_left_3_1.png diff --git a/resources/g2/track/intamin/large_corkscrew_left_3_2.png b/resources/g2/track/lattice_triangle/large_corkscrew_left_3_2.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_left_3_2.png rename to resources/g2/track/lattice_triangle/large_corkscrew_left_3_2.png diff --git a/resources/g2/track/intamin/large_corkscrew_left_3_3.png b/resources/g2/track/lattice_triangle/large_corkscrew_left_3_3.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_left_3_3.png rename to resources/g2/track/lattice_triangle/large_corkscrew_left_3_3.png diff --git a/resources/g2/track/intamin/large_corkscrew_left_3_4.png b/resources/g2/track/lattice_triangle/large_corkscrew_left_3_4.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_left_3_4.png rename to resources/g2/track/lattice_triangle/large_corkscrew_left_3_4.png diff --git a/resources/g2/track/intamin/large_corkscrew_left_3_5.png b/resources/g2/track/lattice_triangle/large_corkscrew_left_3_5.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_left_3_5.png rename to resources/g2/track/lattice_triangle/large_corkscrew_left_3_5.png diff --git a/resources/g2/track/intamin/large_corkscrew_left_4_1.png b/resources/g2/track/lattice_triangle/large_corkscrew_left_4_1.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_left_4_1.png rename to resources/g2/track/lattice_triangle/large_corkscrew_left_4_1.png diff --git a/resources/g2/track/intamin/large_corkscrew_left_4_2.png b/resources/g2/track/lattice_triangle/large_corkscrew_left_4_2.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_left_4_2.png rename to resources/g2/track/lattice_triangle/large_corkscrew_left_4_2.png diff --git a/resources/g2/track/intamin/large_corkscrew_left_4_3.png b/resources/g2/track/lattice_triangle/large_corkscrew_left_4_3.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_left_4_3.png rename to resources/g2/track/lattice_triangle/large_corkscrew_left_4_3.png diff --git a/resources/g2/track/intamin/large_corkscrew_left_4_4.png b/resources/g2/track/lattice_triangle/large_corkscrew_left_4_4.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_left_4_4.png rename to resources/g2/track/lattice_triangle/large_corkscrew_left_4_4.png diff --git a/resources/g2/track/intamin/large_corkscrew_left_4_5.png b/resources/g2/track/lattice_triangle/large_corkscrew_left_4_5.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_left_4_5.png rename to resources/g2/track/lattice_triangle/large_corkscrew_left_4_5.png diff --git a/resources/g2/track/intamin/large_corkscrew_right_1_1.png b/resources/g2/track/lattice_triangle/large_corkscrew_right_1_1.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_right_1_1.png rename to resources/g2/track/lattice_triangle/large_corkscrew_right_1_1.png diff --git a/resources/g2/track/intamin/large_corkscrew_right_1_2.png b/resources/g2/track/lattice_triangle/large_corkscrew_right_1_2.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_right_1_2.png rename to resources/g2/track/lattice_triangle/large_corkscrew_right_1_2.png diff --git a/resources/g2/track/intamin/large_corkscrew_right_1_3.png b/resources/g2/track/lattice_triangle/large_corkscrew_right_1_3.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_right_1_3.png rename to resources/g2/track/lattice_triangle/large_corkscrew_right_1_3.png diff --git a/resources/g2/track/intamin/large_corkscrew_right_1_4.png b/resources/g2/track/lattice_triangle/large_corkscrew_right_1_4.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_right_1_4.png rename to resources/g2/track/lattice_triangle/large_corkscrew_right_1_4.png diff --git a/resources/g2/track/intamin/large_corkscrew_right_1_5.png b/resources/g2/track/lattice_triangle/large_corkscrew_right_1_5.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_right_1_5.png rename to resources/g2/track/lattice_triangle/large_corkscrew_right_1_5.png diff --git a/resources/g2/track/intamin/large_corkscrew_right_2_1.png b/resources/g2/track/lattice_triangle/large_corkscrew_right_2_1.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_right_2_1.png rename to resources/g2/track/lattice_triangle/large_corkscrew_right_2_1.png diff --git a/resources/g2/track/intamin/large_corkscrew_right_2_2.png b/resources/g2/track/lattice_triangle/large_corkscrew_right_2_2.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_right_2_2.png rename to resources/g2/track/lattice_triangle/large_corkscrew_right_2_2.png diff --git a/resources/g2/track/intamin/large_corkscrew_right_2_3.png b/resources/g2/track/lattice_triangle/large_corkscrew_right_2_3.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_right_2_3.png rename to resources/g2/track/lattice_triangle/large_corkscrew_right_2_3.png diff --git a/resources/g2/track/intamin/large_corkscrew_right_2_4.png b/resources/g2/track/lattice_triangle/large_corkscrew_right_2_4.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_right_2_4.png rename to resources/g2/track/lattice_triangle/large_corkscrew_right_2_4.png diff --git a/resources/g2/track/intamin/large_corkscrew_right_2_5.png b/resources/g2/track/lattice_triangle/large_corkscrew_right_2_5.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_right_2_5.png rename to resources/g2/track/lattice_triangle/large_corkscrew_right_2_5.png diff --git a/resources/g2/track/intamin/large_corkscrew_right_3_1.png b/resources/g2/track/lattice_triangle/large_corkscrew_right_3_1.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_right_3_1.png rename to resources/g2/track/lattice_triangle/large_corkscrew_right_3_1.png diff --git a/resources/g2/track/intamin/large_corkscrew_right_3_2.png b/resources/g2/track/lattice_triangle/large_corkscrew_right_3_2.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_right_3_2.png rename to resources/g2/track/lattice_triangle/large_corkscrew_right_3_2.png diff --git a/resources/g2/track/intamin/large_corkscrew_right_3_3.png b/resources/g2/track/lattice_triangle/large_corkscrew_right_3_3.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_right_3_3.png rename to resources/g2/track/lattice_triangle/large_corkscrew_right_3_3.png diff --git a/resources/g2/track/intamin/large_corkscrew_right_3_4.png b/resources/g2/track/lattice_triangle/large_corkscrew_right_3_4.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_right_3_4.png rename to resources/g2/track/lattice_triangle/large_corkscrew_right_3_4.png diff --git a/resources/g2/track/intamin/large_corkscrew_right_3_5.png b/resources/g2/track/lattice_triangle/large_corkscrew_right_3_5.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_right_3_5.png rename to resources/g2/track/lattice_triangle/large_corkscrew_right_3_5.png diff --git a/resources/g2/track/intamin/large_corkscrew_right_4_1.png b/resources/g2/track/lattice_triangle/large_corkscrew_right_4_1.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_right_4_1.png rename to resources/g2/track/lattice_triangle/large_corkscrew_right_4_1.png diff --git a/resources/g2/track/intamin/large_corkscrew_right_4_2.png b/resources/g2/track/lattice_triangle/large_corkscrew_right_4_2.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_right_4_2.png rename to resources/g2/track/lattice_triangle/large_corkscrew_right_4_2.png diff --git a/resources/g2/track/intamin/large_corkscrew_right_4_3.png b/resources/g2/track/lattice_triangle/large_corkscrew_right_4_3.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_right_4_3.png rename to resources/g2/track/lattice_triangle/large_corkscrew_right_4_3.png diff --git a/resources/g2/track/intamin/large_corkscrew_right_4_4.png b/resources/g2/track/lattice_triangle/large_corkscrew_right_4_4.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_right_4_4.png rename to resources/g2/track/lattice_triangle/large_corkscrew_right_4_4.png diff --git a/resources/g2/track/intamin/large_corkscrew_right_4_5.png b/resources/g2/track/lattice_triangle/large_corkscrew_right_4_5.png similarity index 100% rename from resources/g2/track/intamin/large_corkscrew_right_4_5.png rename to resources/g2/track/lattice_triangle/large_corkscrew_right_4_5.png diff --git a/resources/g2/track/intamin/large_half_loop_left_1_1.png b/resources/g2/track/lattice_triangle/large_half_loop_left_1_1.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_left_1_1.png rename to resources/g2/track/lattice_triangle/large_half_loop_left_1_1.png diff --git a/resources/g2/track/intamin/large_half_loop_left_1_2.png b/resources/g2/track/lattice_triangle/large_half_loop_left_1_2.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_left_1_2.png rename to resources/g2/track/lattice_triangle/large_half_loop_left_1_2.png diff --git a/resources/g2/track/intamin/large_half_loop_left_1_3.png b/resources/g2/track/lattice_triangle/large_half_loop_left_1_3.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_left_1_3.png rename to resources/g2/track/lattice_triangle/large_half_loop_left_1_3.png diff --git a/resources/g2/track/intamin/large_half_loop_left_1_4.png b/resources/g2/track/lattice_triangle/large_half_loop_left_1_4.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_left_1_4.png rename to resources/g2/track/lattice_triangle/large_half_loop_left_1_4.png diff --git a/resources/g2/track/intamin/large_half_loop_left_1_5.png b/resources/g2/track/lattice_triangle/large_half_loop_left_1_5.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_left_1_5.png rename to resources/g2/track/lattice_triangle/large_half_loop_left_1_5.png diff --git a/resources/g2/track/intamin/large_half_loop_left_1_6.png b/resources/g2/track/lattice_triangle/large_half_loop_left_1_6.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_left_1_6.png rename to resources/g2/track/lattice_triangle/large_half_loop_left_1_6.png diff --git a/resources/g2/track/intamin/large_half_loop_left_1_7.png b/resources/g2/track/lattice_triangle/large_half_loop_left_1_7.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_left_1_7.png rename to resources/g2/track/lattice_triangle/large_half_loop_left_1_7.png diff --git a/resources/g2/track/intamin/large_half_loop_left_2_1.png b/resources/g2/track/lattice_triangle/large_half_loop_left_2_1.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_left_2_1.png rename to resources/g2/track/lattice_triangle/large_half_loop_left_2_1.png diff --git a/resources/g2/track/intamin/large_half_loop_left_2_2.png b/resources/g2/track/lattice_triangle/large_half_loop_left_2_2.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_left_2_2.png rename to resources/g2/track/lattice_triangle/large_half_loop_left_2_2.png diff --git a/resources/g2/track/intamin/large_half_loop_left_2_3.png b/resources/g2/track/lattice_triangle/large_half_loop_left_2_3.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_left_2_3.png rename to resources/g2/track/lattice_triangle/large_half_loop_left_2_3.png diff --git a/resources/g2/track/intamin/large_half_loop_left_2_4.png b/resources/g2/track/lattice_triangle/large_half_loop_left_2_4.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_left_2_4.png rename to resources/g2/track/lattice_triangle/large_half_loop_left_2_4.png diff --git a/resources/g2/track/intamin/large_half_loop_left_2_5.png b/resources/g2/track/lattice_triangle/large_half_loop_left_2_5.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_left_2_5.png rename to resources/g2/track/lattice_triangle/large_half_loop_left_2_5.png diff --git a/resources/g2/track/intamin/large_half_loop_left_2_6.png b/resources/g2/track/lattice_triangle/large_half_loop_left_2_6.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_left_2_6.png rename to resources/g2/track/lattice_triangle/large_half_loop_left_2_6.png diff --git a/resources/g2/track/intamin/large_half_loop_left_2_7.png b/resources/g2/track/lattice_triangle/large_half_loop_left_2_7.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_left_2_7.png rename to resources/g2/track/lattice_triangle/large_half_loop_left_2_7.png diff --git a/resources/g2/track/intamin/large_half_loop_left_3_1.png b/resources/g2/track/lattice_triangle/large_half_loop_left_3_1.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_left_3_1.png rename to resources/g2/track/lattice_triangle/large_half_loop_left_3_1.png diff --git a/resources/g2/track/intamin/large_half_loop_left_3_2.png b/resources/g2/track/lattice_triangle/large_half_loop_left_3_2.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_left_3_2.png rename to resources/g2/track/lattice_triangle/large_half_loop_left_3_2.png diff --git a/resources/g2/track/intamin/large_half_loop_left_3_3.png b/resources/g2/track/lattice_triangle/large_half_loop_left_3_3.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_left_3_3.png rename to resources/g2/track/lattice_triangle/large_half_loop_left_3_3.png diff --git a/resources/g2/track/intamin/large_half_loop_left_3_4.png b/resources/g2/track/lattice_triangle/large_half_loop_left_3_4.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_left_3_4.png rename to resources/g2/track/lattice_triangle/large_half_loop_left_3_4.png diff --git a/resources/g2/track/intamin/large_half_loop_left_3_5.png b/resources/g2/track/lattice_triangle/large_half_loop_left_3_5.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_left_3_5.png rename to resources/g2/track/lattice_triangle/large_half_loop_left_3_5.png diff --git a/resources/g2/track/intamin/large_half_loop_left_3_6.png b/resources/g2/track/lattice_triangle/large_half_loop_left_3_6.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_left_3_6.png rename to resources/g2/track/lattice_triangle/large_half_loop_left_3_6.png diff --git a/resources/g2/track/intamin/large_half_loop_left_3_7.png b/resources/g2/track/lattice_triangle/large_half_loop_left_3_7.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_left_3_7.png rename to resources/g2/track/lattice_triangle/large_half_loop_left_3_7.png diff --git a/resources/g2/track/intamin/large_half_loop_left_4_1.png b/resources/g2/track/lattice_triangle/large_half_loop_left_4_1.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_left_4_1.png rename to resources/g2/track/lattice_triangle/large_half_loop_left_4_1.png diff --git a/resources/g2/track/intamin/large_half_loop_left_4_2.png b/resources/g2/track/lattice_triangle/large_half_loop_left_4_2.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_left_4_2.png rename to resources/g2/track/lattice_triangle/large_half_loop_left_4_2.png diff --git a/resources/g2/track/intamin/large_half_loop_left_4_3.png b/resources/g2/track/lattice_triangle/large_half_loop_left_4_3.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_left_4_3.png rename to resources/g2/track/lattice_triangle/large_half_loop_left_4_3.png diff --git a/resources/g2/track/intamin/large_half_loop_left_4_4.png b/resources/g2/track/lattice_triangle/large_half_loop_left_4_4.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_left_4_4.png rename to resources/g2/track/lattice_triangle/large_half_loop_left_4_4.png diff --git a/resources/g2/track/intamin/large_half_loop_left_4_5.png b/resources/g2/track/lattice_triangle/large_half_loop_left_4_5.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_left_4_5.png rename to resources/g2/track/lattice_triangle/large_half_loop_left_4_5.png diff --git a/resources/g2/track/intamin/large_half_loop_left_4_6.png b/resources/g2/track/lattice_triangle/large_half_loop_left_4_6.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_left_4_6.png rename to resources/g2/track/lattice_triangle/large_half_loop_left_4_6.png diff --git a/resources/g2/track/intamin/large_half_loop_left_4_7.png b/resources/g2/track/lattice_triangle/large_half_loop_left_4_7.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_left_4_7.png rename to resources/g2/track/lattice_triangle/large_half_loop_left_4_7.png diff --git a/resources/g2/track/intamin/large_half_loop_right_1_1.png b/resources/g2/track/lattice_triangle/large_half_loop_right_1_1.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_right_1_1.png rename to resources/g2/track/lattice_triangle/large_half_loop_right_1_1.png diff --git a/resources/g2/track/intamin/large_half_loop_right_1_2.png b/resources/g2/track/lattice_triangle/large_half_loop_right_1_2.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_right_1_2.png rename to resources/g2/track/lattice_triangle/large_half_loop_right_1_2.png diff --git a/resources/g2/track/intamin/large_half_loop_right_1_3.png b/resources/g2/track/lattice_triangle/large_half_loop_right_1_3.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_right_1_3.png rename to resources/g2/track/lattice_triangle/large_half_loop_right_1_3.png diff --git a/resources/g2/track/intamin/large_half_loop_right_1_4.png b/resources/g2/track/lattice_triangle/large_half_loop_right_1_4.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_right_1_4.png rename to resources/g2/track/lattice_triangle/large_half_loop_right_1_4.png diff --git a/resources/g2/track/intamin/large_half_loop_right_1_5.png b/resources/g2/track/lattice_triangle/large_half_loop_right_1_5.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_right_1_5.png rename to resources/g2/track/lattice_triangle/large_half_loop_right_1_5.png diff --git a/resources/g2/track/intamin/large_half_loop_right_1_6.png b/resources/g2/track/lattice_triangle/large_half_loop_right_1_6.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_right_1_6.png rename to resources/g2/track/lattice_triangle/large_half_loop_right_1_6.png diff --git a/resources/g2/track/intamin/large_half_loop_right_1_7.png b/resources/g2/track/lattice_triangle/large_half_loop_right_1_7.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_right_1_7.png rename to resources/g2/track/lattice_triangle/large_half_loop_right_1_7.png diff --git a/resources/g2/track/intamin/large_half_loop_right_2_1.png b/resources/g2/track/lattice_triangle/large_half_loop_right_2_1.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_right_2_1.png rename to resources/g2/track/lattice_triangle/large_half_loop_right_2_1.png diff --git a/resources/g2/track/intamin/large_half_loop_right_2_2.png b/resources/g2/track/lattice_triangle/large_half_loop_right_2_2.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_right_2_2.png rename to resources/g2/track/lattice_triangle/large_half_loop_right_2_2.png diff --git a/resources/g2/track/intamin/large_half_loop_right_2_3.png b/resources/g2/track/lattice_triangle/large_half_loop_right_2_3.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_right_2_3.png rename to resources/g2/track/lattice_triangle/large_half_loop_right_2_3.png diff --git a/resources/g2/track/intamin/large_half_loop_right_2_4.png b/resources/g2/track/lattice_triangle/large_half_loop_right_2_4.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_right_2_4.png rename to resources/g2/track/lattice_triangle/large_half_loop_right_2_4.png diff --git a/resources/g2/track/intamin/large_half_loop_right_2_5.png b/resources/g2/track/lattice_triangle/large_half_loop_right_2_5.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_right_2_5.png rename to resources/g2/track/lattice_triangle/large_half_loop_right_2_5.png diff --git a/resources/g2/track/intamin/large_half_loop_right_2_6.png b/resources/g2/track/lattice_triangle/large_half_loop_right_2_6.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_right_2_6.png rename to resources/g2/track/lattice_triangle/large_half_loop_right_2_6.png diff --git a/resources/g2/track/intamin/large_half_loop_right_2_7.png b/resources/g2/track/lattice_triangle/large_half_loop_right_2_7.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_right_2_7.png rename to resources/g2/track/lattice_triangle/large_half_loop_right_2_7.png diff --git a/resources/g2/track/intamin/large_half_loop_right_3_1.png b/resources/g2/track/lattice_triangle/large_half_loop_right_3_1.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_right_3_1.png rename to resources/g2/track/lattice_triangle/large_half_loop_right_3_1.png diff --git a/resources/g2/track/intamin/large_half_loop_right_3_2.png b/resources/g2/track/lattice_triangle/large_half_loop_right_3_2.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_right_3_2.png rename to resources/g2/track/lattice_triangle/large_half_loop_right_3_2.png diff --git a/resources/g2/track/intamin/large_half_loop_right_3_3.png b/resources/g2/track/lattice_triangle/large_half_loop_right_3_3.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_right_3_3.png rename to resources/g2/track/lattice_triangle/large_half_loop_right_3_3.png diff --git a/resources/g2/track/intamin/large_half_loop_right_3_4.png b/resources/g2/track/lattice_triangle/large_half_loop_right_3_4.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_right_3_4.png rename to resources/g2/track/lattice_triangle/large_half_loop_right_3_4.png diff --git a/resources/g2/track/intamin/large_half_loop_right_3_5.png b/resources/g2/track/lattice_triangle/large_half_loop_right_3_5.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_right_3_5.png rename to resources/g2/track/lattice_triangle/large_half_loop_right_3_5.png diff --git a/resources/g2/track/intamin/large_half_loop_right_3_6.png b/resources/g2/track/lattice_triangle/large_half_loop_right_3_6.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_right_3_6.png rename to resources/g2/track/lattice_triangle/large_half_loop_right_3_6.png diff --git a/resources/g2/track/intamin/large_half_loop_right_3_7.png b/resources/g2/track/lattice_triangle/large_half_loop_right_3_7.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_right_3_7.png rename to resources/g2/track/lattice_triangle/large_half_loop_right_3_7.png diff --git a/resources/g2/track/intamin/large_half_loop_right_4_1.png b/resources/g2/track/lattice_triangle/large_half_loop_right_4_1.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_right_4_1.png rename to resources/g2/track/lattice_triangle/large_half_loop_right_4_1.png diff --git a/resources/g2/track/intamin/large_half_loop_right_4_2.png b/resources/g2/track/lattice_triangle/large_half_loop_right_4_2.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_right_4_2.png rename to resources/g2/track/lattice_triangle/large_half_loop_right_4_2.png diff --git a/resources/g2/track/intamin/large_half_loop_right_4_3.png b/resources/g2/track/lattice_triangle/large_half_loop_right_4_3.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_right_4_3.png rename to resources/g2/track/lattice_triangle/large_half_loop_right_4_3.png diff --git a/resources/g2/track/intamin/large_half_loop_right_4_4.png b/resources/g2/track/lattice_triangle/large_half_loop_right_4_4.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_right_4_4.png rename to resources/g2/track/lattice_triangle/large_half_loop_right_4_4.png diff --git a/resources/g2/track/intamin/large_half_loop_right_4_5.png b/resources/g2/track/lattice_triangle/large_half_loop_right_4_5.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_right_4_5.png rename to resources/g2/track/lattice_triangle/large_half_loop_right_4_5.png diff --git a/resources/g2/track/intamin/large_half_loop_right_4_6.png b/resources/g2/track/lattice_triangle/large_half_loop_right_4_6.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_right_4_6.png rename to resources/g2/track/lattice_triangle/large_half_loop_right_4_6.png diff --git a/resources/g2/track/intamin/large_half_loop_right_4_7.png b/resources/g2/track/lattice_triangle/large_half_loop_right_4_7.png similarity index 100% rename from resources/g2/track/intamin/large_half_loop_right_4_7.png rename to resources/g2/track/lattice_triangle/large_half_loop_right_4_7.png diff --git a/resources/g2/track/intamin/large_turn_left_bank_to_diag_gentle_up_1_1.png b/resources/g2/track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_1_1.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_bank_to_diag_gentle_up_1_1.png rename to resources/g2/track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_1_1.png diff --git a/resources/g2/track/intamin/large_turn_left_bank_to_diag_gentle_up_1_2.png b/resources/g2/track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_1_2.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_bank_to_diag_gentle_up_1_2.png rename to resources/g2/track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_1_2.png diff --git a/resources/g2/track/intamin/large_turn_left_bank_to_diag_gentle_up_1_3.png b/resources/g2/track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_1_3.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_bank_to_diag_gentle_up_1_3.png rename to resources/g2/track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_1_3.png diff --git a/resources/g2/track/intamin/large_turn_left_bank_to_diag_gentle_up_1_4.png b/resources/g2/track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_1_4.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_bank_to_diag_gentle_up_1_4.png rename to resources/g2/track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_1_4.png diff --git a/resources/g2/track/intamin/large_turn_left_bank_to_diag_gentle_up_2_1.png b/resources/g2/track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_2_1.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_bank_to_diag_gentle_up_2_1.png rename to resources/g2/track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_2_1.png diff --git a/resources/g2/track/intamin/large_turn_left_bank_to_diag_gentle_up_2_2.png b/resources/g2/track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_2_2.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_bank_to_diag_gentle_up_2_2.png rename to resources/g2/track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_2_2.png diff --git a/resources/g2/track/intamin/large_turn_left_bank_to_diag_gentle_up_2_3.png b/resources/g2/track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_2_3.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_bank_to_diag_gentle_up_2_3.png rename to resources/g2/track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_2_3.png diff --git a/resources/g2/track/intamin/large_turn_left_bank_to_diag_gentle_up_2_4.png b/resources/g2/track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_2_4.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_bank_to_diag_gentle_up_2_4.png rename to resources/g2/track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_2_4.png diff --git a/resources/g2/track/intamin/large_turn_left_bank_to_diag_gentle_up_3_1.png b/resources/g2/track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_3_1.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_bank_to_diag_gentle_up_3_1.png rename to resources/g2/track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_3_1.png diff --git a/resources/g2/track/intamin/large_turn_left_bank_to_diag_gentle_up_3_2.png b/resources/g2/track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_3_2.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_bank_to_diag_gentle_up_3_2.png rename to resources/g2/track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_3_2.png diff --git a/resources/g2/track/intamin/large_turn_left_bank_to_diag_gentle_up_3_3.png b/resources/g2/track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_3_3.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_bank_to_diag_gentle_up_3_3.png rename to resources/g2/track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_3_3.png diff --git a/resources/g2/track/intamin/large_turn_left_bank_to_diag_gentle_up_3_4.png b/resources/g2/track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_3_4.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_bank_to_diag_gentle_up_3_4.png rename to resources/g2/track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_3_4.png diff --git a/resources/g2/track/intamin/large_turn_left_bank_to_diag_gentle_up_4_1.png b/resources/g2/track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_4_1.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_bank_to_diag_gentle_up_4_1.png rename to resources/g2/track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_4_1.png diff --git a/resources/g2/track/intamin/large_turn_left_bank_to_diag_gentle_up_4_2.png b/resources/g2/track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_4_2.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_bank_to_diag_gentle_up_4_2.png rename to resources/g2/track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_4_2.png diff --git a/resources/g2/track/intamin/large_turn_left_bank_to_diag_gentle_up_4_3.png b/resources/g2/track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_4_3.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_bank_to_diag_gentle_up_4_3.png rename to resources/g2/track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_4_3.png diff --git a/resources/g2/track/intamin/large_turn_left_bank_to_diag_gentle_up_4_4.png b/resources/g2/track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_4_4.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_bank_to_diag_gentle_up_4_4.png rename to resources/g2/track/lattice_triangle/large_turn_left_bank_to_diag_gentle_up_4_4.png diff --git a/resources/g2/track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_1_1.png b/resources/g2/track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_1_1.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_1_1.png rename to resources/g2/track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_1_1.png diff --git a/resources/g2/track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_1_2.png b/resources/g2/track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_1_2.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_1_2.png rename to resources/g2/track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_1_2.png diff --git a/resources/g2/track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_1_3.png b/resources/g2/track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_1_3.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_1_3.png rename to resources/g2/track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_1_3.png diff --git a/resources/g2/track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_1_4.png b/resources/g2/track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_1_4.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_1_4.png rename to resources/g2/track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_1_4.png diff --git a/resources/g2/track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_2_1.png b/resources/g2/track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_2_1.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_2_1.png rename to resources/g2/track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_2_1.png diff --git a/resources/g2/track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_2_2.png b/resources/g2/track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_2_2.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_2_2.png rename to resources/g2/track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_2_2.png diff --git a/resources/g2/track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_2_3.png b/resources/g2/track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_2_3.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_2_3.png rename to resources/g2/track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_2_3.png diff --git a/resources/g2/track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_2_4.png b/resources/g2/track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_2_4.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_2_4.png rename to resources/g2/track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_2_4.png diff --git a/resources/g2/track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_3_1.png b/resources/g2/track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_3_1.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_3_1.png rename to resources/g2/track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_3_1.png diff --git a/resources/g2/track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_3_2.png b/resources/g2/track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_3_2.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_3_2.png rename to resources/g2/track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_3_2.png diff --git a/resources/g2/track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_3_3.png b/resources/g2/track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_3_3.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_3_3.png rename to resources/g2/track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_3_3.png diff --git a/resources/g2/track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_3_4.png b/resources/g2/track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_3_4.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_3_4.png rename to resources/g2/track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_3_4.png diff --git a/resources/g2/track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_4_1.png b/resources/g2/track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_4_1.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_4_1.png rename to resources/g2/track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_4_1.png diff --git a/resources/g2/track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_4_2.png b/resources/g2/track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_4_2.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_4_2.png rename to resources/g2/track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_4_2.png diff --git a/resources/g2/track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_4_3.png b/resources/g2/track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_4_3.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_4_3.png rename to resources/g2/track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_4_3.png diff --git a/resources/g2/track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_4_4.png b/resources/g2/track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_4_4.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_bank_to_orthogonal_gentle_up_4_4.png rename to resources/g2/track/lattice_triangle/large_turn_left_bank_to_orthogonal_gentle_up_4_4.png diff --git a/resources/g2/track/intamin/large_turn_left_to_diag_gentle_up_1_1.png b/resources/g2/track/lattice_triangle/large_turn_left_to_diag_gentle_up_1_1.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_to_diag_gentle_up_1_1.png rename to resources/g2/track/lattice_triangle/large_turn_left_to_diag_gentle_up_1_1.png diff --git a/resources/g2/track/intamin/large_turn_left_to_diag_gentle_up_1_2.png b/resources/g2/track/lattice_triangle/large_turn_left_to_diag_gentle_up_1_2.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_to_diag_gentle_up_1_2.png rename to resources/g2/track/lattice_triangle/large_turn_left_to_diag_gentle_up_1_2.png diff --git a/resources/g2/track/intamin/large_turn_left_to_diag_gentle_up_1_3.png b/resources/g2/track/lattice_triangle/large_turn_left_to_diag_gentle_up_1_3.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_to_diag_gentle_up_1_3.png rename to resources/g2/track/lattice_triangle/large_turn_left_to_diag_gentle_up_1_3.png diff --git a/resources/g2/track/intamin/large_turn_left_to_diag_gentle_up_1_4.png b/resources/g2/track/lattice_triangle/large_turn_left_to_diag_gentle_up_1_4.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_to_diag_gentle_up_1_4.png rename to resources/g2/track/lattice_triangle/large_turn_left_to_diag_gentle_up_1_4.png diff --git a/resources/g2/track/intamin/large_turn_left_to_diag_gentle_up_2_1.png b/resources/g2/track/lattice_triangle/large_turn_left_to_diag_gentle_up_2_1.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_to_diag_gentle_up_2_1.png rename to resources/g2/track/lattice_triangle/large_turn_left_to_diag_gentle_up_2_1.png diff --git a/resources/g2/track/intamin/large_turn_left_to_diag_gentle_up_2_2.png b/resources/g2/track/lattice_triangle/large_turn_left_to_diag_gentle_up_2_2.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_to_diag_gentle_up_2_2.png rename to resources/g2/track/lattice_triangle/large_turn_left_to_diag_gentle_up_2_2.png diff --git a/resources/g2/track/intamin/large_turn_left_to_diag_gentle_up_2_3.png b/resources/g2/track/lattice_triangle/large_turn_left_to_diag_gentle_up_2_3.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_to_diag_gentle_up_2_3.png rename to resources/g2/track/lattice_triangle/large_turn_left_to_diag_gentle_up_2_3.png diff --git a/resources/g2/track/intamin/large_turn_left_to_diag_gentle_up_2_4.png b/resources/g2/track/lattice_triangle/large_turn_left_to_diag_gentle_up_2_4.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_to_diag_gentle_up_2_4.png rename to resources/g2/track/lattice_triangle/large_turn_left_to_diag_gentle_up_2_4.png diff --git a/resources/g2/track/intamin/large_turn_left_to_diag_gentle_up_3_1.png b/resources/g2/track/lattice_triangle/large_turn_left_to_diag_gentle_up_3_1.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_to_diag_gentle_up_3_1.png rename to resources/g2/track/lattice_triangle/large_turn_left_to_diag_gentle_up_3_1.png diff --git a/resources/g2/track/intamin/large_turn_left_to_diag_gentle_up_3_2.png b/resources/g2/track/lattice_triangle/large_turn_left_to_diag_gentle_up_3_2.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_to_diag_gentle_up_3_2.png rename to resources/g2/track/lattice_triangle/large_turn_left_to_diag_gentle_up_3_2.png diff --git a/resources/g2/track/intamin/large_turn_left_to_diag_gentle_up_3_3.png b/resources/g2/track/lattice_triangle/large_turn_left_to_diag_gentle_up_3_3.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_to_diag_gentle_up_3_3.png rename to resources/g2/track/lattice_triangle/large_turn_left_to_diag_gentle_up_3_3.png diff --git a/resources/g2/track/intamin/large_turn_left_to_diag_gentle_up_3_4.png b/resources/g2/track/lattice_triangle/large_turn_left_to_diag_gentle_up_3_4.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_to_diag_gentle_up_3_4.png rename to resources/g2/track/lattice_triangle/large_turn_left_to_diag_gentle_up_3_4.png diff --git a/resources/g2/track/intamin/large_turn_left_to_diag_gentle_up_4_1.png b/resources/g2/track/lattice_triangle/large_turn_left_to_diag_gentle_up_4_1.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_to_diag_gentle_up_4_1.png rename to resources/g2/track/lattice_triangle/large_turn_left_to_diag_gentle_up_4_1.png diff --git a/resources/g2/track/intamin/large_turn_left_to_diag_gentle_up_4_2.png b/resources/g2/track/lattice_triangle/large_turn_left_to_diag_gentle_up_4_2.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_to_diag_gentle_up_4_2.png rename to resources/g2/track/lattice_triangle/large_turn_left_to_diag_gentle_up_4_2.png diff --git a/resources/g2/track/intamin/large_turn_left_to_diag_gentle_up_4_3.png b/resources/g2/track/lattice_triangle/large_turn_left_to_diag_gentle_up_4_3.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_to_diag_gentle_up_4_3.png rename to resources/g2/track/lattice_triangle/large_turn_left_to_diag_gentle_up_4_3.png diff --git a/resources/g2/track/intamin/large_turn_left_to_diag_gentle_up_4_4.png b/resources/g2/track/lattice_triangle/large_turn_left_to_diag_gentle_up_4_4.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_to_diag_gentle_up_4_4.png rename to resources/g2/track/lattice_triangle/large_turn_left_to_diag_gentle_up_4_4.png diff --git a/resources/g2/track/intamin/large_turn_left_to_orthogonal_gentle_up_1_1.png b/resources/g2/track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_1_1.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_to_orthogonal_gentle_up_1_1.png rename to resources/g2/track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_1_1.png diff --git a/resources/g2/track/intamin/large_turn_left_to_orthogonal_gentle_up_1_2.png b/resources/g2/track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_1_2.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_to_orthogonal_gentle_up_1_2.png rename to resources/g2/track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_1_2.png diff --git a/resources/g2/track/intamin/large_turn_left_to_orthogonal_gentle_up_1_3.png b/resources/g2/track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_1_3.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_to_orthogonal_gentle_up_1_3.png rename to resources/g2/track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_1_3.png diff --git a/resources/g2/track/intamin/large_turn_left_to_orthogonal_gentle_up_1_4.png b/resources/g2/track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_1_4.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_to_orthogonal_gentle_up_1_4.png rename to resources/g2/track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_1_4.png diff --git a/resources/g2/track/intamin/large_turn_left_to_orthogonal_gentle_up_2_1.png b/resources/g2/track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_2_1.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_to_orthogonal_gentle_up_2_1.png rename to resources/g2/track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_2_1.png diff --git a/resources/g2/track/intamin/large_turn_left_to_orthogonal_gentle_up_2_2.png b/resources/g2/track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_2_2.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_to_orthogonal_gentle_up_2_2.png rename to resources/g2/track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_2_2.png diff --git a/resources/g2/track/intamin/large_turn_left_to_orthogonal_gentle_up_2_3.png b/resources/g2/track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_2_3.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_to_orthogonal_gentle_up_2_3.png rename to resources/g2/track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_2_3.png diff --git a/resources/g2/track/intamin/large_turn_left_to_orthogonal_gentle_up_2_4.png b/resources/g2/track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_2_4.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_to_orthogonal_gentle_up_2_4.png rename to resources/g2/track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_2_4.png diff --git a/resources/g2/track/intamin/large_turn_left_to_orthogonal_gentle_up_3_1.png b/resources/g2/track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_3_1.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_to_orthogonal_gentle_up_3_1.png rename to resources/g2/track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_3_1.png diff --git a/resources/g2/track/intamin/large_turn_left_to_orthogonal_gentle_up_3_2.png b/resources/g2/track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_3_2.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_to_orthogonal_gentle_up_3_2.png rename to resources/g2/track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_3_2.png diff --git a/resources/g2/track/intamin/large_turn_left_to_orthogonal_gentle_up_3_3.png b/resources/g2/track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_3_3.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_to_orthogonal_gentle_up_3_3.png rename to resources/g2/track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_3_3.png diff --git a/resources/g2/track/intamin/large_turn_left_to_orthogonal_gentle_up_3_4.png b/resources/g2/track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_3_4.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_to_orthogonal_gentle_up_3_4.png rename to resources/g2/track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_3_4.png diff --git a/resources/g2/track/intamin/large_turn_left_to_orthogonal_gentle_up_4_1.png b/resources/g2/track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_4_1.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_to_orthogonal_gentle_up_4_1.png rename to resources/g2/track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_4_1.png diff --git a/resources/g2/track/intamin/large_turn_left_to_orthogonal_gentle_up_4_2.png b/resources/g2/track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_4_2.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_to_orthogonal_gentle_up_4_2.png rename to resources/g2/track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_4_2.png diff --git a/resources/g2/track/intamin/large_turn_left_to_orthogonal_gentle_up_4_3.png b/resources/g2/track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_4_3.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_to_orthogonal_gentle_up_4_3.png rename to resources/g2/track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_4_3.png diff --git a/resources/g2/track/intamin/large_turn_left_to_orthogonal_gentle_up_4_4.png b/resources/g2/track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_4_4.png similarity index 100% rename from resources/g2/track/intamin/large_turn_left_to_orthogonal_gentle_up_4_4.png rename to resources/g2/track/lattice_triangle/large_turn_left_to_orthogonal_gentle_up_4_4.png diff --git a/resources/g2/track/intamin/large_turn_right_bank_to_diag_gentle_up_1_1.png b/resources/g2/track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_1_1.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_bank_to_diag_gentle_up_1_1.png rename to resources/g2/track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_1_1.png diff --git a/resources/g2/track/intamin/large_turn_right_bank_to_diag_gentle_up_1_2.png b/resources/g2/track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_1_2.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_bank_to_diag_gentle_up_1_2.png rename to resources/g2/track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_1_2.png diff --git a/resources/g2/track/intamin/large_turn_right_bank_to_diag_gentle_up_1_3.png b/resources/g2/track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_1_3.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_bank_to_diag_gentle_up_1_3.png rename to resources/g2/track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_1_3.png diff --git a/resources/g2/track/intamin/large_turn_right_bank_to_diag_gentle_up_1_4.png b/resources/g2/track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_1_4.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_bank_to_diag_gentle_up_1_4.png rename to resources/g2/track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_1_4.png diff --git a/resources/g2/track/intamin/large_turn_right_bank_to_diag_gentle_up_2_1.png b/resources/g2/track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_2_1.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_bank_to_diag_gentle_up_2_1.png rename to resources/g2/track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_2_1.png diff --git a/resources/g2/track/intamin/large_turn_right_bank_to_diag_gentle_up_2_2.png b/resources/g2/track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_2_2.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_bank_to_diag_gentle_up_2_2.png rename to resources/g2/track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_2_2.png diff --git a/resources/g2/track/intamin/large_turn_right_bank_to_diag_gentle_up_2_3.png b/resources/g2/track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_2_3.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_bank_to_diag_gentle_up_2_3.png rename to resources/g2/track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_2_3.png diff --git a/resources/g2/track/intamin/large_turn_right_bank_to_diag_gentle_up_2_4.png b/resources/g2/track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_2_4.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_bank_to_diag_gentle_up_2_4.png rename to resources/g2/track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_2_4.png diff --git a/resources/g2/track/intamin/large_turn_right_bank_to_diag_gentle_up_3_1.png b/resources/g2/track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_3_1.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_bank_to_diag_gentle_up_3_1.png rename to resources/g2/track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_3_1.png diff --git a/resources/g2/track/intamin/large_turn_right_bank_to_diag_gentle_up_3_2.png b/resources/g2/track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_3_2.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_bank_to_diag_gentle_up_3_2.png rename to resources/g2/track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_3_2.png diff --git a/resources/g2/track/intamin/large_turn_right_bank_to_diag_gentle_up_3_3.png b/resources/g2/track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_3_3.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_bank_to_diag_gentle_up_3_3.png rename to resources/g2/track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_3_3.png diff --git a/resources/g2/track/intamin/large_turn_right_bank_to_diag_gentle_up_3_4.png b/resources/g2/track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_3_4.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_bank_to_diag_gentle_up_3_4.png rename to resources/g2/track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_3_4.png diff --git a/resources/g2/track/intamin/large_turn_right_bank_to_diag_gentle_up_4_1.png b/resources/g2/track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_4_1.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_bank_to_diag_gentle_up_4_1.png rename to resources/g2/track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_4_1.png diff --git a/resources/g2/track/intamin/large_turn_right_bank_to_diag_gentle_up_4_2.png b/resources/g2/track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_4_2.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_bank_to_diag_gentle_up_4_2.png rename to resources/g2/track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_4_2.png diff --git a/resources/g2/track/intamin/large_turn_right_bank_to_diag_gentle_up_4_3.png b/resources/g2/track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_4_3.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_bank_to_diag_gentle_up_4_3.png rename to resources/g2/track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_4_3.png diff --git a/resources/g2/track/intamin/large_turn_right_bank_to_diag_gentle_up_4_4.png b/resources/g2/track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_4_4.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_bank_to_diag_gentle_up_4_4.png rename to resources/g2/track/lattice_triangle/large_turn_right_bank_to_diag_gentle_up_4_4.png diff --git a/resources/g2/track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_1_1.png b/resources/g2/track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_1_1.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_1_1.png rename to resources/g2/track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_1_1.png diff --git a/resources/g2/track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_1_2.png b/resources/g2/track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_1_2.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_1_2.png rename to resources/g2/track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_1_2.png diff --git a/resources/g2/track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_1_3.png b/resources/g2/track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_1_3.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_1_3.png rename to resources/g2/track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_1_3.png diff --git a/resources/g2/track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_1_4.png b/resources/g2/track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_1_4.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_1_4.png rename to resources/g2/track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_1_4.png diff --git a/resources/g2/track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_2_1.png b/resources/g2/track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_2_1.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_2_1.png rename to resources/g2/track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_2_1.png diff --git a/resources/g2/track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_2_2.png b/resources/g2/track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_2_2.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_2_2.png rename to resources/g2/track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_2_2.png diff --git a/resources/g2/track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_2_3.png b/resources/g2/track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_2_3.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_2_3.png rename to resources/g2/track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_2_3.png diff --git a/resources/g2/track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_2_4.png b/resources/g2/track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_2_4.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_2_4.png rename to resources/g2/track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_2_4.png diff --git a/resources/g2/track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_3_1.png b/resources/g2/track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_3_1.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_3_1.png rename to resources/g2/track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_3_1.png diff --git a/resources/g2/track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_3_2.png b/resources/g2/track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_3_2.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_3_2.png rename to resources/g2/track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_3_2.png diff --git a/resources/g2/track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_3_3.png b/resources/g2/track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_3_3.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_3_3.png rename to resources/g2/track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_3_3.png diff --git a/resources/g2/track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_3_4.png b/resources/g2/track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_3_4.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_3_4.png rename to resources/g2/track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_3_4.png diff --git a/resources/g2/track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_4_1.png b/resources/g2/track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_4_1.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_4_1.png rename to resources/g2/track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_4_1.png diff --git a/resources/g2/track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_4_2.png b/resources/g2/track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_4_2.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_4_2.png rename to resources/g2/track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_4_2.png diff --git a/resources/g2/track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_4_3.png b/resources/g2/track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_4_3.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_4_3.png rename to resources/g2/track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_4_3.png diff --git a/resources/g2/track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_4_4.png b/resources/g2/track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_4_4.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_bank_to_orthogonal_gentle_up_4_4.png rename to resources/g2/track/lattice_triangle/large_turn_right_bank_to_orthogonal_gentle_up_4_4.png diff --git a/resources/g2/track/intamin/large_turn_right_to_diag_gentle_up_1_1.png b/resources/g2/track/lattice_triangle/large_turn_right_to_diag_gentle_up_1_1.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_to_diag_gentle_up_1_1.png rename to resources/g2/track/lattice_triangle/large_turn_right_to_diag_gentle_up_1_1.png diff --git a/resources/g2/track/intamin/large_turn_right_to_diag_gentle_up_1_2.png b/resources/g2/track/lattice_triangle/large_turn_right_to_diag_gentle_up_1_2.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_to_diag_gentle_up_1_2.png rename to resources/g2/track/lattice_triangle/large_turn_right_to_diag_gentle_up_1_2.png diff --git a/resources/g2/track/intamin/large_turn_right_to_diag_gentle_up_1_3.png b/resources/g2/track/lattice_triangle/large_turn_right_to_diag_gentle_up_1_3.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_to_diag_gentle_up_1_3.png rename to resources/g2/track/lattice_triangle/large_turn_right_to_diag_gentle_up_1_3.png diff --git a/resources/g2/track/intamin/large_turn_right_to_diag_gentle_up_1_4.png b/resources/g2/track/lattice_triangle/large_turn_right_to_diag_gentle_up_1_4.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_to_diag_gentle_up_1_4.png rename to resources/g2/track/lattice_triangle/large_turn_right_to_diag_gentle_up_1_4.png diff --git a/resources/g2/track/intamin/large_turn_right_to_diag_gentle_up_2_1.png b/resources/g2/track/lattice_triangle/large_turn_right_to_diag_gentle_up_2_1.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_to_diag_gentle_up_2_1.png rename to resources/g2/track/lattice_triangle/large_turn_right_to_diag_gentle_up_2_1.png diff --git a/resources/g2/track/intamin/large_turn_right_to_diag_gentle_up_2_2.png b/resources/g2/track/lattice_triangle/large_turn_right_to_diag_gentle_up_2_2.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_to_diag_gentle_up_2_2.png rename to resources/g2/track/lattice_triangle/large_turn_right_to_diag_gentle_up_2_2.png diff --git a/resources/g2/track/intamin/large_turn_right_to_diag_gentle_up_2_3.png b/resources/g2/track/lattice_triangle/large_turn_right_to_diag_gentle_up_2_3.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_to_diag_gentle_up_2_3.png rename to resources/g2/track/lattice_triangle/large_turn_right_to_diag_gentle_up_2_3.png diff --git a/resources/g2/track/intamin/large_turn_right_to_diag_gentle_up_2_4.png b/resources/g2/track/lattice_triangle/large_turn_right_to_diag_gentle_up_2_4.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_to_diag_gentle_up_2_4.png rename to resources/g2/track/lattice_triangle/large_turn_right_to_diag_gentle_up_2_4.png diff --git a/resources/g2/track/intamin/large_turn_right_to_diag_gentle_up_3_1.png b/resources/g2/track/lattice_triangle/large_turn_right_to_diag_gentle_up_3_1.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_to_diag_gentle_up_3_1.png rename to resources/g2/track/lattice_triangle/large_turn_right_to_diag_gentle_up_3_1.png diff --git a/resources/g2/track/intamin/large_turn_right_to_diag_gentle_up_3_2.png b/resources/g2/track/lattice_triangle/large_turn_right_to_diag_gentle_up_3_2.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_to_diag_gentle_up_3_2.png rename to resources/g2/track/lattice_triangle/large_turn_right_to_diag_gentle_up_3_2.png diff --git a/resources/g2/track/intamin/large_turn_right_to_diag_gentle_up_3_3.png b/resources/g2/track/lattice_triangle/large_turn_right_to_diag_gentle_up_3_3.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_to_diag_gentle_up_3_3.png rename to resources/g2/track/lattice_triangle/large_turn_right_to_diag_gentle_up_3_3.png diff --git a/resources/g2/track/intamin/large_turn_right_to_diag_gentle_up_3_4.png b/resources/g2/track/lattice_triangle/large_turn_right_to_diag_gentle_up_3_4.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_to_diag_gentle_up_3_4.png rename to resources/g2/track/lattice_triangle/large_turn_right_to_diag_gentle_up_3_4.png diff --git a/resources/g2/track/intamin/large_turn_right_to_diag_gentle_up_4_1.png b/resources/g2/track/lattice_triangle/large_turn_right_to_diag_gentle_up_4_1.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_to_diag_gentle_up_4_1.png rename to resources/g2/track/lattice_triangle/large_turn_right_to_diag_gentle_up_4_1.png diff --git a/resources/g2/track/intamin/large_turn_right_to_diag_gentle_up_4_2.png b/resources/g2/track/lattice_triangle/large_turn_right_to_diag_gentle_up_4_2.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_to_diag_gentle_up_4_2.png rename to resources/g2/track/lattice_triangle/large_turn_right_to_diag_gentle_up_4_2.png diff --git a/resources/g2/track/intamin/large_turn_right_to_diag_gentle_up_4_3.png b/resources/g2/track/lattice_triangle/large_turn_right_to_diag_gentle_up_4_3.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_to_diag_gentle_up_4_3.png rename to resources/g2/track/lattice_triangle/large_turn_right_to_diag_gentle_up_4_3.png diff --git a/resources/g2/track/intamin/large_turn_right_to_diag_gentle_up_4_4.png b/resources/g2/track/lattice_triangle/large_turn_right_to_diag_gentle_up_4_4.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_to_diag_gentle_up_4_4.png rename to resources/g2/track/lattice_triangle/large_turn_right_to_diag_gentle_up_4_4.png diff --git a/resources/g2/track/intamin/large_turn_right_to_orthogonal_gentle_up_1_1.png b/resources/g2/track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_1_1.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_to_orthogonal_gentle_up_1_1.png rename to resources/g2/track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_1_1.png diff --git a/resources/g2/track/intamin/large_turn_right_to_orthogonal_gentle_up_1_2.png b/resources/g2/track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_1_2.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_to_orthogonal_gentle_up_1_2.png rename to resources/g2/track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_1_2.png diff --git a/resources/g2/track/intamin/large_turn_right_to_orthogonal_gentle_up_1_3.png b/resources/g2/track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_1_3.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_to_orthogonal_gentle_up_1_3.png rename to resources/g2/track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_1_3.png diff --git a/resources/g2/track/intamin/large_turn_right_to_orthogonal_gentle_up_1_4.png b/resources/g2/track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_1_4.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_to_orthogonal_gentle_up_1_4.png rename to resources/g2/track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_1_4.png diff --git a/resources/g2/track/intamin/large_turn_right_to_orthogonal_gentle_up_2_1.png b/resources/g2/track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_2_1.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_to_orthogonal_gentle_up_2_1.png rename to resources/g2/track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_2_1.png diff --git a/resources/g2/track/intamin/large_turn_right_to_orthogonal_gentle_up_2_2.png b/resources/g2/track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_2_2.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_to_orthogonal_gentle_up_2_2.png rename to resources/g2/track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_2_2.png diff --git a/resources/g2/track/intamin/large_turn_right_to_orthogonal_gentle_up_2_3.png b/resources/g2/track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_2_3.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_to_orthogonal_gentle_up_2_3.png rename to resources/g2/track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_2_3.png diff --git a/resources/g2/track/intamin/large_turn_right_to_orthogonal_gentle_up_2_4.png b/resources/g2/track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_2_4.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_to_orthogonal_gentle_up_2_4.png rename to resources/g2/track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_2_4.png diff --git a/resources/g2/track/intamin/large_turn_right_to_orthogonal_gentle_up_3_1.png b/resources/g2/track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_3_1.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_to_orthogonal_gentle_up_3_1.png rename to resources/g2/track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_3_1.png diff --git a/resources/g2/track/intamin/large_turn_right_to_orthogonal_gentle_up_3_2.png b/resources/g2/track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_3_2.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_to_orthogonal_gentle_up_3_2.png rename to resources/g2/track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_3_2.png diff --git a/resources/g2/track/intamin/large_turn_right_to_orthogonal_gentle_up_3_3.png b/resources/g2/track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_3_3.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_to_orthogonal_gentle_up_3_3.png rename to resources/g2/track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_3_3.png diff --git a/resources/g2/track/intamin/large_turn_right_to_orthogonal_gentle_up_3_4.png b/resources/g2/track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_3_4.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_to_orthogonal_gentle_up_3_4.png rename to resources/g2/track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_3_4.png diff --git a/resources/g2/track/intamin/large_turn_right_to_orthogonal_gentle_up_4_1.png b/resources/g2/track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_4_1.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_to_orthogonal_gentle_up_4_1.png rename to resources/g2/track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_4_1.png diff --git a/resources/g2/track/intamin/large_turn_right_to_orthogonal_gentle_up_4_2.png b/resources/g2/track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_4_2.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_to_orthogonal_gentle_up_4_2.png rename to resources/g2/track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_4_2.png diff --git a/resources/g2/track/intamin/large_turn_right_to_orthogonal_gentle_up_4_3.png b/resources/g2/track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_4_3.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_to_orthogonal_gentle_up_4_3.png rename to resources/g2/track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_4_3.png diff --git a/resources/g2/track/intamin/large_turn_right_to_orthogonal_gentle_up_4_4.png b/resources/g2/track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_4_4.png similarity index 100% rename from resources/g2/track/intamin/large_turn_right_to_orthogonal_gentle_up_4_4.png rename to resources/g2/track/lattice_triangle/large_turn_right_to_orthogonal_gentle_up_4_4.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_left_1_1.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_left_1_1.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_left_1_1.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_left_1_1.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_left_1_2.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_left_1_2.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_left_1_2.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_left_1_2.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_left_1_3.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_left_1_3.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_left_1_3.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_left_1_3.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_left_1_4.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_left_1_4.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_left_1_4.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_left_1_4.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_left_1_5.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_left_1_5.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_left_1_5.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_left_1_5.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_left_2_1.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_left_2_1.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_left_2_1.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_left_2_1.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_left_2_2.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_left_2_2.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_left_2_2.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_left_2_2.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_left_2_3.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_left_2_3.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_left_2_3.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_left_2_3.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_left_2_4.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_left_2_4.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_left_2_4.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_left_2_4.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_left_3_1.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_left_3_1.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_left_3_1.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_left_3_1.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_left_3_2.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_left_3_2.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_left_3_2.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_left_3_2.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_left_3_3.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_left_3_3.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_left_3_3.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_left_3_3.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_left_3_4.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_left_3_4.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_left_3_4.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_left_3_4.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_left_3_5.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_left_3_5.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_left_3_5.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_left_3_5.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_left_3_6.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_left_3_6.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_left_3_6.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_left_3_6.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_left_4_1.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_left_4_1.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_left_4_1.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_left_4_1.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_left_4_2.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_left_4_2.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_left_4_2.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_left_4_2.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_left_4_3.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_left_4_3.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_left_4_3.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_left_4_3.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_left_4_4.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_left_4_4.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_left_4_4.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_left_4_4.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_left_4_5.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_left_4_5.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_left_4_5.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_left_4_5.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_right_1_1.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_right_1_1.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_right_1_1.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_right_1_1.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_right_1_2.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_right_1_2.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_right_1_2.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_right_1_2.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_right_1_3.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_right_1_3.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_right_1_3.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_right_1_3.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_right_1_4.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_right_1_4.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_right_1_4.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_right_1_4.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_right_1_5.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_right_1_5.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_right_1_5.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_right_1_5.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_right_2_1.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_right_2_1.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_right_2_1.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_right_2_1.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_right_2_2.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_right_2_2.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_right_2_2.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_right_2_2.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_right_2_3.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_right_2_3.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_right_2_3.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_right_2_3.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_right_2_4.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_right_2_4.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_right_2_4.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_right_2_4.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_right_2_5.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_right_2_5.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_right_2_5.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_right_2_5.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_right_2_6.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_right_2_6.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_right_2_6.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_right_2_6.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_right_3_1.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_right_3_1.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_right_3_1.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_right_3_1.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_right_3_2.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_right_3_2.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_right_3_2.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_right_3_2.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_right_3_3.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_right_3_3.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_right_3_3.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_right_3_3.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_right_3_4.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_right_3_4.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_right_3_4.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_right_3_4.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_right_4_1.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_right_4_1.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_right_4_1.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_right_4_1.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_right_4_2.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_right_4_2.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_right_4_2.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_right_4_2.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_right_4_3.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_right_4_3.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_right_4_3.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_right_4_3.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_right_4_4.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_right_4_4.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_right_4_4.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_right_4_4.png diff --git a/resources/g2/track/intamin/large_zero_g_roll_right_4_5.png b/resources/g2/track/lattice_triangle/large_zero_g_roll_right_4_5.png similarity index 100% rename from resources/g2/track/intamin/large_zero_g_roll_right_4_5.png rename to resources/g2/track/lattice_triangle/large_zero_g_roll_right_4_5.png diff --git a/resources/g2/track/intamin/left_bank_to_gentle_up_left_bank_diag_1.png b/resources/g2/track/lattice_triangle/left_bank_to_gentle_up_left_bank_diag_1.png similarity index 100% rename from resources/g2/track/intamin/left_bank_to_gentle_up_left_bank_diag_1.png rename to resources/g2/track/lattice_triangle/left_bank_to_gentle_up_left_bank_diag_1.png diff --git a/resources/g2/track/intamin/left_bank_to_gentle_up_left_bank_diag_2.png b/resources/g2/track/lattice_triangle/left_bank_to_gentle_up_left_bank_diag_2.png similarity index 100% rename from resources/g2/track/intamin/left_bank_to_gentle_up_left_bank_diag_2.png rename to resources/g2/track/lattice_triangle/left_bank_to_gentle_up_left_bank_diag_2.png diff --git a/resources/g2/track/intamin/left_bank_to_gentle_up_left_bank_diag_3.png b/resources/g2/track/lattice_triangle/left_bank_to_gentle_up_left_bank_diag_3.png similarity index 100% rename from resources/g2/track/intamin/left_bank_to_gentle_up_left_bank_diag_3.png rename to resources/g2/track/lattice_triangle/left_bank_to_gentle_up_left_bank_diag_3.png diff --git a/resources/g2/track/intamin/left_bank_to_gentle_up_left_bank_diag_4.png b/resources/g2/track/lattice_triangle/left_bank_to_gentle_up_left_bank_diag_4.png similarity index 100% rename from resources/g2/track/intamin/left_bank_to_gentle_up_left_bank_diag_4.png rename to resources/g2/track/lattice_triangle/left_bank_to_gentle_up_left_bank_diag_4.png diff --git a/resources/g2/track/intamin/left_vertical_loop_1_1.png b/resources/g2/track/lattice_triangle/left_vertical_loop_1_1.png similarity index 100% rename from resources/g2/track/intamin/left_vertical_loop_1_1.png rename to resources/g2/track/lattice_triangle/left_vertical_loop_1_1.png diff --git a/resources/g2/track/intamin/left_vertical_loop_1_2.png b/resources/g2/track/lattice_triangle/left_vertical_loop_1_2.png similarity index 100% rename from resources/g2/track/intamin/left_vertical_loop_1_2.png rename to resources/g2/track/lattice_triangle/left_vertical_loop_1_2.png diff --git a/resources/g2/track/intamin/left_vertical_loop_1_3.png b/resources/g2/track/lattice_triangle/left_vertical_loop_1_3.png similarity index 100% rename from resources/g2/track/intamin/left_vertical_loop_1_3.png rename to resources/g2/track/lattice_triangle/left_vertical_loop_1_3.png diff --git a/resources/g2/track/intamin/left_vertical_loop_1_4.png b/resources/g2/track/lattice_triangle/left_vertical_loop_1_4.png similarity index 100% rename from resources/g2/track/intamin/left_vertical_loop_1_4.png rename to resources/g2/track/lattice_triangle/left_vertical_loop_1_4.png diff --git a/resources/g2/track/intamin/left_vertical_loop_2_1.png b/resources/g2/track/lattice_triangle/left_vertical_loop_2_1.png similarity index 100% rename from resources/g2/track/intamin/left_vertical_loop_2_1.png rename to resources/g2/track/lattice_triangle/left_vertical_loop_2_1.png diff --git a/resources/g2/track/intamin/left_vertical_loop_2_2.png b/resources/g2/track/lattice_triangle/left_vertical_loop_2_2.png similarity index 100% rename from resources/g2/track/intamin/left_vertical_loop_2_2.png rename to resources/g2/track/lattice_triangle/left_vertical_loop_2_2.png diff --git a/resources/g2/track/intamin/left_vertical_loop_2_3.png b/resources/g2/track/lattice_triangle/left_vertical_loop_2_3.png similarity index 100% rename from resources/g2/track/intamin/left_vertical_loop_2_3.png rename to resources/g2/track/lattice_triangle/left_vertical_loop_2_3.png diff --git a/resources/g2/track/intamin/left_vertical_loop_2_4.png b/resources/g2/track/lattice_triangle/left_vertical_loop_2_4.png similarity index 100% rename from resources/g2/track/intamin/left_vertical_loop_2_4.png rename to resources/g2/track/lattice_triangle/left_vertical_loop_2_4.png diff --git a/resources/g2/track/intamin/left_vertical_loop_3_1.png b/resources/g2/track/lattice_triangle/left_vertical_loop_3_1.png similarity index 100% rename from resources/g2/track/intamin/left_vertical_loop_3_1.png rename to resources/g2/track/lattice_triangle/left_vertical_loop_3_1.png diff --git a/resources/g2/track/intamin/left_vertical_loop_3_2.png b/resources/g2/track/lattice_triangle/left_vertical_loop_3_2.png similarity index 100% rename from resources/g2/track/intamin/left_vertical_loop_3_2.png rename to resources/g2/track/lattice_triangle/left_vertical_loop_3_2.png diff --git a/resources/g2/track/intamin/left_vertical_loop_3_3.png b/resources/g2/track/lattice_triangle/left_vertical_loop_3_3.png similarity index 100% rename from resources/g2/track/intamin/left_vertical_loop_3_3.png rename to resources/g2/track/lattice_triangle/left_vertical_loop_3_3.png diff --git a/resources/g2/track/intamin/left_vertical_loop_3_4.png b/resources/g2/track/lattice_triangle/left_vertical_loop_3_4.png similarity index 100% rename from resources/g2/track/intamin/left_vertical_loop_3_4.png rename to resources/g2/track/lattice_triangle/left_vertical_loop_3_4.png diff --git a/resources/g2/track/intamin/left_vertical_loop_4_1.png b/resources/g2/track/lattice_triangle/left_vertical_loop_4_1.png similarity index 100% rename from resources/g2/track/intamin/left_vertical_loop_4_1.png rename to resources/g2/track/lattice_triangle/left_vertical_loop_4_1.png diff --git a/resources/g2/track/intamin/left_vertical_loop_4_2.png b/resources/g2/track/lattice_triangle/left_vertical_loop_4_2.png similarity index 100% rename from resources/g2/track/intamin/left_vertical_loop_4_2.png rename to resources/g2/track/lattice_triangle/left_vertical_loop_4_2.png diff --git a/resources/g2/track/intamin/left_vertical_loop_4_3.png b/resources/g2/track/lattice_triangle/left_vertical_loop_4_3.png similarity index 100% rename from resources/g2/track/intamin/left_vertical_loop_4_3.png rename to resources/g2/track/lattice_triangle/left_vertical_loop_4_3.png diff --git a/resources/g2/track/intamin/left_vertical_loop_4_4.png b/resources/g2/track/lattice_triangle/left_vertical_loop_4_4.png similarity index 100% rename from resources/g2/track/intamin/left_vertical_loop_4_4.png rename to resources/g2/track/lattice_triangle/left_vertical_loop_4_4.png diff --git a/resources/g2/track/intamin/liftbooster_0.png b/resources/g2/track/lattice_triangle/liftbooster_0.png similarity index 100% rename from resources/g2/track/intamin/liftbooster_0.png rename to resources/g2/track/lattice_triangle/liftbooster_0.png diff --git a/resources/g2/track/intamin/liftbooster_1.png b/resources/g2/track/lattice_triangle/liftbooster_1.png similarity index 100% rename from resources/g2/track/intamin/liftbooster_1.png rename to resources/g2/track/lattice_triangle/liftbooster_1.png diff --git a/resources/g2/track/intamin/liftbooster_2.png b/resources/g2/track/lattice_triangle/liftbooster_2.png similarity index 100% rename from resources/g2/track/intamin/liftbooster_2.png rename to resources/g2/track/lattice_triangle/liftbooster_2.png diff --git a/resources/g2/track/intamin/liftbooster_3.png b/resources/g2/track/lattice_triangle/liftbooster_3.png similarity index 100% rename from resources/g2/track/intamin/liftbooster_3.png rename to resources/g2/track/lattice_triangle/liftbooster_3.png diff --git a/resources/g2/track/intamin/medium_half_loop_left_1_1.png b/resources/g2/track/lattice_triangle/medium_half_loop_left_1_1.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_left_1_1.png rename to resources/g2/track/lattice_triangle/medium_half_loop_left_1_1.png diff --git a/resources/g2/track/intamin/medium_half_loop_left_1_2.png b/resources/g2/track/lattice_triangle/medium_half_loop_left_1_2.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_left_1_2.png rename to resources/g2/track/lattice_triangle/medium_half_loop_left_1_2.png diff --git a/resources/g2/track/intamin/medium_half_loop_left_1_3.png b/resources/g2/track/lattice_triangle/medium_half_loop_left_1_3.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_left_1_3.png rename to resources/g2/track/lattice_triangle/medium_half_loop_left_1_3.png diff --git a/resources/g2/track/intamin/medium_half_loop_left_1_4.png b/resources/g2/track/lattice_triangle/medium_half_loop_left_1_4.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_left_1_4.png rename to resources/g2/track/lattice_triangle/medium_half_loop_left_1_4.png diff --git a/resources/g2/track/intamin/medium_half_loop_left_1_5.png b/resources/g2/track/lattice_triangle/medium_half_loop_left_1_5.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_left_1_5.png rename to resources/g2/track/lattice_triangle/medium_half_loop_left_1_5.png diff --git a/resources/g2/track/intamin/medium_half_loop_left_2_1.png b/resources/g2/track/lattice_triangle/medium_half_loop_left_2_1.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_left_2_1.png rename to resources/g2/track/lattice_triangle/medium_half_loop_left_2_1.png diff --git a/resources/g2/track/intamin/medium_half_loop_left_2_2.png b/resources/g2/track/lattice_triangle/medium_half_loop_left_2_2.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_left_2_2.png rename to resources/g2/track/lattice_triangle/medium_half_loop_left_2_2.png diff --git a/resources/g2/track/intamin/medium_half_loop_left_2_3.png b/resources/g2/track/lattice_triangle/medium_half_loop_left_2_3.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_left_2_3.png rename to resources/g2/track/lattice_triangle/medium_half_loop_left_2_3.png diff --git a/resources/g2/track/intamin/medium_half_loop_left_2_4.png b/resources/g2/track/lattice_triangle/medium_half_loop_left_2_4.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_left_2_4.png rename to resources/g2/track/lattice_triangle/medium_half_loop_left_2_4.png diff --git a/resources/g2/track/intamin/medium_half_loop_left_2_5.png b/resources/g2/track/lattice_triangle/medium_half_loop_left_2_5.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_left_2_5.png rename to resources/g2/track/lattice_triangle/medium_half_loop_left_2_5.png diff --git a/resources/g2/track/intamin/medium_half_loop_left_3_1.png b/resources/g2/track/lattice_triangle/medium_half_loop_left_3_1.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_left_3_1.png rename to resources/g2/track/lattice_triangle/medium_half_loop_left_3_1.png diff --git a/resources/g2/track/intamin/medium_half_loop_left_3_2.png b/resources/g2/track/lattice_triangle/medium_half_loop_left_3_2.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_left_3_2.png rename to resources/g2/track/lattice_triangle/medium_half_loop_left_3_2.png diff --git a/resources/g2/track/intamin/medium_half_loop_left_3_3.png b/resources/g2/track/lattice_triangle/medium_half_loop_left_3_3.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_left_3_3.png rename to resources/g2/track/lattice_triangle/medium_half_loop_left_3_3.png diff --git a/resources/g2/track/intamin/medium_half_loop_left_3_4.png b/resources/g2/track/lattice_triangle/medium_half_loop_left_3_4.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_left_3_4.png rename to resources/g2/track/lattice_triangle/medium_half_loop_left_3_4.png diff --git a/resources/g2/track/intamin/medium_half_loop_left_3_5.png b/resources/g2/track/lattice_triangle/medium_half_loop_left_3_5.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_left_3_5.png rename to resources/g2/track/lattice_triangle/medium_half_loop_left_3_5.png diff --git a/resources/g2/track/intamin/medium_half_loop_left_4_1.png b/resources/g2/track/lattice_triangle/medium_half_loop_left_4_1.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_left_4_1.png rename to resources/g2/track/lattice_triangle/medium_half_loop_left_4_1.png diff --git a/resources/g2/track/intamin/medium_half_loop_left_4_2.png b/resources/g2/track/lattice_triangle/medium_half_loop_left_4_2.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_left_4_2.png rename to resources/g2/track/lattice_triangle/medium_half_loop_left_4_2.png diff --git a/resources/g2/track/intamin/medium_half_loop_left_4_3.png b/resources/g2/track/lattice_triangle/medium_half_loop_left_4_3.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_left_4_3.png rename to resources/g2/track/lattice_triangle/medium_half_loop_left_4_3.png diff --git a/resources/g2/track/intamin/medium_half_loop_left_4_4.png b/resources/g2/track/lattice_triangle/medium_half_loop_left_4_4.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_left_4_4.png rename to resources/g2/track/lattice_triangle/medium_half_loop_left_4_4.png diff --git a/resources/g2/track/intamin/medium_half_loop_left_4_5.png b/resources/g2/track/lattice_triangle/medium_half_loop_left_4_5.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_left_4_5.png rename to resources/g2/track/lattice_triangle/medium_half_loop_left_4_5.png diff --git a/resources/g2/track/intamin/medium_half_loop_right_1_1.png b/resources/g2/track/lattice_triangle/medium_half_loop_right_1_1.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_right_1_1.png rename to resources/g2/track/lattice_triangle/medium_half_loop_right_1_1.png diff --git a/resources/g2/track/intamin/medium_half_loop_right_1_2.png b/resources/g2/track/lattice_triangle/medium_half_loop_right_1_2.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_right_1_2.png rename to resources/g2/track/lattice_triangle/medium_half_loop_right_1_2.png diff --git a/resources/g2/track/intamin/medium_half_loop_right_1_3.png b/resources/g2/track/lattice_triangle/medium_half_loop_right_1_3.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_right_1_3.png rename to resources/g2/track/lattice_triangle/medium_half_loop_right_1_3.png diff --git a/resources/g2/track/intamin/medium_half_loop_right_1_4.png b/resources/g2/track/lattice_triangle/medium_half_loop_right_1_4.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_right_1_4.png rename to resources/g2/track/lattice_triangle/medium_half_loop_right_1_4.png diff --git a/resources/g2/track/intamin/medium_half_loop_right_1_5.png b/resources/g2/track/lattice_triangle/medium_half_loop_right_1_5.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_right_1_5.png rename to resources/g2/track/lattice_triangle/medium_half_loop_right_1_5.png diff --git a/resources/g2/track/intamin/medium_half_loop_right_2_1.png b/resources/g2/track/lattice_triangle/medium_half_loop_right_2_1.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_right_2_1.png rename to resources/g2/track/lattice_triangle/medium_half_loop_right_2_1.png diff --git a/resources/g2/track/intamin/medium_half_loop_right_2_2.png b/resources/g2/track/lattice_triangle/medium_half_loop_right_2_2.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_right_2_2.png rename to resources/g2/track/lattice_triangle/medium_half_loop_right_2_2.png diff --git a/resources/g2/track/intamin/medium_half_loop_right_2_3.png b/resources/g2/track/lattice_triangle/medium_half_loop_right_2_3.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_right_2_3.png rename to resources/g2/track/lattice_triangle/medium_half_loop_right_2_3.png diff --git a/resources/g2/track/intamin/medium_half_loop_right_2_4.png b/resources/g2/track/lattice_triangle/medium_half_loop_right_2_4.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_right_2_4.png rename to resources/g2/track/lattice_triangle/medium_half_loop_right_2_4.png diff --git a/resources/g2/track/intamin/medium_half_loop_right_2_5.png b/resources/g2/track/lattice_triangle/medium_half_loop_right_2_5.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_right_2_5.png rename to resources/g2/track/lattice_triangle/medium_half_loop_right_2_5.png diff --git a/resources/g2/track/intamin/medium_half_loop_right_3_1.png b/resources/g2/track/lattice_triangle/medium_half_loop_right_3_1.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_right_3_1.png rename to resources/g2/track/lattice_triangle/medium_half_loop_right_3_1.png diff --git a/resources/g2/track/intamin/medium_half_loop_right_3_2.png b/resources/g2/track/lattice_triangle/medium_half_loop_right_3_2.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_right_3_2.png rename to resources/g2/track/lattice_triangle/medium_half_loop_right_3_2.png diff --git a/resources/g2/track/intamin/medium_half_loop_right_3_3.png b/resources/g2/track/lattice_triangle/medium_half_loop_right_3_3.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_right_3_3.png rename to resources/g2/track/lattice_triangle/medium_half_loop_right_3_3.png diff --git a/resources/g2/track/intamin/medium_half_loop_right_3_4.png b/resources/g2/track/lattice_triangle/medium_half_loop_right_3_4.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_right_3_4.png rename to resources/g2/track/lattice_triangle/medium_half_loop_right_3_4.png diff --git a/resources/g2/track/intamin/medium_half_loop_right_3_5.png b/resources/g2/track/lattice_triangle/medium_half_loop_right_3_5.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_right_3_5.png rename to resources/g2/track/lattice_triangle/medium_half_loop_right_3_5.png diff --git a/resources/g2/track/intamin/medium_half_loop_right_4_1.png b/resources/g2/track/lattice_triangle/medium_half_loop_right_4_1.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_right_4_1.png rename to resources/g2/track/lattice_triangle/medium_half_loop_right_4_1.png diff --git a/resources/g2/track/intamin/medium_half_loop_right_4_2.png b/resources/g2/track/lattice_triangle/medium_half_loop_right_4_2.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_right_4_2.png rename to resources/g2/track/lattice_triangle/medium_half_loop_right_4_2.png diff --git a/resources/g2/track/intamin/medium_half_loop_right_4_3.png b/resources/g2/track/lattice_triangle/medium_half_loop_right_4_3.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_right_4_3.png rename to resources/g2/track/lattice_triangle/medium_half_loop_right_4_3.png diff --git a/resources/g2/track/intamin/medium_half_loop_right_4_4.png b/resources/g2/track/lattice_triangle/medium_half_loop_right_4_4.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_right_4_4.png rename to resources/g2/track/lattice_triangle/medium_half_loop_right_4_4.png diff --git a/resources/g2/track/intamin/medium_half_loop_right_4_5.png b/resources/g2/track/lattice_triangle/medium_half_loop_right_4_5.png similarity index 100% rename from resources/g2/track/intamin/medium_half_loop_right_4_5.png rename to resources/g2/track/lattice_triangle/medium_half_loop_right_4_5.png diff --git a/resources/g2/track/intamin/quarter_loop_up_1_1.png b/resources/g2/track/lattice_triangle/quarter_loop_up_1_1.png similarity index 100% rename from resources/g2/track/intamin/quarter_loop_up_1_1.png rename to resources/g2/track/lattice_triangle/quarter_loop_up_1_1.png diff --git a/resources/g2/track/intamin/quarter_loop_up_1_2.png b/resources/g2/track/lattice_triangle/quarter_loop_up_1_2.png similarity index 100% rename from resources/g2/track/intamin/quarter_loop_up_1_2.png rename to resources/g2/track/lattice_triangle/quarter_loop_up_1_2.png diff --git a/resources/g2/track/intamin/quarter_loop_up_1_3.png b/resources/g2/track/lattice_triangle/quarter_loop_up_1_3.png similarity index 100% rename from resources/g2/track/intamin/quarter_loop_up_1_3.png rename to resources/g2/track/lattice_triangle/quarter_loop_up_1_3.png diff --git a/resources/g2/track/intamin/quarter_loop_up_2_1.png b/resources/g2/track/lattice_triangle/quarter_loop_up_2_1.png similarity index 100% rename from resources/g2/track/intamin/quarter_loop_up_2_1.png rename to resources/g2/track/lattice_triangle/quarter_loop_up_2_1.png diff --git a/resources/g2/track/intamin/quarter_loop_up_2_2.png b/resources/g2/track/lattice_triangle/quarter_loop_up_2_2.png similarity index 100% rename from resources/g2/track/intamin/quarter_loop_up_2_2.png rename to resources/g2/track/lattice_triangle/quarter_loop_up_2_2.png diff --git a/resources/g2/track/intamin/quarter_loop_up_2_3.png b/resources/g2/track/lattice_triangle/quarter_loop_up_2_3.png similarity index 100% rename from resources/g2/track/intamin/quarter_loop_up_2_3.png rename to resources/g2/track/lattice_triangle/quarter_loop_up_2_3.png diff --git a/resources/g2/track/intamin/quarter_loop_up_3_1.png b/resources/g2/track/lattice_triangle/quarter_loop_up_3_1.png similarity index 100% rename from resources/g2/track/intamin/quarter_loop_up_3_1.png rename to resources/g2/track/lattice_triangle/quarter_loop_up_3_1.png diff --git a/resources/g2/track/intamin/quarter_loop_up_3_2.png b/resources/g2/track/lattice_triangle/quarter_loop_up_3_2.png similarity index 100% rename from resources/g2/track/intamin/quarter_loop_up_3_2.png rename to resources/g2/track/lattice_triangle/quarter_loop_up_3_2.png diff --git a/resources/g2/track/intamin/quarter_loop_up_3_3.png b/resources/g2/track/lattice_triangle/quarter_loop_up_3_3.png similarity index 100% rename from resources/g2/track/intamin/quarter_loop_up_3_3.png rename to resources/g2/track/lattice_triangle/quarter_loop_up_3_3.png diff --git a/resources/g2/track/intamin/quarter_loop_up_4_1.png b/resources/g2/track/lattice_triangle/quarter_loop_up_4_1.png similarity index 100% rename from resources/g2/track/intamin/quarter_loop_up_4_1.png rename to resources/g2/track/lattice_triangle/quarter_loop_up_4_1.png diff --git a/resources/g2/track/intamin/quarter_loop_up_4_2.png b/resources/g2/track/lattice_triangle/quarter_loop_up_4_2.png similarity index 100% rename from resources/g2/track/intamin/quarter_loop_up_4_2.png rename to resources/g2/track/lattice_triangle/quarter_loop_up_4_2.png diff --git a/resources/g2/track/intamin/quarter_loop_up_4_3.png b/resources/g2/track/lattice_triangle/quarter_loop_up_4_3.png similarity index 100% rename from resources/g2/track/intamin/quarter_loop_up_4_3.png rename to resources/g2/track/lattice_triangle/quarter_loop_up_4_3.png diff --git a/resources/g2/track/intamin/right_bank_to_gentle_up_right_bank_diag_1.png b/resources/g2/track/lattice_triangle/right_bank_to_gentle_up_right_bank_diag_1.png similarity index 100% rename from resources/g2/track/intamin/right_bank_to_gentle_up_right_bank_diag_1.png rename to resources/g2/track/lattice_triangle/right_bank_to_gentle_up_right_bank_diag_1.png diff --git a/resources/g2/track/intamin/right_bank_to_gentle_up_right_bank_diag_2.png b/resources/g2/track/lattice_triangle/right_bank_to_gentle_up_right_bank_diag_2.png similarity index 100% rename from resources/g2/track/intamin/right_bank_to_gentle_up_right_bank_diag_2.png rename to resources/g2/track/lattice_triangle/right_bank_to_gentle_up_right_bank_diag_2.png diff --git a/resources/g2/track/intamin/right_bank_to_gentle_up_right_bank_diag_3.png b/resources/g2/track/lattice_triangle/right_bank_to_gentle_up_right_bank_diag_3.png similarity index 100% rename from resources/g2/track/intamin/right_bank_to_gentle_up_right_bank_diag_3.png rename to resources/g2/track/lattice_triangle/right_bank_to_gentle_up_right_bank_diag_3.png diff --git a/resources/g2/track/intamin/right_bank_to_gentle_up_right_bank_diag_4.png b/resources/g2/track/lattice_triangle/right_bank_to_gentle_up_right_bank_diag_4.png similarity index 100% rename from resources/g2/track/intamin/right_bank_to_gentle_up_right_bank_diag_4.png rename to resources/g2/track/lattice_triangle/right_bank_to_gentle_up_right_bank_diag_4.png diff --git a/resources/g2/track/intamin/right_vertical_loop_1_1.png b/resources/g2/track/lattice_triangle/right_vertical_loop_1_1.png similarity index 100% rename from resources/g2/track/intamin/right_vertical_loop_1_1.png rename to resources/g2/track/lattice_triangle/right_vertical_loop_1_1.png diff --git a/resources/g2/track/intamin/right_vertical_loop_1_2.png b/resources/g2/track/lattice_triangle/right_vertical_loop_1_2.png similarity index 100% rename from resources/g2/track/intamin/right_vertical_loop_1_2.png rename to resources/g2/track/lattice_triangle/right_vertical_loop_1_2.png diff --git a/resources/g2/track/intamin/right_vertical_loop_1_3.png b/resources/g2/track/lattice_triangle/right_vertical_loop_1_3.png similarity index 100% rename from resources/g2/track/intamin/right_vertical_loop_1_3.png rename to resources/g2/track/lattice_triangle/right_vertical_loop_1_3.png diff --git a/resources/g2/track/intamin/right_vertical_loop_1_4.png b/resources/g2/track/lattice_triangle/right_vertical_loop_1_4.png similarity index 100% rename from resources/g2/track/intamin/right_vertical_loop_1_4.png rename to resources/g2/track/lattice_triangle/right_vertical_loop_1_4.png diff --git a/resources/g2/track/intamin/right_vertical_loop_2_1.png b/resources/g2/track/lattice_triangle/right_vertical_loop_2_1.png similarity index 100% rename from resources/g2/track/intamin/right_vertical_loop_2_1.png rename to resources/g2/track/lattice_triangle/right_vertical_loop_2_1.png diff --git a/resources/g2/track/intamin/right_vertical_loop_2_2.png b/resources/g2/track/lattice_triangle/right_vertical_loop_2_2.png similarity index 100% rename from resources/g2/track/intamin/right_vertical_loop_2_2.png rename to resources/g2/track/lattice_triangle/right_vertical_loop_2_2.png diff --git a/resources/g2/track/intamin/right_vertical_loop_2_3.png b/resources/g2/track/lattice_triangle/right_vertical_loop_2_3.png similarity index 100% rename from resources/g2/track/intamin/right_vertical_loop_2_3.png rename to resources/g2/track/lattice_triangle/right_vertical_loop_2_3.png diff --git a/resources/g2/track/intamin/right_vertical_loop_2_4.png b/resources/g2/track/lattice_triangle/right_vertical_loop_2_4.png similarity index 100% rename from resources/g2/track/intamin/right_vertical_loop_2_4.png rename to resources/g2/track/lattice_triangle/right_vertical_loop_2_4.png diff --git a/resources/g2/track/intamin/right_vertical_loop_3_1.png b/resources/g2/track/lattice_triangle/right_vertical_loop_3_1.png similarity index 100% rename from resources/g2/track/intamin/right_vertical_loop_3_1.png rename to resources/g2/track/lattice_triangle/right_vertical_loop_3_1.png diff --git a/resources/g2/track/intamin/right_vertical_loop_3_2.png b/resources/g2/track/lattice_triangle/right_vertical_loop_3_2.png similarity index 100% rename from resources/g2/track/intamin/right_vertical_loop_3_2.png rename to resources/g2/track/lattice_triangle/right_vertical_loop_3_2.png diff --git a/resources/g2/track/intamin/right_vertical_loop_3_3.png b/resources/g2/track/lattice_triangle/right_vertical_loop_3_3.png similarity index 100% rename from resources/g2/track/intamin/right_vertical_loop_3_3.png rename to resources/g2/track/lattice_triangle/right_vertical_loop_3_3.png diff --git a/resources/g2/track/intamin/right_vertical_loop_3_4.png b/resources/g2/track/lattice_triangle/right_vertical_loop_3_4.png similarity index 100% rename from resources/g2/track/intamin/right_vertical_loop_3_4.png rename to resources/g2/track/lattice_triangle/right_vertical_loop_3_4.png diff --git a/resources/g2/track/intamin/right_vertical_loop_4_1.png b/resources/g2/track/lattice_triangle/right_vertical_loop_4_1.png similarity index 100% rename from resources/g2/track/intamin/right_vertical_loop_4_1.png rename to resources/g2/track/lattice_triangle/right_vertical_loop_4_1.png diff --git a/resources/g2/track/intamin/right_vertical_loop_4_2.png b/resources/g2/track/lattice_triangle/right_vertical_loop_4_2.png similarity index 100% rename from resources/g2/track/intamin/right_vertical_loop_4_2.png rename to resources/g2/track/lattice_triangle/right_vertical_loop_4_2.png diff --git a/resources/g2/track/intamin/right_vertical_loop_4_3.png b/resources/g2/track/lattice_triangle/right_vertical_loop_4_3.png similarity index 100% rename from resources/g2/track/intamin/right_vertical_loop_4_3.png rename to resources/g2/track/lattice_triangle/right_vertical_loop_4_3.png diff --git a/resources/g2/track/intamin/right_vertical_loop_4_4.png b/resources/g2/track/lattice_triangle/right_vertical_loop_4_4.png similarity index 100% rename from resources/g2/track/intamin/right_vertical_loop_4_4.png rename to resources/g2/track/lattice_triangle/right_vertical_loop_4_4.png diff --git a/resources/g2/track/intamin/small_flat_to_steep_up_1.png b/resources/g2/track/lattice_triangle/small_flat_to_steep_up_1.png similarity index 100% rename from resources/g2/track/intamin/small_flat_to_steep_up_1.png rename to resources/g2/track/lattice_triangle/small_flat_to_steep_up_1.png diff --git a/resources/g2/track/intamin/small_flat_to_steep_up_2_1.png b/resources/g2/track/lattice_triangle/small_flat_to_steep_up_2_1.png similarity index 100% rename from resources/g2/track/intamin/small_flat_to_steep_up_2_1.png rename to resources/g2/track/lattice_triangle/small_flat_to_steep_up_2_1.png diff --git a/resources/g2/track/intamin/small_flat_to_steep_up_2_2.png b/resources/g2/track/lattice_triangle/small_flat_to_steep_up_2_2.png similarity index 100% rename from resources/g2/track/intamin/small_flat_to_steep_up_2_2.png rename to resources/g2/track/lattice_triangle/small_flat_to_steep_up_2_2.png diff --git a/resources/g2/track/intamin/small_flat_to_steep_up_3_1.png b/resources/g2/track/lattice_triangle/small_flat_to_steep_up_3_1.png similarity index 100% rename from resources/g2/track/intamin/small_flat_to_steep_up_3_1.png rename to resources/g2/track/lattice_triangle/small_flat_to_steep_up_3_1.png diff --git a/resources/g2/track/intamin/small_flat_to_steep_up_3_2.png b/resources/g2/track/lattice_triangle/small_flat_to_steep_up_3_2.png similarity index 100% rename from resources/g2/track/intamin/small_flat_to_steep_up_3_2.png rename to resources/g2/track/lattice_triangle/small_flat_to_steep_up_3_2.png diff --git a/resources/g2/track/intamin/small_flat_to_steep_up_4.png b/resources/g2/track/lattice_triangle/small_flat_to_steep_up_4.png similarity index 100% rename from resources/g2/track/intamin/small_flat_to_steep_up_4.png rename to resources/g2/track/lattice_triangle/small_flat_to_steep_up_4.png diff --git a/resources/g2/track/intamin/small_flat_to_steep_up_diag_1.png b/resources/g2/track/lattice_triangle/small_flat_to_steep_up_diag_1.png similarity index 100% rename from resources/g2/track/intamin/small_flat_to_steep_up_diag_1.png rename to resources/g2/track/lattice_triangle/small_flat_to_steep_up_diag_1.png diff --git a/resources/g2/track/intamin/small_flat_to_steep_up_diag_2.png b/resources/g2/track/lattice_triangle/small_flat_to_steep_up_diag_2.png similarity index 100% rename from resources/g2/track/intamin/small_flat_to_steep_up_diag_2.png rename to resources/g2/track/lattice_triangle/small_flat_to_steep_up_diag_2.png diff --git a/resources/g2/track/intamin/small_flat_to_steep_up_diag_3.png b/resources/g2/track/lattice_triangle/small_flat_to_steep_up_diag_3.png similarity index 100% rename from resources/g2/track/intamin/small_flat_to_steep_up_diag_3.png rename to resources/g2/track/lattice_triangle/small_flat_to_steep_up_diag_3.png diff --git a/resources/g2/track/intamin/small_flat_to_steep_up_diag_4.png b/resources/g2/track/lattice_triangle/small_flat_to_steep_up_diag_4.png similarity index 100% rename from resources/g2/track/intamin/small_flat_to_steep_up_diag_4.png rename to resources/g2/track/lattice_triangle/small_flat_to_steep_up_diag_4.png diff --git a/resources/g2/track/intamin/small_steep_to_flat_up_1.png b/resources/g2/track/lattice_triangle/small_steep_to_flat_up_1.png similarity index 100% rename from resources/g2/track/intamin/small_steep_to_flat_up_1.png rename to resources/g2/track/lattice_triangle/small_steep_to_flat_up_1.png diff --git a/resources/g2/track/intamin/small_steep_to_flat_up_2_1.png b/resources/g2/track/lattice_triangle/small_steep_to_flat_up_2_1.png similarity index 100% rename from resources/g2/track/intamin/small_steep_to_flat_up_2_1.png rename to resources/g2/track/lattice_triangle/small_steep_to_flat_up_2_1.png diff --git a/resources/g2/track/intamin/small_steep_to_flat_up_2_2.png b/resources/g2/track/lattice_triangle/small_steep_to_flat_up_2_2.png similarity index 100% rename from resources/g2/track/intamin/small_steep_to_flat_up_2_2.png rename to resources/g2/track/lattice_triangle/small_steep_to_flat_up_2_2.png diff --git a/resources/g2/track/intamin/small_steep_to_flat_up_3_1.png b/resources/g2/track/lattice_triangle/small_steep_to_flat_up_3_1.png similarity index 100% rename from resources/g2/track/intamin/small_steep_to_flat_up_3_1.png rename to resources/g2/track/lattice_triangle/small_steep_to_flat_up_3_1.png diff --git a/resources/g2/track/intamin/small_steep_to_flat_up_3_2.png b/resources/g2/track/lattice_triangle/small_steep_to_flat_up_3_2.png similarity index 100% rename from resources/g2/track/intamin/small_steep_to_flat_up_3_2.png rename to resources/g2/track/lattice_triangle/small_steep_to_flat_up_3_2.png diff --git a/resources/g2/track/intamin/small_steep_to_flat_up_4.png b/resources/g2/track/lattice_triangle/small_steep_to_flat_up_4.png similarity index 100% rename from resources/g2/track/intamin/small_steep_to_flat_up_4.png rename to resources/g2/track/lattice_triangle/small_steep_to_flat_up_4.png diff --git a/resources/g2/track/intamin/small_steep_to_flat_up_diag_1.png b/resources/g2/track/lattice_triangle/small_steep_to_flat_up_diag_1.png similarity index 100% rename from resources/g2/track/intamin/small_steep_to_flat_up_diag_1.png rename to resources/g2/track/lattice_triangle/small_steep_to_flat_up_diag_1.png diff --git a/resources/g2/track/intamin/small_steep_to_flat_up_diag_2.png b/resources/g2/track/lattice_triangle/small_steep_to_flat_up_diag_2.png similarity index 100% rename from resources/g2/track/intamin/small_steep_to_flat_up_diag_2.png rename to resources/g2/track/lattice_triangle/small_steep_to_flat_up_diag_2.png diff --git a/resources/g2/track/intamin/small_steep_to_flat_up_diag_3.png b/resources/g2/track/lattice_triangle/small_steep_to_flat_up_diag_3.png similarity index 100% rename from resources/g2/track/intamin/small_steep_to_flat_up_diag_3.png rename to resources/g2/track/lattice_triangle/small_steep_to_flat_up_diag_3.png diff --git a/resources/g2/track/intamin/small_steep_to_flat_up_diag_4.png b/resources/g2/track/lattice_triangle/small_steep_to_flat_up_diag_4.png similarity index 100% rename from resources/g2/track/intamin/small_steep_to_flat_up_diag_4.png rename to resources/g2/track/lattice_triangle/small_steep_to_flat_up_diag_4.png diff --git a/resources/g2/track/intamin/small_turn_left_bank_to_gentle_up_1_1.png b/resources/g2/track/lattice_triangle/small_turn_left_bank_to_gentle_up_1_1.png similarity index 100% rename from resources/g2/track/intamin/small_turn_left_bank_to_gentle_up_1_1.png rename to resources/g2/track/lattice_triangle/small_turn_left_bank_to_gentle_up_1_1.png diff --git a/resources/g2/track/intamin/small_turn_left_bank_to_gentle_up_1_2.png b/resources/g2/track/lattice_triangle/small_turn_left_bank_to_gentle_up_1_2.png similarity index 100% rename from resources/g2/track/intamin/small_turn_left_bank_to_gentle_up_1_2.png rename to resources/g2/track/lattice_triangle/small_turn_left_bank_to_gentle_up_1_2.png diff --git a/resources/g2/track/intamin/small_turn_left_bank_to_gentle_up_2_1.png b/resources/g2/track/lattice_triangle/small_turn_left_bank_to_gentle_up_2_1.png similarity index 100% rename from resources/g2/track/intamin/small_turn_left_bank_to_gentle_up_2_1.png rename to resources/g2/track/lattice_triangle/small_turn_left_bank_to_gentle_up_2_1.png diff --git a/resources/g2/track/intamin/small_turn_left_bank_to_gentle_up_2_2.png b/resources/g2/track/lattice_triangle/small_turn_left_bank_to_gentle_up_2_2.png similarity index 100% rename from resources/g2/track/intamin/small_turn_left_bank_to_gentle_up_2_2.png rename to resources/g2/track/lattice_triangle/small_turn_left_bank_to_gentle_up_2_2.png diff --git a/resources/g2/track/intamin/small_turn_left_bank_to_gentle_up_2_3.png b/resources/g2/track/lattice_triangle/small_turn_left_bank_to_gentle_up_2_3.png similarity index 100% rename from resources/g2/track/intamin/small_turn_left_bank_to_gentle_up_2_3.png rename to resources/g2/track/lattice_triangle/small_turn_left_bank_to_gentle_up_2_3.png diff --git a/resources/g2/track/intamin/small_turn_left_bank_to_gentle_up_3_1.png b/resources/g2/track/lattice_triangle/small_turn_left_bank_to_gentle_up_3_1.png similarity index 100% rename from resources/g2/track/intamin/small_turn_left_bank_to_gentle_up_3_1.png rename to resources/g2/track/lattice_triangle/small_turn_left_bank_to_gentle_up_3_1.png diff --git a/resources/g2/track/intamin/small_turn_left_bank_to_gentle_up_3_2.png b/resources/g2/track/lattice_triangle/small_turn_left_bank_to_gentle_up_3_2.png similarity index 100% rename from resources/g2/track/intamin/small_turn_left_bank_to_gentle_up_3_2.png rename to resources/g2/track/lattice_triangle/small_turn_left_bank_to_gentle_up_3_2.png diff --git a/resources/g2/track/intamin/small_turn_left_bank_to_gentle_up_4_1.png b/resources/g2/track/lattice_triangle/small_turn_left_bank_to_gentle_up_4_1.png similarity index 100% rename from resources/g2/track/intamin/small_turn_left_bank_to_gentle_up_4_1.png rename to resources/g2/track/lattice_triangle/small_turn_left_bank_to_gentle_up_4_1.png diff --git a/resources/g2/track/intamin/small_turn_left_bank_to_gentle_up_4_2.png b/resources/g2/track/lattice_triangle/small_turn_left_bank_to_gentle_up_4_2.png similarity index 100% rename from resources/g2/track/intamin/small_turn_left_bank_to_gentle_up_4_2.png rename to resources/g2/track/lattice_triangle/small_turn_left_bank_to_gentle_up_4_2.png diff --git a/resources/g2/track/intamin/small_turn_right_bank_to_gentle_up_1_1.png b/resources/g2/track/lattice_triangle/small_turn_right_bank_to_gentle_up_1_1.png similarity index 100% rename from resources/g2/track/intamin/small_turn_right_bank_to_gentle_up_1_1.png rename to resources/g2/track/lattice_triangle/small_turn_right_bank_to_gentle_up_1_1.png diff --git a/resources/g2/track/intamin/small_turn_right_bank_to_gentle_up_1_2.png b/resources/g2/track/lattice_triangle/small_turn_right_bank_to_gentle_up_1_2.png similarity index 100% rename from resources/g2/track/intamin/small_turn_right_bank_to_gentle_up_1_2.png rename to resources/g2/track/lattice_triangle/small_turn_right_bank_to_gentle_up_1_2.png diff --git a/resources/g2/track/intamin/small_turn_right_bank_to_gentle_up_2_1.png b/resources/g2/track/lattice_triangle/small_turn_right_bank_to_gentle_up_2_1.png similarity index 100% rename from resources/g2/track/intamin/small_turn_right_bank_to_gentle_up_2_1.png rename to resources/g2/track/lattice_triangle/small_turn_right_bank_to_gentle_up_2_1.png diff --git a/resources/g2/track/intamin/small_turn_right_bank_to_gentle_up_2_2.png b/resources/g2/track/lattice_triangle/small_turn_right_bank_to_gentle_up_2_2.png similarity index 100% rename from resources/g2/track/intamin/small_turn_right_bank_to_gentle_up_2_2.png rename to resources/g2/track/lattice_triangle/small_turn_right_bank_to_gentle_up_2_2.png diff --git a/resources/g2/track/intamin/small_turn_right_bank_to_gentle_up_3_1.png b/resources/g2/track/lattice_triangle/small_turn_right_bank_to_gentle_up_3_1.png similarity index 100% rename from resources/g2/track/intamin/small_turn_right_bank_to_gentle_up_3_1.png rename to resources/g2/track/lattice_triangle/small_turn_right_bank_to_gentle_up_3_1.png diff --git a/resources/g2/track/intamin/small_turn_right_bank_to_gentle_up_3_2.png b/resources/g2/track/lattice_triangle/small_turn_right_bank_to_gentle_up_3_2.png similarity index 100% rename from resources/g2/track/intamin/small_turn_right_bank_to_gentle_up_3_2.png rename to resources/g2/track/lattice_triangle/small_turn_right_bank_to_gentle_up_3_2.png diff --git a/resources/g2/track/intamin/small_turn_right_bank_to_gentle_up_3_3.png b/resources/g2/track/lattice_triangle/small_turn_right_bank_to_gentle_up_3_3.png similarity index 100% rename from resources/g2/track/intamin/small_turn_right_bank_to_gentle_up_3_3.png rename to resources/g2/track/lattice_triangle/small_turn_right_bank_to_gentle_up_3_3.png diff --git a/resources/g2/track/intamin/small_turn_right_bank_to_gentle_up_4_1.png b/resources/g2/track/lattice_triangle/small_turn_right_bank_to_gentle_up_4_1.png similarity index 100% rename from resources/g2/track/intamin/small_turn_right_bank_to_gentle_up_4_1.png rename to resources/g2/track/lattice_triangle/small_turn_right_bank_to_gentle_up_4_1.png diff --git a/resources/g2/track/intamin/small_turn_right_bank_to_gentle_up_4_2.png b/resources/g2/track/lattice_triangle/small_turn_right_bank_to_gentle_up_4_2.png similarity index 100% rename from resources/g2/track/intamin/small_turn_right_bank_to_gentle_up_4_2.png rename to resources/g2/track/lattice_triangle/small_turn_right_bank_to_gentle_up_4_2.png diff --git a/resources/g2/track/intamin/steep_to_vertical_up_1.png b/resources/g2/track/lattice_triangle/steep_to_vertical_up_1.png similarity index 100% rename from resources/g2/track/intamin/steep_to_vertical_up_1.png rename to resources/g2/track/lattice_triangle/steep_to_vertical_up_1.png diff --git a/resources/g2/track/intamin/steep_to_vertical_up_2.png b/resources/g2/track/lattice_triangle/steep_to_vertical_up_2.png similarity index 100% rename from resources/g2/track/intamin/steep_to_vertical_up_2.png rename to resources/g2/track/lattice_triangle/steep_to_vertical_up_2.png diff --git a/resources/g2/track/intamin/steep_to_vertical_up_3.png b/resources/g2/track/lattice_triangle/steep_to_vertical_up_3.png similarity index 100% rename from resources/g2/track/intamin/steep_to_vertical_up_3.png rename to resources/g2/track/lattice_triangle/steep_to_vertical_up_3.png diff --git a/resources/g2/track/intamin/steep_to_vertical_up_4.png b/resources/g2/track/lattice_triangle/steep_to_vertical_up_4.png similarity index 100% rename from resources/g2/track/intamin/steep_to_vertical_up_4.png rename to resources/g2/track/lattice_triangle/steep_to_vertical_up_4.png diff --git a/resources/g2/track/intamin/vertical_1.png b/resources/g2/track/lattice_triangle/vertical_1.png similarity index 100% rename from resources/g2/track/intamin/vertical_1.png rename to resources/g2/track/lattice_triangle/vertical_1.png diff --git a/resources/g2/track/intamin/vertical_2.png b/resources/g2/track/lattice_triangle/vertical_2.png similarity index 100% rename from resources/g2/track/intamin/vertical_2.png rename to resources/g2/track/lattice_triangle/vertical_2.png diff --git a/resources/g2/track/intamin/vertical_3.png b/resources/g2/track/lattice_triangle/vertical_3.png similarity index 100% rename from resources/g2/track/intamin/vertical_3.png rename to resources/g2/track/lattice_triangle/vertical_3.png diff --git a/resources/g2/track/intamin/vertical_4.png b/resources/g2/track/lattice_triangle/vertical_4.png similarity index 100% rename from resources/g2/track/intamin/vertical_4.png rename to resources/g2/track/lattice_triangle/vertical_4.png diff --git a/resources/g2/track/intamin/vertical_to_steep_up_1.png b/resources/g2/track/lattice_triangle/vertical_to_steep_up_1.png similarity index 100% rename from resources/g2/track/intamin/vertical_to_steep_up_1.png rename to resources/g2/track/lattice_triangle/vertical_to_steep_up_1.png diff --git a/resources/g2/track/intamin/vertical_to_steep_up_2.png b/resources/g2/track/lattice_triangle/vertical_to_steep_up_2.png similarity index 100% rename from resources/g2/track/intamin/vertical_to_steep_up_2.png rename to resources/g2/track/lattice_triangle/vertical_to_steep_up_2.png diff --git a/resources/g2/track/intamin/vertical_to_steep_up_3.png b/resources/g2/track/lattice_triangle/vertical_to_steep_up_3.png similarity index 100% rename from resources/g2/track/intamin/vertical_to_steep_up_3.png rename to resources/g2/track/lattice_triangle/vertical_to_steep_up_3.png diff --git a/resources/g2/track/intamin/vertical_to_steep_up_4.png b/resources/g2/track/lattice_triangle/vertical_to_steep_up_4.png similarity index 100% rename from resources/g2/track/intamin/vertical_to_steep_up_4.png rename to resources/g2/track/lattice_triangle/vertical_to_steep_up_4.png diff --git a/resources/g2/track/intamin/vertical_twist_left_up_1.png b/resources/g2/track/lattice_triangle/vertical_twist_left_up_1.png similarity index 100% rename from resources/g2/track/intamin/vertical_twist_left_up_1.png rename to resources/g2/track/lattice_triangle/vertical_twist_left_up_1.png diff --git a/resources/g2/track/intamin/vertical_twist_left_up_2_1.png b/resources/g2/track/lattice_triangle/vertical_twist_left_up_2_1.png similarity index 100% rename from resources/g2/track/intamin/vertical_twist_left_up_2_1.png rename to resources/g2/track/lattice_triangle/vertical_twist_left_up_2_1.png diff --git a/resources/g2/track/intamin/vertical_twist_left_up_2_2.png b/resources/g2/track/lattice_triangle/vertical_twist_left_up_2_2.png similarity index 100% rename from resources/g2/track/intamin/vertical_twist_left_up_2_2.png rename to resources/g2/track/lattice_triangle/vertical_twist_left_up_2_2.png diff --git a/resources/g2/track/intamin/vertical_twist_left_up_3.png b/resources/g2/track/lattice_triangle/vertical_twist_left_up_3.png similarity index 100% rename from resources/g2/track/intamin/vertical_twist_left_up_3.png rename to resources/g2/track/lattice_triangle/vertical_twist_left_up_3.png diff --git a/resources/g2/track/intamin/vertical_twist_left_up_4_1.png b/resources/g2/track/lattice_triangle/vertical_twist_left_up_4_1.png similarity index 100% rename from resources/g2/track/intamin/vertical_twist_left_up_4_1.png rename to resources/g2/track/lattice_triangle/vertical_twist_left_up_4_1.png diff --git a/resources/g2/track/intamin/vertical_twist_left_up_4_2.png b/resources/g2/track/lattice_triangle/vertical_twist_left_up_4_2.png similarity index 100% rename from resources/g2/track/intamin/vertical_twist_left_up_4_2.png rename to resources/g2/track/lattice_triangle/vertical_twist_left_up_4_2.png diff --git a/resources/g2/track/intamin/vertical_twist_right_up_1_1.png b/resources/g2/track/lattice_triangle/vertical_twist_right_up_1_1.png similarity index 100% rename from resources/g2/track/intamin/vertical_twist_right_up_1_1.png rename to resources/g2/track/lattice_triangle/vertical_twist_right_up_1_1.png diff --git a/resources/g2/track/intamin/vertical_twist_right_up_1_2.png b/resources/g2/track/lattice_triangle/vertical_twist_right_up_1_2.png similarity index 100% rename from resources/g2/track/intamin/vertical_twist_right_up_1_2.png rename to resources/g2/track/lattice_triangle/vertical_twist_right_up_1_2.png diff --git a/resources/g2/track/intamin/vertical_twist_right_up_2.png b/resources/g2/track/lattice_triangle/vertical_twist_right_up_2.png similarity index 100% rename from resources/g2/track/intamin/vertical_twist_right_up_2.png rename to resources/g2/track/lattice_triangle/vertical_twist_right_up_2.png diff --git a/resources/g2/track/intamin/vertical_twist_right_up_3_1.png b/resources/g2/track/lattice_triangle/vertical_twist_right_up_3_1.png similarity index 100% rename from resources/g2/track/intamin/vertical_twist_right_up_3_1.png rename to resources/g2/track/lattice_triangle/vertical_twist_right_up_3_1.png diff --git a/resources/g2/track/intamin/vertical_twist_right_up_3_2.png b/resources/g2/track/lattice_triangle/vertical_twist_right_up_3_2.png similarity index 100% rename from resources/g2/track/intamin/vertical_twist_right_up_3_2.png rename to resources/g2/track/lattice_triangle/vertical_twist_right_up_3_2.png diff --git a/resources/g2/track/intamin/vertical_twist_right_up_4.png b/resources/g2/track/lattice_triangle/vertical_twist_right_up_4.png similarity index 100% rename from resources/g2/track/intamin/vertical_twist_right_up_4.png rename to resources/g2/track/lattice_triangle/vertical_twist_right_up_4.png diff --git a/resources/g2/track/intamin/zero_g_roll_left_1_1.png b/resources/g2/track/lattice_triangle/zero_g_roll_left_1_1.png similarity index 100% rename from resources/g2/track/intamin/zero_g_roll_left_1_1.png rename to resources/g2/track/lattice_triangle/zero_g_roll_left_1_1.png diff --git a/resources/g2/track/intamin/zero_g_roll_left_1_2.png b/resources/g2/track/lattice_triangle/zero_g_roll_left_1_2.png similarity index 100% rename from resources/g2/track/intamin/zero_g_roll_left_1_2.png rename to resources/g2/track/lattice_triangle/zero_g_roll_left_1_2.png diff --git a/resources/g2/track/intamin/zero_g_roll_left_1_3.png b/resources/g2/track/lattice_triangle/zero_g_roll_left_1_3.png similarity index 100% rename from resources/g2/track/intamin/zero_g_roll_left_1_3.png rename to resources/g2/track/lattice_triangle/zero_g_roll_left_1_3.png diff --git a/resources/g2/track/intamin/zero_g_roll_left_1_4.png b/resources/g2/track/lattice_triangle/zero_g_roll_left_1_4.png similarity index 100% rename from resources/g2/track/intamin/zero_g_roll_left_1_4.png rename to resources/g2/track/lattice_triangle/zero_g_roll_left_1_4.png diff --git a/resources/g2/track/intamin/zero_g_roll_left_2_1.png b/resources/g2/track/lattice_triangle/zero_g_roll_left_2_1.png similarity index 100% rename from resources/g2/track/intamin/zero_g_roll_left_2_1.png rename to resources/g2/track/lattice_triangle/zero_g_roll_left_2_1.png diff --git a/resources/g2/track/intamin/zero_g_roll_left_2_2.png b/resources/g2/track/lattice_triangle/zero_g_roll_left_2_2.png similarity index 100% rename from resources/g2/track/intamin/zero_g_roll_left_2_2.png rename to resources/g2/track/lattice_triangle/zero_g_roll_left_2_2.png diff --git a/resources/g2/track/intamin/zero_g_roll_left_2_3.png b/resources/g2/track/lattice_triangle/zero_g_roll_left_2_3.png similarity index 100% rename from resources/g2/track/intamin/zero_g_roll_left_2_3.png rename to resources/g2/track/lattice_triangle/zero_g_roll_left_2_3.png diff --git a/resources/g2/track/intamin/zero_g_roll_left_2_4.png b/resources/g2/track/lattice_triangle/zero_g_roll_left_2_4.png similarity index 100% rename from resources/g2/track/intamin/zero_g_roll_left_2_4.png rename to resources/g2/track/lattice_triangle/zero_g_roll_left_2_4.png diff --git a/resources/g2/track/intamin/zero_g_roll_left_3_1.png b/resources/g2/track/lattice_triangle/zero_g_roll_left_3_1.png similarity index 100% rename from resources/g2/track/intamin/zero_g_roll_left_3_1.png rename to resources/g2/track/lattice_triangle/zero_g_roll_left_3_1.png diff --git a/resources/g2/track/intamin/zero_g_roll_left_3_2.png b/resources/g2/track/lattice_triangle/zero_g_roll_left_3_2.png similarity index 100% rename from resources/g2/track/intamin/zero_g_roll_left_3_2.png rename to resources/g2/track/lattice_triangle/zero_g_roll_left_3_2.png diff --git a/resources/g2/track/intamin/zero_g_roll_left_3_3.png b/resources/g2/track/lattice_triangle/zero_g_roll_left_3_3.png similarity index 100% rename from resources/g2/track/intamin/zero_g_roll_left_3_3.png rename to resources/g2/track/lattice_triangle/zero_g_roll_left_3_3.png diff --git a/resources/g2/track/intamin/zero_g_roll_left_3_4.png b/resources/g2/track/lattice_triangle/zero_g_roll_left_3_4.png similarity index 100% rename from resources/g2/track/intamin/zero_g_roll_left_3_4.png rename to resources/g2/track/lattice_triangle/zero_g_roll_left_3_4.png diff --git a/resources/g2/track/intamin/zero_g_roll_left_4_1.png b/resources/g2/track/lattice_triangle/zero_g_roll_left_4_1.png similarity index 100% rename from resources/g2/track/intamin/zero_g_roll_left_4_1.png rename to resources/g2/track/lattice_triangle/zero_g_roll_left_4_1.png diff --git a/resources/g2/track/intamin/zero_g_roll_left_4_2.png b/resources/g2/track/lattice_triangle/zero_g_roll_left_4_2.png similarity index 100% rename from resources/g2/track/intamin/zero_g_roll_left_4_2.png rename to resources/g2/track/lattice_triangle/zero_g_roll_left_4_2.png diff --git a/resources/g2/track/intamin/zero_g_roll_left_4_3.png b/resources/g2/track/lattice_triangle/zero_g_roll_left_4_3.png similarity index 100% rename from resources/g2/track/intamin/zero_g_roll_left_4_3.png rename to resources/g2/track/lattice_triangle/zero_g_roll_left_4_3.png diff --git a/resources/g2/track/intamin/zero_g_roll_left_4_4.png b/resources/g2/track/lattice_triangle/zero_g_roll_left_4_4.png similarity index 100% rename from resources/g2/track/intamin/zero_g_roll_left_4_4.png rename to resources/g2/track/lattice_triangle/zero_g_roll_left_4_4.png diff --git a/resources/g2/track/intamin/zero_g_roll_right_1_1.png b/resources/g2/track/lattice_triangle/zero_g_roll_right_1_1.png similarity index 100% rename from resources/g2/track/intamin/zero_g_roll_right_1_1.png rename to resources/g2/track/lattice_triangle/zero_g_roll_right_1_1.png diff --git a/resources/g2/track/intamin/zero_g_roll_right_1_2.png b/resources/g2/track/lattice_triangle/zero_g_roll_right_1_2.png similarity index 100% rename from resources/g2/track/intamin/zero_g_roll_right_1_2.png rename to resources/g2/track/lattice_triangle/zero_g_roll_right_1_2.png diff --git a/resources/g2/track/intamin/zero_g_roll_right_1_3.png b/resources/g2/track/lattice_triangle/zero_g_roll_right_1_3.png similarity index 100% rename from resources/g2/track/intamin/zero_g_roll_right_1_3.png rename to resources/g2/track/lattice_triangle/zero_g_roll_right_1_3.png diff --git a/resources/g2/track/intamin/zero_g_roll_right_1_4.png b/resources/g2/track/lattice_triangle/zero_g_roll_right_1_4.png similarity index 100% rename from resources/g2/track/intamin/zero_g_roll_right_1_4.png rename to resources/g2/track/lattice_triangle/zero_g_roll_right_1_4.png diff --git a/resources/g2/track/intamin/zero_g_roll_right_2_1.png b/resources/g2/track/lattice_triangle/zero_g_roll_right_2_1.png similarity index 100% rename from resources/g2/track/intamin/zero_g_roll_right_2_1.png rename to resources/g2/track/lattice_triangle/zero_g_roll_right_2_1.png diff --git a/resources/g2/track/intamin/zero_g_roll_right_2_2.png b/resources/g2/track/lattice_triangle/zero_g_roll_right_2_2.png similarity index 100% rename from resources/g2/track/intamin/zero_g_roll_right_2_2.png rename to resources/g2/track/lattice_triangle/zero_g_roll_right_2_2.png diff --git a/resources/g2/track/intamin/zero_g_roll_right_2_3.png b/resources/g2/track/lattice_triangle/zero_g_roll_right_2_3.png similarity index 100% rename from resources/g2/track/intamin/zero_g_roll_right_2_3.png rename to resources/g2/track/lattice_triangle/zero_g_roll_right_2_3.png diff --git a/resources/g2/track/intamin/zero_g_roll_right_2_4.png b/resources/g2/track/lattice_triangle/zero_g_roll_right_2_4.png similarity index 100% rename from resources/g2/track/intamin/zero_g_roll_right_2_4.png rename to resources/g2/track/lattice_triangle/zero_g_roll_right_2_4.png diff --git a/resources/g2/track/intamin/zero_g_roll_right_3_1.png b/resources/g2/track/lattice_triangle/zero_g_roll_right_3_1.png similarity index 100% rename from resources/g2/track/intamin/zero_g_roll_right_3_1.png rename to resources/g2/track/lattice_triangle/zero_g_roll_right_3_1.png diff --git a/resources/g2/track/intamin/zero_g_roll_right_3_2.png b/resources/g2/track/lattice_triangle/zero_g_roll_right_3_2.png similarity index 100% rename from resources/g2/track/intamin/zero_g_roll_right_3_2.png rename to resources/g2/track/lattice_triangle/zero_g_roll_right_3_2.png diff --git a/resources/g2/track/intamin/zero_g_roll_right_3_3.png b/resources/g2/track/lattice_triangle/zero_g_roll_right_3_3.png similarity index 100% rename from resources/g2/track/intamin/zero_g_roll_right_3_3.png rename to resources/g2/track/lattice_triangle/zero_g_roll_right_3_3.png diff --git a/resources/g2/track/intamin/zero_g_roll_right_3_4.png b/resources/g2/track/lattice_triangle/zero_g_roll_right_3_4.png similarity index 100% rename from resources/g2/track/intamin/zero_g_roll_right_3_4.png rename to resources/g2/track/lattice_triangle/zero_g_roll_right_3_4.png diff --git a/resources/g2/track/intamin/zero_g_roll_right_4_1.png b/resources/g2/track/lattice_triangle/zero_g_roll_right_4_1.png similarity index 100% rename from resources/g2/track/intamin/zero_g_roll_right_4_1.png rename to resources/g2/track/lattice_triangle/zero_g_roll_right_4_1.png diff --git a/resources/g2/track/intamin/zero_g_roll_right_4_2.png b/resources/g2/track/lattice_triangle/zero_g_roll_right_4_2.png similarity index 100% rename from resources/g2/track/intamin/zero_g_roll_right_4_2.png rename to resources/g2/track/lattice_triangle/zero_g_roll_right_4_2.png diff --git a/resources/g2/track/intamin/zero_g_roll_right_4_3.png b/resources/g2/track/lattice_triangle/zero_g_roll_right_4_3.png similarity index 100% rename from resources/g2/track/intamin/zero_g_roll_right_4_3.png rename to resources/g2/track/lattice_triangle/zero_g_roll_right_4_3.png diff --git a/resources/g2/track/intamin/zero_g_roll_right_4_4.png b/resources/g2/track/lattice_triangle/zero_g_roll_right_4_4.png similarity index 100% rename from resources/g2/track/intamin/zero_g_roll_right_4_4.png rename to resources/g2/track/lattice_triangle/zero_g_roll_right_4_4.png diff --git a/src/openrct2/libopenrct2.vcxproj b/src/openrct2/libopenrct2.vcxproj index c49d825ee9..1962ee3889 100644 --- a/src/openrct2/libopenrct2.vcxproj +++ b/src/openrct2/libopenrct2.vcxproj @@ -898,7 +898,7 @@ - + diff --git a/src/openrct2/paint/track/coaster/GigaCoaster.cpp b/src/openrct2/paint/track/coaster/LatticeTriangleTrack.cpp similarity index 85% rename from src/openrct2/paint/track/coaster/GigaCoaster.cpp rename to src/openrct2/paint/track/coaster/LatticeTriangleTrack.cpp index 663f92c7f3..02f1b256b7 100644 --- a/src/openrct2/paint/track/coaster/GigaCoaster.cpp +++ b/src/openrct2/paint/track/coaster/LatticeTriangleTrack.cpp @@ -26,69 +26,69 @@ using namespace OpenRCT2; static constexpr MetalSupportType kSupportType = MetalSupportType::Tubes; // Closed block brakes and regular brakes use the same images -static constexpr uint32_t GIGA_COASTER_BRAKE_SW_NE_OPEN_1 = 18076; -static constexpr uint32_t GIGA_COASTER_BRAKE_NW_SE_OPEN_1 = 18077; -static constexpr uint32_t GIGA_COASTER_BRAKE_SW_NE_CLOSED_1 = 18078; -static constexpr uint32_t GIGA_COASTER_BRAKE_NW_SE_CLOSED_1 = 18079; -static constexpr uint32_t GIGA_COASTER_BRAKE_SW_NE_OPEN_2 = 18080; -static constexpr uint32_t GIGA_COASTER_BRAKE_NW_SE_OPEN_2 = 18081; -static constexpr uint32_t GIGA_COASTER_BRAKE_SW_NE_CLOSED_2 = 18082; -static constexpr uint32_t GIGA_COASTER_BRAKE_NW_SE_CLOSED_2 = 18083; +static constexpr uint32_t LATTICE_TRIANGLE_BRAKE_SW_NE_OPEN_1 = 18076; +static constexpr uint32_t LATTICE_TRIANGLE_BRAKE_NW_SE_OPEN_1 = 18077; +static constexpr uint32_t LATTICE_TRIANGLE_BRAKE_SW_NE_CLOSED_1 = 18078; +static constexpr uint32_t LATTICE_TRIANGLE_BRAKE_NW_SE_CLOSED_1 = 18079; +static constexpr uint32_t LATTICE_TRIANGLE_BRAKE_SW_NE_OPEN_2 = 18080; +static constexpr uint32_t LATTICE_TRIANGLE_BRAKE_NW_SE_OPEN_2 = 18081; +static constexpr uint32_t LATTICE_TRIANGLE_BRAKE_SW_NE_CLOSED_2 = 18082; +static constexpr uint32_t LATTICE_TRIANGLE_BRAKE_NW_SE_CLOSED_2 = 18083; -static constexpr uint32_t _GigaCoasterBrakeImages[kNumOrthogonalDirections][2][2] = { - { { GIGA_COASTER_BRAKE_SW_NE_OPEN_1, GIGA_COASTER_BRAKE_SW_NE_OPEN_2 }, - { GIGA_COASTER_BRAKE_SW_NE_CLOSED_1, GIGA_COASTER_BRAKE_SW_NE_CLOSED_2 } }, - { { GIGA_COASTER_BRAKE_NW_SE_OPEN_1, GIGA_COASTER_BRAKE_NW_SE_OPEN_2 }, - { GIGA_COASTER_BRAKE_NW_SE_CLOSED_1, GIGA_COASTER_BRAKE_NW_SE_CLOSED_2 } }, - { { GIGA_COASTER_BRAKE_SW_NE_OPEN_1, GIGA_COASTER_BRAKE_SW_NE_OPEN_2 }, - { GIGA_COASTER_BRAKE_SW_NE_CLOSED_1, GIGA_COASTER_BRAKE_SW_NE_CLOSED_2 } }, - { { GIGA_COASTER_BRAKE_NW_SE_OPEN_1, GIGA_COASTER_BRAKE_NW_SE_OPEN_2 }, - { GIGA_COASTER_BRAKE_NW_SE_CLOSED_1, GIGA_COASTER_BRAKE_NW_SE_CLOSED_2 } }, +static constexpr uint32_t _LatticeTriangleBrakeImages[kNumOrthogonalDirections][2][2] = { + { { LATTICE_TRIANGLE_BRAKE_SW_NE_OPEN_1, LATTICE_TRIANGLE_BRAKE_SW_NE_OPEN_2 }, + { LATTICE_TRIANGLE_BRAKE_SW_NE_CLOSED_1, LATTICE_TRIANGLE_BRAKE_SW_NE_CLOSED_2 } }, + { { LATTICE_TRIANGLE_BRAKE_NW_SE_OPEN_1, LATTICE_TRIANGLE_BRAKE_NW_SE_OPEN_2 }, + { LATTICE_TRIANGLE_BRAKE_NW_SE_CLOSED_1, LATTICE_TRIANGLE_BRAKE_NW_SE_CLOSED_2 } }, + { { LATTICE_TRIANGLE_BRAKE_SW_NE_OPEN_1, LATTICE_TRIANGLE_BRAKE_SW_NE_OPEN_2 }, + { LATTICE_TRIANGLE_BRAKE_SW_NE_CLOSED_1, LATTICE_TRIANGLE_BRAKE_SW_NE_CLOSED_2 } }, + { { LATTICE_TRIANGLE_BRAKE_NW_SE_OPEN_1, LATTICE_TRIANGLE_BRAKE_NW_SE_OPEN_2 }, + { LATTICE_TRIANGLE_BRAKE_NW_SE_CLOSED_1, LATTICE_TRIANGLE_BRAKE_NW_SE_CLOSED_2 } }, }; /* first level : open, closed * second level: background, foreground * third level: direction */ -static constexpr uint32_t GigaDiagBrakeImages[2][2][kNumOrthogonalDirections] = { +static constexpr uint32_t LatticeTriangleBrakeImages[2][2][kNumOrthogonalDirections] = { { // Open { // Background - SPR_G2_GIGA_RC_DIAG_BRAKES, - SPR_G2_GIGA_RC_DIAG_BRAKES + 3, - SPR_G2_GIGA_RC_DIAG_BRAKES, - SPR_G2_GIGA_RC_DIAG_BRAKES + 3, + SPR_G2_LATTICE_TRIANGLE_TRACK_DIAG_BRAKES, + SPR_G2_LATTICE_TRIANGLE_TRACK_DIAG_BRAKES + 3, + SPR_G2_LATTICE_TRIANGLE_TRACK_DIAG_BRAKES, + SPR_G2_LATTICE_TRIANGLE_TRACK_DIAG_BRAKES + 3, }, { // Foreground - SPR_G2_GIGA_RC_DIAG_BRAKES + 2, - SPR_G2_GIGA_RC_DIAG_BRAKES + 4, - SPR_G2_GIGA_RC_DIAG_BRAKES + 2, - SPR_G2_GIGA_RC_DIAG_BRAKES + 4, + SPR_G2_LATTICE_TRIANGLE_TRACK_DIAG_BRAKES + 2, + SPR_G2_LATTICE_TRIANGLE_TRACK_DIAG_BRAKES + 4, + SPR_G2_LATTICE_TRIANGLE_TRACK_DIAG_BRAKES + 2, + SPR_G2_LATTICE_TRIANGLE_TRACK_DIAG_BRAKES + 4, }, }, { // Closed { // Background - SPR_G2_GIGA_RC_DIAG_BRAKES + 1, - SPR_G2_GIGA_RC_DIAG_BRAKES + 3, - SPR_G2_GIGA_RC_DIAG_BRAKES + 1, - SPR_G2_GIGA_RC_DIAG_BRAKES + 3, + SPR_G2_LATTICE_TRIANGLE_TRACK_DIAG_BRAKES + 1, + SPR_G2_LATTICE_TRIANGLE_TRACK_DIAG_BRAKES + 3, + SPR_G2_LATTICE_TRIANGLE_TRACK_DIAG_BRAKES + 1, + SPR_G2_LATTICE_TRIANGLE_TRACK_DIAG_BRAKES + 3, }, { // Foreground - SPR_G2_GIGA_RC_DIAG_BRAKES + 2, - SPR_G2_GIGA_RC_DIAG_BRAKES + 5, - SPR_G2_GIGA_RC_DIAG_BRAKES + 2, - SPR_G2_GIGA_RC_DIAG_BRAKES + 5, + SPR_G2_LATTICE_TRIANGLE_TRACK_DIAG_BRAKES + 2, + SPR_G2_LATTICE_TRIANGLE_TRACK_DIAG_BRAKES + 5, + SPR_G2_LATTICE_TRIANGLE_TRACK_DIAG_BRAKES + 2, + SPR_G2_LATTICE_TRIANGLE_TRACK_DIAG_BRAKES + 5, }, }, }; /** rct2: 0x008AD674 */ -static void GigaRCTrackFlat( +static void LatticeTriangleTrackFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -171,7 +171,7 @@ static void GigaRCTrackFlat( PaintUtilSetGeneralSupportHeight(session, height + kDefaultGeneralSupportHeight); } -static void GigaRCTrackStation( +static void LatticeTriangleTrackStation( PaintSession& session, const Ride& ride, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -186,7 +186,7 @@ static void GigaRCTrackStation( { bool isClosed = trackElement.IsBrakeClosed(); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(_GigaCoasterBrakeImages[direction][isClosed][0]), + session, direction, session.TrackColours.WithIndex(_LatticeTriangleBrakeImages[direction][isClosed][0]), { 0, 0, height }, { { 0, 6, height + 3 }, { 32, 20, 1 } }); } else @@ -206,7 +206,7 @@ static void GigaRCTrackStation( } /** rct2: 0x008AD684 */ -static void GigaRCTrack25DegUp( +static void LatticeTriangleTrack25DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -313,7 +313,7 @@ static void GigaRCTrack25DegUp( } /** rct2: 0x008AD694 */ -static void GigaRCTrack60DegUp( +static void LatticeTriangleTrack60DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -390,7 +390,7 @@ static void GigaRCTrack60DegUp( } /** rct2: 0x008AD6A4 */ -static void GigaRCTrackFlatTo25DegUp( +static void LatticeTriangleTrackFlatTo25DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -497,7 +497,7 @@ static void GigaRCTrackFlatTo25DegUp( } /** rct2: 0x008AD6B4 */ -static void GigaRCTrack25DegUpTo60DegUp( +static void LatticeTriangleTrack25DegUpTo60DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -586,7 +586,7 @@ static void GigaRCTrack25DegUpTo60DegUp( } /** rct2: 0x008AD6C4 */ -static void GigaRCTrack60DegUpTo25DegUp( +static void LatticeTriangleTrack60DegUpTo25DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -675,7 +675,7 @@ static void GigaRCTrack60DegUpTo25DegUp( } /** rct2: 0x008AD6D4 */ -static void GigaRCTrack25DegUpToFlat( +static void LatticeTriangleTrack25DegUpToFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -782,55 +782,55 @@ static void GigaRCTrack25DegUpToFlat( } /** rct2: 0x008AD6E4 */ -static void GigaRCTrack25DegDown( +static void LatticeTriangleTrack25DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrack25DegUp(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrack25DegUp(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); } /** rct2: 0x008AD6F4 */ -static void GigaRCTrack60DegDown( +static void LatticeTriangleTrack60DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrack60DegUp(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrack60DegUp(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); } /** rct2: 0x008AD704 */ -static void GigaRCTrackFlatTo25DegDown( +static void LatticeTriangleTrackFlatTo25DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrack25DegUpToFlat(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrack25DegUpToFlat(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); } /** rct2: 0x008AD714 */ -static void GigaRCTrack25DegDownTo60DegDown( +static void LatticeTriangleTrack25DegDownTo60DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrack60DegUpTo25DegUp(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrack60DegUpTo25DegUp(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); } /** rct2: 0x008AD724 */ -static void GigaRCTrack60DegDownTo25DegDown( +static void LatticeTriangleTrack60DegDownTo25DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrack25DegUpTo60DegUp(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrack25DegUpTo60DegUp(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); } /** rct2: 0x008AD734 */ -static void GigaRCTrack25DegDownToFlat( +static void LatticeTriangleTrack25DegDownToFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackFlatTo25DegUp(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackFlatTo25DegUp(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); } /** rct2: 0x008AD744 */ -static void GigaRCTrackLeftQuarterTurn5( +static void LatticeTriangleTrackLeftQuarterTurn5( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -1031,16 +1031,16 @@ static void GigaRCTrackLeftQuarterTurn5( } /** rct2: 0x008AD754 */ -static void GigaRCTrackRightQuarterTurn5( +static void LatticeTriangleTrackRightQuarterTurn5( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { trackSequence = kMapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; - GigaRCTrackLeftQuarterTurn5(session, ride, trackSequence, (direction - 1) & 3, height, trackElement); + LatticeTriangleTrackLeftQuarterTurn5(session, ride, trackSequence, (direction - 1) & 3, height, trackElement); } /** rct2: 0x008AD764 */ -static void GigaRCTrackFlatToLeftBank( +static void LatticeTriangleTrackFlatToLeftBank( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -1083,7 +1083,7 @@ static void GigaRCTrackFlatToLeftBank( } /** rct2: 0x008AD774 */ -static void GigaRCTrackFlatToRightBank( +static void LatticeTriangleTrackFlatToRightBank( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -1126,7 +1126,7 @@ static void GigaRCTrackFlatToRightBank( } /** rct2: 0x008AD784 */ -static void GigaRCTrackLeftBankToFlat( +static void LatticeTriangleTrackLeftBankToFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -1169,7 +1169,7 @@ static void GigaRCTrackLeftBankToFlat( } /** rct2: 0x008AD794 */ -static void GigaRCTrackRightBankToFlat( +static void LatticeTriangleTrackRightBankToFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -1212,7 +1212,7 @@ static void GigaRCTrackRightBankToFlat( } /** rct2: 0x008AD7A4 */ -static void GigaRCTrackBankedLeftQuarterTurn5( +static void LatticeTriangleTrackBankedLeftQuarterTurn5( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -1419,16 +1419,16 @@ static void GigaRCTrackBankedLeftQuarterTurn5( } /** rct2: 0x008AD7B4 */ -static void GigaRCTrackBankedRightQuarterTurn5( +static void LatticeTriangleTrackBankedRightQuarterTurn5( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { trackSequence = kMapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; - GigaRCTrackBankedLeftQuarterTurn5(session, ride, trackSequence, (direction - 1) & 3, height, trackElement); + LatticeTriangleTrackBankedLeftQuarterTurn5(session, ride, trackSequence, (direction - 1) & 3, height, trackElement); } /** rct2: 0x008AD7C4 */ -static void GigaRCTrackLeftBankTo25DegUp( +static void LatticeTriangleTrackLeftBankTo25DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -1478,7 +1478,7 @@ static void GigaRCTrackLeftBankTo25DegUp( } /** rct2: 0x008AD7D4 */ -static void GigaRCTrackRightBankTo25DegUp( +static void LatticeTriangleTrackRightBankTo25DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -1528,7 +1528,7 @@ static void GigaRCTrackRightBankTo25DegUp( } /** rct2: 0x008AD7E4 */ -static void GigaRCTrack25DegUpToLeftBank( +static void LatticeTriangleTrack25DegUpToLeftBank( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -1578,7 +1578,7 @@ static void GigaRCTrack25DegUpToLeftBank( } /** rct2: 0x008AD7F4 */ -static void GigaRCTrack25DegUpToRightBank( +static void LatticeTriangleTrack25DegUpToRightBank( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -1628,39 +1628,39 @@ static void GigaRCTrack25DegUpToRightBank( } /** rct2: 0x008AD804 */ -static void GigaRCTrackLeftBankTo25DegDown( +static void LatticeTriangleTrackLeftBankTo25DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrack25DegUpToRightBank(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrack25DegUpToRightBank(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); } /** rct2: 0x008AD814 */ -static void GigaRCTrackRightBankTo25DegDown( +static void LatticeTriangleTrackRightBankTo25DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrack25DegUpToLeftBank(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrack25DegUpToLeftBank(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); } /** rct2: 0x008AD824 */ -static void GigaRCTrack25DegDownToLeftBank( +static void LatticeTriangleTrack25DegDownToLeftBank( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackRightBankTo25DegUp(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackRightBankTo25DegUp(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); } /** rct2: 0x008AD834 */ -static void GigaRCTrack25DegDownToRightBank( +static void LatticeTriangleTrack25DegDownToRightBank( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackLeftBankTo25DegUp(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackLeftBankTo25DegUp(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); } /** rct2: 0x008AD844 */ -static void GigaRCTrackLeftBank( +static void LatticeTriangleTrackLeftBank( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -1697,15 +1697,15 @@ static void GigaRCTrackLeftBank( } /** rct2: 0x008AD854 */ -static void GigaRCTrackRightBank( +static void LatticeTriangleTrackRightBank( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackLeftBank(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackLeftBank(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); } /** rct2: 0x008AD864 */ -static void GigaRCTrackLeftQuarterTurn525DegUp( +static void LatticeTriangleTrackLeftQuarterTurn525DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -1901,7 +1901,7 @@ static void GigaRCTrackLeftQuarterTurn525DegUp( } /** rct2: 0x008AD874 */ -static void GigaRCTrackRightQuarterTurn525DegUp( +static void LatticeTriangleTrackRightQuarterTurn525DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -2096,25 +2096,25 @@ static void GigaRCTrackRightQuarterTurn525DegUp( } /** rct2: 0x008AD884 */ -static void GigaRCTrackLeftQuarterTurn525DegDown( +static void LatticeTriangleTrackLeftQuarterTurn525DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { trackSequence = kMapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; - GigaRCTrackRightQuarterTurn525DegUp(session, ride, trackSequence, (direction + 1) & 3, height, trackElement); + LatticeTriangleTrackRightQuarterTurn525DegUp(session, ride, trackSequence, (direction + 1) & 3, height, trackElement); } /** rct2: 0x008AD894 */ -static void GigaRCTrackRightQuarterTurn525DegDown( +static void LatticeTriangleTrackRightQuarterTurn525DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { trackSequence = kMapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; - GigaRCTrackLeftQuarterTurn525DegUp(session, ride, trackSequence, (direction - 1) & 3, height, trackElement); + LatticeTriangleTrackLeftQuarterTurn525DegUp(session, ride, trackSequence, (direction - 1) & 3, height, trackElement); } /** rct2: 0x008AD8A4 */ -static void GigaRCTrackSBendLeft( +static void LatticeTriangleTrackSBendLeft( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -2279,7 +2279,7 @@ static void GigaRCTrackSBendLeft( } /** rct2: 0x008AD8B4 */ -static void GigaRCTrackSBendRight( +static void LatticeTriangleTrackSBendRight( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -2444,7 +2444,7 @@ static void GigaRCTrackSBendRight( } /** rct2: 0x008AD8F4 */ -static void GigaRCTrackLeftQuarterTurn3( +static void LatticeTriangleTrackLeftQuarterTurn3( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -2574,16 +2574,16 @@ static void GigaRCTrackLeftQuarterTurn3( } /** rct2: 0x008AD904 */ -static void GigaRCTrackRightQuarterTurn3( +static void LatticeTriangleTrackRightQuarterTurn3( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { trackSequence = kMapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; - GigaRCTrackLeftQuarterTurn3(session, ride, trackSequence, (direction - 1) & 3, height, trackElement); + LatticeTriangleTrackLeftQuarterTurn3(session, ride, trackSequence, (direction - 1) & 3, height, trackElement); } /** rct2: 0x008AD914 */ -static void GigaRCTrackLeftQuarterTurn3Bank( +static void LatticeTriangleTrackLeftQuarterTurn3Bank( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -2719,16 +2719,16 @@ static void GigaRCTrackLeftQuarterTurn3Bank( } /** rct2: 0x008AD924 */ -static void GigaRCTrackRightQuarterTurn3Bank( +static void LatticeTriangleTrackRightQuarterTurn3Bank( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { trackSequence = kMapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; - GigaRCTrackLeftQuarterTurn3Bank(session, ride, trackSequence, (direction - 1) & 3, height, trackElement); + LatticeTriangleTrackLeftQuarterTurn3Bank(session, ride, trackSequence, (direction - 1) & 3, height, trackElement); } /** rct2: 0x008AD934 */ -static void GigaRCTrackLeftQuarterTurn325DegUp( +static void LatticeTriangleTrackLeftQuarterTurn325DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -2819,7 +2819,7 @@ static void GigaRCTrackLeftQuarterTurn325DegUp( } /** rct2: 0x008AD944 */ -static void GigaRCTrackRightQuarterTurn325DegUp( +static void LatticeTriangleTrackRightQuarterTurn325DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -2917,25 +2917,25 @@ static void GigaRCTrackRightQuarterTurn325DegUp( } /** rct2: 0x008AD954 */ -static void GigaRCTrackLeftQuarterTurn325DegDown( +static void LatticeTriangleTrackLeftQuarterTurn325DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { trackSequence = kMapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; - GigaRCTrackRightQuarterTurn325DegUp(session, ride, trackSequence, (direction + 1) & 3, height, trackElement); + LatticeTriangleTrackRightQuarterTurn325DegUp(session, ride, trackSequence, (direction + 1) & 3, height, trackElement); } /** rct2: 0x008AD964 */ -static void GigaRCTrackRightQuarterTurn325DegDown( +static void LatticeTriangleTrackRightQuarterTurn325DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { trackSequence = kMapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; - GigaRCTrackLeftQuarterTurn325DegUp(session, ride, trackSequence, (direction - 1) & 3, height, trackElement); + LatticeTriangleTrackLeftQuarterTurn325DegUp(session, ride, trackSequence, (direction - 1) & 3, height, trackElement); } /** rct2: 0x008AD974 */ -static void GigaRCTrackLeftHalfBankedHelixUpSmall( +static void LatticeTriangleTrackLeftHalfBankedHelixUpSmall( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -3197,7 +3197,7 @@ static void GigaRCTrackLeftHalfBankedHelixUpSmall( } /** rct2: 0x008AD984 */ -static void GigaRCTrackRightHalfBankedHelixUpSmall( +static void LatticeTriangleTrackRightHalfBankedHelixUpSmall( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -3459,7 +3459,7 @@ static void GigaRCTrackRightHalfBankedHelixUpSmall( } /** rct2: 0x008AD994 */ -static void GigaRCTrackLeftHalfBankedHelixDownSmall( +static void LatticeTriangleTrackLeftHalfBankedHelixDownSmall( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -3469,11 +3469,11 @@ static void GigaRCTrackLeftHalfBankedHelixDownSmall( direction = (direction - 1) & 3; } trackSequence = kMapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; - GigaRCTrackRightHalfBankedHelixUpSmall(session, ride, trackSequence, (direction + 1) & 3, height, trackElement); + LatticeTriangleTrackRightHalfBankedHelixUpSmall(session, ride, trackSequence, (direction + 1) & 3, height, trackElement); } /** rct2: 0x008AD9A4 */ -static void GigaRCTrackRightHalfBankedHelixDownSmall( +static void LatticeTriangleTrackRightHalfBankedHelixDownSmall( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -3483,11 +3483,11 @@ static void GigaRCTrackRightHalfBankedHelixDownSmall( direction = (direction + 1) & 3; } trackSequence = kMapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; - GigaRCTrackLeftHalfBankedHelixUpSmall(session, ride, trackSequence, (direction - 1) & 3, height, trackElement); + LatticeTriangleTrackLeftHalfBankedHelixUpSmall(session, ride, trackSequence, (direction - 1) & 3, height, trackElement); } /** rct2: 0x008AD9B4 */ -static void GigaRCTrackLeftHalfBankedHelixUpLarge( +static void LatticeTriangleTrackLeftHalfBankedHelixUpLarge( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -3890,7 +3890,7 @@ static void GigaRCTrackLeftHalfBankedHelixUpLarge( } /** rct2: 0x008AD9C4 */ -static void GigaRCTrackRightHalfBankedHelixUpLarge( +static void LatticeTriangleTrackRightHalfBankedHelixUpLarge( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -4307,7 +4307,7 @@ static void GigaRCTrackRightHalfBankedHelixUpLarge( } /** rct2: 0x008AD9D4 */ -static void GigaRCTrackLeftHalfBankedHelixDownLarge( +static void LatticeTriangleTrackLeftHalfBankedHelixDownLarge( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -4317,11 +4317,11 @@ static void GigaRCTrackLeftHalfBankedHelixDownLarge( direction = (direction - 1) & 3; } trackSequence = kMapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; - GigaRCTrackRightHalfBankedHelixUpLarge(session, ride, trackSequence, (direction + 1) & 3, height, trackElement); + LatticeTriangleTrackRightHalfBankedHelixUpLarge(session, ride, trackSequence, (direction + 1) & 3, height, trackElement); } /** rct2: 0x008AD9E4 */ -static void GigaRCTrackRightHalfBankedHelixDownLarge( +static void LatticeTriangleTrackRightHalfBankedHelixDownLarge( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -4331,11 +4331,11 @@ static void GigaRCTrackRightHalfBankedHelixDownLarge( direction = (direction + 1) & 3; } trackSequence = kMapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; - GigaRCTrackLeftHalfBankedHelixUpLarge(session, ride, trackSequence, (direction - 1) & 3, height, trackElement); + LatticeTriangleTrackLeftHalfBankedHelixUpLarge(session, ride, trackSequence, (direction - 1) & 3, height, trackElement); } /** rct2: 0x008ADA14 */ -static void GigaRCTrackLeftQuarterTurn160DegUp( +static void LatticeTriangleTrackLeftQuarterTurn160DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -4381,7 +4381,7 @@ static void GigaRCTrackLeftQuarterTurn160DegUp( } /** rct2: 0x008AD9F4 */ -static void GigaRCTrackRightQuarterTurn160DegUp( +static void LatticeTriangleTrackRightQuarterTurn160DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -4427,23 +4427,23 @@ static void GigaRCTrackRightQuarterTurn160DegUp( } /** rct2: 0x008ADA04 */ -static void GigaRCTrackLeftQuarterTurn160DegDown( +static void LatticeTriangleTrackLeftQuarterTurn160DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackRightQuarterTurn160DegUp(session, ride, trackSequence, (direction + 1) & 3, height, trackElement); + LatticeTriangleTrackRightQuarterTurn160DegUp(session, ride, trackSequence, (direction + 1) & 3, height, trackElement); } /** rct2: 0x008ADA24 */ -static void GigaRCTrackRightQuarterTurn160DegDown( +static void LatticeTriangleTrackRightQuarterTurn160DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackLeftQuarterTurn160DegUp(session, ride, trackSequence, (direction - 1) & 3, height, trackElement); + LatticeTriangleTrackLeftQuarterTurn160DegUp(session, ride, trackSequence, (direction - 1) & 3, height, trackElement); } /** rct2: 0x008ADA34 */ -static void GigaRCTrackBrakes( +static void LatticeTriangleTrackBrakes( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -4452,19 +4452,19 @@ static void GigaRCTrackBrakes( case 0: case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(GIGA_COASTER_BRAKE_SW_NE_CLOSED_1), { 0, 0, height }, + session, direction, session.TrackColours.WithIndex(LATTICE_TRIANGLE_BRAKE_SW_NE_CLOSED_1), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(GIGA_COASTER_BRAKE_SW_NE_CLOSED_2), { 0, 0, height }, + session, direction, session.TrackColours.WithIndex(LATTICE_TRIANGLE_BRAKE_SW_NE_CLOSED_2), { 0, 0, height }, { { 0, 27, height + 5 }, { 32, 1, 11 } }); break; case 1: case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(GIGA_COASTER_BRAKE_NW_SE_CLOSED_1), { 0, 0, height }, + session, direction, session.TrackColours.WithIndex(LATTICE_TRIANGLE_BRAKE_NW_SE_CLOSED_1), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(GIGA_COASTER_BRAKE_NW_SE_CLOSED_2), { 0, 0, height }, + session, direction, session.TrackColours.WithIndex(LATTICE_TRIANGLE_BRAKE_NW_SE_CLOSED_2), { 0, 0, height }, { { 0, 27, height + 5 }, { 32, 1, 11 } }); break; } @@ -4478,7 +4478,7 @@ static void GigaRCTrackBrakes( } /** rct2: 0x008ADC84 */ -static void GigaRCTrack25DegUpLeftBanked( +static void LatticeTriangleTrack25DegUpLeftBanked( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -4522,7 +4522,7 @@ static void GigaRCTrack25DegUpLeftBanked( } /** rct2: 0x008ADC94 */ -static void GigaRCTrack25DegUpRightBanked( +static void LatticeTriangleTrack25DegUpRightBanked( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -4566,7 +4566,7 @@ static void GigaRCTrack25DegUpRightBanked( } /** rct2: 0x008ADA44 */ -static void GigaRCTrackOnRidePhoto( +static void LatticeTriangleTrackOnRidePhoto( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -4602,23 +4602,23 @@ static void GigaRCTrackOnRidePhoto( } /** rct2: 0x008ADCA4 */ -static void GigaRCTrack25DegDownLeftBanked( +static void LatticeTriangleTrack25DegDownLeftBanked( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrack25DegUpRightBanked(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrack25DegUpRightBanked(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); } /** rct2: 0x008ADCB4 */ -static void GigaRCTrack25DegDownRightBanked( +static void LatticeTriangleTrack25DegDownRightBanked( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrack25DegUpLeftBanked(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrack25DegUpLeftBanked(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); } /** rct2: 0x008ADED4 */ -static void GigaRCTrackFlatTo60DegUpLongBase( +static void LatticeTriangleTrackFlatTo60DegUpLongBase( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -4909,7 +4909,7 @@ static void GigaRCTrackFlatTo60DegUpLongBase( } /** rct2: 0x008ADEE4 */ -static void GigaRCTrack60DegUpToFlatLongBase( +static void LatticeTriangleTrack60DegUpToFlatLongBase( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -5060,23 +5060,23 @@ static void GigaRCTrack60DegUpToFlatLongBase( } /** rct2: 0x008ADEF4 */ -static void GigaRCTrack60DegDownToFlatLongBase( +static void LatticeTriangleTrack60DegDownToFlatLongBase( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackFlatTo60DegUpLongBase(session, ride, 3 - trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackFlatTo60DegUpLongBase(session, ride, 3 - trackSequence, (direction + 2) & 3, height, trackElement); } /** rct2: 0x008ADF04 */ -static void GigaRCTrackFlatTo60DegDownLongBase( +static void LatticeTriangleTrackFlatTo60DegDownLongBase( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrack60DegUpToFlatLongBase(session, ride, 3 - trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrack60DegUpToFlatLongBase(session, ride, 3 - trackSequence, (direction + 2) & 3, height, trackElement); } /** rct2: 0x008ADF14 */ -static void GigaRCTrackCableLiftHill( +static void LatticeTriangleTrackCableLiftHill( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -5252,7 +5252,7 @@ static void GigaRCTrackCableLiftHill( } /** rct2: 0x008ADA64 */ -static void GigaRCTrackLeftEighthToDiag( +static void LatticeTriangleTrackLeftEighthToDiag( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -5416,7 +5416,7 @@ static void GigaRCTrackLeftEighthToDiag( } /** rct2: 0x008ADA74 */ -static void GigaRCTrackRightEighthToDiag( +static void LatticeTriangleTrackRightEighthToDiag( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -5580,25 +5580,25 @@ static void GigaRCTrackRightEighthToDiag( } /** rct2: 0x008ADA84 */ -static void GigaRCTrackLeftEighthToOrthogonal( +static void LatticeTriangleTrackLeftEighthToOrthogonal( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; - GigaRCTrackRightEighthToDiag(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackRightEighthToDiag(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); } /** rct2: 0x008ADA94 */ -static void GigaRCTrackRightEighthToOrthogonal( +static void LatticeTriangleTrackRightEighthToOrthogonal( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; - GigaRCTrackLeftEighthToDiag(session, ride, trackSequence, (direction + 3) & 3, height, trackElement); + LatticeTriangleTrackLeftEighthToDiag(session, ride, trackSequence, (direction + 3) & 3, height, trackElement); } /** rct2: 0x008ADAA4 */ -static void GigaRCTrackLeftEighthBankToDiag( +static void LatticeTriangleTrackLeftEighthBankToDiag( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -5762,7 +5762,7 @@ static void GigaRCTrackLeftEighthBankToDiag( } /** rct2: 0x008ADAB4 */ -static void GigaRCTrackRightEighthBankToDiag( +static void LatticeTriangleTrackRightEighthBankToDiag( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -5926,25 +5926,25 @@ static void GigaRCTrackRightEighthBankToDiag( } /** rct2: 0x008ADAC4 */ -static void GigaRCTrackLeftEighthBankToOrthogonal( +static void LatticeTriangleTrackLeftEighthBankToOrthogonal( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; - GigaRCTrackRightEighthBankToDiag(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackRightEighthBankToDiag(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); } /** rct2: 0x008ADAD4 */ -static void GigaRCTrackRightEighthBankToOrthogonal( +static void LatticeTriangleTrackRightEighthBankToOrthogonal( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; - GigaRCTrackLeftEighthBankToDiag(session, ride, trackSequence, (direction + 3) & 3, height, trackElement); + LatticeTriangleTrackLeftEighthBankToDiag(session, ride, trackSequence, (direction + 3) & 3, height, trackElement); } /** rct2: 0x008ADA54 */ -static void GigaRCTrackDiagFlat( +static void LatticeTriangleTrackDiagFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -5958,7 +5958,7 @@ static void GigaRCTrackDiagFlat( } /** rct2: 0x008ADB04 */ -static void GigaRCTrackDiag25DegUp( +static void LatticeTriangleTrackDiag25DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -6127,7 +6127,7 @@ static void GigaRCTrackDiag25DegUp( } /** rct2: 0x008ADB64 */ -static void GigaRCTrackDiag60DegUp( +static void LatticeTriangleTrackDiag60DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -6226,7 +6226,7 @@ static void GigaRCTrackDiag60DegUp( } /** rct2: 0x008ADAE4 */ -static void GigaRCTrackDiagFlatTo25DegUp( +static void LatticeTriangleTrackDiagFlatTo25DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -6395,7 +6395,7 @@ static void GigaRCTrackDiagFlatTo25DegUp( } /** rct2: 0x008ADB44 */ -static void GigaRCTrackDiag25DegUpTo60DegUp( +static void LatticeTriangleTrackDiag25DegUpTo60DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -6494,7 +6494,7 @@ static void GigaRCTrackDiag25DegUpTo60DegUp( } /** rct2: 0x008ADB54 */ -static void GigaRCTrackDiag60DegUpTo25DegUp( +static void LatticeTriangleTrackDiag60DegUpTo25DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -6593,7 +6593,7 @@ static void GigaRCTrackDiag60DegUpTo25DegUp( } /** rct2: 0x008ADAF4 */ -static void GigaRCTrackDiag25DegUpToFlat( +static void LatticeTriangleTrackDiag25DegUpToFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -6762,7 +6762,7 @@ static void GigaRCTrackDiag25DegUpToFlat( } /** rct2: 0x008ADB34 */ -static void GigaRCTrackDiag25DegDown( +static void LatticeTriangleTrackDiag25DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -6931,7 +6931,7 @@ static void GigaRCTrackDiag25DegDown( } /** rct2: 0x008ADB94 */ -static void GigaRCTrackDiag60DegDown( +static void LatticeTriangleTrackDiag60DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -7030,7 +7030,7 @@ static void GigaRCTrackDiag60DegDown( } /** rct2: 0x008ADB14 */ -static void GigaRCTrackDiagFlatTo25DegDown( +static void LatticeTriangleTrackDiagFlatTo25DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -7197,7 +7197,7 @@ static void GigaRCTrackDiagFlatTo25DegDown( } /** rct2: 0x008ADB74 */ -static void GigaRCTrackDiag25DegDownTo60DegDown( +static void LatticeTriangleTrackDiag25DegDownTo60DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -7296,7 +7296,7 @@ static void GigaRCTrackDiag25DegDownTo60DegDown( } /** rct2: 0x008ADB84 */ -static void GigaRCTrackDiag60DegDownTo25DegDown( +static void LatticeTriangleTrackDiag60DegDownTo25DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -7395,7 +7395,7 @@ static void GigaRCTrackDiag60DegDownTo25DegDown( } /** rct2: 0x008ADB24 */ -static void GigaRCTrackDiag25DegDownToFlat( +static void LatticeTriangleTrackDiag25DegDownToFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -7564,7 +7564,7 @@ static void GigaRCTrackDiag25DegDownToFlat( } /** rct2: 0x008ADBC4 */ -static void GigaRCTrackDiagFlatToLeftBank( +static void LatticeTriangleTrackDiagFlatToLeftBank( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -7666,7 +7666,7 @@ static void GigaRCTrackDiagFlatToLeftBank( } /** rct2: 0x008ADBD4 */ -static void GigaRCTrackDiagFlatToRightBank( +static void LatticeTriangleTrackDiagFlatToRightBank( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -7768,7 +7768,7 @@ static void GigaRCTrackDiagFlatToRightBank( } /** rct2: 0x008ADBE4 */ -static void GigaRCTrackDiagLeftBankToFlat( +static void LatticeTriangleTrackDiagLeftBankToFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -7870,7 +7870,7 @@ static void GigaRCTrackDiagLeftBankToFlat( } /** rct2: 0x008ADBF4 */ -static void GigaRCTrackDiagRightBankToFlat( +static void LatticeTriangleTrackDiagRightBankToFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -7972,7 +7972,7 @@ static void GigaRCTrackDiagRightBankToFlat( } /** rct2: 0x008ADC24 */ -static void GigaRCTrackDiagLeftBankTo25DegUp( +static void LatticeTriangleTrackDiagLeftBankTo25DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -8074,7 +8074,7 @@ static void GigaRCTrackDiagLeftBankTo25DegUp( } /** rct2: 0x008ADC34 */ -static void GigaRCTrackDiagRightBankTo25DegUp( +static void LatticeTriangleTrackDiagRightBankTo25DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -8176,7 +8176,7 @@ static void GigaRCTrackDiagRightBankTo25DegUp( } /** rct2: 0x008ADC04 */ -static void GigaRCTrackDiag25DegUpToLeftBank( +static void LatticeTriangleTrackDiag25DegUpToLeftBank( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -8278,7 +8278,7 @@ static void GigaRCTrackDiag25DegUpToLeftBank( } /** rct2: 0x008ADC14 */ -static void GigaRCTrackDiag25DegUpToRightBank( +static void LatticeTriangleTrackDiag25DegUpToRightBank( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -8380,7 +8380,7 @@ static void GigaRCTrackDiag25DegUpToRightBank( } /** rct2: 0x008ADC44 */ -static void GigaRCTrackDiagLeftBankTo25DegDown( +static void LatticeTriangleTrackDiagLeftBankTo25DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -8480,7 +8480,7 @@ static void GigaRCTrackDiagLeftBankTo25DegDown( } /** rct2: 0x008ADC54 */ -static void GigaRCTrackDiagRightBankTo25DegDown( +static void LatticeTriangleTrackDiagRightBankTo25DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -8580,7 +8580,7 @@ static void GigaRCTrackDiagRightBankTo25DegDown( } /** rct2: 0x008ADC64 */ -static void GigaRCTrackDiag25DegDownToLeftBank( +static void LatticeTriangleTrackDiag25DegDownToLeftBank( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -8682,7 +8682,7 @@ static void GigaRCTrackDiag25DegDownToLeftBank( } /** rct2: 0x008ADC74 */ -static void GigaRCTrackDiag25DegDownToRightBank( +static void LatticeTriangleTrackDiag25DegDownToRightBank( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -8784,7 +8784,7 @@ static void GigaRCTrackDiag25DegDownToRightBank( } /** rct2: 0x008ADBA4 */ -static void GigaRCTrackDiagLeftBank( +static void LatticeTriangleTrackDiagLeftBank( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -8883,7 +8883,7 @@ static void GigaRCTrackDiagLeftBank( } /** rct2: 0x008ADBB4 */ -static void GigaRCTrackDiagRightBank( +static void LatticeTriangleTrackDiagRightBank( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -8982,17 +8982,17 @@ static void GigaRCTrackDiagRightBank( } /** rct2: 0x008ADEC4 */ -static void GigaRCTrackBlockBrakes( +static void LatticeTriangleTrackBlockBrakes( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { bool isClosed = trackElement.IsBrakeClosed(); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(_GigaCoasterBrakeImages[direction][isClosed][0]), { 0, 0, height }, - { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, session.TrackColours.WithIndex(_LatticeTriangleBrakeImages[direction][isClosed][0]), + { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(_GigaCoasterBrakeImages[direction][isClosed][1]), { 0, 0, height }, - { { 0, 27, height + 5 }, { 32, 1, 11 } }); + session, direction, session.TrackColours.WithIndex(_LatticeTriangleBrakeImages[direction][isClosed][1]), + { 0, 0, height }, { { 0, 27, height + 5 }, { 32, 1, 11 } }); if (TrackPaintUtilShouldPaintSupports(session.MapPosition)) { @@ -9004,7 +9004,7 @@ static void GigaRCTrackBlockBrakes( } /** rct2: 0x008ADCC4 */ -static void GigaRCTrackLeftBankedQuarterTurn325DegUp( +static void LatticeTriangleTrackLeftBankedQuarterTurn325DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -9098,7 +9098,7 @@ static void GigaRCTrackLeftBankedQuarterTurn325DegUp( } /** rct2: 0x008ADCD4 */ -static void GigaRCTrackRightBankedQuarterTurn325DegUp( +static void LatticeTriangleTrackRightBankedQuarterTurn325DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -9199,25 +9199,25 @@ static void GigaRCTrackRightBankedQuarterTurn325DegUp( } /** rct2: 0x008ADCE4 */ -static void GigaRCTrackLeftBankedQuarterTurn325DegDown( +static void LatticeTriangleTrackLeftBankedQuarterTurn325DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { trackSequence = kMapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; - GigaRCTrackRightBankedQuarterTurn325DegUp(session, ride, trackSequence, (direction + 1) & 3, height, trackElement); + LatticeTriangleTrackRightBankedQuarterTurn325DegUp(session, ride, trackSequence, (direction + 1) & 3, height, trackElement); } /** rct2: 0x008ADCF4 */ -static void GigaRCTrackRightBankedQuarterTurn325DegDown( +static void LatticeTriangleTrackRightBankedQuarterTurn325DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { trackSequence = kMapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; - GigaRCTrackLeftBankedQuarterTurn325DegUp(session, ride, trackSequence, (direction - 1) & 3, height, trackElement); + LatticeTriangleTrackLeftBankedQuarterTurn325DegUp(session, ride, trackSequence, (direction - 1) & 3, height, trackElement); } /** rct2: 0x008ADD04 */ -static void GigaRCTrackLeftBankedQuarterTurn525DegUp( +static void LatticeTriangleTrackLeftBankedQuarterTurn525DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -9416,7 +9416,7 @@ static void GigaRCTrackLeftBankedQuarterTurn525DegUp( } /** rct2: 0x008ADD14 */ -static void GigaRCTrackRightBankedQuarterTurn525DegUp( +static void LatticeTriangleTrackRightBankedQuarterTurn525DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -9614,25 +9614,25 @@ static void GigaRCTrackRightBankedQuarterTurn525DegUp( } /** rct2: 0x008ADD24 */ -static void GigaRCTrackLeftBankedQuarterTurn525DegDown( +static void LatticeTriangleTrackLeftBankedQuarterTurn525DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { trackSequence = kMapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; - GigaRCTrackRightBankedQuarterTurn525DegUp(session, ride, trackSequence, (direction + 1) & 3, height, trackElement); + LatticeTriangleTrackRightBankedQuarterTurn525DegUp(session, ride, trackSequence, (direction + 1) & 3, height, trackElement); } /** rct2: 0x008ADD34 */ -static void GigaRCTrackRightBankedQuarterTurn525DegDown( +static void LatticeTriangleTrackRightBankedQuarterTurn525DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { trackSequence = kMapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; - GigaRCTrackLeftBankedQuarterTurn525DegUp(session, ride, trackSequence, (direction - 1) & 3, height, trackElement); + LatticeTriangleTrackLeftBankedQuarterTurn525DegUp(session, ride, trackSequence, (direction - 1) & 3, height, trackElement); } /** rct2: 0x008ADD44 */ -static void GigaRCTrack25DegUpToLeftBanked25DegUp( +static void LatticeTriangleTrack25DegUpToLeftBanked25DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -9679,7 +9679,7 @@ static void GigaRCTrack25DegUpToLeftBanked25DegUp( } /** rct2: 0x008ADD54 */ -static void GigaRCTrack25DegUpToRightBanked25DegUp( +static void LatticeTriangleTrack25DegUpToRightBanked25DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -9726,7 +9726,7 @@ static void GigaRCTrack25DegUpToRightBanked25DegUp( } /** rct2: 0x008ADD64 */ -static void GigaRCTrackLeftBanked25DegUpTo25DegUp( +static void LatticeTriangleTrackLeftBanked25DegUpTo25DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -9773,7 +9773,7 @@ static void GigaRCTrackLeftBanked25DegUpTo25DegUp( } /** rct2: 0x008ADD74 */ -static void GigaRCTrackRightBanked25DegUpTo25DegUp( +static void LatticeTriangleTrackRightBanked25DegUpTo25DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -9820,39 +9820,39 @@ static void GigaRCTrackRightBanked25DegUpTo25DegUp( } /** rct2: 0x008ADD84 */ -static void GigaRCTrack25DegDownToLeftBanked25DegDown( +static void LatticeTriangleTrack25DegDownToLeftBanked25DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackRightBanked25DegUpTo25DegUp(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackRightBanked25DegUpTo25DegUp(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); } /** rct2: 0x008ADD94 */ -static void GigaRCTrack25DegDownToRightBanked25DegDown( +static void LatticeTriangleTrack25DegDownToRightBanked25DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackLeftBanked25DegUpTo25DegUp(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackLeftBanked25DegUpTo25DegUp(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); } /** rct2: 0x008ADDA4 */ -static void GigaRCTrackLeftBanked25DegDownTo25DegDown( +static void LatticeTriangleTrackLeftBanked25DegDownTo25DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrack25DegUpToRightBanked25DegUp(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrack25DegUpToRightBanked25DegUp(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); } /** rct2: 0x008ADDB4 */ -static void GigaRCTrackRightBanked25DegDownTo25DegDown( +static void LatticeTriangleTrackRightBanked25DegDownTo25DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrack25DegUpToLeftBanked25DegUp(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrack25DegUpToLeftBanked25DegUp(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); } /** rct2: 0x008ADDC4 */ -static void GigaRCTrackLeftBankedFlatToLeftBanked25DegUp( +static void LatticeTriangleTrackLeftBankedFlatToLeftBanked25DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -9896,7 +9896,7 @@ static void GigaRCTrackLeftBankedFlatToLeftBanked25DegUp( } /** rct2: 0x008ADDD4 */ -static void GigaRCTrackRightBankedFlatToRightBanked25DegUp( +static void LatticeTriangleTrackRightBankedFlatToRightBanked25DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -9940,7 +9940,7 @@ static void GigaRCTrackRightBankedFlatToRightBanked25DegUp( } /** rct2: 0x008ADE04 */ -static void GigaRCTrackLeftBanked25DegUpToLeftBankedFlat( +static void LatticeTriangleTrackLeftBanked25DegUpToLeftBankedFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -9984,7 +9984,7 @@ static void GigaRCTrackLeftBanked25DegUpToLeftBankedFlat( } /** rct2: 0x008ADE14 */ -static void GigaRCTrackRightBanked25DegUpToRightBankedFlat( +static void LatticeTriangleTrackRightBanked25DegUpToRightBankedFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -10028,39 +10028,43 @@ static void GigaRCTrackRightBanked25DegUpToRightBankedFlat( } /** rct2: 0x008ADE24 */ -static void GigaRCTrackLeftBankedFlatToLeftBanked25DegDown( +static void LatticeTriangleTrackLeftBankedFlatToLeftBanked25DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackRightBanked25DegUpToRightBankedFlat(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackRightBanked25DegUpToRightBankedFlat( + session, ride, trackSequence, (direction + 2) & 3, height, trackElement); } /** rct2: 0x008ADE34 */ -static void GigaRCTrackRightBankedFlatToRightBanked25DegDown( +static void LatticeTriangleTrackRightBankedFlatToRightBanked25DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackLeftBanked25DegUpToLeftBankedFlat(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackLeftBanked25DegUpToLeftBankedFlat( + session, ride, trackSequence, (direction + 2) & 3, height, trackElement); } /** rct2: 0x008ADDE4 */ -static void GigaRCTrackLeftBanked25DegDownToLeftBankedFlat( +static void LatticeTriangleTrackLeftBanked25DegDownToLeftBankedFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackRightBankedFlatToRightBanked25DegUp(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackRightBankedFlatToRightBanked25DegUp( + session, ride, trackSequence, (direction + 2) & 3, height, trackElement); } /** rct2: 0x008ADDF4 */ -static void GigaRCTrackRightBanked25DegDownToRightBankedFlat( +static void LatticeTriangleTrackRightBanked25DegDownToRightBankedFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackLeftBankedFlatToLeftBanked25DegUp(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackLeftBankedFlatToLeftBanked25DegUp( + session, ride, trackSequence, (direction + 2) & 3, height, trackElement); } /** rct2: 0x008ADE44 */ -static void GigaRCTrackFlatToLeftBanked25DegUp( +static void LatticeTriangleTrackFlatToLeftBanked25DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -10107,7 +10111,7 @@ static void GigaRCTrackFlatToLeftBanked25DegUp( } /** rct2: 0x008ADE54 */ -static void GigaRCTrackFlatToRightBanked25DegUp( +static void LatticeTriangleTrackFlatToRightBanked25DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -10154,7 +10158,7 @@ static void GigaRCTrackFlatToRightBanked25DegUp( } /** rct2: 0x008ADE64 */ -static void GigaRCTrackLeftBanked25DegUpToFlat( +static void LatticeTriangleTrackLeftBanked25DegUpToFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -10201,7 +10205,7 @@ static void GigaRCTrackLeftBanked25DegUpToFlat( } /** rct2: 0x008ADE74 */ -static void GigaRCTrackRightBanked25DegUpToFlat( +static void LatticeTriangleTrackRightBanked25DegUpToFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -10248,38 +10252,38 @@ static void GigaRCTrackRightBanked25DegUpToFlat( } /** rct2: 0x008ADE84 */ -static void GigaRCTrackFlatToLeftBanked25DegDown( +static void LatticeTriangleTrackFlatToLeftBanked25DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackRightBanked25DegUpToFlat(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackRightBanked25DegUpToFlat(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); } /** rct2: 0x008ADE94 */ -static void GigaRCTrackFlatToRightBanked25DegDown( +static void LatticeTriangleTrackFlatToRightBanked25DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackLeftBanked25DegUpToFlat(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackLeftBanked25DegUpToFlat(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); } /** rct2: 0x008ADEA4 */ -static void GigaRCTrackLeftBanked25DegDownToFlat( +static void LatticeTriangleTrackLeftBanked25DegDownToFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackFlatToRightBanked25DegUp(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackFlatToRightBanked25DegUp(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); } /** rct2: 0x008ADEB4 */ -static void GigaRCTrackRightBanked25DegDownToFlat( +static void LatticeTriangleTrackRightBanked25DegDownToFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackFlatToLeftBanked25DegUp(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackFlatToLeftBanked25DegUp(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); } -static void GigaRCTrackBooster( +static void LatticeTriangleTrackBooster( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -10288,14 +10292,14 @@ static void GigaRCTrackBooster( case 0: case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_RC_BOOSTER_NE_SW), { 0, 0, height }, - { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_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), { 0, 0, height }, - { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_BOOSTER_NW_SE), + { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); break; } if (TrackPaintUtilShouldPaintSupports(session.MapPosition)) @@ -10307,13 +10311,13 @@ static void GigaRCTrackBooster( PaintUtilSetGeneralSupportHeight(session, height + kDefaultGeneralSupportHeight); } -static void GigaRCTrackPoweredLift( +static void LatticeTriangleTrackPoweredLift( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_RC_POWERED_LIFT_0 + direction), { 0, 0, height }, - { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_POWERED_LIFT_0 + direction), + { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); if (TrackPaintUtilShouldPaintSupports(session.MapPosition)) { @@ -10331,7 +10335,7 @@ static void GigaRCTrackPoweredLift( PaintUtilSetGeneralSupportHeight(session, height + 56); } -static void GigaRCTrack90DegUp( +static void LatticeTriangleTrack90DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -10342,23 +10346,23 @@ static void GigaRCTrack90DegUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_VERTICAL + 8)), { 0, 0, height }, - { { 4, 6, height + 8 }, { 2, 20, 31 } }); + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL + 8)), + { 0, 0, height }, { { 4, 6, height + 8 }, { 2, 20, 31 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_VERTICAL + 9)), { 0, 0, height }, - { { 24, 6, height + 8 }, { 2, 20, 31 } }); + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL + 9)), + { 0, 0, height }, { { 24, 6, height + 8 }, { 2, 20, 31 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_VERTICAL + 10)), { 0, 0, height }, - { { 24, 6, height + 8 }, { 2, 20, 31 } }); + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL + 10)), + { 0, 0, height }, { { 24, 6, height + 8 }, { 2, 20, 31 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_VERTICAL + 11)), { 0, 0, height }, - { { 4, 6, height + 8 }, { 2, 20, 31 } }); + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL + 11)), + { 0, 0, height }, { { 4, 6, height + 8 }, { 2, 20, 31 } }); break; } PaintUtilSetVerticalTunnel(session, height + 32); @@ -10371,14 +10375,14 @@ static void GigaRCTrack90DegUp( } } -static void GigaRCTrack90DegDown( +static void LatticeTriangleTrack90DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrack90DegUp(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrack90DegUp(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); } -static void GigaRCTrack60DegUpTo90DegUp( +static void LatticeTriangleTrack60DegUpTo90DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -10389,23 +10393,23 @@ static void GigaRCTrack60DegUpTo90DegUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_VERTICAL + 0)), { 0, 0, height }, - { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL + 0)), + { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_VERTICAL + 1)), { 0, 0, height }, - { { 24, 6, height }, { 2, 20, 55 } }); + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL + 1)), + { 0, 0, height }, { { 24, 6, height }, { 2, 20, 55 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_VERTICAL + 2)), { 0, 0, height }, - { { 24, 6, height }, { 2, 20, 55 } }); + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL + 2)), + { 0, 0, height }, { { 24, 6, height }, { 2, 20, 55 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_VERTICAL + 3)), { 0, 0, height }, - { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL + 3)), + { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); break; } if (TrackPaintUtilShouldPaintSupports(session.MapPosition)) @@ -10426,14 +10430,14 @@ static void GigaRCTrack60DegUpTo90DegUp( } } -static void GigaRCTrack90DegDownTo60DegDown( +static void LatticeTriangleTrack90DegDownTo60DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrack60DegUpTo90DegUp(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrack60DegUpTo90DegUp(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); } -static void GigaRCTrack90DegUpTo60DegUp( +static void LatticeTriangleTrack90DegUpTo60DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -10441,23 +10445,23 @@ static void GigaRCTrack90DegUpTo60DegUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_VERTICAL + 4)), { 0, 0, height }, - { { 0, 6, height + 8 }, { 32, 20, 3 } }); + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL + 4)), + { 0, 0, height }, { { 0, 6, height + 8 }, { 32, 20, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_VERTICAL + 5)), { 0, 0, height }, - { { 24, 6, height + 8 }, { 2, 20, 31 } }); + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL + 5)), + { 0, 0, height }, { { 24, 6, height + 8 }, { 2, 20, 31 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_VERTICAL + 6)), { 0, 0, height }, - { { 24, 6, height + 8 }, { 2, 20, 31 } }); + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL + 6)), + { 0, 0, height }, { { 24, 6, height + 8 }, { 2, 20, 31 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_VERTICAL + 7)), { 0, 0, height }, - { { 0, 6, height + 8 }, { 32, 20, 3 } }); + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL + 7)), + { 0, 0, height }, { { 0, 6, height + 8 }, { 32, 20, 3 } }); break; } switch (direction) @@ -10473,7 +10477,7 @@ static void GigaRCTrack90DegUpTo60DegUp( PaintUtilSetGeneralSupportHeight(session, height + 80); } -static void GigaRCTrack60DegDownTo90DegDown( +static void LatticeTriangleTrack60DegDownTo90DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -10484,23 +10488,23 @@ static void GigaRCTrack60DegDownTo90DegDown( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_VERTICAL + 6)), { 0, 0, height }, - { { 24, 6, height + 8 }, { 2, 20, 31 } }); + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL + 6)), + { 0, 0, height }, { { 24, 6, height + 8 }, { 2, 20, 31 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_VERTICAL + 7)), { 0, 0, height }, - { { 0, 6, height + 8 }, { 32, 20, 3 } }); + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL + 7)), + { 0, 0, height }, { { 0, 6, height + 8 }, { 32, 20, 3 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_VERTICAL + 4)), { 0, 0, height }, - { { 0, 6, height + 8 }, { 32, 20, 3 } }); + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL + 4)), + { 0, 0, height }, { { 0, 6, height + 8 }, { 32, 20, 3 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_VERTICAL + 5)), { 0, 0, height }, - { { 24, 6, height + 8 }, { 2, 20, 31 } }); + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL + 5)), + { 0, 0, height }, { { 24, 6, height + 8 }, { 2, 20, 31 } }); break; } if (direction == 0 || direction == 3) @@ -10516,7 +10520,7 @@ static void GigaRCTrack60DegDownTo90DegDown( } } -static void GigaRCTrackLeftQuarterTurn190DegUp( +static void LatticeTriangleTrackLeftQuarterTurn190DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -10527,28 +10531,28 @@ static void GigaRCTrackLeftQuarterTurn190DegUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_VERTICAL_TWIST + 0)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_TWIST + 0)), { 0, 0, height }, { { 4, 6, height + 8 }, { 2, 20, 96 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_VERTICAL_TWIST + 1)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_TWIST + 1)), { 0, 0, height }, { { 4, 6, height + 8 }, { 2, 20, 96 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_VERTICAL_TWIST + 2)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_TWIST + 2)), { 0, 0, height }, { { 24, 6, height + 8 }, { 2, 20, 96 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_VERTICAL_TWIST + 3)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_TWIST + 3)), { 0, 0, height }, { { 24, 6, height + 8 }, { 2, 20, 96 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_VERTICAL_TWIST + 4)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_TWIST + 4)), { 0, 0, height }, { { 4, 6, height + 8 }, { 2, 20, 96 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_VERTICAL_TWIST + 5)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_TWIST + 5)), { 0, 0, height }, { { 24, 6, height + 8 }, { 2, 20, 96 } }); break; } @@ -10562,7 +10566,7 @@ static void GigaRCTrackLeftQuarterTurn190DegUp( } } -static void GigaRCTrackRightQuarterTurn190DegUp( +static void LatticeTriangleTrackRightQuarterTurn190DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -10573,28 +10577,28 @@ static void GigaRCTrackRightQuarterTurn190DegUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_VERTICAL_TWIST + 6)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_TWIST + 6)), { 0, 0, height }, { { 4, 6, height + 8 }, { 2, 20, 96 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_VERTICAL_TWIST + 7)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_TWIST + 7)), { 0, 0, height }, { { 24, 6, height + 8 }, { 2, 20, 96 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_VERTICAL_TWIST + 8)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_TWIST + 8)), { 0, 0, height }, { { 24, 6, height + 8 }, { 2, 20, 96 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_VERTICAL_TWIST + 9)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_TWIST + 9)), { 0, 0, height }, { { 4, 6, height + 8 }, { 2, 20, 96 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_VERTICAL_TWIST + 10)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_TWIST + 10)), { 0, 0, height }, { { 24, 6, height + 8 }, { 2, 20, 96 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_VERTICAL_TWIST + 11)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_TWIST + 11)), { 0, 0, height }, { { 4, 6, height + 8 }, { 2, 20, 96 } }); break; } @@ -10608,21 +10612,21 @@ static void GigaRCTrackRightQuarterTurn190DegUp( } } -static void GigaRCTrackLeftQuarterTurn190DegDown( +static void LatticeTriangleTrackLeftQuarterTurn190DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackRightQuarterTurn190DegUp(session, ride, trackSequence, (direction + 1) & 3, height, trackElement); + LatticeTriangleTrackRightQuarterTurn190DegUp(session, ride, trackSequence, (direction + 1) & 3, height, trackElement); } -static void GigaRCTrackRightQuarterTurn190DegDown( +static void LatticeTriangleTrackRightQuarterTurn190DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackLeftQuarterTurn190DegUp(session, ride, trackSequence, (direction - 1) & 3, height, trackElement); + LatticeTriangleTrackLeftQuarterTurn190DegUp(session, ride, trackSequence, (direction - 1) & 3, height, trackElement); } -static void GigaRCTrackLeftBarrelRollUpToDown( +static void LatticeTriangleTrackLeftBarrelRollUpToDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -10633,40 +10637,40 @@ static void GigaRCTrackLeftBarrelRollUpToDown( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 0)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 0)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 1)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 1)), { 0, 0, height }, { { 0, 6, height + 28 }, { 32, 20, 0 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::RightCorner, 4, height - 2, session.SupportColours); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 6)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 6)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 7)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 7)), { 0, 0, height }, { { 0, 6, height + 28 }, { 32, 20, 0 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::BottomCorner, 4, height - 2, session.SupportColours); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 12)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 12)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 13)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 13)), { 0, 0, height }, { { 0, 6, height + 28 }, { 32, 20, 0 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::LeftCorner, 0, height + 1, session.SupportColours); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 18)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 18)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 19)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 19)), { 0, 0, height }, { { 0, 6, height + 28 }, { 32, 20, 0 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopCorner, 0, height + 1, session.SupportColours); @@ -10691,34 +10695,34 @@ static void GigaRCTrackLeftBarrelRollUpToDown( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 2)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 2)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 3)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 3)), { 0, 0, height }, { { 0, 6, height + 28 }, { 32, 20, 0 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 8)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 8)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 9)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 9)), { 0, 0, height }, { { 0, 6, height + 28 }, { 32, 20, 0 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 14)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 14)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 15)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 15)), { 0, 0, height }, { { 0, 6, height + 28 }, { 32, 20, 0 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 20)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 20)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 21)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 21)), { 0, 0, height }, { { 0, 6, height + 28 }, { 32, 20, 0 } }); break; } @@ -10737,34 +10741,34 @@ static void GigaRCTrackLeftBarrelRollUpToDown( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 4)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 4)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 5)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 5)), { 0, 0, height }, { { 0, 6, height + 44 }, { 32, 20, 0 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 10)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 10)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 11)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 11)), { 0, 0, height }, { { 0, 6, height + 44 }, { 32, 20, 0 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 16)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 16)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 17)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 17)), { 0, 0, height }, { { 0, 6, height + 44 }, { 32, 20, 0 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 22)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 22)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 23)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 23)), { 0, 0, height }, { { 0, 6, height + 44 }, { 32, 20, 0 } }); break; } @@ -10790,7 +10794,7 @@ static void GigaRCTrackLeftBarrelRollUpToDown( } } -static void GigaRCTrackRightBarrelRollUpToDown( +static void LatticeTriangleTrackRightBarrelRollUpToDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -10801,40 +10805,40 @@ static void GigaRCTrackRightBarrelRollUpToDown( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 24)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 24)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 25)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 25)), { 0, 0, height }, { { 0, 6, height + 28 }, { 32, 20, 0 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopCorner, 0, height + 1, session.SupportColours); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 30)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 30)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 31)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 31)), { 0, 0, height }, { { 0, 6, height + 28 }, { 32, 20, 0 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::RightCorner, 0, height + 1, session.SupportColours); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 36)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 36)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 37)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 37)), { 0, 0, height }, { { 0, 6, height + 28 }, { 32, 20, 0 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::BottomCorner, 4, height - 2, session.SupportColours); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 42)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 42)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 43)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 43)), { 0, 0, height }, { { 0, 6, height + 28 }, { 32, 20, 0 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::LeftCorner, 4, height - 2, session.SupportColours); @@ -10859,34 +10863,34 @@ static void GigaRCTrackRightBarrelRollUpToDown( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 26)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 26)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 27)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 27)), { 0, 0, height }, { { 0, 6, height + 28 }, { 32, 20, 0 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 32)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 32)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 33)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 33)), { 0, 0, height }, { { 0, 6, height + 28 }, { 32, 20, 0 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 38)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 38)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 39)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 39)), { 0, 0, height }, { { 0, 6, height + 28 }, { 32, 20, 0 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 44)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 44)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 45)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 45)), { 0, 0, height }, { { 0, 6, height + 28 }, { 32, 20, 0 } }); break; } @@ -10905,34 +10909,34 @@ static void GigaRCTrackRightBarrelRollUpToDown( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 28)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 28)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 29)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 29)), { 0, 0, height }, { { 0, 6, height + 44 }, { 32, 20, 0 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 34)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 34)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 35)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 35)), { 0, 0, height }, { { 0, 6, height + 44 }, { 32, 20, 0 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 40)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 40)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 41)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 41)), { 0, 0, height }, { { 0, 6, height + 44 }, { 32, 20, 0 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 46)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 46)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_BARREL_ROLL + 47)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 47)), { 0, 0, height }, { { 0, 6, height + 44 }, { 32, 20, 0 } }); break; } @@ -10958,21 +10962,21 @@ static void GigaRCTrackRightBarrelRollUpToDown( } } -static void GigaRCTrackLeftBarrelRollDownToUp( +static void LatticeTriangleTrackLeftBarrelRollDownToUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackLeftBarrelRollUpToDown(session, ride, 2 - trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackLeftBarrelRollUpToDown(session, ride, 2 - trackSequence, (direction + 2) & 3, height, trackElement); } -static void GigaRCTrackRightBarrelRollDownToUp( +static void LatticeTriangleTrackRightBarrelRollDownToUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackRightBarrelRollUpToDown(session, ride, 2 - trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackRightBarrelRollUpToDown(session, ride, 2 - trackSequence, (direction + 2) & 3, height, trackElement); } -static void GigaRCTrackHalfLoopUp( +static void LatticeTriangleTrackHalfLoopUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -10983,22 +10987,22 @@ static void GigaRCTrackHalfLoopUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_HALF_LOOP + 0)), { 0, 6, height }, - { 32, 20, 3 }); + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_HALF_LOOP + 0)), + { 0, 6, height }, { 32, 20, 3 }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_HALF_LOOP + 4)), { 0, 6, height }, - { 32, 20, 11 }); + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_HALF_LOOP + 4)), + { 0, 6, height }, { 32, 20, 11 }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_HALF_LOOP + 8)), { 0, 6, height }, - { 32, 20, 9 }); + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_HALF_LOOP + 8)), + { 0, 6, height }, { 32, 20, 9 }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_HALF_LOOP + 12)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_HALF_LOOP + 12)), { 0, 6, height }, { 32, 20, 7 }); break; } @@ -11016,28 +11020,28 @@ static void GigaRCTrackHalfLoopUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_HALF_LOOP + 1)), { 0, 0, height }, - { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_HALF_LOOP + 1)), + { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 20, height, session.SupportColours); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_HALF_LOOP + 5)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_HALF_LOOP + 5)), { 0, 14, height }, { { 28, 6, height }, { 3, 20, 63 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 15, height, session.SupportColours); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_HALF_LOOP + 9)), { 0, 6, height }, - { { 28, 6, height }, { 3, 20, 63 } }); + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_HALF_LOOP + 9)), + { 0, 6, height }, { { 28, 6, height }, { 3, 20, 63 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 16, height, session.SupportColours); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_HALF_LOOP + 13)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_HALF_LOOP + 13)), { 0, 6, height }, { 32, 20, 3 }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 16, height, session.SupportColours); @@ -11051,22 +11055,22 @@ static void GigaRCTrackHalfLoopUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_HALF_LOOP + 2)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_HALF_LOOP + 2)), { 16, 0, height }, { 2, 16, 119 }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_HALF_LOOP + 6)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_HALF_LOOP + 6)), { 12, 0, height }, { { 12, 0, height }, { 3, 16, 119 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_HALF_LOOP + 10)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_HALF_LOOP + 10)), { 10, 16, height }, { 4, 12, 119 }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_HALF_LOOP + 14)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_HALF_LOOP + 14)), { 16, 16, height }, { { 15, 6, height }, { 2, 16, 119 } }); break; } @@ -11085,22 +11089,22 @@ static void GigaRCTrackHalfLoopUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_HALF_LOOP + 3)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_HALF_LOOP + 3)), { 0, 0, height + 32 }, { 32, 16, 3 }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_HALF_LOOP + 7)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_HALF_LOOP + 7)), { 0, 0, height + 32 }, { 32, 16, 3 }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_HALF_LOOP + 11)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_HALF_LOOP + 11)), { 0, 16, height + 32 }, { 32, 12, 3 }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_HALF_LOOP + 15)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_HALF_LOOP + 15)), { 0, 16, height + 32 }, { 32, 12, 3 }); break; } @@ -11115,14 +11119,14 @@ static void GigaRCTrackHalfLoopUp( } } -static void GigaRCTrackHalfLoopDown( +static void LatticeTriangleTrackHalfLoopDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackHalfLoopUp(session, ride, 3 - trackSequence, direction, height, trackElement); + LatticeTriangleTrackHalfLoopUp(session, ride, 3 - trackSequence, direction, height, trackElement); } -static void GigaRCTrackLeftVerticalLoop( +static void LatticeTriangleTrackLeftVerticalLoop( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -11133,28 +11137,28 @@ static void GigaRCTrackLeftVerticalLoop( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 0), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 0), { 0, 6, height }, { 32, 20, 3 }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 8, height, session.SupportColours); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 4), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 4), { 0, 6, height }, { 32, 20, 3 }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 8, height, session.SupportColours); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 8), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 8), { 0, 6, height }, { 32, 20, 3 }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 8, height, session.SupportColours); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 12), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 12), { 0, 6, height }, { 32, 20, 7 }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 6, height, session.SupportColours); @@ -11179,28 +11183,28 @@ static void GigaRCTrackLeftVerticalLoop( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 1), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 1), { 0, 0, height }, { 32, 26, 3 }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 26, height, session.SupportColours); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 5), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 5), { 0, 14, height }, { 32, 2, 63 }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 0, height + 10, session.SupportColours); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 9), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 9), { 0, 6, height }, { 32, 26, 3 }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 14, height, session.SupportColours); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 13), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 13), { 0, 6, height }, { 32, 26, 3 }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 5, height, session.SupportColours); @@ -11221,22 +11225,22 @@ static void GigaRCTrackLeftVerticalLoop( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 2), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 2), { 16, 0, height }, { { 16, 0, height }, { 3, 16, 119 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 6), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 6), { 12, 0, height }, { { 12, 0, height }, { 3, 16, 119 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 10), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 10), { 10, 16, height }, { { 10, 16, height }, { 4, 16, 119 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 14), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 14), { 16, 16, height }, { { 16, 16, height }, { 2, 16, 119 } }); break; } @@ -11255,22 +11259,22 @@ static void GigaRCTrackLeftVerticalLoop( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 3), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 3), { 0, 0, height + 32 }, { 32, 16, 3 }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 7), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 7), { 0, 0, height + 32 }, { 32, 16, 3 }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 11), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 11), { 0, 16, height + 32 }, { 32, 16, 3 }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 15), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 15), { 0, 16, height + 32 }, { 32, 16, 3 }); break; } @@ -11295,22 +11299,22 @@ static void GigaRCTrackLeftVerticalLoop( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 11), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 11), { 0, 16, height + 32 }, { 32, 16, 3 }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 15), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 15), { 0, 16, height + 32 }, { 32, 16, 3 }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 3), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 3), { 0, 0, height + 32 }, { 32, 16, 3 }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 7), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 7), { 0, 0, height + 32 }, { 32, 16, 3 }); break; } @@ -11329,22 +11333,22 @@ static void GigaRCTrackLeftVerticalLoop( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 10), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 10), { 10, 16, height }, { { 10, 16, height }, { 4, 16, 119 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 14), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 14), { 16, 16, height }, { { 16, 16, height }, { 2, 16, 119 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 2), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 2), { 16, 0, height }, { { 16, 0, height }, { 3, 16, 119 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 6), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 6), { 12, 0, height }, { { 12, 0, height }, { 3, 16, 119 } }); break; } @@ -11363,28 +11367,28 @@ static void GigaRCTrackLeftVerticalLoop( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 9), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 9), { 0, 6, height }, { 32, 26, 3 }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 14, height, session.SupportColours); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 13), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 13), { 0, 6, height }, { 32, 26, 3 }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 5, height, session.SupportColours); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 1), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 1), { 0, 0, height }, { 32, 26, 3 }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 26, height, session.SupportColours); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 5), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 5), { 0, 14, height }, { 32, 2, 63 }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 0, height + 10, session.SupportColours); @@ -11405,28 +11409,28 @@ static void GigaRCTrackLeftVerticalLoop( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 8), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 8), { 0, 6, height }, { 32, 20, 3 }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 8, height, session.SupportColours); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 12), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 12), { 0, 6, height }, { 32, 20, 7 }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 6, height, session.SupportColours); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 0), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 0), { 0, 6, height }, { 32, 20, 3 }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 8, height, session.SupportColours); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 4), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 4), { 0, 6, height }, { 32, 20, 3 }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 8, height, session.SupportColours); @@ -11454,7 +11458,7 @@ static void GigaRCTrackLeftVerticalLoop( } } -static void GigaRCTrackRightVerticalLoop( +static void LatticeTriangleTrackRightVerticalLoop( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -11465,22 +11469,22 @@ static void GigaRCTrackRightVerticalLoop( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 16), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 16), { 0, 6, height }, { 32, 20, 7 }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 20), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 20), { 0, 6, height }, { 32, 20, 3 }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 24), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 24), { 0, 6, height }, { 32, 20, 3 }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 28), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 28), { 0, 6, height }, { 32, 20, 3 }); break; } @@ -11496,28 +11500,28 @@ static void GigaRCTrackRightVerticalLoop( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 17), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 17), { 0, 6, height }, { 32, 26, 3 }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 5, height, session.SupportColours); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 21), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 21), { 0, 6, height }, { 32, 26, 3 }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 14, height, session.SupportColours); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 25), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 25), { 0, 14, height }, { 32, 2, 63 }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 0, height + 10, session.SupportColours); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 29), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 29), { 0, 0, height }, { 32, 26, 3 }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 26, height, session.SupportColours); @@ -11530,22 +11534,22 @@ static void GigaRCTrackRightVerticalLoop( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 18), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 18), { 16, 16, height }, { { 16, 16, height }, { 2, 16, 119 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 22), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 22), { 10, 16, height }, { { 10, 16, height }, { 4, 16, 119 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 26), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 26), { 12, 0, height }, { { 12, 0, height }, { 3, 16, 119 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 30), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 30), { 16, 0, height }, { { 16, 0, height }, { 2, 16, 119 } }); break; } @@ -11556,22 +11560,22 @@ static void GigaRCTrackRightVerticalLoop( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 19), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 19), { 0, 16, height + 32 }, { 32, 16, 3 }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 23), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 23), { 0, 16, height + 32 }, { 32, 16, 3 }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 27), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 27), { 0, 0, height + 32 }, { 32, 16, 3 }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 31), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 31), { 0, 0, height + 32 }, { 32, 16, 3 }); break; } @@ -11588,22 +11592,22 @@ static void GigaRCTrackRightVerticalLoop( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 27), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 27), { 0, 0, height + 32 }, { 32, 16, 3 }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 31), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 31), { 0, 0, height + 32 }, { 32, 16, 3 }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 19), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 19), { 0, 16, height + 32 }, { 32, 16, 3 }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 23), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 23), { 0, 16, height + 32 }, { 32, 16, 3 }); break; } @@ -11614,22 +11618,22 @@ static void GigaRCTrackRightVerticalLoop( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 26), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 26), { 12, 0, height }, { { 12, 0, height }, { 3, 16, 119 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 30), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 30), { 16, 0, height }, { { 16, 0, height }, { 2, 16, 119 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 18), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 18), { 16, 16, height }, { { 16, 16, height }, { 2, 16, 119 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 22), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 22), { 10, 16, height }, { { 10, 16, height }, { 4, 16, 119 } }); break; } @@ -11640,28 +11644,28 @@ static void GigaRCTrackRightVerticalLoop( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 25), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 25), { 0, 14, height }, { 32, 2, 63 }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 0, height + 10, session.SupportColours); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 29), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 29), { 0, 0, height }, { 32, 26, 3 }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 26, height, session.SupportColours); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 17), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 17), { 0, 6, height }, { 32, 26, 3 }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 5, height, session.SupportColours); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 21), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 21), { 0, 6, height }, { 32, 26, 3 }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 14, height, session.SupportColours); @@ -11674,22 +11678,22 @@ static void GigaRCTrackRightVerticalLoop( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 24), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 24), { 0, 6, height }, { 32, 20, 3 }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 28), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 28), { 0, 6, height }, { 32, 20, 3 }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 16), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 16), { 0, 6, height }, { 32, 20, 7 }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex(SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 20), + session, direction, session.TrackColours.WithIndex(SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 20), { 0, 6, height }, { 32, 20, 3 }); break; } @@ -11710,7 +11714,7 @@ static void GigaRCTrackRightVerticalLoop( TrackPaintUtilRightVerticalLoopSegments(session, direction, trackSequence); } -static void GigaRCTrackLeftCorkscrewUp( +static void LatticeTriangleTrackLeftCorkscrewUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -11721,29 +11725,29 @@ static void GigaRCTrackLeftCorkscrewUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_CORKSCREW + 0)), { 0, 0, height }, - { { 0, 6, height + 4 }, { 32, 20, 3 } }); + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_CORKSCREW + 0)), + { 0, 0, height }, { { 0, 6, height + 4 }, { 32, 20, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 0, height - 3, session.SupportColours); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_CORKSCREW + 3)), { 0, 0, height }, - { { 0, 6, height + 4 }, { 32, 20, 3 } }); + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_CORKSCREW + 3)), + { 0, 0, height }, { { 0, 6, height + 4 }, { 32, 20, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 0, height, session.SupportColours); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_CORKSCREW + 6)), { 0, 0, height }, - { { 0, 6, height + 4 }, { 32, 20, 3 } }); + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_CORKSCREW + 6)), + { 0, 0, height }, { { 0, 6, height + 4 }, { 32, 20, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 0, height, session.SupportColours); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_CORKSCREW + 9)), { 0, 0, height }, - { { 0, 6, height + 4 }, { 32, 20, 3 } }); + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_CORKSCREW + 9)), + { 0, 0, height }, { { 0, 6, height + 4 }, { 32, 20, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 0, height + 3, session.SupportColours); break; @@ -11767,22 +11771,22 @@ static void GigaRCTrackLeftCorkscrewUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_CORKSCREW + 1)), { 0, 0, height }, - { { 6, 6, height + 10 }, { 20, 20, 3 } }); + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_CORKSCREW + 1)), + { 0, 0, height }, { { 6, 6, height + 10 }, { 20, 20, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_CORKSCREW + 4)), { 0, 0, height }, - { { 6, 6, height + 10 }, { 20, 20, 3 } }); + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_CORKSCREW + 4)), + { 0, 0, height }, { { 6, 6, height + 10 }, { 20, 20, 3 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_CORKSCREW + 7)), { 0, 0, height }, - { { 6, 6, height + 10 }, { 20, 20, 3 } }); + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_CORKSCREW + 7)), + { 0, 0, height }, { { 6, 6, height + 10 }, { 20, 20, 3 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_CORKSCREW + 10)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_CORKSCREW + 10)), { 0, 0, height }, { { 6, 6, height + 10 }, { 20, 20, 3 } }); break; } @@ -11794,22 +11798,22 @@ static void GigaRCTrackLeftCorkscrewUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_CORKSCREW + 2)), { 0, 0, height }, - { { 6, 0, height + 24 }, { 20, 32, 3 } }); + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_CORKSCREW + 2)), + { 0, 0, height }, { { 6, 0, height + 24 }, { 20, 32, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_CORKSCREW + 5)), { 0, 0, height }, - { { 6, 0, height + 24 }, { 20, 32, 3 } }); + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_CORKSCREW + 5)), + { 0, 0, height }, { { 6, 0, height + 24 }, { 20, 32, 3 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_CORKSCREW + 8)), { 0, 0, height }, - { { 6, 0, height + 24 }, { 20, 32, 3 } }); + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_CORKSCREW + 8)), + { 0, 0, height }, { { 6, 0, height + 24 }, { 20, 32, 3 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_CORKSCREW + 11)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_CORKSCREW + 11)), { 0, 0, height }, { { 6, 0, height + 24 }, { 20, 32, 3 } }); break; } @@ -11838,7 +11842,7 @@ static void GigaRCTrackLeftCorkscrewUp( } } -static void GigaRCTrackRightCorkscrewUp( +static void LatticeTriangleTrackRightCorkscrewUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -11849,28 +11853,28 @@ static void GigaRCTrackRightCorkscrewUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_CORKSCREW + 12)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_CORKSCREW + 12)), { 0, 0, height }, { { 0, 6, height + 4 }, { 32, 20, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 0, height + 3, session.SupportColours); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_CORKSCREW + 15)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_CORKSCREW + 15)), { 0, 0, height }, { { 0, 6, height + 4 }, { 32, 20, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 0, height, session.SupportColours); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_CORKSCREW + 18)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_CORKSCREW + 18)), { 0, 0, height }, { { 0, 6, height + 4 }, { 32, 20, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 0, height, session.SupportColours); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_CORKSCREW + 21)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_CORKSCREW + 21)), { 0, 0, height }, { { 0, 6, height + 4 }, { 32, 20, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 0, height - 3, session.SupportColours); @@ -11895,22 +11899,22 @@ static void GigaRCTrackRightCorkscrewUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_CORKSCREW + 13)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_CORKSCREW + 13)), { 0, 0, height }, { { 6, 6, height + 10 }, { 20, 20, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_CORKSCREW + 16)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_CORKSCREW + 16)), { 0, 0, height }, { { 6, 6, height + 10 }, { 20, 20, 3 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_CORKSCREW + 19)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_CORKSCREW + 19)), { 0, 0, height }, { { 6, 6, height + 10 }, { 20, 20, 3 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_CORKSCREW + 22)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_CORKSCREW + 22)), { 0, 0, height }, { { 6, 6, height + 10 }, { 20, 20, 3 } }); break; } @@ -11922,22 +11926,22 @@ static void GigaRCTrackRightCorkscrewUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_CORKSCREW + 14)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_CORKSCREW + 14)), { 0, 0, height }, { { 6, 0, height + 24 }, { 20, 32, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_CORKSCREW + 17)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_CORKSCREW + 17)), { 0, 0, height }, { { 6, 0, height + 24 }, { 20, 32, 3 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_CORKSCREW + 20)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_CORKSCREW + 20)), { 0, 0, height }, { { 6, 0, height + 24 }, { 20, 32, 3 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_CORKSCREW + 23)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_CORKSCREW + 23)), { 0, 0, height }, { { 6, 0, height + 24 }, { 20, 32, 3 } }); break; } @@ -11966,20 +11970,20 @@ static void GigaRCTrackRightCorkscrewUp( } } -static void GigaRCTrackLeftCorkscrewDown( +static void LatticeTriangleTrackLeftCorkscrewDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackRightCorkscrewUp(session, ride, 2 - trackSequence, (direction + 1) & 3, height, trackElement); + LatticeTriangleTrackRightCorkscrewUp(session, ride, 2 - trackSequence, (direction + 1) & 3, height, trackElement); } -static void GigaRCTrackRightCorkscrewDown( +static void LatticeTriangleTrackRightCorkscrewDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackLeftCorkscrewUp(session, ride, 2 - trackSequence, (direction - 1) & 3, height, trackElement); + LatticeTriangleTrackLeftCorkscrewUp(session, ride, 2 - trackSequence, (direction - 1) & 3, height, trackElement); } -static void GigaRCTrackLeftLargeCorkscrewUp( +static void LatticeTriangleTrackLeftLargeCorkscrewUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -11990,23 +11994,25 @@ static void GigaRCTrackLeftLargeCorkscrewUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 0)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 0)), { 0, 0, height }, { { 0, 6, height + 4 }, { 32, 20, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 5)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 5)), { 0, 0, height }, { { 0, 6, height + 4 }, { 32, 20, 3 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 10)), - { 0, 0, height }, { { 0, 6, height + 4 }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 10)), { 0, 0, height }, + { { 0, 6, height + 4 }, { 32, 20, 3 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 15)), - { 0, 0, height }, { { 0, 6, height + 4 }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 15)), { 0, 0, height }, + { { 0, 6, height + 4 }, { 32, 20, 3 } }); break; } @@ -12031,29 +12037,31 @@ static void GigaRCTrackLeftLargeCorkscrewUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 1)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 1)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); MetalBSupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopRightSide, 21, height, session.SupportColours); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 6)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 6)), { 0, 0, height }, { { 0, 29, height }, { 26, 1, 32 } }); MetalBSupportsPaintSetup( session, kSupportType, MetalSupportPlace::BottomRightSide, 19, height, session.SupportColours); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 11)), - { 0, 0, height }, { { 0, 6, height }, { 20, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 11)), { 0, 0, height }, + { { 0, 6, height }, { 20, 20, 3 } }); MetalBSupportsPaintSetup( session, kSupportType, MetalSupportPlace::BottomLeftSide, 19, height, session.SupportColours); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 16)), - { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 16)), { 0, 0, height }, + { { 0, 6, height }, { 32, 20, 3 } }); MetalBSupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopLeftSide, 16, height, session.SupportColours); break; @@ -12073,23 +12081,25 @@ static void GigaRCTrackLeftLargeCorkscrewUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 2)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 2)), { 0, 0, height }, { { 0, 31, height }, { 48, 1, 64 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 7)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 7)), { 0, 0, height }, { { 2, 2, height + 40 }, { 28, 28, 1 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 12)), - { 0, 0, height }, { { 2, 2, height + 48 }, { 28, 28, 1 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 12)), { 0, 0, height }, + { { 2, 2, height + 48 }, { 28, 28, 1 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 17)), - { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 17)), { 0, 0, height }, + { { 0, 6, height }, { 32, 20, 3 } }); break; } PaintUtilSetSegmentSupportHeight( @@ -12118,29 +12128,31 @@ static void GigaRCTrackLeftLargeCorkscrewUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 3)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 3)), { 0, 0, height }, { { 2, 2, height + 50 }, { 28, 28, 0 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopLeftSide, 0, height + 65, session.SupportColours); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 8)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 8)), { 0, 0, height }, { { 2, 2, height + 50 }, { 28, 28, 0 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopRightSide, 0, height + 65, session.SupportColours); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 13)), - { 0, 0, height }, { { 2, 2, height + 50 }, { 24, 28, 0 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 13)), { 0, 0, height }, + { { 2, 2, height + 50 }, { 24, 28, 0 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::BottomRightSide, 0, height + 65, session.SupportColours); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 18)), - { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 18)), { 0, 0, height }, + { { 0, 6, height }, { 32, 20, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::BottomLeftSide, 0, height + 65, session.SupportColours); break; @@ -12153,23 +12165,25 @@ static void GigaRCTrackLeftLargeCorkscrewUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 4)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 4)), { 0, 0, height }, { { 2, 2, height + 40 }, { 28, 28, 1 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 9)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 9)), { 0, 0, height }, { { 2, 2, height + 40 }, { 28, 28, 1 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 14)), - { 0, 0, height }, { { 2, 2, height + 40 }, { 26, 28, 1 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 14)), { 0, 0, height }, + { { 2, 2, height + 40 }, { 26, 28, 1 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 19)), - { 0, 0, height }, { { 2, 2, height + 40 }, { 26, 28, 1 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 19)), { 0, 0, height }, + { { 2, 2, height + 40 }, { 26, 28, 1 } }); break; } @@ -12195,7 +12209,7 @@ static void GigaRCTrackLeftLargeCorkscrewUp( } } -static void GigaRCTrackRightLargeCorkscrewUp( +static void LatticeTriangleTrackRightLargeCorkscrewUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -12206,23 +12220,27 @@ static void GigaRCTrackRightLargeCorkscrewUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 20)), - { 0, 0, height }, { { 0, 6, height + 4 }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 20)), { 0, 0, height }, + { { 0, 6, height + 4 }, { 32, 20, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 25)), - { 0, 0, height }, { { 0, 6, height + 4 }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 25)), { 0, 0, height }, + { { 0, 6, height + 4 }, { 32, 20, 3 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 30)), - { 0, 0, height }, { { 0, 6, height + 4 }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 30)), { 0, 0, height }, + { { 0, 6, height + 4 }, { 32, 20, 3 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 35)), - { 0, 0, height }, { { 0, 6, height + 4 }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 35)), { 0, 0, height }, + { { 0, 6, height + 4 }, { 32, 20, 3 } }); break; } @@ -12247,29 +12265,33 @@ static void GigaRCTrackRightLargeCorkscrewUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 21)), - { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 21)), { 0, 0, height }, + { { 0, 6, height }, { 32, 20, 3 } }); MetalBSupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopRightSide, 16, height, session.SupportColours); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 26)), - { 0, 0, height }, { { 0, 6, height }, { 20, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 26)), { 0, 0, height }, + { { 0, 6, height }, { 20, 20, 3 } }); MetalBSupportsPaintSetup( session, kSupportType, MetalSupportPlace::BottomRightSide, 19, height, session.SupportColours); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 31)), - { 0, 0, height }, { { 0, 29, height }, { 26, 1, 32 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 31)), { 0, 0, height }, + { { 0, 29, height }, { 26, 1, 32 } }); MetalBSupportsPaintSetup( session, kSupportType, MetalSupportPlace::BottomLeftSide, 19, height, session.SupportColours); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 36)), - { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 36)), { 0, 0, height }, + { { 0, 6, height }, { 32, 20, 3 } }); MetalBSupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopLeftSide, 21, height, session.SupportColours); break; @@ -12289,23 +12311,27 @@ static void GigaRCTrackRightLargeCorkscrewUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 22)), - { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 22)), { 0, 0, height }, + { { 0, 6, height }, { 32, 20, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 27)), - { 0, 0, height }, { { 2, 2, height + 48 }, { 28, 28, 1 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 27)), { 0, 0, height }, + { { 2, 2, height + 48 }, { 28, 28, 1 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 32)), - { 0, 0, height }, { { 2, 2, height + 48 }, { 28, 28, 1 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 32)), { 0, 0, height }, + { { 2, 2, height + 48 }, { 28, 28, 1 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 37)), - { 0, 0, height }, { { 0, 31, height }, { 48, 1, 64 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 37)), { 0, 0, height }, + { { 0, 31, height }, { 48, 1, 64 } }); break; } PaintUtilSetSegmentSupportHeight( @@ -12334,29 +12360,33 @@ static void GigaRCTrackRightLargeCorkscrewUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 23)), - { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 23)), { 0, 0, height }, + { { 0, 6, height }, { 32, 20, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::BottomRightSide, 0, height + 65, session.SupportColours); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 28)), - { 0, 0, height }, { { 2, 2, height + 50 }, { 24, 28, 0 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 28)), { 0, 0, height }, + { { 2, 2, height + 50 }, { 24, 28, 0 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::BottomLeftSide, 0, height + 65, session.SupportColours); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 33)), - { 0, 0, height }, { { 2, 2, height + 50 }, { 28, 28, 0 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 33)), { 0, 0, height }, + { { 2, 2, height + 50 }, { 28, 28, 0 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopLeftSide, 0, height + 65, session.SupportColours); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 38)), - { 0, 0, height }, { { 2, 2, height + 50 }, { 28, 28, 0 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 38)), { 0, 0, height }, + { { 2, 2, height + 50 }, { 28, 28, 0 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopRightSide, 0, height + 65, session.SupportColours); break; @@ -12368,23 +12398,27 @@ static void GigaRCTrackRightLargeCorkscrewUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 24)), - { 0, 0, height }, { { 2, 2, height + 40 }, { 26, 28, 1 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 24)), { 0, 0, height }, + { { 2, 2, height + 40 }, { 26, 28, 1 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 29)), - { 0, 0, height }, { { 2, 2, height + 40 }, { 26, 28, 1 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 29)), { 0, 0, height }, + { { 2, 2, height + 40 }, { 26, 28, 1 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 34)), - { 0, 0, height }, { { 2, 2, height + 40 }, { 28, 28, 1 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 34)), { 0, 0, height }, + { { 2, 2, height + 40 }, { 28, 28, 1 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 39)), - { 0, 0, height }, { { 2, 2, height + 40 }, { 28, 28, 1 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 39)), { 0, 0, height }, + { { 2, 2, height + 40 }, { 28, 28, 1 } }); break; } @@ -12410,21 +12444,21 @@ static void GigaRCTrackRightLargeCorkscrewUp( } } -static void GigaRCTrackLeftLargeCorkscrewDown( +static void LatticeTriangleTrackLeftLargeCorkscrewDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackRightLargeCorkscrewUp(session, ride, 5 - trackSequence, (direction + 1) & 3, height, trackElement); + LatticeTriangleTrackRightLargeCorkscrewUp(session, ride, 5 - trackSequence, (direction + 1) & 3, height, trackElement); } -static void GigaRCTrackRightLargeCorkscrewDown( +static void LatticeTriangleTrackRightLargeCorkscrewDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackLeftLargeCorkscrewUp(session, ride, 5 - trackSequence, (direction - 1) & 3, height, trackElement); + LatticeTriangleTrackLeftLargeCorkscrewUp(session, ride, 5 - trackSequence, (direction - 1) & 3, height, trackElement); } -static void GigaRCTrackLeftMediumHalfLoopUp( +static void LatticeTriangleTrackLeftMediumHalfLoopUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -12435,23 +12469,27 @@ static void GigaRCTrackLeftMediumHalfLoopUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 0)), - { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 0)), { 0, 0, height }, + { { 0, 6, height }, { 32, 20, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 5)), - { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 5)), { 0, 0, height }, + { { 0, 6, height }, { 32, 20, 3 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 10)), - { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 10)), { 0, 0, height }, + { { 0, 6, height }, { 32, 20, 3 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 15)), - { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 15)), { 0, 0, height }, + { { 0, 6, height }, { 32, 20, 3 } }); break; } @@ -12470,23 +12508,27 @@ static void GigaRCTrackLeftMediumHalfLoopUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 1)), - { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 1)), { 0, 0, height }, + { { 0, 6, height }, { 32, 20, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 6)), - { 0, 0, height }, { { 0, 31, height }, { 0, 32, 64 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 6)), { 0, 0, height }, + { { 0, 31, height }, { 0, 32, 64 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 11)), - { 0, 0, height }, { { 0, 32, height }, { 40, 0, 64 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 11)), { 0, 0, height }, + { { 0, 32, height }, { 40, 0, 64 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 16)), - { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 16)), { 0, 0, height }, + { { 0, 6, height }, { 32, 20, 3 } }); break; } @@ -12505,29 +12547,33 @@ static void GigaRCTrackLeftMediumHalfLoopUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 2)), - { 0, 0, height }, { { 0, 0, height + 2 }, { 32, 32, 0 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 2)), { 0, 0, height }, + { { 0, 0, height + 2 }, { 32, 32, 0 } }); MetalBSupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopLeftSide, 14, height, session.SupportColours); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 7)), - { 0, 0, height }, { { 29, 0, height }, { 1, 32, 96 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 7)), { 0, 0, height }, + { { 29, 0, height }, { 1, 32, 96 } }); MetalBSupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopRightSide, 16, height, session.SupportColours); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 12)), - { 0, 0, height }, { { 31, 0, height }, { 1, 32, 96 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 12)), { 0, 0, height }, + { { 31, 0, height }, { 1, 32, 96 } }); MetalBSupportsPaintSetup( session, kSupportType, MetalSupportPlace::BottomRightSide, 18, height, session.SupportColours); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 17)), - { 0, 0, height }, { { 0, 0, height }, { 32, 32, 0 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 17)), { 0, 0, height }, + { { 0, 0, height }, { 32, 32, 0 } }); MetalBSupportsPaintSetup( session, kSupportType, MetalSupportPlace::BottomLeftSide, 14, height, session.SupportColours); break; @@ -12547,23 +12593,27 @@ static void GigaRCTrackLeftMediumHalfLoopUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 3)), - { 0, 0, height }, { { 2, 0, height }, { 1, 32, 160 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 3)), { 0, 0, height }, + { { 2, 0, height }, { 1, 32, 160 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 8)), - { 0, 0, height }, { { 30, 24, height }, { 0, 8, 160 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 8)), { 0, 0, height }, + { { 30, 24, height }, { 0, 8, 160 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 13)), - { 0, 0, height }, { { 29, 0, height }, { 1, 32, 160 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 13)), { 0, 0, height }, + { { 29, 0, height }, { 1, 32, 160 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 18)), - { 0, 0, height }, { { 0, 0, height }, { 1, 32, 160 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 18)), { 0, 0, height }, + { { 0, 0, height }, { 1, 32, 160 } }); break; } PaintUtilSetSegmentSupportHeight( @@ -12581,23 +12631,27 @@ static void GigaRCTrackLeftMediumHalfLoopUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 4)), - { 0, 0, height }, { { 0, 2, height + 48 }, { 32, 32, 1 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 4)), { 0, 0, height }, + { { 0, 2, height + 48 }, { 32, 32, 1 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 9)), - { 0, 0, height }, { { 0, 2, height + 48 }, { 32, 32, 1 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 9)), { 0, 0, height }, + { { 0, 2, height + 48 }, { 32, 32, 1 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 14)), - { 0, 0, height }, { { 0, 0, height + 48 }, { 32, 32, 1 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 14)), { 0, 0, height }, + { { 0, 0, height + 48 }, { 32, 32, 1 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 19)), - { 0, 0, height }, { { 0, 0, height + 48 }, { 32, 32, 1 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 19)), { 0, 0, height }, + { { 0, 0, height + 48 }, { 32, 32, 1 } }); break; } @@ -12619,7 +12673,7 @@ static void GigaRCTrackLeftMediumHalfLoopUp( } } -static void GigaRCTrackRightMediumHalfLoopUp( +static void LatticeTriangleTrackRightMediumHalfLoopUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -12630,23 +12684,27 @@ static void GigaRCTrackRightMediumHalfLoopUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 20)), - { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 20)), { 0, 0, height }, + { { 0, 6, height }, { 32, 20, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 25)), - { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 25)), { 0, 0, height }, + { { 0, 6, height }, { 32, 20, 3 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 30)), - { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 30)), { 0, 0, height }, + { { 0, 6, height }, { 32, 20, 3 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 35)), - { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 35)), { 0, 0, height }, + { { 0, 6, height }, { 32, 20, 3 } }); break; } @@ -12665,23 +12723,27 @@ static void GigaRCTrackRightMediumHalfLoopUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 21)), - { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 21)), { 0, 0, height }, + { { 0, 6, height }, { 32, 20, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 26)), - { 0, 0, height }, { { 0, 32, height }, { 40, 0, 64 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 26)), { 0, 0, height }, + { { 0, 32, height }, { 40, 0, 64 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 31)), - { 0, 0, height }, { { 0, 31, height }, { 0, 32, 64 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 31)), { 0, 0, height }, + { { 0, 31, height }, { 0, 32, 64 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 36)), - { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 36)), { 0, 0, height }, + { { 0, 6, height }, { 32, 20, 3 } }); break; } @@ -12700,29 +12762,33 @@ static void GigaRCTrackRightMediumHalfLoopUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 22)), - { 0, 0, height }, { { 0, 0, height }, { 32, 32, 0 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 22)), { 0, 0, height }, + { { 0, 0, height }, { 32, 32, 0 } }); MetalBSupportsPaintSetup( session, kSupportType, MetalSupportPlace::BottomRightSide, 14, height, session.SupportColours); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 27)), - { 0, 0, height }, { { 30, 16, height }, { 0, 32, 96 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 27)), { 0, 0, height }, + { { 30, 16, height }, { 0, 32, 96 } }); MetalBSupportsPaintSetup( session, kSupportType, MetalSupportPlace::BottomLeftSide, 18, height, session.SupportColours); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 32)), - { 0, 0, height }, { { 29, 0, height }, { 0, 32, 96 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 32)), { 0, 0, height }, + { { 29, 0, height }, { 0, 32, 96 } }); MetalBSupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopLeftSide, 16, height, session.SupportColours); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 37)), - { 0, 0, height }, { { 0, 0, height + 2 }, { 32, 32, 0 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 37)), { 0, 0, height }, + { { 0, 0, height + 2 }, { 32, 32, 0 } }); MetalBSupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopRightSide, 14, height, session.SupportColours); break; @@ -12742,23 +12808,27 @@ static void GigaRCTrackRightMediumHalfLoopUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 23)), - { 0, 0, height }, { { 0, 0, height }, { 1, 32, 160 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 23)), { 0, 0, height }, + { { 0, 0, height }, { 1, 32, 160 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 28)), - { 0, 0, height }, { { 29, 16, height }, { 0, 16, 160 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 28)), { 0, 0, height }, + { { 29, 16, height }, { 0, 16, 160 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 33)), - { 0, 0, height }, { { 30, 0, height }, { 0, 32, 160 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 33)), { 0, 0, height }, + { { 30, 0, height }, { 0, 32, 160 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 38)), - { 0, 0, height }, { { 2, 0, height }, { 1, 32, 160 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 38)), { 0, 0, height }, + { { 2, 0, height }, { 1, 32, 160 } }); break; } @@ -12777,23 +12847,27 @@ static void GigaRCTrackRightMediumHalfLoopUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 24)), - { 0, 0, height }, { { 0, 0, height + 48 }, { 32, 32, 1 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 24)), { 0, 0, height }, + { { 0, 0, height + 48 }, { 32, 32, 1 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 29)), - { 0, 0, height }, { { 0, 0, height + 48 }, { 32, 32, 1 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 29)), { 0, 0, height }, + { { 0, 0, height + 48 }, { 32, 32, 1 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 34)), - { 0, 0, height }, { { 0, 0, height + 48 }, { 32, 32, 1 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 34)), { 0, 0, height }, + { { 0, 0, height + 48 }, { 32, 32, 1 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 39)), - { 0, 0, height }, { { 0, 0, height + 48 }, { 32, 32, 1 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 39)), { 0, 0, height }, + { { 0, 0, height + 48 }, { 32, 32, 1 } }); break; } @@ -12814,21 +12888,21 @@ static void GigaRCTrackRightMediumHalfLoopUp( } } -static void GigaRCTrackLeftMediumHalfLoopDown( +static void LatticeTriangleTrackLeftMediumHalfLoopDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackRightMediumHalfLoopUp(session, ride, 4 - trackSequence, direction, height, trackElement); + LatticeTriangleTrackRightMediumHalfLoopUp(session, ride, 4 - trackSequence, direction, height, trackElement); } -static void GigaRCTrackRightMediumHalfLoopDown( +static void LatticeTriangleTrackRightMediumHalfLoopDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackLeftMediumHalfLoopUp(session, ride, 4 - trackSequence, direction, height, trackElement); + LatticeTriangleTrackLeftMediumHalfLoopUp(session, ride, 4 - trackSequence, direction, height, trackElement); } -static void GigaRCTrackLeftZeroGRollUp( +static void LatticeTriangleTrackLeftZeroGRollUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -12839,34 +12913,34 @@ static void GigaRCTrackLeftZeroGRollUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_ZERO_G_ROLL + 0)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_ZERO_G_ROLL + 0)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_ZERO_G_ROLL + 1)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_ZERO_G_ROLL + 1)), { 0, 0, height }, { { 0, 6, height + 32 }, { 32, 20, 1 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 0, height, session.SupportColours); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_ZERO_G_ROLL + 4)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_ZERO_G_ROLL + 4)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_ZERO_G_ROLL + 5)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_ZERO_G_ROLL + 5)), { 0, 0, height }, { { 0, 31, height }, { 40, 1, 32 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 3, height, session.SupportColours); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_ZERO_G_ROLL + 8)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_ZERO_G_ROLL + 8)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 5, height, session.SupportColours); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_ZERO_G_ROLL + 12)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_ZERO_G_ROLL + 12)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 11, height, session.SupportColours); @@ -12886,22 +12960,22 @@ static void GigaRCTrackLeftZeroGRollUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_ZERO_G_ROLL + 2)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_ZERO_G_ROLL + 2)), { 0, 0, height }, { { 0, 6, height + 32 }, { 32, 20, 1 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_ZERO_G_ROLL + 6)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_ZERO_G_ROLL + 6)), { 0, 0, height }, { { 0, 6, height + 32 }, { 40, 20, 1 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_ZERO_G_ROLL + 9)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_ZERO_G_ROLL + 9)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_ZERO_G_ROLL + 13)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_ZERO_G_ROLL + 13)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); break; } @@ -12920,28 +12994,28 @@ static void GigaRCTrackLeftZeroGRollUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_ZERO_G_ROLL + 3)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_ZERO_G_ROLL + 3)), { 0, 0, height }, { { 0, 6, height + 32 }, { 40, 20, 1 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_ZERO_G_ROLL + 7)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_ZERO_G_ROLL + 7)), { 0, 0, height }, { { 0, 6, height + 32 }, { 32, 20, 1 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_ZERO_G_ROLL + 10)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_ZERO_G_ROLL + 10)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_ZERO_G_ROLL + 11)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_ZERO_G_ROLL + 11)), { 0, 0, height }, { { 0, 6, height + 36 }, { 32, 20, 0 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_ZERO_G_ROLL + 14)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_ZERO_G_ROLL + 14)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_ZERO_G_ROLL + 15)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_ZERO_G_ROLL + 15)), { 0, 0, height }, { { 0, 6, height + 36 }, { 32, 20, 0 } }); break; } @@ -12968,7 +13042,7 @@ static void GigaRCTrackLeftZeroGRollUp( } } -static void GigaRCTrackRightZeroGRollUp( +static void LatticeTriangleTrackRightZeroGRollUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -12979,34 +13053,34 @@ static void GigaRCTrackRightZeroGRollUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_ZERO_G_ROLL + 16)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_ZERO_G_ROLL + 16)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 11, height, session.SupportColours); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_ZERO_G_ROLL + 20)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_ZERO_G_ROLL + 20)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 5, height, session.SupportColours); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_ZERO_G_ROLL + 24)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_ZERO_G_ROLL + 24)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_ZERO_G_ROLL + 25)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_ZERO_G_ROLL + 25)), { 0, 0, height }, { { 0, 31, height }, { 40, 1, 32 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 3, height, session.SupportColours); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_ZERO_G_ROLL + 28)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_ZERO_G_ROLL + 28)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_ZERO_G_ROLL + 29)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_ZERO_G_ROLL + 29)), { 0, 0, height }, { { 0, 6, height + 32 }, { 32, 20, 1 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 0, height, session.SupportColours); @@ -13025,22 +13099,22 @@ static void GigaRCTrackRightZeroGRollUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_ZERO_G_ROLL + 17)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_ZERO_G_ROLL + 17)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_ZERO_G_ROLL + 21)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_ZERO_G_ROLL + 21)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_ZERO_G_ROLL + 26)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_ZERO_G_ROLL + 26)), { 0, 0, height }, { { 0, 31, height }, { 44, 1, 32 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_ZERO_G_ROLL + 30)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_ZERO_G_ROLL + 30)), { 0, 0, height }, { { 0, 6, height + 32 }, { 32, 20, 1 } }); break; } @@ -13059,28 +13133,28 @@ static void GigaRCTrackRightZeroGRollUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_ZERO_G_ROLL + 18)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_ZERO_G_ROLL + 18)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_ZERO_G_ROLL + 19)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_ZERO_G_ROLL + 19)), { 0, 0, height }, { { 0, 6, height + 36 }, { 32, 20, 0 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_ZERO_G_ROLL + 22)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_ZERO_G_ROLL + 22)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 32 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_ZERO_G_ROLL + 23)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_ZERO_G_ROLL + 23)), { 0, 0, height }, { { 0, 6, height + 36 }, { 32, 20, 0 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_ZERO_G_ROLL + 27)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_ZERO_G_ROLL + 27)), { 0, 0, height }, { { 0, 6, height + 32 }, { 32, 20, 1 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_ZERO_G_ROLL + 31)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_ZERO_G_ROLL + 31)), { 0, 0, height }, { { 0, 6, height + 32 }, { 40, 20, 1 } }); break; } @@ -13107,21 +13181,21 @@ static void GigaRCTrackRightZeroGRollUp( } } -static void GigaRCTrackLeftZeroGRollDown( +static void LatticeTriangleTrackLeftZeroGRollDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackLeftZeroGRollUp(session, ride, 2 - trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackLeftZeroGRollUp(session, ride, 2 - trackSequence, (direction + 2) & 3, height, trackElement); } -static void GigaRCTrackRightZeroGRollDown( +static void LatticeTriangleTrackRightZeroGRollDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackRightZeroGRollUp(session, ride, 2 - trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackRightZeroGRollUp(session, ride, 2 - trackSequence, (direction + 2) & 3, height, trackElement); } -static void GigaRCTrackLeftLargeZeroGRollUp( +static void LatticeTriangleTrackLeftLargeZeroGRollUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -13132,25 +13206,30 @@ static void GigaRCTrackLeftLargeZeroGRollUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 0)), - { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 0)), { 0, 0, height }, + { { 0, 6, height }, { 32, 20, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 5)), - { 0, 0, height }, { { 0, 30, height }, { 32, 0, 96 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 5)), { 0, 0, height }, + { { 0, 30, height }, { 32, 0, 96 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 9)), - { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 9)), { 0, 0, height }, + { { 0, 6, height }, { 32, 20, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 10)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 10)), { 0, 0, height }, { { 0, 30, height }, { 32, 0, 96 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 15)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 15)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); break; } @@ -13168,25 +13247,30 @@ static void GigaRCTrackLeftLargeZeroGRollUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 1)), - { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 1)), { 0, 0, height }, + { { 0, 6, height }, { 32, 20, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 2)), - { 0, 0, height }, { { 0, 30, height }, { 32, 0, 96 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 2)), { 0, 0, height }, + { { 0, 30, height }, { 32, 0, 96 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 6)), - { 0, 0, height }, { { 0, 30, height }, { 32, 0, 64 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 6)), { 0, 0, height }, + { { 0, 30, height }, { 32, 0, 64 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 11)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 11)), { 0, 0, height }, { { 0, 2, height }, { 32, 0, 64 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 16)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 16)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); break; } @@ -13199,25 +13283,30 @@ static void GigaRCTrackLeftLargeZeroGRollUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 3)), - { 0, 0, height }, { { 0, 30, height }, { 32, 0, 64 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 3)), { 0, 0, height }, + { { 0, 30, height }, { 32, 0, 64 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 7)), - { 0, 0, height }, { { 0, 30, height }, { 32, 0, 48 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 7)), { 0, 0, height }, + { { 0, 30, height }, { 32, 0, 48 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 12)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 12)), { 0, 0, height }, { { 0, 2, height }, { 32, 0, 48 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 17)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 17)), { 0, 0, height }, { { 0, 2, height }, { 32, 0, 32 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 18)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 18)), { 0, 0, height }, { { 0, 6, height + 40 }, { 32, 20, 3 } }); break; } @@ -13244,31 +13333,36 @@ static void GigaRCTrackLeftLargeZeroGRollUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 4)), - { 0, 0, height }, { { 0, 26, height }, { 32, 0, 32 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 4)), { 0, 0, height }, + { { 0, 26, height }, { 32, 0, 32 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::BottomLeftSide, 0, height + 37, session.SupportColours); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 8)), - { 0, 0, height }, { { 0, 26, height }, { 26, 0, 20 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 8)), { 0, 0, height }, + { { 0, 26, height }, { 26, 0, 20 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopLeftSide, 0, height + 37, session.SupportColours); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 13)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 13)), { 0, 0, height }, { { 0, 2, height }, { 32, 0, 32 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 14)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 14)), { 0, 0, height }, { { 0, 6, height + 40 }, { 32, 20, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopRightSide, 0, height + 37, session.SupportColours); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 19)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 19)), { 0, 0, height }, { { 0, 18, height }, { 32, 1, 30 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::BottomRightSide, 0, height + 37, session.SupportColours); @@ -13288,7 +13382,7 @@ static void GigaRCTrackLeftLargeZeroGRollUp( } } -static void GigaRCTrackRightLargeZeroGRollUp( +static void LatticeTriangleTrackRightLargeZeroGRollUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -13299,25 +13393,30 @@ static void GigaRCTrackRightLargeZeroGRollUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 20)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 20)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 25)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 25)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 26)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 26)), { 0, 0, height }, { { 0, 30, height }, { 32, 0, 96 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 31)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 31)), { 0, 0, height }, { { 0, 30, height }, { 32, 0, 96 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 35)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 35)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); break; } @@ -13335,25 +13434,30 @@ static void GigaRCTrackRightLargeZeroGRollUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 21)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 21)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 27)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 27)), { 0, 0, height }, { { 0, 2, height }, { 32, 0, 64 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 32)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 32)), { 0, 0, height }, { { 0, 30, height }, { 32, 0, 64 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 36)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 36)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 37)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 37)), { 0, 0, height }, { { 0, 30, height }, { 32, 0, 96 } }); break; } @@ -13366,25 +13470,30 @@ static void GigaRCTrackRightLargeZeroGRollUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 22)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 22)), { 0, 0, height }, { { 0, 2, height }, { 32, 0, 32 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 23)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 23)), { 0, 0, height }, { { 0, 6, height + 40 }, { 32, 20, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 28)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 28)), { 0, 0, height }, { { 0, 2, height }, { 32, 0, 48 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 33)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 33)), { 0, 0, height }, { { 0, 30, height }, { 32, 0, 48 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 38)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 38)), { 0, 0, height }, { { 0, 30, height }, { 32, 0, 64 } }); break; } @@ -13412,31 +13521,36 @@ static void GigaRCTrackRightLargeZeroGRollUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 24)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 24)), { 0, 0, height }, { { 0, 18, height }, { 32, 1, 30 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::BottomLeftSide, 0, height + 37, session.SupportColours); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 29)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 29)), { 0, 0, height }, { { 0, 2, height }, { 32, 0, 32 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 30)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 30)), { 0, 0, height }, { { 0, 6, height + 40 }, { 32, 20, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopLeftSide, 0, height + 37, session.SupportColours); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 34)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 34)), { 0, 0, height }, { { 0, 26, height }, { 32, 0, 30 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopRightSide, 0, height + 37, session.SupportColours); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 39)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 39)), { 0, 0, height }, { { 0, 26, height }, { 40, 0, 32 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::BottomRightSide, 0, height + 37, session.SupportColours); @@ -13456,21 +13570,21 @@ static void GigaRCTrackRightLargeZeroGRollUp( } } -static void GigaRCTrackLeftLargeZeroGRollDown( +static void LatticeTriangleTrackLeftLargeZeroGRollDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackLeftLargeZeroGRollUp(session, ride, 3 - trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackLeftLargeZeroGRollUp(session, ride, 3 - trackSequence, (direction + 2) & 3, height, trackElement); } -static void GigaRCTrackRightLargeZeroGRollDown( +static void LatticeTriangleTrackRightLargeZeroGRollDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackRightLargeZeroGRollUp(session, ride, 3 - trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackRightLargeZeroGRollUp(session, ride, 3 - trackSequence, (direction + 2) & 3, height, trackElement); } -static void GigaRCTrack90DegToInvertedFlatQuarterLoopUp( +static void LatticeTriangleTrack90DegToInvertedFlatQuarterLoopUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -13481,22 +13595,22 @@ static void GigaRCTrack90DegToInvertedFlatQuarterLoopUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_QUARTER_LOOP + 0)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_QUARTER_LOOP + 0)), { 0, 0, height }, { { 4, 6, height + 8 }, { 2, 20, 31 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_QUARTER_LOOP + 3)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_QUARTER_LOOP + 3)), { 0, 0, height }, { { 24, 6, height + 8 }, { 2, 20, 31 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_QUARTER_LOOP + 6)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_QUARTER_LOOP + 6)), { 0, 0, height }, { { 24, 6, height + 8 }, { 2, 20, 31 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_QUARTER_LOOP + 9)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_QUARTER_LOOP + 9)), { 0, 0, height }, { { 4, 6, height + 8 }, { 2, 20, 31 } }); break; } @@ -13512,22 +13626,22 @@ static void GigaRCTrack90DegToInvertedFlatQuarterLoopUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_QUARTER_LOOP + 1)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_QUARTER_LOOP + 1)), { 0, 0, height }, { { -8, 6, height }, { 2, 20, 31 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_QUARTER_LOOP + 4)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_QUARTER_LOOP + 4)), { 0, 0, height }, { { 24, 6, height + 8 }, { 2, 20, 63 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_QUARTER_LOOP + 7)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_QUARTER_LOOP + 7)), { 0, 0, height }, { { 24, 6, height + 8 }, { 2, 20, 63 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_QUARTER_LOOP + 10)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_QUARTER_LOOP + 10)), { 0, 0, height }, { { -8, 6, height }, { 2, 20, 31 } }); break; } @@ -13543,22 +13657,22 @@ static void GigaRCTrack90DegToInvertedFlatQuarterLoopUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_QUARTER_LOOP + 2)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_QUARTER_LOOP + 2)), { 0, 0, height }, { { 0, 6, height + 24 }, { 32, 20, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_QUARTER_LOOP + 5)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_QUARTER_LOOP + 5)), { 0, 0, height }, { { 24, 6, height + 8 }, { 2, 20, 31 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_QUARTER_LOOP + 8)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_QUARTER_LOOP + 8)), { 0, 0, height }, { { 24, 6, height + 8 }, { 2, 20, 31 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_QUARTER_LOOP + 11)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_QUARTER_LOOP + 11)), { 0, 0, height }, { { 0, 6, height + 24 }, { 32, 20, 3 } }); break; } @@ -13576,14 +13690,14 @@ static void GigaRCTrack90DegToInvertedFlatQuarterLoopUp( } } -static void GigaRCTrackInvertedFlatTo90DegQuarterLoopDown( +static void LatticeTriangleTrackInvertedFlatTo90DegQuarterLoopDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrack90DegToInvertedFlatQuarterLoopUp(session, ride, 2 - trackSequence, direction, height, trackElement); + LatticeTriangleTrack90DegToInvertedFlatQuarterLoopUp(session, ride, 2 - trackSequence, direction, height, trackElement); } -static void GigaRCTrackLeftBankToLeftQuarterTurn3Tile25DegUp( +static void LatticeTriangleTrackLeftBankToLeftQuarterTurn3Tile25DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -13594,25 +13708,30 @@ static void GigaRCTrackLeftBankToLeftQuarterTurn3Tile25DegUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION + 0)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION + 0)), { 0, 6, height }, { 32, 20, 3 }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION + 2)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION + 2)), { 0, 6, height }, { 32, 20, 3 }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION + 3)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION + 3)), { 0, 6, height }, { { 0, 27, height }, { 32, 1, 26 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION + 5)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION + 5)), { 0, 6, height }, { 32, 20, 3 }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION + 7)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION + 7)), { 0, 6, height }, { 32, 20, 3 }); break; } @@ -13642,22 +13761,26 @@ static void GigaRCTrackLeftBankToLeftQuarterTurn3Tile25DegUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION + 1)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION + 1)), { 6, 0, height }, { { 0, 6, height - 6 }, { 20, 32, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION + 4)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION + 4)), { 6, 0, height }, { { 0, 6, height - 6 }, { 20, 32, 3 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION + 6)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION + 6)), { 6, 0, height }, { { 0, 6, height - 6 }, { 20, 32, 3 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION + 8)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION + 8)), { 6, 0, height }, { { 0, 6, height - 6 }, { 20, 32, 3 } }); break; } @@ -13684,7 +13807,7 @@ static void GigaRCTrackLeftBankToLeftQuarterTurn3Tile25DegUp( } } -static void GigaRCTrackRightBankToRightQuarterTurn3Tile25DegUp( +static void LatticeTriangleTrackRightBankToRightQuarterTurn3Tile25DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -13695,25 +13818,30 @@ static void GigaRCTrackRightBankToRightQuarterTurn3Tile25DegUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION + 9)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION + 9)), { 0, 6, height }, { 32, 20, 3 }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION + 11)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION + 11)), { 0, 6, height }, { 32, 20, 3 }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION + 13)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION + 13)), { 0, 6, height }, { 32, 20, 3 }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION + 14)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION + 14)), { 0, 6, height }, { { 0, 27, height }, { 32, 1, 26 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION + 16)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION + 16)), { 0, 6, height }, { 32, 20, 3 }); break; } @@ -13743,22 +13871,26 @@ static void GigaRCTrackRightBankToRightQuarterTurn3Tile25DegUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION + 10)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION + 10)), { 6, 0, height }, { { 0, 6, height - 6 }, { 20, 32, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION + 12)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION + 12)), { 6, 0, height }, { { 0, 6, height - 6 }, { 20, 32, 3 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION + 15)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION + 15)), { 6, 0, height }, { { 0, 6, height - 6 }, { 20, 32, 3 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION + 17)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION + 17)), { 6, 0, height }, { { 0, 6, height - 6 }, { 20, 32, 3 } }); break; } @@ -13785,7 +13917,7 @@ static void GigaRCTrackRightBankToRightQuarterTurn3Tile25DegUp( } } -static void GigaRCTrackLeftQuarterTurn3Tile25DegDownToLeftBank( +static void LatticeTriangleTrackLeftQuarterTurn3Tile25DegDownToLeftBank( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -13796,22 +13928,26 @@ static void GigaRCTrackLeftQuarterTurn3Tile25DegDownToLeftBank( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION + 12)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION + 12)), { 0, 6, height }, { { 0, 6, height - 6 }, { 32, 20, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION + 15)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION + 15)), { 0, 6, height }, { { 0, 6, height - 6 }, { 32, 20, 3 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION + 17)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION + 17)), { 0, 6, height }, { { 0, 6, height - 6 }, { 32, 20, 3 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION + 10)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION + 10)), { 0, 6, height }, { { 0, 6, height - 6 }, { 32, 20, 3 } }); break; } @@ -13841,25 +13977,30 @@ static void GigaRCTrackLeftQuarterTurn3Tile25DegDownToLeftBank( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION + 11)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION + 11)), { 6, 0, height }, { 20, 32, 3 }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION + 13)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION + 13)), { 6, 0, height }, { 20, 32, 3 }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION + 14)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION + 14)), { 6, 0, height }, { { 27, 0, height }, { 1, 32, 26 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION + 16)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION + 16)), { 6, 0, height }, { 20, 32, 3 }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION + 9)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION + 9)), { 6, 0, height }, { 20, 32, 3 }); break; } @@ -13886,7 +14027,7 @@ static void GigaRCTrackLeftQuarterTurn3Tile25DegDownToLeftBank( } } -static void GigaRCTrackRightQuarterTurn3Tile25DegDownToRightBank( +static void LatticeTriangleTrackRightQuarterTurn3Tile25DegDownToRightBank( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -13897,22 +14038,26 @@ static void GigaRCTrackRightQuarterTurn3Tile25DegDownToRightBank( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION + 8)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION + 8)), { 0, 6, height }, { { 0, 6, height - 6 }, { 32, 20, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION + 1)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION + 1)), { 0, 6, height }, { { 0, 6, height - 6 }, { 32, 20, 3 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION + 4)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION + 4)), { 0, 6, height }, { { 0, 6, height - 6 }, { 32, 20, 3 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION + 6)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION + 6)), { 0, 6, height }, { { 0, 6, height - 6 }, { 32, 20, 3 } }); break; } @@ -13942,25 +14087,30 @@ static void GigaRCTrackRightQuarterTurn3Tile25DegDownToRightBank( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION + 7)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION + 7)), { 6, 0, height }, { 20, 32, 3 }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION + 0)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION + 0)), { 6, 0, height }, { 20, 32, 3 }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION + 2)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION + 2)), { 6, 0, height }, { 20, 32, 3 }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION + 3)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION + 3)), { 6, 0, height }, { { 27, 0, height }, { 1, 32, 26 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION + 5)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION + 5)), { 6, 0, height }, { 20, 32, 3 }); break; } @@ -13987,7 +14137,7 @@ static void GigaRCTrackRightQuarterTurn3Tile25DegDownToRightBank( } } -static void GigaRCTrackLeftLargeHalfLoopUp( +static void LatticeTriangleTrackLeftLargeHalfLoopUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -13998,23 +14148,25 @@ static void GigaRCTrackLeftLargeHalfLoopUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 0)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 0)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 7)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 7)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 14)), - { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 14)), { 0, 0, height }, + { { 0, 6, height }, { 32, 20, 3 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 21)), - { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 21)), { 0, 0, height }, + { { 0, 6, height }, { 32, 20, 3 } }); break; } MetalASupportsPaintSetup(session, kSupportType, MetalSupportPlace::Centre, 5, height, session.SupportColours); @@ -14031,29 +14183,31 @@ static void GigaRCTrackLeftLargeHalfLoopUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 1)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 1)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 12, height, session.SupportColours); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 8)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 8)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 9 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 6, height, session.SupportColours); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 15)), - { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 15)), { 0, 0, height }, + { { 0, 6, height }, { 32, 20, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 0, height, session.SupportColours); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 22)), - { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 22)), { 0, 0, height }, + { { 0, 6, height }, { 32, 20, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 0, height, session.SupportColours); break; @@ -14067,23 +14221,25 @@ static void GigaRCTrackLeftLargeHalfLoopUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 2)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 2)), { 0, 0, height }, { { 0, 0, height }, { 32, 16, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 9)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 9)), { 0, 0, height }, { { 0, 0, height + 70 }, { 32, 16, 0 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 16)), - { 0, 0, height }, { { 0, 16, height + 70 }, { 32, 16, 0 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 16)), { 0, 0, height }, + { { 0, 16, height + 70 }, { 32, 16, 0 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 23)), - { 0, 0, height }, { { 0, 16, height }, { 32, 16, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 23)), { 0, 0, height }, + { { 0, 16, height }, { 32, 16, 3 } }); break; } PaintUtilSetSegmentSupportHeight( @@ -14101,29 +14257,32 @@ static void GigaRCTrackLeftLargeHalfLoopUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 3)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 3)), { 0, 0, height }, { { 0, 0, height }, { 32, 16, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopLeftSide, 14, height + 8, session.SupportColours); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 10)), - { 0, 0, height }, { { 0, 0, height + 200 }, { 32, 16, 0 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 10)), { 0, 0, height }, + { { 0, 0, height + 200 }, { 32, 16, 0 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopRightSide, 14, height + 8, session.SupportColours); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 17)), - { 0, 0, height }, { { 0, 16, height + 200 }, { 32, 16, 0 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 17)), { 0, 0, height }, + { { 0, 16, height + 200 }, { 32, 16, 0 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::BottomRightSide, 0, height + 21, session.SupportColours); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 24)), - { 0, 0, height }, { { 0, 16, height }, { 32, 16, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 24)), { 0, 0, height }, + { { 0, 16, height }, { 32, 16, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::BottomLeftSide, 22, height, session.SupportColours); break; @@ -14143,23 +14302,26 @@ static void GigaRCTrackLeftLargeHalfLoopUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 4)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 4)), { 0, 0, height }, { { 16, 16, height }, { 16, 16, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 11)), - { 0, 0, height }, { { 0, 16, height + 110 }, { 16, 16, 0 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 11)), { 0, 0, height }, + { { 0, 16, height + 110 }, { 16, 16, 0 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 18)), - { 0, 0, height }, { { 0, 0, height + 100 }, { 16, 16, 0 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 18)), { 0, 0, height }, + { { 0, 0, height + 100 }, { 16, 16, 0 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 25)), - { 0, 0, height }, { { 16, 0, height }, { 16, 16, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 25)), { 0, 0, height }, + { { 16, 0, height }, { 16, 16, 3 } }); break; } PaintUtilSetSegmentSupportHeight( @@ -14177,23 +14339,26 @@ static void GigaRCTrackLeftLargeHalfLoopUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 5)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 5)), { 0, 0, height }, { { 0, 16, height }, { 32, 16, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 12)), - { 0, 0, height }, { { 0, 16, height + 200 }, { 32, 16, 0 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 12)), { 0, 0, height }, + { { 0, 16, height + 200 }, { 32, 16, 0 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 19)), - { 0, 0, height }, { { 0, 0, height + 200 }, { 32, 16, 0 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 19)), { 0, 0, height }, + { { 0, 0, height + 200 }, { 32, 16, 0 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 26)), - { 0, 0, height }, { { 0, 0, height }, { 32, 16, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 26)), { 0, 0, height }, + { { 0, 0, height }, { 32, 16, 3 } }); break; } PaintUtilSetSegmentSupportHeight( @@ -14211,23 +14376,26 @@ static void GigaRCTrackLeftLargeHalfLoopUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 6)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 6)), { 0, 0, height }, { { 0, 16, height + 32 }, { 32, 16, 0 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 13)), - { 0, 0, height }, { { 0, 16, height + 32 }, { 32, 16, 0 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 13)), { 0, 0, height }, + { { 0, 16, height + 32 }, { 32, 16, 0 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 20)), - { 0, 0, height }, { { 0, 0, height + 32 }, { 32, 16, 0 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 20)), { 0, 0, height }, + { { 0, 0, height + 32 }, { 32, 16, 0 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 27)), - { 0, 0, height }, { { 0, 0, height + 32 }, { 32, 16, 0 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 27)), { 0, 0, height }, + { { 0, 0, height + 32 }, { 32, 16, 0 } }); break; } if (direction == 0 || direction == 3) @@ -14247,7 +14415,7 @@ static void GigaRCTrackLeftLargeHalfLoopUp( } } -static void GigaRCTrackRightLargeHalfLoopUp( +static void LatticeTriangleTrackRightLargeHalfLoopUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -14258,23 +14426,27 @@ static void GigaRCTrackRightLargeHalfLoopUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 28)), - { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 28)), { 0, 0, height }, + { { 0, 6, height }, { 32, 20, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 35)), - { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 35)), { 0, 0, height }, + { { 0, 6, height }, { 32, 20, 3 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 42)), - { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 42)), { 0, 0, height }, + { { 0, 6, height }, { 32, 20, 3 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 49)), - { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 49)), { 0, 0, height }, + { { 0, 6, height }, { 32, 20, 3 } }); break; } MetalASupportsPaintSetup(session, kSupportType, MetalSupportPlace::Centre, 5, height, session.SupportColours); @@ -14291,29 +14463,33 @@ static void GigaRCTrackRightLargeHalfLoopUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 29)), - { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 29)), { 0, 0, height }, + { { 0, 6, height }, { 32, 20, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 0, height, session.SupportColours); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 36)), - { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 36)), { 0, 0, height }, + { { 0, 6, height }, { 32, 20, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 0, height, session.SupportColours); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 43)), - { 0, 0, height }, { { 0, 6, height }, { 32, 20, 9 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 43)), { 0, 0, height }, + { { 0, 6, height }, { 32, 20, 9 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 6, height, session.SupportColours); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 50)), - { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 50)), { 0, 0, height }, + { { 0, 6, height }, { 32, 20, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 12, height, session.SupportColours); break; @@ -14327,23 +14503,27 @@ static void GigaRCTrackRightLargeHalfLoopUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 30)), - { 0, 0, height }, { { 0, 16, height }, { 32, 16, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 30)), { 0, 0, height }, + { { 0, 16, height }, { 32, 16, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 37)), - { 0, 0, height }, { { 0, 16, height + 70 }, { 32, 16, 0 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 37)), { 0, 0, height }, + { { 0, 16, height + 70 }, { 32, 16, 0 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 44)), - { 0, 0, height }, { { 0, 0, height + 70 }, { 32, 16, 0 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 44)), { 0, 0, height }, + { { 0, 0, height + 70 }, { 32, 16, 0 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 51)), - { 0, 0, height }, { { 0, 0, height }, { 32, 16, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 51)), { 0, 0, height }, + { { 0, 0, height }, { 32, 16, 3 } }); break; } PaintUtilSetSegmentSupportHeight( @@ -14361,29 +14541,33 @@ static void GigaRCTrackRightLargeHalfLoopUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 31)), - { 0, 0, height }, { { 0, 16, height }, { 32, 16, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 31)), { 0, 0, height }, + { { 0, 16, height }, { 32, 16, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::BottomRightSide, 22, height, session.SupportColours); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 38)), - { 0, 0, height }, { { 0, 16, height + 200 }, { 32, 16, 0 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 38)), { 0, 0, height }, + { { 0, 16, height + 200 }, { 32, 16, 0 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::BottomLeftSide, 0, height + 21, session.SupportColours); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 45)), - { 0, 0, height }, { { 0, 0, height + 200 }, { 32, 16, 0 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 45)), { 0, 0, height }, + { { 0, 0, height + 200 }, { 32, 16, 0 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopLeftSide, 14, height + 8, session.SupportColours); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 52)), - { 0, 0, height }, { { 0, 0, height }, { 32, 16, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 52)), { 0, 0, height }, + { { 0, 0, height }, { 32, 16, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopRightSide, 14, height + 8, session.SupportColours); break; @@ -14403,23 +14587,27 @@ static void GigaRCTrackRightLargeHalfLoopUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 32)), - { 0, 0, height }, { { 16, 0, height }, { 16, 16, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 32)), { 0, 0, height }, + { { 16, 0, height }, { 16, 16, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 39)), - { 0, 0, height }, { { 0, 0, height + 100 }, { 16, 16, 0 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 39)), { 0, 0, height }, + { { 0, 0, height + 100 }, { 16, 16, 0 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 46)), - { 0, 0, height }, { { 0, 16, height + 110 }, { 16, 16, 0 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 46)), { 0, 0, height }, + { { 0, 16, height + 110 }, { 16, 16, 0 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 53)), - { 0, 0, height }, { { 16, 16, height }, { 16, 16, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 53)), { 0, 0, height }, + { { 16, 16, height }, { 16, 16, 3 } }); break; } PaintUtilSetSegmentSupportHeight( @@ -14437,23 +14625,27 @@ static void GigaRCTrackRightLargeHalfLoopUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 33)), - { 0, 0, height }, { { 0, 0, height }, { 32, 16, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 33)), { 0, 0, height }, + { { 0, 0, height }, { 32, 16, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 40)), - { 0, 0, height }, { { 0, 0, height + 200 }, { 32, 16, 0 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 40)), { 0, 0, height }, + { { 0, 0, height + 200 }, { 32, 16, 0 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 47)), - { 0, 0, height }, { { 0, 16, height + 200 }, { 32, 16, 0 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 47)), { 0, 0, height }, + { { 0, 16, height + 200 }, { 32, 16, 0 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 54)), - { 0, 0, height }, { { 0, 16, height }, { 32, 16, 3 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 54)), { 0, 0, height }, + { { 0, 16, height }, { 32, 16, 3 } }); break; } PaintUtilSetSegmentSupportHeight( @@ -14471,23 +14663,27 @@ static void GigaRCTrackRightLargeHalfLoopUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 34)), - { 0, 0, height }, { { 0, 0, height + 32 }, { 32, 16, 0 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 34)), { 0, 0, height }, + { { 0, 0, height + 32 }, { 32, 16, 0 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 41)), - { 0, 0, height }, { { 0, 0, height + 32 }, { 32, 16, 0 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 41)), { 0, 0, height }, + { { 0, 0, height + 32 }, { 32, 16, 0 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 48)), - { 0, 0, height }, { { 0, 16, height + 32 }, { 32, 16, 0 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 48)), { 0, 0, height }, + { { 0, 16, height + 32 }, { 32, 16, 0 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 55)), - { 0, 0, height }, { { 0, 16, height + 32 }, { 32, 16, 0 } }); + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 55)), { 0, 0, height }, + { { 0, 16, height + 32 }, { 32, 16, 0 } }); break; } if (direction == 0 || direction == 3) @@ -14507,21 +14703,21 @@ static void GigaRCTrackRightLargeHalfLoopUp( } } -static void GigaRCTrackLeftLargeHalfLoopDown( +static void LatticeTriangleTrackLeftLargeHalfLoopDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackRightLargeHalfLoopUp(session, ride, 6 - trackSequence, direction, height, trackElement); + LatticeTriangleTrackRightLargeHalfLoopUp(session, ride, 6 - trackSequence, direction, height, trackElement); } -static void GigaRCTrackRightLargeHalfLoopDown( +static void LatticeTriangleTrackRightLargeHalfLoopDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackLeftLargeHalfLoopUp(session, ride, 6 - trackSequence, direction, height, trackElement); + LatticeTriangleTrackLeftLargeHalfLoopUp(session, ride, 6 - trackSequence, direction, height, trackElement); } -static void GigaRCTrackFlatTo60DegUp( +static void LatticeTriangleTrackFlatTo60DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -14529,28 +14725,28 @@ static void GigaRCTrackFlatTo60DegUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_SMALL_FLAT_TO_STEEP + 0)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_SMALL_FLAT_TO_STEEP + 0)), { 0, 0, height }, { { 0, 2, height }, { 32, 27, 4 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_SMALL_FLAT_TO_STEEP + 2)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_SMALL_FLAT_TO_STEEP + 2)), { 0, 0, height }, { { 29, 4, height + 2 }, { 1, 24, 43 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_SMALL_FLAT_TO_STEEP + 1)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_SMALL_FLAT_TO_STEEP + 1)), { 0, 0, height }, { { 0, 4, height }, { 32, 2, 43 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_SMALL_FLAT_TO_STEEP + 4)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_SMALL_FLAT_TO_STEEP + 4)), { 0, 0, height }, { { 29, 4, height + 2 }, { 1, 24, 43 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_SMALL_FLAT_TO_STEEP + 3)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_SMALL_FLAT_TO_STEEP + 3)), { 0, 0, height }, { { 0, 4, height }, { 32, 2, 43 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_SMALL_FLAT_TO_STEEP + 5)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_SMALL_FLAT_TO_STEEP + 5)), { 0, 0, height }, { { 0, 2, height }, { 32, 27, 4 } }); break; } @@ -14567,7 +14763,7 @@ static void GigaRCTrackFlatTo60DegUp( PaintUtilSetGeneralSupportHeight(session, height + 64); } -static void GigaRCTrack60DegUpToFlat( +static void LatticeTriangleTrack60DegUpToFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -14575,28 +14771,28 @@ static void GigaRCTrack60DegUpToFlat( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_SMALL_FLAT_TO_STEEP + 6)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_SMALL_FLAT_TO_STEEP + 6)), { 0, 0, height }, { { 0, 2, height }, { 32, 27, 4 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_SMALL_FLAT_TO_STEEP + 7)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_SMALL_FLAT_TO_STEEP + 7)), { 0, 0, height }, { { 0, 4, height }, { 32, 2, 43 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_SMALL_FLAT_TO_STEEP + 8)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_SMALL_FLAT_TO_STEEP + 8)), { 0, 0, height }, { { 29, 4, height + 2 }, { 1, 24, 43 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_SMALL_FLAT_TO_STEEP + 10)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_SMALL_FLAT_TO_STEEP + 10)), { 0, 0, height }, { { 29, 4, height + 2 }, { 1, 24, 43 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_SMALL_FLAT_TO_STEEP + 9)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_SMALL_FLAT_TO_STEEP + 9)), { 0, 0, height }, { { 0, 4, height }, { 32, 2, 43 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_SMALL_FLAT_TO_STEEP + 11)), + session, direction, session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_SMALL_FLAT_TO_STEEP + 11)), { 0, 0, height }, { { 0, 2, height }, { 32, 27, 4 } }); break; } @@ -14613,21 +14809,21 @@ static void GigaRCTrack60DegUpToFlat( PaintUtilSetGeneralSupportHeight(session, height + 72); } -static void GigaRCTrackFlatTo60DegDown( +static void LatticeTriangleTrackFlatTo60DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrack60DegUpToFlat(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrack60DegUpToFlat(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); } -static void GigaRCTrack60DegDownToFlat( +static void LatticeTriangleTrack60DegDownToFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackFlatTo60DegUp(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackFlatTo60DegUp(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); } -static void GigaRCTrackDiagFlatTo60DegUp( +static void LatticeTriangleTrackDiagFlatTo60DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -14638,7 +14834,8 @@ static void GigaRCTrackDiagFlatTo60DegUp( { case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_SMALL_FLAT_TO_STEEP + 15)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_SMALL_FLAT_TO_STEEP + 15)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 4 } }); break; } @@ -14657,7 +14854,8 @@ static void GigaRCTrackDiagFlatTo60DegUp( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_SMALL_FLAT_TO_STEEP + 12)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_SMALL_FLAT_TO_STEEP + 12)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 4 } }); break; } @@ -14675,7 +14873,8 @@ static void GigaRCTrackDiagFlatTo60DegUp( { case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_SMALL_FLAT_TO_STEEP + 14)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_SMALL_FLAT_TO_STEEP + 14)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 4 } }); break; } @@ -14698,7 +14897,8 @@ static void GigaRCTrackDiagFlatTo60DegUp( break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_SMALL_FLAT_TO_STEEP + 13)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_SMALL_FLAT_TO_STEEP + 13)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 4 } }); MetalBSupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopCorner, 4, height, session.SupportColours); @@ -14725,7 +14925,7 @@ static void GigaRCTrackDiagFlatTo60DegUp( } } -static void GigaRCTrackDiag60DegUpToFlat( +static void LatticeTriangleTrackDiag60DegUpToFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -14736,7 +14936,8 @@ static void GigaRCTrackDiag60DegUpToFlat( { case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_SMALL_FLAT_TO_STEEP + 19)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_SMALL_FLAT_TO_STEEP + 19)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 4 } }); break; } @@ -14755,7 +14956,8 @@ static void GigaRCTrackDiag60DegUpToFlat( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_SMALL_FLAT_TO_STEEP + 16)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_SMALL_FLAT_TO_STEEP + 16)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 4 } }); break; } @@ -14773,7 +14975,8 @@ static void GigaRCTrackDiag60DegUpToFlat( { case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_SMALL_FLAT_TO_STEEP + 18)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_SMALL_FLAT_TO_STEEP + 18)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 4 } }); break; } @@ -14796,7 +14999,8 @@ static void GigaRCTrackDiag60DegUpToFlat( break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_SMALL_FLAT_TO_STEEP + 17)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_SMALL_FLAT_TO_STEEP + 17)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 4 } }); MetalBSupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopCorner, 18, height, session.SupportColours); @@ -14823,7 +15027,7 @@ static void GigaRCTrackDiag60DegUpToFlat( } } -static void GigaRCTrackDiagFlatTo60DegDown( +static void LatticeTriangleTrackDiagFlatTo60DegDown( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -14834,7 +15038,8 @@ static void GigaRCTrackDiagFlatTo60DegDown( { case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_SMALL_FLAT_TO_STEEP + 17)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_SMALL_FLAT_TO_STEEP + 17)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 4 } }); break; } @@ -14853,7 +15058,8 @@ static void GigaRCTrackDiagFlatTo60DegDown( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_SMALL_FLAT_TO_STEEP + 18)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_SMALL_FLAT_TO_STEEP + 18)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 4 } }); break; } @@ -14871,7 +15077,8 @@ static void GigaRCTrackDiagFlatTo60DegDown( { case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_SMALL_FLAT_TO_STEEP + 16)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_SMALL_FLAT_TO_STEEP + 16)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 4 } }); break; } @@ -14894,7 +15101,8 @@ static void GigaRCTrackDiagFlatTo60DegDown( break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_SMALL_FLAT_TO_STEEP + 19)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_SMALL_FLAT_TO_STEEP + 19)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 4 } }); MetalBSupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopCorner, 14, height, session.SupportColours); @@ -14921,7 +15129,7 @@ static void GigaRCTrackDiagFlatTo60DegDown( } } -static void GigaRCTrackDiag60DegDownToFlat( +static void LatticeTriangleTrackDiag60DegDownToFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -14932,7 +15140,8 @@ static void GigaRCTrackDiag60DegDownToFlat( { case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_SMALL_FLAT_TO_STEEP + 13)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_SMALL_FLAT_TO_STEEP + 13)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 4 } }); break; } @@ -14951,7 +15160,8 @@ static void GigaRCTrackDiag60DegDownToFlat( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_SMALL_FLAT_TO_STEEP + 14)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_SMALL_FLAT_TO_STEEP + 14)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 4 } }); break; } @@ -14969,7 +15179,8 @@ static void GigaRCTrackDiag60DegDownToFlat( { case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_SMALL_FLAT_TO_STEEP + 12)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_SMALL_FLAT_TO_STEEP + 12)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 4 } }); break; } @@ -14992,7 +15203,8 @@ static void GigaRCTrackDiag60DegDownToFlat( break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_SMALL_FLAT_TO_STEEP + 15)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_SMALL_FLAT_TO_STEEP + 15)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 4 } }); MetalBSupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopCorner, 2, height, session.SupportColours); @@ -15019,7 +15231,7 @@ static void GigaRCTrackDiag60DegDownToFlat( } } -static void GigaRCTrackLeftEighthToDiagUp25( +static void LatticeTriangleTrackLeftEighthToDiagUp25( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -15030,22 +15242,26 @@ static void GigaRCTrackLeftEighthToDiagUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 0)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 0)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 4)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 4)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 8)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 8)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 12)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 12)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); break; } @@ -15063,22 +15279,26 @@ static void GigaRCTrackLeftEighthToDiagUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 1)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 1)), { 0, 0, height }, { { 0, 0, height }, { 32, 16, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 5)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 5)), { 0, 0, height }, { { 0, 0, height }, { 34, 16, 3 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 9)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 9)), { 0, 0, height }, { { 0, 16, height }, { 32, 16, 3 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 13)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 13)), { 0, 0, height }, { { 0, 16, height }, { 32, 16, 3 } }); break; } @@ -15097,22 +15317,26 @@ static void GigaRCTrackLeftEighthToDiagUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 2)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 2)), { 0, 0, height }, { { 0, 16, height }, { 16, 16, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 6)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 6)), { 0, 0, height }, { { 16, 16, height }, { 16, 16, 3 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 10)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 10)), { 0, 0, height }, { { 16, 0, height }, { 16, 16, 3 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 14)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 14)), { 0, 0, height }, { { 0, 0, height }, { 16, 16, 3 } }); break; } @@ -15142,28 +15366,32 @@ static void GigaRCTrackLeftEighthToDiagUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 3)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 3)), { 0, 0, height }, { { 16, 16, height }, { 16, 16, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::BottomCorner, 2, height, session.SupportColours); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 7)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 7)), { 0, 0, height }, { { 0, 16, height }, { 16, 18, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::LeftCorner, 3, height, session.SupportColours); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 11)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 11)), { 0, 0, height }, { { 0, 0, height }, { 16, 16, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopCorner, 2, height, session.SupportColours); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 15)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 15)), { 0, 0, height }, { { 16, 0, height }, { 16, 16, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::RightCorner, 1, height, session.SupportColours); @@ -15182,7 +15410,7 @@ static void GigaRCTrackLeftEighthToDiagUp25( } } -static void GigaRCTrackRightEighthToDiagUp25( +static void LatticeTriangleTrackRightEighthToDiagUp25( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -15193,22 +15421,26 @@ static void GigaRCTrackRightEighthToDiagUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 16)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 16)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 20)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 20)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 24)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 24)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 28)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 28)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); break; } @@ -15226,22 +15458,26 @@ static void GigaRCTrackRightEighthToDiagUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 17)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 17)), { 0, 0, height }, { { 0, 16, height }, { 32, 16, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 21)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 21)), { 0, 0, height }, { { 0, 16, height }, { 32, 16, 3 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 25)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 25)), { 0, 0, height }, { { 0, 0, height }, { 34, 16, 3 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 29)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 29)), { 0, 0, height }, { { 0, 0, height }, { 32, 16, 3 } }); break; } @@ -15260,22 +15496,26 @@ static void GigaRCTrackRightEighthToDiagUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 18)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 18)), { 0, 0, height }, { { 0, 0, height }, { 16, 16, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 22)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 22)), { 0, 0, height }, { { 16, 0, height }, { 16, 16, 3 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 26)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 26)), { 0, 0, height }, { { 4, 4, height }, { 28, 28, 3 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 30)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 30)), { 0, 0, height }, { { 0, 16, height }, { 16, 16, 3 } }); break; } @@ -15305,28 +15545,32 @@ static void GigaRCTrackRightEighthToDiagUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 19)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 19)), { 0, 0, height }, { { 16, 0, height }, { 16, 16, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::LeftCorner, 1, height, session.SupportColours); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 23)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 23)), { 0, 0, height }, { { 0, 0, height }, { 16, 16, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopCorner, 2, height, session.SupportColours); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 27)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 27)), { 0, 0, height }, { { 0, 16, height }, { 16, 18, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::RightCorner, 3, height, session.SupportColours); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 31)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 31)), { 0, 0, height }, { { 16, 16, height }, { 16, 16, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::BottomCorner, 2, height, session.SupportColours); @@ -15345,7 +15589,7 @@ static void GigaRCTrackRightEighthToDiagUp25( } } -static void GigaRCTrackLeftEighthToOrthogonalUp25( +static void LatticeTriangleTrackLeftEighthToOrthogonalUp25( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -15356,28 +15600,32 @@ static void GigaRCTrackLeftEighthToOrthogonalUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 32)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 32)), { 0, 0, height }, { { 0, 16, height }, { 16, 16, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::RightCorner, 5, height, session.SupportColours); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 36)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 36)), { 0, 0, height }, { { 16, 16, height }, { 16, 18, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::BottomCorner, 5, height, session.SupportColours); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 40)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 40)), { 0, 0, height }, { { 16, 0, height }, { 16, 16, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::LeftCorner, 3, height, session.SupportColours); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 44)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 44)), { 0, 0, height }, { { 0, 0, height }, { 16, 16, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopCorner, 4, height, session.SupportColours); @@ -15398,22 +15646,26 @@ static void GigaRCTrackLeftEighthToOrthogonalUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 33)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 33)), { 0, 0, height }, { { 16, 16, height }, { 16, 16, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 37)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 37)), { 0, 0, height }, { { 0, 16, height }, { 16, 16, 3 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 41)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 41)), { 0, 0, height }, { { 0, 0, height }, { 16, 16, 3 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 45)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 45)), { 0, 0, height }, { { 16, 0, height }, { 16, 16, 3 } }); break; } @@ -15442,22 +15694,26 @@ static void GigaRCTrackLeftEighthToOrthogonalUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 34)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 34)), { 0, 0, height }, { { 0, 0, height }, { 32, 16, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 38)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 38)), { 0, 0, height }, { { 0, 0, height }, { 34, 16, 3 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 42)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 42)), { 0, 0, height }, { { 0, 16, height }, { 32, 16, 3 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 46)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 46)), { 0, 0, height }, { { 0, 16, height }, { 32, 16, 3 } }); break; } @@ -15476,22 +15732,26 @@ static void GigaRCTrackLeftEighthToOrthogonalUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 35)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 35)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 39)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 39)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 43)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 43)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 10 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 47)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 47)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); break; } @@ -15509,7 +15769,7 @@ static void GigaRCTrackLeftEighthToOrthogonalUp25( } } -static void GigaRCTrackRightEighthToOrthogonalUp25( +static void LatticeTriangleTrackRightEighthToOrthogonalUp25( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -15520,28 +15780,32 @@ static void GigaRCTrackRightEighthToOrthogonalUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 48)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 48)), { 0, 0, height }, { { 0, 16, height }, { 16, 16, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::RightCorner, 3, height, session.SupportColours); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 52)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 52)), { 0, 0, height }, { { 16, 16, height }, { 16, 16, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::BottomCorner, 5, height, session.SupportColours); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 56)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 56)), { 0, 0, height }, { { 16, 0, height }, { 16, 18, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::LeftCorner, 5, height, session.SupportColours); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 60)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 60)), { 0, 0, height }, { { 0, 0, height }, { 16, 16, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopCorner, 4, height, session.SupportColours); @@ -15562,22 +15826,26 @@ static void GigaRCTrackRightEighthToOrthogonalUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 49)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 49)), { 0, 0, height }, { { 0, 0, height }, { 16, 16, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 53)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 53)), { 0, 0, height }, { { 16, 0, height }, { 16, 16, 3 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 57)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 57)), { 0, 0, height }, { { 16, 16, height }, { 16, 16, 3 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 61)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 61)), { 0, 0, height }, { { 0, 16, height }, { 16, 16, 3 } }); break; } @@ -15607,22 +15875,26 @@ static void GigaRCTrackRightEighthToOrthogonalUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 50)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 50)), { 0, 0, height }, { { 16, 0, height }, { 16, 32, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 54)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 54)), { 0, 0, height }, { { 0, 0, height }, { 16, 32, 3 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 58)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 58)), { 0, 0, height }, { { 0, 0, height }, { 16, 32, 3 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 62)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 62)), { 0, 0, height }, { { 16, 0, height }, { 16, 32, 3 } }); break; } @@ -15641,22 +15913,26 @@ static void GigaRCTrackRightEighthToOrthogonalUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 51)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 51)), { 0, 0, height }, { { 6, 0, height }, { 20, 32, 10 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 55)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 55)), { 0, 0, height }, { { 6, 0, height }, { 20, 32, 3 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 59)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 59)), { 0, 0, height }, { { 6, 0, height }, { 20, 32, 3 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 63)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 63)), { 0, 0, height }, { { 6, 0, height }, { 20, 32, 3 } }); break; } @@ -15675,41 +15951,41 @@ static void GigaRCTrackRightEighthToOrthogonalUp25( } } -static void GigaRCTrackLeftEighthToDiagDown25( +static void LatticeTriangleTrackLeftEighthToDiagDown25( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { uint8_t map[5] = { 4, 3, 1, 2, 0 }; trackSequence = map[trackSequence]; - GigaRCTrackRightEighthToOrthogonalUp25(session, ride, trackSequence, (direction + 1) & 3, height, trackElement); + LatticeTriangleTrackRightEighthToOrthogonalUp25(session, ride, trackSequence, (direction + 1) & 3, height, trackElement); } -static void GigaRCTrackRightEighthToDiagDown25( +static void LatticeTriangleTrackRightEighthToDiagDown25( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { uint8_t map[5] = { 4, 3, 1, 2, 0 }; trackSequence = map[trackSequence]; - GigaRCTrackLeftEighthToOrthogonalUp25(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackLeftEighthToOrthogonalUp25(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); } -static void GigaRCTrackLeftEighthToOrthogonalDown25( +static void LatticeTriangleTrackLeftEighthToOrthogonalDown25( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; - GigaRCTrackRightEighthToDiagUp25(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackRightEighthToDiagUp25(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); } -static void GigaRCTrackRightEighthToOrthogonalDown25( +static void LatticeTriangleTrackRightEighthToOrthogonalDown25( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; - GigaRCTrackLeftEighthToDiagUp25(session, ride, trackSequence, (direction + 3) & 3, height, trackElement); + LatticeTriangleTrackLeftEighthToDiagUp25(session, ride, trackSequence, (direction + 3) & 3, height, trackElement); } -static void GigaRCTrackDiagUp25ToLeftBankedUp25( +static void LatticeTriangleTrackDiagUp25ToLeftBankedUp25( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -15720,7 +15996,8 @@ static void GigaRCTrackDiagUp25ToLeftBankedUp25( { case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 4)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 4)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); break; } @@ -15739,10 +16016,12 @@ static void GigaRCTrackDiagUp25ToLeftBankedUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 0)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 0)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 1)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 1)), { -16, -16, height }, { { -16, -16, height + 48 }, { 32, 32, 0 } }); break; } @@ -15760,7 +16039,8 @@ static void GigaRCTrackDiagUp25ToLeftBankedUp25( { case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 3)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 3)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); break; } @@ -15783,7 +16063,8 @@ static void GigaRCTrackDiagUp25ToLeftBankedUp25( break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 2)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 2)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); MetalBSupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopCorner, 10, height, session.SupportColours); @@ -15810,7 +16091,7 @@ static void GigaRCTrackDiagUp25ToLeftBankedUp25( } } -static void GigaRCTrackDiagUp25ToRightBankedUp25( +static void LatticeTriangleTrackDiagUp25ToRightBankedUp25( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -15821,7 +16102,8 @@ static void GigaRCTrackDiagUp25ToRightBankedUp25( { case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 9)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 9)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); break; } @@ -15840,7 +16122,8 @@ static void GigaRCTrackDiagUp25ToRightBankedUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 5)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 5)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); break; } @@ -15858,10 +16141,12 @@ static void GigaRCTrackDiagUp25ToRightBankedUp25( { case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 7)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 7)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 8)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 8)), { -16, -16, height }, { { -16, -16, height + 48 }, { 32, 32, 0 } }); break; } @@ -15884,7 +16169,8 @@ static void GigaRCTrackDiagUp25ToRightBankedUp25( break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 6)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 6)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); MetalBSupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopCorner, 10, height, session.SupportColours); @@ -15911,7 +16197,7 @@ static void GigaRCTrackDiagUp25ToRightBankedUp25( } } -static void GigaRCTrackDiagLeftBankedUp25ToUp25( +static void LatticeTriangleTrackDiagLeftBankedUp25ToUp25( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -15922,7 +16208,8 @@ static void GigaRCTrackDiagLeftBankedUp25ToUp25( { case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 14)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 14)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); break; } @@ -15941,10 +16228,12 @@ static void GigaRCTrackDiagLeftBankedUp25ToUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 10)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 10)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 11)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 11)), { -16, -16, height }, { { -16, -16, height + 48 }, { 32, 32, 0 } }); break; } @@ -15962,7 +16251,8 @@ static void GigaRCTrackDiagLeftBankedUp25ToUp25( { case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 13)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 13)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); break; } @@ -15985,7 +16275,8 @@ static void GigaRCTrackDiagLeftBankedUp25ToUp25( break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 12)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 12)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); MetalBSupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopCorner, 9, height, session.SupportColours); @@ -16012,7 +16303,7 @@ static void GigaRCTrackDiagLeftBankedUp25ToUp25( } } -static void GigaRCTrackDiagRightBankedUp25ToUp25( +static void LatticeTriangleTrackDiagRightBankedUp25ToUp25( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -16023,7 +16314,8 @@ static void GigaRCTrackDiagRightBankedUp25ToUp25( { case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 19)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 19)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); break; } @@ -16042,7 +16334,8 @@ static void GigaRCTrackDiagRightBankedUp25ToUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 15)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 15)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); break; } @@ -16060,10 +16353,12 @@ static void GigaRCTrackDiagRightBankedUp25ToUp25( { case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 17)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 17)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 18)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 18)), { -16, -16, height }, { { -16, -16, height + 48 }, { 32, 32, 0 } }); break; } @@ -16086,7 +16381,8 @@ static void GigaRCTrackDiagRightBankedUp25ToUp25( break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 16)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 16)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); MetalBSupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopCorner, 9, height, session.SupportColours); @@ -16113,35 +16409,35 @@ static void GigaRCTrackDiagRightBankedUp25ToUp25( } } -static void GigaRCTrackDiagDown25ToLeftBankedDown25( +static void LatticeTriangleTrackDiagDown25ToLeftBankedDown25( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackDiagRightBankedUp25ToUp25(session, ride, 3 - trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackDiagRightBankedUp25ToUp25(session, ride, 3 - trackSequence, (direction + 2) & 3, height, trackElement); } -static void GigaRCTrackDiagDown25ToRightBankedDown25( +static void LatticeTriangleTrackDiagDown25ToRightBankedDown25( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackDiagLeftBankedUp25ToUp25(session, ride, 3 - trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackDiagLeftBankedUp25ToUp25(session, ride, 3 - trackSequence, (direction + 2) & 3, height, trackElement); } -static void GigaRCTrackDiagLeftBankedDown25ToDown25( +static void LatticeTriangleTrackDiagLeftBankedDown25ToDown25( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackDiagUp25ToRightBankedUp25(session, ride, 3 - trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackDiagUp25ToRightBankedUp25(session, ride, 3 - trackSequence, (direction + 2) & 3, height, trackElement); } -static void GigaRCTrackDiagRightBankedDown25ToDown25( +static void LatticeTriangleTrackDiagRightBankedDown25ToDown25( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackDiagUp25ToLeftBankedUp25(session, ride, 3 - trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackDiagUp25ToLeftBankedUp25(session, ride, 3 - trackSequence, (direction + 2) & 3, height, trackElement); } -static void GigaRCTrackDiagLeftBankedFlatToLeftBankedUp25( +static void LatticeTriangleTrackDiagLeftBankedFlatToLeftBankedUp25( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -16152,7 +16448,8 @@ static void GigaRCTrackDiagLeftBankedFlatToLeftBankedUp25( { case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 23)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 23)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); break; } @@ -16171,7 +16468,8 @@ static void GigaRCTrackDiagLeftBankedFlatToLeftBankedUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 20)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 20)), { -16, -16, height }, { { -16, -16, height + 27 }, { 32, 32, 0 } }); break; } @@ -16189,7 +16487,8 @@ static void GigaRCTrackDiagLeftBankedFlatToLeftBankedUp25( { case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 22)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 22)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); break; } @@ -16212,7 +16511,8 @@ static void GigaRCTrackDiagLeftBankedFlatToLeftBankedUp25( break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 21)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 21)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); MetalBSupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopCorner, 4, height, session.SupportColours); @@ -16239,7 +16539,7 @@ static void GigaRCTrackDiagLeftBankedFlatToLeftBankedUp25( } } -static void GigaRCTrackDiagRightBankedFlatToRightBankedUp25( +static void LatticeTriangleTrackDiagRightBankedFlatToRightBankedUp25( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -16250,7 +16550,8 @@ static void GigaRCTrackDiagRightBankedFlatToRightBankedUp25( { case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 27)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 27)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); break; } @@ -16269,7 +16570,8 @@ static void GigaRCTrackDiagRightBankedFlatToRightBankedUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 24)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 24)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); break; } @@ -16287,7 +16589,8 @@ static void GigaRCTrackDiagRightBankedFlatToRightBankedUp25( { case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 26)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 26)), { -16, -16, height }, { { -16, -16, height + 27 }, { 32, 32, 0 } }); break; } @@ -16310,7 +16613,8 @@ static void GigaRCTrackDiagRightBankedFlatToRightBankedUp25( break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 25)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 25)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); MetalBSupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopCorner, 4, height, session.SupportColours); @@ -16337,7 +16641,7 @@ static void GigaRCTrackDiagRightBankedFlatToRightBankedUp25( } } -static void GigaRCTrackDiagLeftBankedUp25ToLeftBankedFlat( +static void LatticeTriangleTrackDiagLeftBankedUp25ToLeftBankedFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -16348,7 +16652,8 @@ static void GigaRCTrackDiagLeftBankedUp25ToLeftBankedFlat( { case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 31)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 31)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); break; } @@ -16367,7 +16672,8 @@ static void GigaRCTrackDiagLeftBankedUp25ToLeftBankedFlat( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 28)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 28)), { -16, -16, height }, { { -16, -16, height + 27 }, { 32, 32, 0 } }); break; } @@ -16385,7 +16691,8 @@ static void GigaRCTrackDiagLeftBankedUp25ToLeftBankedFlat( { case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 30)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 30)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); break; } @@ -16408,7 +16715,8 @@ static void GigaRCTrackDiagLeftBankedUp25ToLeftBankedFlat( break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 29)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 29)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); MetalBSupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopCorner, 8, height, session.SupportColours); @@ -16435,7 +16743,7 @@ static void GigaRCTrackDiagLeftBankedUp25ToLeftBankedFlat( } } -static void GigaRCTrackDiagRightBankedUp25ToRightBankedFlat( +static void LatticeTriangleTrackDiagRightBankedUp25ToRightBankedFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -16446,7 +16754,8 @@ static void GigaRCTrackDiagRightBankedUp25ToRightBankedFlat( { case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 35)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 35)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); break; } @@ -16465,7 +16774,8 @@ static void GigaRCTrackDiagRightBankedUp25ToRightBankedFlat( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 32)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 32)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); break; } @@ -16483,7 +16793,8 @@ static void GigaRCTrackDiagRightBankedUp25ToRightBankedFlat( { case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 34)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 34)), { -16, -16, height }, { { -16, -16, height + 27 }, { 32, 32, 0 } }); break; } @@ -16506,7 +16817,8 @@ static void GigaRCTrackDiagRightBankedUp25ToRightBankedFlat( break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 33)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 33)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); MetalBSupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopCorner, 8, height, session.SupportColours); @@ -16533,37 +16845,39 @@ static void GigaRCTrackDiagRightBankedUp25ToRightBankedFlat( } } -static void GigaRCTrackDiagLeftBankedFlatToLeftBankedDown25( +static void LatticeTriangleTrackDiagLeftBankedFlatToLeftBankedDown25( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackDiagRightBankedUp25ToRightBankedFlat( + LatticeTriangleTrackDiagRightBankedUp25ToRightBankedFlat( session, ride, 3 - trackSequence, (direction + 2) & 3, height, trackElement); } -static void GigaRCTrackDiagRightBankedFlatToRightBankedDown25( +static void LatticeTriangleTrackDiagRightBankedFlatToRightBankedDown25( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackDiagLeftBankedUp25ToLeftBankedFlat(session, ride, 3 - trackSequence, (direction + 2) & 3, height, trackElement); -} - -static void GigaRCTrackDiagLeftBankedDown25ToLeftBankedFlat( - PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, - const TrackElement& trackElement) -{ - GigaRCTrackDiagRightBankedFlatToRightBankedUp25( + LatticeTriangleTrackDiagLeftBankedUp25ToLeftBankedFlat( session, ride, 3 - trackSequence, (direction + 2) & 3, height, trackElement); } -static void GigaRCTrackDiagRightBankedDown25ToRightBankedFlat( +static void LatticeTriangleTrackDiagLeftBankedDown25ToLeftBankedFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackDiagLeftBankedFlatToLeftBankedUp25(session, ride, 3 - trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackDiagRightBankedFlatToRightBankedUp25( + session, ride, 3 - trackSequence, (direction + 2) & 3, height, trackElement); } -static void GigaRCTrackDiagUp25LeftBanked( +static void LatticeTriangleTrackDiagRightBankedDown25ToRightBankedFlat( + PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, + const TrackElement& trackElement) +{ + LatticeTriangleTrackDiagLeftBankedFlatToLeftBankedUp25( + session, ride, 3 - trackSequence, (direction + 2) & 3, height, trackElement); +} + +static void LatticeTriangleTrackDiagUp25LeftBanked( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -16574,7 +16888,8 @@ static void GigaRCTrackDiagUp25LeftBanked( { case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 39)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 39)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); break; } @@ -16593,7 +16908,8 @@ static void GigaRCTrackDiagUp25LeftBanked( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 36)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 36)), { -16, -16, height }, { { -16, -16, height + 48 }, { 32, 32, 0 } }); break; } @@ -16611,7 +16927,8 @@ static void GigaRCTrackDiagUp25LeftBanked( { case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 38)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 38)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); break; } @@ -16634,7 +16951,8 @@ static void GigaRCTrackDiagUp25LeftBanked( break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 37)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 37)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); MetalBSupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopCorner, 11, height, session.SupportColours); @@ -16661,7 +16979,7 @@ static void GigaRCTrackDiagUp25LeftBanked( } } -static void GigaRCTrackDiagUp25RightBanked( +static void LatticeTriangleTrackDiagUp25RightBanked( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -16672,7 +16990,8 @@ static void GigaRCTrackDiagUp25RightBanked( { case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 43)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 43)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); break; } @@ -16691,7 +17010,8 @@ static void GigaRCTrackDiagUp25RightBanked( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 40)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 40)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); break; } @@ -16709,7 +17029,8 @@ static void GigaRCTrackDiagUp25RightBanked( { case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 42)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 42)), { -16, -16, height }, { { -16, -16, height + 48 }, { 32, 32, 0 } }); break; } @@ -16732,7 +17053,8 @@ static void GigaRCTrackDiagUp25RightBanked( break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 41)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 41)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); MetalBSupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopCorner, 11, height, session.SupportColours); @@ -16759,21 +17081,21 @@ static void GigaRCTrackDiagUp25RightBanked( } } -static void GigaRCTrackDiagDown25LeftBanked( +static void LatticeTriangleTrackDiagDown25LeftBanked( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackDiagUp25RightBanked(session, ride, 3 - trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackDiagUp25RightBanked(session, ride, 3 - trackSequence, (direction + 2) & 3, height, trackElement); } -static void GigaRCTrackDiagDown25RightBanked( +static void LatticeTriangleTrackDiagDown25RightBanked( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackDiagUp25LeftBanked(session, ride, 3 - trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackDiagUp25LeftBanked(session, ride, 3 - trackSequence, (direction + 2) & 3, height, trackElement); } -static void GigaRCTrackDiagFlatToLeftBankedUp25( +static void LatticeTriangleTrackDiagFlatToLeftBankedUp25( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -16784,7 +17106,8 @@ static void GigaRCTrackDiagFlatToLeftBankedUp25( { case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 48)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 48)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); break; } @@ -16803,10 +17126,12 @@ static void GigaRCTrackDiagFlatToLeftBankedUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 44)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 44)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 45)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 45)), { -16, -16, height }, { { -16, -16, height + 27 }, { 32, 32, 0 } }); break; } @@ -16824,7 +17149,8 @@ static void GigaRCTrackDiagFlatToLeftBankedUp25( { case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 47)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 47)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); break; } @@ -16847,7 +17173,8 @@ static void GigaRCTrackDiagFlatToLeftBankedUp25( break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 46)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 46)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); MetalBSupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopCorner, 4, height, session.SupportColours); @@ -16874,7 +17201,7 @@ static void GigaRCTrackDiagFlatToLeftBankedUp25( } } -static void GigaRCTrackDiagFlatToRightBankedUp25( +static void LatticeTriangleTrackDiagFlatToRightBankedUp25( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -16885,7 +17212,8 @@ static void GigaRCTrackDiagFlatToRightBankedUp25( { case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 53)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 53)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); break; } @@ -16904,7 +17232,8 @@ static void GigaRCTrackDiagFlatToRightBankedUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 49)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 49)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); break; } @@ -16922,10 +17251,12 @@ static void GigaRCTrackDiagFlatToRightBankedUp25( { case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 51)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 51)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 52)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 52)), { -16, -16, height }, { { -16, -16, height + 27 }, { 32, 32, 0 } }); break; } @@ -16948,7 +17279,8 @@ static void GigaRCTrackDiagFlatToRightBankedUp25( break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 50)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 50)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); MetalBSupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopCorner, 4, height, session.SupportColours); @@ -16975,7 +17307,7 @@ static void GigaRCTrackDiagFlatToRightBankedUp25( } } -static void GigaRCTrackDiagLeftBankedUp25ToFlat( +static void LatticeTriangleTrackDiagLeftBankedUp25ToFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -16986,7 +17318,8 @@ static void GigaRCTrackDiagLeftBankedUp25ToFlat( { case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 58)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 58)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); break; } @@ -17005,10 +17338,12 @@ static void GigaRCTrackDiagLeftBankedUp25ToFlat( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 54)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 54)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 55)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 55)), { -16, -16, height }, { { -16, -16, height + 27 }, { 32, 32, 0 } }); break; } @@ -17026,7 +17361,8 @@ static void GigaRCTrackDiagLeftBankedUp25ToFlat( { case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 57)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 57)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); break; } @@ -17049,7 +17385,8 @@ static void GigaRCTrackDiagLeftBankedUp25ToFlat( break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 56)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 56)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); MetalBSupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopCorner, 6, height, session.SupportColours); @@ -17076,7 +17413,7 @@ static void GigaRCTrackDiagLeftBankedUp25ToFlat( } } -static void GigaRCTrackDiagRightBankedUp25ToFlat( +static void LatticeTriangleTrackDiagRightBankedUp25ToFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -17087,7 +17424,8 @@ static void GigaRCTrackDiagRightBankedUp25ToFlat( { case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 63)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 63)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); break; } @@ -17106,7 +17444,8 @@ static void GigaRCTrackDiagRightBankedUp25ToFlat( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 59)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 59)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); break; } @@ -17124,10 +17463,12 @@ static void GigaRCTrackDiagRightBankedUp25ToFlat( { case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 61)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 61)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 62)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 62)), { -16, -16, height }, { { -16, -16, height + 27 }, { 32, 32, 0 } }); break; } @@ -17150,7 +17491,8 @@ static void GigaRCTrackDiagRightBankedUp25ToFlat( break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 60)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 60)), { -16, -16, height }, { { -16, -16, height }, { 32, 32, 3 } }); MetalBSupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopCorner, 6, height, session.SupportColours); @@ -17177,35 +17519,35 @@ static void GigaRCTrackDiagRightBankedUp25ToFlat( } } -static void GigaRCTrackDiagFlatToLeftBankedDown25( +static void LatticeTriangleTrackDiagFlatToLeftBankedDown25( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackDiagRightBankedUp25ToFlat(session, ride, 3 - trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackDiagRightBankedUp25ToFlat(session, ride, 3 - trackSequence, (direction + 2) & 3, height, trackElement); } -static void GigaRCTrackDiagFlatToRightBankedDown25( +static void LatticeTriangleTrackDiagFlatToRightBankedDown25( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackDiagLeftBankedUp25ToFlat(session, ride, 3 - trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackDiagLeftBankedUp25ToFlat(session, ride, 3 - trackSequence, (direction + 2) & 3, height, trackElement); } -static void GigaRCTrackDiagLeftBankedDown25ToFlat( +static void LatticeTriangleTrackDiagLeftBankedDown25ToFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackDiagFlatToRightBankedUp25(session, ride, 3 - trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackDiagFlatToRightBankedUp25(session, ride, 3 - trackSequence, (direction + 2) & 3, height, trackElement); } -static void GigaRCTrackDiagRightBankedDown25ToFlat( +static void LatticeTriangleTrackDiagRightBankedDown25ToFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - GigaRCTrackDiagFlatToLeftBankedUp25(session, ride, 3 - trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackDiagFlatToLeftBankedUp25(session, ride, 3 - trackSequence, (direction + 2) & 3, height, trackElement); } -static void GigaRCTrackLeftEighthBankToDiagUp25( +static void LatticeTriangleTrackLeftEighthBankToDiagUp25( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -17216,28 +17558,32 @@ static void GigaRCTrackLeftEighthBankToDiagUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 64)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 64)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 1, height - 4, session.SupportColours); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 68)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 68)), { 0, 0, height }, { { 0, 31, height }, { 32, 1, 32 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 6, height, session.SupportColours); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 72)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 72)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 9, height, session.SupportColours); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 76)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 76)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 12, height, session.SupportColours); @@ -17256,22 +17602,26 @@ static void GigaRCTrackLeftEighthBankToDiagUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 65)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 65)), { 0, 0, height }, { { 0, 0, height }, { 32, 16, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 69)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 69)), { 0, 0, height }, { { 0, 31, height }, { 32, 1, 32 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 73)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 73)), { 0, 0, height }, { { 0, 16, height }, { 32, 16, 3 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 77)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 77)), { 0, 0, height }, { { 0, 16, height }, { 32, 16, 3 } }); break; } @@ -17290,22 +17640,26 @@ static void GigaRCTrackLeftEighthBankToDiagUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 66)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 66)), { 0, 0, height }, { { 0, 16, height }, { 16, 16, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 70)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 70)), { 0, 0, height }, { { 0, 0, height + 32 }, { 32, 40, 1 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 74)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 74)), { 0, 0, height }, { { 16, 0, height }, { 16, 16, 3 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 78)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 78)), { 0, 0, height }, { { 0, 0, height }, { 16, 16, 3 } }); break; } @@ -17335,28 +17689,32 @@ static void GigaRCTrackLeftEighthBankToDiagUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 67)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 67)), { 0, 0, height }, { { 16, 16, height }, { 16, 16, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::BottomCorner, 7, height, session.SupportColours); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 71)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 71)), { 0, 0, height }, { { 0, 0, height + 48 }, { 32, 32, 1 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::LeftCorner, 4, height, session.SupportColours); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 75)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 75)), { 0, 0, height }, { { 0, 0, height }, { 16, 16, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopCorner, 7, height, session.SupportColours); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 79)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 79)), { 0, 0, height }, { { 16, 0, height }, { 16, 16, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::RightCorner, 7, height, session.SupportColours); @@ -17375,7 +17733,7 @@ static void GigaRCTrackLeftEighthBankToDiagUp25( } } -static void GigaRCTrackRightEighthBankToDiagUp25( +static void LatticeTriangleTrackRightEighthBankToDiagUp25( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -17386,28 +17744,32 @@ static void GigaRCTrackRightEighthBankToDiagUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 80)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 80)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 12, height, session.SupportColours); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 84)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 84)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 9, height, session.SupportColours); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 88)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 88)), { 0, 0, height }, { { 0, 31, height }, { 32, 1, 32 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 6, height, session.SupportColours); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 92)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 92)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 1, height - 4, session.SupportColours); @@ -17426,22 +17788,26 @@ static void GigaRCTrackRightEighthBankToDiagUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 81)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 81)), { 0, 0, height }, { { 0, 16, height }, { 32, 16, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 85)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 85)), { 0, 0, height }, { { 0, 16, height }, { 32, 16, 3 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 89)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 89)), { 0, 0, height }, { { 0, 31, height }, { 32, 1, 32 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 93)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 93)), { 0, 0, height }, { { 0, 0, height }, { 32, 16, 3 } }); break; } @@ -17460,22 +17826,26 @@ static void GigaRCTrackRightEighthBankToDiagUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 82)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 82)), { 0, 0, height }, { { 0, 0, height }, { 16, 16, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 86)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 86)), { 0, 0, height }, { { 16, 0, height }, { 16, 16, 3 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 90)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 90)), { 0, 0, height }, { { 0, 0, height + 32 }, { 32, 40, 1 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 94)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 94)), { 0, 0, height }, { { 0, 16, height }, { 16, 16, 3 } }); break; } @@ -17505,28 +17875,32 @@ static void GigaRCTrackRightEighthBankToDiagUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 83)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 83)), { 0, 0, height }, { { 16, 0, height }, { 16, 16, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::LeftCorner, 7, height, session.SupportColours); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 87)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 87)), { 0, 0, height }, { { 0, 0, height }, { 16, 16, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopCorner, 7, height, session.SupportColours); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 91)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 91)), { 0, 0, height }, { { 0, 0, height + 48 }, { 32, 32, 1 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::RightCorner, 4, height, session.SupportColours); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 95)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 95)), { 0, 0, height }, { { 16, 16, height }, { 16, 16, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::BottomCorner, 7, height, session.SupportColours); @@ -17545,7 +17919,7 @@ static void GigaRCTrackRightEighthBankToDiagUp25( } } -static void GigaRCTrackLeftEighthBankToOrthogonalUp25( +static void LatticeTriangleTrackLeftEighthBankToOrthogonalUp25( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -17556,28 +17930,32 @@ static void GigaRCTrackLeftEighthBankToOrthogonalUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 96)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 96)), { 0, 0, height }, { { 0, 0, height + 32 }, { 32, 32, 1 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::RightCorner, 5, height, session.SupportColours); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 100)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 100)), { 0, 0, height }, { { 0, 0, height + 32 }, { 32, 32, 1 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::BottomCorner, 7, height, session.SupportColours); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 104)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 104)), { 0, 0, height }, { { 16, 0, height }, { 16, 16, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::LeftCorner, 9, height, session.SupportColours); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 108)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 108)), { 0, 0, height }, { { 0, 0, height }, { 16, 16, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopCorner, 7, height, session.SupportColours); @@ -17598,22 +17976,26 @@ static void GigaRCTrackLeftEighthBankToOrthogonalUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 97)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 97)), { 0, 0, height }, { { 0, 0, height + 32 }, { 32, 32, 1 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 101)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 101)), { 0, 0, height }, { { 0, 0, height + 32 }, { 32, 32, 1 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 105)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 105)), { 0, 0, height }, { { 0, 0, height }, { 16, 16, 3 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 109)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 109)), { 0, 0, height }, { { 16, 0, height }, { 16, 16, 3 } }); break; } @@ -17642,22 +18024,26 @@ static void GigaRCTrackLeftEighthBankToOrthogonalUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 98)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 98)), { 0, 0, height }, { { 0, 31, height }, { 32, 1, 32 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 102)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 102)), { 0, 0, height }, { { 0, 31, height }, { 32, 1, 32 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 106)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 106)), { 0, 0, height }, { { 0, 0, height }, { 32, 16, 10 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 110)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 110)), { 0, 0, height }, { { 0, 16, height }, { 32, 16, 3 } }); break; } @@ -17676,28 +18062,32 @@ static void GigaRCTrackLeftEighthBankToOrthogonalUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 99)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 99)), { 0, 0, height }, { { 0, 31, height }, { 32, 1, 32 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 0, height, session.SupportColours); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 103)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 103)), { 0, 0, height }, { { 0, 31, height }, { 32, 1, 32 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 3, height, session.SupportColours); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 107)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 107)), { 0, 0, height }, { { 0, 0, height }, { 32, 20, 10 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 8, height, session.SupportColours); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 111)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 111)), { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 9, height, session.SupportColours); @@ -17714,7 +18104,7 @@ static void GigaRCTrackLeftEighthBankToOrthogonalUp25( } } -static void GigaRCTrackRightEighthBankToOrthogonalUp25( +static void LatticeTriangleTrackRightEighthBankToOrthogonalUp25( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -17725,28 +18115,32 @@ static void GigaRCTrackRightEighthBankToOrthogonalUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 112)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 112)), { 0, 0, height }, { { 0, 16, height }, { 16, 16, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::RightCorner, 9, height, session.SupportColours); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 116)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 116)), { 0, 0, height }, { { 0, 0, height + 32 }, { 32, 32, 1 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::BottomCorner, 7, height, session.SupportColours); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 120)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 120)), { 0, 0, height }, { { 0, 0, height + 32 }, { 32, 32, 1 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::LeftCorner, 5, height, session.SupportColours); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 124)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 124)), { 0, 0, height }, { { 0, 0, height }, { 16, 16, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::TopCorner, 7, height, session.SupportColours); @@ -17767,22 +18161,26 @@ static void GigaRCTrackRightEighthBankToOrthogonalUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 113)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 113)), { 0, 0, height }, { { 0, 0, height }, { 16, 16, 3 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 117)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 117)), { 0, 0, height }, { { 0, 0, height + 32 }, { 32, 32, 1 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 121)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 121)), { 0, 0, height }, { { 0, 0, height + 32 }, { 32, 32, 1 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 125)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 125)), { 0, 0, height }, { { 0, 16, height }, { 16, 16, 3 } }); break; } @@ -17812,22 +18210,26 @@ static void GigaRCTrackRightEighthBankToOrthogonalUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 114)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 114)), { 0, 0, height }, { { 0, 0, height }, { 16, 32, 10 } }); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 118)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 118)), { 0, 0, height }, { { 31, 0, height }, { 1, 32, 32 } }); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 122)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 122)), { 0, 0, height }, { { 31, 0, height }, { 1, 32, 32 } }); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 126)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 126)), { 0, 0, height }, { { 16, 0, height }, { 16, 32, 3 } }); break; } @@ -17846,28 +18248,32 @@ static void GigaRCTrackRightEighthBankToOrthogonalUp25( { case 0: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 115)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 115)), { 0, 0, height }, { { 6, 0, height }, { 20, 32, 10 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 8, height, session.SupportColours); break; case 1: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 119)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 119)), { 0, 0, height }, { { 31, 0, height }, { 1, 32, 32 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 3, height, session.SupportColours); break; case 2: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 123)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 123)), { 0, 0, height }, { { 31, 0, height }, { 1, 32, 32 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 0, height, session.SupportColours); break; case 3: PaintAddImageAsParentRotated( - session, direction, session.TrackColours.WithIndex((SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 127)), + session, direction, + session.TrackColours.WithIndex((SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 127)), { 0, 0, height }, { { 6, 0, height }, { 20, 32, 3 } }); MetalASupportsPaintSetup( session, kSupportType, MetalSupportPlace::Centre, 9, height, session.SupportColours); @@ -17887,38 +18293,39 @@ static void GigaRCTrackRightEighthBankToOrthogonalUp25( } } -static void GigaRCTrackLeftEighthBankToDiagDown25( +static void LatticeTriangleTrackLeftEighthBankToDiagDown25( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { uint8_t map[5] = { 4, 3, 1, 2, 0 }; trackSequence = map[trackSequence]; - GigaRCTrackRightEighthBankToOrthogonalUp25(session, ride, trackSequence, (direction + 1) & 3, height, trackElement); + LatticeTriangleTrackRightEighthBankToOrthogonalUp25( + session, ride, trackSequence, (direction + 1) & 3, height, trackElement); } -static void GigaRCTrackRightEighthBankToDiagDown25( +static void LatticeTriangleTrackRightEighthBankToDiagDown25( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { uint8_t map[5] = { 4, 3, 1, 2, 0 }; trackSequence = map[trackSequence]; - GigaRCTrackLeftEighthBankToOrthogonalUp25(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackLeftEighthBankToOrthogonalUp25(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); } -static void GigaRCTrackLeftEighthBankToOrthogonalDown25( +static void LatticeTriangleTrackLeftEighthBankToOrthogonalDown25( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; - GigaRCTrackRightEighthBankToDiagUp25(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); + LatticeTriangleTrackRightEighthBankToDiagUp25(session, ride, trackSequence, (direction + 2) & 3, height, trackElement); } -static void GigaRCTrackRightEighthBankToOrthogonalDown25( +static void LatticeTriangleTrackRightEighthBankToOrthogonalDown25( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; - GigaRCTrackLeftEighthBankToDiagUp25(session, ride, trackSequence, (direction + 3) & 3, height, trackElement); + LatticeTriangleTrackLeftEighthBankToDiagUp25(session, ride, trackSequence, (direction + 3) & 3, height, trackElement); } static constexpr CoordsXYZ diagBrakeBoundsOffsets[4] = { @@ -17928,16 +18335,16 @@ static constexpr CoordsXYZ diagBrakeBoundsOffsets[4] = { { 0, 0, 24 }, }; -static void GigaRCTrackDiagBrakes( +static void LatticeTriangleTrackDiagBrakes( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { TrackPaintUtilDiagTilesPaint( - session, 3, height, direction, trackSequence, GigaDiagBrakeImages[trackElement.IsBrakeClosed()][0], + session, 3, height, direction, trackSequence, LatticeTriangleBrakeImages[trackElement.IsBrakeClosed()][0], defaultDiagTileOffsets, defaultDiagBoundLengths, nullptr); TrackPaintUtilDiagTilesPaint( - session, 3, height, direction, trackSequence, GigaDiagBrakeImages[trackElement.IsBrakeClosed()][1], + session, 3, height, direction, trackSequence, LatticeTriangleBrakeImages[trackElement.IsBrakeClosed()][1], defaultDiagTileOffsets, defaultDiagBoundLengths, diagBrakeBoundsOffsets); if (trackSequence == 3) @@ -17949,495 +18356,495 @@ static void GigaRCTrackDiagBrakes( PaintUtilSetGeneralSupportHeight(session, height + kDefaultGeneralSupportHeight); } -TRACK_PAINT_FUNCTION GetTrackPaintFunctionGigaRC(int32_t trackType) +TRACK_PAINT_FUNCTION GetTrackPaintFunctionLatticeTriangleTrack(int32_t trackType) { switch (trackType) { case TrackElemType::Flat: - return GigaRCTrackFlat; + return LatticeTriangleTrackFlat; case TrackElemType::EndStation: case TrackElemType::BeginStation: case TrackElemType::MiddleStation: - return GigaRCTrackStation; + return LatticeTriangleTrackStation; case TrackElemType::Up25: - return GigaRCTrack25DegUp; + return LatticeTriangleTrack25DegUp; case TrackElemType::Up60: - return GigaRCTrack60DegUp; + return LatticeTriangleTrack60DegUp; case TrackElemType::FlatToUp25: - return GigaRCTrackFlatTo25DegUp; + return LatticeTriangleTrackFlatTo25DegUp; case TrackElemType::Up25ToUp60: - return GigaRCTrack25DegUpTo60DegUp; + return LatticeTriangleTrack25DegUpTo60DegUp; case TrackElemType::Up60ToUp25: - return GigaRCTrack60DegUpTo25DegUp; + return LatticeTriangleTrack60DegUpTo25DegUp; case TrackElemType::Up25ToFlat: - return GigaRCTrack25DegUpToFlat; + return LatticeTriangleTrack25DegUpToFlat; case TrackElemType::Down25: - return GigaRCTrack25DegDown; + return LatticeTriangleTrack25DegDown; case TrackElemType::Down60: - return GigaRCTrack60DegDown; + return LatticeTriangleTrack60DegDown; case TrackElemType::FlatToDown25: - return GigaRCTrackFlatTo25DegDown; + return LatticeTriangleTrackFlatTo25DegDown; case TrackElemType::Down25ToDown60: - return GigaRCTrack25DegDownTo60DegDown; + return LatticeTriangleTrack25DegDownTo60DegDown; case TrackElemType::Down60ToDown25: - return GigaRCTrack60DegDownTo25DegDown; + return LatticeTriangleTrack60DegDownTo25DegDown; case TrackElemType::Down25ToFlat: - return GigaRCTrack25DegDownToFlat; + return LatticeTriangleTrack25DegDownToFlat; case TrackElemType::LeftQuarterTurn5Tiles: - return GigaRCTrackLeftQuarterTurn5; + return LatticeTriangleTrackLeftQuarterTurn5; case TrackElemType::RightQuarterTurn5Tiles: - return GigaRCTrackRightQuarterTurn5; + return LatticeTriangleTrackRightQuarterTurn5; case TrackElemType::FlatToLeftBank: - return GigaRCTrackFlatToLeftBank; + return LatticeTriangleTrackFlatToLeftBank; case TrackElemType::FlatToRightBank: - return GigaRCTrackFlatToRightBank; + return LatticeTriangleTrackFlatToRightBank; case TrackElemType::LeftBankToFlat: - return GigaRCTrackLeftBankToFlat; + return LatticeTriangleTrackLeftBankToFlat; case TrackElemType::RightBankToFlat: - return GigaRCTrackRightBankToFlat; + return LatticeTriangleTrackRightBankToFlat; case TrackElemType::BankedLeftQuarterTurn5Tiles: - return GigaRCTrackBankedLeftQuarterTurn5; + return LatticeTriangleTrackBankedLeftQuarterTurn5; case TrackElemType::BankedRightQuarterTurn5Tiles: - return GigaRCTrackBankedRightQuarterTurn5; + return LatticeTriangleTrackBankedRightQuarterTurn5; case TrackElemType::LeftBankToUp25: - return GigaRCTrackLeftBankTo25DegUp; + return LatticeTriangleTrackLeftBankTo25DegUp; case TrackElemType::RightBankToUp25: - return GigaRCTrackRightBankTo25DegUp; + return LatticeTriangleTrackRightBankTo25DegUp; case TrackElemType::Up25ToLeftBank: - return GigaRCTrack25DegUpToLeftBank; + return LatticeTriangleTrack25DegUpToLeftBank; case TrackElemType::Up25ToRightBank: - return GigaRCTrack25DegUpToRightBank; + return LatticeTriangleTrack25DegUpToRightBank; case TrackElemType::LeftBankToDown25: - return GigaRCTrackLeftBankTo25DegDown; + return LatticeTriangleTrackLeftBankTo25DegDown; case TrackElemType::RightBankToDown25: - return GigaRCTrackRightBankTo25DegDown; + return LatticeTriangleTrackRightBankTo25DegDown; case TrackElemType::Down25ToLeftBank: - return GigaRCTrack25DegDownToLeftBank; + return LatticeTriangleTrack25DegDownToLeftBank; case TrackElemType::Down25ToRightBank: - return GigaRCTrack25DegDownToRightBank; + return LatticeTriangleTrack25DegDownToRightBank; case TrackElemType::LeftBank: - return GigaRCTrackLeftBank; + return LatticeTriangleTrackLeftBank; case TrackElemType::RightBank: - return GigaRCTrackRightBank; + return LatticeTriangleTrackRightBank; case TrackElemType::LeftQuarterTurn5TilesUp25: - return GigaRCTrackLeftQuarterTurn525DegUp; + return LatticeTriangleTrackLeftQuarterTurn525DegUp; case TrackElemType::RightQuarterTurn5TilesUp25: - return GigaRCTrackRightQuarterTurn525DegUp; + return LatticeTriangleTrackRightQuarterTurn525DegUp; case TrackElemType::LeftQuarterTurn5TilesDown25: - return GigaRCTrackLeftQuarterTurn525DegDown; + return LatticeTriangleTrackLeftQuarterTurn525DegDown; case TrackElemType::RightQuarterTurn5TilesDown25: - return GigaRCTrackRightQuarterTurn525DegDown; + return LatticeTriangleTrackRightQuarterTurn525DegDown; case TrackElemType::SBendLeft: - return GigaRCTrackSBendLeft; + return LatticeTriangleTrackSBendLeft; case TrackElemType::SBendRight: - return GigaRCTrackSBendRight; + return LatticeTriangleTrackSBendRight; case TrackElemType::LeftQuarterTurn3Tiles: - return GigaRCTrackLeftQuarterTurn3; + return LatticeTriangleTrackLeftQuarterTurn3; case TrackElemType::RightQuarterTurn3Tiles: - return GigaRCTrackRightQuarterTurn3; + return LatticeTriangleTrackRightQuarterTurn3; case TrackElemType::LeftBankedQuarterTurn3Tiles: - return GigaRCTrackLeftQuarterTurn3Bank; + return LatticeTriangleTrackLeftQuarterTurn3Bank; case TrackElemType::RightBankedQuarterTurn3Tiles: - return GigaRCTrackRightQuarterTurn3Bank; + return LatticeTriangleTrackRightQuarterTurn3Bank; case TrackElemType::LeftQuarterTurn3TilesUp25: - return GigaRCTrackLeftQuarterTurn325DegUp; + return LatticeTriangleTrackLeftQuarterTurn325DegUp; case TrackElemType::RightQuarterTurn3TilesUp25: - return GigaRCTrackRightQuarterTurn325DegUp; + return LatticeTriangleTrackRightQuarterTurn325DegUp; case TrackElemType::LeftQuarterTurn3TilesDown25: - return GigaRCTrackLeftQuarterTurn325DegDown; + return LatticeTriangleTrackLeftQuarterTurn325DegDown; case TrackElemType::RightQuarterTurn3TilesDown25: - return GigaRCTrackRightQuarterTurn325DegDown; + return LatticeTriangleTrackRightQuarterTurn325DegDown; case TrackElemType::LeftHalfBankedHelixUpSmall: - return GigaRCTrackLeftHalfBankedHelixUpSmall; + return LatticeTriangleTrackLeftHalfBankedHelixUpSmall; case TrackElemType::RightHalfBankedHelixUpSmall: - return GigaRCTrackRightHalfBankedHelixUpSmall; + return LatticeTriangleTrackRightHalfBankedHelixUpSmall; case TrackElemType::LeftHalfBankedHelixDownSmall: - return GigaRCTrackLeftHalfBankedHelixDownSmall; + return LatticeTriangleTrackLeftHalfBankedHelixDownSmall; case TrackElemType::RightHalfBankedHelixDownSmall: - return GigaRCTrackRightHalfBankedHelixDownSmall; + return LatticeTriangleTrackRightHalfBankedHelixDownSmall; case TrackElemType::LeftHalfBankedHelixUpLarge: - return GigaRCTrackLeftHalfBankedHelixUpLarge; + return LatticeTriangleTrackLeftHalfBankedHelixUpLarge; case TrackElemType::RightHalfBankedHelixUpLarge: - return GigaRCTrackRightHalfBankedHelixUpLarge; + return LatticeTriangleTrackRightHalfBankedHelixUpLarge; case TrackElemType::LeftHalfBankedHelixDownLarge: - return GigaRCTrackLeftHalfBankedHelixDownLarge; + return LatticeTriangleTrackLeftHalfBankedHelixDownLarge; case TrackElemType::RightHalfBankedHelixDownLarge: - return GigaRCTrackRightHalfBankedHelixDownLarge; + return LatticeTriangleTrackRightHalfBankedHelixDownLarge; case TrackElemType::LeftQuarterTurn1TileUp60: - return GigaRCTrackLeftQuarterTurn160DegUp; + return LatticeTriangleTrackLeftQuarterTurn160DegUp; case TrackElemType::RightQuarterTurn1TileUp60: - return GigaRCTrackRightQuarterTurn160DegUp; + return LatticeTriangleTrackRightQuarterTurn160DegUp; case TrackElemType::LeftQuarterTurn1TileDown60: - return GigaRCTrackLeftQuarterTurn160DegDown; + return LatticeTriangleTrackLeftQuarterTurn160DegDown; case TrackElemType::RightQuarterTurn1TileDown60: - return GigaRCTrackRightQuarterTurn160DegDown; + return LatticeTriangleTrackRightQuarterTurn160DegDown; case TrackElemType::Brakes: - return GigaRCTrackBrakes; + return LatticeTriangleTrackBrakes; case TrackElemType::Up25LeftBanked: - return GigaRCTrack25DegUpLeftBanked; + return LatticeTriangleTrack25DegUpLeftBanked; case TrackElemType::Up25RightBanked: - return GigaRCTrack25DegUpRightBanked; + return LatticeTriangleTrack25DegUpRightBanked; case TrackElemType::OnRidePhoto: - return GigaRCTrackOnRidePhoto; + return LatticeTriangleTrackOnRidePhoto; case TrackElemType::Down25LeftBanked: - return GigaRCTrack25DegDownLeftBanked; + return LatticeTriangleTrack25DegDownLeftBanked; case TrackElemType::Down25RightBanked: - return GigaRCTrack25DegDownRightBanked; + return LatticeTriangleTrack25DegDownRightBanked; case TrackElemType::FlatToUp60LongBase: - return GigaRCTrackFlatTo60DegUpLongBase; + return LatticeTriangleTrackFlatTo60DegUpLongBase; case TrackElemType::Up60ToFlatLongBase: - return GigaRCTrack60DegUpToFlatLongBase; + return LatticeTriangleTrack60DegUpToFlatLongBase; case TrackElemType::Down60ToFlatLongBase: - return GigaRCTrack60DegDownToFlatLongBase; + return LatticeTriangleTrack60DegDownToFlatLongBase; case TrackElemType::FlatToDown60LongBase: - return GigaRCTrackFlatTo60DegDownLongBase; + return LatticeTriangleTrackFlatTo60DegDownLongBase; case TrackElemType::CableLiftHill: - return GigaRCTrackCableLiftHill; + return LatticeTriangleTrackCableLiftHill; case TrackElemType::LeftEighthToDiag: - return GigaRCTrackLeftEighthToDiag; + return LatticeTriangleTrackLeftEighthToDiag; case TrackElemType::RightEighthToDiag: - return GigaRCTrackRightEighthToDiag; + return LatticeTriangleTrackRightEighthToDiag; case TrackElemType::LeftEighthToOrthogonal: - return GigaRCTrackLeftEighthToOrthogonal; + return LatticeTriangleTrackLeftEighthToOrthogonal; case TrackElemType::RightEighthToOrthogonal: - return GigaRCTrackRightEighthToOrthogonal; + return LatticeTriangleTrackRightEighthToOrthogonal; case TrackElemType::LeftEighthBankToDiag: - return GigaRCTrackLeftEighthBankToDiag; + return LatticeTriangleTrackLeftEighthBankToDiag; case TrackElemType::RightEighthBankToDiag: - return GigaRCTrackRightEighthBankToDiag; + return LatticeTriangleTrackRightEighthBankToDiag; case TrackElemType::LeftEighthBankToOrthogonal: - return GigaRCTrackLeftEighthBankToOrthogonal; + return LatticeTriangleTrackLeftEighthBankToOrthogonal; case TrackElemType::RightEighthBankToOrthogonal: - return GigaRCTrackRightEighthBankToOrthogonal; + return LatticeTriangleTrackRightEighthBankToOrthogonal; case TrackElemType::DiagFlat: - return GigaRCTrackDiagFlat; + return LatticeTriangleTrackDiagFlat; case TrackElemType::DiagUp25: - return GigaRCTrackDiag25DegUp; + return LatticeTriangleTrackDiag25DegUp; case TrackElemType::DiagUp60: - return GigaRCTrackDiag60DegUp; + return LatticeTriangleTrackDiag60DegUp; case TrackElemType::DiagFlatToUp25: - return GigaRCTrackDiagFlatTo25DegUp; + return LatticeTriangleTrackDiagFlatTo25DegUp; case TrackElemType::DiagUp25ToUp60: - return GigaRCTrackDiag25DegUpTo60DegUp; + return LatticeTriangleTrackDiag25DegUpTo60DegUp; case TrackElemType::DiagUp60ToUp25: - return GigaRCTrackDiag60DegUpTo25DegUp; + return LatticeTriangleTrackDiag60DegUpTo25DegUp; case TrackElemType::DiagUp25ToFlat: - return GigaRCTrackDiag25DegUpToFlat; + return LatticeTriangleTrackDiag25DegUpToFlat; case TrackElemType::DiagDown25: - return GigaRCTrackDiag25DegDown; + return LatticeTriangleTrackDiag25DegDown; case TrackElemType::DiagDown60: - return GigaRCTrackDiag60DegDown; + return LatticeTriangleTrackDiag60DegDown; case TrackElemType::DiagFlatToDown25: - return GigaRCTrackDiagFlatTo25DegDown; + return LatticeTriangleTrackDiagFlatTo25DegDown; case TrackElemType::DiagDown25ToDown60: - return GigaRCTrackDiag25DegDownTo60DegDown; + return LatticeTriangleTrackDiag25DegDownTo60DegDown; case TrackElemType::DiagDown60ToDown25: - return GigaRCTrackDiag60DegDownTo25DegDown; + return LatticeTriangleTrackDiag60DegDownTo25DegDown; case TrackElemType::DiagDown25ToFlat: - return GigaRCTrackDiag25DegDownToFlat; + return LatticeTriangleTrackDiag25DegDownToFlat; case TrackElemType::DiagFlatToLeftBank: - return GigaRCTrackDiagFlatToLeftBank; + return LatticeTriangleTrackDiagFlatToLeftBank; case TrackElemType::DiagFlatToRightBank: - return GigaRCTrackDiagFlatToRightBank; + return LatticeTriangleTrackDiagFlatToRightBank; case TrackElemType::DiagLeftBankToFlat: - return GigaRCTrackDiagLeftBankToFlat; + return LatticeTriangleTrackDiagLeftBankToFlat; case TrackElemType::DiagRightBankToFlat: - return GigaRCTrackDiagRightBankToFlat; + return LatticeTriangleTrackDiagRightBankToFlat; case TrackElemType::DiagLeftBankToUp25: - return GigaRCTrackDiagLeftBankTo25DegUp; + return LatticeTriangleTrackDiagLeftBankTo25DegUp; case TrackElemType::DiagRightBankToUp25: - return GigaRCTrackDiagRightBankTo25DegUp; + return LatticeTriangleTrackDiagRightBankTo25DegUp; case TrackElemType::DiagUp25ToLeftBank: - return GigaRCTrackDiag25DegUpToLeftBank; + return LatticeTriangleTrackDiag25DegUpToLeftBank; case TrackElemType::DiagUp25ToRightBank: - return GigaRCTrackDiag25DegUpToRightBank; + return LatticeTriangleTrackDiag25DegUpToRightBank; case TrackElemType::DiagLeftBankToDown25: - return GigaRCTrackDiagLeftBankTo25DegDown; + return LatticeTriangleTrackDiagLeftBankTo25DegDown; case TrackElemType::DiagRightBankToDown25: - return GigaRCTrackDiagRightBankTo25DegDown; + return LatticeTriangleTrackDiagRightBankTo25DegDown; case TrackElemType::DiagDown25ToLeftBank: - return GigaRCTrackDiag25DegDownToLeftBank; + return LatticeTriangleTrackDiag25DegDownToLeftBank; case TrackElemType::DiagDown25ToRightBank: - return GigaRCTrackDiag25DegDownToRightBank; + return LatticeTriangleTrackDiag25DegDownToRightBank; case TrackElemType::DiagLeftBank: - return GigaRCTrackDiagLeftBank; + return LatticeTriangleTrackDiagLeftBank; case TrackElemType::DiagRightBank: - return GigaRCTrackDiagRightBank; + return LatticeTriangleTrackDiagRightBank; case TrackElemType::BlockBrakes: - return GigaRCTrackBlockBrakes; + return LatticeTriangleTrackBlockBrakes; case TrackElemType::LeftBankedQuarterTurn3TileUp25: - return GigaRCTrackLeftBankedQuarterTurn325DegUp; + return LatticeTriangleTrackLeftBankedQuarterTurn325DegUp; case TrackElemType::RightBankedQuarterTurn3TileUp25: - return GigaRCTrackRightBankedQuarterTurn325DegUp; + return LatticeTriangleTrackRightBankedQuarterTurn325DegUp; case TrackElemType::LeftBankedQuarterTurn3TileDown25: - return GigaRCTrackLeftBankedQuarterTurn325DegDown; + return LatticeTriangleTrackLeftBankedQuarterTurn325DegDown; case TrackElemType::RightBankedQuarterTurn3TileDown25: - return GigaRCTrackRightBankedQuarterTurn325DegDown; + return LatticeTriangleTrackRightBankedQuarterTurn325DegDown; case TrackElemType::LeftBankedQuarterTurn5TileUp25: - return GigaRCTrackLeftBankedQuarterTurn525DegUp; + return LatticeTriangleTrackLeftBankedQuarterTurn525DegUp; case TrackElemType::RightBankedQuarterTurn5TileUp25: - return GigaRCTrackRightBankedQuarterTurn525DegUp; + return LatticeTriangleTrackRightBankedQuarterTurn525DegUp; case TrackElemType::LeftBankedQuarterTurn5TileDown25: - return GigaRCTrackLeftBankedQuarterTurn525DegDown; + return LatticeTriangleTrackLeftBankedQuarterTurn525DegDown; case TrackElemType::RightBankedQuarterTurn5TileDown25: - return GigaRCTrackRightBankedQuarterTurn525DegDown; + return LatticeTriangleTrackRightBankedQuarterTurn525DegDown; case TrackElemType::Up25ToLeftBankedUp25: - return GigaRCTrack25DegUpToLeftBanked25DegUp; + return LatticeTriangleTrack25DegUpToLeftBanked25DegUp; case TrackElemType::Up25ToRightBankedUp25: - return GigaRCTrack25DegUpToRightBanked25DegUp; + return LatticeTriangleTrack25DegUpToRightBanked25DegUp; case TrackElemType::LeftBankedUp25ToUp25: - return GigaRCTrackLeftBanked25DegUpTo25DegUp; + return LatticeTriangleTrackLeftBanked25DegUpTo25DegUp; case TrackElemType::RightBankedUp25ToUp25: - return GigaRCTrackRightBanked25DegUpTo25DegUp; + return LatticeTriangleTrackRightBanked25DegUpTo25DegUp; case TrackElemType::Down25ToLeftBankedDown25: - return GigaRCTrack25DegDownToLeftBanked25DegDown; + return LatticeTriangleTrack25DegDownToLeftBanked25DegDown; case TrackElemType::Down25ToRightBankedDown25: - return GigaRCTrack25DegDownToRightBanked25DegDown; + return LatticeTriangleTrack25DegDownToRightBanked25DegDown; case TrackElemType::LeftBankedDown25ToDown25: - return GigaRCTrackLeftBanked25DegDownTo25DegDown; + return LatticeTriangleTrackLeftBanked25DegDownTo25DegDown; case TrackElemType::RightBankedDown25ToDown25: - return GigaRCTrackRightBanked25DegDownTo25DegDown; + return LatticeTriangleTrackRightBanked25DegDownTo25DegDown; case TrackElemType::LeftBankedFlatToLeftBankedUp25: - return GigaRCTrackLeftBankedFlatToLeftBanked25DegUp; + return LatticeTriangleTrackLeftBankedFlatToLeftBanked25DegUp; case TrackElemType::RightBankedFlatToRightBankedUp25: - return GigaRCTrackRightBankedFlatToRightBanked25DegUp; + return LatticeTriangleTrackRightBankedFlatToRightBanked25DegUp; case TrackElemType::LeftBankedUp25ToLeftBankedFlat: - return GigaRCTrackLeftBanked25DegUpToLeftBankedFlat; + return LatticeTriangleTrackLeftBanked25DegUpToLeftBankedFlat; case TrackElemType::RightBankedUp25ToRightBankedFlat: - return GigaRCTrackRightBanked25DegUpToRightBankedFlat; + return LatticeTriangleTrackRightBanked25DegUpToRightBankedFlat; case TrackElemType::LeftBankedFlatToLeftBankedDown25: - return GigaRCTrackLeftBankedFlatToLeftBanked25DegDown; + return LatticeTriangleTrackLeftBankedFlatToLeftBanked25DegDown; case TrackElemType::RightBankedFlatToRightBankedDown25: - return GigaRCTrackRightBankedFlatToRightBanked25DegDown; + return LatticeTriangleTrackRightBankedFlatToRightBanked25DegDown; case TrackElemType::LeftBankedDown25ToLeftBankedFlat: - return GigaRCTrackLeftBanked25DegDownToLeftBankedFlat; + return LatticeTriangleTrackLeftBanked25DegDownToLeftBankedFlat; case TrackElemType::RightBankedDown25ToRightBankedFlat: - return GigaRCTrackRightBanked25DegDownToRightBankedFlat; + return LatticeTriangleTrackRightBanked25DegDownToRightBankedFlat; case TrackElemType::FlatToLeftBankedUp25: - return GigaRCTrackFlatToLeftBanked25DegUp; + return LatticeTriangleTrackFlatToLeftBanked25DegUp; case TrackElemType::FlatToRightBankedUp25: - return GigaRCTrackFlatToRightBanked25DegUp; + return LatticeTriangleTrackFlatToRightBanked25DegUp; case TrackElemType::LeftBankedUp25ToFlat: - return GigaRCTrackLeftBanked25DegUpToFlat; + return LatticeTriangleTrackLeftBanked25DegUpToFlat; case TrackElemType::RightBankedUp25ToFlat: - return GigaRCTrackRightBanked25DegUpToFlat; + return LatticeTriangleTrackRightBanked25DegUpToFlat; case TrackElemType::FlatToLeftBankedDown25: - return GigaRCTrackFlatToLeftBanked25DegDown; + return LatticeTriangleTrackFlatToLeftBanked25DegDown; case TrackElemType::FlatToRightBankedDown25: - return GigaRCTrackFlatToRightBanked25DegDown; + return LatticeTriangleTrackFlatToRightBanked25DegDown; case TrackElemType::LeftBankedDown25ToFlat: - return GigaRCTrackLeftBanked25DegDownToFlat; + return LatticeTriangleTrackLeftBanked25DegDownToFlat; case TrackElemType::RightBankedDown25ToFlat: - return GigaRCTrackRightBanked25DegDownToFlat; + return LatticeTriangleTrackRightBanked25DegDownToFlat; case TrackElemType::Booster: - return GigaRCTrackBooster; + return LatticeTriangleTrackBooster; case TrackElemType::PoweredLift: - return GigaRCTrackPoweredLift; + return LatticeTriangleTrackPoweredLift; case TrackElemType::Up90: - return GigaRCTrack90DegUp; + return LatticeTriangleTrack90DegUp; case TrackElemType::Down90: - return GigaRCTrack90DegDown; + return LatticeTriangleTrack90DegDown; case TrackElemType::Up60ToUp90: - return GigaRCTrack60DegUpTo90DegUp; + return LatticeTriangleTrack60DegUpTo90DegUp; case TrackElemType::Down90ToDown60: - return GigaRCTrack90DegDownTo60DegDown; + return LatticeTriangleTrack90DegDownTo60DegDown; case TrackElemType::Up90ToUp60: - return GigaRCTrack90DegUpTo60DegUp; + return LatticeTriangleTrack90DegUpTo60DegUp; case TrackElemType::Down60ToDown90: - return GigaRCTrack60DegDownTo90DegDown; + return LatticeTriangleTrack60DegDownTo90DegDown; case TrackElemType::LeftQuarterTurn1TileUp90: - return GigaRCTrackLeftQuarterTurn190DegUp; + return LatticeTriangleTrackLeftQuarterTurn190DegUp; case TrackElemType::RightQuarterTurn1TileUp90: - return GigaRCTrackRightQuarterTurn190DegUp; + return LatticeTriangleTrackRightQuarterTurn190DegUp; case TrackElemType::LeftQuarterTurn1TileDown90: - return GigaRCTrackLeftQuarterTurn190DegDown; + return LatticeTriangleTrackLeftQuarterTurn190DegDown; case TrackElemType::RightQuarterTurn1TileDown90: - return GigaRCTrackRightQuarterTurn190DegDown; + return LatticeTriangleTrackRightQuarterTurn190DegDown; case TrackElemType::LeftBarrelRollUpToDown: - return GigaRCTrackLeftBarrelRollUpToDown; + return LatticeTriangleTrackLeftBarrelRollUpToDown; case TrackElemType::RightBarrelRollUpToDown: - return GigaRCTrackRightBarrelRollUpToDown; + return LatticeTriangleTrackRightBarrelRollUpToDown; case TrackElemType::LeftBarrelRollDownToUp: - return GigaRCTrackLeftBarrelRollDownToUp; + return LatticeTriangleTrackLeftBarrelRollDownToUp; case TrackElemType::RightBarrelRollDownToUp: - return GigaRCTrackRightBarrelRollDownToUp; + return LatticeTriangleTrackRightBarrelRollDownToUp; case TrackElemType::HalfLoopUp: - return GigaRCTrackHalfLoopUp; + return LatticeTriangleTrackHalfLoopUp; case TrackElemType::HalfLoopDown: - return GigaRCTrackHalfLoopDown; + return LatticeTriangleTrackHalfLoopDown; case TrackElemType::LeftVerticalLoop: - return GigaRCTrackLeftVerticalLoop; + return LatticeTriangleTrackLeftVerticalLoop; case TrackElemType::RightVerticalLoop: - return GigaRCTrackRightVerticalLoop; + return LatticeTriangleTrackRightVerticalLoop; case TrackElemType::LeftCorkscrewUp: - return GigaRCTrackLeftCorkscrewUp; + return LatticeTriangleTrackLeftCorkscrewUp; case TrackElemType::RightCorkscrewUp: - return GigaRCTrackRightCorkscrewUp; + return LatticeTriangleTrackRightCorkscrewUp; case TrackElemType::LeftCorkscrewDown: - return GigaRCTrackLeftCorkscrewDown; + return LatticeTriangleTrackLeftCorkscrewDown; case TrackElemType::RightCorkscrewDown: - return GigaRCTrackRightCorkscrewDown; + return LatticeTriangleTrackRightCorkscrewDown; case TrackElemType::LeftLargeCorkscrewUp: - return GigaRCTrackLeftLargeCorkscrewUp; + return LatticeTriangleTrackLeftLargeCorkscrewUp; case TrackElemType::RightLargeCorkscrewUp: - return GigaRCTrackRightLargeCorkscrewUp; + return LatticeTriangleTrackRightLargeCorkscrewUp; case TrackElemType::LeftLargeCorkscrewDown: - return GigaRCTrackLeftLargeCorkscrewDown; + return LatticeTriangleTrackLeftLargeCorkscrewDown; case TrackElemType::RightLargeCorkscrewDown: - return GigaRCTrackRightLargeCorkscrewDown; + return LatticeTriangleTrackRightLargeCorkscrewDown; case TrackElemType::LeftZeroGRollUp: - return GigaRCTrackLeftZeroGRollUp; + return LatticeTriangleTrackLeftZeroGRollUp; case TrackElemType::RightZeroGRollUp: - return GigaRCTrackRightZeroGRollUp; + return LatticeTriangleTrackRightZeroGRollUp; case TrackElemType::LeftZeroGRollDown: - return GigaRCTrackLeftZeroGRollDown; + return LatticeTriangleTrackLeftZeroGRollDown; case TrackElemType::RightZeroGRollDown: - return GigaRCTrackRightZeroGRollDown; + return LatticeTriangleTrackRightZeroGRollDown; case TrackElemType::LeftLargeZeroGRollUp: - return GigaRCTrackLeftLargeZeroGRollUp; + return LatticeTriangleTrackLeftLargeZeroGRollUp; case TrackElemType::RightLargeZeroGRollUp: - return GigaRCTrackRightLargeZeroGRollUp; + return LatticeTriangleTrackRightLargeZeroGRollUp; case TrackElemType::LeftLargeZeroGRollDown: - return GigaRCTrackLeftLargeZeroGRollDown; + return LatticeTriangleTrackLeftLargeZeroGRollDown; case TrackElemType::RightLargeZeroGRollDown: - return GigaRCTrackRightLargeZeroGRollDown; + return LatticeTriangleTrackRightLargeZeroGRollDown; case TrackElemType::Up90ToInvertedFlatQuarterLoop: - return GigaRCTrack90DegToInvertedFlatQuarterLoopUp; + return LatticeTriangleTrack90DegToInvertedFlatQuarterLoopUp; case TrackElemType::InvertedFlatToDown90QuarterLoop: - return GigaRCTrackInvertedFlatTo90DegQuarterLoopDown; + return LatticeTriangleTrackInvertedFlatTo90DegQuarterLoopDown; case TrackElemType::LeftBankToLeftQuarterTurn3TilesUp25: - return GigaRCTrackLeftBankToLeftQuarterTurn3Tile25DegUp; + return LatticeTriangleTrackLeftBankToLeftQuarterTurn3Tile25DegUp; case TrackElemType::RightBankToRightQuarterTurn3TilesUp25: - return GigaRCTrackRightBankToRightQuarterTurn3Tile25DegUp; + return LatticeTriangleTrackRightBankToRightQuarterTurn3Tile25DegUp; case TrackElemType::LeftQuarterTurn3TilesDown25ToLeftBank: - return GigaRCTrackLeftQuarterTurn3Tile25DegDownToLeftBank; + return LatticeTriangleTrackLeftQuarterTurn3Tile25DegDownToLeftBank; case TrackElemType::RightQuarterTurn3TilesDown25ToRightBank: - return GigaRCTrackRightQuarterTurn3Tile25DegDownToRightBank; + return LatticeTriangleTrackRightQuarterTurn3Tile25DegDownToRightBank; case TrackElemType::LeftMediumHalfLoopUp: - return GigaRCTrackLeftMediumHalfLoopUp; + return LatticeTriangleTrackLeftMediumHalfLoopUp; case TrackElemType::RightMediumHalfLoopUp: - return GigaRCTrackRightMediumHalfLoopUp; + return LatticeTriangleTrackRightMediumHalfLoopUp; case TrackElemType::LeftMediumHalfLoopDown: - return GigaRCTrackLeftMediumHalfLoopDown; + return LatticeTriangleTrackLeftMediumHalfLoopDown; case TrackElemType::RightMediumHalfLoopDown: - return GigaRCTrackRightMediumHalfLoopDown; + return LatticeTriangleTrackRightMediumHalfLoopDown; case TrackElemType::LeftLargeHalfLoopUp: - return GigaRCTrackLeftLargeHalfLoopUp; + return LatticeTriangleTrackLeftLargeHalfLoopUp; case TrackElemType::RightLargeHalfLoopUp: - return GigaRCTrackRightLargeHalfLoopUp; + return LatticeTriangleTrackRightLargeHalfLoopUp; case TrackElemType::RightLargeHalfLoopDown: - return GigaRCTrackRightLargeHalfLoopDown; + return LatticeTriangleTrackRightLargeHalfLoopDown; case TrackElemType::LeftLargeHalfLoopDown: - return GigaRCTrackLeftLargeHalfLoopDown; + return LatticeTriangleTrackLeftLargeHalfLoopDown; case TrackElemType::FlatToUp60: - return GigaRCTrackFlatTo60DegUp; + return LatticeTriangleTrackFlatTo60DegUp; case TrackElemType::Up60ToFlat: - return GigaRCTrack60DegUpToFlat; + return LatticeTriangleTrack60DegUpToFlat; case TrackElemType::FlatToDown60: - return GigaRCTrackFlatTo60DegDown; + return LatticeTriangleTrackFlatTo60DegDown; case TrackElemType::Down60ToFlat: - return GigaRCTrack60DegDownToFlat; + return LatticeTriangleTrack60DegDownToFlat; case TrackElemType::DiagFlatToUp60: - return GigaRCTrackDiagFlatTo60DegUp; + return LatticeTriangleTrackDiagFlatTo60DegUp; case TrackElemType::DiagUp60ToFlat: - return GigaRCTrackDiag60DegUpToFlat; + return LatticeTriangleTrackDiag60DegUpToFlat; case TrackElemType::DiagFlatToDown60: - return GigaRCTrackDiagFlatTo60DegDown; + return LatticeTriangleTrackDiagFlatTo60DegDown; case TrackElemType::DiagDown60ToFlat: - return GigaRCTrackDiag60DegDownToFlat; + return LatticeTriangleTrackDiag60DegDownToFlat; case TrackElemType::LeftEighthToDiagUp25: - return GigaRCTrackLeftEighthToDiagUp25; + return LatticeTriangleTrackLeftEighthToDiagUp25; case TrackElemType::RightEighthToDiagUp25: - return GigaRCTrackRightEighthToDiagUp25; + return LatticeTriangleTrackRightEighthToDiagUp25; case TrackElemType::LeftEighthToDiagDown25: - return GigaRCTrackLeftEighthToDiagDown25; + return LatticeTriangleTrackLeftEighthToDiagDown25; case TrackElemType::RightEighthToDiagDown25: - return GigaRCTrackRightEighthToDiagDown25; + return LatticeTriangleTrackRightEighthToDiagDown25; case TrackElemType::LeftEighthToOrthogonalUp25: - return GigaRCTrackLeftEighthToOrthogonalUp25; + return LatticeTriangleTrackLeftEighthToOrthogonalUp25; case TrackElemType::RightEighthToOrthogonalUp25: - return GigaRCTrackRightEighthToOrthogonalUp25; + return LatticeTriangleTrackRightEighthToOrthogonalUp25; case TrackElemType::LeftEighthToOrthogonalDown25: - return GigaRCTrackLeftEighthToOrthogonalDown25; + return LatticeTriangleTrackLeftEighthToOrthogonalDown25; case TrackElemType::RightEighthToOrthogonalDown25: - return GigaRCTrackRightEighthToOrthogonalDown25; + return LatticeTriangleTrackRightEighthToOrthogonalDown25; case TrackElemType::DiagUp25ToLeftBankedUp25: - return GigaRCTrackDiagUp25ToLeftBankedUp25; + return LatticeTriangleTrackDiagUp25ToLeftBankedUp25; case TrackElemType::DiagUp25ToRightBankedUp25: - return GigaRCTrackDiagUp25ToRightBankedUp25; + return LatticeTriangleTrackDiagUp25ToRightBankedUp25; case TrackElemType::DiagLeftBankedUp25ToUp25: - return GigaRCTrackDiagLeftBankedUp25ToUp25; + return LatticeTriangleTrackDiagLeftBankedUp25ToUp25; case TrackElemType::DiagRightBankedUp25ToUp25: - return GigaRCTrackDiagRightBankedUp25ToUp25; + return LatticeTriangleTrackDiagRightBankedUp25ToUp25; case TrackElemType::DiagDown25ToLeftBankedDown25: - return GigaRCTrackDiagDown25ToLeftBankedDown25; + return LatticeTriangleTrackDiagDown25ToLeftBankedDown25; case TrackElemType::DiagDown25ToRightBankedDown25: - return GigaRCTrackDiagDown25ToRightBankedDown25; + return LatticeTriangleTrackDiagDown25ToRightBankedDown25; case TrackElemType::DiagLeftBankedDown25ToDown25: - return GigaRCTrackDiagLeftBankedDown25ToDown25; + return LatticeTriangleTrackDiagLeftBankedDown25ToDown25; case TrackElemType::DiagRightBankedDown25ToDown25: - return GigaRCTrackDiagRightBankedDown25ToDown25; + return LatticeTriangleTrackDiagRightBankedDown25ToDown25; case TrackElemType::DiagLeftBankedFlatToLeftBankedUp25: - return GigaRCTrackDiagLeftBankedFlatToLeftBankedUp25; + return LatticeTriangleTrackDiagLeftBankedFlatToLeftBankedUp25; case TrackElemType::DiagRightBankedFlatToRightBankedUp25: - return GigaRCTrackDiagRightBankedFlatToRightBankedUp25; + return LatticeTriangleTrackDiagRightBankedFlatToRightBankedUp25; case TrackElemType::DiagLeftBankedUp25ToLeftBankedFlat: - return GigaRCTrackDiagLeftBankedUp25ToLeftBankedFlat; + return LatticeTriangleTrackDiagLeftBankedUp25ToLeftBankedFlat; case TrackElemType::DiagRightBankedUp25ToRightBankedFlat: - return GigaRCTrackDiagRightBankedUp25ToRightBankedFlat; + return LatticeTriangleTrackDiagRightBankedUp25ToRightBankedFlat; case TrackElemType::DiagLeftBankedFlatToLeftBankedDown25: - return GigaRCTrackDiagLeftBankedFlatToLeftBankedDown25; + return LatticeTriangleTrackDiagLeftBankedFlatToLeftBankedDown25; case TrackElemType::DiagRightBankedFlatToRightBankedDown25: - return GigaRCTrackDiagRightBankedFlatToRightBankedDown25; + return LatticeTriangleTrackDiagRightBankedFlatToRightBankedDown25; case TrackElemType::DiagLeftBankedDown25ToLeftBankedFlat: - return GigaRCTrackDiagLeftBankedDown25ToLeftBankedFlat; + return LatticeTriangleTrackDiagLeftBankedDown25ToLeftBankedFlat; case TrackElemType::DiagRightBankedDown25ToRightBankedFlat: - return GigaRCTrackDiagRightBankedDown25ToRightBankedFlat; + return LatticeTriangleTrackDiagRightBankedDown25ToRightBankedFlat; case TrackElemType::DiagUp25LeftBanked: - return GigaRCTrackDiagUp25LeftBanked; + return LatticeTriangleTrackDiagUp25LeftBanked; case TrackElemType::DiagUp25RightBanked: - return GigaRCTrackDiagUp25RightBanked; + return LatticeTriangleTrackDiagUp25RightBanked; case TrackElemType::DiagDown25LeftBanked: - return GigaRCTrackDiagDown25LeftBanked; + return LatticeTriangleTrackDiagDown25LeftBanked; case TrackElemType::DiagDown25RightBanked: - return GigaRCTrackDiagDown25RightBanked; + return LatticeTriangleTrackDiagDown25RightBanked; case TrackElemType::DiagFlatToLeftBankedUp25: - return GigaRCTrackDiagFlatToLeftBankedUp25; + return LatticeTriangleTrackDiagFlatToLeftBankedUp25; case TrackElemType::DiagFlatToRightBankedUp25: - return GigaRCTrackDiagFlatToRightBankedUp25; + return LatticeTriangleTrackDiagFlatToRightBankedUp25; case TrackElemType::DiagLeftBankedUp25ToFlat: - return GigaRCTrackDiagLeftBankedUp25ToFlat; + return LatticeTriangleTrackDiagLeftBankedUp25ToFlat; case TrackElemType::DiagRightBankedUp25ToFlat: - return GigaRCTrackDiagRightBankedUp25ToFlat; + return LatticeTriangleTrackDiagRightBankedUp25ToFlat; case TrackElemType::DiagFlatToLeftBankedDown25: - return GigaRCTrackDiagFlatToLeftBankedDown25; + return LatticeTriangleTrackDiagFlatToLeftBankedDown25; case TrackElemType::DiagFlatToRightBankedDown25: - return GigaRCTrackDiagFlatToRightBankedDown25; + return LatticeTriangleTrackDiagFlatToRightBankedDown25; case TrackElemType::DiagLeftBankedDown25ToFlat: - return GigaRCTrackDiagLeftBankedDown25ToFlat; + return LatticeTriangleTrackDiagLeftBankedDown25ToFlat; case TrackElemType::DiagRightBankedDown25ToFlat: - return GigaRCTrackDiagRightBankedDown25ToFlat; + return LatticeTriangleTrackDiagRightBankedDown25ToFlat; case TrackElemType::LeftEighthBankToDiagUp25: - return GigaRCTrackLeftEighthBankToDiagUp25; + return LatticeTriangleTrackLeftEighthBankToDiagUp25; case TrackElemType::RightEighthBankToDiagUp25: - return GigaRCTrackRightEighthBankToDiagUp25; + return LatticeTriangleTrackRightEighthBankToDiagUp25; case TrackElemType::LeftEighthBankToDiagDown25: - return GigaRCTrackLeftEighthBankToDiagDown25; + return LatticeTriangleTrackLeftEighthBankToDiagDown25; case TrackElemType::RightEighthBankToDiagDown25: - return GigaRCTrackRightEighthBankToDiagDown25; + return LatticeTriangleTrackRightEighthBankToDiagDown25; case TrackElemType::LeftEighthBankToOrthogonalUp25: - return GigaRCTrackLeftEighthBankToOrthogonalUp25; + return LatticeTriangleTrackLeftEighthBankToOrthogonalUp25; case TrackElemType::RightEighthBankToOrthogonalUp25: - return GigaRCTrackRightEighthBankToOrthogonalUp25; + return LatticeTriangleTrackRightEighthBankToOrthogonalUp25; case TrackElemType::LeftEighthBankToOrthogonalDown25: - return GigaRCTrackLeftEighthBankToOrthogonalDown25; + return LatticeTriangleTrackLeftEighthBankToOrthogonalDown25; case TrackElemType::RightEighthBankToOrthogonalDown25: - return GigaRCTrackRightEighthBankToOrthogonalDown25; + return LatticeTriangleTrackRightEighthBankToOrthogonalDown25; case TrackElemType::DiagBlockBrakes: case TrackElemType::DiagBrakes: - return GigaRCTrackDiagBrakes; + return LatticeTriangleTrackDiagBrakes; } return nullptr; } diff --git a/src/openrct2/ride/TrackPaint.h b/src/openrct2/ride/TrackPaint.h index ccce2055ad..183ff5cdce 100644 --- a/src/openrct2/ride/TrackPaint.h +++ b/src/openrct2/ride/TrackPaint.h @@ -584,7 +584,7 @@ TRACK_PAINT_FUNCTION GetTrackPaintFunctionSuspendedMonorail(int32_t trackType); TRACK_PAINT_FUNCTION GetTrackPaintFunctionReverserRC(int32_t trackType); TRACK_PAINT_FUNCTION GetTrackPaintFunctionHeartlineTwisterRC(int32_t trackType); TRACK_PAINT_FUNCTION GetTrackPaintFunctionMiniGolf(int32_t trackType); -TRACK_PAINT_FUNCTION GetTrackPaintFunctionGigaRC(int32_t trackType); +TRACK_PAINT_FUNCTION GetTrackPaintFunctionLatticeTriangleTrack(int32_t trackType); TRACK_PAINT_FUNCTION GetTrackPaintFunctionRotoDrop(int32_t trackType); TRACK_PAINT_FUNCTION GetTrackPaintFunctionFlyingSaucers(int32_t trackType); TRACK_PAINT_FUNCTION GetTrackPaintFunctionCrookedHouse(int32_t trackType); diff --git a/src/openrct2/ride/rtd/coaster/GigaCoaster.h b/src/openrct2/ride/rtd/coaster/GigaCoaster.h index a3f4e9cda8..ce6da39efe 100644 --- a/src/openrct2/ride/rtd/coaster/GigaCoaster.h +++ b/src/openrct2/ride/rtd/coaster/GigaCoaster.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor GigaCoasterRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionGigaRC, + .Drawer = GetTrackPaintFunctionLatticeTriangleTrack, .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_CURVE_LARGE, TRACK_HELIX_DOWN_BANKED_HALF, TRACK_HELIX_UP_BANKED_HALF, 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, TRACK_SLOPE_CURVE_BANKED, TRACK_SLOPE_CURVE_LARGE, TRACK_DIAG_BRAKES, TRACK_DIAG_BLOCK_BRAKES, TRACK_SLOPE_VERTICAL, TRACK_CURVE_VERTICAL}, .ExtraTrackPieces = {TRACK_BARREL_ROLL, TRACK_QUARTER_LOOP, TRACK_HALF_LOOP, TRACK_HALF_LOOP_MEDIUM, TRACK_HALF_LOOP_LARGE, TRACK_VERTICAL_LOOP, TRACK_CORKSCREW, TRACK_CORKSCREW_LARGE, TRACK_ZERO_G_ROLL, TRACK_ZERO_G_ROLL_LARGE}, }), @@ -56,7 +56,7 @@ constexpr RideTypeDescriptor GigaCoasterRTD = { COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE, COLOUR_BLACK }, { COLOUR_BRIGHT_YELLOW, COLOUR_YELLOW, COLOUR_DARK_GREEN }, // Mega-Lite / 蓝月飞车 ), - .ColourPreview = { SPR_RIDE_DESIGN_PREVIEW_GIGA_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_GIGA_COASTER_SUPPORTS }, + .ColourPreview = { SPR_RIDE_DESIGN_PREVIEW_GIGA_RC, SPR_RIDE_DESIGN_PREVIEW_GIGA_RC_SUPPORTS }, .ColourKey = RideColourKey::Ride, .Name = "giga_rc", .RatingsData = diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index 919e91c97d..29a5f1cc5c 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -657,8 +657,8 @@ enum SPR_RIDE_DESIGN_PREVIEW_HEARTLINE_TWISTER_COASTER_SUPPORTS = 14355, SPR_RIDE_DESIGN_PREVIEW_MINI_GOLF_TRACK = 14356, SPR_RIDE_DESIGN_PREVIEW_MINI_GOLF_SUPPORTS = 14357, - SPR_RIDE_DESIGN_PREVIEW_GIGA_COASTER_TRACK = 14358, - SPR_RIDE_DESIGN_PREVIEW_GIGA_COASTER_SUPPORTS = 14359, + SPR_RIDE_DESIGN_PREVIEW_GIGA_RC = 14358, + SPR_RIDE_DESIGN_PREVIEW_GIGA_RC_SUPPORTS = 14359, SPR_RIDE_DESIGN_PREVIEW_ROTO_DROP_TRACK = 14360, SPR_RIDE_DESIGN_PREVIEW_ROTO_DROP_SUPPORTS = 14361, SPR_RIDE_DESIGN_PREVIEW_FLYING_SAUCERS_TRACK = 14362, @@ -1223,33 +1223,33 @@ enum SPR_G2_JUNIOR_DIAG_BRAKES, SPR_G2_JUNIOR_RC_END = SPR_G2_JUNIOR_DIAG_BRAKES + 6, - SPR_G2_GIGA_RC_BEGIN = SPR_G2_JUNIOR_RC_END, - SPR_G2_GIGA_RC_BOOSTER_NE_SW = SPR_G2_GIGA_RC_BEGIN, - SPR_G2_GIGA_RC_BOOSTER_NW_SE, - SPR_G2_GIGA_RC_DIAG_BRAKES, - SPR_G2_GIGA_RC_POWERED_LIFT_0 = SPR_G2_GIGA_RC_DIAG_BRAKES + 6, - SPR_G2_GIGA_RC_POWERED_LIFT_1, - SPR_G2_GIGA_RC_POWERED_LIFT_2, - SPR_G2_GIGA_RC_POWERED_LIFT_3, - SPR_G2_GIGA_TRACK_VERTICAL, - SPR_G2_GIGA_TRACK_VERTICAL_TWIST = SPR_G2_GIGA_TRACK_VERTICAL + 12, - SPR_G2_GIGA_TRACK_BARREL_ROLL = SPR_G2_GIGA_TRACK_VERTICAL_TWIST + 12, - SPR_G2_GIGA_TRACK_HALF_LOOP = SPR_G2_GIGA_TRACK_BARREL_ROLL + 48, - SPR_G2_GIGA_TRACK_VERTICAL_LOOP = SPR_G2_GIGA_TRACK_HALF_LOOP + 16, - SPR_G2_GIGA_TRACK_QUARTER_LOOP = SPR_G2_GIGA_TRACK_VERTICAL_LOOP + 32, - SPR_G2_GIGA_TRACK_CORKSCREW = SPR_G2_GIGA_TRACK_QUARTER_LOOP + 12, - SPR_G2_GIGA_TRACK_LARGE_CORKSCREW = SPR_G2_GIGA_TRACK_CORKSCREW + 24, - SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION = SPR_G2_GIGA_TRACK_LARGE_CORKSCREW + 40, - SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP = SPR_G2_GIGA_TRACK_TURN_BANK_TRANSITION + 18, - SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP = SPR_G2_GIGA_TRACK_MEDIUM_HALF_LOOP + 40, - SPR_G2_GIGA_TRACK_ZERO_G_ROLL = SPR_G2_GIGA_TRACK_LARGE_HALF_LOOP + 56, - SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL = SPR_G2_GIGA_TRACK_ZERO_G_ROLL + 32, - SPR_G2_GIGA_TRACK_SMALL_FLAT_TO_STEEP = SPR_G2_GIGA_TRACK_LARGE_ZERO_G_ROLL + 40, - SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE = SPR_G2_GIGA_TRACK_SMALL_FLAT_TO_STEEP + 20, - SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED = SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE + 64, - SPR_G2_GIGA_RC_END = SPR_G2_GIGA_TRACK_GENTLE_LARGE_CURVE_BANKED + 128, + SPR_G2_LATTICE_TRIANGLE_TRACK_BEGIN = SPR_G2_JUNIOR_RC_END, + SPR_G2_LATTICE_TRIANGLE_TRACK_BOOSTER_NE_SW = SPR_G2_LATTICE_TRIANGLE_TRACK_BEGIN, + SPR_G2_LATTICE_TRIANGLE_TRACK_BOOSTER_NW_SE, + SPR_G2_LATTICE_TRIANGLE_TRACK_DIAG_BRAKES, + SPR_G2_LATTICE_TRIANGLE_TRACK_POWERED_LIFT_0 = SPR_G2_LATTICE_TRIANGLE_TRACK_DIAG_BRAKES + 6, + SPR_G2_LATTICE_TRIANGLE_TRACK_POWERED_LIFT_1, + SPR_G2_LATTICE_TRIANGLE_TRACK_POWERED_LIFT_2, + SPR_G2_LATTICE_TRIANGLE_TRACK_POWERED_LIFT_3, + SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL, + SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_TWIST = SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL + 12, + SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL = SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_TWIST + 12, + SPR_G2_LATTICE_TRIANGLE_TRACK_HALF_LOOP = SPR_G2_LATTICE_TRIANGLE_TRACK_BARREL_ROLL + 48, + SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP = SPR_G2_LATTICE_TRIANGLE_TRACK_HALF_LOOP + 16, + SPR_G2_LATTICE_TRIANGLE_TRACK_QUARTER_LOOP = SPR_G2_LATTICE_TRIANGLE_TRACK_VERTICAL_LOOP + 32, + SPR_G2_LATTICE_TRIANGLE_TRACK_CORKSCREW = SPR_G2_LATTICE_TRIANGLE_TRACK_QUARTER_LOOP + 12, + SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW = SPR_G2_LATTICE_TRIANGLE_TRACK_CORKSCREW + 24, + SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION = SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_CORKSCREW + 40, + SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP = SPR_G2_LATTICE_TRIANGLE_TRACK_TURN_BANK_TRANSITION + 18, + SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP = SPR_G2_LATTICE_TRIANGLE_TRACK_MEDIUM_HALF_LOOP + 40, + SPR_G2_LATTICE_TRIANGLE_TRACK_ZERO_G_ROLL = SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_HALF_LOOP + 56, + SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL = SPR_G2_LATTICE_TRIANGLE_TRACK_ZERO_G_ROLL + 32, + SPR_G2_LATTICE_TRIANGLE_TRACK_SMALL_FLAT_TO_STEEP = SPR_G2_LATTICE_TRIANGLE_TRACK_LARGE_ZERO_G_ROLL + 40, + SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE = SPR_G2_LATTICE_TRIANGLE_TRACK_SMALL_FLAT_TO_STEEP + 20, + SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED = SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE + 64, + SPR_G2_LATTICE_TRIANGLE_TRACK_END = SPR_G2_LATTICE_TRIANGLE_TRACK_GENTLE_LARGE_CURVE_BANKED + 128, - SPR_G2_MINI_RC_BEGIN = SPR_G2_GIGA_RC_END, + SPR_G2_MINI_RC_BEGIN = SPR_G2_LATTICE_TRIANGLE_TRACK_END, SPR_G2_MINI_RC_BOOSTER_NE_SW = SPR_G2_MINI_RC_BEGIN, SPR_G2_MINI_RC_BOOSTER_NW_SE, SPR_G2_MINI_RC_END,