Skip to content

Commit

Permalink
new wait pics, no plus for nonbuyers,
Browse files Browse the repository at this point in the history
  • Loading branch information
@nomisum
nomisum committed Jan 6, 2019
1 parent 8ba8ee8 commit e445334
Show file tree
Hide file tree
Showing 10 changed files with 74 additions and 92 deletions.
6 changes: 1 addition & 5 deletions BC_buyables/factions/russiaTank.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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";
};
};


Expand Down
30 changes: 1 addition & 29 deletions BC_buyables/factions/usaTank.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,29 +31,14 @@ class USATank {
displayName = "M2A3";
description = "";
price = 10;
stock = 7;
stock = 1;
itemCargo = "";
magazineCargo = "";
trackCargo = 2;
spawnEmpty = 1;
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]]";
};


};


Expand All @@ -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]]";
};
};


Expand Down
101 changes: 52 additions & 49 deletions BC_buymenu/functions/fn_createGUI.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 "<t size='1' align='center' shadow='0' color='#999999'>-</t>";
_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 "<t size='1' align='center' shadow='0' color='#999999'>-</t>";
_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";
Expand Down
3 changes: 3 additions & 0 deletions BC_objectives/functions/server/fn_startPreparationTime.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,7 @@ _this spawn {
_preparationTime = _preparationTime - 1;
sleep 1;
};

MISSION_STARTED = true;
publicVariable "MISSION_STARTED";
};
9 changes: 7 additions & 2 deletions BC_setup/functions/client/fn_addInteractions.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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];
},
{
Expand All @@ -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;
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions description.ext
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
};
Expand Down
3 changes: 3 additions & 0 deletions initserver.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions mission.sqm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@ class EditorData
toggles=1;
class ItemIDProvider
{
nextID=1316;
nextID=1322;
};
class MarkerIDProvider
{
nextID=16;
};
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;
Expand Down
Binary file modified pic/blufor_please_wait.paa
View file
Binary file not shown.
Binary file modified pic/opfor_please_wait.paa
View file
Binary file not shown.

0 comments on commit e445334

Please sign in to comment.