W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-17 09:10:27 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

1.0.1.1 part 4

Browse Source
This commit is contained in:
vbawol
2013-05-29 16:45:15 -05:00
parent dbe8fb206a
commit f6d2b2a2c0
4 changed files with 412 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

171
dayz_code/cfgLoot.hpp
View File

@@ -9,12 +9,12 @@ class CfgLoot {
"ItemLightBulb"
},
{
1,
0.1,
0.5,
0.4,
0.2,
0.05
0.05,
0.25,
0.09,
0.1,
0.01
}
};
civilian[] = {
@@ -35,13 +35,13 @@ class CfgLoot {
"ItemBandage",
"ItemPainkiller",
"FoodBioMeat",
"8Rnd_9x18_Makarov"
"8Rnd_9x18_MakarovSD"
},
{
0.07,
0.09,
0.09,
0.09,
0.12,
0.1,
0.09,
0.05,
0.05,
@@ -70,23 +70,23 @@ class CfgLoot {
"FoodCanFrankBeans",
"FoodCanPasta",
"FoodCanUnlabeled",
//Bags
// food Bags
"FoodPistachio",
"FoodNutmix"
},
{
//trash
0.13,
0.13,
0.13,
0.09,
0.13,
0.12,
0.12,
0.09,
0.09,
0.09,
0.09,
0.06,
//Bags
0.11,
0.07,
0.07,
0.07,
0.07,
0.1,
// food Bags
0.05,
0.04
}
@@ -161,12 +161,12 @@ class CfgLoot {
"ItemHeatPack"
},
{
0.8,
0.5,
0.5,
0.4,
0.15,
0.2,
0.3,
0.1
0.1,
0.1,
0.05
}
};
hospital[] = {
@@ -180,7 +180,7 @@ class CfgLoot {
},
{
0.33,
0.17,
0.16,
0.13,
0.09,
0.17,
@@ -231,8 +231,8 @@ class CfgLoot {
"30Rnd_9x19_UZI_SD"
},
{
0.18,
0.09,
0.04,
0.01,
0.01,
0.04,
@@ -280,15 +280,17 @@ class CfgLoot {
"6Rnd_45ACP",
"15Rnd_W1866_Slug",
"8Rnd_B_Beneli_74Slug",
"HandRoadFlare"
"HandRoadFlare",
"8Rnd_9x18_MakarovSD"
},
{
1,
0.8,
0.3,
0.3,
0.5,
0.3
0.2,
0.1,
0.14,
0.15,
0.1,
0.01
}
};
hunter[] = {
@@ -304,16 +306,15 @@ class CfgLoot {
"FoodNutmix"
},
{
1,
0.5,
0.4,
0.17,
0.03,
0.1,
0.05,
0.2,
0.5,
0.2,
1,
0.2,
0.04,
0.1
0.02,
0.01,
0.02
}
};
@@ -334,17 +335,17 @@ class CfgLoot {
"ItemTankTrap",
},
{
0.09,
0.09,
0.14,
0.12,
0.09,
0.12,
0.09,
0.05,
0.05,
0.05,
0.05,
0.06,
0.06,
0.06,
0.06,
0.12,
0.06,
0.01,
0.01
}
@@ -356,20 +357,26 @@ class CfgLoot {
"Skin_Pilot_EP1_DZ",
"Skin_Functionary1_EP1_DZ",
"Skin_Priest_DZ",
"Skin_Rocker1_DZ",
"Skin_Rocker2_DZ",
"Skin_Rocker3_DZ",
"Skin_Rocker4_DZ",
"Skin_SurvivorW3_DZ",
"Skin_SurvivorWpink_DZ",
"Skin_SurvivorWurban_DZ",
},
{
0.01,
0.02,
0.03,
0.02,
0.02,
0.05,
0.02,
0.01,
0.13,
0.12,
0.1,
0.1,
0.07,
0.07,
0.07,
0.07,
0.09,
0.09,
0.09
}
};
militaryclothes[] = {
@@ -389,19 +396,19 @@ class CfgLoot {
"Skin_Graves_Light_DZ"
},
{
0.03, // "Skin_Camo1_DZ",
0.02, // "Skin_Sniper1_DZ",
0.03, // "Skin_Rocket_DZ",
0.05, // "Skin_Soldier1_DZ",
0.01, // "Skin_Drake_Light_DZ"
0.02, // Skin_Soldier_TL_PMC_DZ
0.02, // Skin_Soldier_Sniper_PMC_DZ
0.02, // Skin_Soldier_Bodyguard_AA12_PMC_DZ
0.02, // Skin_CZ_Special_Forces_GL_DES_EP1_DZ
0.01, // "Skin_FR_OHara_DZ",
0.01, // "Skin_FR_Rodriguez_DZ",
0.01, // "Skin_CZ_Soldier_Sniper_EP1_DZ",
0.01, // "Skin_Graves_Light_DZ"
0.1,
0.08,
0.05,
0.13,
0.07,
0.07,
0.05,
0.07,
0.08,
0.08,
0.09,
0.04,
0.09
}
};
specialclothes[] = {
@@ -423,21 +430,21 @@ class CfgLoot {
"Skin_GUE_Soldier_2_DZ",
},
{
0.01, //"Skin_Ins_Soldier_GL_DZ",
0.01, //"Skin_GUE_Commander_DZ",
0.05, //"Skin_Bandit1_DZ",
0.02, //"Skin_Bandit2_DZ",
0.05, //"Skin_BanditW1_DZ",
0.03, //"Skin_BanditW2_DZ",
0.01, //"Skin_TK_INS_Soldier_EP1_DZ",
0.01, //"Skin_TK_INS_Warlord_EP1",
0.01, //"Skin_SurvivorWcombat_DZ",
0.03, //"Skin_SurvivorWdesert_DZ",
0.01, //"Skin_GUE_Soldier_MG_DZ",
0.01, //"Skin_GUE_Soldier_Sniper_DZ",
0.01, //"Skin_GUE_Soldier_Crew_DZ",
0.01, //"Skin_GUE_Soldier_CO_DZ",
0.01, //"Skin_GUE_Soldier_2_DZ",
0.1,
0.08,
0.13,
0.06,
0.07,
0.07,
0.05,
0.07,
0.08,
0.08,
0.05,
0.04,
0.04,
0.04,
0.04
}
};
};

13
dayz_code/compile/player_switchModel.sqf
View File

@@ -120,6 +120,19 @@ private ["_newBackpackType","_backpackWpn","_backpackMag"];
_newUnit addWeapon _primweapon;
};
if (_primweapon == "MeleeCrowbar") then {
_newUnit addMagazine 'crowbar_swing';
};
if (_primweapon == "MeleeHatchet") then {
_newUnit addMagazine 'hatchet_swing';
};
if (_primweapon == "MeleeMachete") then {
_newUnit addMagazine 'Machete_swing';
};
if (_primweapon == "MeleeFishingPole") then {
_newUnit addMagazine 'Fishing_Swing';
};
if(_secweapon != (secondaryWeapon _newUnit) && _secweapon != "") then {
_newUnit addWeapon _secweapon;
};

