0.999a

+ Fixed Machete Spawns thanks to: fe83fca83a + Add check for loot underground da4cbfbaca + Tweaked supply crate model so that is is not sunk into the ground. Fixes #249 + Added 3 more female clothing variants thanks to http://www.twitch.tv/miss_alejandria + Added player distance cursorTarget increase if target is isKindOf AIR OR SHIP. Fixes #235 + Changed currency conversion from 1 x 10oz copper for 1 oz silver to 3x 10oz copper for 1 oz silver.
2025-12-14 12:12:34 +03:00 · 2013-03-25 17:45:58 -05:00
parent 256ae2ac7f
commit fc36a7ac22
9 changed files with 280 additions and 16 deletions
--- a/dayz_code/actions/trade_metals.sqf
+++ b/dayz_code/actions/trade_metals.sqf
@@ -11,8 +11,8 @@ _metals_conversion = [
 	["ItemCopperBar","ItemTinBar",1,2,"buy","Tin","Copper",106],
 	["ItemTinBar","ItemCopperBar",2,1,"buy","Copper","Tin",105],
 		
-	["ItemSilverBar","ItemCopperBar10oz",1,1,"buy","10oz Copper","Silver",104],
-	["ItemCopperBar10oz","ItemSilverBar",1,1,"buy","Silver","10oz Copper",103],
+	["ItemSilverBar","ItemCopperBar10oz",1,3,"buy","10oz Copper","Silver",104],
+	["ItemCopperBar10oz","ItemSilverBar",3,1,"buy","Silver","10oz Copper",103],
 		
 	["ItemGoldBar","ItemSilverBar10oz",1,3,"buy","10oz Silver","Gold",102],
 	["ItemSilverBar10oz","ItemGoldBar",3,1,"buy","Gold","10oz Silver",101]
--- a/dayz_code/compile/fn_selfActions.sqf
+++ b/dayz_code/compile/fn_selfActions.sqf
@@ -21,10 +21,8 @@ _hastinitem = false;
    if (_x in magazines player) then {
        _hastinitem = true;
    };
-
 } forEach boil_tin_cans;

-
 _hasKnife = 	"ItemKnife" in items player;
 _hasToolbox = 	"ItemToolbox" in items player;
 //_hasTent = 		"ItemTent" in items player;
@@ -53,7 +51,9 @@ if (_canPickLight and !dayz_hasLight and !_isPZombie) then {
 	s_player_removeflare = -1;
 };

-// hint str(typeOf cursorTarget);
+if(DZEdebug) then {
+	hint str(typeOf cursorTarget);
+};

 if(_isPZombie) then {
 	//_state = animationState player;
@@ -87,8 +87,15 @@ if(_isPZombie) then {
 	};
 };

+// Increase distance only if AIR OR SHIP
+_allowedDistance = 4;
+_isAir = cursorTarget isKindOf "Air";
+_isShip = cursorTarget isKindOf "Ship";
+if(_isAir or _isShip) then {
+	_allowedDistance = 6;
+};

