Skip to content

Commit

Permalink
Bug fixing + R3F + new comps
Browse files Browse the repository at this point in the history
  • Loading branch information
kmain4 committed Apr 28, 2015
1 parent 4217153 commit dce4f75
Show file tree
Hide file tree
Showing 93 changed files with 9,727 additions and 885 deletions.
7 changes: 7 additions & 0 deletions Comps/farp.sqf
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
private ["_objs"];
_objs =
[
["CamoNet_BLUFOR_open_Curator_F",[0.194824,-0.445313,0],0,1,0],["Land_CampingChair_V2_F",[2.24121,-1.18945,2.14577e-005],266.739,1,0],["Land_Camping_Light_F",[2.56055,-0.333008,-0.00113344],0.114423,1,0],["Land_Pallets_F",[-1.18359,-3.10498,0.097342],299.142,1,0],["Land_CampingTable_small_F",[2.75488,-2.1123,4.76837e-007],39.2677,1,0],["Campfire_burning_F",[4.06494,-0.938965,0.0299988],0,1,0],["CargoNet_01_box_F",[-4.3667,-0.788086,9.53674e-007],326.1,1,0],["Land_CampingChair_V1_folded_F",[3.77686,-2.54346,0],0,1,0],["Land_PaperBox_open_empty_F",[-4.32666,-3.13135,0],0,1,0],["Land_MetalBarrel_F",[3.26367,4.37256,5.38826e-005],14.2116,1,1],["CargoNet_01_barrels_F",[4.60693,2.99902,0],66.2192,1,0],["Land_MetalBarrel_F",[4.15137,4.87598,3.29018e-005],68.3785,1,1],["Land_PaperBox_closed_F",[-6.23438,-1.46484,0],73.5976,1,0],["Land_TentA_F",[6.64502,-1.97705,0.0102367],116.467,1,0],["PortableHelipadLight_01_blue_F",[-5.59863,6.57813,4.76837e-007],358.867,1,0],["PortableHelipadLight_01_blue_F",[5.70068,6.54785,0],0.0666893,1,0],["Land_HelipadSquare_F",[0.0571289,12.2422,0],0,1,0],["Windsock_01_F",[-8.32129,12.5205,0],0,1,0],["PortableHelipadLight_01_blue_F",[-5.61914,17.8506,4.76837e-007],359.994,1,0],["PortableHelipadLight_01_blue_F",[5.7002,17.8545,4.76837e-007],359.98,1,0]
];

_objs
7 changes: 7 additions & 0 deletions Comps/mash.sqf
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
private ["_objs"];
_objs =
[
["Land_Sun_chair_green_F",[-2.32031,1.34961,0.0199571],359.996,1,0.26381],["Land_BarrelWater_F",[1.1416,2.49512,6.05583e-005],158.666,1,0],["PortableHelipadLight_01_red_F",[2.55713,-1.86279,4.76837e-007],359.933,1,0],["Land_Sun_chair_green_F",[-3.85791,1.30908,0.019958],0.0088729,1,0.232577],["Land_Medevac_house_V1_F",[-1.1543,4.96045,0],0,1,0],["CamoNet_BLUFOR_big_Curator_F",[-1.19971,4.6958,-0.592812],0,1,0],["PortableHelipadLight_01_red_F",[-4.2085,-2.875,4.76837e-007],359.924,1,0],["CargoNet_01_box_F",[3.15576,4.34814,0],178.938,1,0],["Land_Sun_chair_green_F",[-5.61523,1.36621,0.0199571],359.997,1,0.211276],["CargoNet_01_barrels_F",[3.27344,7.24512,0],181.509,1,0]
];

_objs
36 changes: 13 additions & 23 deletions EVO/fn_deployEplayer.sqf
Original file line number Diff line number Diff line change
@@ -1,38 +1,28 @@
_truck = objNull;
_truck = (nearestObject [vehicle player, "B_Truck_01_Repair_F"]);

if(isNull _truck) exitWith
{
_msg = format ["There is no repair truck nearby."];
["deployed",["FARP NOT DEPLOYED", _msg]] call BIS_fnc_showNotification;
};

