From 732154037a5b3bcdec528ca8777a08cd156a9988 Mon Sep 17 00:00:00 2001 From: icomrade Date: Sat, 21 Jan 2017 15:08:29 -0500 Subject: [PATCH 1/2] Disable blood stains by default Nice effect, but too intensive in my eyes --- CHANGE LOG 1.0.6.1.txt | 1 + Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf | 2 +- Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf | 2 +- Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf | 2 +- Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf | 2 +- Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf | 2 +- Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf | 2 +- Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf | 2 +- Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf | 2 +- Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/init.sqf | 2 +- Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf | 2 +- Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf | 2 +- Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf | 2 +- Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/init.sqf | 2 +- Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf | 2 +- Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf | 2 +- Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf | 2 +- Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf | 2 +- Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf | 2 +- Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf | 2 +- Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf | 2 +- Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf | 2 +- .../MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf | 2 +- Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf | 2 +- 24 files changed, 24 insertions(+), 23 deletions(-) diff --git a/CHANGE LOG 1.0.6.1.txt b/CHANGE LOG 1.0.6.1.txt index 32e669db9..3e95fc594 100644 --- a/CHANGE LOG 1.0.6.1.txt +++ b/CHANGE LOG 1.0.6.1.txt @@ -16,6 +16,7 @@ [CHANGED] Reverted pain to old violent shaking effect instead of subtle gun sway. #1839 @AirwavesMan @schwanzkopfhegel [CHANGED] Reverted lobby and player list background colors to A2OA default instead of dark grey [CHANGED] Salvage vehicle actions are no longer allowed in positions defined in DZE_SafeZonePosArray +[CHANGED] Changed default value for the variable dayz_bleedingeffect to 2 (blood particle effect only) - set to 3 to enable blood stains again [FIXED] Wrong texture for z_hunter zombie. #1805 @schwanzkopfhegel @ebayShopper [FIXED] Refuel with generator at gas station not working. #1806 @Helios27 @ebayShopper diff --git a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf index 46c5f165b..7ecef85f6 100644 --- a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf @@ -29,7 +29,7 @@ if (dayz_presets == "Custom") then { dayz_spawncarepkgs_clutterCutter = 0; //0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnCrashSite_clutterCutter = 0; // heli crash options 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnInfectedSite_clutterCutter = 0; // infected base spawn 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass - dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both + dayz_bleedingeffect = 2; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //true, Enables nutrition system, false, disables nutrition system. dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag diff --git a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf b/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf index bb5d22481..d87fde134 100644 --- a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf @@ -29,7 +29,7 @@ if (dayz_presets == "Custom") then { dayz_spawncarepkgs_clutterCutter = 0; //0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnCrashSite_clutterCutter = 0; // heli crash options 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnInfectedSite_clutterCutter = 0; // infected base spawn 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass - dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both + dayz_bleedingeffect = 2; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //true, Enables nutrition system, false, disables nutrition system. dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag diff --git a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf index b04cc86e4..c5b631757 100644 --- a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf @@ -29,7 +29,7 @@ if (dayz_presets == "Custom") then { dayz_spawncarepkgs_clutterCutter = 0; //0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnCrashSite_clutterCutter = 0; // heli crash options 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnInfectedSite_clutterCutter = 0; // infected base spawn 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass - dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both + dayz_bleedingeffect = 2; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //true, Enables nutrition system, false, disables nutrition system. dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag diff --git a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf index cd530bc2e..edff092f9 100644 --- a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf @@ -29,7 +29,7 @@ if (dayz_presets == "Custom") then { dayz_spawncarepkgs_clutterCutter = 0; //0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnCrashSite_clutterCutter = 0; // heli crash options 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnInfectedSite_clutterCutter = 0; // infected base spawn 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass - dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both + dayz_bleedingeffect = 2; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //true, Enables nutrition system, false, disables nutrition system. dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag diff --git a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf index 185a7dead..59dfd0157 100644 --- a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf @@ -29,7 +29,7 @@ if (dayz_presets == "Custom") then { dayz_spawncarepkgs_clutterCutter = 0; //0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnCrashSite_clutterCutter = 0; // heli crash options 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnInfectedSite_clutterCutter = 0; // infected base spawn 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass - dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both + dayz_bleedingeffect = 2; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //true, Enables nutrition system, false, disables nutrition system. dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag diff --git a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf index fb98edfd2..836bf65b0 100644 --- a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf @@ -29,7 +29,7 @@ if (dayz_presets == "Custom") then { dayz_spawncarepkgs_clutterCutter = 0; //0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnCrashSite_clutterCutter = 0; // heli crash options 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnInfectedSite_clutterCutter = 0; // infected base spawn 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass - dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both + dayz_bleedingeffect = 2; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //true, Enables nutrition system, false, disables nutrition system. dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag diff --git a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf index 1c514b51f..3e824198d 100644 --- a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf @@ -29,7 +29,7 @@ if (dayz_presets == "Custom") then { dayz_spawncarepkgs_clutterCutter = 0; //0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnCrashSite_clutterCutter = 0; // heli crash options 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnInfectedSite_clutterCutter = 0; // infected base spawn 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass - dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both + dayz_bleedingeffect = 2; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //true, Enables nutrition system, false, disables nutrition system. dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag diff --git a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf index 21c2b8c34..66a5afe13 100644 --- a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf @@ -29,7 +29,7 @@ if (dayz_presets == "Custom") then { dayz_spawncarepkgs_clutterCutter = 0; //0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnCrashSite_clutterCutter = 0; // heli crash options 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnInfectedSite_clutterCutter = 0; // infected base spawn 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass - dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both + dayz_bleedingeffect = 2; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //true, Enables nutrition system, false, disables nutrition system. dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag diff --git a/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/init.sqf b/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/init.sqf index 0ed99adc0..0f4db23f6 100644 --- a/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/init.sqf @@ -29,7 +29,7 @@ if (dayz_presets == "Custom") then { dayz_spawncarepkgs_clutterCutter = 0; //0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnCrashSite_clutterCutter = 0; // heli crash options 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnInfectedSite_clutterCutter = 0; // infected base spawn 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass - dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both + dayz_bleedingeffect = 2; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //true, Enables nutrition system, false, disables nutrition system. dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag diff --git a/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf b/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf index b39296e0b..21fbb8122 100644 --- a/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf @@ -29,7 +29,7 @@ if (dayz_presets == "Custom") then { dayz_spawncarepkgs_clutterCutter = 0; //0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnCrashSite_clutterCutter = 0; // heli crash options 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnInfectedSite_clutterCutter = 0; // infected base spawn 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass - dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both + dayz_bleedingeffect = 2; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //true, Enables nutrition system, false, disables nutrition system. dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag diff --git a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf index 147c1bb0e..fd4ff1cff 100644 --- a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf @@ -29,7 +29,7 @@ if (dayz_presets == "Custom") then { dayz_spawncarepkgs_clutterCutter = 0; //0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnCrashSite_clutterCutter = 0; // heli crash options 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnInfectedSite_clutterCutter = 0; // infected base spawn 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass - dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both + dayz_bleedingeffect = 2; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //true, Enables nutrition system, false, disables nutrition system. dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag diff --git a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf index d38932a98..85c1ed51f 100644 --- a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf @@ -29,7 +29,7 @@ if (dayz_presets == "Custom") then { dayz_spawncarepkgs_clutterCutter = 0; //0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnCrashSite_clutterCutter = 0; // heli crash options 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnInfectedSite_clutterCutter = 0; // infected base spawn 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass - dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both + dayz_bleedingeffect = 2; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //true, Enables nutrition system, false, disables nutrition system. dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag diff --git a/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/init.sqf b/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/init.sqf index a91976908..4f088fe29 100644 --- a/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/init.sqf @@ -29,7 +29,7 @@ if (dayz_presets == "Custom") then { dayz_spawncarepkgs_clutterCutter = 0; //0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnCrashSite_clutterCutter = 0; // heli crash options 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnInfectedSite_clutterCutter = 0; // infected base spawn 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass - dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both + dayz_bleedingeffect = 2; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //true, Enables nutrition system, false, disables nutrition system. dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag diff --git a/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf b/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf index 9dbf2934e..f505d5d53 100644 --- a/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf @@ -29,7 +29,7 @@ if (dayz_presets == "Custom") then { dayz_spawncarepkgs_clutterCutter = 0; //0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnCrashSite_clutterCutter = 0; // heli crash options 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnInfectedSite_clutterCutter = 0; // infected base spawn 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass - dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both + dayz_bleedingeffect = 2; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //true, Enables nutrition system, false, disables nutrition system. dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag diff --git a/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf b/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf index 6bb801fa1..017be2752 100644 --- a/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf @@ -29,7 +29,7 @@ if (dayz_presets == "Custom") then { dayz_spawncarepkgs_clutterCutter = 0; //0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnCrashSite_clutterCutter = 0; // heli crash options 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnInfectedSite_clutterCutter = 0; // infected base spawn 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass - dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both + dayz_bleedingeffect = 2; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //true, Enables nutrition system, false, disables nutrition system. dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag diff --git a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf index 58acd7194..cbfe7311b 100644 --- a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf @@ -29,7 +29,7 @@ if (dayz_presets == "Custom") then { dayz_spawncarepkgs_clutterCutter = 0; //0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnCrashSite_clutterCutter = 0; // heli crash options 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnInfectedSite_clutterCutter = 0; // infected base spawn 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass - dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both + dayz_bleedingeffect = 2; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //true, Enables nutrition system, false, disables nutrition system. dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag diff --git a/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf b/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf index 7606ea286..9726ca855 100644 --- a/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf @@ -29,7 +29,7 @@ if (dayz_presets == "Custom") then { dayz_spawncarepkgs_clutterCutter = 0; //0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnCrashSite_clutterCutter = 0; // heli crash options 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnInfectedSite_clutterCutter = 0; // infected base spawn 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass - dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both + dayz_bleedingeffect = 2; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //true, Enables nutrition system, false, disables nutrition system. dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag diff --git a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf b/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf index 849018df8..b8ea3084b 100644 --- a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf @@ -29,7 +29,7 @@ if (dayz_presets == "Custom") then { dayz_spawncarepkgs_clutterCutter = 0; //0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnCrashSite_clutterCutter = 0; // heli crash options 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnInfectedSite_clutterCutter = 0; // infected base spawn 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass - dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both + dayz_bleedingeffect = 2; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //true, Enables nutrition system, false, disables nutrition system. dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag diff --git a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf index ee950eb9d..eaeb9b45f 100644 --- a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf @@ -29,7 +29,7 @@ if (dayz_presets == "Custom") then { dayz_spawncarepkgs_clutterCutter = 0; //0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnCrashSite_clutterCutter = 0; // heli crash options 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnInfectedSite_clutterCutter = 0; // infected base spawn 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass - dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both + dayz_bleedingeffect = 2; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //true, Enables nutrition system, false, disables nutrition system. dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag diff --git a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf b/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf index cf416346a..fd62964b2 100644 --- a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf @@ -29,7 +29,7 @@ if (dayz_presets == "Custom") then { dayz_spawncarepkgs_clutterCutter = 0; //0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnCrashSite_clutterCutter = 0; // heli crash options 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnInfectedSite_clutterCutter = 0; // infected base spawn 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass - dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both + dayz_bleedingeffect = 2; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //true, Enables nutrition system, false, disables nutrition system. dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag diff --git a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf index dad583f72..22c6c3acf 100644 --- a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf @@ -29,7 +29,7 @@ if (dayz_presets == "Custom") then { dayz_spawncarepkgs_clutterCutter = 0; //0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnCrashSite_clutterCutter = 0; // heli crash options 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnInfectedSite_clutterCutter = 0; // infected base spawn 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass - dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both + dayz_bleedingeffect = 2; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //true, Enables nutrition system, false, disables nutrition system. dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag diff --git a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf b/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf index 657eafb1c..6234bb2b3 100644 --- a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf @@ -29,7 +29,7 @@ if (dayz_presets == "Custom") then { dayz_spawncarepkgs_clutterCutter = 0; //0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnCrashSite_clutterCutter = 0; // heli crash options 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnInfectedSite_clutterCutter = 0; // infected base spawn 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass - dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both + dayz_bleedingeffect = 2; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //true, Enables nutrition system, false, disables nutrition system. dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag diff --git a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf b/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf index cdf60be9f..2eb431be6 100644 --- a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf @@ -29,7 +29,7 @@ if (dayz_presets == "Custom") then { dayz_spawncarepkgs_clutterCutter = 0; //0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnCrashSite_clutterCutter = 0; // heli crash options 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass dayz_spawnInfectedSite_clutterCutter = 0; // infected base spawn 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass - dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both + dayz_bleedingeffect = 2; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //true, Enables nutrition system, false, disables nutrition system. dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag From a68e4b273be19fb6da5be00aea07643c5b24fff3 Mon Sep 17 00:00:00 2001 From: oiad Date: Sun, 22 Jan 2017 11:01:42 +1300 Subject: [PATCH 2/2] fix epoch_tempKeys.sqf making massive arrays. (#1884) * fix epoch_tempKeys.sqf making massive arrays. epoch_tempKeys was making a massive array every time it was called due to them setting the array size to the _ownerKeyId instead of count _temp_keys_names. For example: Call this function 10k times in testkit and see it lag the client due to making a massive array over and over again. ```"[[["9379"],[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,> "CfgWeapons" >> _x)) in _key_colors) then { _ownerKeyId = getNumber(configFile >> "CfgWeapons" >> _x >> "keyid"); _ownerKeyName = getText(configFile >> "CfgWeapons" >> _x >> "displayName"); - _temp_keys_names set [_ownerKeyId,_ownerKeyName]; + _temp_keys_names set [count _temp_keys_names,_ownerKeyName]; _temp_keys set [count _temp_keys,str(_ownerKeyId)]; }; } count (items player); + [_temp_keys,_temp_keys_names] \ No newline at end of file diff --git a/SQF/dayz_code/compile/fn_selfActions.sqf b/SQF/dayz_code/compile/fn_selfActions.sqf index 767a9d82c..588aa560e 100644 --- a/SQF/dayz_code/compile/fn_selfActions.sqf +++ b/SQF/dayz_code/compile/fn_selfActions.sqf @@ -120,10 +120,11 @@ if (_inVehicle) then { _temp_keys_names = _totalKeys select 1; _hasKey = _vehicleOwnerID in _temp_keys; _oldOwner = (_vehicleOwnerID == _uid); + _text = getText (configFile >> "CfgVehicles" >> (typeOf DZE_myVehicle) >> "displayName"); if (locked DZE_myVehicle) then { if (_hasKey || _oldOwner) then { - _unlock = DZE_myVehicle addAction [format[localize "STR_EPOCH_ACTIONS_UNLOCK",_text], "\z\addons\dayz_code\actions\unlock_veh.sqf",[DZE_myVehicle,(_temp_keys_names select (parseNumber _vehicleOwnerID))], 2, false, true]; + _unlock = DZE_myVehicle addAction [format[localize "STR_EPOCH_ACTIONS_UNLOCK",_text], "\z\addons\dayz_code\actions\unlock_veh.sqf",[DZE_myVehicle,(_temp_keys_names select (_temp_keys find _vehicleOwnerID))], 2, false, true]; s_player_lockUnlockInside set [count s_player_lockUnlockInside,_unlock]; s_player_lockUnlockInside_ctrl = 1; } else { @@ -692,7 +693,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur _oldOwner = (_characterID == _uid); if (locked _cursorTarget) then { if (_hasKey || _oldOwner) then { - _unlock = player addAction [format[localize "STR_EPOCH_ACTIONS_UNLOCK",_text], "\z\addons\dayz_code\actions\unlock_veh.sqf",[_cursorTarget,(_temp_keys_names select (parseNumber _characterID))], 2, true, true]; + _unlock = player addAction [format[localize "STR_EPOCH_ACTIONS_UNLOCK",_text], "\z\addons\dayz_code\actions\unlock_veh.sqf",[_cursorTarget,(_temp_keys_names select (_temp_keys find _characterID))], 2, true, true]; s_player_lockunlock set [count s_player_lockunlock,_unlock]; s_player_lockUnlock_crtl = 1; } else {