diff --git a/SQF/dayz_code/Configs/CfgBuildingLoot/CfgBuildingLoot.hpp b/SQF/dayz_code/Configs/CfgBuildingLoot/CfgBuildingLoot.hpp index 49088d5dd..e2c880c5f 100644 --- a/SQF/dayz_code/Configs/CfgBuildingLoot/CfgBuildingLoot.hpp +++ b/SQF/dayz_code/Configs/CfgBuildingLoot/CfgBuildingLoot.hpp @@ -841,14 +841,10 @@ class CfgBuildingLoot { { "","military" }, { "5Rnd_86x70_L115A1","magazine"}, { "10Rnd_127x99_m107","magazine"}, - { "machinegunammo","single" }, + { "machinegunammoexpl","single" }, { "militaryclothes","single" }, { "NVGoggles","weapon" }, - { "100Rnd_762x54_PK","magazine" }, - { "MAAWS_HEAT","magazine" }, - { "2000Rnd_762x51_M134","magazine" }, - { "PipeBomb","magazine" }, - { "machinegunammo","single" } + { "100Rnd_762x54_PK","magazine" } }; itemChanceSmall[] = { 0.10, @@ -861,8 +857,8 @@ class CfgBuildingLoot { 0.03, 0.01, 0.06, - 0.13, - 0.3, + 0.15, + 0.33, 0.02, 0.02, 0.05, @@ -870,9 +866,7 @@ class CfgBuildingLoot { 0.02, 0.05, 0.01, - 0.03, - 0.01, - 0.02 + 0.01 }; }; class Hunting: Default { @@ -2280,15 +2274,15 @@ class CfgBuildingLoot { }; class land_ind_pec_03: IndustrialMilitary { - lootPos[] = {{6.07275,11.8623,2.59973},{7.82275,-2.04883,-1.9376},{13.1899,16.0693,-5.15128},{14.0396,8.12549,-5.15128},{13.8237,12.5366,-4.69128},{4.63086,16.6553,-2.04201},{3.07275,-5.11963,-5.15128},{4.79541,-2.07031,-1.9387},{3.67627,14.5518,2.60131},{-2.08447,-13.6855,1.11455}}; + lootPos[] = {{6.07275,11.8623,2.59973},{7.82275,-2.04883,-1.9376},{13.1899,16.0693,-5.15128},{14.0396,8.12549,-5.15128},{13.8237,12.5366,-4.69128},{4.63086,16.6553,-2.04201},{3.07275,-5.11963,-5.15128},{4.79541,-2.07031,-1.9387},{3.67627,14.5518,2.60131},{-2.08447,-13.6855,1.11455},{3.21484,8.37207,-5.15128},{4.78662,18.0498,-5.15128},{-3.98193,-24.5332,-5.15128},{12.9028,-1.58447,3.05404},{-0.259766,22.2715,4.05607},{1.96094,25.4209,4.05607}}; lootPosZombie[] = {{1.979,15.7012,3.48646},{5.93604,16.2686,3.48582},{6.50586,13.8198,-4.22628},{12.314,9.64258,-4.22628},{6.15381,9.78711,-4.22628},{6.34424,-2.52051,-0.953124},{-5.04004,-4.30566,-4.22628},{-5.77588,-21.0293,-4.22628}}; - lootPosSmall[] = {{2.1709,11.5796,2.75019},{1.17725,11.8911,3.87051},{6.62451,13.2251,4.24952},{3.21777,-11.7026,-1.85671},{8.35938,-3.10693,-1.93559},{14.1851,-5.31348,-1.08754},{13.0874,16.7339,-4.27128},{7.37207,16.6235,-4.99128},{11.6133,16.7075,-5.04128},{12.248,13.2998,-3.56128},{-15.2876,-18.2754,-5.06128},{3.3833,14.4814,3.36135},{10.6797,7.66943,-4.43128}}; + lootPosSmall[] = {{2.1709,11.5796,2.75019},{1.17725,11.8911,3.87051},{6.62451,13.2251,4.24952},{3.21777,-11.7026,-1.85671},{8.35938,-3.10693,-1.93559},{14.1851,-5.31348,-1.08754},{13.0874,16.7339,-4.27128},{7.37207,16.6235,-4.99128},{11.6133,16.7075,-5.04128},{12.248,13.2998,-3.56128},{-15.2876,-18.2754,-5.06128},{3.3833,14.4814,3.36135},{10.6797,7.66943,-4.43128},{-4.56982,14.9658,-4.94128},{4.23242,-26.7783,-1.97225},{2.2749,21.8086,4.05607}}; }; class land_ind_pec_03a: IndustrialMilitary { - lootPos[] = {{6.07275,11.8623,2.59973},{7.82275,-2.04883,-1.9376},{13.1899,16.0693,-5.15128},{14.0396,8.12549,-5.15128},{13.8237,12.5366,-4.69128},{4.63086,16.6553,-2.04201},{3.07275,-5.11963,-5.15128},{4.79541,-2.07031,-1.9387},{3.67627,14.5518,2.60131},{-2.08447,-13.6855,1.11455}}; + lootPos[] = {{6.07275,11.8623,2.59973},{7.82275,-2.04883,-1.9376},{13.1899,16.0693,-5.15128},{14.0396,8.12549,-5.15128},{13.8237,12.5366,-4.69128},{4.63086,16.6553,-2.04201},{3.07275,-5.11963,-5.15128},{4.79541,-2.07031,-1.9387},{3.67627,14.5518,2.60131},{-2.08447,-13.6855,1.11455},{3.21484,8.37207,-5.15128},{4.78662,18.0498,-5.15128},{-3.98193,-24.5332,-5.15128},{12.9028,-1.58447,3.05404},{-0.259766,22.2715,4.05607},{1.96094,25.4209,4.05607}}; lootPosZombie[] = {{1.979,15.7012,3.48646},{5.93604,16.2686,3.48582},{6.50586,13.8198,-4.22628},{12.314,9.64258,-4.22628},{6.15381,9.78711,-4.22628},{6.34424,-2.52051,-0.953124},{-5.04004,-4.30566,-4.22628},{-5.77588,-21.0293,-4.22628}}; - lootPosSmall[] = {{2.1709,11.5796,2.75019},{1.17725,11.8911,3.87051},{6.62451,13.2251,4.24952},{3.21777,-11.7026,-1.85671},{8.35938,-3.10693,-1.93559},{14.1851,-5.31348,-1.08754},{13.0874,16.7339,-4.27128},{7.37207,16.6235,-4.99128},{11.6133,16.7075,-5.04128},{12.248,13.2998,-3.56128},{-15.2876,-18.2754,-5.06128},{3.3833,14.4814,3.36135},{10.6797,7.66943,-4.43128}}; + lootPosSmall[] = {{2.1709,11.5796,2.75019},{1.17725,11.8911,3.87051},{6.62451,13.2251,4.24952},{3.21777,-11.7026,-1.85671},{8.35938,-3.10693,-1.93559},{14.1851,-5.31348,-1.08754},{13.0874,16.7339,-4.27128},{7.37207,16.6235,-4.99128},{11.6133,16.7075,-5.04128},{12.248,13.2998,-3.56128},{-15.2876,-18.2754,-5.06128},{3.3833,14.4814,3.36135},{10.6797,7.66943,-4.43128},{-4.56982,14.9658,-4.94128},{4.23242,-26.7783,-1.97225},{2.2749,21.8086,4.05607}}; }; class Land_MBG_Police_Station: Office { diff --git a/SQF/dayz_code/Configs/CfgBuildingLoot/CfgLootSmall.hpp b/SQF/dayz_code/Configs/CfgBuildingLoot/CfgLootSmall.hpp index 41dff0791..e2c95b107 100644 --- a/SQF/dayz_code/Configs/CfgBuildingLoot/CfgLootSmall.hpp +++ b/SQF/dayz_code/Configs/CfgBuildingLoot/CfgLootSmall.hpp @@ -538,4 +538,26 @@ class CfgLootSmall { 0.04 } }; + machinegunammoexpl[] = { + { + "100Rnd_556x45_BetaCMag", + "75Rnd_545x39_RPK", + "100Rnd_556x45", + "100Rnd_762x51_M240", + "100Rnd_762x54_PK", + "200Rnd_556x45_M249", + "MAAWS_HEAT", + "PipeBomb" + }, + { + 0.20, + 0.20, + 0.15, + 0.15, + 0.14, + 0.14, + 0.01, + 0.01, + } + }; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgBuildingLoot/cfgLoot.hpp b/SQF/dayz_code/Configs/CfgBuildingLoot/cfgLoot.hpp index ff1f31727..bdf9f1fcb 100644 --- a/SQF/dayz_code/Configs/CfgBuildingLoot/cfgLoot.hpp +++ b/SQF/dayz_code/Configs/CfgBuildingLoot/cfgLoot.hpp @@ -1035,7 +1035,29 @@ class CfgLoot { 0.15, 0.15, 0.15, + 0.15 + } + }; + machinegunammoexpl[] = { + { + "100Rnd_556x45_BetaCMag", + "75Rnd_545x39_RPK", + "100Rnd_556x45", + "100Rnd_762x51_M240", + "100Rnd_762x54_PK", + "200Rnd_556x45_M249", + "MAAWS_HEAT", + "PipeBomb" + }, + { + 0.20, + 0.20, 0.15, + 0.15, + 0.14, + 0.14, + 0.01, + 0.01, } }; diff --git a/SQF/dayz_epoch_b/stringtable.xml b/SQF/dayz_epoch_b/stringtable.xml index abc977d91..0715a7134 100644 --- a/SQF/dayz_epoch_b/stringtable.xml +++ b/SQF/dayz_epoch_b/stringtable.xml @@ -4807,14 +4807,14 @@ Poskládat 10oz cihlu - Smelt 1oz bar - Smelt 1oz bar - 1oz bar Stapel - Уложить в 1oz слиток + Unstack + Unstack + + - Stapel 1oz balk + - Poskládat 1oz cihlu + Salvage Scrap diff --git a/SQF/dayz_server/missions/DayZ_Epoch_25.sauerland/mission.sqf b/SQF/dayz_server/missions/DayZ_Epoch_25.sauerland/mission.sqf index 833b486a1..e79d03488 100644 --- a/SQF/dayz_server/missions/DayZ_Epoch_25.sauerland/mission.sqf +++ b/SQF/dayz_server/missions/DayZ_Epoch_25.sauerland/mission.sqf @@ -1046,11 +1046,6 @@ if (true) then _this setPos [24783.713, 21737.24, 0.00015258789]; }; -_this = createCenter civilian; -_center_1 = _this; - -_group_1 = createGroup _center_1; - _unit_45 = objNull; if (true) then { @@ -2136,11 +2131,6 @@ if (true) then _this setPos [15537.356, 17005.707, 4.5776367e-005]; }; -_this = createCenter east; -_center_6 = _this; - -_group_3 = createGroup _center_6; - _unit_74 = objNull; if (true) then { @@ -3905,11 +3895,6 @@ if (true) then _this setPos [11038.616, 15680.393, -0.16394557]; }; -_this = createCenter resistance; -_center_7 = _this; - -_group_4 = createGroup _center_7; - _unit_153 = objNull; if (true) then { diff --git a/Server Files/@DayZ_Epoch_Server/addons/dayz_server.pbo b/Server Files/@DayZ_Epoch_Server/addons/dayz_server.pbo index 9e104edc9..3a8d26e4e 100644 Binary files a/Server Files/@DayZ_Epoch_Server/addons/dayz_server.pbo and b/Server Files/@DayZ_Epoch_Server/addons/dayz_server.pbo differ