if (player in list AirportIn) exitWith {
if (player distance spawnBuilding < 1000) exitWith {
_msg = format ["You can't deploy a FARP in the base."];
["deployed",["FARP NOT DEPLOYED", _msg]] call BIS_fnc_showNotification;
};

deletevehicle etent;
deletevehicle epad;
deletevehicle ebox;
_mark = format["%1farp",(name player)];
deleteMarker _mark;

player playMove "Acts_carFixingWheel";
FARPRespawn call BIS_fnc_removeRespawnPosition;
{
deleteVehicle _x;
} forEach playerStructures;
sleep 3.0;

WaitUntil {animationState player != "Acts_carFixingWheel"};

epad = "Land_HelipadSquare_F" createVehicle (position player);
_pos = position epad;
_pos2 = [_pos select 0,(_pos select 1) - 18,_pos select 2];
etent = "Land_BagBunker_Tower_F" createVehicle _pos2;
_respawnPos = [(side player), etent] spawn BIS_fnc_addRespawnPosition;
_mark = format["%1FARP",(name player)];
deleteMarker _mark;
playerStructures = [(getPos player), (getDir player), "Comps\farp.sqf", false] call (compile (preprocessFileLineNumbers "scripts\otl7_Mapper.sqf"));
FARPRespawn = [(side player), getPos player] spawn BIS_fnc_addRespawnPosition;
_mssg = format["%1's FARP",(name player)];
_medmark = createMarker [_mark, _pos];
_medmark = createMarker [_mark, getPos player];
_medmark setMarkerShape "ICON";
_medmark setMarkerType "b_service";
_medmark setMarkerType "b_med";
_medmark setMarkerColor "ColorBlue";
_medmark setMarkerText _mssg;
_medmark setMarkerSize [1, 1];
_msg = format ["Your FARP has been deployed at map grid %1.", mapGridPosition etent];
_msg = format ["Your FARP has been deployed at map grid %1.", mapGridPosition player];
["deployed",["FARP DEPLOYED", _msg]] call BIS_fnc_showNotification;
17 changes: 10 additions & 7 deletions EVO/fn_deployMplayer.sqf
Original file line number Diff line number Diff line change
@@ -1,25 +1,28 @@
if (player in list AirportIn) exitWith {
if (player distance spawnBuilding < 1000) exitWith {
_msg = format ["You can't deploy a MASH in the base."];
["deployed",["MASH NOT DEPLOYED", _msg]] call BIS_fnc_showNotification;
};

deletevehicle mtent;

player playMove "Acts_carFixingWheel";
mashRespawn call BIS_fnc_removeRespawnPosition;
{
deleteVehicle _x;
} forEach playerStructures;
sleep 3.0;

WaitUntil {animationState player != "Acts_carFixingWheel"};

_mark = format["%1mash",(name player)];
deleteMarker _mark;
mtent = "MASH" createVehicle (position player);
_respawnPos = [(side player), mtent] spawn BIS_fnc_addRespawnPosition;
_pos = position mtent;
playerStructures = [(getPos player), (getDir player), "Comps\mash.sqf", false] call (compile (preprocessFileLineNumbers "scripts\otl7_Mapper.sqf"));
mashRespawn = [(side player), getPos player] spawn BIS_fnc_addRespawnPosition;
_mssg = format["%1's MASH",(name player)];
_medmark = createMarker [_mark, _pos];
_medmark = createMarker [_mark, getPos player];
_medmark setMarkerShape "ICON";
_medmark setMarkerType "b_med";
_medmark setMarkerColor "ColorBlue";
_medmark setMarkerText _mssg;
_medmark setMarkerSize [1, 1];
_msg = format ["Your MASH has been deployed at map grid %1.", mapGridPosition mtent];
_msg = format ["Your MASH has been deployed at map grid %1.", mapGridPosition player];
["deployed",["MASH DEPLOYED", _msg]] call BIS_fnc_showNotification;
3 changes: 0 additions & 3 deletions EVO/fn_initEVO.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ _mil = [];
militaryLocations = _mil;




targetCounter = 2;
currentTarget = targetLocations select targetCounter;
currentTargetName = text currentTarget;
Expand All @@ -37,7 +35,6 @@ infSquads = (("infSquadsParam" call BIS_fnc_getParamValue) * 2);
mechSquads = ("mechSquadsParam" call BIS_fnc_getParamValue);
armorSquads = ("armorSquadsParam" call BIS_fnc_getParamValue);
CROSSROADS = [West,"HQ"];
MHQ = firstMHQ;
markerCounter = 0;
"opforair" setMarkerAlpha 0;
currentSideMission = "none";
Expand Down
11 changes: 8 additions & 3 deletions EVO/fn_pinit.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,12 @@ player addEventHandler ["HandleScore", {[] spawn EVO_fnc_handleScore}];
//if (!isNil "hqbox") then {deleteVehicle hqbox};

if (("fullArsenal" call BIS_fnc_getParamValue) == 0) then {
player addaction ["Modify Loadout","['Open',true] spawn BIS_fnc_arsenal;",nil,1,false,true,"","(player distance ammoOfficer) < 15"];
player addaction ["Modify Loadout","['Open',true] spawn BIS_fnc_arsenal;",nil,1,false,true,"","(player distance spawnBuilding) < 25"];
} else {
if (!isNil "hqbox") then {
deleteVehicle hqbox;
};
hqbox = "CargoNet_01_box_F" createVehicleLocal (getMarkerPos "ammobox");
};

if (("pfatigue" call BIS_fnc_getParamValue) == 0) then {
Expand Down Expand Up @@ -137,8 +142,8 @@ _handleHealID = player addEventHandler ["HandleHeal",{

handle = [] spawn {
while {alive player} do {
waitUntil {player distance ammoOfficer < 25};
waitUntil {player distance ammoOfficer > 25};
waitUntil {player distance spawnBuilding < 25};
waitUntil {player distance spawnBuilding > 25};
loadout = [player] call compile preprocessFileLineNumbers "scripts\getloadout.sqf";
systemChat "Loadout saved...";
};
Expand Down
84 changes: 56 additions & 28 deletions EVO/fn_rank.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,17 @@ _rank = rank _player;
_msg = format ["You've been promoted to the rank of %1.", rank _player];
if (_newScore < rank1 and _rank != "PRIVATE") then {
_player setUnitRank "PRIVATE";
if (!isNil "hqbox") then {
deleteVehicle hqbox;
};
hqbox = "CargoNet_01_box_F" createVehicleLocal (getMarkerPos "ammobox");
availableWeapons = availableWeapons + rank1weapons;
availableMagazines = availableMagazines + rank1magazines;
["promoted",["img\pvt.paa", _msg]] call BIS_fnc_showNotification;
[ammoOfficer, (availableBackpacks)] call BIS_fnc_addVirtualBackpackCargo;
[ammoOfficer, (availableHeadgear + availableGoggles + availableItems + availableUniforms + availableVests)] call BIS_fnc_addVirtualItemCargo;
[ammoOfficer, (availableMagazines)] call BIS_fnc_addVirtualMagazineCargo;
[ammoOfficer, (availableWeapons)] call BIS_fnc_addVirtualWeaponCargo;
[hqbox, (availableBackpacks)] call BIS_fnc_addVirtualBackpackCargo;
[hqbox, (availableHeadgear + availableGoggles + availableItems + availableUniforms + availableVests)] call BIS_fnc_addVirtualItemCargo;
[hqbox, (availableMagazines)] call BIS_fnc_addVirtualMagazineCargo;
[hqbox, (availableWeapons)] call BIS_fnc_addVirtualWeaponCargo;
playsound "Paycall";
};
if (_newScore < rank2 and _newScore >= rank1 and _rank != "CORPORAL") then {
Expand All @@ -23,61 +27,85 @@ _rank = rank _player;
availableItems = availableItems + rank2items;
availableMagazines = availableMagazines + rank1magazines;
["promoted",["img\corp.paa", _msg]] call BIS_fnc_showNotification;
[ammoOfficer, (availableBackpacks)] call BIS_fnc_addVirtualBackpackCargo;
[ammoOfficer, (availableHeadgear + availableGoggles + availableItems + availableUniforms + availableVests)] call BIS_fnc_addVirtualItemCargo;
[ammoOfficer, (availableMagazines)] call BIS_fnc_addVirtualMagazineCargo;
[ammoOfficer, (availableWeapons)] call BIS_fnc_addVirtualWeaponCargo;
[hqbox, (availableBackpacks)] call BIS_fnc_addVirtualBackpackCargo;
[hqbox, (availableHeadgear + availableGoggles + availableItems + availableUniforms + availableVests)] call BIS_fnc_addVirtualItemCargo;
[hqbox, (availableMagazines)] call BIS_fnc_addVirtualMagazineCargo;
[hqbox, (availableWeapons)] call BIS_fnc_addVirtualWeaponCargo;
playsound "Paycall";
if (!isNil "hqbox") then {
deleteVehicle hqbox;
};
hqbox = "CargoNet_01_box_F" createVehicleLocal (getMarkerPos "ammobox");
};
if (_newScore < rank3 and _newScore >= rank2 and _rank != "SERGEANT") then {
_player setUnitRank "SERGEANT";
availableWeapons = availableWeapons + rank1weapons + rank2weapons + rank3weapons;
availableItems = availableItems + rank2items + rank3items;
availableMagazines = availableMagazines + rank1magazines;
["promoted",["img\sgt.paa", _msg]] call BIS_fnc_showNotification;
[ammoOfficer, (availableBackpacks)] call BIS_fnc_addVirtualBackpackCargo;
[ammoOfficer, (availableHeadgear + availableGoggles + availableItems + availableUniforms + availableVests)] call BIS_fnc_addVirtualItemCargo;
[ammoOfficer, (availableMagazines)] call BIS_fnc_addVirtualMagazineCargo;
[ammoOfficer, (availableWeapons)] call BIS_fnc_addVirtualWeaponCargo;
[hqbox, (availableBackpacks)] call BIS_fnc_addVirtualBackpackCargo;
[hqbox, (availableHeadgear + availableGoggles + availableItems + availableUniforms + availableVests)] call BIS_fnc_addVirtualItemCargo;
[hqbox, (availableMagazines)] call BIS_fnc_addVirtualMagazineCargo;
[hqbox, (availableWeapons)] call BIS_fnc_addVirtualWeaponCargo;
playsound "Paycall";
if (!isNil "hqbox") then {
deleteVehicle hqbox;
};
hqbox = "CargoNet_01_box_F" createVehicleLocal (getMarkerPos "ammobox");
};
if (_newScore < rank4 and _newScore >= rank3 and _rank != "LIEUTENANT") then {
_player setUnitRank "LIEUTENANT";
availableWeapons = availableWeapons + rank1weapons + rank2weapons + rank3weapons + rank4weapons;
["promoted",["img\ltn.paa", _msg]] call BIS_fnc_showNotification;
[ammoOfficer, (availableBackpacks)] call BIS_fnc_addVirtualBackpackCargo;
[ammoOfficer, (availableHeadgear + availableGoggles + availableItems + availableUniforms + availableVests)] call BIS_fnc_addVirtualItemCargo;
[ammoOfficer, (availableMagazines)] call BIS_fnc_addVirtualMagazineCargo;
[ammoOfficer, (availableWeapons)] call BIS_fnc_addVirtualWeaponCargo;
[hqbox, (availableBackpacks)] call BIS_fnc_addVirtualBackpackCargo;
[hqbox, (availableHeadgear + availableGoggles + availableItems + availableUniforms + availableVests)] call BIS_fnc_addVirtualItemCargo;
[hqbox, (availableMagazines)] call BIS_fnc_addVirtualMagazineCargo;
[hqbox, (availableWeapons)] call BIS_fnc_addVirtualWeaponCargo;
playsound "Paycall";
if (!isNil "hqbox") then {
deleteVehicle hqbox;
};
hqbox = "CargoNet_01_box_F" createVehicleLocal (getMarkerPos "ammobox");
};
if (_newScore < rank5 and _newScore >= rank4 and _rank != "CAPTAIN") then {
_player setUnitRank "CAPTAIN";
availableWeapons = availableWeapons + rank1weapons + rank2weapons + rank3weapons + rank4weapons + rank5weapons;
["promoted",["img\cpt.paa", _msg]] call BIS_fnc_showNotification;
[ammoOfficer, (availableBackpacks)] call BIS_fnc_addVirtualBackpackCargo;
[ammoOfficer, (availableHeadgear + availableGoggles + availableItems + availableUniforms + availableVests)] call BIS_fnc_addVirtualItemCargo;
[ammoOfficer, (availableMagazines)] call BIS_fnc_addVirtualMagazineCargo;
[ammoOfficer, (availableWeapons)] call BIS_fnc_addVirtualWeaponCargo;
[hqbox, (availableBackpacks)] call BIS_fnc_addVirtualBackpackCargo;
[hqbox, (availableHeadgear + availableGoggles + availableItems + availableUniforms + availableVests)] call BIS_fnc_addVirtualItemCargo;
[hqbox, (availableMagazines)] call BIS_fnc_addVirtualMagazineCargo;
[hqbox, (availableWeapons)] call BIS_fnc_addVirtualWeaponCargo;
playsound "Paycall";
if (!isNil "hqbox") then {
deleteVehicle hqbox;
};
hqbox = "CargoNet_01_box_F" createVehicleLocal (getMarkerPos "ammobox");
};
if (_newScore < rank6 and _newScore >= rank5 and _rank != "MAJOR") then {
_player setUnitRank "MAJOR";
availableWeapons = availableWeapons + rank1weapons + rank2weapons + rank3weapons + rank4weapons + rank6weapons;
["promoted",["img\mjr.paa", _msg]] call BIS_fnc_showNotification;
[ammoOfficer, (availableBackpacks)] call BIS_fnc_addVirtualBackpackCargo;
[ammoOfficer, (availableHeadgear + availableGoggles + availableItems + availableUniforms + availableVests)] call BIS_fnc_addVirtualItemCargo;
[ammoOfficer, (availableMagazines)] call BIS_fnc_addVirtualMagazineCargo;
[ammoOfficer, (availableWeapons)] call BIS_fnc_addVirtualWeaponCargo;
[hqbox, (availableBackpacks)] call BIS_fnc_addVirtualBackpackCargo;
[hqbox, (availableHeadgear + availableGoggles + availableItems + availableUniforms + availableVests)] call BIS_fnc_addVirtualItemCargo;
[hqbox, (availableMagazines)] call BIS_fnc_addVirtualMagazineCargo;
[hqbox, (availableWeapons)] call BIS_fnc_addVirtualWeaponCargo;
playsound "Paycall";
if (!isNil "hqbox") then {
deleteVehicle hqbox;
};
hqbox = "CargoNet_01_box_F" createVehicleLocal (getMarkerPos "ammobox");
};
if (_newScore >= rank6 and _rank != "COLONEL") then {
_player setUnitRank "COLONEL";
availableWeapons = availableWeapons + rank1weapons + rank2weapons + rank3weapons + rank4weapons + rank7weapons;
["promoted",["img\col.paa", _msg]] call BIS_fnc_showNotification;
[ammoOfficer, (availableBackpacks)] call BIS_fnc_addVirtualBackpackCargo;
[ammoOfficer, (availableHeadgear + availableGoggles + availableItems + availableUniforms + availableVests)] call BIS_fnc_addVirtualItemCargo;
[ammoOfficer, (availableMagazines)] call BIS_fnc_addVirtualMagazineCargo;
[ammoOfficer, (availableWeapons)] call BIS_fnc_addVirtualWeaponCargo;
[hqbox, (availableBackpacks)] call BIS_fnc_addVirtualBackpackCargo;
[hqbox, (availableHeadgear + availableGoggles + availableItems + availableUniforms + availableVests)] call BIS_fnc_addVirtualItemCargo;
[hqbox, (availableMagazines)] call BIS_fnc_addVirtualMagazineCargo;
[hqbox, (availableWeapons)] call BIS_fnc_addVirtualWeaponCargo;
playsound "Paycall";
if (!isNil "hqbox") then {
deleteVehicle hqbox;
};
hqbox = "CargoNet_01_box_F" createVehicleLocal (getMarkerPos "ammobox");
};
Loading

0 comments on commit dce4f75

Please sign in to comment.