diff --git a/A3-Antistasi/AI/inmuneConvoy.sqf b/A3-Antistasi/AI/inmuneConvoy.sqf index a43ad2009a..026695e0a7 100644 --- a/A3-Antistasi/AI/inmuneConvoy.sqf +++ b/A3-Antistasi/AI/inmuneConvoy.sqf @@ -33,6 +33,7 @@ while {alive _veh} do _pos = getPos _veh; sleep 60; _newPos = getPos _veh; + _condu = driver _veh; if ((_newPos distance _pos < 5) and (_text != "Supply Box") and !(isNull _condu)) then { @@ -71,5 +72,4 @@ while {alive _veh} do }; }; }; - }; \ No newline at end of file diff --git a/A3-Antistasi/REINF/buildMinefield.sqf b/A3-Antistasi/REINF/buildMinefield.sqf index 08012c1887..075ef89939 100644 --- a/A3-Antistasi/REINF/buildMinefield.sqf +++ b/A3-Antistasi/REINF/buildMinefield.sqf @@ -58,6 +58,8 @@ _mrk setMarkerType "hd_warning"; _mrk setMarkerColor "ColorRed"; _mrk setMarkerBrush "DiagGrid"; _mrk setMarkerText _texto; +[_mrk,0] remoteExec ["setMarkerAlpha",[malos,muyMalos]]; + [[buenos,civilian],"Mines",[format ["An Engineer Team has been deployed at your command with High Command Option. Once they reach the position, they will start to deploy %1 mines in the area. Cover them in the meantime.",_cantidad],"Minefield Deploy",_mrk],_posicionTel,false,0,true,"map",true] call BIS_fnc_taskCreate; //_tsk = ["Mines",[buenos,civilian],[format ["An Engineer Team has been deployed at your command with High Command Option. Once they reach the position, they will start to deploy %1 mines in the area. Cover them in the meantime.",_cantidad],"Minefield Deploy",_mrk],_posicionTel,"CREATED",5,true,true,"map"] call BIS_fnc_setTask; //misiones pushBack _tsk; publicVariable "misiones"; @@ -69,7 +71,7 @@ sleep 1; _unit = _grupo createUnit [(SDKExp select 0), (getMarkerPos "respawn_guerrila"), [], 0, "NONE"]; _grupo setGroupId ["MineF"]; -_road = [_posicion] call findNearestGoodRoad; +_road = [getMarkerPos "respawn_guerrila"] call findNearestGoodRoad; _pos = position _road findEmptyPosition [1,30,vehSDKTruck]; _camion = vehSDKTruck createVehicle _pos; diff --git a/A3-Antistasi/initServer.sqf b/A3-Antistasi/initServer.sqf index 29844849e9..32afc634c2 100644 --- a/A3-Antistasi/initServer.sqf +++ b/A3-Antistasi/initServer.sqf @@ -69,8 +69,8 @@ if (loadLastSave) then loadLastSave = false; diag_log "Antistasi: Persitent Load selected but there is no older session"; }; - publicVariable "loadLastSave"; }; +publicVariable "loadLastSave"; if (loadLastSave) then { _nul = [] execVM "statSave\loadAccount.sqf"; @@ -82,18 +82,20 @@ if (loadLastSave) then { miembros pushBack (getPlayerUID _x); } forEach playableUnits; + publicVariable "miembros"; sleep 3; }; + stavros = objNull; { if (([_x] call isMember) and (side _x == buenos)) exitWith { stavros = _x; //_x setRank "CORPORAL"; //[_x,"CORPORAL"] remoteExec ["ranksMP"]; - publicVariable "stavros"; //_x setVariable ["score", 25,true]; }; } forEach playableUnits; + publicVariable "stavros"; } else { @@ -126,6 +128,7 @@ else if (membershipEnabled) then {miembros = [getPlayerUID stavros]} else {miembros = []}; publicVariable "miembros"; }; + _nul = [caja] call cajaAAF; }; /* { @@ -171,7 +174,6 @@ addMissionEventHandler ["BuildingChanged", serverInitDone = true; publicVariable "serverInitDone"; diag_log "Antistasi MP Server. serverInitDone set to true."; -_nul = [caja] call cajaAAF; waitUntil {sleep 1;!(isNil "placementDone")}; distancias = [] spawn distancias4; resourcecheck = [] execVM "resourcecheck.sqf"; diff --git a/A3-Antistasi/initVar.sqf b/A3-Antistasi/initVar.sqf index a9a155538c..3775a0023c 100644 --- a/A3-Antistasi/initVar.sqf +++ b/A3-Antistasi/initVar.sqf @@ -5,7 +5,7 @@ //Not commented lines cannot be changed. //Don't touch them. -antistasiVersion = "v 1.1.3"; +antistasiVersion = "v 1.1.4"; servidoresOficiales = ["A3-Antistasi Official EU 1","A3-Antistasi Official EU 2"]; diff --git a/A3-Antistasi/markerChange.sqf b/A3-Antistasi/markerChange.sqf index 2c2f806873..94285cfd36 100644 --- a/A3-Antistasi/markerChange.sqf +++ b/A3-Antistasi/markerChange.sqf @@ -172,7 +172,7 @@ else }; if ((_winner != buenos) and (_marcador in aeropuertos) and (_looser != buenos)) then { - _cercanos = (puertos + puestos + recursos) select {((getMarkerPos _x) distance _posicion < distanciaSPWN) and (lados getVariable [_x,sideUnknown] != buenos)}; + _cercanos = (puertos + puestos + recursos + fabricas) select {((getMarkerPos _x) distance _posicion < distanciaSPWN) and (lados getVariable [_x,sideUnknown] != buenos)}; if (_looser == malos) then {_cercanos = _cercanos select {lados getVariable [_x,sideUnknown] == malos}; _winner = "OPFORSpawn"} else {_cercanos = _cercanos select {lados getVariable [_x,sideUnknown] == muyMalos}; _winner = "BLUFORSpawn"}; {[_winner,_x] spawn markerChange; sleep 5} forEach _cercanos; }; \ No newline at end of file diff --git a/A3-Antistasi/orgPlayers/mList.sqf b/A3-Antistasi/orgPlayers/mList.sqf index 34c057ff3c..afb40683a0 100644 --- a/A3-Antistasi/orgPlayers/mList.sqf +++ b/A3-Antistasi/orgPlayers/mList.sqf @@ -3,19 +3,19 @@ if !(isServer) exitWith {}; { miembros pushBackUnique _x; } forEach [ - "76561198049058798", - "76561198242611392", - "76561198065403559", - "76561198229230676", - "76561198038720428", - "76561198068009040", - "76561198117496601", - "76561197963824555", - "76561198127254055", - "76561197960319903", - "76561198088177326", - "76561198045702154", - "76561198149111506", + "76561198049058798", // Canas + "76561198242611392", // H0wl0 + "76561198065403559", // John Huxley + "76561198229230676", // Chillatopbilla + "76561198038720428", // ETcomesback + "76561198068009040", // Neatpie + "76561198117496601", // Grim + "76561197963824555", // Sen + "76561198127254055", // Sebastian + "76561197960319903", // Imbaer AKA Jodansuki + "76561198088177326", // Rusty Justy + "76561198045702154", // Dick Cheney + "76561198149111506", // Venom Snake "76561197960604947", "76561197961960492", "76561197962099476", @@ -28,7 +28,7 @@ if !(isServer) exitWith {}; "76561197972995501", "76561197977395374", "76561197979729653", - "76561197981549243", + "76561197981549243", // Sparker "76561197983004373", "76561197983017590", "76561197983686485", @@ -37,12 +37,12 @@ if !(isServer) exitWith {}; "76561197988778391", "76561197991710998", "76561197992975040", - "76561198005296652", + "76561198005296652", // stef "76561198010531079", "76561198010912271", "76561198011043004", "76561198012553600", - "76561198013878464", + "76561198013878464", // bobchaos "76561198015557763", "76561198016063072", "76561198016630176", @@ -52,8 +52,8 @@ if !(isServer) exitWith {}; "76561198030263984", "76561198031909524", "76561198032833352", - "76561198034977762", - "76561198036417817", + "76561198034977762", // Jeroen Not + "76561198036417817", // Barbolani "76561198038487624", "76561198038832670", "76561198039888227", @@ -66,7 +66,7 @@ if !(isServer) exitWith {}; "76561198065337478", "76561198066044187", "76561198068948124", - "76561198070770670", + "76561198070770670", // Dusty "76561198072605756", "76561198087534605", "76561198090170897",