546
dayz_code/config.cpp
View File

@@ -519,42 +519,41 @@ class CfgBuildingLoot {
{ "","clothes" },
{ "","specialclothes" },
{ "WeaponHolder_MeleeCrowbar","object" },
{"MR43","weapon"},
{"MR43","weapon"},
};
itemChance[] = {
0.001,
0.004,
0.04,
0.03,
0.02,
0.06,
0.01,
0.02,
0.001,
0.04,
0.01,
0.35,
0.03,
0.02,
0.02,
0.02,
0.015,
0.01,
0.005,
0.01,
0.003,
0.003,
0.003,
0.02,
0.15,
0.05,
0.01,
0.02,
0.02,
0.01,
0.005,
0.03,
0.13,
0.03,
0.05,
0.03,
0.08,
0.06,
2,
0.06,
0.04,
0.05, //12
0.04, // 12-0
0.02, //16
0.02, //16
0.01, //18
0.01,
0.01,
0.01,
0.01,
0.03,
0.5,
0.01,
0.06,
0.06,
0.03,
0.01,
0.08,
0.03
0.01
};
};
class Office: Residential {
@@ -600,7 +599,7 @@ class CfgBuildingLoot {
0.04,
0.01,
0.04,
0.11,
0.075,
0.07,
0.06,
0.01,
@@ -630,15 +629,15 @@ class CfgBuildingLoot {
{ "ItemFishingPole","weapon" }
};
itemChance[] = {
0.06,
0.28,
0.05,
0.27,
0.01,
0.04,
0.03,
0.22,
0.03,
0.11,
0.17,
0.095,
0.15,
0.06,
0.005,
0.03,
@@ -686,35 +685,35 @@ class CfgBuildingLoot {
{"ItemKeyKit","weapon"}
};
itemChance[] = {
0.15,
0.11,
0.02,
0.04,
0.02,
0.01,
0.05,
0.02,
0.02,
0.05,
0.02,
0.05,
0.05,
0.005,
0.025,
0.04,
0.04,
0.01,
0.01,
0.05, //12
0.04, // 12-0
0.02, //16
0.02, //16
0.01, //18
0.01, // 18-1
0.01, // 12-1
0.04,
0.03,
0.02,
0.02,
0.01,
0.005,
0.005,
0.005,
0.3,
0.15,
0.01,
0.003,
0.003,
0.003,
0.29,
0.14,
0.01,
0.05,
0.02,
0.01,
0.005
0.001
};
};
class HeliCrash: Default {
@@ -747,32 +746,32 @@ class CfgBuildingLoot {
{"G36A_camo","weapon"},
{"G36K_camo","weapon"},
{"100Rnd_762x54_PK","magazine"},
};
};
itemChance[] = {
0.02, //{"FN_FAL","weapon"},
0.05, //{"bizon_silenced","weapon"},
0.05, //{"M14_EP1","weapon"},
0.02, //{"FN_FAL_ANPVS4","weapon"},
0.02, //{"m107","weapon"},
0.01, //{"BAF_AS50_scoped","weapon"},
0.03, //{"Mk_48_DZ","weapon"},
0.05, //{"M249_DZ","weapon"},
0.01, //{"BAF_L85A2_RIS_SUSAT","weapon"},
0.06, //{"DMR","weapon"},
1, //{"","military"},
0.5, //{"","medical"},
0.1, //{"MedBox0","object"},
0.02, //{"NVGoggles","weapon"}
0.1, //AmmoBoxSmall_556
0.1, //AmmoBoxSmall_762
0.08, //militaryclothes
0.03, //G36C"
0.02, //G36C_camo
//0.01, //G36_C_SD_camo
0.02, //G36A_camo
0.02, //G36K_camo
0.01, //("100Rnd_762x54_PK","magazine"}
};
0.01,
0.025,
0.025,
0.01,
0.01,
0.005,
0.015,
0.025,
0.01,
0.03,
0.4,
0.2,
0.05,
0.01,
0.045,
0.04,
0.04,
0.015,
0.01,
// 0.01,
0.01,
0.01,
0.005
};
};
class HeliCrash_No50s: Default {
zombieChance = 0.4;
@@ -804,27 +803,27 @@ class HeliCrash_No50s: Default {
{"100Rnd_762x54_PK","magazine"}
};
itemChance[] = {
0.02, //{"FN_FAL","weapon"},
0.05, //{"bizon_silenced","weapon"},
0.05, //{"M14_EP1","weapon"},
0.02, //{"FN_FAL_ANPVS4","weapon"},
0.03, //{"Mk_48_DZ","weapon"},
0.05, //{"M249_DZ","weapon"},
0.01, //{"BAF_L85A2_RIS_SUSAT","weapon"},
0.06, //{"DMR","weapon"},
1, //{"","military"},
0.5, //{"","medical"},
0.1, //{"MedBox0","object"},
0.02, //{"NVGoggles","weapon"}
0.1, //AmmoBoxSmall_556
0.1, //AmmoBoxSmall_762
0.08, //militaryclothes
0.03, //G36C"
0.02, //G36C_camo
//0.01, //G36_C_SD_camo
0.02, //G36A_camo
0.02, //G36K_camo
0.01 //("100Rnd_762x54_PK","magazine"}
0.01,
0.02,
0.02,
0.01,
0.01,
0.02,
0.005,
0.025,
0.44,
0.23,
0.04,
0.01,
0.04,
0.04,
0.03,
0.015,
0.01,
//0.01,
0.01,
0.01,
0.005
};
};
class Hospital: Default {
@@ -840,8 +839,8 @@ class HeliCrash_No50s: Default {
{"MedBox0","object"}
};
itemChance[] = {
0.2,
1,
0.1,
0.7,
0.2
};
};
@@ -898,47 +897,46 @@ class HeliCrash_No50s: Default {
{"BAF_L85A2_RIS_Holo","weapon"}
};
itemChance[] = {
0.05,
0.05,
0.01,
0.01,
0.005,
0.005,
0.015,
0.005,
0.01,
0.01,
0.01,
0.005,
0.02,
0.15,
0.01,
0.08,
0.05,
0.05,
0.01,
0.10,
0.005,
0.01,
0.005,
0.02,
0.02,
0.02,
0.02,
0.01,
0.05,
0.08,
0.10,
0.005,
0.03,
0.04,
0.01,
0.005,
0.02,
0.04,
0.04,
0.03,
0.01,
0.01,
0.005,
0.02,
0.085,
0.35,
0.01,
0.005,
0.02,
0.01,
0.06,
0.10,
0.10,
0.01,
0.05,
//Bags
0.08, //16
0.08, //16
0.06, //18
0.01, //24
0.01, //DZ_Backpack_EP1 24
0.01, // DZ_GunBag_EP1
0.10,
1.00,
2.50,
0.05, // Sa61_EP1
0.02, //UZI_SD_EP1
0.05,
0.02,
0.03,
0.03,
0.01
};
};
@@ -1006,61 +1004,58 @@ class HeliCrash_No50s: Default {
{"M40A3","weapon"},
{"100Rnd_762x54_PK","magazine"},
{ "","militaryclothes" },
};
};
itemChance[] = {
0.10,
0.05,
0.01,
0.02,
0.01, //PKP
0.10,
0.02,
0.10,
0.10,
0.10,
0.01,
0.01,
0.20,
0.01,
0.02,
0.10,
0.03,
0.20,
0.10,
0.20,
0.01,
0.04,
0.05,
0.02,
0.01,
0.08,
0.04,
0.02,
//0.01, //NVGoggles
0.10,
0.05,
0.15,
0.01, //ItemGPS
0.03,
0.01,
//Bags
0.08, //16
0.08, //16
0.06, //18
0.01, //24
0.01, //DZ_Backpack_EP1 24
0.01, //45
0.30,
1.00,
5.00, //military
//0.20,
0.01, //PipeBomb
0.01, //Sa58V_RCO_EP1
0.01, //Sa58V_CCO_EP1
0.01, //{"G36_C_SD_camo","weapon"},
0.02, // M40A3
0.01, //("100Rnd_762x54_PK","magazine"}
0.05, // militaryclothes
0.011,
0.006,
0.002,
0.002,
0.001,
0.011,
0.002,
0.011,
0.011,
0.011,
0.001,
0.001,
0.023,
0.001,
0.002,
0.011,
0.003,
0.023,
0.011,
0.023,
0.001,
0.005,
0.006,
0.002,
0.001,
0.009,
0.005,
0.002,
0.011,
0.006,
0.018,
0.001,
0.003,
0.002,
0.009,
0.009,
0.008,
0.001,
0.001,
0.001,
0.034,
0.114,
0.569,
0.001,
0.001,
0.001,
0.001,
0.002,
0.002,
0.007
};
};
class Hunting: Default {
@@ -1082,15 +1077,15 @@ class HeliCrash_No50s: Default {
{"","hunter"}
};
itemChance[] = {
0.08,
0.05,
0.04,
0.06,
0.03,
2.00,
0.03,
0.04,
3.00
0.015,
0.009,
0.008,
0.011,
0.006,
0.375,
0.006,
0.008,
0.562
};
};
class Church: Residential {
@@ -1715,8 +1710,27 @@ class HeliCrash_No50s: Default {
{ "WeaponHolder_PartFueltank","object" },
{ "WeaponHolder_PartEngine","object" },
{ "WeaponHolder_PartGlass","object" },
{ "WeaponHolder_ItemJerrycan","object" }};
itemChance[] = {0.15,0.01,0.05,0.02,0.02,0.05,0.05,0.05,0.02,0.15,0.05,0.06,0.05,0.03,0.01,0.07,0.03};
{ "WeaponHolder_ItemJerrycan","object" }
};
itemChance[] = {
0.191,
0.012,
0.062,
0.024,
0.024,
0.055,
0.055,
0.055,
0.022,
0.169,
0.055,
0.066,
0.055,
0.033,
0.011,
0.078,
0.033
};
};
class DynamicDebrisMilitary: Default
@@ -1747,8 +1761,31 @@ class HeliCrash_No50s: Default {
{ "WeaponHolder_PartEngine","object" },
{ "WeaponHolder_PartGlass","object" },
{ "WeaponHolder_PartVRotor","object" },
{ "WeaponHolder_ItemJerrycan","object" }};
itemChance[] = {0.05,0.11,0.08,0.15,0.01,0.05,0.02,0.02,0.05,0.05,0.05,0.02,0.15,0.05,0.06,0.05,0.03,0.02,0.03,0.02,0.03};
{ "WeaponHolder_ItemJerrycan","object" }
};
itemChance[] = {
0.050,
0.100,
0.080,
0.100,
0.020,
0.050,
0.010,
0.020,
0.010,
0.050,
0.050,
0.020,
0.150,
0.050,
0.060,
0.050,
0.030,
0.02,
0.03,
0.02,
0.03
};
};
class MassGrave: Default {
@@ -1816,63 +1853,60 @@ class HeliCrash_No50s: Default {
{ "","militaryclothes" },
{"WeaponHolder_ItemMachete", "object"},
{ "SCAR_H_LNG_Sniper_SD","weapon" },
};
};
itemChance[] = {
0.10,
0.05,
0.01,
0.02,
0.01, //PKP
0.10,
0.02,
0.10,
0.10,
0.10,
0.01,
0.01,
0.20,
0.01,
0.02,
0.10,
0.03,
0.20,
0.10,
0.20,
0.01,
0.04,
0.05,
0.02,
0.01,
0.08,
0.04,
0.02,
//0.01, //NVGoggles
0.10,
0.05,
0.15,
0.01, //ItemGPS
0.03,
0.01,
//Bags
0.08, //16
0.08, //16
0.06, //18
0.01, //24
0.01, //DZ_Backpack_EP1 24
0.01, //45
0.30,
1.00,
5.00, //military
//0.20,
0.01, //PipeBomb
0.01, //Sa58V_RCO_EP1
0.01, //Sa58V_CCO_EP1
0.01, //{"G36_C_SD_camo","weapon"},
0.02, // M40A3
0.01, //("100Rnd_762x54_PK","magazine"}
0.05, // militaryclothes
0.03,
0.01
0.011,
0.006,
0.001,
0.002,
0.001,
0.011,
0.002,
0.011,
0.011,
0.011,
0.001,
0.001,
0.023,
0.001,
0.002,
0.011,
0.003,
0.023,
0.011,
0.023,
0.001,
0.005,
0.006,
0.002,
0.001,
0.009,
0.005,
0.002,
0.011,
0.006,
0.017,
0.001,
0.003,
0.001,
0.009,
0.009,
0.007,
0.003,
0.001,
0.001,
0.034,
0.113,
0.567,
0.001,
0.002,
0.001,
0.001,
0.002,
0.001,
0.006,
0.005,
0.001
};
};
class Land_House_C_1_EP1: Residential

20
dayz_server/system/server_monitor.sqf
View File

@@ -94,6 +94,26 @@ serverVehicleCounter = [];
_object = createVehicle [_type, _pos, [], 0, "CAN_COLLIDE"];
_object setVariable ["lastUpdate",time];
_object setVariable ["ObjectID", _idKey, true];
// fix for leading zero issues on safe codes after restart
if (_object isKindOf "VaultStorageLocked") then {
if(_ownerID == 0) then {
_ownerID = "0000";
} else {
_codeCount = (count (toArray _ownerID));
if(_codeCount == 3) then {
_ownerID = format["0%1", _ownerID];
};
if(_codeCount == 2) then {
_ownerID = format["00%1", _ownerID];
};
if(_codeCount == 1) then {
_ownerID = format["000%1", _ownerID];
};
};
};
_object setVariable ["CharacterID", _ownerID, true];
clearWeaponCargoGlobal _object;