Merge branch 'master' into develop

This commit is contained in:
Frank
2020-12-31 21:22:59 +01:00
7 changed files with 697 additions and 28 deletions

View File

@@ -1453,6 +1453,19 @@ do -- Cargo
}
self.__.CargoBayWeightLimit = Weights[Desc.typeName] or ( Desc.massMax - ( Desc.massEmpty + Desc.fuelMassMax ) )
elseif self:IsShip() then
local Desc = self:GetDesc()
self:F({Desc=Desc})
local Weights = {
["Type_071"] = 245000,
["LHA_Tarawa"] = 500000,
["Ropucha-class"] = 150000,
["Dry-cargo ship-1"] = 70000,
["Dry-cargo ship-2"] = 70000,
}
self.__.CargoBayWeightLimit = Weights[Desc.typeName]
else
local Desc = self:GetDesc()