RC5

.gitignore

@@ -5,3 +5,4 @@
 /SQF/dayz_weapons
 saw_idle.rtm
 chainsaw.p3d
+skeleton.p3d

SQF/dayz_anim/config.cpp

@@ -4,7 +4,7 @@ class CfgPatches {
 		weapons[] = {};
 		requiredVersion = 0.1;
 		requiredAddons[] = {"CAData","HALO_Test","CAAnimals","CA_Anims","CA_Anims_Sdr","CA_Anims_Wmn","CA_Anims_E","CA_Anims_E_Sdr","CA_Anims_E_Wmn","CABuildings","CA_E","CA_PMC","CA_Heads","CAData_ParticleEffects","CA_Dubbing","CA_Dubbing_Counterattack","CA_Dubbing_E","CA_Dubbing_PMC","CA_Editor","CALanguage","CALanguage_e","CALanguage_PMC","CALanguage_missions","CALanguage_missions_e","CALanguage_missions_PMC","CA_HC_Sounds","CA_Modules","CA_Missions_AlternativeInjurySimulation","CA_Modules_Alice","CA_Missions_AmbientCombat","CA_Modules_Animals","CA_Missions_BattlefieldClearance","CA_Modules_clouds","CA_Modules_Coin","CA_Modules_DynO","CA_Missions_FirstAidSystem","CA_Modules_Functions","CA_Missions_GarbageCollector","CA_HighCommand","CA_Modules_Marta","CA_Modules_Silvie","BI_SRRS","CA_Modules_UAV","CA_Modules_ZoRA","CA_Modules_E","CA_Modules_Alice2","CA_Modules_E_DynO","CA_Modules_E_Functions","CA_Modules_E_Gita","CA_Modules_E_Jukebox","CA_Modules_E_OO","CA_Support","CA_Modules_E_UAV","CA_Modules_E_UAV_Heli","CA_Modules_E_Weather","CA_Modules_PMC","CA_Modules_PMC_Functions","CA_Modules_PMC_SimpleFIrstAid","CA_MPA","CA_MPA_Core","CA_MPA_Challenges","CA_MPA_Scenarios","CAMusic","CARoads2","CARoads2Bridge","CARoads2Dam","CARoads_E","CARoads_PMC_Bridge","CARocks2","CARocks_E","CASigns2","CASounds_Missions","CA_SoundsMissions_E","CASounds","CA_Sounds_Baf","CASounds_E","CAStructures","CAStructures_A_BuildingWIP","CAStructures_A_CraneCon","CAStructuresLand_A_MunicipalOffice","CAStructuresBarn_W","CAStructures_Castle","CAStructuresHouse","CAStructuresHouse_A_FuelStation","CAStructuresHouse_A_Hospital","CAStructuresHouse_A_Office01","CAStructuresHouse_A_Office02","CAStructuresHouse_a_stationhouse","CAStructuresHouse_Church_02","CAStructuresHouse_Church_03","CAStructuresHouse_Church_05R","CAStructuresHouse_HouseBT","CAStructuresHouse_HouseV2","CAStructuresHouse_HouseV","CAStructuresLand_Ind_Stack_Big","CAStructures_IndPipe1","CAStructuresInd_Quarry","Ind_SawMill","CAStructures_Mil","CAStructures_Misc_Powerlines","CAStructures_Nav","CAStructuresLand_Nav_Boathouse","pond_test","CAStructures_Proxy_BuildingParts","CAStructures_Proxy_Ruins","CAStructures_Rail","CAStructuresHouse_rail_station_big","CAStructures_Ruins","CAStructuresShed_Small","CAStructuresHouse_Shed_Ind","CAStructures_Wall","CAFonts","Utes","CAVideo2_PMC","CA_Animals2","CA_Animals2_Anim_Config","CA_Animals2_Chicken","CA_Animals2_Cow","CA_Animals2_Dogs","CA_Animals2_Dogs_Fin","CA_Animals2_Dogs_Pastor","CA_Animals2_Goat","CA_Animals2_Rabbit","CA_Animals2_Sheep","CA_Animals2_WildBoar","CA_Animals_E","CA_Anims_Char","CABuildings2","A_Crane_02","A_GeneralStore_01","CABuildings2_A_Pub","A_statue","Barn_Metal","Church_01","Farm_Cowshed","Farm_WTower","CAHouseBlock_A","CAHouseBlock_B","CAHouseBlock_C","CAHouseBlock_D","HouseRuins","Ind_Dopravnik","Ind_Expedice","Ind_MalyKomin","Ind_Mlyn","Ind_Pec","ind_silomale","Ind_SiloVelke","Ind_Vysypka","Ind_Garage01","CAStructures_IndPipe1_todo_delete","IndPipe2","Ind_Shed_01","Ind_Shed_02","Ind_Tank","Ind_Workshop01","CABuildings2_Misc_Cargo","Misc_PowerStation","Misc_WaterStation","Rail_House_01","Shed_small","Shed_wooden","CA_E_ParticleEffects","CA_DubbingRadio_E","CAMisc_fix","CAMisc_fix_Str","CA_Missions","CA_Missions_E","CAMusic_E","CAMusic_PMC","A_TVTower","CAStructures_Nav_pier","CAStructures_Railway","CAStructures_E","CAStructures_E_HouseA","CAStructures_E_HouseA_A_BuildingWIP","CAStructures_E_HouseA_A_CityGate1","CAStructures_E_HouseA_A_Minaret","CAStructures_E_HouseA_A_Minaret_Porto","CAStructures_E_HouseA_A_Mosque_big","CAStructures_E_HouseA_A_Mosque_small","CAStructures_E_HouseA_A_Office01","CAStructures_E_HouseA_a_stationhouse","CAStructures_E_HouseA_A_Statue","CAStructures_E_HouseA_A_Villa","CAStructures_E_HouseC","CAStructures_E_HouseK","CAStructures_E_HouseL","CAStructures_E_Ind","CAStructures_E_Ind_Ind_Coltan_Mine","CAStructures_E_Ind_Ind_FuelStation","CAStructures_E_Ind_Ind_Garage01","CAStructures_E_Ind_Oil_Mine","CAStructures_E_Ind_IndPipes","CAStructures_E_Ind_Misc_PowerStation","CAStructures_E_Ind_Ind_Shed","CAStructures_E_Mil","CAStructures_E_Misc","CAStructures_E_Misc_Misc_cables","CAStructures_E_Misc_Misc_Construction","CAStructures_E_Misc_Misc_Garbage","CAStructures_E_Misc_Misc_Lamp","CAStructures_E_Misc_Misc_powerline","CAStructures_E_Misc_Misc_Water","CAStructures_E_Misc_Misc_Well","CAStructures_E_Wall","CAStructures_E_Wall_Wall_L","CAStructures_PMC","CAStructures_PMC_Buildings","CAStructures_PMC_Buildings_Bunker","CAStructures_PMC_Buildings_GeneralStore_PMC","CAStructures_PMC_Buildings_Ruin_Cowshed","CAStructures_PMC_Ind","CAStructures_PMC_FuelStation","CAStructures_PMC_Misc","CAStructures_PMC_Misc_Shed","CAStructures_PMC_Ruins","CAStructures_PMC_Walls","CAUI","CAWeapons","CAWeapons_AK","CAWeapons_AmmoBoxes","CAWeapons_bizon","CAWeapons_Colt1911","CAWeapons_DMR","CAweapons_ksvk","CAWeapons_M1014","CAweapons_m107","CAWeapons_M252_81mm_Mortar","CAWeapons_Metis_AT_13","CAWeapons_2b14_82mm_Mortar","CAWeLine truncated
-		dayzVersion = "1.0.2.92";
+		dayzVersion = "1.0.2.93";
 	};
 };
 

