From f6b0f7848b197a82ce8e22efd5b5cbde60119723 Mon Sep 17 00:00:00 2001 From: SamuXarick <43006711+SamuXarick@users.noreply.github.com> Date: Sat, 15 Mar 2025 15:51:56 +0000 Subject: [PATCH] Add: [Script] Newer Cargo Classes (#13779) --- src/script/api/ai_changelog.hpp | 5 +++++ src/script/api/game_changelog.hpp | 5 +++++ src/script/api/script_cargo.hpp | 7 ++++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/script/api/ai_changelog.hpp b/src/script/api/ai_changelog.hpp index dbb4324bfe..23d2d3b216 100644 --- a/src/script/api/ai_changelog.hpp +++ b/src/script/api/ai_changelog.hpp @@ -21,6 +21,11 @@ * \li AIEventVehicleCrashed::GetVictims * \li AIEventCompanyRenamed * \li AIEventPresidentRenamed + * \li AICargo::CC_OVERSIZED + * \li AICargo::CC_POWDERIZED + * \li AICargo::CC_NON_POURABLE + * \li AICargo::CC_POTABLE + * \li AICargo::CC_NON_POTABLE * * Other changes: * \li AIBridge::GetBridgeID renamed to AIBridge::GetBridgeType diff --git a/src/script/api/game_changelog.hpp b/src/script/api/game_changelog.hpp index 752c61f502..1ec9611311 100644 --- a/src/script/api/game_changelog.hpp +++ b/src/script/api/game_changelog.hpp @@ -21,6 +21,11 @@ * \li GSEventVehicleCrashed::GetVictims * \li GSEventCompanyRenamed * \li GSEventPresidentRenamed + * \li GSCargo::CC_OVERSIZED + * \li GSCargo::CC_POWDERIZED + * \li GSCargo::CC_NON_POURABLE + * \li GSCargo::CC_POTABLE + * \li GSCargo::CC_NON_POTABLE * * Other changes: * \li GSBridge::GetBridgeID renamed to GSBridge::GetBridgeType diff --git a/src/script/api/script_cargo.hpp b/src/script/api/script_cargo.hpp index 51a4c5fbbb..13751e6070 100644 --- a/src/script/api/script_cargo.hpp +++ b/src/script/api/script_cargo.hpp @@ -30,11 +30,16 @@ public: CC_EXPRESS = ::CargoClasses{::CargoClass::Express}.base(), ///< Express cargo (Goods, Food, Candy, but also possible for passengers) CC_ARMOURED = ::CargoClasses{::CargoClass::Armoured}.base(), ///< Armoured cargo (Valuables, Gold, Diamonds) CC_BULK = ::CargoClasses{::CargoClass::Bulk}.base(), ///< Bulk cargo (Coal, Grain etc., Ores, Fruit) - CC_PIECE_GOODS = ::CargoClasses{::CargoClass::PieceGoods}.base(), ///< Piece goods (Livestock, Wood, Steel, Paper) + CC_PIECE_GOODS = ::CargoClasses{::CargoClass::PieceGoods}.base(), ///< Piece goods (Livestock, Wood, Steel, Paper) CC_LIQUID = ::CargoClasses{::CargoClass::Liquid}.base(), ///< Liquids (Oil, Water, Rubber) CC_REFRIGERATED = ::CargoClasses{::CargoClass::Refrigerated}.base(), ///< Refrigerated cargo (Food, Fruit) CC_HAZARDOUS = ::CargoClasses{::CargoClass::Hazardous}.base(), ///< Hazardous cargo (Nuclear Fuel, Explosives, etc.) CC_COVERED = ::CargoClasses{::CargoClass::Covered}.base(), ///< Covered/Sheltered Freight (Transportation in Box Vans, Silo Wagons, etc.) + CC_OVERSIZED = ::CargoClasses{::CargoClass::Oversized}.base(), ///< Oversized (stake/flatbed wagon) + CC_POWDERIZED = ::CargoClasses{::CargoClass::Powderized}.base(), ///< Powderized, moist protected (powder/silo wagon) + CC_NON_POURABLE = ::CargoClasses{::CargoClass::NotPourable}.base(), ///< Non-pourable (open wagon, but not hopper wagon) + CC_POTABLE = ::CargoClasses{::CargoClass::Potable}.base(), ///< Potable / food / clean. + CC_NON_POTABLE = ::CargoClasses{::CargoClass::NonPotable}.base(), ///< Non-potable / non-food / dirty. }; /**