RC5

.gitignore

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

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";