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

Fix in ground spawn pickaxe and broken pickaxe

Browse Source 
The pickaxe and the broken pickaxe spawned headlong in the ground. It was the same for the crowbar. We need to add an extra weaponholder for this tools for a proper spawn.
This commit is contained in:
A Man
2019-10-23 10:50:01 +02:00
parent 82485ea0c6
commit a09bb81a7a
6 changed files with 58 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
CHANGE LOG 1.0.6.3.txt
View File

@@ -1,28 +1,32 @@
[NEW] Time between unlocking safes/lockboxes after a failed code will be exponentially higher, see configVariables.sqf\DZE_lockablesHarderPenalty @oiad [NEW] Time between unlocking safes/lockboxes after a failed code will be exponentially higher, see configVariables.sqf\DZE_lockablesHarderPenalty (c3cbca1) @oiad
[NEW] Added 93 new zombie models with loot groups and strings for Server Admins @Airwavesman [NEW] Added 93 new zombie models with loot groups and strings for Server Admins. (2e15009) @AirwavesMan
[NEW] Zombie Loot supports backpacks now @Airwavesman [NEW] Zombie Loot supports backpacks now. (096fc13) @AirwavesMan
[NEW] Hide Body can be edited and toggled now. Enabled by default, configVariables.sqf/DZE_Hide_Body @AirwavesMan [NEW] Hide Body can be edited and toggled now. Enabled by default, configVariables.sqf/DZE_Hide_Body (c0e9fe6) @AirwavesMan
[NEW] 6 AK-107 versions added with attachment support. @AirwavesMan [NEW] 6 AK-107 versions added with attachment support. (82485ea) @AirwavesMan
[FIXED] Some more occurrences of zero_building interiors misaligned or at the wrong terrain height (eaaedf2, 048caa5) [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
[FIXED] POI fires were still spawning when POI was off and town generator was on (2855997) [FIXED] POI fires were still spawning when POI was off and town generator was on (2855997) @ebayShopper
[FIXED] Combo locks could be duplicated by two players removing them at the same time (564e3da) [FIXED] Combo locks could be duplicated by two players removing them at the same time (564e3da) @shu @oiad
[FIXED] Bush b_corylus.p3d allowed chopping down for wood like a tree (42e519a) [FIXED] Bush b_corylus.p3d allowed chopping down for wood like a tree (42e519a) @ebayShopper
[FIXED] Player could shoot during unconscious wake up animation (634a01a) [FIXED] Player could shoot during unconscious wake up animation (634a01a) @ebayShopper
[FIXED] Rare publicVariable value restrictions for AuthKey due to RNG with basic Latin characters (d48c907) @oiad @AirwavesMan [FIXED] Rare publicVariable value restrictions for AuthKey due to RNG with basic Latin characters (d48c907) @oiad @AirwavesMan
[FIXED] Freeze when iterating through CfgWeapons in A2OA 1.64 due to conflict with ItemKeys in dayz_epoch_b.pbo #2010 @S-fly [FIXED] Freeze when iterating through CfgWeapons in A2OA 1.64 due to conflict with ItemKeys in dayz_epoch_b.pbo #2010 @S-fly
[FIXED] 45Rnd_545x39_RPK error after it was removed with the 2018-04-05 A2OA CorePatch (d249227) [FIXED] 45Rnd_545x39_RPK error after it was removed with the 2018-04-05 A2OA CorePatch (d249227) @ebayShopper
[FIXED] Disabled Arma's automatic vehicle refuel, repair and rearm at WarfareBVehicleServicePoint buildings (2c4f06c) @dihan48 [FIXED] Disabled Arma's automatic vehicle refuel, repair and rearm at WarfareBVehicleServicePoint buildings (2c4f06c) @dihan48
[FIXED] DistanceFoot database stat was incorrect. @dihan48 [FIXED] DistanceFoot database stat was incorrect. (be777dd) @dihan48
[FIXED] Wrong cargo count of Refuel Trucks after last Corepatch. @AirwavesMan [FIXED] Wrong cargo count of Refuel Trucks after last Corepatch. (e26fb24) @AirwavesMan
[FIXED] Vehicles jumping into the air after flipping. @AirwavesMan [FIXED] Vehicles jumping into the air after flipping. (096fc13) @AirwavesMan
[FIXED] Crafting wooden arrows from wood piles and razors was not possible. @AirwavesMan [FIXED] Crafting wooden arrows from wood piles and razors was not possible. (d4b46e4) @AirwavesMan
[FIXED] Top snap point for half cinder wall was incorrect. @ndavalos, @AirwavesMan [FIXED] Top snap point for half cinder wall was incorrect. (8f10a36) @ndavalos, @AirwavesMan
[FIXED] The RPK-74 magazine could not be used with all AK-74 versions. @AirwavesMan [FIXED] The RPK-74 magazine could not be used with all AK-74 versions. (82485ea) @AirwavesMan
[FIXED] Multiple Vehicle Upgrades were not possbile. (ac884f2), (a430f79), (c24504a) @F507DMT
[FIXED] Fix an inventory dupe if on water. (a052ba7), (baf92eb) @F507DMT
[FIXED] The pickaxe and the broken pickaxe spawned in the ground on loot spawn. @AirwavesMan
[UPDATED] Spawning of Zombies and Loot in Safe Zones can now be toggled, disabled by default, see configVariables.sqf/DZE_SafeZoneZombieLoot (6248add, 141b25e) @oiad @_Lance_ [UPDATED] Spawning of Zombies and Loot in Safe Zones can now be toggled, disabled by default, see configVariables.sqf/DZE_SafeZoneZombieLoot (6248add, 141b25e) @oiad @_Lance_
[UPDATED] Added notification when status icons are disabled [UPDATED] Added notification when status icons are disabled. (e04f0fc) @ebayShopper
[UPDATED] Added night vision mode back to DMR_DZ and M4SPR_DZE after it was removed with the 2018-04-05 A2OA CorePatch [UPDATED] Added night vision mode back to DMR_DZ and M4SPR_DZE after it was removed with the 2018-04-05 A2OA CorePatch (d6cf707) @ebayShopper
[UPDATED] All M32 grenades using one inventroy slot now. (cc85067) @AirwavesMan
[INFO] Synced with DayZMod upstream up to commit fe063a8 [INFO] Synced with DayZMod upstream up to commit fe063a8

6
SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Castle.hpp
View File

@@ -5,8 +5,10 @@ Castle[] =
{Loot_WEAPON, 1, ItemMap}, {Loot_WEAPON, 1, ItemMap},
{Loot_WEAPON, 1, ItemCompass}, {Loot_WEAPON, 1, ItemCompass},
{Loot_WEAPON, 2, ItemFlashlight}, {Loot_WEAPON, 2, ItemFlashlight},
{Loot_WEAPON, 1, ItemPickaxe}, //{Loot_WEAPON, 1, ItemPickaxe},
{Loot_WEAPON, 2, ItemPickaxeBroken}, //{Loot_WEAPON, 2, ItemPickaxeBroken},
{Loot_VEHICLE, 1, WeaponHolder_ItemPickaxe},
{Loot_VEHICLE, 2, WeaponHolder_ItemPickaxeBroken},
// {Loot_WEAPON, 2, ItemShovel}, // {Loot_WEAPON, 2, ItemShovel},
// {Loot_WEAPON, 1, ItemHatchet}, // {Loot_WEAPON, 1, ItemHatchet},
{Loot_VEHICLE, 1, WeaponHolder_ItemHatchet}, {Loot_VEHICLE, 1, WeaponHolder_ItemHatchet},

6
SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Construction.hpp
View File

@@ -10,8 +10,10 @@ Construction[] =
{Loot_MAGAZINE, 1, equip_lever}, {Loot_MAGAZINE, 1, equip_lever},
{Loot_MAGAZINE, 1, ItemComboLock}, {Loot_MAGAZINE, 1, ItemComboLock},
{Loot_WEAPON, 1, ItemPickaxe}, //{Loot_WEAPON, 1, ItemPickaxe},
{Loot_WEAPON, 2, ItemPickaxeBroken}, //{Loot_WEAPON, 2, ItemPickaxeBroken},
{Loot_VEHICLE, 1, WeaponHolder_ItemPickaxe},
{Loot_VEHICLE, 2, WeaponHolder_ItemPickaxeBroken},
{Loot_WEAPON, 1, ItemSledge}, {Loot_WEAPON, 1, ItemSledge},
{Loot_MAGAZINE, 2, ItemSledgeHandle}, {Loot_MAGAZINE, 2, ItemSledgeHandle},
{Loot_MAGAZINE, 2, ItemSledgeHead}, {Loot_MAGAZINE, 2, ItemSledgeHead},

6
SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp
View File

@@ -7,8 +7,10 @@ Industrial[] =
{Loot_VEHICLE, 8, WeaponHolder_ItemCrowbar}, {Loot_VEHICLE, 8, WeaponHolder_ItemCrowbar},
// {Loot_WEAPON, 5, ItemHatchet}, // {Loot_WEAPON, 5, ItemHatchet},
{Loot_VEHICLE, 5, WeaponHolder_ItemHatchet}, {Loot_VEHICLE, 5, WeaponHolder_ItemHatchet},
{Loot_WEAPON, 1, ItemPickaxe}, //{Loot_WEAPON, 1, ItemPickaxe},
{Loot_WEAPON, 2, ItemPickaxeBroken}, //{Loot_WEAPON, 2, ItemPickaxeBroken},
{Loot_VEHICLE, 1, WeaponHolder_ItemPickaxe},
{Loot_VEHICLE, 2, WeaponHolder_ItemPickaxeBroken},
{Loot_WEAPON, 1, ItemSledge}, {Loot_WEAPON, 1, ItemSledge},
{Loot_MAGAZINE, 2, ItemSledgeHandle}, {Loot_MAGAZINE, 2, ItemSledgeHandle},
{Loot_MAGAZINE, 2, ItemSledgeHead}, {Loot_MAGAZINE, 2, ItemSledgeHead},

21
SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp
View File

@@ -22,6 +22,27 @@ class WeaponHolder_ItemCrowbar: WeaponHolderBase
init="[(_this select 0),'cfgWeapons','ItemCrowbar'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';"; init="[(_this select 0),'cfgWeapons','ItemCrowbar'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';";
}; };
}; };
class WeaponHolder_ItemPickaxe: WeaponHolderBase
{
scope=2;
displayName = $STR_EQUIP_NAME_PICKAXE;
model = "z\addons\dayz_communityweapons\models\pickaxe\pickaxe.p3d";
destrType = "DestructNo";
class eventHandlers
{
init="[(_this select 0),'cfgWeapons','ItemPickaxe'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';";
};
};
class WeaponHolder_ItemPickaxeBroken: WeaponHolder_ItemPickaxe
{
displayName = $STR_name_ItemPickaxeBroken;
class eventHandlers
{
init="[(_this select 0),'cfgWeapons','ItemPickaxeBroken'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';";
};
};
class WeaponHolder_ItemSledge : WeaponHolderBase { // Epoch class. Needed for player_dropWeapon class WeaponHolder_ItemSledge : WeaponHolderBase { // Epoch class. Needed for player_dropWeapon
scope = public; scope = public;
displayName = $STR_EQUIP_NAME_SledgeHammer; displayName = $STR_EQUIP_NAME_SledgeHammer;

4
SQF/dayz_code/stringtable.xml
View File

@@ -14798,7 +14798,7 @@
</Key> </Key>
<Key ID="STR_EPOCH_LUMBERPACK"> <Key ID="STR_EPOCH_LUMBERPACK">
<English>Lumber Pack</English> <English>Lumber Pack</English>
<German>Bauholzstapel</German> <German>Bauholzpaket</German>
<Russian>Упаковка пиломатериалов</Russian> <Russian>Упаковка пиломатериалов</Russian>
</Key> </Key>
<Key ID="STR_EPOCH_LUMBERPACK_DESC"> <Key ID="STR_EPOCH_LUMBERPACK_DESC">
@@ -14833,7 +14833,7 @@
</Key> </Key>
<Key ID="STR_EPOCH_PLYWOODPACK_DESC"> <Key ID="STR_EPOCH_PLYWOODPACK_DESC">
<English>Plywood in a stack.</English> <English>Plywood in a stack.</English>
<German>Sperrholzstapel.</German> <German>Sperrholz, gestapelt und zusammengebunden.</German>
<Russian>Упакованная фанера.</Russian> <Russian>Упакованная фанера.</Russian>
</Key> </Key>
<Key ID="STR_EPOCH_LUMBER"> <Key ID="STR_EPOCH_LUMBER">