Skip to content

Commit

Permalink
rc10 fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Kirk Main committed Jun 1, 2015
1 parent 389dcb3 commit f65930a
Show file tree
Hide file tree
Showing 11 changed files with 36 additions and 25 deletions.
3 changes: 2 additions & 1 deletion EVO/fn_deployEplayer.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,15 @@ if (!alive player || player distance _pos > 1) exitWith {};
_mark = format["%1FARP",(name player)];
deleteMarker _mark;
playerStructures = [(getPos player), (getDir player), "Comps\farp.sqf", false] call (compile (preprocessFileLineNumbers "scripts\otl7_Mapper.sqf"));
playerRespawnPoint = [(group player), (getPos player)] call BIS_fnc_addRespawnPosition;
_mssg = format["%1's FARP",(name player)];
playerRespawnPoint = [(group player), (getPos player), _mssg] call BIS_fnc_addRespawnPosition;
_medmark = createMarker [_mark, getPos player];
_medmark setMarkerShape "ICON";
_medmark setMarkerType "b_med";
_medmark setMarkerColor "ColorBlue";
_medmark setMarkerText _mssg;
_medmark setMarkerSize [1, 1];
sleep 5;
_msg = format ["Your FARP has been deployed at map grid %1.", mapGridPosition player];
["deployed",["FARP DEPLOYED", _msg]] call BIS_fnc_showNotification;
_crate = nearestObject [_pos, "CargoNet_01_box_F"];
Expand Down
5 changes: 3 additions & 2 deletions EVO/fn_deployMplayer.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,20 @@ WaitUntil {animationState player != "Acts_carFixingWheel"};
if (!alive player || player distance _pos > 1) exitWith {};


[[_pos, 25],"EVO_fnc_healNearMen",false] call BIS_fnc_MP;
[[_pos, 25],"EVO_fnc_healNearMen",false] call BIS_fnc_MP;

