Merge pull request #13 from EpochModTeam/master

update fork
This commit is contained in:
W0LF
2021-04-09 10:17:51 +03:00
committed by GitHub
16 changed files with 67 additions and 105 deletions

View File

@@ -61,6 +61,7 @@
[NEW] Added many broken versions of already existing items and tools like Safe, Engine Parts, Wheel, Toolbox and many more. @AirwavesMan [NEW] Added many broken versions of already existing items and tools like Safe, Engine Parts, Wheel, Toolbox and many more. @AirwavesMan
[NEW] Added lots of new items and tools like Handsaw, Hammer, Cement Bag, Carrot, Potato, Mobile Phone and more. @AirwavesMan, @Helion4 [NEW] Added lots of new items and tools like Handsaw, Hammer, Cement Bag, Carrot, Potato, Mobile Phone and more. @AirwavesMan, @Helion4
[NEW] Added snapping support for Storage Sheds, Wood Shacks, Wooden Sheds, Gun Racks and Outhouses. (ca05896f) @AirwavesMan [NEW] Added snapping support for Storage Sheds, Wood Shacks, Wooden Sheds, Gun Racks and Outhouses. (ca05896f) @AirwavesMan
[NEW] Added Submarine (c316d20) @AirwavesMan, @Helion4
[FIXED] Some more occurrences of zero_building interiors misaligned or at the wrong terrain height (eaaedf2, 048caa5) @ebayShopper [FIXED] Some more occurrences of zero_building interiors misaligned or at the wrong terrain height (eaaedf2, 048caa5) @ebayShopper
[FIXED] Player could switch into gunner's seat of ArmoredSUV while the hatch was being closed (e89eebc) #2009 @TheFirstNoob [FIXED] Player could switch into gunner's seat of ArmoredSUV while the hatch was being closed (e89eebc) #2009 @TheFirstNoob
@@ -156,6 +157,7 @@
[UPDATED] Cinder buildings and metal floors have a new texture. @Helion4 [UPDATED] Cinder buildings and metal floors have a new texture. @Helion4
[UPDATED] Highly increased infection chance if the player eats uncooked meat or fish. (29b6a26) @AirwavesMan [UPDATED] Highly increased infection chance if the player eats uncooked meat or fish. (29b6a26) @AirwavesMan
[UPDATED] Crafting wooden buildings now requires a handsaw and a hammer. (247f5dc6) @AirwavesMan [UPDATED] Crafting wooden buildings now requires a handsaw and a hammer. (247f5dc6) @AirwavesMan
[UPDATED] Full Russian Localization @RedLink-kam, @dreamforceinc
[REMOVED] Epoch 1.0.7 does not support Database Traders any longer. All server admins with DB Traders have to switch to the config traders now. (49378f62) @AirwavesMan [REMOVED] Epoch 1.0.7 does not support Database Traders any longer. All server admins with DB Traders have to switch to the config traders now. (49378f62) @AirwavesMan
[REMOVED] NORRN_loadVcl, posForceUpdate, and medForceUpdate removed from setvariable.txt (47f07a8) @worldwidesorrow [REMOVED] NORRN_loadVcl, posForceUpdate, and medForceUpdate removed from setvariable.txt (47f07a8) @worldwidesorrow

View File

@@ -212,7 +212,7 @@ AmmoEU[] =
//Sniper rifle //Sniper rifle
{Loot_MAGAZINE, 3, 5Rnd_86x70_L115A1}, {Loot_MAGAZINE, 3, 5Rnd_86x70_L115A1},
{Loot_MAGAZINE, 1, 5Rnd_127x99_as50_CP}, {Loot_MAGAZINE, 1, 5Rnd_127x99_as50},
{Loot_MAGAZINE, 1, 20Rnd_762x51_RSASS}, {Loot_MAGAZINE, 1, 20Rnd_762x51_RSASS},
{Loot_MAGAZINE, 1, 10Rnd_86x70_MRAD}, {Loot_MAGAZINE, 1, 10Rnd_86x70_MRAD},

View File

@@ -130,7 +130,7 @@ CrashSiteEUPile[] =
{Loot_GROUP, 5, ToolsMilitary}, {Loot_GROUP, 5, ToolsMilitary},
{Loot_MAGAZINE, 10, FoodMRE}, {Loot_MAGAZINE, 10, FoodMRE},
{Loot_GROUP, 15, AmmoEU}, {Loot_GROUP, 15, AmmoEU},
{Loot_MAGAZINE, 3, 5Rnd_127x99_as50_CP}, {Loot_MAGAZINE, 3, 5Rnd_127x99_as50},
{Loot_MAGAZINE, 3, 6Rnd_762x51_WA2000}, {Loot_MAGAZINE, 3, 6Rnd_762x51_WA2000},
{Loot_GROUP, 10, MedicalLow} {Loot_GROUP, 10, MedicalLow}
}; };

