FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source
This commit is contained in:
Applevangelist 2024-08-18 19:38:24 +02:00
commit 80011f4e4e
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Moose Development/Moose/Core/Set.lua
View File

@ -2003,12 +2003,13 @@ do
if self.Filter.Categories and MGroupInclude then
local MGroupCategory = false
for CategoryID, CategoryName in pairs( self.Filter.Categories ) do
--self:T3( { "Category:", MGroup:GetCategory(), self.FilterMeta.Categories[CategoryName], CategoryName } )
--self:I( { "Category:", MGroup:GetCategory(), self.FilterMeta.Categories[CategoryName], CategoryName } )
if self.FilterMeta.Categories[CategoryName] and self.FilterMeta.Categories[CategoryName] == MGroup:GetCategory() then
MGroupCategory = true
end
end
MGroupInclude = MGroupInclude and MGroupCategory
--self:I("Is Included: "..tostring(MGroupInclude))
end
if self.Filter.Countries and MGroupInclude then
@ -2025,12 +2026,13 @@ do
if self.Filter.GroupPrefixes and MGroupInclude then
local MGroupPrefix = false
for GroupPrefixId, GroupPrefix in pairs( self.Filter.GroupPrefixes ) do
--self:T3( { "Prefix:", string.find( MGroup:GetName(), GroupPrefix, 1 ), GroupPrefix } )
if string.find( MGroup:GetName(), GroupPrefix:gsub( "-", "%%-" ), 1 ) then
--self:I( { "Prefix:", MGroup:GetName(), GroupPrefix } )
if string.find( string.lower(MGroup:GetName()), string.lower(GroupPrefix), 1 ) or string.find( string.lower(MGroup:GetName()), string.lower(GroupPrefix), 1, true ) then
MGroupPrefix = true
end
end
MGroupInclude = MGroupInclude and MGroupPrefix
--self:I("Is Included: "..tostring(MGroupInclude))
end
if self.Filter.Zones and MGroupInclude then
@ -2050,7 +2052,7 @@ do
MGroupInclude = MGroupInclude and MGroupFunc
end
--self:T2( MGroupInclude )
--self:I( MGroupInclude )
return MGroupInclude
end
@ -9007,6 +9009,5 @@ do -- SET_DYNAMICCARGO
)
return owners
end
end

1
Moose Development/Moose/Wrapper/Positionable.lua
View File

@ -1853,6 +1853,7 @@ do -- Cargo
["HL_KORD"] = 6*POSITIONABLE.DefaultInfantryWeight,
["HL_DSHK"] = 6*POSITIONABLE.DefaultInfantryWeight,
["CCKW_353"] = 16*POSITIONABLE.DefaultInfantryWeight, --GMC CCKW 2½-ton 6×6 truck, estimating 16 soldiers,
["MaxxPro_MRAP"] = 7*POSITIONABLE.DefaultInfantryWeight,
}
}