SQF/dayz_code/Configs/CfgMagazines.hpp

@@ -293,7 +293,7 @@ class CfgMagazines {
 		displayName = $STR_EPOCH_VEHUP_AVE;
 		model = "\z\addons\dayz_epoch\models\doc_Up2.p3d";
 		picture = "\z\addons\dayz_epoch\pictures\equip_docup2_ca.paa";
-		descriptionShort = STR_EPOCH_VEHUP_AVE_DESC;
+		descriptionShort = $STR_EPOCH_VEHUP_AVE_DESC;
 		weight = 0.1;
 		sfx = "document";
 		class ItemActions

SQF/dayz_code/Configs/CfgWeapons.hpp

@@ -174,7 +174,26 @@ class CfgWeapons {
 		};
 		descriptionShort = "Horlite Chainsaw";
 	};
-
+	class ChainSawB : ChainSaw {
+		model = "\z\addons\dayz_epoch\models\chainsaw_B.p3d";
+		picture = "\z\addons\dayz_epoch\pictures\equip_chainsawB_CA.paa";
+		descriptionShort = "Horlite Chainsaw (Blue)";
+	};
+	class ChainSawG : ChainSaw {
+		model = "\z\addons\dayz_epoch\models\chainsaw_G.p3d";
+		picture = "\z\addons\dayz_epoch\pictures\equip_chainsawG_CA.paa";
+		descriptionShort = "Horlite Chainsaw (Green)";
+	};
+	class ChainSawP : ChainSaw {
+		model = "\z\addons\dayz_epoch\models\chainsaw_P.p3d";
+		picture = "\z\addons\dayz_epoch\pictures\equip_chainsawP_CA.paa";
+		descriptionShort = "Horlite Chainsaw (Pink)";
+	};
+	class ChainSawR : ChainSaw {
+		model = "\z\addons\dayz_epoch\models\chainsaw_R.p3d";
+		picture = "\z\addons\dayz_epoch\pictures\equip_chainsawR_CA.paa";
+		descriptionShort = "Horlite Chainsaw (Red)";
+	};
 
 
 

