Commit 1cbb9bb5 authored by Superxpdude's avatar Superxpdude

Bumped the version number.

The red zone now triggers when civilians are in vehicles.
Vehicles around the turn-in locations are now cleared when players turn in items.
BLUFOR respawn time raised to three minutes.
parent d0124a98
//-------------------- Mission Information
author = "Justyn23 and Superxpdude"; // Author name visible on loading screen. DO NOT EDIT IF USING BUILD SCRIPT
briefingName = "TvT 100 - Eyes on You v8.3"; // Name visible in mission select screen. DO NOT EDIT IF USING BUILD SCRIPT
briefingName = "Test TvT 100 - Eyes on You v8.5"; // Name visible in mission select screen. DO NOT EDIT IF USING BUILD SCRIPT
overviewText = ""; // Description visible in mission select screen
//overviewPicture = ""; // Image visible in mission select screen. Leave commented, still doesn't work properly.
onLoadName = "Eyes on You"; // Name visible on loading screen
......
......@@ -10,7 +10,7 @@ _punishment = "redzone_punishment" call BIS_fnc_getParamValue;
if (playerSide == west) exitWith {};
// Double-check that the player is in the trigger
if !(player in (list _trigger)) exitWith {};
if !((vehicle player) in (list _trigger)) exitWith {};
// If called instead of spawned, throw an error, and spawn the script instead.
if (!canSuspend) then {
......@@ -25,7 +25,7 @@ sleep 2;
_repeatcheck = 6;
while {_repeatcheck > 0} do {
sleep 4;
if !(player in (list _trigger)) exitWith
if !((vehicle player) in (list _trigger)) exitWith
{
hint "You have safely left the Red Zone";
sleep 4;
......@@ -36,7 +36,7 @@ while {_repeatcheck > 0} do {
};
//checks if player is still in red zone
if (player in (list _trigger)) then{
if ((vehicle player) in (list _trigger)) then{
//if punishment is death
// Using disableUserInput is a REALLY bad idea. --Superxpdude
......
......@@ -16,7 +16,7 @@ class EditorData
};
class LayerIndexProvider
{
nextID=589;
nextID=601;
};
class Camera
{
......@@ -16965,7 +16965,7 @@ class Mission
class Attributes
{
text="no zone";
condition="call{this AND (player in thisList)}";
condition="call{this AND ((vehicle player) in thisList)}";
onActivation="call{[player,thisTrigger] spawn J23_fnc_redzone;}";
sizeA=990;
sizeB=490;
......@@ -16985,7 +16985,7 @@ class Mission
class Attributes
{
text="no zone";
condition="call{this AND (player in thisList)}";
condition="call{this AND ((vehicle player) in thisList)}";
onActivation="call{[player,thisTrigger] spawn J23_fnc_redzone;}";
sizeA=990;
sizeB=490;
......@@ -17005,7 +17005,7 @@ class Mission
class Attributes
{
text="no zone";
condition="call{this AND (player in thisList)}";
condition="call{this AND ((vehicle player) in thisList)}";
onActivation="call{[player,thisTrigger] spawn J23_fnc_redzone;}";
sizeA=990;
sizeB=490;
......@@ -17025,7 +17025,7 @@ class Mission
class Attributes
{
text="no zone";
condition="call{this AND (player in thisList)}";
condition="call{this AND ((vehicle player) in thisList)}";
onActivation="call{[player,thisTrigger] spawn J23_fnc_redzone;}";
sizeA=990;
sizeB=490;
......@@ -17045,7 +17045,7 @@ class Mission
class Attributes
{
text="no zone";
condition="call{this AND (player in thisList)}";
condition="call{this AND ((vehicle player) in thisList)}";
onActivation="call{[player,thisTrigger] spawn J23_fnc_redzone;}";
sizeA=990;
sizeB=490;
......@@ -17065,7 +17065,7 @@ class Mission
class Attributes
{
text="no zone";
condition="call{this AND (player in thisList)}";
condition="call{this AND ((vehicle player) in thisList)}";
onActivation="call{[player,thisTrigger] spawn J23_fnc_redzone;}";
sizeA=990;
sizeB=490;
......@@ -17085,7 +17085,7 @@ class Mission
class Attributes
{
text="no zone";
condition="call{this AND (player in thisList)}";
condition="call{this AND ((vehicle player) in thisList)}";
onActivation="call{[player,thisTrigger] spawn J23_fnc_redzone;}";
sizeA=990;
sizeB=490;
......@@ -17105,7 +17105,7 @@ class Mission
class Attributes
{
text="no zone";
condition="call{this AND (player in thisList)}";
condition="call{this AND ((vehicle player) in thisList)}";
onActivation="call{[player,thisTrigger] spawn J23_fnc_redzone;}";
sizeA=990;
sizeB=490;
......
......@@ -19,7 +19,11 @@ private _badGuy = _oldUnit getVariable ["badguy", 0];
if (_badGuy > 0) then {
setPlayerRespawnTime (((_jailTime * 2) min 300) max 180); // Between 3 to 5 minutes depending on jail time
} else {
setPlayerRespawnTime 5;
if (side (group player) == west) then {
setPlayerRespawnTime 180;
} else {
setPlayerRespawnTime 5;
};
};
// Old onPlayerKilled script
......
......@@ -20,5 +20,12 @@ if ((player getVariable ["badguy",0]) == 2) then {
// Let the server know how much we delivered
[_legalPoints,_illegalPoints,_convict] remoteExec ["J23_fnc_itemDeliveredServer", 2];
// Clear any nearby vehicles from the dropoff point
{
if (count (crew _x) <= 0) then {
deleteVehicle _x;
};
} forEach (nearestObjects [player, ["Car_F"],15,true]);
[] call J23_fnc_moveToStart;
[] call J23_fnc_jobselect;
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment