From ceda09297b669098cdf96e0b0fe680bf3b74545c Mon Sep 17 00:00:00 2001 From: A Man Date: Sun, 20 Mar 2022 15:58:51 +0100 Subject: [PATCH] Make water sources customizable --- SQF/dayz_code/actions/water_fill.sqf | 4 +--- SQF/dayz_code/init/variables.sqf | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/SQF/dayz_code/actions/water_fill.sqf b/SQF/dayz_code/actions/water_fill.sqf index ae538bdd5..f6ead7bd6 100644 --- a/SQF/dayz_code/actions/water_fill.sqf +++ b/SQF/dayz_code/actions/water_fill.sqf @@ -17,12 +17,10 @@ if Player_IsOnLadder() exitWith { (localize "str_player_21") call dayz_rollingMe _posASL = getPosASL player; _posATL = ASLtoATL _posASL; -//"Land_water_tank" has no spout or opening, doesn't make sense to include -_wells = ["Land_pumpa","Land_Barrel_water","Land_Misc_Well_C_EP1","Land_Misc_Well_L_EP1","land_smd_water_pump"]; _canFill = call { //Return: [nearWaterHole, isPond] - if (count nearestObjects [_posATL,_wells,4] > 0) exitwith {[true,false]}; + if (count nearestObjects [_posATL,DZE_WaterSources,4] > 0) exitwith {[true,false]}; if (toLower worldName in ["chernarus","namalsk","napf"]) exitwith {(call fn_nearWaterHole)}; //Slow searches for maps without waterHoleProxy objects added yet if ({["_well",str _x] call fnc_inString} count nearestObjects [_posATL,[],4] > 0) exitwith {[true,false]}; diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index bfdf3cb66..677a7cf4d 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -282,7 +282,7 @@ if (!isDedicated) then { 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_smd_fuelstation_army","Land_fuelstation","land_fuelstation_w","Land_benzina_schnell"]; DayZ_fuelCans = ["ItemJerrycan","ItemFuelcan","ItemFuelBarrel"]; DayZ_fuelCansEmpty = ["ItemJerrycanEmpty","ItemFuelcanEmpty","ItemFuelBarrelEmpty"]; - 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_smd_fuelstation_army","land_fuelstation_w","Land_benzina_schnell"]; + 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_smd_fuelstation_army","land_fuelstation_w","Land_benzina_schnell","Fueltank_DZE"]; dayz_plantOutput = ["FoodPumpkin","FoodSunFlowerSeed","ItemKiloHemp","FoodPumpkin","FoodSunFlowerSeed","FoodPotatoRaw","FoodCarrot","ItemKiloHemp","ItemKiloBlackTea","ItemTobaccoLeafs","equip_garlic_bulb"]; dayz_plantTypes = ["","MAP_pumpkin","MAP_p_Helianthus","fiberplant","Plant_Pumpkin_DZE","Plant_Sunflower_DZE","Plant_Potato_DZE","Plant_Carrot_DZE","Plant_Hemp_DZE","Plant_Tea_DZE","Plant_Tobacco_DZE","Plant_Garlic_DZE"]; DZE_LockableStorage = ["VaultStorage","VaultStorage2","VaultStorageLocked","VaultStorage2Locked","LockboxStorageLocked","LockboxStorage2Locked","LockboxStorage","LockboxStorage2","LockboxStorageWinterLocked","LockboxStorageWinter2Locked","LockboxStorageWinter","LockboxStorageWinter2","TallSafe","TallSafeLocked"]; @@ -305,6 +305,7 @@ if (!isDedicated) then { DZE_modularDoors = ["Land_DZE_WoodDoor","Land_DZE_LargeWoodDoor","Land_DZE_GarageWoodDoor","CinderWallDoor_DZ","CinderWallDoorSmall_DZ","WoodenGate_foundation_DZ","WoodenGate_1_DZ","WoodenGate_2_DZ","WoodenGate_3_DZ","WoodenGate_4_DZ","Land_DZE_WoodGate","Land_DZE_WoodOpenTopGarageDoor","CinderGate_DZ","CinderGarageOpenTop_DZ","CinderDoorHatch_DZ","Door_DZ","Concrete_Bunker_DZ","Metal_Drawbridge_DZ"]; DZE_refundStorageItemContents = ["GunRack_DZ","GunRack2_DZ","WoodCrate_DZ","WoodCrate2_DZ","StorageCrate_DZ","CamoStorageCrate_DZ","OutHouse_DZ","StorageShed_DZ","StorageShed2_DZ","Wooden_shed_DZ","Wooden_shed2_DZ","WoodShack_DZ","WoodShack2_DZ","Advanced_WorkBench_DZ","StashSmall","StashSmall1","StashSmall2","StashSmall3","StashSmall4","StashMedium","StashMedium1","StashMedium2","StashMedium3","StashMedium4","Generator_DZ","M240Nest_DZ","CookTripod_DZ","Stoneoven_DZ","Commode_DZ","Wardrobe_DZ","Fridge_DZ","Washing_Machine_DZ","Server_Rack_DZ","ATM_DZ","Armchair_DZ","Sofa_DZ","Arcade_DZ","Vendmachine1_DZ","Vendmachine2_DZ"]; // array of non-lockable storage objects that will refund their contents when the object is removed DZE_rocks = ["r2_boulder1.p3d","r2_boulder2.p3d","r2_rock1.p3d","r2_rock2.p3d","r2_rocktower.p3d","r2_rockwall.p3d","r2_stone.p3d"]; + DZE_WaterSources = ["Land_pumpa","Land_Barrel_water","Land_Misc_Well_C_EP1","Land_Misc_Well_L_EP1","land_smd_water_pump","Watertank_DZE","Watertower_DZE","Land_water_tank","MAP_water_tank"]; // Helper Colors Require Reformatting DZE_NoRefundTexture = [0, format["#(argb,8,8,3)color(1.00,0.00,0.00,%1,ca)", (DZE_NoRefundTransparency max 0.1)] ]; // red