From 2eea8520d8adc6a2f2d68c9929afbed628dc5add Mon Sep 17 00:00:00 2001 From: Thomas <72444570+Applevangelist@users.noreply.github.com> Date: Mon, 7 Nov 2022 11:23:39 +0100 Subject: [PATCH] Merge CTLD Bronco update into master (#1829) * Update Range.lua (#1825) Add meter text to RANGE bombing result. * CTLD - added Bronco (#1828) Added data for the Bronco-OV-10A - needs further additions to ensure to work, as this is a plane, not a chopper #1827 Co-authored-by: TommyC81 --- Moose Development/Moose/Functional/Range.lua | 2 +- Moose Development/Moose/Ops/CTLD.lua | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Moose Development/Moose/Functional/Range.lua b/Moose Development/Moose/Functional/Range.lua index 15f8b148b..32052f218 100644 --- a/Moose Development/Moose/Functional/Range.lua +++ b/Moose Development/Moose/Functional/Range.lua @@ -2259,7 +2259,7 @@ function RANGE:onafterImpact( From, Event, To, result, player ) end -- Send message to player. - local text = string.format( "%s, impact %03d° for %d ft", player.playername, result.radial, UTILS.MetersToFeet( result.distance ) ) + local text = string.format( "%s, impact %03d° for %d ft (%d m)", player.playername, result.radial, UTILS.MetersToFeet( result.distance ), result.distance ) if targetname then text = text .. string.format( " from bulls of target %s.", targetname ) else diff --git a/Moose Development/Moose/Ops/CTLD.lua b/Moose Development/Moose/Ops/CTLD.lua index bd52b2742..d18e4d32f 100644 --- a/Moose Development/Moose/Ops/CTLD.lua +++ b/Moose Development/Moose/Ops/CTLD.lua @@ -1072,11 +1072,12 @@ CTLD.UnitTypes = { --Actually it's longer, but the center coord is off-center of the model. ["UH-60L"] = {type="UH-60L", crates=true, troops=true, cratelimit = 2, trooplimit = 20, length = 16, cargoweightlimit = 3500}, -- 4t cargo, 20 (unsec) seats ["AH-64D_BLK_II"] = {type="AH-64D_BLK_II", crates=false, troops=true, cratelimit = 0, trooplimit = 2, length = 17, cargoweightlimit = 200}, -- 2 ppl **outside** the helo -} + ["Bronco-OV-10A"] = {type="Bronco-OV-10A", crates= false, troops=true, cratelimit = 0, trooplimit = 5, length = 13, cargoweightlimit = 1450}, + } --- CTLD class version. -- @field #string version -CTLD.version="1.0.17" +CTLD.version="1.0.18" --- Instantiate a new CTLD. -- @param #CTLD self