Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TK FNC Translation and fix #218

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"logViewer.watch": [
{
"title": "RPTs",
"pattern": "C:\\Users\\billw\\AppData\\Local\\Arma 3\\*.rpt"
}
]
}
9 changes: 5 additions & 4 deletions A3-Antistasi/AI/AAFKilledEH.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ if (side (group _killer) == buenos) then
{
if (_lado == malos) then
{
[0,-2,getPos _muerto] remoteExec ["A3A_fnc_citySupportChange",2];
[-1, 0, "SDK Killed Unarmed Enemy"] remoteExec ["A3A_fnc_timingCA", 2];
//[3,-3,getPos _muerto] remoteExec ["A3A_fnc_citySupportChange",2];
[1,0] remoteExec ["A3A_fnc_prestige",2];
}
else
Expand All @@ -64,7 +65,7 @@ if (side (group _killer) == buenos) then
}
else
{
[-1,1,getPos _muerto] remoteExec ["A3A_fnc_citySupportChange",2];
//[-3,3,getPos _muerto] remoteExec ["A3A_fnc_citySupportChange",2];
if (_lado == malos) then
{
[0.1,0] remoteExec ["A3A_fnc_prestige",2];
Expand All @@ -79,11 +80,11 @@ else
{
if (_lado == malos) then
{
[-0.25,0,getPos _muerto] remoteExec ["A3A_fnc_citySupportChange",2];
[-1,0,getPos _muerto, "AAFKilledEH"] remoteExec ["A3A_fnc_citySupportChange",2];
}
else
{
[0.25,0,getPos _muerto] remoteExec ["A3A_fnc_citySupportChange",2];
//[0.25,0,getPos _muerto] remoteExec ["A3A_fnc_citySupportChange",2];
};
};
_marcador = _muerto getVariable "marcador";
Expand Down
1 change: 1 addition & 0 deletions A3-Antistasi/AI/airbomb.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ _ammo = "Bomb_03_F";
_cuenta = 8;
_cluster = false;
_carpet = false;

if (_tipo != "HE") then
{
_ammo = "G_40mm_HEDP";
Expand Down
8 changes: 5 additions & 3 deletions A3-Antistasi/AI/airstrike.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ _origPos = [];
_pos2 = [];
_finPos = [];
_exit = false;
sleep (120 + random(300));
if (_esMarcador) then
{
_timeOut = time + 600;
waitUntil {sleep 1; (spawner getVariable _marcador == 0) or (time > _timeOut)};

if (_marcador in aeropuertos) then
{
_size = [_marcador] call A3A_fnc_sizeMarker;
Expand Down Expand Up @@ -90,6 +90,7 @@ else
};
};

// TODO: spawn this at an actual air port?
if (_exit) exitWith {};
_planefn = [_origpos, _ang, _tipoavion, _lado] call bis_fnc_spawnvehicle;
_plane = _planefn select 0;
Expand All @@ -108,7 +109,8 @@ _wp1 setWaypointType "MOVE";
_wp1 setWaypointSpeed "LIMITED";
_wp1 setWaypointBehaviour "CARELESS";
_plane setCollisionLight true;
if ((_tipo == "NAPALM") and (napalmCurrent)) then {_tipo = "CLUSTER"};
// Disabling NAPALM, it looks crap, and causes client crashes I think.
if (_tipo == "NAPALM") then {_tipo = "CLUSTER"};
if (_tipo == "HE") then {_wp1 setWaypointStatements ["true", "[this,""HE""] execVM 'AI\airbomb.sqf'"]} else {if (_tipo == "NAPALM") then {_wp1 setWaypointStatements ["true", "[this,""NAPALM""] execVM 'AI\airbomb.sqf'"]} else {_wp1 setWaypointStatements ["true", "[this,""CLUSTER""] execVM 'AI\airbomb.sqf'"]}};

_wp2 = _grupoplane addWaypoint [_pos2, 1];
Expand Down
6 changes: 5 additions & 1 deletion A3-Antistasi/AI/mortyAI.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ while {(alive _morty0) and (alive _morty1)} do
_nul = [_mortero] call A3A_fnc_AIVEHinit;

waitUntil {sleep 1; ({!(alive _x)} count units _grupo != 0) or !(unitReady _morty0)};
_morty0 forceSpeed 0;

if (({(alive _x)} count units _grupo == count units _grupo) and !(unitReady _morty0)) then
{
Expand All @@ -39,4 +40,7 @@ while {(alive _morty0) and (alive _morty1)} do
moveOut _morty1;
deleteVehicle _mortero;
};
};

waitUntil {sleep 1; vehicle _morty1 != _morty1};
_morty0 forceSpeed -1;
};
61 changes: 31 additions & 30 deletions A3-Antistasi/AI/pedirAyuda.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -7,74 +7,75 @@ _enemy = _unit findNearestEnemy _unit;
_distancia = 81;
_medico = objNull;
_units = units group _unit;
// if the nearest enemy can see the patient, or the nearest enemy is less than 100m away and the patient isn't the player
if ((([objNull, "VIEW"] checkVisibility [eyePos _enemy, eyePos _unit]) > 0) or (_unit distance _enemy < 100) and (!isPlayer _unit)) then
{
{
{
if (!isPlayer _x) then
if (!isPlayer _x) then
{
if (([_x] call A3A_fnc_canFight) and ("FirstAidKit" in (items _x)) and (vehicle _x == _x) and (_x distance _unit < _distancia) and !(_x getVariable ["maniobrando",false])) then
if (([_x] call A3A_fnc_canFight) and (("FirstAidKit" in (items _x)) or easyRevive) and (vehicle _x == _x) and (_x distance _unit < _distancia) and !(_x getVariable ["maniobrando",false])) then
{
_medico == _unit;
_medico = _unit;
};
};
} forEach _units;
}
}
else
{
{
{
if (!isPlayer _x) then
if (!isPlayer _x) then
{
if ([_x] call A3A_fnc_isMedic) then
if ([_x] call A3A_fnc_isMedic) then
{
if (([_x] call A3A_fnc_canFight) and ("FirstAidKit" in (items _x)) and (vehicle _x == _x) and (_x distance _unit < 81) and !(_x getVariable ["maniobrando",false])) then
if (([_x] call A3A_fnc_canFight) and (("FirstAidKit" in (items _x)) or easyRevive) and (vehicle _x == _x) and (_x distance _unit < 81) and !(_x getVariable ["maniobrando",false])) then
{
//_ayudando = _x getVariable "ayudando";
if (!(_x getVariable ["ayudando",false]) and (!(_x getVariable ["rearming",false]))) then
//_ayudando = _x getVariable "ayudando";
if (!(_x getVariable ["ayudando",false]) and (!(_x getVariable ["rearming",false]))) then
{
_medico = _x;
_distancia = _x distance _unit;
_medico = _x;
_distancia = _x distance _unit;
};
};
};
};
} forEach _units;

if (((isNull _medico) or (_unit getVariable ["INCAPACITATED",false])) and !([_unit] call A3A_fnc_fatalWound)) then
{
{
{
if (!isPlayer _x) then
if (!isPlayer _x) then
{
if !([_x] call A3A_fnc_isMedic) then
if !([_x] call A3A_fnc_isMedic) then
{
if (([_x] call A3A_fnc_canFight) and ("FirstAidKit" in (items _x)) and (vehicle _x == _x) and (_x distance _unit < _distancia) and !(_x getVariable ["maniobrando",false])) then
if (([_x] call A3A_fnc_canFight) and (("FirstAidKit" in (items _x)) or easyRevive) and (vehicle _x == _x) and (_x distance _unit < _distancia) and !(_x getVariable ["maniobrando",false])) then
{
//_ayudando = _x getVariable "ayudando";
if (!(_x getVariable ["ayudando",false]) and (!(_x getVariable ["rearming",false]))) then
//_ayudando = _x getVariable "ayudando";
if (!(_x getVariable ["ayudando",false]) and (!(_x getVariable ["rearming",false]))) then
{
_medico = _x;
_distancia = _x distance _unit;
_medico = _x;
_distancia = _x distance _unit;
};
};
};
};
} forEach _units;
};
};
if (!isNull _medico) then
{
{
if (isNull(_unit getVariable ["ayudado",objNull])) then {[_unit,_medico] spawn A3A_fnc_ayudar};
}
}
else
{
{
_distancia = 81;
{
if (!isPlayer _x) then
if (!isPlayer _x) then
{
if (([_x] call A3A_fnc_canFight) and ("FirstAidKit" in (items _x)) and (vehicle _x == _x) and (_x distance _unit < _distancia)) then
if (([_x] call A3A_fnc_canFight) and (("FirstAidKit" in (items _x)) or easyRevive) and (vehicle _x == _x) and (_x distance _unit < _distancia)) then
{
_medico == _unit;
_medico = _unit;
};
};
} forEach _units;
};
};
_medico
};
_medico
4 changes: 2 additions & 2 deletions A3-Antistasi/AI/surrenderAction.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ _unit setVariable ["surrendered",true];

if (side _unit == malos) then
{
_nul = [-2,0,getPos _unit] remoteExec ["A3A_fnc_citySupportChange",2];
//_nul = [-2,0,getPos _unit] remoteExec ["A3A_fnc_citySupportChange",2];
}
else
{
_nul = [1,0,getPos _unit] remoteExec ["A3A_fnc_citySupportChange",2];
_nul = [2,0,getPos _unit, "SDK Surrender"] remoteExec ["A3A_fnc_citySupportChange",2];
};
_armas = [];
_municion = [];
Expand Down
27 changes: 27 additions & 0 deletions A3-Antistasi/CHVD/CfgFunctions.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
class CHVD
{
tag = "CHVD";
class script
{
file = "CHVD";
class onSliderChange {};
class onLBSelChanged {};
class onLBSelChanged_syncmode {};
class onEBinput {};
class onEBterrainInput {};
class onEBinput_syncmode {};
class selTerrainQuality {};
class updateTerrain {};
class updateSettings {};
class updateVehType {};
class fovViewDistance {};
class UAVstatus {};
class openDialog {};
class localize {};
class trueZoom {};
class keyBindings {};
class keyDown {};
class keyDownTerrain {};
class init {postInit = 1;};
};
};
Loading