diff --git a/BC_buyables/factions/russiaTank.hpp b/BC_buyables/factions/russiaTank.hpp
index 053df72d..6330e518 100644
--- a/BC_buyables/factions/russiaTank.hpp
+++ b/BC_buyables/factions/russiaTank.hpp
@@ -63,13 +63,9 @@ class RussiaTank {
stock = 2;
spawnEmpty = 1;
condition = "true";
- vehicleInit = "[[], ['kshield_unhide',0,'kdeck_unhide',0,'sideskirt_unhide',0,'fbskirt_unhide',0,'ftskirt_unhide',1,'log_unhide',1,'snorkel_unhide',0]]";
+ vehicleInit = "[[], ['kshield_unhide',0,'kdeck_unhide',1,'sideskirt_unhide',0,'fbskirt_unhide',0,'ftskirt_unhide',0,'log_unhide',1,'snorkel_unhide',0]]";
removeMagazines = "['rhs_mag_3of26_5', [0]]";
};
-
- class rhs_t80bk: rhs_t80bvk {
- displayName = "T-80BK";
- };
};
diff --git a/BC_buyables/factions/usaTank.hpp b/BC_buyables/factions/usaTank.hpp
index e3fde3e3..422f5506 100644
--- a/BC_buyables/factions/usaTank.hpp
+++ b/BC_buyables/factions/usaTank.hpp
@@ -31,7 +31,7 @@ class USATank {
displayName = "M2A3";
description = "";
price = 10;
- stock = 7;
+ stock = 1;
itemCargo = "";
magazineCargo = "";
trackCargo = 2;
@@ -39,21 +39,6 @@ class USATank {
condition = "true";
vehicleInit = "[['standard',1],['IFF_Panels_Hide',1,'Select_TOW',1,'Select_Stinger',0]]";
};
-
- class RHS_M2A2_wd {
- displayName = "M2A2";
- description = "";
- price = 10;
- stock = 7;
- itemCargo = "";
- magazineCargo = "";
- trackCargo = 2;
- spawnEmpty = 1;
- condition = "true";
- vehicleInit = "[['standard',1],['IFF_Panels_Hide',1,'Select_TOW',1,'Select_Stinger',0]]";
- };
-
-
};
@@ -75,19 +60,6 @@ class USATank {
condition = "true";
vehicleInit = "[['woodland',1],['IFF_Panels_Hide',1,'Miles_Hide',1]]";
};
-
- class rhsusf_m1a1aim_tuski_wd {
- displayName = "M1A1 Tusk I";
- description = "";
- price = 10;
- stock = 7;
- itemCargo = "";
- magazineCargo = "";
- trackCargo = 2;
- spawnEmpty = 1;
- condition = "true";
- vehicleInit = "[['woodland',1],['IFF_Panels_Hide',1,'Miles_Hide',1]]";
- };
};
diff --git a/BC_buymenu/functions/fn_createGUI.sqf b/BC_buymenu/functions/fn_createGUI.sqf
index 930404c0..c4bbe7d7 100644
--- a/BC_buymenu/functions/fn_createGUI.sqf
+++ b/BC_buymenu/functions/fn_createGUI.sqf
@@ -286,59 +286,62 @@ _ctrlTotalSideCount ctrlCommit 0;
};
_picture ctrlCommit 0;
-
- private _btnPlus = _display ctrlCreate ["grad_buymenu_RscButton", -1];
- _btnPlus ctrlsetFont "RobotoCondensedBold";
- _btnPlus ctrlSetBackgroundColor [0,0,0,1];
- _btnPlus ctrlsetText "+";
- _btnPlus ctrlSetPosition [
- _columnWidth * _multiplicator + safezoneX + _columnWidth * 4 + _columnWidth/2,
- (_i * (_rowHeight * 8) + safezoneY) - _rowHeight/4,
- _columnWidth/2,
- _rowHeight * 2
- ];
- _btnPlus ctrlSetTooltip "Increase Count";
- _btnPlus setVariable ["parentControl", _ctrlItemCount];
- if (_valueItemCount >= _maxCount || _valueChosenInThisCat >= _valueMaxInThisCat || _isLocked) then {
- _btnPlus ctrlEnable false;
- };
- _btnPlus ctrlAddEventHandler [
- "MouseButtonDown",
- "[_this, true] call BC_buymenu_fnc_changeValue;"
- ];
- _btnPlus ctrlCommit 0;
+ if (player getVariable ["BC_potentToBuy", false]) then {
+ private _btnPlus = _display ctrlCreate ["grad_buymenu_RscButton", -1];
+ _btnPlus ctrlsetFont "RobotoCondensedBold";
+ _btnPlus ctrlSetBackgroundColor [0,0,0,1];
+ _btnPlus ctrlsetText "+";
+ _btnPlus ctrlSetPosition [
+ _columnWidth * _multiplicator + safezoneX + _columnWidth * 4 + _columnWidth/2,
+ (_i * (_rowHeight * 8) + safezoneY) - _rowHeight/4,
+ _columnWidth/2,
+ _rowHeight * 2
+ ];
+ _btnPlus ctrlSetTooltip "Increase Count";
+ _btnPlus setVariable ["parentControl", _ctrlItemCount];
+ if (_valueItemCount >= _maxCount || _valueChosenInThisCat >= _valueMaxInThisCat || _isLocked) then {
+ _btnPlus ctrlEnable false;
+ };
+ _btnPlus ctrlAddEventHandler [
+ "MouseButtonDown",
+ "[_this, true] call BC_buymenu_fnc_changeValue;"
+ ];
+ _btnPlus ctrlCommit 0;
+
+
+ private _btnMinus = _display ctrlCreate ["grad_buymenu_RscButton", -1];
+ _btnMinus ctrlsetFont "RobotoCondensedBold";
+ _btnMinus ctrlSetBackgroundColor [0,0,0,1];
+ _btnMinus ctrlsetText "-";
+ // _btnMinus ctrlSetStructuredText parseText "-";
+ _btnMinus ctrlSetPosition [
+ _columnWidth * _multiplicator + safezoneX + _columnWidth * 4 + _columnWidth/2,
+ (_i * (_rowHeight * 8) + safezoneY) + _rowHeight * 2,
+ _columnWidth/2,
+ _rowHeight * 2
+ ];
+ _btnMinus ctrlSetTooltip "Reduce Count";
+ _btnMinus setVariable ["parentControl", _ctrlItemCount];
+ if (_valueItemCount == 0) then {
+ _btnMinus ctrlEnable false;
+ };
+ _btnMinus ctrlAddEventHandler [
+ "MouseButtonDown",
+ "[_this, false] call BC_buymenu_fnc_changeValue;"
+ ];
+ _btnMinus ctrlCommit 0;
- private _btnMinus = _display ctrlCreate ["grad_buymenu_RscButton", -1];
- _btnMinus ctrlsetFont "RobotoCondensedBold";
- _btnMinus ctrlSetBackgroundColor [0,0,0,1];
- _btnMinus ctrlsetText "-";
- // _btnMinus ctrlSetStructuredText parseText "-";
- _btnMinus ctrlSetPosition [
- _columnWidth * _multiplicator + safezoneX + _columnWidth * 4 + _columnWidth/2,
- (_i * (_rowHeight * 8) + safezoneY) + _rowHeight * 2,
- _columnWidth/2,
- _rowHeight * 2
- ];
- _btnMinus ctrlSetTooltip "Reduce Count";
- _btnMinus setVariable ["parentControl", _ctrlItemCount];
- if (_valueItemCount == 0) then {
- _btnMinus ctrlEnable false;
- };
- _btnMinus ctrlAddEventHandler [
- "MouseButtonDown",
- "[_this, false] call BC_buymenu_fnc_changeValue;"
- ];
- _btnMinus ctrlCommit 0;
+ // add plus and minus to parent ctrl
+ _ctrlItemCount setVariable ["connectedButtons", [_btnPlus, _btnMinus]];
- // add plus and minus to parent ctrl
- _ctrlItemCount setVariable ["connectedButtons", [_btnPlus, _btnMinus]];
+ // parent cat control stores plus and minus buttons to disable/enable
+ private _plusMinusButtons = _ctrlChosenInThisCat getVariable ["catPlusMinusButtons", []];
+ _plusMinusButtons pushBack [_btnPlus, _btnMinus];
+ _ctrlChosenInThisCat setVariable ["catPlusMinusButtons", _plusMinusButtons];
+ _ctrlChosenInThisCat ctrlCommit 0;
- // parent cat control stores plus and minus buttons to disable/enable
- private _plusMinusButtons = _ctrlChosenInThisCat getVariable ["catPlusMinusButtons", []];
- _plusMinusButtons pushBack [_btnPlus, _btnMinus];
- _ctrlChosenInThisCat setVariable ["catPlusMinusButtons", _plusMinusButtons];
- _ctrlChosenInThisCat ctrlCommit 0;
+ };
private _subline = _display ctrlCreate ["RscStructuredText", -1];
_subline ctrlsetFont "RobotoCondensedBold";
diff --git a/BC_objectives/functions/server/fn_startPreparationTime.sqf b/BC_objectives/functions/server/fn_startPreparationTime.sqf
index c461d119..3fa2e073 100644
--- a/BC_objectives/functions/server/fn_startPreparationTime.sqf
+++ b/BC_objectives/functions/server/fn_startPreparationTime.sqf
@@ -6,4 +6,7 @@ _this spawn {
_preparationTime = _preparationTime - 1;
sleep 1;
};
+
+ MISSION_STARTED = true;
+ publicVariable "MISSION_STARTED";
};
diff --git a/BC_setup/functions/client/fn_addInteractions.sqf b/BC_setup/functions/client/fn_addInteractions.sqf
index bc15dc19..618bb38c 100644
--- a/BC_setup/functions/client/fn_addInteractions.sqf
+++ b/BC_setup/functions/client/fn_addInteractions.sqf
@@ -58,6 +58,11 @@ if (!hasInterface) exitWith {};
"",
{
params ["_radiotruck"];
+
+ if (!MISSION_STARTED) exitWith {
+ hint "Please wait until Preparation Time is over.";
+ };
+
[_radiotruck] remoteExec ["GRAD_tracking_fnc_radioTruckDeploy", 2];
},
{
@@ -66,7 +71,7 @@ if (!hasInterface) exitWith {};
_isStationary = (speed _radiotruck) == 0;
_isNotAnimated = ! (_radiotruck getVariable ["GRAD_isAnimating", false]);
- (side player == east) && _isStationary && _isRetracted && _isNotAnimated;
+ (side player == east) && _isStationary && _isRetracted && _isNotAnimated
}
] call ace_interact_menu_fnc_createAction;
[_type, 0, ["ACE_MainActions"], _deployAction] call ace_interact_menu_fnc_addActionToClass;
@@ -85,7 +90,7 @@ if (!hasInterface) exitWith {};
_isStationary = (speed _radiotruck) == 0;
_isNotAnimated = ! (_radiotruck getVariable ["GRAD_isAnimating", false]);
- (side player == east) && _isStationary && _isDeployed && _isNotAnimated;
+ (side player == east) && _isStationary && _isDeployed && _isNotAnimated
}
] call ace_interact_menu_fnc_createAction;
[_type, 0, ["ACE_MainActions"], _retractAction] call ace_interact_menu_fnc_addActionToClass;
diff --git a/description.ext b/description.ext
index f610848d..1032cb74 100644
--- a/description.ext
+++ b/description.ext
@@ -43,8 +43,8 @@ class GRAD_Replay {
precision = 5; // precision of replay, 5 means every 5 seconds one snapshot (number)
trackedSides[] = {"west", "east", "civilian"}; // defines the sides that will be tracked (possible are "west", "east", "independant", "civilian") (array)
stepsPerTick = 1; // defines steps played back at once (number)
- trackedVehicles = 0; // defines if empty and AI steered vehicles will be tracked (0/1)
- trackedAI = 0; // defines if AI will be tracked (0/1)
+ trackedVehicles = 1; // defines if empty and AI steered vehicles will be tracked (0/1)
+ trackedAI = 1; // defines if AI will be tracked (0/1)
sendingChunkSize = 10; // higher number means replay loading is faster, but might cause instability / lags during loading (number)
trackShots = 1; // defines if shots will be tracked (0/1)
};
diff --git a/initserver.sqf b/initserver.sqf
index d3efe51c..bd4d91a0 100644
--- a/initserver.sqf
+++ b/initserver.sqf
@@ -172,6 +172,9 @@ setTimeMultiplier TIME_ACCELERATION;
["Initialize", [true]] call BIS_fnc_dynamicGroups;
+MISSION_STARTED = false;
+publicVariable "MISSION_STARTED";
+
BLUFOR_ELIMINATED = false;
publicVariable "BLUFOR_ELIMINATED";
OPFOR_ELIMINATED = false;
diff --git a/mission.sqm b/mission.sqm
index 9dd64c5f..c3d76a02 100644
--- a/mission.sqm
+++ b/mission.sqm
@@ -8,7 +8,7 @@ class EditorData
toggles=1;
class ItemIDProvider
{
- nextID=1316;
+ nextID=1322;
};
class MarkerIDProvider
{
@@ -16,10 +16,10 @@ class EditorData
};
class Camera
{
- pos[]={1552.0066,17.882996,5111.3521};
- dir[]={-0.37215129,-0.39218947,-0.84131861};
- up[]={-0.15867199,0.9198634,-0.35870975};
- aside[]={-0.91458029,-3.1292439e-007,0.40455672};
+ pos[]={1599.5677,16.367012,5408.2002};
+ dir[]={-0.12470513,-0.29818553,-0.94640839};
+ up[]={-0.038961355,0.95448887,-0.29569021};
+ aside[]={-0.99150711,-6.9790985e-008,0.1306465};
};
};
binarizationWanted=0;
diff --git a/pic/blufor_please_wait.paa b/pic/blufor_please_wait.paa
index f8f67f08..89ca1fd1 100644
Binary files a/pic/blufor_please_wait.paa and b/pic/blufor_please_wait.paa differ
diff --git a/pic/opfor_please_wait.paa b/pic/opfor_please_wait.paa
index 19b30005..e862a6e9 100644
Binary files a/pic/opfor_please_wait.paa and b/pic/opfor_please_wait.paa differ