Update player_tameDog raw meat names

SQF/dayz_code/Configs/CfgArma.hpp

@@ -344,7 +344,7 @@ class CfgSurvival {
 	class Meat {
 		class Default {
 			yield = 2;
-			rawfoodtype = "FoodmeatRaw";
+			//rawfoodtype = "FoodmeatRaw"; //This magazine does not exist
 		};
 		class Cow: Default {
 			yield = 6;
@@ -378,7 +378,7 @@ class CfgSurvival {
 		class Cock: Hen {};
 		class DZ_Fin: Default {
 			yield = 0;
-			rawfoodtype = "FoodSteakRaw";
+			rawfoodtype = "FoodDogRaw";
 		};
 		class DZ_Pastor: DZ_Fin {};
 		class Rabbit: Default {

SQF/dayz_code/Configs/CfgMagazines/Consumables/Meat.hpp

@@ -173,3 +173,31 @@ class FoodBeefCooked : FoodCooked
 	bloodRegen = 800;
 	Nutrition[] = {332,700,0,0};
 };
+
+class FoodDogRaw : FoodRaw
+{
+	scope = public;
+	
+	model = "\dayz_equip\models\food_steak_gear.p3d";
+	picture = "\dayz_equip\textures\equip_steak_ca.paa";
+	displayName = $STR_FOOD_NAME_DOG_RAW;
+	descriptionShort = $STR_EQUIP_DESC_47;
+	
+	bloodRegen = 300;
+	Nutrition[] = {143,300,0,0};
+	
+	cookOutput = "FoodDogCooked";
+};
+
+class FoodDogCooked : FoodCooked
+{
+	scope = public;
+	
+	model = "\dayz_equip\models\food_steak_cooked_gear.p3d";
+	picture = "\dayz_equip\textures\equip_steak_cooked_ca.paa";
+	displayName = $STR_FOOD_NAME_DOG_COOKED;
+	descriptionShort = $STR_EQUIP_DESC_25;
+	
+	bloodRegen = 600;
+	Nutrition[] = {143,600,0,0};
+};

SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp

@@ -13,13 +13,16 @@ class CfgVehicles {
 		class Sounds { class Engine; class Movement;};
 		class DefaultEventhandlers;
 	};
-	class Air : AllVehicles {
+	class Air : AllVehicles
+	{
 		class NewTurret;
 		class ViewPilot;
 		class AnimationSources;
 	};
-	class Helicopter : Air {
+	class Helicopter : Air
-		class HitPoints {
+	{
+		class HitPoints
+		{
 			class HitHull {
 				armor = 1;
 				material = 51;
@@ -121,15 +124,18 @@ class CfgVehicles {
 				passThrough = 0;
 			};
 		};
-		class Turrets {
+		class Turrets
-			class MainTurret: NewTurret {
+		{
+			class MainTurret: NewTurret
+			{
 				class Turrets;
 				class ViewOptics;
 			};
 		};
 	};
 	class Land;	// External class reference
-	class LandVehicle : Land {
+	class LandVehicle : Land
+	{
 		class NewTurret;
 		class Sounds;
 		class ViewOptics;
@@ -159,14 +165,9 @@ class CfgVehicles {
 			};
 		};
 	};
-	class car: landvehicle {
+	class Car: LandVehicle {
-		class Turrets {
+		class HitPoints
-			class MainTurret: NewTurret {
+		{
-				class Turrets;
-				class ViewOptics;
-			};
-		};
-		class HitPoints {
 			class HitEngine;
 			class HitRGlass;
 			class HitLGlass;
@@ -185,13 +186,22 @@ class CfgVehicles {
 			class HitGlass3;
 			class HitGlass4;
 		};
-		class Sounds : Sounds {
+		class Turrets
+		{
+			class MainTurret: NewTurret
+			{
+				class Turrets;
+				class ViewOptics;
+			};
+		};
+		class Sounds : Sounds
+		{
 			class Engine;
 			class Movement;
 		};
 	};
 
-	class Tank: landvehicle	{
+	class Tank: LandVehicle	{
   		class Sounds: Sounds  {
    			class Engine;
    			class Movement;

SQF/dayz_code/Configs/CfgWorlds.hpp

@@ -203,6 +203,7 @@ class CfgWorlds {
 			};
 		};
 	};
+	
 	initWorld = "DayZMod";
 	demoWorld = "DayZMod";
 };

SQF/dayz_code/actions/dog/player_tameDog.sqf

@@ -1,14 +1,21 @@
-private ["_target","_id","_pos","_dog","_fsmid","_hasRawMeat","_hasdog"];
+private ["_target","_id","_pos","_dog","_fsmid","_hasMeat","_hasdog","_meat"];
 _target = 	_this select 0;
 //_caller = 	_this select 1;
 _id =		_this select 2;
 //_params =	_this select 3;
 _pos = 		[_target] call FNC_GetPos;
-_hasRawMeat = "FoodSteakRaw" in magazines player;
+
+_hasMeat = false;
+{
+	if (_x in Dayz_meatraw) exitWith {
+		_hasMeat = true;
+		_meat = _x;
+	};
+} count (magazines player);
 _hasdog = player getVariable ["dogid", "false"];
 
-if ((_hasRawMeat) && (_hasdog == "false")) then {
+if (_hasMeat && (_hasdog == "false")) then {
-	player removeMagazine "FoodSteakRaw";
+	player removeMagazine _meat;
 	deleteVehicle (_this select 0);
 	_dog = (group player) createUnit [typeOf _target, _pos, [], 0, "FORM"];
 
@@ -16,7 +23,7 @@ if ((_hasRawMeat) && (_hasdog == "false")) then {
 	_fsmid = [_dog, typeOf _target] execFSM "\z\addons\dayz_code\system\dog_agent.fsm";
 	_fsmid setFSMVariable ["_handle", _fsmid];
 	_target removeAction _id;
-    	player setvariable ["dogid", _fsmid];
+    player setVariable ["dogid", _fsmid];
 } else {
 	localize "str_epoch_player_18" call dayz_rollingMessages;
 };

SQF/dayz_code/actions/dog/tame_dog_old.sqf

@@ -19,7 +19,7 @@ _caller = 	_this select 1;
 _id =		_this select 2;
 _dog =		_this select 3;
 
-player removeMagazine "FoodSteakRaw";
+player removeMagazine "FoodBeefRaw";
 _animalID = _dog getVariable "fsm_handle";
 _animalID setFSMVariable ["_isTamed", true];
 uiSleep 1;

SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Food.hpp

@@ -80,10 +80,6 @@ class FoodbeefRaw
 {
 	weight = 0.25;
 };
-class FoodSteakRaw
-{
-	weight = 0.25;
-};
 class FoodBioMeat
 {
 	weight = 0.2;

SQF/dayz_code/stringtable.xml

@@ -13902,5 +13902,21 @@
 			<Czech>Stan (iglú) Poušť +++++</Czech>
 			<German>Igluzelt Wüste +++++</German>
 		</Key>
+		<Key ID="STR_FOOD_NAME_DOG_RAW">
+			<English>Raw Dog Meat</English>
+			<German>Raw Hundefleisch</German>
+			<Russian>Сырое мясо собаки</Russian>
+			<Spanish>La carne de perro en bruto</Spanish>
+			<French>Nourriture pour chien</French>
+			<Czech>Raw Dog Meat</Czech>
+		</Key>
+		<Key ID="STR_FOOD_NAME_DOG_COOKED">
+			<English>Cooked Dog Meat</English>
+			<German>Gekochte Hundefleisch</German>
+			<Russian>Приготовленное мясо собаки</Russian>
+			<Spanish>Carne cocinada perro</Spanish>
+			<French>Cuit viande de chien</French>
+			<Czech>Vařené maso Dog</Czech>
+		</Key>
 	</Package>
 </Project>