From cb56f7fffd4323e5d111166a1aa1678a5397fb0d Mon Sep 17 00:00:00 2001 From: vbawol Date: Tue, 7 May 2013 12:21:54 -0500 Subject: [PATCH] 1.0.0.8 Developer Build + [REMOVED] Auto refuel from gas stations in Panthera + [ADDED] added Land_benzina_schnell to standard and power assisted filling. + [ADDED] more clothes: Rocker1_DZ, Rocker3_DZ, Rocker4_DZ, GUE_Soldier_2_DZ,GUE_Soldier_CO_DZ, GUE_Soldier_Crew_DZ, GUE_Soldier_Sniper_DZ, GUE_Soldier_MG_DZ + [CHANGED] Disabled radar on UH1Y with UH1Y_DZ + [CHANGED] Disabled radar on MV22 with MV22_DZ + [CHANGED] Moved standard fuel sources to array dayz_fuelsources + [ADDED] Added weights for new items. --- .../R3F_Realism/R3F_Weight/R3F_CfgWeight.h | 189 +++++++++++++++++- Server Files/Battleye/setpos.txt | 3 + dayz_code/CfgMagazines.hpp | 4 +- dayz_code/cfgLoot.hpp | 10 + dayz_code/cfgVehicles.hpp | 187 ++++++++++++++++- dayz_code/compile/fn_selfActions.sqf | 4 +- dayz_code/config.cpp | 35 ++++ dayz_code/init/variables.sqf | 8 +- dayz_equip/config.cpp | 92 +++++++-- 9 files changed, 504 insertions(+), 28 deletions(-) diff --git a/MPMissions/TEMPLATE/R3F_Realism/R3F_Weight/R3F_CfgWeight.h b/MPMissions/TEMPLATE/R3F_Realism/R3F_Weight/R3F_CfgWeight.h index e2a826787..ebcbec8cb 100644 --- a/MPMissions/TEMPLATE/R3F_Realism/R3F_Weight/R3F_CfgWeight.h +++ b/MPMissions/TEMPLATE/R3F_Realism/R3F_Weight/R3F_CfgWeight.h @@ -1208,6 +1208,10 @@ class CfgWeight { weight = 1; }; + class MeleeMachete + { + weight = 1; + }; class ItemHatchet { weight = 1; @@ -1228,8 +1232,43 @@ class CfgWeight { weight = 1; }; - - + + class Skin_FR_OHara_DZ + { + weight = 1; + }; + class Skin_FR_Rodriguez_DZ + { + weight = 1; + }; + class Skin_CZ_Soldier_Sniper_EP1_DZ + { + weight = 1; + }; + class Skin_Graves_Light_DZ + { + weight = 1; + }; + class Skin_GUE_Soldier_MG_DZ + { + weight = 1; + }; + class Skin_GUE_Soldier_Sniper_DZ + { + weight = 1; + }; + class Skin_GUE_Soldier_Crew_DZ + { + weight = 1; + }; + class Skin_GUE_Soldier_CO_DZ + { + weight = 1; + }; + class Skin_GUE_Soldier_2_DZ + { + weight = 1; + }; class Skin_Survivor2_DZ { weight = 1; @@ -1278,10 +1317,22 @@ class CfgWeight { weight = 1; }; + class Skin_Rocker1_DZ + { + weight = 1; + }; class Skin_Rocker2_DZ { weight = 1; }; + class Skin_Rocker3_DZ + { + weight = 1; + }; + class Skin_Rocker4_DZ + { + weight = 1; + }; class Skin_Bandit1_DZ { weight = 1; @@ -1389,7 +1440,7 @@ class CfgWeight }; class PartWoodPile { - weight = 0.5; + weight = 1; }; class PartWheel { @@ -1435,6 +1486,10 @@ class CfgWeight { weight = 5; }; + class ItemTentDomed2 + { + weight = 5; + }; class TrapBear { weight = 1; @@ -1558,7 +1613,131 @@ class CfgWeight }; - - + class ItemCanvas + { + weight = 4; + }; + class ItemBurlap + { + weight = 8; + }; + class ItemLightBulb + { + weight = 0.02; + }; + class ItemPole + { + weight = 10; + }; + class ItemCorrugated + { + weight = 29; + }; + class PartWoodPlywood + { + weight = 4; + }; + class PartWoodLumber + { + weight = 2; + }; + + class 30m_plot_kit + { + weight = 0.02; + }; + class fuel_pump_kit + { + weight = 50; + }; + class light_pole_kit + { + weight = 10; + }; + class stick_fence_kit + { + weight = 6; + }; + class park_bench_kit + { + weight = 50; + }; + class wood_shack_kit + { + weight = 50; + }; + class storage_shed_kit + { + weight = 100; + }; + class outhouse_kit + { + weight = 50; + }; + class wooden_shed_kit + { + weight = 75; + }; + class rusty_gate_kit + { + weight = 80; + }; + class sun_shade_kit + { + weight = 50; + }; + class m240_nest_kit + { + weight = 100; + }; + class ItemFuelBarrel + { + weight = 167; + }; + class ItemFuelBarrelEmpty + { + weight = 20; + }; + class ItemOilBarrel + { + weight = 140; + }; + + class bulk_NVGoggles + { + weight = 25; + }; + class bulk_DZ_Backpack_EP1 + { + weight = 25; + }; + class bulk_15Rnd_9x19_M9SD + { + weight = 25; + }; + class bulk_30Rnd_556x45_StanagSD + { + weight = 25; + }; + class bulk_ItemSandbag + { + weight = 25; + }; + class bulk_ItemGPS + { + weight = 25; + }; + class bulk_ItemMap + { + weight = 25; + }; + class bulk_ItemEtool + { + weight = 25; + }; + class bulk_17Rnd_9x19_glock17 + { + weight = 25; + }; }; }; \ No newline at end of file diff --git a/Server Files/Battleye/setpos.txt b/Server Files/Battleye/setpos.txt index f28b22c50..5fe714134 100644 --- a/Server Files/Battleye/setpos.txt +++ b/Server Files/Battleye/setpos.txt @@ -14,7 +14,10 @@ 5 "Camo1_DZ" 5 "Soldier1_DZ" 5 "Rocket_DZ" +5 "Rocker1_DZ" 5 "Rocker2_DZ" +5 "Rocker3_DZ" +5 "Rocker4_DZ" 5 "Priest_DZ" 5 "Functionary1_EP1_DZ" 5 "GUE_Commander_DZ" diff --git a/dayz_code/CfgMagazines.hpp b/dayz_code/CfgMagazines.hpp index d9610b858..20251e077 100644 --- a/dayz_code/CfgMagazines.hpp +++ b/dayz_code/CfgMagazines.hpp @@ -56,7 +56,7 @@ class CfgMagazines { { text = "Craft Large Sandbag"; script = "spawn player_craftItem;"; - neednearby[] = {}; + neednearby[] = {"workshop"}; requiretools[] = {"ItemEtool","ItemToolbox"}; output[] = {{"ItemSandbagLarge",1}}; input[] = {{"ItemSandbag",3},{"ItemWire",1},{"ItemTankTrap",1}}; @@ -65,7 +65,7 @@ class CfgMagazines { { text = "Craft M240 Nest"; script = "spawn player_craftItem1;"; - neednearby[] = {}; + neednearby[] = {"workshop"}; requiretools[] = {"ItemEtool","ItemToolbox","M240_DZ"}; output[] = {{"m240_nest_kit",1}}; input[] = {{"ItemSandbag",4},{"ItemCanvas",1},{"PartWoodPlywood",4},{"PartWoodLumber",3}}; diff --git a/dayz_code/cfgLoot.hpp b/dayz_code/cfgLoot.hpp index a9cceacd9..3c0d445d6 100644 --- a/dayz_code/cfgLoot.hpp +++ b/dayz_code/cfgLoot.hpp @@ -416,6 +416,11 @@ class CfgLoot { "Skin_TK_INS_Warlord_EP1", "Skin_SurvivorWcombat_DZ", "Skin_SurvivorWdesert_DZ", + "Skin_GUE_Soldier_MG_DZ", + "Skin_GUE_Soldier_Sniper_DZ", + "Skin_GUE_Soldier_Crew_DZ", + "Skin_GUE_Soldier_CO_DZ", + "Skin_GUE_Soldier_2_DZ", }, { 0.01, //"Skin_Ins_Soldier_GL_DZ", @@ -428,6 +433,11 @@ class CfgLoot { 0.01, //"Skin_TK_INS_Warlord_EP1", 0.01, //"Skin_SurvivorWcombat_DZ", 0.03, //"Skin_SurvivorWdesert_DZ", + 0.01, //"Skin_GUE_Soldier_MG_DZ", + 0.01, //"Skin_GUE_Soldier_Sniper_DZ", + 0.01, //"Skin_GUE_Soldier_Crew_DZ", + 0.01, //"Skin_GUE_Soldier_CO_DZ", + 0.01, //"Skin_GUE_Soldier_2_DZ", } }; }; \ No newline at end of file diff --git a/dayz_code/cfgVehicles.hpp b/dayz_code/cfgVehicles.hpp index 91d9bc402..26d297e18 100644 --- a/dayz_code/cfgVehicles.hpp +++ b/dayz_code/cfgVehicles.hpp @@ -192,8 +192,58 @@ class Citizen1; // External class reference transportmaxbackpacks = 10; }; - - + // UH1Y + class UH1_Base: Helicopter + { + class Turrets: Turrets + { + class MainTurret: MainTurret + { + class ViewOptics: ViewOptics {}; + class Turrets: Turrets {}; + }; + class RightDoorGun: MainTurret + { + class Turrets: Turrets {}; + }; + class CoPilotObs: MainTurret + { + class Turrets: Turrets {}; + }; + + }; + }; + class UH1Y_DZ: UH1_Base + { + scope = 2; + side = 2; + crew = ""; + typicalCargo[] = {}; + hiddenSelections[] = {}; + class TransportMagazines{}; + class TransportWeapons{}; + commanderCanSee = 2+16+32; + gunnerCanSee = 2+16+32; + driverCanSee = 2+16+32; + transportMaxWeapons = 5; + transportMaxMagazines = 25; + transportmaxbackpacks = 4; + weapons[] = {}; + magazines[] = {}; + + class Turrets : Turrets + { + class MainTurret : MainTurret + { + magazines[] = {"2000Rnd_762x51_M134"}; + }; + class RightDoorGun : RightDoorGun + { + magazines[] = {"2000Rnd_762x51_M134"}; + }; + }; + }; + class UH1H_base: Helicopter { class Turrets: Turrets @@ -284,6 +334,20 @@ class Citizen1; // External class reference transportMaxMagazines = 200; transportmaxbackpacks = 5; }; + class MV22; + class MV22_DZ : MV22 { + accuracy = 1000; + scope = 2; + displayName = "MV-22"; + crew = ""; + typicalCargo[] = {}; + commanderCanSee = 2+16+32; + gunnerCanSee = 2+16+32; + driverCanSee = 2+16+32; + transportMaxWeapons = 20; + transportMaxMagazines = 400; + transportmaxbackpacks = 10; + }; class ArmoredSUV_PMC; class ArmoredSUV_PMC_DZ : ArmoredSUV_PMC { @@ -683,6 +747,74 @@ class Citizen1; // External class reference canHideBodies = 1; }; + // new bandits + class GUE_Soldier_MG; + class GUE_Soldier_MG_DZ: GUE_Soldier_MG { + displayName = "Bandit Gunner"; + side = 1; + weapons[] = {"Throw","Put"}; + backpack = ""; + magazines[] = {}; + respawnWeapons[] = {"Throw","Put"}; + respawnMagazines[] = {}; + weaponSlots = "1 + 4 + 12* 256 + 2* 4096 + 2 + 8* 16 + 12*131072"; + canHideBodies = 1; + canCarryBackPack = 1; + }; + class GUE_Soldier_Sniper; + class GUE_Soldier_Sniper_DZ: GUE_Soldier_Sniper { + displayName = "Bandit Sniper"; + side = 1; + weapons[] = {"Throw","Put"}; + backpack = ""; + magazines[] = {}; + respawnWeapons[] = {"Throw","Put"}; + respawnMagazines[] = {}; + weaponSlots = "1 + 4 + 12* 256 + 2* 4096 + 2 + 8* 16 + 12*131072"; + canHideBodies = 1; + canCarryBackPack = 1; + }; + class GUE_Soldier_Crew; + class GUE_Soldier_Crew_DZ: GUE_Soldier_Crew { + displayName = "Bandit "; + side = 1; + weapons[] = {"Throw","Put"}; + backpack = ""; + magazines[] = {}; + respawnWeapons[] = {"Throw","Put"}; + respawnMagazines[] = {}; + weaponSlots = "1 + 4 + 12* 256 + 2* 4096 + 2 + 8* 16 + 12*131072"; + canHideBodies = 1; + canCarryBackPack = 1; + }; + class GUE_Soldier_CO; + class GUE_Soldier_CO_DZ: GUE_Soldier_CO { + displayName = "Bandit Gunner"; + side = 1; + weapons[] = {"Throw","Put"}; + backpack = ""; + magazines[] = {}; + respawnWeapons[] = {"Throw","Put"}; + respawnMagazines[] = {}; + weaponSlots = "1 + 4 + 12* 256 + 2* 4096 + 2 + 8* 16 + 12*131072"; + canHideBodies = 1; + canCarryBackPack = 1; + }; + class GUE_Soldier_2; + class GUE_Soldier_2_DZ: GUE_Soldier_2 { + displayName = "Bandit Gunner"; + side = 1; + weapons[] = {"Throw","Put"}; + backpack = ""; + magazines[] = {}; + respawnWeapons[] = {"Throw","Put"}; + respawnMagazines[] = {}; + weaponSlots = "1 + 4 + 12* 256 + 2* 4096 + 2 + 8* 16 + 12*131072"; + canHideBodies = 1; + canCarryBackPack = 1; + }; + + class BAF_Soldier_Officer_W; class Rocket_DZ: BAF_Soldier_Officer_W { displayName = "Officer"; @@ -786,9 +918,48 @@ class Citizen1; // External class reference canHideBodies = 1; canCarryBackPack = 1; }; + class Rocker1; + class Rocker1_DZ: Rocker1 { + displayName = "Rocker (black)"; + side = 1; + weapons[] = {"Throw","Put"}; + backpack = ""; + magazines[] = {}; + respawnWeapons[] = {"Throw","Put"}; + respawnMagazines[] = {}; + weaponSlots = "1 + 4 + 12* 256 + 2* 4096 + 2 + 8* 16 + 12*131072"; + canHideBodies = 1; + canCarryBackPack = 1; + }; class Rocker2; class Rocker2_DZ: Rocker2 { - displayName = "Rocker"; + displayName = "Rocker (brown)"; + side = 1; + weapons[] = {"Throw","Put"}; + backpack = ""; + magazines[] = {}; + respawnWeapons[] = {"Throw","Put"}; + respawnMagazines[] = {}; + weaponSlots = "1 + 4 + 12* 256 + 2* 4096 + 2 + 8* 16 + 12*131072"; + canHideBodies = 1; + canCarryBackPack = 1; + }; + class Rocker3; + class Rocker3_DZ: Rocker3 { + displayName = "Rocker (blue)"; + side = 1; + weapons[] = {"Throw","Put"}; + backpack = ""; + magazines[] = {}; + respawnWeapons[] = {"Throw","Put"}; + respawnMagazines[] = {}; + weaponSlots = "1 + 4 + 12* 256 + 2* 4096 + 2 + 8* 16 + 12*131072"; + canHideBodies = 1; + canCarryBackPack = 1; + }; + class Rocker4; + class Rocker4_DZ: Rocker4 { + displayName = "Rocker (green)"; side = 1; weapons[] = {"Throw","Put"}; backpack = ""; @@ -977,7 +1148,7 @@ class Citizen1; // External class reference respawnMagazines[] = {}; weaponSlots = "1 + 4 + 12* 256 + 2* 4096 + 2 + 8* 16 + 12*131072"; canHideBodies = 1; - }; + }; class Bag_Base_EP1; class Bag_Base_BAF; class DZ_Patrol_Pack_EP1: Bag_Base_EP1 @@ -1183,7 +1354,6 @@ class Citizen1; // External class reference transportFuel = 0; nameSound = "fuelstation"; }; - class FuelStation : Strategic { icon = "\Ca\buildings\Icons\i_fuel_CA.paa"; scope = 0; @@ -1231,6 +1401,13 @@ class Citizen1; // External class reference destrType = "DestructBuilding"; armor = 1200; }; + // Panthera + class Land_benzina_schnell: Strategic + { + model = "\ibr\ibr_plants\benzina_schnell"; + transportFuel = 0; + nameSound = "fuelstation"; + }; class Ship: AllVehicles { diff --git a/dayz_code/compile/fn_selfActions.sqf b/dayz_code/compile/fn_selfActions.sqf index c285a4cd5..4828e8e75 100644 --- a/dayz_code/compile/fn_selfActions.sqf +++ b/dayz_code/compile/fn_selfActions.sqf @@ -50,7 +50,7 @@ if (_canPickLight and !dayz_hasLight and !_isPZombie) then { s_player_grabflare = -1; s_player_removeflare = -1; }; -hint str(typeOf cursorTarget); + if(DZEdebug) then { hint str(typeOf cursorTarget); @@ -136,7 +136,7 @@ if (!isNull cursorTarget and !_inVehicle and !_isPZombie and (player distance cu } forEach _rawmeat; if (_hasFuelE and dayz_oldrefuel) then { - _isFuel = (cursorTarget isKindOf "Land_Ind_TankSmall") or (cursorTarget isKindOf "Land_fuel_tank_big") or (cursorTarget isKindOf "Land_fuel_tank_stairs") or (cursorTarget isKindOf "Land_fuel_tank_stairs_ep1") or (cursorTarget isKindOf "Land_wagon_tanker") or (cursorTarget isKindOf "Land_fuelstation") or (cursorTarget isKindOf "Land_fuelstation_army") or (cursorTarget isKindOf "land_fuelstation_w"); + _isFuel = ((typeOf cursorTarget) in dayz_fuelsources); }; // diag_log ("OWNERID = " + _ownerID + " CHARID = " + dayz_characterID + " " + str(_ownerID == dayz_characterID)); diff --git a/dayz_code/config.cpp b/dayz_code/config.cpp index 2658a24b0..78969e5fe 100644 --- a/dayz_code/config.cpp +++ b/dayz_code/config.cpp @@ -321,10 +321,22 @@ class CfgSurvival { sex = "male"; playerModel = "Priest_DZ"; }; + class Skin_Rocker1_DZ: Default { + sex = "male"; + playerModel = "Rocker1_DZ"; + }; class Skin_Rocker2_DZ: Default { sex = "male"; playerModel = "Rocker2_DZ"; }; + class Skin_Rocker3_DZ: Default { + sex = "male"; + playerModel = "Rocker3_DZ"; + }; + class Skin_Rocker4_DZ: Default { + sex = "male"; + playerModel = "Rocker4_DZ"; + }; class Skin_Bandit1_DZ: Default { sex = "male"; playerModel = "Bandit1_DZ"; @@ -333,6 +345,26 @@ class CfgSurvival { sex = "male"; playerModel = "Bandit2_DZ"; }; + class Skin_GUE_Soldier_MG_DZ: Default { + sex = "male"; + playerModel = "GUE_Soldier_MG_DZ"; + }; + class Skin_GUE_Soldier_Sniper_DZ: Default { + sex = "male"; + playerModel = "GUE_Soldier_Sniper_DZ"; + }; + class Skin_GUE_Soldier_Crew_DZ: Default { + sex = "male"; + playerModel = "GUE_Soldier_Crew_DZ"; + }; + class Skin_GUE_Soldier_CO_DZ: Default { + sex = "male"; + playerModel = "GUE_Soldier_CO_DZ"; + }; + class Skin_GUE_Soldier_2_DZ: Default { + sex = "male"; + playerModel = "GUE_Soldier_2_DZ"; + }; class Skin_BanditW1_DZ: Default { sex = "female"; playerModel = "BanditW1_DZ"; @@ -2948,5 +2980,8 @@ class HeliCrash_No50s: Default { class Land_sara_stodola: Farm { lootPos[] = {{5.01367,3.33118,-2.19523},{2.51758,1.05737,-2.19523},{-1.30957,-1.02954,-2.19523},{-4.24414,4.0238,-2.19523},{5.16211,-0.661621,-2.19523}}; }; + class land_cihlovej_dum_mini: Residential { + lootPos[] = {{-2.4646,-0.78418,-2.86942},{-1.75586,2.88525,-2.86942},{2.76587,2.08154,-2.86942},{1.96265,-1.98877,-2.86942},{0.0109863,0.876465,-2.86942},{0.116455,3.05762,-2.86942}}; + }; }; diff --git a/dayz_code/init/variables.sqf b/dayz_code/init/variables.sqf index c98c62003..5a3d58bd6 100644 --- a/dayz_code/init/variables.sqf +++ b/dayz_code/init/variables.sqf @@ -14,7 +14,7 @@ Camo1_DZ = "Camo1_DZ"; Soldier1_DZ = "Soldier1_DZ"; Rocket_DZ = "Rocket_DZ"; -AllPlayers = ["Survivor2_DZ","SurvivorWcombat_DZ","SurvivorWdesert_DZ","SurvivorWurban_DZ","SurvivorWpink_DZ","SurvivorW3_DZ","SurvivorW2_DZ","Bandit1_DZ","Bandit2_DZ","BanditW1_DZ","BanditW2_DZ","Soldier_Crew_PMC","Sniper1_DZ","Camo1_DZ","Soldier1_DZ","Rocket_DZ","Rocker2_DZ","Priest_DZ","Functionary1_EP1_DZ","GUE_Commander_DZ","Ins_Soldier_GL_DZ","Haris_Press_EP1_DZ","Pilot_EP1_DZ","RU_Policeman_DZ","pz_policeman","pz_suit1","pz_suit2","pz_worker1","pz_worker2","pz_worker3","pz_doctor","pz_teacher","pz_hunter","pz_villager1","pz_villager2","pz_villager3","pz_priest","Soldier_TL_PMC_DZ","Soldier_Sniper_PMC_DZ","Soldier_Bodyguard_AA12_PMC_DZ","Drake_Light_DZ","CZ_Special_Forces_GL_DES_EP1_DZ","TK_INS_Soldier_EP1_DZ","TK_INS_Warlord_EP1_DZ","FR_OHara_DZ","FR_Rodriguez_DZ","CZ_Soldier_Sniper_EP1_DZ","Graves_Light_DZ"]; +AllPlayers = ["Survivor2_DZ","SurvivorWcombat_DZ","SurvivorWdesert_DZ","SurvivorWurban_DZ","SurvivorWpink_DZ","SurvivorW3_DZ","SurvivorW2_DZ","Bandit1_DZ","Bandit2_DZ","BanditW1_DZ","BanditW2_DZ","Soldier_Crew_PMC","Sniper1_DZ","Camo1_DZ","Soldier1_DZ","Rocket_DZ","Rocker1_DZ","Rocker2_DZ","Rocker3_DZ","Rocker4_DZ","Priest_DZ","Functionary1_EP1_DZ","GUE_Commander_DZ","Ins_Soldier_GL_DZ","Haris_Press_EP1_DZ","Pilot_EP1_DZ","RU_Policeman_DZ","pz_policeman","pz_suit1","pz_suit2","pz_worker1","pz_worker2","pz_worker3","pz_doctor","pz_teacher","pz_hunter","pz_villager1","pz_villager2","pz_villager3","pz_priest","Soldier_TL_PMC_DZ","Soldier_Sniper_PMC_DZ","Soldier_Bodyguard_AA12_PMC_DZ","Drake_Light_DZ","CZ_Special_Forces_GL_DES_EP1_DZ","TK_INS_Soldier_EP1_DZ","TK_INS_Warlord_EP1_DZ","FR_OHara_DZ","FR_Rodriguez_DZ","CZ_Soldier_Sniper_EP1_DZ","Graves_Light_DZ","GUE_Soldier_MG_DZ","GUE_Soldier_Sniper_DZ","GUE_Soldier_Crew_DZ","GUE_Soldier_CO_DZ","GUE_Soldier_2_DZ"]; // AllPlayersVehicles = ["AllVehicles"]+AllPlayers; //Cooking @@ -390,7 +390,11 @@ dayz_disallowedVault = ["TentStorage", "BuiltItems"]; dayz_reveal = ["AllVehicles","WeaponHolder","TentStorage","VaultStorage","VaultStorageLocked","BuiltItems"]; dayz_allowedObjects = ["TentStorage","TentStorageDomed","TentStorageDomed2", "VaultStorageLocked", "Hedgehog_DZ", "Sandbag1_DZ","TrapBear","Fort_RazorWire","WoodGate_DZ","Land_HBarrier1_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"]; -dayz_fuelpumparray = ["FuelPump_DZ","Land_A_FuelStation_Feed","Land_Ind_FuelStation_Feed_EP1","Land_FuelStation_Feed_PMC","FuelStation","Land_ibr_FuelStation_Feed","Land_fuelstation_army","Land_fuelstation","land_fuelstation_w"]; +// These work with just a running generator +dayz_fuelpumparray = ["FuelPump_DZ","Land_A_FuelStation_Feed","Land_Ind_FuelStation_Feed_EP1","Land_FuelStation_Feed_PMC","FuelStation","Land_ibr_FuelStation_Feed","Land_fuelstation_army","Land_fuelstation","land_fuelstation_w","Land_benzina_schnell"]; + +// Standard Fuel sources +dayz_fuelsources = ["Land_Ind_TankSmall","Land_fuel_tank_big","Land_fuel_tank_stairs","Land_fuel_tank_stairs_ep1","Land_wagon_tanker","Land_fuelstation","Land_fuelstation_army","land_fuelstation_w","Land_benzina_schnell"]; dayz_spawnPos = getPosATL player; diff --git a/dayz_equip/config.cpp b/dayz_equip/config.cpp index 610e06a7a..744b3ad6e 100644 --- a/dayz_equip/config.cpp +++ b/dayz_equip/config.cpp @@ -1018,7 +1018,7 @@ class CfgMagazines { text = "Craft Tent"; script = "spawn player_craftItem;"; - neednearby[] = {}; + neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"ItemTent",1}}; input[] = {{"ItemCanvas",2},{"ItemPole",2}}; @@ -1027,25 +1027,34 @@ class CfgMagazines { text = "Craft Desert Tent"; script = "spawn player_craftItem1;"; - neednearby[] = {}; + neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"ItemTentDomed",1}}; - input[] = {{"ItemCanvas",3},{"ItemPole",2}}; + input[] = {{"ItemCanvas",3},{"ItemPole",3}}; }; class Crafting2 + { + text = "Craft Green Tent"; + script = "spawn player_craftItem1;"; + neednearby[] = {"workshop"}; + requiretools[] = {"ItemToolbox","ItemKnife"}; + output[] = {{"ItemTentDomed2",1}}; + input[] = {{"ItemCanvas",3},{"ItemPole",3}}; + }; + class Crafting3 { text = "Craft Sun Shade"; script = "spawn player_craftItem2;"; - neednearby[] = {}; + neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"sun_shade_kit",1}}; input[] = {{"ItemCanvas",1},{"PartWoodLumber",4}}; }; - class Crafting3 + class Crafting4 { text = "Craft Burlap"; script = "spawn player_craftItem3;"; - neednearby[] = {}; + neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"ItemBurlap",1}}; input[] = {{"ItemCanvas",2}}; @@ -1068,7 +1077,7 @@ class CfgMagazines text = "Craft Sandbag"; script = "spawn player_craftItem;"; neednearby[] = {"sand"}; // todo add sand requirement - requiretools[] = {"ItemEtool"}; + requiretools[] = {"ItemEtool","ItemToolbox"}; output[] = {{"ItemSandbag",1}}; input[] = {{"ItemBurlap",3}}; }; @@ -1155,12 +1164,30 @@ class CfgMagazines displayName = "Priest Outfit"; descriptionShort = "Priest Outfit"; }; + class Skin_Rocker1_DZ: SkinBase + { + scope = 2; + displayName = "Rocker Outfit"; + descriptionShort = "Rocker (black)"; + }; class Skin_Rocker2_DZ: SkinBase { scope = 2; displayName = "Rocker Outfit"; - descriptionShort = "Rebel Uniform"; - }; + descriptionShort = "Rocker (brown)"; + }; + class Skin_Rocker3_DZ: SkinBase + { + scope = 2; + displayName = "Rocker Outfit"; + descriptionShort = "Rocker (blue)"; + }; + class Skin_Rocker4_DZ: SkinBase + { + scope = 2; + displayName = "Rocker Outfit"; + descriptionShort = "Rocker (green)"; + }; class Skin_Bandit1_DZ: SkinBase { scope = 2; @@ -1173,6 +1200,36 @@ class CfgMagazines displayName = "Bandit Camo"; descriptionShort = "Bandit Camo Outfit"; }; + class Skin_GUE_Soldier_MG_DZ: SkinBase + { + scope = 2; + displayName = "Bandit Gunner"; + descriptionShort = "Bandit Gunner Outfit"; + }; + class Skin_GUE_Soldier_Sniper_DZ: SkinBase + { + scope = 2; + displayName = "Bandit Sniper"; + descriptionShort = "Bandit Sniper Outfit"; + }; + class Skin_GUE_Soldier_Crew_DZ: SkinBase + { + scope = 2; + displayName = "Bandit Baklava"; + descriptionShort = "Bandit Baklava Outfit"; + }; + class Skin_GUE_Soldier_CO_DZ: SkinBase + { + scope = 2; + displayName = "Bandit Mask"; + descriptionShort = "Bandit Mask Outfit"; + }; + class Skin_GUE_Soldier_2_DZ: SkinBase + { + scope = 2; + displayName = "Bandit Hat"; + descriptionShort = "Bandit Hat with Baklava"; + }; class Skin_BanditW1_DZ: SkinBase { scope = 2; @@ -1339,6 +1396,17 @@ class CfgMagazines model = "\dayz_equip\models\fad.p3d"; picture = "\dayz_equip\textures\equip_fad_ca.paa"; descriptionShort = "Light Bulb"; + class ItemActions { + class Crafting + { + text = "Craft Light Pole"; + script = "spawn player_craftItem;"; + neednearby[] = {"workshop"}; + requiretools[] = {"ItemEtool","ItemToolbox"}; + output[] = {{"light_pole_kit",1}}; + input[] = {{"ItemLightBulb",1},{"PartGeneric",1},{"PartWoodLumber",6}}; + }; + }; }; class PartFueltank: CA_Magazine { @@ -1482,7 +1550,7 @@ class CfgMagazines { text = "Craft Lumber"; script = "spawn player_craftItem;"; - neednearby[] = {}; + neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"PartWoodLumber",1}}; input[] = {{"PartWoodPile",2}}; @@ -1531,7 +1599,7 @@ class CfgMagazines { text = "Craft Plywood"; script = "spawn player_craftItem;"; - neednearby[] = {}; + neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox"}; output[] = {{"PartWoodPlywood",1}}; input[] = {{"PartWoodLumber",2}}; @@ -1562,7 +1630,7 @@ class CfgMagazines class ItemActions { class Crafting { - text = "Craft Shed"; + text = "Craft Shack"; script = "spawn player_craftItem;"; neednearby[] = {}; requiretools[] = {"ItemToolbox"};