View File

@@ -14,7 +14,6 @@ class Submarine_DZE_base: Submarine
Icon = "\Ca\water\Data\map_ico\icomap_rubber_CA.paa"; Icon = "\Ca\water\Data\map_ico\icomap_rubber_CA.paa";
mapSize = 6; mapSize = 6;
vehicleClass = "DayZ Epoch Vehicles"; vehicleClass = "DayZ Epoch Vehicles";
//vehicle characteristics
maxSpeed = 60; maxSpeed = 60;
brakeDistance = 20; brakeDistance = 20;
armor = 40; armor = 40;
@@ -41,8 +40,6 @@ class Submarine_DZE_base: Submarine
rightEngineEffect = "subspray"; rightEngineEffect = "subspray";
destrType = DestructWreck; destrType = DestructWreck;
class DestructionEffects; class DestructionEffects;
//driverForceOptics = 1;
//driverOpticsModel = "\ca\Tracked\optika_M1A1_commander";
//based on fishing boat //based on fishing boat
transportMaxMagazines = 500; transportMaxMagazines = 500;
@@ -56,7 +53,6 @@ class Submarine_DZE_base: Submarine
typicalCargo[] = {RU_Soldier,RU_Soldier_AR,RU_Soldier_AR}; typicalCargo[] = {RU_Soldier,RU_Soldier_AR,RU_Soldier_AR};
driverAction = PBX_Driver; driverAction = PBX_Driver;
cargoAction[] = {Truck_Cargo04,Truck_Cargo01,Truck_Cargo01}; cargoAction[] = {Truck_Cargo04,Truck_Cargo01,Truck_Cargo01};
// FB_Cargo01,FB_Cargo02,FB_Cargo03,FB_Cargo03,FB_Cargo03,FB_Cargo03,FB_Cargo04
cargoGetInAction[] = {"GetInLow"}; cargoGetInAction[] = {"GetInLow"};
cargoGetOutAction[] = {"GetOutLow"}; cargoGetOutAction[] = {"GetOutLow"};
extCameraPosition[] = {0,4.0,-14.0}; extCameraPosition[] = {0,4.0,-14.0};
@@ -105,46 +101,35 @@ class Submarine_DZE_base: Submarine
condition = "(player == (driver this)) && {(this animationphase ""dive"" > 0.5)}"; condition = "(player == (driver this)) && {(this animationphase ""dive"" > 0.5)}";
statement = "this animate [""dive"", 0];"; statement = "this animate [""dive"", 0];";
}; };
/*
class periscope_up
{
displayName = "Periscope Up";
displayNameDefault = "";
onlyforplayer = true;
position = "zamerny";
radius = 3;
priority = 99;
condition = "(player == driver this) && (this animationphase ""peri_trans"" < 0.5)";
statement = "this animate [""peri_trans"", 1]";
};
class periscope_down : periscope_up
{
displayName = "Periscope Down";
condition = "(player == driver this) && (this animationphase ""peri_trans"" > 0.5)";
statement = "this animate [""peri_trans"", 0];";
};
*/
}; };
//damage //damage
class HitPoints: HitPoints class HitPoints: HitPoints
{ {
class HitHull class HitBody
{ {
armor = 0.85; armor = 0.85;
material = -1; material = -1;
name = "karoserie"; name = "karoserie";
visual = "zbytek"; visual = "zbytek";
passThrough = 1; passThrough = 1;
}; };
class HitEngine class HitEngine
{ {
armor = 1.2; armor = 1.2;
material = 60; material = 60;
name = "motor"; name = "motor";
visual = "zbytek"; visual = "zbytek";
passThrough = 1; passThrough = 1;
}; };
}; class HitFuel
{
armor=0.3;
material = -1;
name="palivo";
visual=""; // no visible fuel tank destruction effects
passThrough =0.5;
};
};
class Damage class Damage
{ {
tex[] = {}; tex[] = {};
@@ -242,34 +227,6 @@ class Submarine_DZE_base: Submarine
brightness = 5.0; brightness = 5.0;
}; };
}; };
//blinkers
class MarkerLights
{
class RedStill
{
name = "red_light";
color[] = {1.0, 0.1, 0.1, 1};
ambient[] = {0.1, 0.01, 0.01, 1};
brightness = 0.01;
blinking = false;
};
class GreenStill
{
name = "green_light";
color[] = {0.1, 1.0, 0.1, 1};
ambient[] = {0.01, 0.1, 0.01, 1};
brightness = 0.01;
blinking = false;
};
class WhiteStill
{
name = "white_light";
color[] = {1.0, 1.0, 1.0, 1};
ambient[] = {0.1, 0.1, 0.1, 1};
brightness = 0.01;
blinking = false;
};
};
}; };
class Submarine_DZE: Submarine_DZE_base class Submarine_DZE: Submarine_DZE_base

