Skip to content

Commit 068dff8

Browse files
ultranoobianultranoobian
committed
Possible fix for issue #15
Changed check to look for client side flag instead of mission code flag. This will remotely execute on the 'game_master' aka 'player1's machine.
1 parent 8fc04ca commit 068dff8

File tree

1 file changed

+8
-198
lines changed

1 file changed

+8
-198
lines changed

‎source/serverinit.sqf‎

Lines changed: 8 additions & 198 deletions
Original file line numberDiff line numberDiff line change
@@ -191,13 +191,18 @@ publicVariable "Array_of_FOBS";
191191
publicVariable "Array_of_FOBname";
192192

193193
game_master = ["player1"];publicVariable "game_master";
194-
194+
195195
waitUntil {chosen_settings && createzone_server};
196-
if (!zones_manually_placed) then {
196+
197+
if (!manually_chosen) then {
197198
if (!zones_created) then { // CHECK IF ZONES ARE PLACED, IF NOT EXECUTE locatorZonesV1.sqf
198199
_zones_create = [50, 0.2] execVM "initZones\locatorZonesV1.sqf"; // CHECK IF ZONES HAVE ALREADY BEEN PLACED
199200
};
200-
};
201+
} else {
202+
if (!zones_created) then { // CHECK IF ZONES ARE PLACED, IF NOT EXECUTE locatorZonesV1.sqf
203+
_zones_create = {[50,0.2] execVM "initZones\locatorZonesV2.sqf"} remoteExec ["bis_fnc_spawn", game_master select 0]; // CHECK IF ZONES HAVE ALREADY BEEN PLACED
204+
};
205+
}
201206

