diff --git a/SQF/dayz_code/Configs/CfgMagazines.hpp b/SQF/dayz_code/Configs/CfgMagazines.hpp index d3fabe1bb..34bd86057 100644 --- a/SQF/dayz_code/Configs/CfgMagazines.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines.hpp @@ -115,6 +115,7 @@ class CfgMagazines { { picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_E_CA.paa"; descriptionShort = "Empty Briefcase"; + weight = 1; class ItemActions { class Crafting @@ -141,6 +142,7 @@ class CfgMagazines { { picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_10oz_CA.paa"; descriptionShort = "Briefcase (Contains: 1 x 10oz Gold Bar)"; + weight = 1.2; class ItemActions { class Crafting @@ -177,6 +179,7 @@ class CfgMagazines { { picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_20oz_CA.paa"; descriptionShort = "Briefcase (Contains: 2 x 10oz Gold Bar)"; + weight = 1.5; class ItemActions { class Crafting @@ -221,6 +224,7 @@ class CfgMagazines { { picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_30oz_CA.paa"; descriptionShort = "Briefcase (Contains: 3 x 10oz Gold Bar)"; + weight = 1.8; class ItemActions { class Crafting @@ -265,6 +269,7 @@ class CfgMagazines { { picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_40oz_CA.paa"; descriptionShort = "Briefcase (Contains: 4 x 10oz Gold Bar)"; + weight = 2.1; class ItemActions { class Crafting @@ -309,6 +314,7 @@ class CfgMagazines { { picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_50oz_CA.paa"; descriptionShort = "Briefcase (Contains: 5 x 10oz Gold Bar)"; + weight = 2.4; class ItemActions { class Crafting @@ -353,6 +359,7 @@ class CfgMagazines { { picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_60oz_CA.paa"; descriptionShort = "Briefcase (Contains: 6 x 10oz Gold Bar)"; + weight = 2.7; class ItemActions { class Crafting @@ -397,6 +404,7 @@ class CfgMagazines { { picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_70oz_CA.paa"; descriptionShort = "Briefcase (Contains: 7 x 10oz Gold Bar)"; + weight = 2.9; class ItemActions { class Crafting @@ -441,6 +449,7 @@ class CfgMagazines { { picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_80oz_CA.paa"; descriptionShort = "Briefcase (Contains: 8 x 10oz Gold Bar)"; + weight = 3.2; class ItemActions { class Crafting @@ -485,6 +494,7 @@ class CfgMagazines { { picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_90oz_CA.paa"; descriptionShort = "Briefcase (Contains: 9 x 10oz Gold Bar)"; + weight = 3.5; class ItemActions { class Crafting @@ -520,6 +530,7 @@ class CfgMagazines { { picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_100oz_CA.paa"; descriptionShort = "Briefcase (Contains: 10 x 10oz Gold Bar)"; + weight = 3.8; class ItemActions { class Crafting @@ -1145,6 +1156,28 @@ class CfgMagazines { }; }; + class cinder_wall_kit: CA_Magazine + { + scope = 2; + count = 1; + type = 256; + displayName = "Cinder Block Wall"; + descriptionShort = "Half height cinder block wall"; + model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; + weight = 300; + class ItemActions + { + class Build + { + text = "$STR_ACTIONS_BUILD"; + script = "spawn player_build;"; + require[] = {"ItemToolbox"}; + create = "CinderWallHalf_DZ"; + }; + }; + }; + class workbench_kit: CA_Magazine { scope = 2; @@ -1780,7 +1813,7 @@ class CfgMagazines { script = "spawn player_craftItem;"; neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox"}; - output[] = {{"ItemWoodStairsSupports",1}}; + output[] = {{"ItemWoodStairsSupport",1}}; input[] = {{"ItemWoodStairs",1},{"PartWoodLumber",2}}; }; @@ -2299,6 +2332,86 @@ class CfgMagazines { }; }; + class PartPlankPack: CA_Magazine + { + scope = 2; + count = 1; + type = 256; + displayName = "Lumber Pack"; + model = "\z\addons\dayz_epoch\models\plank_pack.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_lumber_pack_CA.paa"; + descriptionShort = "Lumber in a stack"; + weight = 6; + class ItemActions { + class Crafting + { + text = "Un pack"; + script = "spawn player_craftItem;"; + neednearby[] = {"sawmill"}; + requiretools[] = {"ItemToolbox","ItemKnife"}; + output[] = {{"PartWoodLumber",3}}; + input[] = {{"PartPlankPack",1}}; + }; + + }; + }; + class CinderBlocks: CA_Magazine + { + scope = 2; + count = 1; + type = 256; + displayName = "Cinder Blocks"; + model = "\z\addons\dayz_epoch\models\cinder_stack.p3d"; + picture = "\z\addons\dayz_epoch\pictures\epuip_cinder_blocks_CA.paa"; + descriptionShort = "Stack of nine cinder blocks"; + weight = 100; + class ItemActions { + class Crafting + { + text = "Craft Cinder Block Wall"; + script = "spawn player_craftItem;"; + neednearby[] = {"workshop"}; + requiretools[] = {"ItemToolbox"}; + output[] = {{"cinder_wall_kit",1}}; + input[] = {{"CinderBlocks",3}}; + }; + + }; + }; + class MortarBucket: CA_Magazine + { + scope = 2; + count = 1; + type = 256; + displayName = "Bucket of Mortar"; + model = "\z\addons\dayz_epoch\models\mortar.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_mortar_CA.paa"; + descriptionShort = "Premixed mastic adhesive that will bond to concrete block."; + weight = 21; + }; + class PartPlywoodPack: CA_Magazine + { + scope = 2; + count = 1; + type = 256; + displayName = "Plywood Pack"; + model = "\dayz_equip\models\plywood_pack.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_plywood_pack_CA.paa"; + descriptionShort = "Plywood in a stack"; + weight = 12; + class ItemActions { + class Crafting + { + text = "Un pack"; + script = "spawn player_craftItem;"; + neednearby[] = {"sawmill"}; + requiretools[] = {"ItemToolbox","ItemKnife"}; + output[] = {{"PartWoodPlywood",3}}; + input[] = {{"PartPlywoodPack",1}}; + }; + + }; + }; class PartWoodLumber: CA_Magazine { scope = 2; @@ -2309,12 +2422,6 @@ class CfgMagazines { picture="\z\addons\dayz_epoch\pictures\equip_wood_planks_CA.paa"; descriptionShort = "Lumber: Used for building many structures and can also be used to make plywood."; class ItemActions { - class Build { - text = "Build Wood Gate"; - script = "spawn player_build;"; - require[] = {"ItemToolbox"}; - create = "WoodGate_DZ"; - }; class Crafting { text = "Craft Plywood"; @@ -2397,7 +2504,6 @@ class CfgMagazines { requiretools[] = {"ItemToolbox"}; output[] = {{"wood_shack_kit",1}}; input[] = {{"bulk_empty",1},{"PartWoodPlywood",4},{"PartWoodLumber",4}}; - }; class Crafting2 { @@ -2407,7 +2513,6 @@ class CfgMagazines { requiretools[] = {"ItemToolbox","ItemCrowbar"}; output[] = {{"ItemWoodFloorQuarter",1}}; input[] = {{"bulk_empty",1},{"PartWoodPlywood",3},{"PartWoodLumber",3}}; - }; class Crafting3 { @@ -2417,7 +2522,6 @@ class CfgMagazines { requiretools[] = {"ItemToolbox","ItemCrowbar"}; output[] = {{"ItemWoodWallThird",1}}; input[] = {{"bulk_empty",1},{"PartWoodPlywood",3},{"PartWoodLumber",3}}; - }; }; diff --git a/SQF/dayz_code/Configs/cfgVehicles.hpp b/SQF/dayz_code/Configs/cfgVehicles.hpp index 8d1c49608..536eee08d 100644 --- a/SQF/dayz_code/Configs/cfgVehicles.hpp +++ b/SQF/dayz_code/Configs/cfgVehicles.hpp @@ -1373,7 +1373,37 @@ class CfgVehicles { //class NonStrategic; class BuiltItems: NonStrategic{}; - class ModularItems: NonStrategic{}; + class ModularItems: NonStrategic{ + + class DestructionEffects { + class Sound { + simulation = "sound"; + type = "DestrHouse"; + position = "destructionEffect1"; + intensity = 1; + interval = 1; + lifeTime = 0.05; + }; + + class DestroyPhase1 { + simulation = "destroy"; + type = "DelayedDestruction"; + lifeTime = 2.5; + position = ""; + intensity = 1; + interval = 1; + }; + + class DamageAround1 { + simulation = "damageAround"; + type = "DamageAroundHouse"; + position = ""; + intensity = 0.1; + interval = 1; + lifeTime = 1; + }; + }; + }; class TrapItems: NonStrategic{}; // buildables class Hedgehog_DZ: BuiltItems @@ -1573,6 +1603,38 @@ class CfgVehicles { }; // modular + class CinderWallHalf_DZ: ModularItems + { + scope = 2; + destrType = "DestructBuilding"; + cost = 100; + offset[] = {0,4,0}; + model="\z\addons\dayz_epoch\models\Cinder_Wall_Half.p3d"; + icon = "\ca\data\data\Unknown_object.paa"; + mapSize = 2; + armor = 800; + displayName = "Cinder Block Wall 1/2"; + vehicleClass = "Fortifications"; + upgradeBuilding[] = {"CinderWall_DZ",{{"CinderBlocks",4},{"MortarBucket",1}}}; + maintainBuilding[] = {{"MortarBucket",1}}; + GhostPreview = "CinderWallHalf_Preview_DZ"; + }; + class CinderWall_DZ: ModularItems + { + scope = 2; + destrType = "DestructBuilding"; + cost = 100; + offset[] = {0,4,0}; + model="\z\addons\dayz_epoch\models\Cinder_Wall.p3d"; + icon = "\ca\data\data\Unknown_object.paa"; + mapSize = 2; + armor = 800; + displayName = "Cinder Block Wall"; + vehicleClass = "Fortifications"; + maintainBuilding[] = {{"MortarBucket",1}}; + GhostPreview = "CinderWall_Preview_DZ"; + }; + class WoodFloor_DZ: ModularItems { scope = 2; @@ -1782,6 +1844,34 @@ class CfgVehicles { }; // ghost models + class CinderWallHalf_Preview_DZ: NonStrategic + { + scope = 2; + destrType = "DestructNo"; + cost = 100; + offset[] = {0,1.5,0}; + model="\z\addons\dayz_epoch\models\Cinder_Wall_Half_ghost.p3d"; + icon = "\ca\data\data\Unknown_object.paa"; + mapSize = 2; + armor = 1000; + displayName = "Cinder Block Wall 1/2"; + vehicleClass = "Fortifications"; + }; + class CinderWall_Preview_DZ: NonStrategic + { + scope = 2; + destrType = "DestructNo"; + cost = 100; + offset[] = {0,1.5,0}; + model="\z\addons\dayz_epoch\models\Cinder_Wall_ghost.p3d"; + icon = "\ca\data\data\Unknown_object.paa"; + mapSize = 2; + armor = 1000; + displayName = "Cinder Block Wall"; + vehicleClass = "Fortifications"; + }; + + class WoodFloorQuarter_Preview_DZ: NonStrategic { scope = 2; diff --git a/SQF/dayz_code/config.cpp b/SQF/dayz_code/config.cpp index 59c3dbf16..6d5f486c5 100644 --- a/SQF/dayz_code/config.cpp +++ b/SQF/dayz_code/config.cpp @@ -544,7 +544,7 @@ class CfgBuildingLoot { { "ItemTentDomed","magazine" }, { "","military" }, { "","trash" }, - {"Crossbow_DZ","weapon"}, + { "Crossbow_DZ","weapon" }, { "Binocular","weapon" }, { "PartPlywoodPack","magazine" }, { "clothes","single" }, @@ -691,14 +691,15 @@ class CfgBuildingLoot { { "ItemWire","magazine" }, {"ItemTankTrap","magazine"}, {"ItemKeyKit","weapon"}, - {"CinderBlocks","magazine"} + {"CinderBlocks","magazine"}, + {"MortarBucket","magazine"} }; itemChance[] = { 0.01, 0.01, 0.01, - 0.17, - 0.26, + 0.16, + 0.25, 0.04, 0.04, 0.05, @@ -713,7 +714,8 @@ class CfgBuildingLoot { 0.01, 0.04, 0.01, - 0.02, + 0.03, + 0.01 }; }; class IndustrialFuel: Default { diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index b0e7d7ead..39fb81d3c 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -450,7 +450,7 @@ if(isNil "dayz_zedsAttackVehicles") then { dayz_updateObjects = ["Car", "Helicopter", "Motorcycle", "Ship", "TentStorage", "VaultStorage","LockboxStorage","OutHouse_DZ","Wooden_shed_DZ","WoodShack_DZ","StorageShed_DZ"]; dayz_disallowedVault = ["TentStorage", "BuiltItems"]; dayz_reveal = ["AllVehicles","WeaponHolder","Land_A_tent","BuiltItems","ModularItems"]; -dayz_allowedObjects = ["TentStorage","TentStorageDomed","TentStorageDomed2", "VaultStorageLocked", "Hedgehog_DZ", "Sandbag1_DZ","TrapBear","Fort_RazorWire","WoodGate_DZ","Land_HBarrier1_DZ","Land_HBarrier3_DZ","Fence_corrugated_DZ","M240Nest_DZ","CanvasHut_DZ","ParkBench_DZ","MetalGate_DZ","OutHouse_DZ","Wooden_shed_DZ","WoodShack_DZ","StorageShed_DZ","Plastic_Pole_EP1_DZ","Generator_DZ","StickFence_DZ","LightPole_DZ","FuelPump_DZ","DesertCamoNet_DZ","ForestCamoNet_DZ","DesertLargeCamoNet_DZ","ForestLargeCamoNet_DZ","SandNest_DZ","DeerStand_DZ","MetalPanel_DZ","WorkBench_DZ","WoodFloor_DZ","WoodLargeWall_DZ","WoodLargeWallDoor_DZ","WoodLargeWallWin_DZ","WoodSmallWall_DZ","WoodSmallWallWin_DZ","WoodSmallWallDoor_DZ","LockboxStorageLocked","WoodFloorHalf_DZ","WoodFloorQuarter_DZ","WoodStairs_DZ","WoodStairsSans_DZ","WoodSmallWallThird_DZ","WoodLadder_DZ","Land_DZE_GarageWoodDoor","Land_DZE_LargeWoodDoor","Land_DZE_WoodDoor","Land_DZE_GarageWoodDoorLocked","Land_DZE_LargeWoodDoorLocked","Land_DZE_WoodDoorLocked"]; +dayz_allowedObjects = ["TentStorage","TentStorageDomed","TentStorageDomed2", "VaultStorageLocked", "Hedgehog_DZ", "Sandbag1_DZ","TrapBear","Fort_RazorWire","WoodGate_DZ","Land_HBarrier1_DZ","Land_HBarrier3_DZ","Fence_corrugated_DZ","M240Nest_DZ","CanvasHut_DZ","ParkBench_DZ","MetalGate_DZ","OutHouse_DZ","Wooden_shed_DZ","WoodShack_DZ","StorageShed_DZ","Plastic_Pole_EP1_DZ","Generator_DZ","StickFence_DZ","LightPole_DZ","FuelPump_DZ","DesertCamoNet_DZ","ForestCamoNet_DZ","DesertLargeCamoNet_DZ","ForestLargeCamoNet_DZ","SandNest_DZ","DeerStand_DZ","MetalPanel_DZ","WorkBench_DZ","WoodFloor_DZ","WoodLargeWall_DZ","WoodLargeWallDoor_DZ","WoodLargeWallWin_DZ","WoodSmallWall_DZ","WoodSmallWallWin_DZ","WoodSmallWallDoor_DZ","LockboxStorageLocked","WoodFloorHalf_DZ","WoodFloorQuarter_DZ","WoodStairs_DZ","WoodStairsSans_DZ","WoodSmallWallThird_DZ","WoodLadder_DZ","Land_DZE_GarageWoodDoor","Land_DZE_LargeWoodDoor","Land_DZE_WoodDoor","Land_DZE_GarageWoodDoorLocked","Land_DZE_LargeWoodDoorLocked","Land_DZE_WoodDoorLocked","CinderWallHalf_DZ","CinderWall_DZ"]; DZE_LockableStorage = ["VaultStorage","VaultStorageLocked","LockboxStorageLocked","LockboxStorage"]; DZE_LockedStorage = ["VaultStorageLocked","LockboxStorageLocked"];