From a3aed8dce1707406fa554671993e1cf5b11fb819 Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Thu, 4 Jun 2020 20:47:58 +0100
Subject: [PATCH] Update vehicle powered fields

---
 distribution/openrct2.d.ts          | 11 +++++++++-
 src/openrct2/scripting/ScEntity.hpp | 32 ++++++++++++++---------------
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/distribution/openrct2.d.ts b/distribution/openrct2.d.ts
index 59102550be..c174afa86e 100644
--- a/distribution/openrct2.d.ts
+++ b/distribution/openrct2.d.ts
@@ -931,9 +931,18 @@ declare global {
          */
         colours: VehicleColour;
 
-        speed: number;
+        /**
+         * The acceleration for vehicles with constant power, e.g.
+         * transport rides and boats.
+         */
         poweredAcceleration: number;
 
+        /**
+         * The maximum speed for vehicles with constant power, e.g.
+         * transport rides and boats.
+         */
+        poweredMaxSpeed: number;
+
         /**
          * Current status of the car or train.
          */
diff --git a/src/openrct2/scripting/ScEntity.hpp b/src/openrct2/scripting/ScEntity.hpp
index 02b5984e1c..60a1b5bb06 100644
--- a/src/openrct2/scripting/ScEntity.hpp
+++ b/src/openrct2/scripting/ScEntity.hpp
@@ -238,9 +238,9 @@ namespace OpenRCT2::Scripting
             dukglue_register_property(ctx, &ScVehicle::bankRotation_get, &ScVehicle::bankRotation_set, "bankRotation");
             dukglue_register_property(ctx, &ScVehicle::colours_get, &ScVehicle::colours_set, "colours");
             dukglue_register_property(ctx, &ScVehicle::trackLocation_get, &ScVehicle::trackLocation_set, "trackLocation");
-            dukglue_register_property(ctx, &ScVehicle::speed_get, &ScVehicle::speed_set, "speed");
             dukglue_register_property(
                 ctx, &ScVehicle::poweredAcceleration_get, &ScVehicle::poweredAcceleration_set, "poweredAcceleration");
+            dukglue_register_property(ctx, &ScVehicle::poweredMaxSpeed_get, &ScVehicle::poweredMaxSpeed_set, "poweredMaxSpeed");
             dukglue_register_property(ctx, &ScVehicle::status_get, &ScVehicle::status_set, "status");
             dukglue_register_property(ctx, &ScVehicle::peeps_get, nullptr, "peeps");
         }
@@ -513,21 +513,6 @@ namespace OpenRCT2::Scripting
             }
         }
 
-        uint8_t speed_get() const
-        {
-            auto vehicle = GetVehicle();
-            return vehicle != nullptr ? vehicle->speed : 0;
-        }
-        void speed_set(uint8_t value)
-        {
-            ThrowIfGameStateNotMutable();
-            auto vehicle = GetVehicle();
-            if (vehicle != nullptr)
-            {
-                vehicle->speed = value;
-            }
-        }
-
         uint8_t poweredAcceleration_get() const
         {
             auto vehicle = GetVehicle();
@@ -543,6 +528,21 @@ namespace OpenRCT2::Scripting
             }
         }
 
+        uint8_t poweredMaxSpeed_get() const
+        {
+            auto vehicle = GetVehicle();
+            return vehicle != nullptr ? vehicle->speed : 0;
+        }
+        void poweredMaxSpeed_set(uint8_t value)
+        {
+            ThrowIfGameStateNotMutable();
+            auto vehicle = GetVehicle();
+            if (vehicle != nullptr)
+            {
+                vehicle->speed = value;
+            }
+        }
+
         std::string status_get() const
         {
             auto vehicle = GetVehicle();