SQF/dayz_code/Configs/cfgVehicles.hpp

@@ -3155,9 +3155,9 @@ class CfgVehicles {
 		vehicleClass = "Survival";
 		displayName = "Grave DZE";
 		destrType = "DestructNo";
-		model = "\ca\buildings\Misc\hrobecek.p3d";
+		model = "\z\addons\dayz_epoch\models\skeleton.p3d";
 		transportMaxMagazines = 80;
-		transportMaxWeapons = 5;
+		transportMaxWeapons = 15;
 		transportMaxBackpacks = 1;
 	};
 };	

SQF/dayz_code/Configs/rscTitles.hpp

@@ -166,7 +166,7 @@ class RscDisplayMain : RscStandardDisplay
 		class DAYZ_Version : CA_Version
 		{
 			idc = -1;
-			text = "DayZ Epoch 1.0.3 RC2";
+			text = "DayZ Epoch 1.0.3 RC5";
 			y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)";
 		};
 		delete CA_TitleMainMenu;

SQF/dayz_code/actions/object_pickup.sqf

@@ -27,10 +27,12 @@ player playActionNow "PutDown";
 if(_classname isKindOf "TrapBear") exitwith {DZE_CanPickup = true; deleteVehicle _holder;};
 
 if(_classname isKindOf "Bag_Base_EP1") exitwith {
+	
 	// diag_log("Picked up a bag: " + _classname);
 	if(_classname == typeOf _holder) then {
 		player action ["TakeBag", _holder];
 	};
+	DZE_CanPickup = true;
 };
 
 _obj = nearestObjects [(getPosATL player), [(typeOf _holder)], 5];

SQF/dayz_code/compile/spawn_loot.sqf

@@ -76,6 +76,10 @@ switch (_iClass) do
 		_index = _weights select _index;
 		_iItem = _itemTypes select _index;
 
+		if (_iItem == "Chainsaw") then {
+			_iItem = ["ChainSaw","ChainSawB","ChainSawG","ChainSawP","ChainSawR"] call BIS_fnc_selectRandom;
+		};
+
 		//Item is a weapon, add it and a random quantity of magazines
 		_item = createVehicle ["WeaponHolder", _iPos, [], _radius, "CAN_COLLIDE"];
 		_item addWeaponCargoGlobal [_iItem,1];

SQF/dayz_code/config.cpp

@@ -41,7 +41,7 @@ class CfgMods
 		hidePicture = 0;
 		hideName = 0;
 		action = "http://www.dayzepoch.com";
-		version = "1.0.2.92";
+		version = "1.0.2.93";
 		hiveVersion = 0.96; //0.93
 	};
 };

SQF/dayz_code/system/player_monitor.fsm

@@ -1326,7 +1326,7 @@ class FSM
           priority = 2.000000;
           to="ERROR__No_Player_1";
           precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
-          condition=/*%FSM<CONDITION""">*/"(_myEpochAnim != ""1.0.2.92"") || (_myEpoch != ""1.0.2.92"") || (_myEpochB != ""1.0.2.92"") || (_myEpochSfx != ""1.0.2.92"")"/*%FSM</CONDITION""">*/;
+          condition=/*%FSM<CONDITION""">*/"(_myEpochAnim != ""1.0.2.93"") || (_myEpoch != ""1.0.2.93"") || (_myEpochB != ""1.0.2.93"") || (_myEpochSfx != ""1.0.2.93"")"/*%FSM</CONDITION""">*/;
           action=/*%FSM<ACTION""">*/""/*%FSM</ACTION""">*/;
         };
         /*%FSM</LINK>*/

SQF/dayz_epoch/config.cpp

@@ -3,7 +3,7 @@ class CfgPatches {
 		units[] = {};
 		weapons[] = {};
 		requiredVersion = 0.1;
-		dayzVersion = "1.0.2.92";
+		dayzVersion = "1.0.2.93";
 		requiredAddons[] = {"dayz_code"};
 	};
 };

SQF/dayz_epoch/textures/skeleton.rvmat