-if (!isNull cursorTarget and !_inVehicle and !_isPZombie and (player distance cursorTarget < 5)) then {	//Has some kind of target
+if (!isNull cursorTarget and !_inVehicle and !_isPZombie and (player distance cursorTarget < _allowedDistance)) then {	//Has some kind of target
 	_isHarvested = cursorTarget getVariable["meatHarvested",false];
 	_isVehicle = cursorTarget isKindOf "AllVehicles";
 	_isVehicletype = typeOf cursorTarget in ["ATV_US_EP1","ATV_CZ_EP1"];
--- a/dayz_code/compile/spawn_loot.sqf
+++ b/dayz_code/compile/spawn_loot.sqf
@@ -1,9 +1,12 @@
-private["_iItem","_iClass","_iPos","_radius","_itemTypes","_index","_item","_qty","_max","_tQty","_canType","_weights","_cntWeights","_dateNow"];
+private["_iItem","_iClass","_iPos","_radius","_itemTypes","_index","_item","_qty","_max","_tQty","_canType","_weights","_cntWeights","_dateNow","_iPosZ"];
 _iItem = 	_this select 0;
 _iClass = 	_this select 1;
 _iPos =		_this select 2;
 _radius =	_this select 3;

+_iPosZ = _iPos select 2;
+if( _iPosZ < 0 ) then { _iPos = [_iPos select 0,_iPos select 1,0]; };
+
 switch (_iClass) do {
 	default {
 		//Item is food, add random quantity of cans along with an item (if exists)
--- a/dayz_code/config.cpp
+++ b/dayz_code/config.cpp
@@ -345,6 +345,18 @@ class CfgSurvival {
 			sex = "female";
 			playerModel = "SurvivorWpink_DZ";
 		};
+		class Skin_SurvivorWcombat_DZ: Default {
+			sex = "female";
+			playerModel = "SurvivorWcombat_DZ";
+		};
+		class Skin_SurvivorWdesert_DZ: Default {
+			sex = "female";
+			playerModel = "SurvivorWdesert_DZ";
+		};
+		class Skin_SurvivorWurban_DZ: Default {
+			sex = "female";
+			playerModel = "SurvivorWurban_DZ";
+		};
 		class Skin_SurvivorW3_DZ: Default {
 			sex = "female";
 			playerModel = "SurvivorW3_DZ";
@@ -455,6 +467,7 @@ class CfgBuildingLoot {
 			{ "Skin_Rocker2_DZ","magazine" },
 			{ "Skin_SurvivorW3_DZ","magazine" },
 			{ "Skin_SurvivorWpink_DZ","magazine" },
+			{ "Skin_SurvivorWurban_DZ","magazine" },
 			
 	};
 		itemChance[] =	{
@@ -493,6 +506,7 @@ class CfgBuildingLoot {
 			0.02,
 			0.02,
 			0.05,
+			0.02,
 			0.01,
 		};		
 	};
@@ -561,7 +575,7 @@ class CfgBuildingLoot {
 			{ "WeaponHolder_ItemHatchet","object" },
 			{ "MR43","weapon" },
 			//{"TrapBear","magazine"},
-			{"WeaponHolder_ItemMachete"}
+			{"WeaponHolder_ItemMachete", "object"}
 	};
 		itemChance[] =	{
 			0.06,
@@ -946,6 +960,8 @@ class HeliCrash_No50s: Default {
 			{ "Skin_CZ_Special_Forces_GL_DES_EP1_DZ","magazine" },
 			{ "Skin_TK_INS_Soldier_EP1_DZ","magazine" },
 			{ "Skin_TK_INS_Warlord_EP1","magazine" },
+			{ "Skin_SurvivorWcombat_DZ","magazine" },
+			{ "Skin_SurvivorWdesert_DZ","magazine" },
 	};
 		itemChance[] =	{
 			0.10,
@@ -1009,6 +1025,8 @@ class HeliCrash_No50s: Default {
 			0.01,
 			0.03,
 			0.01,
+			0.01,
+			0.03,
 		};
 	};
 	class Hunting: Default {
@@ -2297,7 +2315,7 @@ class HeliCrash_No50s: Default {
 			{-0.566406,-3.44775,-4.14959},
 			{-2.00146,1.43604,-4.14959}};
 	};
-	class Land_garaz_bez_tanku: Industrial
+	class LAND_garaz_bez_tanku: Industrial
 	{
 		lootPos[] = {
 			{-5.896,3.05811,3.41651},
@@ -2436,4 +2454,195 @@ class HeliCrash_No50s: Default {
 			{-1.84766,3.92969,-1.80313},
 			{-1.85254,0.222656,-1.80321}};
 	};
+	class LAND_Kiosk2 : Residential
+	{
+		lootPos[] = {
+			{-20.7441,45.2878,3.05876},
+			{-3.80933,-33.6328,3.02246},
+			{-3.57007,-22.666,3.02246},
+			{4.76587,-24.3711,-0.618923},
+			{-1.10449,43.1938,-0.58263},
+			{8.77441,23.7346,-0.845428},
+			{-9.86914,41.6533,3.05876},
+			{7.84668,20.991,4.76736},
+			{6.91211,27.9067,10.1178}};
+	};
+	class Land_deutshe_mini : Residential
+	{
+		lootPos[] = {
+			{-4.34277,-2.54297,-2.74846},
+			{-0.624023,-0.357422,-2.74846},
+			{0.853516,1.04395,-2.74846},
+			{-2.75781,2.44336,-2.74846}};
+	};
+	class LAND_shopping_sab1 : Supermarket
+	{
+		lootPos[] = {
+			{-30.0442,28.7891,-6.25663},
+			{-18.561,23.7578,-6.25663},
+			{1.32031,24.5879,-6.25663},
+			{-7.86792,15.1182,-6.25663},
+			{-22.3628,16.8828,-6.25663},
+			{-26.7896,-24.9424,-6.25663},
+			{-22.4546,-17.333,-6.25663},
+			{-30.6628,-11.0195,-6.25663},
+			{-2.51978,-23.1719,-6.25663},
+			{0.889893,-14.1914,-6.25663},
+			{23.3015,-15.1357,-6.25663},
+			{42.353,-13.5322,-6.25663},
+			{37.3396,-22.9014,-6.34278},
+			{14.5388,-26.2158,-6.25663},
+			{9.93091,-18.2871,-6.25663},
+			{7.23315,24.9834,-6.25663},
+			{8.8877,16.46,-6.25663},
+			{16.9697,11.9541,-6.25663},
+			{27.3679,21.3857,-6.25663},
+			{-28.7632,27.7227,-2.38664},
+			{33.5342,16.8047,-6.25663},
+			{-31.0317,12.626,-2.38664},
+			{-22.1975,16.3066,-2.38664},
+			{-17.7339,21.0166,-2.38664},
+			{-8.78564,27.5811,-2.38664},
+			{-7.71826,15.2012,-2.38664},
+			{1.65771,16.3496,-2.38664},
+			{-36.4099,8.60352,-2.38664},
+			{-43.6084,8.64258,-2.38664},
+			{-41.8218,-2.6748,-2.38664},
+			{-35.7854,-5.95313,-2.38664},
+			{-16.2727,-13.2295,-2.38664},
+			{-23.0032,-13.2764,-2.38664},
+			{-25.6714,-25.6045,-2.38664},
+			{-10.1611,-26.001,-2.38664},
+			{2.98145,-26.7119,-2.38664},
+			{2.59131,-13.5352,-2.38664},
+			{10.7913,-16.2617,-2.38664},
+			{17.1582,-27.3232,-2.38664},
+			{26.3887,-25.0986,-2.38664},
+			{30.8889,-22.1074,-2.38664},
+			{42.4817,-21.6602,-2.47279},
+			{41.8726,-13.7373,-2.38664},
+			{32.7183,-12.5967,-2.38664},
+			{34.2241,-5.04199,-2.38664},
+			{40.2024,-7.14941,-2.38664},
+			{39.8079,-0.0917969,-2.38664},
+			{43.5059,6.59766,-2.38664},
+			{33.3914,3.02148,-2.38664},
+			{29.0322,11.1025,-2.38664},
+			{33.1868,17.4531,-2.38664},
+			{22.3228,26.3857,-2.38664},
+			{7.32861,23.8564,-2.38664}};
+	};
+	class LAND_skola : Residential
+	{
+		lootPos[] = {
+			{15.8508,20.459,-2.00361},
+			{29.0132,22.3887,-2.00361},
+			{30.6335,16.1104,-2.00361},
+			{30.7412,5.33691,-2.00361},
+			{18.7554,5.07324,-2.00361},
+			{2.84912,14.2744,-2.00361},
+			{-1.27197,12.2324,-2.00361},
+			{-5.66699,16.6445,-2.00361},
+			{-2.93408,22.0967,-2.00361},
+			{5.48535,21.7969,-2.00361},
+			{-9.52954,-8.64063,-2.00361},
+			{-18.5305,-9.60449,-2.00361},
+			{-23.9783,-0.905273,-2.00361},
+			{-8.50586,13.9482,-2.00361},
+			{5.84448,0.175781,-2.00361},
+			{2.56885,-14.167,-2.00361},
+			{-3.15063,-14.084,-2.00361},
+			{-3.76294,-21.2754,-2.00361},
+			{5.4397,-24.5635,-2.00361},
+			{18.5049,-11.9141,-2.00361},
+			{10.7795,-18.4443,-2.00361},
+			{18.3979,-21.9854,1.22083},
+			{20.1707,-14.1572,1.22083},
+			{30.334,5.12402,1.22083},
+			{22.9521,12.1387,1.22083},
+			{1.45825,18.208,1.22083},
+			{-5.56128,20.1572,1.22083},
+			{-6.19165,15.4678,1.22083},
+			{-1.05029,9.69141,1.22083},
+			{6.17896,5.19434,1.22083},
+			{5.00513,2.78711,1.22083},
+			{5.81836,-5.65625,1.22083},
+			{-0.54541,-15.1104,1.22083},
+			{1.8418,-19.8584,1.22083},
+			{-2.10864,-21.9961,1.22083},
+			{-5.78857,-24.9277,1.22083},
+			{16.3679,-15.4463,1.22083},
+			{28.0537,-17.1328,1.22083},
+			{22.1833,11.416,-2.00361}};
+	};
+	class LAND_konecna : Office
+	{
+		lootPos[] = {{14.8423,-0.987793,-1.59364},
+			{16.873,-2.86865,-1.59364},s
+			{13.3672,-9.11377,-1.59364},
+			{5.09497,-9.98682,-1.59364},
+			{-24.8281,-1.17871,-1.59364},
+			{-14.0747,-7.3042,-1.59364},
+			{-19.0789,0.98291,-1.59364},
+			{4.67944,0.805176,-1.59364},
+			{-11.4639,-10.1475,-1.59364}};
+	};
+	class LAND_Tav_Panelak2 : Residential
+	{
+		lootPos[] = {{2.7627,-5.62524,5.43665},
+			{2.63867,-0.156494,5.43665},
+			{3.4873,2.76855,5.43665},
+			{6.06152,3.64966,5.43665},
+			{6.70996,0.734619,5.43665},
+			{4.71875,-1.69263,5.43665},
+			{-0.347656,-2.23315,5.43665},
+			{0.814453,-1.73901,2.71097},
+			{-0.545898,-2.29468,2.71097},
+			{-0.415039,4.25122,1.32864},
+			{0.75,-2.01318,0.0714264},
+			{0.644531,-1.86401,-2.62859}};
+	};
+	class LAND_Tav_panelak : Residential
+	{
+		lootPos[] = {{5.24121,-6.39453,2.77144},
+			{6.71191,-5.43262,2.77144},
+			{4.65625,-1.83838,2.77144},
+			{6.69531,0.225586,2.77144},
+			{6.54395,3.06519,2.77144},
+			{3.40234,3.32324,2.77144},
+			{2.61523,0.798096,2.77144},
+			{2.7041,-4.98389,2.77144},
+			{3.66016,-6.17651,2.77144},
+			{-0.982422,-1.86328,2.77144},
+			{-0.904297,4.13086,1.32864},
+			{0.942383,-2.10474,0.0714226},
+			{-2.56836,-1.68628,0.0714226},
+			{-2.69531,3.42407,0.0714226},
+			{-6.24902,3.01392,0.0714226},
+			{-6.07227,0.556396,0.0714226},
+			{-5.75488,-2.03857,0.0714226},
+			{-6.66406,-4.34497,0.0714226},
+			{-5.49219,-6.70581,0.0714226},
+			{-2.41602,-4.19434,0.0714226},
+			{-3.70801,-6.17212,0.0714226}};
+	};
+	class LAND_Tav_Panelak3 : Residential
+	{
+		lootPos[] = {{0.0878906,0.793457,-10.8154},
+			{-0.810547,3.44824,-10.8154}};
+	};
+	
+	class LAND_Posta : Residential
+	{
+		lootPos[] = {{-17.4678,-9.28809,1.00044},
+			{-16.5732,-1.32227,1.00044},
+			{-3.60254,-5.11377,1.00044},
+			{9.72168,-6.61035,1.00044},
+			{17.333,-8.2085,1.00044},
+			{13.3633,7.1958,1.00044},
+			{1.56445,8.49707,1.00044}};
+	};
+	 
+
+	
 };
--- a/dayz_code/init/variables.sqf
+++ b/dayz_code/init/variables.sqf
@@ -31,10 +31,12 @@ TK_INS_Soldier_EP1_DZ = "TK_INS_Soldier_EP1_DZ";
 TK_INS_Warlord_EP1_DZ = "TK_INS_Warlord_EP1_DZ";
 // new females
 SurvivorWpink_DZ = "SurvivorWpink_DZ";
+SurvivorWcombat_DZ = "SurvivorWcombat_DZ";
+SurvivorWdesert_DZ = "SurvivorWdesert_DZ";
+SurvivorWurban_DZ = "SurvivorWurban_DZ";

-
-AllPlayers = ["SurvivorWpink_DZ","SurvivorW3_DZ","SurvivorW2_DZ","Bandit1_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"];
-AllPlayersVehicles = ["SurvivorWpink_DZ","SurvivorW3_DZ","SurvivorW2_DZ","Bandit1_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","AllVehicles"];
+AllPlayers = ["SurvivorWcombat_DZ","SurvivorWdesert_DZ","SurvivorWurban_DZ","SurvivorWpink_DZ","SurvivorW3_DZ","SurvivorW2_DZ","Bandit1_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"];
+AllPlayersVehicles = ["SurvivorWcombat_DZ","SurvivorWdesert_DZ","SurvivorWurban_DZ","SurvivorWpink_DZ","SurvivorW3_DZ","SurvivorW2_DZ","Bandit1_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","AllVehicles"];

 PZombie_VB =	"PZombie_VB";

@@ -401,6 +403,10 @@ if(isNil "dayz_maxZeds") then {
 	dayz_maxZeds = 500;
 };

+if(isNil "DZEdebug") then {
+	DZEdebug = false;
+};
+

 dayz_spawnPos = getPosATL player;

--- a/dayz_code/system/player_monitor.sqf
+++ b/dayz_code/system/player_monitor.sqf
@@ -1,4 +1,8 @@
 if (isServer) then {
 	waitUntil{dayz_preloadFinished};
 };
-_id = [] execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
+_id = [] execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
+
+if(DZEdebug) then {
+	_void = [] execVM "\z\addons\dayz_code\actions\debug\Make_lootPos.sqf
+};
--- a/dayz_equip/config.cpp
+++ b/dayz_equip/config.cpp
@@ -1114,10 +1114,30 @@ class CfgMagazines
 	class Skin_SurvivorWpink_DZ: SkinBase
 	{
 		scope = 2;
-		displayName = "Civilian Pink (female)";
-		descriptionShort = "Civilian Pink (female)";
+		displayName = "Pink (female)";
+		descriptionShort = "Pink Clothes (female)";
 	};
-	
+
+	class Skin_SurvivorWcombat_DZ: SkinBase
+	{
+		scope = 2;
+		displayName = "Camo (female)";
+		descriptionShort = "Camo Clothes (female)";
+	};
+	class Skin_SurvivorWdesert_DZ: SkinBase
+	{
+		scope = 2;
+		displayName = "Desert (female)";
+		descriptionShort = "Desert Clothes (female)";
+	};
+	class Skin_SurvivorWurban_DZ: SkinBase
+	{
+		scope = 2;
+		displayName = "Urban (female)";
+		descriptionShort = "Urban Clothes (female)";
+	};
+
+
 	class Skin_TK_INS_Warlord_EP1_DZ: SkinBase
 	{
 		scope = 2;
--- a/dayz_equip/models/supply_crate.p3d
+++ b/dayz_equip/models/supply_crate.p3d
--- a/dayz_weapons/config.cpp
+++ b/dayz_weapons/config.cpp
@@ -1612,6 +1612,21 @@ class CfgVehicles
 		hiddenSelections[] = {"Camo"};
 		hiddenSelectionsTextures[] = {"\dayz_equip\textures\GirlyGirl.paa"};
 	};
+	class SurvivorWcombat_DZ: SurvivorW2_DZ
+	{
+		hiddenSelections[] = {"Camo"};
+		hiddenSelectionsTextures[] = {"\dayz_equip\textures\CombatGirl.paa"};
+	};
+	class SurvivorWdesert_DZ: SurvivorW2_DZ
+	{
+		hiddenSelections[] = {"Camo"};
+		hiddenSelectionsTextures[] = {"\dayz_equip\textures\DesertGirl.paa"};
+	};
+	class SurvivorWurban_DZ: SurvivorW2_DZ
+	{
+		hiddenSelections[] = {"Camo"};
+		hiddenSelectionsTextures[] = {"\dayz_equip\textures\UrbanGirl.paa"};
+	};
 	class Citizen1;
 	class PZombie_VB: Citizen1
 	{