diff --git a/initServer.sqf b/initServer.sqf index 1d2ab49..d4d0b49 100644 --- a/initServer.sqf +++ b/initServer.sqf @@ -2,7 +2,7 @@ // // Server Occupation script by second_coming // -SC_occupationVersion = "v30 (27-04-2016)"; +SC_occupationVersion = "v31 (27-04-2016)"; // // http://www.exilemod.com/profile/60-second_coming/ // diff --git a/readme.txt b/readme.txt index e6ff076..c493ec8 100644 --- a/readme.txt +++ b/readme.txt @@ -1,3 +1,8 @@ +V28-V31 (27-04-2016) +Altereed a few eventhandlers +Fixed multiple static spawns so they are independent of each other + + V27 (26-04-2016) Development Update Added the option fully control the gear assigned to bandit and survivor units @@ -6,6 +11,4 @@ Added the option for helicopters as public transport, the heli travels between t Added the option to set the maximum crew (crew count will be a random number between the max and min). The applies for all AI vehicles. -Added a separate SC_VehicleClassToUseRare list of vehicles which spawn 10% of the time in place of the standard SC_VehicleClassToUse list. - -V26 is now the master release on github +Added a separate SC_VehicleClassToUseRare list of vehicles which spawn 10% of the time in place of the standard SC_VehicleClassToUse list. \ No newline at end of file diff --git a/scripts/occupationMonitor.sqf b/scripts/occupationMonitor.sqf index 1d0509f..dab107f 100644 --- a/scripts/occupationMonitor.sqf +++ b/scripts/occupationMonitor.sqf @@ -33,15 +33,6 @@ _logDetail = format ["[OCCUPATION:Unstick]:: Initialised at %1",time]; sleep 5; }forEach SC_liveBoatsArray; -/* -{ - _logDetail = format ["[OCCUPATION:Unstick]:: Transport: %1 is active",_x]; - [_logDetail] call SC_fnc_log; - _x setFuel 1; - [_x] call SC_fnc_comeUnstuck; - sleep 5; -}forEach SC_transportArray; -*/ _logDetail = format ["[OCCUPATION:Unstick]:: Finished at %1",time]; [_logDetail] call SC_fnc_log; \ No newline at end of file diff --git a/scripts/occupationTraders.sqf b/scripts/occupationTraders.sqf index d8ea383..5ec696a 100644 --- a/scripts/occupationTraders.sqf +++ b/scripts/occupationTraders.sqf @@ -57,6 +57,10 @@ _logDetail = format['[OCCUPATION:Traders] starting @ %1',time]; _group = createGroup resistance; _group setCombatMode "BLUE"; + { + + }forEach tradersToAdd; + _traderPosition = _traderPos findEmptyPosition [0,25]; "Exile_Trader_CommunityCustoms" createUnit [_traderPosition, _group, "trader = this;"]; trader setVariable ["ExileTraderType", "Exile_Trader_CommunityCustoms",true]; diff --git a/scripts/reactions/getIn.sqf b/scripts/reactions/getIn.sqf index 7456acf..e70bd22 100644 --- a/scripts/reactions/getIn.sqf +++ b/scripts/reactions/getIn.sqf @@ -27,9 +27,4 @@ else [_vehicle] call SC_fnc_repairVehicle; }; -}; - - - - - +}; \ No newline at end of file diff --git a/scripts/reactions/getOffBus.sqf b/scripts/reactions/getOffBus.sqf index 7bee72d..acedcaa 100644 --- a/scripts/reactions/getOffBus.sqf +++ b/scripts/reactions/getOffBus.sqf @@ -1,11 +1,12 @@ -// Triggered if a player gets off the public bus -// removes the addaction to stop the bus -_bus = _this select 0; -_unit = _this select 2; +// Triggered if a player gets off the public transport + +_transport = _this select 0; +_unit = _this select 2; + +if(_transport isKindOf "LandVehicle") then +{ + _transport setFuel 0; + _transportDriver = driver _transport; + _transportDriver disableAI "MOVE"; +}; -_bus setFuel 0; -_busDriver = driver _bus; -_busDriver disableAI "MOVE"; -_bus animateDoor ["Doors_1", 1]; -_bus animateDoor ["Doors_2", 1]; -_bus animateDoor ["Doors_3", 1]; \ No newline at end of file diff --git a/scripts/reactions/getOnBus.sqf b/scripts/reactions/getOnBus.sqf index cd06d58..bbdb670 100644 --- a/scripts/reactions/getOnBus.sqf +++ b/scripts/reactions/getOnBus.sqf @@ -1,5 +1,5 @@ -// Triggered if a player gets on the public bus -// adds an addaction to stop the bus -_bus = _this select 0; -_unit = _this select 2; +// Triggered if a player gets on the public transport + +_transport = _this select 0; +_unit = _this select 2; diff --git a/scripts/reactions/staticUnitMPKilled.sqf b/scripts/reactions/staticUnitMPKilled.sqf index b8135fb..11013d8 100644 --- a/scripts/reactions/staticUnitMPKilled.sqf +++ b/scripts/reactions/staticUnitMPKilled.sqf @@ -3,6 +3,7 @@ _unit = _this select 0; _staticUID = _unit getVariable "SC_staticUID"; _spawnPosition = _unit getVariable "SC_staticSpawnPos"; +_unit removeAllMPEventHandlers "mphit"; _group = group _unit; diff --git a/scripts/startOccupation.sqf b/scripts/startOccupation.sqf index 3341e65..e1b4287 100644 --- a/scripts/startOccupation.sqf +++ b/scripts/startOccupation.sqf @@ -16,6 +16,11 @@ if (SC_fastNights) then [60, fnc_checkMultiplier, [], true] call ExileServer_system_thread_addTask; }; +if() then +{ + +}; + if(SC_occupyTraders) then { uiSleep 15; // delay the start