_mark = format["%1mash",(name player)];
deleteMarker _mark;
playerStructures = [(getPos player), (getDir player), "Comps\mash.sqf", false] call (compile (preprocessFileLineNumbers "scripts\otl7_Mapper.sqf"));
playerRespawnPoint = [(group player), (getPos player)] call BIS_fnc_addRespawnPosition;
_mssg = format["%1's MASH",(name player)];
playerRespawnPoint = [(group player), (getPos player), _mssg] call BIS_fnc_addRespawnPosition;
_medmark = createMarker [_mark, getPos player];
_medmark setMarkerShape "ICON";
_medmark setMarkerType "b_med";
_medmark setMarkerColor "ColorBlue";
_medmark setMarkerText _mssg;
_medmark setMarkerSize [1, 1];
sleep 5;
_msg = format ["Your MASH has been deployed at map grid %1.", mapGridPosition player];
["deployed",["MASH DEPLOYED", _msg]] call BIS_fnc_showNotification;
_crate = nearestObject [_pos, "CargoNet_01_box_F"];
Expand Down
2 changes: 1 addition & 1 deletion EVO/fn_handleScore.sqf
Original file line number Diff line number Diff line change
@@ -1 +1 @@
false
false;
8 changes: 4 additions & 4 deletions EVO/fn_onUnitKilled.sqf
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
private ["_killed","_killer","_scoreToAdd","_score","_notify","_vis","_displayName","_fLetter","_pre","_string"];
_killed = _this select 0;
_killer = _this select 1;
_scoreToAdd = 0;
_score = 0;
_notify = true;
_vis = lineIntersects [eyePos _killer, eyePos _killed, _killer, _killed];
_string = "";
//systemChat format ["%1 (%2) killed %3 (%4).", name _killer, side group _killer, name _killed, side group _killed];
if (("killNotificationParam " call BIS_fnc_getParamValue) == 0) then {
_notify = false;
} else {
Expand All @@ -21,7 +21,7 @@ if (isPlayer _killer || isPlayer (leader group _killer)) then {
if (!isPlayer _killer) then {_killer = leader group _killer};
_score = _killer getVariable "EVO_score";
if (true) then {
if ((side _killed) != (side _killer) && (side _killed != civilian)) then {
if ((side group _killed) != (side _killer)) then {
if (_killed isKindOf "Man" && toLower(typeOf _killed) != toLower("O_officer_F")) then {
//npc kill
_score = _score + 1;
Expand Down Expand Up @@ -133,7 +133,7 @@ if (isPlayer _killer || isPlayer (leader group _killer)) then {
};
} else {
[[[_string, _scoreToAdd, _killer], {
if (player == _killer) then {["PointsRemoved",["Friendly Fire Kill", 7]] call BIS_fnc_showNotification};
if (player == _this select 2) then {["PointsRemoved",["Friendly Fire Kill", 7]] call BIS_fnc_showNotification};
}], "BIS_fnc_spawn", true] call BIS_fnc_MP;
_score = _score - 7;
_scoreToAdd = -7;
Expand All @@ -149,4 +149,4 @@ if (isPlayer _killer || isPlayer (leader group _killer)) then {

[_killer, _scoreToAdd] call BIS_fnc_addScore;

false
false;
6 changes: 1 addition & 5 deletions EVO/fn_pinit.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,7 @@ player addaction ["<t color='#CCCC00'>HALO Drop</t>", EVO_fnc_paraInsert, nil,1,
player addaction ["<t color='#CCCC00'>Group Management</t>","disableserialization; ([] call BIS_fnc_displayMission) createDisplay 'RscDisplayDynamicGroups'",nil,1,false,true,"","(player distance spawnBuilding) < 10"];


[[[player], {
if (isServer) then {
_this select 0 addEventHandler ["HandleScore", {[] spawn EVO_fnc_handleScore}];
};
}], "BIS_fnc_spawn", true] call BIS_fnc_MP;
[[[player], {(_this select 0) addEventHandler ["HandleScore", {false}]}], "BIS_fnc_spawn", false] call BIS_fnc_MP;

if (("fullArsenal" call BIS_fnc_getParamValue) == 0) then {
//player addaction ["Arsenal","['Open',true] spawn BIS_fnc_arsenal;",nil,1,false,true,"","(player distance hqbox) < 10"];
Expand Down
5 changes: 3 additions & 2 deletions EVO/fn_protectBase.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ while {true} do {
{
if (side _x == EAST && !isPlayer leader group _x) then {
[_x] spawn {
_this select 0 setDamage 1;
_ent = _this select 0;
_ent setDamage 1;
sleep 30;
deleteVehicle _this select 0;
deleteVehicle _ent;
};
};
} forEach _list;
Expand Down
16 changes: 8 additions & 8 deletions EVO/fn_sendToAO.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -152,19 +152,19 @@ switch (_type) do {
}];
} forEach units _grp;
if ((typeOf _tank == "O_MRAP_02_gmg_F" || typeOf _tank == "O_MRAP_02_hmg_F" || typeOf _tank == "O_UGV_01_rcws_F") && !_init) then {
spawnPos = [position (targetLocations select (targetCounter + 1)), 10, 500, 10, 0, 2, 0] call BIS_fnc_findSafePos;
_spawnPos = [position (targetLocations select (targetCounter + 1)), 10, 500, 10, 0, 2, 0] call BIS_fnc_findSafePos;
_ret = [_spawnPos, (floor (random 360)), "O_Heli_Transport_04_F", EAST] call EVO_fnc_spawnvehicle;
heli = _ret select 0;
_heli = _ret select 0;
[_heli, _tank] spawn {
_heli = _this select 0;
_tank = _this select 1;
_heli setSlingLoad _tank;
driver _heli disableAI "FSM";
driver _heli disableAI "TARGET";
driver _heli disableAI "AUTOTARGET";
group driver _heli setBehaviour "AWARE";
group driver _heli setCombatMode "RED";
group driver _heli setSpeedMode "NORMAL";
group driver _heli setBehaviour "CARELESS";
group driver _heli setCombatMode "BLUE";
group driver _heli setSpeedMode "FULL";
_lz = [position currentTarget, 150, 500, 10, 0, 2, 0] call BIS_fnc_findSafePos;
driver _heli doMove _lz;
_heli flyInHeight 50;
Expand All @@ -176,10 +176,10 @@ switch (_type) do {
{
ropeCut [ _x, 5];
} forEach ropes _heli;
_null = [(leader _grp), currentTargetMarkerName, "ONROAD", "NOSMOKE", "DELETE:", 80, "SHOWMARKER"] execVM "scripts\UPSMON.sqf";
_grp setSpeedMode "LIMITED";
_null = [(leader group driver _tank), currentTargetMarkerName, "ONROAD", "NOSMOKE", "DELETE:", 80, "SHOWMARKER"] execVM "scripts\UPSMON.sqf";
group driver _tank setSpeedMode "LIMITED";
_heli land "NONE";
_heliDriver doMove getPos server;
driver _heli doMove getPos server;
_heli flyInHeight 50;
[_heli] spawn {
_heli = _this select 0;
Expand Down
6 changes: 5 additions & 1 deletion EVO/fn_spawnGroup.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ _grp = _this call BIS_fnc_spawnGroup;
_x setSkill ["commanding", 0.5];
_x setSkill ["general", 0.6];
_x AddMPEventHandler ["mpkilled", {_this spawn EVO_fnc_onUnitKilled}];
if (HCconnected) then {
handle = [_x] call EVO_fnc_sendToHC;
};
} foreach units _grp;

_grp;
_grp;

5 changes: 4 additions & 1 deletion EVO/fn_spawnVehicle.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,12 @@ _grp = _ret select 2;
_x setSkill ["commanding", 0.5];
_x setSkill ["general", 0.6];
_x AddMPEventHandler ["mpkilled", {_this spawn EVO_fnc_onUnitKilled}];
if (HCconnected) then {
handle = [_x] call EVO_fnc_sendToHC;
};
} foreach units _grp;

_veh addEventHandler ["Killed", {_this spawn EVO_fnc_onUnitKilled}];
_veh AddMPEventHandler ["mpkilled", {_this spawn EVO_fnc_onUnitKilled}];
_veh allowCrewInImmobile true;

_ret;
Binary file modified img/evo.paa
Binary file not shown.
5 changes: 5 additions & 0 deletions mission.sqm
Original file line number Diff line number Diff line change
Expand Up @@ -1001,6 +1001,7 @@ class Mission
side="EMPTY";
vehicle="C_Offroad_01_F";
skill=0.60000002;
init="nul = [this] spawn EVO_fnc_basicRespawn";
};
class Item22
{
Expand Down Expand Up @@ -1419,6 +1420,7 @@ class Mission
side="EMPTY";
vehicle="C_Offroad_01_F";
skill=0.60000002;
init="nul = [this] spawn EVO_fnc_basicRespawn";
};
class Item65
{
Expand All @@ -1429,6 +1431,7 @@ class Mission
side="EMPTY";
vehicle="C_Offroad_01_F";
skill=0.60000002;
init="nul = [this] spawn EVO_fnc_basicRespawn";
};
class Item66
{
Expand All @@ -1439,6 +1442,7 @@ class Mission
side="EMPTY";
vehicle="C_Offroad_01_F";
skill=0.60000002;
init="nul = [this] spawn EVO_fnc_basicRespawn";
};
class Item67
{
Expand All @@ -1449,6 +1453,7 @@ class Mission
side="EMPTY";
vehicle="C_Offroad_01_F";
skill=0.60000002;
init="nul = [this] spawn EVO_fnc_basicRespawn";
};
class Item68
{
Expand Down

0 comments on commit f65930a

Please sign in to comment.