View File

@@ -3,6 +3,9 @@ class BAF_AS50_scoped_DZ : BAF_AS50_scoped {
displayname = "AS50"; displayname = "AS50";
type = 1; type = 1;
canlock = 0; canlock = 0;
//cursor = "RifleCursor"; magazines[] = {
//cursoraim = "Foresight"; "5Rnd_127x99_as50",
}; "10Rnd_127x99_m107",
"5Rnd_127x99_as50_CP"
};
};

View File

@@ -20,7 +20,7 @@ _unit = _this select 0;
_selection = _this select 1; _selection = _this select 1;
_total = _this select 2; _total = _this select 2;
_totalDmg = if (_selection != "") then {false} else {true}; _totalDmg = if (_selection != "") then {false} else {true};
_force = [false,true] select (count _this > 6); // Needed to force update salavage _force = [false,true] select (count _this > 6); // Needed to force update salvage
if (_total >= 0.98) then { if (_total >= 0.98) then {
_total = 1.0; _total = 1.0;

View File

@@ -46,8 +46,7 @@ if (!isDedicated) then {
dayz_paraSpawn = false; // Helo jump spawn dayz_paraSpawn = false; // Helo jump spawn
DZE_SelfTransfuse = false; // Allow players to give themselves blood transfusions DZE_SelfTransfuse = false; // Allow players to give themselves blood transfusions
DZE_selfTransfuse_Values = [12000,15,120]; // [blood amount, infection chance, cool-down (seconds)] DZE_selfTransfuse_Values = [12000,15,120]; // [blood amount, infection chance, cool-down (seconds)]
dayz_DamageMultiplier = 1; // Increases the damage to the player by zombie attacks dayz_DamageMultiplier = 1; // Increases the damage to the player by zombie attacks
dayz_infectiouswaterholes = true; //Enable infected waterholes
dayz_randomMaxFuelAmount = 500; //Puts a random amount of fuel in all fuel stations. dayz_randomMaxFuelAmount = 500; //Puts a random amount of fuel in all fuel stations.
DZE_BackpackAntiTheft = false; // Prevents accessing backpack gear of non-friendly players in trader cities DZE_BackpackAntiTheft = false; // Prevents accessing backpack gear of non-friendly players in trader cities
DZE_StaticConstructionCount = 0; // Number of animations required for building an object. Leaving set at zero will default to the construction count in the configs for each object. DZE_StaticConstructionCount = 0; // Number of animations required for building an object. Leaving set at zero will default to the construction count in the configs for each object.
@@ -164,6 +163,7 @@ if (!isDedicated) then {
}; };
// Both // Both
dayz_infectiouswaterholes = true; //Enable infected waterholes
dayz_townGenerator = false; // Spawn vanilla map junk instead of Epoch DynamicDebris. Currently only compatible with Chernarus. Also enables comfrey plant spawner which negatively impacts performance. dayz_townGenerator = false; // Spawn vanilla map junk instead of Epoch DynamicDebris. Currently only compatible with Chernarus. Also enables comfrey plant spawner which negatively impacts performance.
dayz_townGeneratorBlackList = []; // If townGenerator is enabled it will not spawn junk within 150m of these positions. Example for Chernarus traders: [[4053,11668,0],[11463,11349,0],[6344,7806,0],[1606,7803,0],[12944,12766,0],[5075,9733,0],[12060,12638,0]] dayz_townGeneratorBlackList = []; // If townGenerator is enabled it will not spawn junk within 150m of these positions. Example for Chernarus traders: [[4053,11668,0],[11463,11349,0],[6344,7806,0],[1606,7803,0],[12944,12766,0],[5075,9733,0],[12060,12638,0]]
DZE_HeliLift = true; // Enable Epoch heli lift system DZE_HeliLift = true; // Enable Epoch heli lift system

View File

@@ -50,6 +50,10 @@ class Sa61_EP1
{ {
weight = 1.3; weight = 1.3;
}; };
class Sa61_DZ
{
weight = 1.3;
};
class Mac10_DZ class Mac10_DZ
{ {
weight = 1.0; weight = 1.0;

View File

@@ -24375,9 +24375,9 @@
<Czech>Rozebrat na šrot</Czech> <Czech>Rozebrat na šrot</Czech>
</Key> </Key>
<Key ID="STR_EPOCH_PLAYER_213"> <Key ID="STR_EPOCH_PLAYER_213">
<English>Craft Pole</English> <English>Craft Metal Pole</English>
<German>Metallstange herstellen</German> <German>Metallstange herstellen</German>
<Russian>Создать: Столб</Russian> <Russian>Создать: Металлическая труба</Russian>
<Dutch>Creëer paal</Dutch> <Dutch>Creëer paal</Dutch>
<Czech>Vytvořit tyč</Czech> <Czech>Vytvořit tyč</Czech>
</Key> </Key>

View File

@@ -54,10 +54,6 @@
["MAP_sign_service",[8258.08,15511.7,-0.250015],50.4975], ["MAP_sign_service",[8258.08,15511.7,-0.250015],50.4975],
["MAP_Bilboard_alkohol",[8261.41,15480.5,-1.10212],140.49], ["MAP_Bilboard_alkohol",[8261.41,15480.5,-1.10212],140.49],
["MAP_EmbeddedTire",[8256.86,15465.3,0.229279],326.005], ["MAP_EmbeddedTire",[8256.86,15465.3,0.229279],326.005],
["ASC_EU_BulbI",[8247.78,15477,11.1069],113.044],
["ASC_EU_BulbI",[8266.88,15492,11.0731],110.615],
["ASC_EU_BulbI",[8252.2,15508.1,11.1055],110.501],
["ASC_EU_BulbI",[8233.15,15494.2,11.0997],119.923],
["MAP_PowerGenerator",[8249.51,15514,0.220642],321.369], ["MAP_PowerGenerator",[8249.51,15514,0.220642],321.369],
["MAP_stanek_3B",[8261.95,15499.7,0.263503],321.633], ["MAP_stanek_3B",[8261.95,15499.7,0.263503],321.633],
["Land_Toilet",[8272.39,15488.1,-0.00942516],324.934], ["Land_Toilet",[8272.39,15488.1,-0.00942516],324.934],

View File

@@ -66,7 +66,7 @@ diag_log ("PUBLISH: Attempt " + str(_object));
_dir = _worldspace select 0; _dir = _worldspace select 0;
_uid = _worldspace call dayz_objectUID2; _uid = _worldspace call dayz_objectUID2;
_key = format["CHILD:308:%1:%2:%3:%4:%5:%6:%7:%8:%9:",dayZ_instance, _class, 0 , _characterID, _worldspace, _inv, _newHitpoints, _damage,_uid]; _key = format["CHILD:308:%1:%2:%3:%4:%5:%6:%7:%8:%9:",dayZ_instance, _class, _damage , _characterID, _worldspace, _inv, _newHitpoints, _fuel,_uid];
#ifdef OBJECT_DEBUG #ifdef OBJECT_DEBUG
diag_log ("HIVE: WRITE: "+ str(_key)); diag_log ("HIVE: WRITE: "+ str(_key));
#endif #endif
@@ -120,6 +120,7 @@ if (_outcome != "PASS") then {
_object setDir _dir; _object setDir _dir;
_object setPosATL _location; _object setPosATL _location;
_object setVectorUp surfaceNormal _location; _object setVectorUp surfaceNormal _location;
_object setDamage _damage;
[_weapons,_magazines,_backpacks,_object] call fn_addCargo; [_weapons,_magazines,_backpacks,_object] call fn_addCargo;
@@ -130,7 +131,7 @@ if (_outcome != "PASS") then {
_object setHit [_selection,_dam]; _object setHit [_selection,_dam];
} count _newHitpoints; } count _newHitpoints;
_object setFuel _fuel; _object setFuel _fuel;
[_object,"all",true] call server_updateObject; [_object,"all",true] call server_updateObject;

View File

@@ -44,8 +44,6 @@ if (_isNotOk) exitWith {
//deleteVehicle _object; //deleteVehicle _object;
}; };
_object setVariable ["lastUpdate",diag_ticktime,true];
call { call {
if (_type == "all") exitwith { if (_type == "all") exitwith {
[_object,_objectID,_class] call server_obj_pos; [_object,_objectID,_class] call server_obj_pos;
@@ -75,4 +73,4 @@ call {
[_object,_objectID,_objectUID,_class] call server_obj_inv; [_object,_objectID,_objectUID,_class] call server_obj_inv;
}; };
""; "";
}; };

View File

@@ -89,7 +89,7 @@ server_obj_dam = {
}; };
} count _hitpoints; } count _hitpoints;
if (_allFixed && !_totalDmg) then {_object setDamage 0;}; if (_allFixed && !_totalDmg && _forced) then {_object setDamage 0;};
if (_forced) then { if (_forced) then {
if (_object in needUpdate_objects) then {needUpdate_objects = needUpdate_objects - [_object];}; if (_object in needUpdate_objects) then {needUpdate_objects = needUpdate_objects - [_object];};
@@ -101,6 +101,7 @@ server_obj_dam = {
//diag_log format["DEBUG: Monitoring: %1",_object]; //diag_log format["DEBUG: Monitoring: %1",_object];
needUpdate_objects set [count needUpdate_objects, _object]; needUpdate_objects set [count needUpdate_objects, _object];
_recorddmg = true; _recorddmg = true;
_object setVariable ["lastUpdate",diag_ticktime];
}; };
}; };
}; };

