From 215932d7f727347da73fe61ce22a8fef91c7d6a5 Mon Sep 17 00:00:00 2001 From: AirwavesMan Date: Thu, 29 Oct 2020 14:59:14 +0100 Subject: [PATCH] Add models and icons for lockbox winter Models made by @Helion4 --- .../Configs/CfgMagazines/Buildings/Storage.hpp | 12 ++++++------ .../Configs/CfgServerTrader/Category/Parts.hpp | 6 +++++- .../Configs/CfgServerTraderZSC/Category/Parts.hpp | 6 +++++- .../CfgVehicles/Buildables/LockableStorage.hpp | 8 ++++---- SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp | 2 +- SQF/dayz_code/init/variables.sqf | 4 ++-- 6 files changed, 23 insertions(+), 15 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgMagazines/Buildings/Storage.hpp b/SQF/dayz_code/Configs/CfgMagazines/Buildings/Storage.hpp index 6cf84512e..fb2266dd8 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Buildings/Storage.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Buildings/Storage.hpp @@ -292,7 +292,7 @@ class ItemLockbox: CA_Magazine type = 256; displayName = $STR_EPOCH_LOCKBOX; model = "\z\addons\dayz_epoch\models\lockbox_mag.p3d"; - picture = "\z\addons\dayz_epoch\pictures\equip_lockbox_CA.paa"; + picture = "\dayz_epoch_c\icons\equipment\equip_lockbox_CA.paa"; descriptionShort = $STR_EPOCH_LOCKBOX_DESC; class ItemActions @@ -314,7 +314,7 @@ class ItemLockbox2: CA_Magazine type = 256; displayName = "$STR_EPOCH_LOCKBOX+"; model = "\z\addons\dayz_epoch\models\lockbox_mag.p3d"; - picture = "\z\addons\dayz_epoch\pictures\equip_lockbox_CA.paa"; + picture = "\dayz_epoch_c\icons\equipment\equip_lockbox_CA.paa"; descriptionShort = $STR_EPOCH_LOCKBOX_DESC; class ItemActions @@ -335,8 +335,8 @@ class ItemLockboxWinter: CA_Magazine count = 1; type = 256; displayName = $STR_EPOCH_LOCKBOX; - model = "\z\addons\dayz_epoch\models\lockbox_mag.p3d"; - picture = "\z\addons\dayz_epoch\pictures\equip_lockbox_CA.paa"; + model = "\z\addons\dayz_epoch\models\lockbox_w_mag.p3d"; + picture = "\dayz_epoch_c\icons\equipment\equip_lockbox_w_CA.paa"; descriptionShort = $STR_EPOCH_LOCKBOX_DESC; class ItemActions @@ -357,8 +357,8 @@ class ItemLockboxWinter2: CA_Magazine count = 1; type = 256; displayName = "$STR_EPOCH_LOCKBOX+"; - model = "\z\addons\dayz_epoch\models\lockbox_mag.p3d"; - picture = "\z\addons\dayz_epoch\pictures\equip_lockbox_CA.paa"; + model = "\z\addons\dayz_epoch\models\lockbox_w_mag.p3d"; + picture = "\dayz_epoch_c\icons\equipment\equip_lockbox_w_CA.paa"; descriptionShort = $STR_EPOCH_LOCKBOX_DESC; class ItemActions diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/Parts.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/Parts.hpp index be1af38fc..f360dcc9f 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Parts.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Parts.hpp @@ -67,8 +67,12 @@ class Category_35 { class ItemCorrugated {type = "trade_items";buy[] = {2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};}; class plot_pole_kit {type = "trade_items";buy[] = {6,"ItemGoldBar10oz"};sell[] = {6,"ItemGoldBar10oz"};}; class ItemComboLock {type = "trade_items";buy[] = {2,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};}; - class ItemLockbox {type = "trade_items";buy[] = {-8,"ItemGoldBar10oz"};sell[] = {4,"ItemGoldBar10oz"};}; + class ItemLockbox {type = "trade_items";buy[] = {-8,"ItemGoldBar10oz"};sell[] = {4,"ItemGoldBar10oz"};}; + class ItemLockbox2 {type = "trade_items";buy[] = {-8,"ItemGoldBar10oz"};sell[] = {6,"ItemGoldBar10oz"};}; + class ItemLockboxWinter {type = "trade_items";buy[] = {-8,"ItemGoldBar10oz"};sell[] = {4,"ItemGoldBar10oz"};}; + class ItemLockboxWinter2 {type = "trade_items";buy[] = {-8,"ItemGoldBar10oz"};sell[] = {6,"ItemGoldBar10oz"};}; class ItemVault {type = "trade_items";buy[] = {1,"ItemBriefcase100oz"};sell[] = {1,"ItemBriefcase100oz"};}; + class ItemVault2 {type = "trade_items";buy[] = {-1,"ItemBriefcase100oz"};sell[] = {15,"ItemGoldBar10oz"};}; class ItemMixOil {type = "trade_items";buy[] = {8,"ItemSilverBar"};sell[] = {4,"ItemSilverBar"};}; }; diff --git a/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Parts.hpp b/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Parts.hpp index ddefbd56f..ee759c6f3 100644 --- a/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Parts.hpp +++ b/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Parts.hpp @@ -67,8 +67,12 @@ class Category_35 { class ItemCorrugated {type = "trade_items";buy[] = {200,"worth"};sell[] = {100,"worth"};}; class plot_pole_kit {type = "trade_items";buy[] = {6000,"worth"};sell[] = {6000,"worth"};}; class ItemComboLock {type = "trade_items";buy[] = {2000,"worth"};sell[] = {1000,"worth"};}; - class ItemLockbox {type = "trade_items";buy[] = {-100,"worth"};sell[] = {4000,"worth"};}; + class ItemLockbox {type = "trade_items";buy[] = {-100,"worth"};sell[] = {4000,"worth"};}; + class ItemLockbox2 {type = "trade_items";buy[] = {-100,"worth"};sell[] = {6000,"worth"};}; + class ItemLockboxWinter {type = "trade_items";buy[] = {-100,"worth"};sell[] = {4000,"worth"};}; + class ItemLockboxWinter2 {type = "trade_items";buy[] = {-100,"worth"};sell[] = {6000,"worth"};}; class ItemVault {type = "trade_items";buy[] = {10000,"worth"};sell[] = {10000,"worth"};}; + class ItemVault2 {type = "trade_items";buy[] = {-10000,"worth"};sell[] = {15000,"worth"};}; class ItemMixOil {type = "trade_items";buy[] = {8,"worth"};sell[] = {4,"worth"};}; }; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Buildables/LockableStorage.hpp b/SQF/dayz_code/Configs/CfgVehicles/Buildables/LockableStorage.hpp index 3ad34ae0b..1f555d169 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Buildables/LockableStorage.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Buildables/LockableStorage.hpp @@ -119,7 +119,7 @@ class LockboxStorage2Locked: Land_A_tent { class LockboxStorageWinter: Land_A_tent { vehicleClass = "DayZ Epoch Buildables"; displayName = $STR_EPOCH_LOCKBOX; - model = "\z\addons\dayz_epoch\models\lockbox.p3d"; + model = "\z\addons\dayz_epoch\models\lockbox_w.p3d"; destrType = "DestructNo"; armor = 800; transportMaxMagazines = 50; @@ -131,7 +131,7 @@ class LockboxStorageWinter: Land_A_tent { class LockboxStorageWinterLocked: Land_A_tent { vehicleClass = "DayZ Epoch Buildables"; displayName = $STR_EPOCH_LOCKBOX_LOCKED; - model = "\z\addons\dayz_epoch\models\lockbox.p3d"; + model = "\z\addons\dayz_epoch\models\lockbox_w.p3d"; destrType = "DestructNo"; armor = 800; transportMaxMagazines = 0; @@ -148,7 +148,7 @@ class LockboxStorageWinterLocked: Land_A_tent { class LockboxStorageWinter2: Land_A_tent { vehicleClass = "DayZ Epoch Buildables"; displayName = "$STR_EPOCH_LOCKBOX+"; - model = "\z\addons\dayz_epoch\models\lockbox.p3d"; + model = "\z\addons\dayz_epoch\models\lockbox_w.p3d"; destrType = "DestructNo"; armor = 1600; transportMaxMagazines = 100; @@ -160,7 +160,7 @@ class LockboxStorageWinter2: Land_A_tent { class LockboxStorageWinter2Locked: Land_A_tent { vehicleClass = "DayZ Epoch Buildables"; displayName = "$STR_EPOCH_LOCKBOX_LOCKED+"; - model = "\z\addons\dayz_epoch\models\lockbox.p3d"; + model = "\z\addons\dayz_epoch\models\lockbox_w.p3d"; destrType = "DestructNo"; armor = 1600; transportMaxMagazines = 0; diff --git a/SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp b/SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp index ce7e623dd..f8861d128 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp @@ -368,7 +368,7 @@ class WeaponHolder_ItemLockbox2: WeaponHolder { seedItem = "ItemLockbox2"; }; -class WeaponHolder_ItemLockboWinter: WeaponHolder { +class WeaponHolder_ItemLockboxWinter: WeaponHolder { scope = 1; displayName = $STR_EPOCH_LOCKBOX; seedItem = "ItemLockboxWinter"; diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index a38c0eb1d..2d4f1101f 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -1,8 +1,8 @@ /**************Variables Compiled on Both Client and Server**************/ Dayz_plants = ["Dayz_Plant1","Dayz_Plant2","Dayz_Plant3"]; -DayZ_SafeObjects = ["Base_Fire_DZ","Land_Fire_DZ","TentStorage","TentStorage0","TentStorage1","TentStorage2","TentStorage3","TentStorage4","StashSmall","StashSmall1","StashSmall2","StashSmall3","StashSmall4","StashMedium","StashMedium1","StashMedium2","StashMedium3","StashMedium4","Wire_cat1","Sandbag1_DZ","Fence_DZ","Generator_DZ","Hedgehog_DZ","BearTrap_DZ","DomeTentStorage","DomeTentStorage0","DomeTentStorage1","DomeTentStorage2","DomeTentStorage3","DomeTentStorage4","CamoNet_DZ","Trap_Cans","TrapTripwireFlare","TrapBearTrapSmoke","TrapTripwireGrenade","TrapTripwireSmoke","TrapBearTrapFlare","TentStorageDomed","VaultStorageLocked","VaultStorage2Locked","BagFenceRound_DZ","TrapBear","Fort_RazorWire","Land_HBarrier1_DZ","Land_HBarrier3_DZ","Land_HBarrier5_DZ","Fence_corrugated_DZ","M240Nest_DZ","CanvasHut_DZ","ParkBench_DZ","MetalGate_DZ","OutHouse_DZ","Wooden_shed_DZ","Wooden_shed2_DZ","WoodShack_DZ","WoodShack2_DZ","StorageShed_DZ","StorageShed2_DZ","Plastic_Pole_EP1_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","LockboxStorage2Locked","LockboxStorageWinter2Locked","WoodFloorHalf_DZ","WoodFloorQuarter_DZ","WoodStairs_DZ","WoodStairsSans_DZ","WoodStairsRails_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","CinderWallDoorway_DZ","CinderWallDoor_DZ","CinderWallDoorLocked_DZ","CinderWallSmallDoorway_DZ","CinderWallDoorSmall_DZ","CinderWallDoorSmallLocked_DZ","MetalFloor_DZ","WoodRamp_DZ","GunRack_DZ","GunRack2_DZ","FireBarrel_DZ","WoodCrate_DZ","WoodCrate2_DZ","Scaffolding_DZ","DesertTentStorage","DesertTentStorage0","DesertTentStorage1","DesertTentStorage2","DesertTentStorage3","DesertTentStorage4","WoodenFence_1_foundation_DZ","WoodenFence_1_frame_DZ","WoodenFence_quaterpanel_DZ","WoodenFence_halfpanel_DZ","WoodenFence_thirdpanel_DZ","WoodenFence_1_DZ","WoodenFence_2_DZ","WoodenFence_3_DZ","WoodenFence_4_DZ","WoodenFence_5_DZ","WoodenFence_6_DZ","WoodenFence_7_DZ","MetalFence_1_foundation_DZ","MetalFence_1_frame_DZ","MetalFence_halfpanel_DZ","MetalFence_thirdpanel_DZ","MetalFence_1_DZ","MetalFence_2_DZ","MetalFence_3_DZ","MetalFence_4_DZ","MetalFence_5_DZ","MetalFence_6_DZ","MetalFence_7_DZ","WoodenGate_foundation_DZ","WoodenGate_1_DZ","WoodenGate_2_DZ","WoodenGate_3_DZ","WoodenGate_4_DZ"]; -DayZ_GearedObjects = ["Car","Helicopter","Motorcycle","Ship","TentStorage_base","StashSmall_base","StashMedium_base","Plane","Tank","VaultStorage","LockboxStorage","TentStorage","OutHouse_DZ","Wooden_shed_DZ","Wooden_shed2_DZ","WoodShack_DZ","WoodShack2_DZ","StorageShed_DZ","StorageShed2_DZ","GunRack_DZ","GunRack2_DZ","WoodCrate_DZ","WoodCrate2_DZ","Scaffolding_DZ","Generator_DZ"]; +DayZ_SafeObjects = ["Base_Fire_DZ","Land_Fire_DZ","TentStorage","TentStorage0","TentStorage1","TentStorage2","TentStorage3","TentStorage4","StashSmall","StashSmall1","StashSmall2","StashSmall3","StashSmall4","StashMedium","StashMedium1","StashMedium2","StashMedium3","StashMedium4","Wire_cat1","Sandbag1_DZ","Fence_DZ","Generator_DZ","Hedgehog_DZ","BearTrap_DZ","DomeTentStorage","DomeTentStorage0","DomeTentStorage1","DomeTentStorage2","DomeTentStorage3","DomeTentStorage4","CamoNet_DZ","Trap_Cans","TrapTripwireFlare","TrapBearTrapSmoke","TrapTripwireGrenade","TrapTripwireSmoke","TrapBearTrapFlare","TentStorageDomed","VaultStorageLocked","VaultStorage2Locked","BagFenceRound_DZ","TrapBear","Fort_RazorWire","Land_HBarrier1_DZ","Land_HBarrier3_DZ","Land_HBarrier5_DZ","Fence_corrugated_DZ","M240Nest_DZ","CanvasHut_DZ","ParkBench_DZ","MetalGate_DZ","OutHouse_DZ","Wooden_shed_DZ","Wooden_shed2_DZ","WoodShack_DZ","WoodShack2_DZ","StorageShed_DZ","StorageShed2_DZ","Plastic_Pole_EP1_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","LockboxStorage2Locked","LockboxStorageWinterLocked","LockboxStorageWinter2Locked","WoodFloorHalf_DZ","WoodFloorQuarter_DZ","WoodStairs_DZ","WoodStairsSans_DZ","WoodStairsRails_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","CinderWallDoorway_DZ","CinderWallDoor_DZ","CinderWallDoorLocked_DZ","CinderWallSmallDoorway_DZ","CinderWallDoorSmall_DZ","CinderWallDoorSmallLocked_DZ","MetalFloor_DZ","WoodRamp_DZ","GunRack_DZ","GunRack2_DZ","FireBarrel_DZ","WoodCrate_DZ","WoodCrate2_DZ","Scaffolding_DZ","DesertTentStorage","DesertTentStorage0","DesertTentStorage1","DesertTentStorage2","DesertTentStorage3","DesertTentStorage4","WoodenFence_1_foundation_DZ","WoodenFence_1_frame_DZ","WoodenFence_quaterpanel_DZ","WoodenFence_halfpanel_DZ","WoodenFence_thirdpanel_DZ","WoodenFence_1_DZ","WoodenFence_2_DZ","WoodenFence_3_DZ","WoodenFence_4_DZ","WoodenFence_5_DZ","WoodenFence_6_DZ","WoodenFence_7_DZ","MetalFence_1_foundation_DZ","MetalFence_1_frame_DZ","MetalFence_halfpanel_DZ","MetalFence_thirdpanel_DZ","MetalFence_1_DZ","MetalFence_2_DZ","MetalFence_3_DZ","MetalFence_4_DZ","MetalFence_5_DZ","MetalFence_6_DZ","MetalFence_7_DZ","WoodenGate_foundation_DZ","WoodenGate_1_DZ","WoodenGate_2_DZ","WoodenGate_3_DZ","WoodenGate_4_DZ"]; +DayZ_GearedObjects = ["Car","Helicopter","Motorcycle","Ship","TentStorage_base","StashSmall_base","StashMedium_base","Plane","Tank","VaultStorage","VaultStorage2","LockboxStorage","LockboxStorage2","LockboxStorageWinter","LockboxStorageWinter2","TentStorage","OutHouse_DZ","Wooden_shed_DZ","Wooden_shed2_DZ","WoodShack_DZ","WoodShack2_DZ","StorageShed_DZ","StorageShed2_DZ","GunRack_DZ","GunRack2_DZ","WoodCrate_DZ","WoodCrate2_DZ","Scaffolding_DZ","Generator_DZ"]; dayz_typedBags = ["emptyBloodBag","bloodTester","bloodBagANEG","bloodBagAPOS","bloodBagBNEG","bloodBagBPOS","bloodBagABNEG","bloodBagABPOS","bloodBagONEG","bloodBagOPOS","wholeBloodBagANEG","wholeBloodBagAPOS","wholeBloodBagBNEG","wholeBloodBagBPOS","wholeBloodBagABNEG","wholeBloodBagABPOS","wholeBloodBagONEG","wholeBloodBagOPOS"]; dayz_plant = ["pumpkin.p3d","p_helianthus.p3d","p_fiberplant_ep1.p3d"]; dayz_trees = ["ind_timbers.p3d","t_picea2s_snow.p3d","b_corylus.p3d","t_quercus3s.p3d","t_larix3s.p3d","t_pyrus2s.p3d","str_briza_kriva.p3d","dd_borovice.p3d","les_singlestrom_b.p3d","les_singlestrom.p3d","smrk_velky.p3d","smrk_siroky.p3d","smrk_maly.p3d","les_buk.p3d","str krovisko vysoke.p3d","str_fikovnik_ker.p3d","str_fikovnik.p3d","str vrba.p3d","hrusen2.p3d","str dub jiny.p3d","str lipa.p3d","str briza.p3d","p_akat02s.p3d","jablon.p3d","p_buk.p3d","str_topol.p3d","str_topol2.p3d","p_osika.p3d","t_picea3f.p3d","t_picea2s.p3d","t_picea1s.p3d","t_fagus2w.p3d","t_fagus2s.p3d","t_fagus2f.p3d","t_betula1f.p3d","t_betula2f.p3d","t_betula2s.p3d","t_betula2w.p3d","t_alnus2s.p3d","t_acer2s.p3d","t_populus3s.p3d","t_quercus2f.p3d","t_sorbus2s.p3d","t_malus1s.p3d","t_salix2s.p3d","t_picea1s_w.p3d","t_picea2s_w.p3d","t_ficusb2s_ep1.p3d","t_populusb2s_ep1.p3d","t_populusf2s_ep1.p3d","t_amygdalusc2s_ep1.p3d","t_pistacial2s_ep1.p3d","t_pinuse2s_ep1.p3d","t_pinuss3s_ep1.p3d","t_prunuss2s_ep1.p3d","t_pinusn2s.p3d","t_pinusn1s.p3d","t_pinuss2f.p3d","t_poplar2f_dead_pmc.p3d","misc_torzotree_pmc.p3d","misc_burnspruce_pmc.p3d","brg_cocunutpalm8.p3d","brg_umbrella_acacia01b.p3d","brg_jungle_tree_canopy_1.p3d","brg_jungle_tree_canopy_2.p3d","brg_cocunutpalm4.p3d","brg_cocunutpalm3.p3d","palm_01.p3d","palm_02.p3d","palm_03.p3d","palm_04.p3d","palm_09.p3d","palm_10.p3d","brg_cocunutpalm2.p3d","brg_jungle_tree_antiaris.p3d","brg_cocunutpalm1.p3d","str habr.p3d","brg_bird_1.p3d","brg_bird_2.p3d","brg_bird_3.p3d","brg_umbrella_acacia02b.p3d","brg_africandoumpalm_1.p3d","brg_umbrella_acacia04b.p3d","brg_datepalm_4.p3d","brg_datepalm_1.p3d","brg_umbrella_acacia03b.p3d","brg_bottle_4.p3d","brg_aloe1.p3d","brg_umbrella_acacia03.p3d","brg_umbrella_acacia01.p3d","brg_umbrella_acacia04.p3d","brg_aloe2.p3d","brg_umbrella_acacia02.p3d","brg_aloe3.p3d","brg_bottle_1.p3d","brg_datepalm_3.p3d","brg_datepalm_2.p3d","brg_baobab_1.p3d","brg_bottle_2.p3d","brg_bottle_3.p3d","t_fraxinus2s.p3d","t_carpinus2s.p3d"];