Bug fixes; more to come yet

This commit is contained in:
Chris Cardozo 2020-08-16 23:36:50 -04:00
parent c5cfb0feee
commit 5a29cb2d94
3 changed files with 48 additions and 37 deletions

View File

@ -24,7 +24,8 @@ private _lineBreak = toString [10];
if (_isInside && (_container isEqualTo _building)) then
{
_configuredStatics pushBackUnique _x;
_staticsText pushBack format['["%1",%2,%3]',typeOf _x,(getPosATL _x) vectorDiff (_pos),getDir _x];
diag_log format["Building %1 | buildingPos %2 | _pos %3",typeOf _x, getPosATL _x,_pos];
_staticsText pushBack [format['%1',typeOf _x],(getPosATL _x) vectorDiff (_pos),getDir _x];
};
};
} forEach _statics;
@ -40,7 +41,7 @@ private _units = nearestObjects[getPosATL _building,["Man"],sizeOf (typeOf _buil
if (_isInside && (_container isEqualTo _building)) then
{
_configuredUnits pushBackUnique _x;
_unitsText pushBack format["[%1,%2]",(getPosATL _x) vectorDiff (_pos),getDir _x];
_unitsText pushBack [(getPosATL _x) vectorDiff (_pos),getDir _x];
};
};
} forEach _units;
@ -50,12 +51,13 @@ _unitsText joinString _lineBreak;
//diag_log format["_unitsText for building %1 = %2",_building,_unitsText];
if !((_staticsText isEqualTo []) && (_unitsText isEqualTo [])) then
{
_buildingGarrisonATL = format[' ["%1",%2,%3,%4,%5,[%6],[%7]]',
typeOf _building,
_buildingGarrisonATL = [
format["%1",
typeOf _building],
(getPosATL _building) vectorDiff _pos,
getDir _building,
'true',
'true',
true,
true,
_staticsText,
_unitsText
];

View File

@ -1,5 +1,6 @@
/*
Dynamic Mission Generated
Using 3DEN Plugin for blckeagls
@ -11,24 +12,30 @@
#include "\q\addons\custom_server\Missions\privateVars.sqf";
_defaultMissionLocations = [];
_markerType = [mil_box,[1,1],<null>];
_markerColor = ColorRed;
_markerType = ["mil_box",[1,1],"<null>"];
_markerColor = "ColorRed";
_startMsg = "TODO: Change approiately";
_endMsg = "TODO: Change Appropriately;
_endMsg = "TODO: Change Appropriately";
_markerMissionName = "Stay Away";
_crateLoot = blck_BoxLoot_Blue;
_lootCounts = blck_lootCountsBlue;
_garrisonedBuilding_ATLsystem = [
["Land_Unfinished_Building_01_F",[0,0,0],0,true,true,[["[""B_HMG_01_high_F"",[-2.19922,0.837891,3.61188],0]","[""B_static_AA_F"",[-2.34766,3.85352,6.80866],0]"]],[[]]]
["Land_Unfinished_Building_01_F",[0,0,0],0,true,true,
[["B_HMG_01_high_F",[-2.19922,0.837891,3.61188],0],
["B_static_AA_F",[-2.34766,3.85352,6.80866],0]],
[
[[0.96875,-1.99023,0.27216],0],
[[-3.74219,0.279297,0.136929],0]]
],
["Land_Unfinished_Building_01_F",[0,0,0],0,true,true,[["B_HMG_01_F",[-1.87305,5.36523,3.86831],0]],[[[-2.46289,-1.18555,3.68233],0],[[-1.72656,3.4668,6.88683],0]]]
];
_missionLandscape = [
["Land_u_Shed_Ind_F",[-29.123,-8.11914,-33.866],0,true,true],
["Land_Shed_08_brown_F",[-15.1465,25.9961,-33.871],0,true,true],
["Land_Shed_02_F",[26.5762,78.6641,-33.8547],0,true,true],
["Land_Wreck_AFV_Wheeled_01_F",[-5.21289,-20.9434,-33.8297],0,true,true],
["Land_Unfinished_Building_01_F",[50.0273,44.1172,-33.623],0,true,true]
["Land_Wreck_AFV_Wheeled_01_F",[-5.21289,-20.9434,-33.8297],0,true,true]
];
_simpleObjects = [
@ -42,7 +49,7 @@ _missionLootVehicles = [
_missionPatrolVehicles = [
["B_Truck_01_mover_F",[24.084,13.5703,-33.8635],0,75,75],
["B_MRAP_01_hmg_F",[3.02539,16.2363,-33.8629],0,75,75],
["B_HMG_01_F",[38.1777,44.25,-33.866],0,75,75],
["B_HMG_01_F",[46.9961,45.3984,-29.9977],0,75,75],
["B_GMG_01_F",[-5.16211,-5.00586,-33.8644],0,75,75],
["B_Heli_Light_01_dynamicLoadout_F",[-6.61523,8.89844,-33.864],0,75,75],
["B_T_Boat_Transport_01_F",[18.582,44.1055,-33.8654],0,75,75],
@ -59,16 +66,20 @@ _airPatrols = [
];
_missionEmplacedWeapons = [
["B_HMG_01_F",[38.1777,44.25,-33.866],0],
["B_HMG_01_F",[46.9961,45.3984,-29.9977],0],
["B_GMG_01_F",[-5.16211,-5.00586,-33.8644],0],
["B_HMG_01_high_F",[30.6055,0.525391,-30.1961],0],
["B_static_AA_F",[30.457,3.54102,-26.9993],0]
];
_missionGroups = [
,[[30.0605,46.2383,-33.8646],3,6,"Blue",30,45],
,[[5.66602,-8.33398,-33.8665],3,6,"Blue",30,45],
,[[19.9512,-4.41797,-29.7975],3,6,"Blue",30,45]
[[30.0605,46.2383,-33.8646],3,6,"Blue",30,45],
[[5.66602,-8.33398,-33.8665],3,6,"Blue",30,45],
[[47.1426,43.5,-26.9792],3,6,"Blue",30,45],
[[46.4063,38.8477,-30.1837],3,6,"Blue",30,45],
[[19.9512,-4.41797,-29.7975],3,6,"Blue",30,45],
[[29.0625,-0.0332031,-33.6711],3,6,"Blue",30,45],
[[33.7734,-2.30273,-33.5358],3,6,"Blue",30,45]
];
_scubaGroupParameters = [
@ -82,9 +93,9 @@ _missionLootBoxes = [
["Box_IND_WpsLaunch_F",[10.1504,-2.12109,-33.8658],_crateLoot,_lootCounts,0]
];
/*
Use the parameters below to customize your mission - see the template or blck_configs.sqf for details about each them
*/
_chanceHeliPatrol = blck_chanceHeliPatrolBlue;
_noChoppers = blck_noPatrolHelisBlue;
_missionHelis = blck_patrolHelisBlue;
@ -101,16 +112,16 @@ _headgear = blck_headgear;
_vests = blck_vests;
_backpacks = blck_backpacks;
_sideArms = blck_Pistols;
_spawnCratesTiming = atMissionSpawnGround
_loadCratesTiming = atMissionSpawn
_endCondition = allKilledOrPlayerNear;
_spawnCratesTiming = "atMissionSpawnGround";
_loadCratesTiming = "atMissionSpawn";
_endCondition = "allKilledOrPlayerNear";
_minNoAI = blck_MinAI_Blue;
_maxNoAI = blck_MaxAI_Blue;
_noAIGroups = blck_AIGrps_Blue;
_noVehiclePatrols = blck_SpawnVeh_Blue;
_noEmplacedWeapons = blck_SpawnEmplaced_Blue;
_minNoAI = blck_MinAI_Blue;
_maxNoAI = blck_MaxAI_Blue
_maxNoAI = blck_MaxAI_Blue;
_noAIGroups = blck_AIGrps_Blue;
_noVehiclePatrols = blck_SpawnVeh_Blue;
_noEmplacedWeapons = blck_SpawnEmplaced_Blue;

View File

@ -206,10 +206,8 @@ diag_log format["_lootVehicles = %1",_lootVehicles];
_missionPatrolVehicles = [];
private _patrolVehicles = _objects select {
((typeOf _x) isKindOf "AllVehicles") &&
!((typeOf _x) isKindOf "Man") &&
(((typeOf _x) isKindOf "Car") || ((typeOf _x) isKindOf "Tank") || ((typeOf _x) isKindOf "Ship")) &&
!((typeOf _x) isKindOf "SDV_01_base_F") &&
!((typeOf _x) isEqualTo "Air") &&
!(_x in _lootVehicles)
};
diag_log format["_patrolVehicles = %1",_patrolVehicles];
@ -229,7 +227,7 @@ diag_log format["_subs = %1",_subs];
private _airPatrols = [];
private _airVehicles = _objects select {
(typeOf _x) isKindOf "Air"
((typeOf _x) isKindOf "Air")
};
diag_log format["_airVehicles = %1",_airvehicles];
{
@ -254,12 +252,12 @@ private _infantry = _units select {
diag_log format["_infantry = %1",_infantry];
_infantryGroups = [];
{
_infantryGroups pushBack format[' ,[%1,%2,%3,"%4",%5,%6]',(getPosATL _x) vectorDiff CENTER,blck_minAI,blck_maxAI,blck_MissionDifficulty,minPatrolRadius,maxPatrolRadius];
_infantryGroups pushBack format[' [%1,%2,%3,"%4",%5,%6]',(getPosATL _x) vectorDiff CENTER,blck_minAI,blck_maxAI,blck_MissionDifficulty,minPatrolRadius,maxPatrolRadius];
} forEach _units;
private _scuba = _units select {
(surfaceIsWater (getPos _x)) &&
!(_x in _garisonedUnits)
!([_x] call blck3DEN_fnc_isInside)
// checck _x get3EDENAtribute "name" != "garrison";
};
diag_log format["_scuba = %1",_scuba];
@ -295,10 +293,10 @@ _lines pushBack '#include "\q\addons\custom_server\Configs\blck_defines.hpp";';
_lines pushBack '#include "\q\addons\custom_server\Missions\privateVars.sqf";';
_lines pushBack "";
_lines pushBack format["_defaultMissionLocations = %1;",_missionCoords];
_lines pushBack format["_markerType = %1",format["[%1,%2,%3];",_markerType,_markerSize,_markerBrush]];
_lines pushBack format["_markerColor = %1;",_markerColor];
_lines pushBack format["_markerType = %1",format['["%1",%2,"%3"];',_markerType,_markerSize,_markerBrush]];
_lines pushBack format['_markerColor = "%1";',_markerColor];
_lines pushBack format['_startMsg = "%1";',blck_dynamicStartMessage];
_lines pushBack format['_endMsg = "%1;',blck_dynamicEndMessage];
_lines pushBack format['_endMsg = "%1";',blck_dynamicEndMessage];
_lines pushBack format['_markerMissionName = "%1";',blck_dynamicmarkerMissionName];
_lines pushBack format['_crateLoot = blck_BoxLoot_%1;',blck_MissionDifficulty];
_lines pushBack format['_lootCounts = blck_lootCounts%1;',blck_MissionDifficulty];
@ -367,16 +365,16 @@ _lines pushBack "_headgear = blck_headgear;";
_lines pushBack "_vests = blck_vests;";
_lines pushBack "_backpacks = blck_backpacks;";
_lines pushBack "_sideArms = blck_Pistols;";
_lines pushBack format['_spawnCratesTiming = %1',blck_spawnCratesTiming];
_lines pushBack format['_loadCratesTiming = %1',blck_loadCratesTiming];
_lines pushBack format['_endCondition = %1;',blck_missionEndCondition];
_lines pushBack format['_spawnCratesTiming = "%1";',blck_spawnCratesTiming];
_lines pushBack format['_loadCratesTiming = "%1";',blck_loadCratesTiming];
_lines pushBack format['_endCondition = "%1";',blck_missionEndCondition];
_lines pushBack format["_minNoAI = blck_MinAI_%1;",blck_MissionDifficulty];
_lines pushBack format["_maxNoAI = blck_MaxAI_%1;",blck_MissionDifficulty];
_lines pushBack format["_noAIGroups = blck_AIGrps_%1;",blck_MissionDifficulty];
_lines pushBack format["_noVehiclePatrols = blck_SpawnVeh_%1;",blck_MissionDifficulty];
_lines pushBack format["_noEmplacedWeapons = blck_SpawnEmplaced_%1;",blck_MissionDifficulty];
_lines pushBack format["_minNoAI = blck_MinAI_%1;",blck_MissionDifficulty];
_lines pushBack format["_maxNoAI = blck_MaxAI_%1",blck_MissionDifficulty];
_lines pushBack format["_maxNoAI = blck_MaxAI_%1;",blck_MissionDifficulty];
_lines pushBack format["_noAIGroups = blck_AIGrps_%1;",blck_MissionDifficulty];
_lines pushBack format["_noVehiclePatrols = blck_SpawnVeh_%1;",blck_MissionDifficulty];
_lines pushBack format["_noEmplacedWeapons = blck_SpawnEmplaced_%1;",blck_MissionDifficulty];