View File

@@ -16,7 +16,7 @@ timeStampFormat = "short";
vonCodecQuality = 11; vonCodecQuality = 11;
disableVoN = 0; disableVoN = 0;
kickduplicate = 1; kickduplicate = 1;
verifySignatures = 1; verifySignatures = 2;
persistent = 1; persistent = 1;
BattlEye = 1; BattlEye = 1;
doubleIdDetected = ""; doubleIdDetected = "";

View File

@@ -1,14 +1,14 @@
//new //new
5 !(^DZ_|^z_|^pz_|^WeaponHolder|Box|dog|PZombie_VB|^Smoke|^Chem|^._40mm|_DZ$|^Trap) !=(SeaGull|SmallSecondary|HelicopterExplo(Small|Big)|DesertTentStorage|Stash(Small|Medium)(|[1-4])|(|Dome)TentStorage(|[0-4])) !=(CZ_VestPouch_EP1|R_M136_AT|R_MEEWS_HEAT|Wire_cat1) !=(JackDaniels|(Tin|Soda)Can|RoadFlare|WoodenArrowF|zZombie_Base|Parachute(West|C)|Grenade(_|HandTimed)(West|East)) !=(CMflareAmmo|Pipebomb) !=(WildBoar|Rabbit|Sheep|Sheep(01_EP1|02_EP1)|Goat|Goat(01_EP1|02_EP1)|Hen|Cow0[1234]|Cow01_EP1|Cock) !=Blood_Trail_DZ !^(Wooden|Metal)Fence !^WoodenGate_ !=(ShantyHouse(|Stage[2-7])|SurvivorWorkshop(|Stage2|[ABC]Stage[345])|WorkBench) !=explosive_bolt !"Land_" !=Sign_(arrow_down_large|sphere10cm)_EP1 !="MAP_c_fern" !="Grave" !"VaultStorage" !="LaserTargetW" !Fort_ !Nest !CMflare !="GyroGrenade" !="CraterLong" !="pook_camel_HE" !="Fin" !="Pastor" !_DZE[12]$ !"TallSafe" 5 !(^DZ_|^z_|^pz_|^WeaponHolder|Box|dog|PZombie_VB|^Smoke|^Chem|^._40mm|_DZ$|^Trap) !=(SeaGull|SmallSecondary|HelicopterExplo(Small|Big)|Stash(Small|Medium)(|[1-4])) !=(CZ_VestPouch_EP1|R_M136_AT|R_MEEWS_HEAT|Wire_cat1) !TentStorage !=(JackDaniels|(Tin|Soda)Can|RoadFlare|WoodenArrowF|zZombie_Base|Parachute(West|C)|Grenade(_|HandTimed)(West|East)) !=(CMflareAmmo|Pipebomb) !=(WildBoar|Rabbit|Sheep|Sheep(01_EP1|02_EP1)|Goat|Goat(01_EP1|02_EP1)|Hen|Cow0[1234]|Cow01_EP1|Cock) !=Blood_Trail_DZ !^(Wooden|Metal)Fence !^WoodenGate_ !=(ShantyHouse(|Stage[2-7])|SurvivorWorkshop(|Stage2|[ABC]Stage[345])|WorkBench) !=explosive_bolt !"Land_" !=Sign_(arrow_down_large|sphere10cm)_EP1 !="MAP_c_fern" !="Grave" !"VaultStorage" !="LaserTargetW" !Fort_ !Nest !CMflare !="GyroGrenade" !="CraterLong" !="pook_camel_HE" !="Fin" !="Pastor" !_DZE[12]$ !"TallSafe"
5 SeaGull //set to its own line so we know which kick we have here with out looking in the logs 5 SeaGull //set to its own line so we know which kick we have here with out looking in the logs
1 ^DZ_ !=DZ_(British_ACU|Czech_Vest_Pouch|(TK_Assault_Pack|Patrol_Pack|Assault_Pack|ALICE_Pack|CivilBackpack|Backpack)_EP1) !=DZ_((AmmoBox|ExplosiveBox)(RU|US)|MedBox|CardboardBox) 1 ^DZ_ !=DZ_(British_ACU|Czech_Vest_Pouch|(TK_Assault_Pack|Patrol_Pack|Assault_Pack|ALICE_Pack|CivilBackpack|Backpack|LargeGunBag|GunBag)_EP1) !=DZ_((AmmoBox|ExplosiveBox)(RU|US)|MedBox|CardboardBox)
1 ^z_ !=z_((|new_)villager[1234]|(|new_)worker[1234]|teacher|hunter|suit[1-6]|soldier(|_pilot|_heavy)|policeman(|2)|doctor|priest) !=z_(citizen[1-4]|profiteer[1-4]|rocker[1-4]|lumberjack[1-4]|hunter[2345]|assistant|pilot|takistani[1-6]) !z_soldier_(usmc|fr|cdf|ru|gue|ins|tk|cz|un|ger|baf|pmc|acr) !=z_(dealer|gardener|mafiaboss|postman[1-4]|prisoner[1-3]|firefighter[1-5]|civilian([1-9]|1[0-5])) 1 ^z_ !=z_((|new_)villager[1234]|(|new_)worker[1234]|teacher|hunter|suit[1-6]|soldier(|_pilot|_heavy)|policeman(|2)|doctor|priest) !=z_(citizen[1-4]|profiteer[1-4]|rocker[1-4]|lumberjack[1-4]|hunter[2345]|assistant|pilot|takistani[1-6]) !z_soldier_(usmc|fr|cdf|ru|gue|ins|tk|cz|un|ger|baf|pmc|acr) !=z_(dealer|gardener|mafiaboss|postman[1-4]|prisoner[1-3]|firefighter[1-5]|civilian([1-9]|1[0-5]))
1 ^WeaponHolder !=WeaponHolder !WeaponHolder_part !=WeaponHolder_(Item(DomeTent|CamoNet|Crowbar|Fuelcan|Hatchet|Jerrycan|Tent)|Melee(BaseBallBat(|Nails)|BatBarbed|Machete)) !=WeaponHolder_Part(Engine|Fueltank|Generic|Glass|VRotor|Wheel) !=WeaponHolder_Item(WorkBench|MetalSheet|ConcreteBlock|RSJ|Pickaxe|Generator) 1 ^WeaponHolder !=WeaponHolder !WeaponHolder_part !=WeaponHolder_(Item(DomeTent|CamoNet|Crowbar|Fuelcan|Hatchet|Jerrycan|Tent)|Melee(BaseBallBat(|Nails)|BatBarbed|Machete)) !=WeaponHolder_Part(Engine|Fueltank|Generic|Glass|VRotor|Wheel) !=WeaponHolder_Item(WorkBench|MetalSheet|ConcreteBlock|RSJ|Pickaxe|Generator)
1 Box !=(DZ_((AmmoBox|ExplosiveBox)(RU|US)|MedBox|CardboardBox)|Item(Match|Tool)box|equip_pvc_box|DebugBoxPlayer_DZ|WeaponHolder_ItemLockbox) !=LockboxStorage(Locked|WinterLocked|2Locked|Winter2Locked) 1 Box !=(DZ_((AmmoBox|ExplosiveBox)(RU|US)|MedBox|CardboardBox)|Item(Match|Tool)box|equip_pvc_box|DebugBoxPlayer_DZ|WeaponHolder_ItemLockbox) !=LockboxStorage(Locked|WinterLocked|2Locked|Winter2Locked)
1 ^Smoke !=SmokeShell(|Red|Green|Yellow) 1 ^Smoke !=SmokeShell(|Red|Green|Yellow) !=SmokeLauncherAmmo
1 ^Chem !=Chem(Green|Red|Blue) 1 ^Chem !=Chem(Green|Red|Blue)
1 ^._40mm !=(G_40mm_HE|G_40mm_Smoke|F_40mm_White|F_40mm_Green) 1 ^._40mm !=(G_40mm_HE|G_40mm_Smoke|F_40mm_White|F_40mm_Green)
1 _DZ$ !=(BanditW?[12]|Camo1|Sniper1W?|Soldier1|SurvivorW?([123]|desert|pink|combat|urban|winter)|Blood_Trail)_DZ !=(Land_Fire|Sandbag1|Hedgehog|BearTrap|CamoNet|GrenadeHandTimedWest|flamable)_DZ !=(Priest|Doctor|Assistant|Worker[134]|Soldier_(Crew|TL|Sniper|Bodyguard_AA12)_PMC)_DZ !=((Functionary1|Haris_Press|Pilot|US_Soldier)_EP1|Reporter|MafiaBoss|Dealer)_DZ !=pz_(policeman|suit[12]|worker[123]|doctor|teacher|hunter|villager[123]|priest)_DZ !=(GUE_Soldier_(MG|Sniper|Crew|CO|2)|Apo_Rifleman_0[1-6])_DZ !=(UN_CDF_Soldier(_Guard)?_EP1|BAF_Soldier_(Officer|N)_MTP|Nac_Soldier|Tamika)_DZ !=GhillieFull_(Desert0[1-8]|Snow0[1-5]|Urban01|Wood(0[1-9]|1[1-6]))_DZ !=SG_GRU_(TL|Scout|Sniper|Spotter|Assaultman|Medic|Marksman|Operator|MG)(|_W|_D)_DZ !=(Firefighter([1-5]|_Officer[12])|Postman[1-4]|SchoolTeacher|Civilian([1-9]|1[0-4]))_DZ !=((Drake|Graves)_Light|GUE_Commander|Hunter|Gardener|RUS_(Soldier1|Commander))_DZ !=(RU_(Soldier(|_Officer|_Crew)|Policeman2?)|Ins_(Soldier_(2|GL|Crew)|Commander))_DZ !=(MVD_Soldier|CDF_Soldier|Prisoner[123]|Rocker[1-4]|BusinessMan|Rocket)_DZ !=(INS_(Lopotev|Soldier_(AR|CO)|Bardak|Worker2)|USMC_Soldier_(Officer|MG|Pilot))_DZ !=FR_(TL|R|Marksman|Assault_R|OHara|Rodriguez|Sapper)_DZ !=TK_(Special_Forces_MG|Soldier_Sniper|Commander|GUE_Soldier|CIV_Takistani0[1346]|INS_(Soldier(_AR)?|Warlord))_EP1_DZ !=gsc_(military_helmet_|military_head_)(|wdl|grey)_DZ !=gsc_(scientist[12](_head)?|cloth_loner_head)_DZ !=gsc_eco_stalker_(mask|head)_(camo|neutral|head|fred|duty)_DZ !=CZ_(Soldier_(805|Crew|Officer|Recon|Spec([123]|_Demo)|Sniper|Light)(|_Wdl|_Dst)|Soldier805_DES)_ACR_DZ !=CZ_(Special_Forces_GL_DES|Soldier_Sniper|Soldier_SL_DES)_EP1_DZ !=GER_Soldier(_TL)?_EP1(|_des|_wdl)_DZ !=(Plastic_Pole_EP1|Generator|Server_Rack|FuelPump|FireBarrel|GunRack|GunRack2|WoodCrate|WoodCrate2|WorkBench|GlassFloor)_DZ !_Preview_DZ !=CamoWinter(1|2|1W|2W)_DZ !=HookerW(1-5)_DZ !=TK_INS_Soldier_EP(1-3)_DZ !=CinderWall(Doorway|Door|DoorLocked|Window)_DZ !=Wood(Floor4x|SmallWall|SmallWallDoor|Floor|SmallWallThird|FloorQuarter|FloorHalf|Handrail)_DZ !=(DesertLarge|Desert|Winter|WinterLarge|Forest|ForestLarge)CamoNet_DZ 1 _DZ$ !=(BanditW?[12]|Camo1|Sniper1W?|Soldier1|SurvivorW?([123]|desert|pink|combat|urban|winter)|Blood_Trail)_DZ !=(Land_Fire|Sandbag1|Hedgehog|BearTrap|CamoNet|GrenadeHandTimedWest|flamable)_DZ !=(Priest|Doctor|Assistant|Worker[134]|Soldier_(Crew|TL|Sniper|Bodyguard_AA12)_PMC)_DZ !=((Functionary1|Haris_Press|Pilot|US_Soldier)_EP1|Reporter|MafiaBoss|Dealer)_DZ !=pz_(policeman|suit[12]|worker[123]|doctor|teacher|hunter|villager[123]|priest)_DZ !=(GUE_Soldier_(MG|Sniper|Crew|CO|2)|Apo_Rifleman_0[1-6])_DZ !=(UN_CDF_Soldier(_Guard)?_EP1|BAF_Soldier_(Officer|N)_MTP|Nac_Soldier|Tamika)_DZ !=GhillieFull_(Desert0[1-8]|Snow0[1-5]|Urban01|Wood(0[1-9]|1[1-6]))_DZ !=SG_GRU_(TL|Scout|Sniper|Spotter|Assaultman|Medic|Marksman|Operator|MG)(|_W|_D)_DZ !=(Firefighter([1-5]|_Officer[12])|Postman[1-4]|SchoolTeacher|Civilian([1-9]|1[0-4]))_DZ !=((Drake|Graves)_Light|GUE_Commander|Hunter|Gardener|RUS_(Soldier1|Commander))_DZ !=(RU_(Soldier(|_Officer|_Crew)|Policeman2?)|Ins_(Soldier_(2|GL|Crew)|Commander))_DZ !=(MVD_Soldier|CDF_Soldier|Prisoner[123]|Rocker[1-4]|BusinessMan|Rocket)_DZ !=(INS_(Lopotev|Soldier_(AR|CO)|Bardak|Worker2)|USMC_Soldier_(Officer|MG|Pilot))_DZ !=FR_(TL|R|Marksman|Assault_R|OHara|Rodriguez|Sapper)_DZ !=TK_(Special_Forces_MG|Soldier_Sniper|Commander|GUE_Soldier|CIV_Takistani0[1346]|INS_(Soldier(_AR)?|Warlord))_EP1_DZ !=gsc_(military_helmet_|military_head_)(|wdl|grey)_DZ !=gsc_(scientist[12](_head)?|cloth_loner_head)_DZ !=gsc_eco_stalker_(mask|head)_(camo|neutral|head|fred|duty)_DZ !=CZ_(Soldier_(805|Crew|Officer|Recon|Spec([123]|_Demo)|Sniper|Light)(|_Wdl|_Dst)|Soldier805_DES)_ACR_DZ !=CZ_(Special_Forces_GL_DES|Soldier_Sniper|Soldier_SL_DES)_EP1_DZ !=GER_Soldier(_TL)?_EP1(|_des|_wdl)_DZ !=(Plastic_Pole_EP1|Generator|Server_Rack|FuelPump|FireBarrel|GunRack|GunRack2|WoodCrate|WoodCrate2|WorkBench)_DZ !_Preview_DZ !=CamoWinter(1|2|1W|2W)_DZ !=HookerW(1-5)_DZ !=TK_INS_Soldier_EP(1-3)_DZ !=CinderGarageOpenTop(|Frame|Locked)_DZ !=CinderWall(Doorway|Door|DoorLocked|Window|Half)_DZ !=Wood(Ramp|Floor(|Stairs|Half|Quarter|4x)|TriangleFloor|Large(Wall(|Door|Win))|Small(Wall(|Third|Win|Door))|TriangleWall|GateFrame|Stairs(|Rails|Sans)|Ladder|Handrail|Pillar)_DZ !=MetalFloor(|_Half|_Quarter|4x)_DZ !=GlassFloor(|_Half|_Quarter)_DZ !=(DesertLarge|Desert|Winter|WinterLarge|Forest|ForestLarge)CamoNet_DZ !WoodenFence_ !MetalFence_
1 ^Trap Trap(_Cans|Tripwire(Flare|Grenade|Smoke)|BearTrap(Smoke|Flare)) 1 ^Trap Trap(_Cans|Tripwire(Flare|Grenade|Smoke)|BearTrap(Smoke|Flare))
1=(SmallSecondary|HelicopterExplo(Small|Big)) // log explosions (optional) 1=(SmallSecondary|HelicopterExplo(Small|Big)) // log explosions (optional)
1=(PipeBomb|Grenade(_|HandTimed)(West|East)) // log grenades (optional) 1=(PipeBomb|Grenade(_|HandTimed)(West|East)) // log grenades (optional)

File diff suppressed because one or more lines are too long