202207
waitUntil { !isNil "serv_zones_array" };
203208
diag_log format ["serv_zones_array: %1", serv_zones_array];
@@ -229,198 +234,3 @@ if (zones_manually_placed) then {
229234
sleep 1;
230235
_warcom_init = [Array_of_OPFOR_zones, getpos hq_blu1, [0,0,0], blufor_ap, opfor_ap, 2700,blufor_ai_skill,opfor_ai_skill, 1500] execVM "WARCOM\WARCOM_init.sqf";
231236
};
232-
233-
234-
235-
236-
237-
238-
239-
240-
241-
242-
243-
244-
245-
246-
247-
248-
249-
250-
251-
252-
253-
254-
255-
256-
257-
258-
259-
/* waitUntil { time > 0 };
260-
261-
vActiveMission=0; publicVariable "vActiveMission";
262-
vActiveMarker="none"; publicVariable "vActiveMarker";
263-
vActiveName="none"; publicVariable "vActiveName";
264-
265-
if (vVehicleLock == 0) then {
266-
vMissionScore=100; publicVariable "vMissionScore";
267-
} else {
268-
vMissionScore=0; publicVariable "vMissionScore";
269-
};
270-
vDestroyMission=false; publicVariable "vDestroyMission";
271-
vNewMissionTimer=0; publicVariable "vNewMissionTimer";
272-
vMissionStartTime=0; publicVariable "vMissionStartTime";
273-
vParadropCount=0; publicVariable "vParadropCount";
274-
vArmorInArea=false; publicVariable "vArmorInArea";
275-
vMortarInArea=false; publicVariable "vMortarInArea";
276-
vHeliInArea=false; publicVariable "vHeliInArea";
277-
vActiveRecruitsAI=0; publicVariable "vActiveRecruitsAI";
278-
vClaimedLeader="PL1"; publicVariable "vClaimedLeader";
279-
vClientRequestInfo="none"; publicVariable "vClientRequestInfo";
280-
vEvacSpawned=false; publicVariable "vEvacSpawned";
281-
282-
if (vSupplyEnable == 1) then {
283-
vSupplyTimer = time;
284-
publicVariable "vSupplyTimer";
285-
vSupplyDown = false;
286-
publicVariable "vSupplyDown";
287-
};
288-
289-
"vClientRequestInfo" addPublicVariableEventHandler {
290-
_id = 0;
291-
if (vClientRequestInfo == "PL1") then { _id = owner Player1; };
292-
if (vClientRequestInfo == "PL2") then { _id = owner Player2; };
293-
if (vClientRequestInfo == "PL3") then { _id = owner Player3; };
294-
if (vClientRequestInfo == "PL4") then { _id = owner Player4; };
295-
if (vClientRequestInfo == "PL5") then { _id = owner Player5; };
296-
if (vClientRequestInfo == "PL6") then { _id = owner Player6; };
297-
if (vClientRequestInfo == "PL7") then { _id = owner Player7; };
298-
if (vClientRequestInfo == "PL8") then { _id = owner Player8; };
299-
if (vClientRequestInfo == "PL9") then { _id = owner Player9; };
300-
if (vClientRequestInfo == "PL10") then { _id = owner Player10; };
301-
if (vClientRequestInfo == "PL11") then { _id = owner Player11; };
302-
if (vClientRequestInfo == "PL12") then { _id = owner Player12; };
303-
vClientRequestInfo="none";
304-
305-
_id publicVariableClient "vActiveMission";
306-
_id publicVariableClient "vActiveMarker";
307-
_id publicVariableClient "vActiveName";
308-
_id publicVariableClient "vRedInArea";
309-
_id publicVariableClient "vBlueInArea";
310-
_id publicVariableClient "vDetectedInArea";
311-
_id publicVariableClient "vMHQDead";
312-
_id publicVariableClient "vMissionScore";
313-
_id publicVariableClient "vArmorInArea";
314-
_id publicVariableClient "vMortarInArea";
315-
_id publicVariableClient "vHeliInArea";
316-
_id publicVariableClient "vActiveRecruitsAI";
317-
_id publicVariableClient "vEvacSpawned";
318-
319-
if (vSupplyEnable == 1) then {
320-
_id publicVariableClient "vSupplyTimer";
321-
_id publicVariableClient "vSupplyDown";
322-
};
323-
};
324-
325-
_CreateMission=false;
326-
_CleanupTimer=time+300;
327-
vLastMission=0;
328-
329-
while {true} do {
330-
if (time > _CleanupTimer) then { nul = [] execVM "cleanup.sqf"; _CleanupTimer=time+300; };
331-
if (vActiveMission == 0) then { vNewMissionTimer = time + 60; publicVariable "vNewMissionTimer"; vActiveMission=1000; publicVariable "vActiveMission"; };
332-
333-
if ((time > vNewMissionTimer) && (vActiveMission == 1000)) then {
334-
while {true} do {
335-
scopeName "MissionGen";
336-
vActiveMission=1+floor(random 51);
337-
if (vActiveMission != vLastMission) then { breakOut "MissionGen"; };
338-
};
339-
vLastMission=vActiveMission;
340-
publicVariable "vActiveMission";
341-
vMissionStartTime=time; publicVariable "vMissionStartTime";
342-
vParadropCount=0;
343-
_CreateMission=true;
344-
};
345-
346-
if (vDestroyMission && (vActiveMission > 0)) then {
347-
nul = [] execVM "destroymission.sqf";
348-
vDestroyMission=false; publicVariable "vDestroyMission";
349-
vActiveMission=0; publicVariable "vActiveMission";
350-
vMissionScore=vMissionScore+1; publicVariable "vMissionScore";
351-
systemChat format [ "Missions done: %1", vMissionScore ];
352-
};
353-
354-
if (_CreateMission) then {
355-
if (vActiveMission == 1) then { nul = [ "Frini" ] execVM "createmission.sqf" };
356-
if (vActiveMission == 2) then { nul = [ "Ifestiona" ] execVM "createmission.sqf" };
357-
if (vActiveMission == 3) then { nul = [ "Galati" ] execVM "createmission.sqf" };
358-
if (vActiveMission == 4) then { nul = [ "Syrta" ] execVM "createmission.sqf" };
359-
if (vActiveMission == 5) then { nul = [ "Kore" ] execVM "createmission.sqf" };
360-
if (vActiveMission == 6) then { nul = [ "Orino" ] execVM "createmission.sqf" };
361-
if (vActiveMission == 7) then { nul = [ "Koroni" ] execVM "createmission.sqf" };
362-
if (vActiveMission == 8) then { nul = [ "Negades" ] execVM "createmission.sqf" };
363-
if (vActiveMission == 9) then { nul = [ "Neri" ] execVM "createmission.sqf" };
364-
if (vActiveMission == 10) then { nul = [ "Panochori" ] execVM "createmission.sqf" };
365-
if (vActiveMission == 11) then { nul = [ "Therisa" ] execVM "createmission.sqf" };
366-
if (vActiveMission == 12) then { nul = [ "Poliakko" ] execVM "createmission.sqf" };
367-
if (vActiveMission == 13) then { nul = [ "Alikampos" ] execVM "createmission.sqf" };
368-
if (vActiveMission == 14) then { nul = [ "Lakka" ] execVM "createmission.sqf" };
369-
if (vActiveMission == 15) then { nul = [ "Stavros" ] execVM "createmission.sqf" };
370-
if (vActiveMission == 16) then { nul = [ "Anthrakia" ] execVM "createmission.sqf" };
371-
if (vActiveMission == 17) then { nul = [ "Rodopoli" ] execVM "createmission.sqf" };
372-
if (vActiveMission == 18) then { nul = [ "Charkia" ] execVM "createmission.sqf" };
373-
if (vActiveMission == 19) then { nul = [ "Kalochori" ] execVM "createmission.sqf" };
374-
if (vActiveMission == 20) then { nul = [ "Dorida" ] execVM "createmission.sqf" };
375-
if (vActiveMission == 21) then { nul = [ "Chalkeia" ] execVM "createmission.sqf" };
376-
if (vActiveMission == 22) then { nul = [ "Pyrgos", "Pyrgos Military Base" ] execVM "createmission.sqf" };
377-
if (vActiveMission == 23) then { nul = [ "Sofia" ] execVM "createmission.sqf" };
378-
if (vActiveMission == 24) then { nul = [ "Molos" ] execVM "createmission.sqf" };
379-
if (vActiveMission == 25) then { nul = [ "Ioannina" ] execVM "createmission.sqf" };
380-
if (vActiveMission == 26) then { nul = [ "PowerPlant", "Power Plant" ] execVM "createmission.sqf" };
381-
if (vActiveMission == 27) then { nul = [ "Panagia" ] execVM "createmission.sqf" };
382-
if (vActiveMission == 28) then { nul = [ "Feres" ] execVM "createmission.sqf" };
383-
if (vActiveMission == 29) then { nul = [ "Selakano" ] execVM "createmission.sqf" };
384-
if (vActiveMission == 30) then { nul = [ "MilBase", "Military Base North" ] execVM "createmission.sqf" };
385-
if (vActiveMission == 31) then { nul = [ "FireBase", "Fire Base" ] execVM "createmission.sqf" };
386-
if (vActiveMission == 32) then { nul = [ "Zaros" ] execVM "createmission.sqf" };
387-
if (vActiveMission == 33) then { nul = [ "Factory" ] execVM "createmission.sqf" };
388-
if (vActiveMission == 34) then { nul = [ "Oreokastro" ] execVM "createmission.sqf" };
389-
if (vActiveMission == 35) then { nul = [ "Vikos" ] execVM "createmission.sqf" };
390-
if (vActiveMission == 36) then { nul = [ "Hill299", "Hill 299" ] execVM "createmission.sqf" };
391-
if (vActiveMission == 37) then { nul = [ "Hill234", "Hill 234" ] execVM "createmission.sqf" };
392-
if (vActiveMission == 38) then { nul = [ "Abdera" ] execVM "createmission.sqf" };
393-
if (vActiveMission == 39) then { nul = [ "AirstripNorth", "Airstrip North" ] execVM "createmission.sqf" };
394-
if (vActiveMission == 40) then { nul = [ "Mine" ] execVM "createmission.sqf" };
395-
if (vActiveMission == 41) then { nul = [ "AirstripSouth", "Airstrip South" ] execVM "createmission.sqf" };
396-
if (vActiveMission == 42) then { nul = [ "Crossroads" ] execVM "createmission.sqf" };
397-
if (vActiveMission == 43) then { nul = [ "Checkpoint" ] execVM "createmission.sqf" };
398-
if (vActiveMission == 44) then { nul = [ "FarosValley", "Faros Valley" ] execVM "createmission.sqf" };
399-
if (vActiveMission == 45) then { nul = [ "Dump" ] execVM "createmission.sqf" };
400-
if (vActiveMission == 46) then { nul = [ "Gori" ] execVM "createmission.sqf" };
401-
if (vActiveMission == 47) then { nul = [ "Aristi" ] execVM "createmission.sqf" };
402-
if (vActiveMission == 48) then { nul = [ "FriniWoods", "Frini Woods" ] execVM "createmission.sqf" };
403-
if (vActiveMission == 49) then { nul = [ "Nidasos" ] execVM "createmission.sqf" };
404-
if (vActiveMission == 50) then { nul = [ "Athira" ] execVM "createmission.sqf" };
405-
if (vActiveMission == 51) then { nul = [ "Paros" ] execVM "createmission.sqf" };
406-
_CreateMission = false;
407-
};
408-
409-
if (vClaimedLeader != "none") then {
410-
if (vClaimedLeader == "PL1") then { if (alive Player1) then { group Player1 selectLeader Player1 }; };
411-
if (vClaimedLeader == "PL2") then { if (alive Player2) then { group Player2 selectLeader Player2 }; };
412-
if (vClaimedLeader == "PL3") then { if (alive Player3) then { group Player3 selectLeader Player3 }; };
413-
if (vClaimedLeader == "PL4") then { if (alive Player4) then { group Player4 selectLeader Player4 }; };
414-
if (vClaimedLeader == "PL5") then { if (alive Player5) then { group Player5 selectLeader Player5 }; };
415-
if (vClaimedLeader == "PL6") then { if (alive Player6) then { group Player6 selectLeader Player6 }; };
416-
if (vClaimedLeader == "PL7") then { if (alive Player7) then { group Player7 selectLeader Player7 }; };
417-
if (vClaimedLeader == "PL8") then { if (alive Player8) then { group Player8 selectLeader Player8 }; };
418-
if (vClaimedLeader == "PL9") then { if (alive Player9) then { group Player9 selectLeader Player9 }; };
419-
if (vClaimedLeader == "PL10") then { if (alive Player10) then { group Player10 selectLeader Player10 }; };
420-
if (vClaimedLeader == "PL11") then { if (alive Player11) then { group Player11 selectLeader Player11 }; };
421-
if (vClaimedLeader == "PL12") then { if (alive Player12) then { group Player12 selectLeader Player12 }; };
422-
};
423-
424-
sleep 1;
425-
};
426-
*/

0 commit comments

Comments
 (0)