W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 04:02:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Corrected SUV upgrades

Browse Source
This commit is contained in:
[VB]AWOL
2013-12-01 11:31:48 -06:00
parent bcd0c36cca
commit 75bb37ae78
2 changed files with 172 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

250
SQF/dayz_code/Configs/CfgVehicles/LAND/SUV.hpp
View File

@@ -271,6 +271,15 @@ class SUV_TK_CIV_EP1: SUV_Base_EP1
upgradeVehicle[] = {"SUV_TK_CIV_EP1_DZE1",{{"ItemORP",1},{"PartEngine",2}}}; upgradeVehicle[] = {"SUV_TK_CIV_EP1_DZE1",{{"ItemORP",1},{"PartEngine",2}}};
}; };
// Camo
class SUV_Camo: SUV_TK_CIV_EP1
{
displayName = "SUV Camo";
hiddenSelectionsTextures[] = {"\z\addons\dayz_epoch\textures\camo10.paa"};
upgradeVehicle[] = {"SUV_Camo_DZE1",{{"ItemORP",1},{"PartEngine",2}}};
};
// SUV RECOLORS // SUV RECOLORS
class SUV_Blue: SUV_TK_CIV_EP1 class SUV_Blue: SUV_TK_CIV_EP1
{ {
@@ -331,62 +340,79 @@ class SUV_Silver: SUV_TK_CIV_EP1
// Performance 1 // Performance 1
class SUV_TK_CIV_EP1_DZE1: SUV_TK_CIV_EP1 class SUV_TK_CIV_EP1_DZE1: SUV_TK_CIV_EP1
{ {
maxspeed = 150; // max engine limit 125-130 maxSpeed = 250; // max engine limit 125-130
terrainCoef = 2.5; brakeDistance = 14; // 19
terrainCoef = 1.5;
upgradeVehicle[] = {"SUV_TK_CIV_EP1_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}}; upgradeVehicle[] = {"SUV_TK_CIV_EP1_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}};
}; };
class SUV_Camo_DZE1: SUV_Camo
{
maxSpeed = 250; // max engine limit 125-130
brakeDistance = 14; // 19
terrainCoef = 1.5;
upgradeVehicle[] = {"SUV_Camo_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}};
};
class SUV_Blue_DZE1: SUV_Blue class SUV_Blue_DZE1: SUV_Blue
{ {
maxspeed = 150; // car 100 maxSpeed = 250; // suv base 130
terrainCoef = 2.5; terrainCoef = 1.5;
brakeDistance = 14; // 19
upgradeVehicle[] = {"SUV_Blue_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}}; upgradeVehicle[] = {"SUV_Blue_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}};
}; };
class SUV_Green_DZE1: SUV_Green class SUV_Green_DZE1: SUV_Green
{ {
maxspeed = 150; // car 100 maxSpeed = 250; // suv base 130
terrainCoef = 2.5; terrainCoef = 1.5;
brakeDistance = 14; // 19
upgradeVehicle[] = {"SUV_Green_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}}; upgradeVehicle[] = {"SUV_Green_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}};
}; };
class SUV_Yellow_DZE1: SUV_Yellow class SUV_Yellow_DZE1: SUV_Yellow
{ {
maxspeed = 150; // max engine limit 125-130 maxSpeed = 250; // max engine limit 125-130
terrainCoef = 2.5; terrainCoef = 1.5;
brakeDistance = 14; // 19
upgradeVehicle[] = {"SUV_Yellow_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}}; upgradeVehicle[] = {"SUV_Yellow_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}};
}; };
class SUV_Red_DZE1: SUV_Red class SUV_Red_DZE1: SUV_Red
{ {
maxspeed = 150; // car 100 maxSpeed = 250; // suv base 130
terrainCoef = 2.5; terrainCoef = 1.5;
brakeDistance = 14; // 19
upgradeVehicle[] = {"SUV_Red_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}}; upgradeVehicle[] = {"SUV_Red_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}};
}; };
class SUV_White_DZE1: SUV_White class SUV_White_DZE1: SUV_White
{ {
maxspeed = 150; // car 100 maxSpeed = 250; // suv base 130
terrainCoef = 2.5; terrainCoef = 1.5;
brakeDistance = 14; // 19
upgradeVehicle[] = {"SUV_White_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}}; upgradeVehicle[] = {"SUV_White_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}};
}; };
class SUV_Pink_DZE1: SUV_Pink class SUV_Pink_DZE1: SUV_Pink
{ {
maxspeed = 150; // car 100 maxSpeed = 250; // suv base 130
terrainCoef = 2.5; terrainCoef = 1.5;
brakeDistance = 14; // 19
upgradeVehicle[] = {"SUV_Pink_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}}; upgradeVehicle[] = {"SUV_Pink_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}};
}; };
class SUV_Charcoal_DZE1: SUV_Charcoal class SUV_Charcoal_DZE1: SUV_Charcoal
{ {
maxspeed = 150; // max engine limit 125-130 maxSpeed = 250; // max engine limit 125-130
terrainCoef = 2.5; terrainCoef = 1.5;
brakeDistance = 14; // 19
upgradeVehicle[] = {"SUV_Charcoal_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}}; upgradeVehicle[] = {"SUV_Charcoal_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}};
}; };
class SUV_Orange_DZE1: SUV_Orange class SUV_Orange_DZE1: SUV_Orange
{ {
maxspeed = 150; // car 100 maxSpeed = 250; // suv base 130
terrainCoef = 2.5; terrainCoef = 1.5;
brakeDistance = 14; // 19
upgradeVehicle[] = {"SUV_Orange_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}}; upgradeVehicle[] = {"SUV_Orange_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}};
}; };
class SUV_Silver_DZE1: SUV_Silver class SUV_Silver_DZE1: SUV_Silver
{ {
maxspeed = 150; // car 100 maxSpeed = 250; // suv base 130
terrainCoef = 2.5; terrainCoef = 1.5;
brakeDistance = 14; // 19
upgradeVehicle[] = {"SUV_Silver_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}}; upgradeVehicle[] = {"SUV_Silver_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}};
}; };
@@ -447,6 +473,62 @@ class SUV_TK_CIV_EP1_DZE2: SUV_TK_CIV_EP1_DZE1
}; };
}; };
}; };
class SUV_Camo_DZE2: SUV_Camo_DZE1
{
armor = 50; // car 20
upgradeVehicle[] = {"SUV_Camo_DZE3",{{"ItemLRK",1},{"ItemTent",1}}};
class HitPoints: HitPoints
{
class HitLFWheel: HitLFWheel
{
armor = 0.3;
};
class HitLBWheel: HitLBWheel
{
armor = 0.3;
};
class HitRFWheel: HitRFWheel
{
armor = 0.3;
};
class HitRBWheel: HitRBWheel
{
armor = 0.15;
};
class HitFuel
{
armor = 0.28;
material = -1;
name = "palivo";
visual = "";
passThrough = 1;
};
class HitEngine
{
armor = 1;
material = -1;
name = "motor";
visual = "";
passThrough = 1;
};
class HitGlass1: HitGlass1
{
armor = 2;
};
class HitGlass2: HitGlass2
{
armor = 2;
};
class HitGlass3: HitGlass3
{
armor = 2;
};
class HitGlass4: HitGlass4
{
armor = 2;
};
};
};
class SUV_Blue_DZE2: SUV_Blue_DZE1 class SUV_Blue_DZE2: SUV_Blue_DZE1
{ {
armor = 50; // car 20 armor = 50; // car 20
@@ -467,7 +549,7 @@ class SUV_Blue_DZE2: SUV_Blue_DZE1
}; };
class HitRBWheel: HitRBWheel class HitRBWheel: HitRBWheel
{ {
armor = 0.3; armor = 0.15;
}; };
class HitFuel class HitFuel
{ {
@@ -487,19 +569,19 @@ class SUV_Blue_DZE2: SUV_Blue_DZE1
}; };
class HitGlass1: HitGlass1 class HitGlass1: HitGlass1
{ {
armor = 0.1; armor = 2;
}; };
class HitGlass2: HitGlass2 class HitGlass2: HitGlass2
{ {
armor = 0.1; armor = 2;
}; };
class HitGlass3: HitGlass3 class HitGlass3: HitGlass3
{ {
armor = 0.1; armor = 2;
}; };
class HitGlass4: HitGlass4 class HitGlass4: HitGlass4
{ {
armor = 0.1; armor = 2;
}; };
}; };
}; };
@@ -523,7 +605,7 @@ class SUV_Green_DZE2: SUV_Green_DZE1
}; };
class HitRBWheel: HitRBWheel class HitRBWheel: HitRBWheel
{ {
armor = 0.3; armor = 0.15;
}; };
class HitFuel class HitFuel
{ {
@@ -543,19 +625,19 @@ class SUV_Green_DZE2: SUV_Green_DZE1
}; };
class HitGlass1: HitGlass1 class HitGlass1: HitGlass1
{ {
armor = 0.1; armor = 2;
}; };
class HitGlass2: HitGlass2 class HitGlass2: HitGlass2
{ {
armor = 0.1; armor = 2;
}; };
class HitGlass3: HitGlass3 class HitGlass3: HitGlass3
{ {
armor = 0.1; armor = 2;
}; };
class HitGlass4: HitGlass4 class HitGlass4: HitGlass4
{ {
armor = 0.1; armor = 2;
}; };
}; };
}; };
@@ -579,7 +661,7 @@ class SUV_Yellow_DZE2: SUV_Yellow_DZE1
}; };
class HitRBWheel: HitRBWheel class HitRBWheel: HitRBWheel
{ {
armor = 0.3; armor = 0.15;
}; };
class HitFuel class HitFuel
{ {
@@ -599,19 +681,19 @@ class SUV_Yellow_DZE2: SUV_Yellow_DZE1
}; };
class HitGlass1: HitGlass1 class HitGlass1: HitGlass1
{ {
armor = 0.1; armor = 2;
}; };
class HitGlass2: HitGlass2 class HitGlass2: HitGlass2
{ {
armor = 0.1; armor = 2;
}; };
class HitGlass3: HitGlass3 class HitGlass3: HitGlass3
{ {
armor = 0.1; armor = 2;
}; };
class HitGlass4: HitGlass4 class HitGlass4: HitGlass4
{ {
armor = 0.1; armor = 2;
}; };
}; };
}; };
@@ -635,7 +717,7 @@ class SUV_Red_DZE2: SUV_Red_DZE1
}; };
class HitRBWheel: HitRBWheel class HitRBWheel: HitRBWheel
{ {
armor = 0.3; armor = 0.15;
}; };
class HitFuel class HitFuel
{ {
@@ -655,19 +737,19 @@ class SUV_Red_DZE2: SUV_Red_DZE1
}; };
class HitGlass1: HitGlass1 class HitGlass1: HitGlass1
{ {
armor = 0.1; armor = 2;
}; };
class HitGlass2: HitGlass2 class HitGlass2: HitGlass2
{ {
armor = 0.1; armor = 2;
}; };
class HitGlass3: HitGlass3 class HitGlass3: HitGlass3
{ {
armor = 0.1; armor = 2;
}; };
class HitGlass4: HitGlass4 class HitGlass4: HitGlass4
{ {
armor = 0.1; armor = 2;
}; };
}; };
}; };
@@ -691,7 +773,7 @@ class SUV_White_DZE2: SUV_White_DZE1
}; };
class HitRBWheel: HitRBWheel class HitRBWheel: HitRBWheel
{ {
armor = 0.3; armor = 0.15;
}; };
class HitFuel class HitFuel
{ {
@@ -711,19 +793,19 @@ class SUV_White_DZE2: SUV_White_DZE1
}; };
class HitGlass1: HitGlass1 class HitGlass1: HitGlass1
{ {
armor = 0.1; armor = 2;
}; };
class HitGlass2: HitGlass2 class HitGlass2: HitGlass2
{ {
armor = 0.1; armor = 2;
}; };
class HitGlass3: HitGlass3 class HitGlass3: HitGlass3
{ {
armor = 0.1; armor = 2;
}; };
class HitGlass4: HitGlass4 class HitGlass4: HitGlass4
{ {
armor = 0.1; armor = 2;
}; };
}; };
}; };
@@ -747,7 +829,7 @@ class SUV_Pink_DZE2: SUV_Pink_DZE1
}; };
class HitRBWheel: HitRBWheel class HitRBWheel: HitRBWheel
{ {
armor = 0.3; armor = 0.15;
}; };
class HitFuel class HitFuel
{ {
@@ -767,19 +849,19 @@ class SUV_Pink_DZE2: SUV_Pink_DZE1
}; };
class HitGlass1: HitGlass1 class HitGlass1: HitGlass1
{ {
armor = 0.1; armor = 2;
}; };
class HitGlass2: HitGlass2 class HitGlass2: HitGlass2
{ {
armor = 0.1; armor = 2;
}; };
class HitGlass3: HitGlass3 class HitGlass3: HitGlass3
{ {
armor = 0.1; armor = 2;
}; };
class HitGlass4: HitGlass4 class HitGlass4: HitGlass4
{ {
armor = 0.1; armor = 2;
}; };
}; };
}; };
@@ -803,7 +885,7 @@ class SUV_Charcoal_DZE2: SUV_Charcoal_DZE1
}; };
class HitRBWheel: HitRBWheel class HitRBWheel: HitRBWheel
{ {
armor = 0.3; armor = 0.15;
}; };
class HitFuel class HitFuel
{ {
@@ -823,19 +905,19 @@ class SUV_Charcoal_DZE2: SUV_Charcoal_DZE1
}; };
class HitGlass1: HitGlass1 class HitGlass1: HitGlass1
{ {
armor = 0.1; armor = 2;
}; };
class HitGlass2: HitGlass2 class HitGlass2: HitGlass2
{ {
armor = 0.1; armor = 2;
}; };
class HitGlass3: HitGlass3 class HitGlass3: HitGlass3
{ {
armor = 0.1; armor = 2;
}; };
class HitGlass4: HitGlass4 class HitGlass4: HitGlass4
{ {
armor = 0.1; armor = 2;
}; };
}; };
}; };
@@ -859,7 +941,7 @@ class SUV_Orange_DZE2: SUV_Orange_DZE1
}; };
class HitRBWheel: HitRBWheel class HitRBWheel: HitRBWheel
{ {
armor = 0.3; armor = 0.15;
}; };
class HitFuel class HitFuel
{ {
@@ -879,19 +961,19 @@ class SUV_Orange_DZE2: SUV_Orange_DZE1
}; };
class HitGlass1: HitGlass1 class HitGlass1: HitGlass1
{ {
armor = 0.1; armor = 2;
}; };
class HitGlass2: HitGlass2 class HitGlass2: HitGlass2
{ {
armor = 0.1; armor = 2;
}; };
class HitGlass3: HitGlass3 class HitGlass3: HitGlass3
{ {
armor = 0.1; armor = 2;
}; };
class HitGlass4: HitGlass4 class HitGlass4: HitGlass4
{ {
armor = 0.1; armor = 2;
}; };
}; };
}; };
@@ -915,7 +997,7 @@ class SUV_Silver_DZE2: SUV_Silver_DZE1
}; };
class HitRBWheel: HitRBWheel class HitRBWheel: HitRBWheel
{ {
armor = 0.3; armor = 0.15;
}; };
class HitFuel class HitFuel
{ {
@@ -935,19 +1017,19 @@ class SUV_Silver_DZE2: SUV_Silver_DZE1
}; };
class HitGlass1: HitGlass1 class HitGlass1: HitGlass1
{ {
armor = 0.1; armor = 2;
}; };
class HitGlass2: HitGlass2 class HitGlass2: HitGlass2
{ {
armor = 0.1; armor = 2;
}; };
class HitGlass3: HitGlass3 class HitGlass3: HitGlass3
{ {
armor = 0.1; armor = 2;
}; };
class HitGlass4: HitGlass4 class HitGlass4: HitGlass4
{ {
armor = 0.1; armor = 2;
}; };
}; };
}; };
@@ -961,6 +1043,13 @@ class SUV_TK_CIV_EP1_DZE3: SUV_TK_CIV_EP1_DZE2
transportmaxbackpacks = 4; // car 2 transportmaxbackpacks = 4; // car 2
upgradeVehicle[] = {"SUV_TK_CIV_EP1_DZE4",{{"ItemTNK",1},{"PartFueltank",2}}}; upgradeVehicle[] = {"SUV_TK_CIV_EP1_DZE4",{{"ItemTNK",1},{"PartFueltank",2}}};
}; };
class SUV_Camo_DZE3: SUV_Camo_DZE2
{
transportMaxWeapons = 20; // car 10
transportMaxMagazines = 100; // car 50
transportmaxbackpacks = 4; // car 2
upgradeVehicle[] = {"SUV_Camo_DZE4",{{"ItemTNK",1},{"PartFueltank",2}}};
};
class SUV_Blue_DZE3: SUV_Blue_DZE2 class SUV_Blue_DZE3: SUV_Blue_DZE2
{ {
transportMaxWeapons = 20; // car 10 transportMaxWeapons = 20; // car 10
@@ -1029,48 +1118,45 @@ class SUV_Silver_DZE3: SUV_Silver_DZE2
// Fuel 4 // Fuel 4
class SUV_TK_CIV_EP1_DZE4: SUV_TK_CIV_EP1_DZE3 class SUV_TK_CIV_EP1_DZE4: SUV_TK_CIV_EP1_DZE3
{ {
fuelCapacity = 210; // car 100 fuelCapacity = 250; // suv base 130
};
class SUV_Camo_DZE4: SUV_Camo_DZE3
{
fuelCapacity = 250; // suv base 130
}; };
class SUV_Blue_DZE4: SUV_Blue_DZE3 class SUV_Blue_DZE4: SUV_Blue_DZE3
{ {
fuelCapacity = 210; // car 100 fuelCapacity = 250; // suv base 130
}; };
class SUV_Green_DZE4: SUV_Green_DZE3 class SUV_Green_DZE4: SUV_Green_DZE3
{ {
fuelCapacity = 210; // car 100 fuelCapacity = 250; // suv base 130
}; };
class SUV_Yellow_DZE4: SUV_Yellow_DZE3 class SUV_Yellow_DZE4: SUV_Yellow_DZE3
{ {
fuelCapacity = 210; // car 100 fuelCapacity = 250; // suv base 130
}; };
class SUV_Red_DZE4: SUV_Red_DZE3 class SUV_Red_DZE4: SUV_Red_DZE3
{ {
fuelCapacity = 210; // car 100 fuelCapacity = 250; // suv base 130
}; };
class SUV_White_DZE4: SUV_White_DZE3 class SUV_White_DZE4: SUV_White_DZE3
{ {
fuelCapacity = 210; // car 100 fuelCapacity = 250; // suv base 130
}; };
class SUV_Pink_DZE4: SUV_Pink_DZE3 class SUV_Pink_DZE4: SUV_Pink_DZE3
{ {
fuelCapacity = 210; // car 100 fuelCapacity = 250; // suv base 130
}; };
class SUV_Charcoal_DZE4: SUV_Charcoal_DZE3 class SUV_Charcoal_DZE4: SUV_Charcoal_DZE3
{ {
fuelCapacity = 210; // car 100 fuelCapacity = 250; // suv base 130
}; };
class SUV_Orange_DZE4: SUV_Orange_DZE3 class SUV_Orange_DZE4: SUV_Orange_DZE3
{ {
fuelCapacity = 210; // car 100 fuelCapacity = 250; // suv base 130
}; };
class SUV_Silver_DZE4: SUV_Silver_DZE3 class SUV_Silver_DZE4: SUV_Silver_DZE3
{ {
fuelCapacity = 210; // car 100 fuelCapacity = 250; // suv base 130
};
// fully upgraded
class SUV_Camo: SUV_TK_CIV_EP1_DZE4
{
displayName = "SUV Camo";
hiddenSelectionsTextures[] = {"\z\addons\dayz_epoch\textures\camo10.paa"};
}; };

5
SQF/dayz_server/compile/server_onPlayerDisconnect.sqf
View File

@@ -4,13 +4,13 @@ _playerName = _this select 1;
_playerObj = nil; _playerObj = nil;
_playerPos = []; _playerPos = [];
{ {
if ((getPlayerUID _x) == _playerUID) exitWith { _playerObj = _x; _playerPos = getPosATL _playerObj;}; if ((getPlayerUID _x) == _playerUID) exitWith {_playerObj = _x;};
} forEach playableUnits; } forEach playableUnits;
if (isNil "_playerObj") then { if (isNil "_playerObj") then {
diag_log format["nil player object attempting PV, :%1", _this]; diag_log format["nil player object attempting PV, :%1", _this];
// fall back to using PV for now // fall back to using PV for now so we have a better chance at finding the player
_playerObj = call compile format["player%1",_playerUID]; _playerObj = call compile format["player%1",_playerUID];
}; };
@@ -22,6 +22,7 @@ diag_log format["get: %1 (%2), sent: %3 (%4)",typeName (getPlayerUID _playerObj)
if (!isNull _playerObj) then { if (!isNull _playerObj) then {
_playerPos = getPosATL _playerObj;
_characterID = _playerObj getVariable ["CharacterID","0"]; _characterID = _playerObj getVariable ["CharacterID","0"];
_timeout = _playerObj getVariable["combattimeout",0]; _timeout = _playerObj getVariable["combattimeout",0];