From ca3c40a644fee8d4d626cd9ea10e4c243e55b21a Mon Sep 17 00:00:00 2001 From: Brenden Cai Date: Sun, 22 Apr 2018 15:01:27 +1000 Subject: [PATCH] Merged development --- source/dialog/request.sqf | 6 ++++-- source/dialog/request_vehicle.sqf | 6 ++++++ source/missions/missions/sabotage/mission.sqf | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/source/dialog/request.sqf b/source/dialog/request.sqf index ab30053..767d737 100644 --- a/source/dialog/request.sqf +++ b/source/dialog/request.sqf @@ -4,7 +4,7 @@ ctrlSetText [1000, format["%1",commandpointsblu1]]; ctrlSetText [1001, format["%1",zoneundercontrolblu]]; ctrlSetText [1002, format["%1",WARCOM_blufor_ap]]; -// UNITS +// UNITS _index = lbAdd [2100, "Rifleman(2CP)"]; // 0 _index = lbAdd [2100, "Grenadier(3CP)"]; // 1 _index = lbAdd [2100, "Automatic Rifleman(3CP)"]; // 2 @@ -21,7 +21,7 @@ _index = lbAdd [2100, "Explosive specialist(4CP)"]; // 12 lbSetCurSel [2100, 0]; -// SQUADS +// SQUADS _index0 = lbAdd [2101, "Fireteam(8CP)"]; // 0 _index0 = lbAdd [2101, "Rifle Squad(16CP)"]; // 1 _index0 = lbAdd [2101, "Weapons Squad(18CP)"]; // 2 @@ -75,6 +75,8 @@ _index1 = lbAdd [2102, "Blackfish Vehicle (45CP)"]; // 34 _index1 = lbAdd [2102, "Blackfish Armed (60CP)"]; // 35 _index1 = lbAdd [2102, "Black Wasp II (50CP)"]; // 36 _index1 = lbAdd [2102, "Black Wasp II (Stealth) (60CP)"]; // 37 +_index1 = lbAdd [2102, "Rhino MGS (40CP)"]; // 38 +_index1 = lbAdd [2102, "Rhino MGS UP (42CP)"]; // 39 lbSetCurSel [2102, 0]; // Supports !!! CHECK TO ADD AT INIT diff --git a/source/dialog/request_vehicle.sqf b/source/dialog/request_vehicle.sqf index 14d1cda..a58b992 100644 --- a/source/dialog/request_vehicle.sqf +++ b/source/dialog/request_vehicle.sqf @@ -123,6 +123,12 @@ switch (_index) do { case 37: { //WASP (Stealth) [60, "B_Plane_Fighter_01_Stealth_F"] execVM "dialog\spawnVehicle.sqf"; }; + case 38: { //Rhino (Stealth) + [38, "B_AFV_Wheeled_01_cannon_F"] execVM "dialog\spawnVehicle.sqf"; + }; + case 39: { //Rhino UP (Stealth) + [42, "B_AFV_Wheeled_01_up_cannon_F"] execVM "dialog\spawnVehicle.sqf"; + }; }; vehic = nil; publicVariable "commandpointsblu1"; diff --git a/source/missions/missions/sabotage/mission.sqf b/source/missions/missions/sabotage/mission.sqf index e1236ee..a4470c7 100644 --- a/source/missions/missions/sabotage/mission.sqf +++ b/source/missions/missions/sabotage/mission.sqf @@ -25,6 +25,7 @@ str(_markername2) setMarkerAlpha 0.3; // create TOWER _tower = createVehicle ["Land_dp_transformer_F", _MissionPos, [], 0, "NONE"]; +_tower addEventHandler ["HandleDamage", {0}]; _tower addaction ["Sabotage", "missions\missions\sabotage\success.sqf",[_missionPos,_mission_name,_markername,_markername2]]; // TASK AND NOTIFICATION