@@ -0,0 +1,92 @@
+ambient[]={1,1,1,1};
+diffuse[]={1,1,1,1};
+forcedDiffuse[]={0,0,0,0};
+emmisive[]={0,0,0,1};
+specular[]={0.21960784,0.21960784,0.21960784,1};
+specularPower=100;
+PixelShaderID="Super";
+VertexShaderID="Super";
+class Stage1
+{
+	texture="z\addons\dayz_epoch\textures\skull_nohq.paa";
+	uvSource="tex";
+	class uvTransform
+	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,0};
+		pos[]={0,0,0};
+	};
+};
+class Stage2
+{
+	texture="#(argb,8,8,3)color(0.5,0.5,0.5,1,DT)";
+	uvSource="tex";
+	class uvTransform
+	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,0};
+		pos[]={0,0,0};
+	};
+};
+class Stage3
+{
+	texture="#(argb,8,8,3)color(0,0,0,0,MC)";
+	uvSource="tex";
+	class uvTransform
+	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,0};
+		pos[]={0,0,0};
+	};
+};
+class Stage4
+{
+	texture="#(argb,8,8,3)color(1,1,1,1,AS)";
+	uvSource="tex";
+	class uvTransform
+	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,0};
+		pos[]={0,0,0};
+	};
+};
+class Stage5
+{
+	texture="z\addons\dayz_epoch\textures\skull_smdi.paa";
+	uvSource="tex";
+	class uvTransform
+	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,0};
+		pos[]={0,0,0};
+	};
+};
+class Stage6
+{
+	texture="#(ai,32,128,1)fresnel(3.3,0.3)";
+	uvSource="tex";
+	class uvTransform
+	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,0};
+		pos[]={0,0,0};
+	};
+};
+class Stage7
+{
+	texture="ca\data\env_land_co.paa";
+	uvSource="tex";
+	class uvTransform
+	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,0};
+		pos[]={0,0,0};
+	};
+};

SQF/dayz_epoch_b/config.cpp

@@ -3,7 +3,7 @@ class CfgPatches {
 		units[] = {};
 		weapons[] = {};
 		requiredVersion = 0.1;
-		dayzVersion = "1.0.2.92";
+		dayzVersion = "1.0.2.93";
 		requiredAddons[] = {"dayz_code"};
 	};
 };

SQF/dayz_epoch_b/stringtable.xml

@@ -4117,22 +4117,22 @@
 		  <!-- <Czech></Czech> -->
 		</Key>
 		<Key ID="STR_EPOCH_PLAYER_145">
-		  <Original>Missing Parts after first check Item: %1 / %2</Original>
-		  <English>Missing Parts after first check Item: %1 / %2</English>
-		  <German>Fehlende Teile nach der ersten Überprüfung: %1 / %2</German>
+		  <Original>\n\nMissing Parts after first check Item: %1 / %2</Original>
+		  <English>\n\nMissing Parts after first check Item: %1 / %2</English>
+		  <German>\n\nFehlende Teile nach der ersten Überprüfung: %1 / %2</German>
 		  <!-- <Russian></Russian> -->
 		  <!-- <Spanish></Spanish> -->
-		  <Dutch>Missende onderdelen na eerste check Onderdeel: %1 / %2</Dutch>
+		  <Dutch>\n\nMissende onderdelen na eerste check Onderdeel: %1 / %2</Dutch>
 		  <!-- <French></French> -->
 		  <!-- <Czech></Czech> -->
 		</Key>
 		<Key ID="STR_EPOCH_PLAYER_146">
-		  <Original>Missing %1 more of %2</Original>
-		  <English>Missing %1 more of %2</English>
-		  <German>Ihnen fehlt/fehlen %1 %2</German>
+		  <Original>\n\nMissing %1 more of %2</Original>
+		  <English>\n\nMissing %1 more of %2</English>
+		  <German>\n\nIhnen fehlt/fehlen %1 %2</German>
 		  <!-- <Russian></Russian> -->
 		  <!-- <Spanish></Spanish> -->
-		  <Dutch>Je hebt nog %1 extra %2 nodig.</Dutch>
+		  <Dutch>\n\nJe hebt nog %1 extra %2 nodig.</Dutch>
 		  <!-- <French></French> -->
 		  <!-- <Czech></Czech> -->
 		</Key>

SQF/dayz_sfx/config.cpp

@@ -22,7 +22,7 @@ class CfgPatches {
 		units[] = {};
 		weapons[] = {};
 		requiredVersion = 0.1;
-		dayzVersion = "1.0.2.92";
+		dayzVersion = "1.0.2.93";
 		requiredAddons[] = {};
 	};
 };

SQF/mod.cpp

@@ -1,5 +1,5 @@
 dir = "@DayZ_Epoch";
-name = "DayZ Epoch 1.0.2.92";
+name = "DayZ Epoch 1.0.2.93";
 actionName = "Website";
 picture = "dayz_logo_ca.paa";
 action = "http://www.dayzepoch.com";