Fix RHIB_DZ version, adding RHIB_DZE boats

Server admins should switch to the RHIB_DZ or RHIB_DZE version. The normal RHIB boats are from arma and should not be overwritten from the epoch configs as it was the case before. This commit restores the acutal configs and alters them to the new versions.

SQF/dayz_code/Configs/CfgServerTrader/Category/Boats.hpp

@@ -1,6 +1,11 @@
 //Armed Boats
-class Category_48 {
-	class RHIB {type = "trade_any_boat";buy[] = {4,"ItemGoldBar10oz"};sell[] = {2,"ItemGoldBar10oz"};};
+class Category_48 {	
+	class RHIB_DZE {type = "trade_any_boat";buy[] = {4,"ItemGoldBar10oz"};sell[] = {2,"ItemGoldBar10oz"};};
+	class RHIB_DZ {type = "trade_any_boat";buy[] = {-4,"ItemGoldBar10oz"};sell[] = {2,"ItemGoldBar10oz"};};	
+	class RHIB2Turret_DZE {type = "trade_any_boat";buy[] = {8,"ItemGoldBar10oz"};sell[] = {4,"ItemGoldBar10oz"};};
+	class RHIB2Turret_DZ {type = "trade_any_boat";buy[] = {-8,"ItemGoldBar10oz"};sell[] = {4,"ItemGoldBar10oz"};};
+	class RHIB {type = "trade_any_boat";buy[] = {-4,"ItemGoldBar10oz"};sell[] = {2,"ItemGoldBar10oz"};};
+	class RHIB2Turret {type = "trade_any_boat";buy[] = {-8,"ItemGoldBar10oz"};sell[] = {4,"ItemGoldBar10oz"};};
 };
 
 //Unarmed Boats

SQF/dayz_code/Configs/CfgVehicles/Boat/RHIB.hpp

@@ -1,15 +1,5 @@
-//class NewTurret;
-//class ViewPilot;
-//class ViewOptics;
-//class Sounds { class Engine; class Movement;};
-//class DefaultEventhandlers;
 class Ship : AllVehicles
-  {
-	  /*class UserActions
-		{
-			class Repair {ACTION_REPAIR; radius = 8;};
-			class Salvage {ACTION_SALVAGE; radius = 8;};
-		};*/
+{
 	transportMaxMagazines = 2000;
     transportMaxWeapons = 200;
     transportMaxBackpacks = 40;
@@ -244,7 +234,8 @@ class Ship : AllVehicles
       "GetOutLow"
     };
     precision = 10;
-  };
+};
+  
 class SmallShip: Ship
 {
 	displayName = "Small Ship";
@@ -258,298 +249,158 @@ class BigShip: Ship
 	transportMaxWeapons = 200;
 };
 class Boat : Ship
-{
+{	
 	precision = 6;
 	brakeDistance = 20;
 	transportMaxMagazines = 100;
 	transportMaxWeapons = 10;
 	transportMaxBackpacks = 2;
 };
-class RHIB: Boat
-{
-	displayName = $STR_DN_RHIB;
-	typicalCargo[] = {};
-	class TransportMagazines {};
-	class TransportWeapons {};
-};
-class RHIB2Turret: RHIB
-{
-	displayName = $STR_DN_RHIB2;
-};
 
-class RHIB_DZ : Boat
+class RHIB;
+class RHIB_DZ : RHIB
 {
 	scope = public;
-	displayName = $STR_DN_RHIB;
-	vehicleClass = "Ship";
-	accuracy = 0.5;
+	displayName = $STR_VEH_NAME_RHIB_M2;
 	crew = "";
-	faction = "USMC";
-	side = 1;
-	model = "\ca\water\rhib";
-	picture = "\ca\water\data\ico\rhib_CA.paa";
-	Icon = "\Ca\water\Data\map_ico\icomap_RHIB_CA.paa";
-	mapSize = 8;
-	unitInfoType = "UnitInfoShip";
-	soundEnviron[] = {
-	  "",
-	  0.0562341,
-	  0.9
-	};
-	class SoundEvents
-	{
-	};
-	insideSoundCoef = 1;
-	soundEngineOnInt[] = {
-	  "ca\sounds\vehicles\water\rhib\ext-boat-start-01",
-	  0.1,
-	  1
-	};
-	soundEngineOnExt[] = {
-	  "ca\sounds\vehicles\water\rhib\ext-boat-start-01",
-	  1,
-	  1,
-	  150
-	};
-	soundEngineOffInt[] = {
-	  "ca\sounds\vehicles\water\rhib\ext-boat-stop-01",
-	  0.1,
-	  1
-	};
-	soundEngineOffExt[] = {
-	  "ca\sounds\vehicles\water\rhib\ext-boat-stop-01",
-	  1,
-	  1,
-	  150
-	};
-	class Sounds
-	{
-	  class Engine
-	  {
-		sound[] = {
-		  "ca\sounds\vehicles\water\rhib\ext-boat-engine-low-01",
-		  1,
-		  0.9,
-		  300
-		};
-		frequency = "(randomizer*0.05+0.95)*rpm";
-		volume = "engineOn*(rpm factor[0.5, 0.1])";
-	  };
-	  class EngineHighOut
-	  {
-		sound[] = {
-		  "ca\sounds\vehicles\water\rhib\ext-boat-engine-high-01",
-		  1,
-		  0.8,
-		  300
-		};
-		frequency = "(randomizer*0.05+0.95)*rpm";
-		volume = "engineOn*(rpm factor[0.4, 1.3])";
-	  };
-	  class IdleOut
-	  {
-		sound[] = {
-		  "ca\sounds\vehicles\water\rhib\ext-boat-engine-idle-03",
-		  0.562341,
-		  1,
-		  150
-		};
-		frequency = "1";
-		volume = "engineOn*(rpm factor[0.3, 0])";
-	  };
-	  class WaternoiseOutW0
-	  {
-		sound[] = {
-		  "ca\sounds\vehicles\water\water_sfx\ext-water-noise-nospeed",
-		  0.398107,
-		  1,
-		  100
-		};
-		frequency = "1";
-		volume = "(speed factor[7, 0])";
-	  };
-	  class WaternoiseOutW1
-	  {
-		sound[] = {
-		  "ca\sounds\vehicles\water\water_sfx\ext-boat-lospd-noise-02",
-		  0.398107,
-		  1,
-		  100
-		};
-		frequency = "1";
-		volume = "((speed factor[2, 12]) min (speed factor[12, 2]))";
-	  };
-	  class WaternoiseOutW2
-	  {
-		sound[] = {
-		  "ca\sounds\vehicles\water\water_sfx\ext-boat-hispd-noise-02",
-		  0.398107,
-		  1,
-		  100
-		};
-		frequency = "1";
-		volume = "(speed factor[9, 18.7])";
-	  };
-	};
-	driverAction = "RHIB_Driver";
-	cargoAction[] = {
-	  "RHIB_Cargo"
-	};
-	getInAction = "GetInMedium";
-	getOutAction = "GetOutMedium";
-	cargoGetInAction[] = {
-	  "GetInMedium"
-	};
-	cargoGetOutAction[] = {
-	  "GetOutMedium"
-	};
-	castDriverShadow = 1;
-	castCargoShadow = 1;
-	gunnerHasFlares = 0;
-	maxSpeed = 60;
-	enableGPS = 1;
-	transportSoldier = 10;
+	enablemanualfire = 0;
 	typicalCargo[] = {};
 	class TransportMagazines {};
 	class TransportWeapons {};
-	supplyRadius = 3;
-	class Exhausts
+	class Turrets;
+	class NewTurret;	
+};
+
+class RHIB_DZE : RHIB_DZ
+{
+	class Turrets: Turrets
 	{
-	  class Exhaust1
-	  {
-		position = "vyfuk start";
-		direction = "vyfuk konec";
-		effect = "";
-	  };
-	};
-	cost = 10000;
-	armor = 30;
-	class AnimationSources
-	{
-	  class ReloadAnim
-	  {
-		source = "reload";
-		weapon = "M2";
-	  };
-	  class ReloadMagazine
-	  {
-		source = "reloadmagazine";
-		weapon = "M2";
-	  };
-	  class Revolving
-	  {
-		source = "revolving";
-		weapon = "M2";
-	  };
-	};
-	class Turrets : Turrets
-	{
-	  class MainTurret : NewTurret
-	  {
-		class HitPoints
+		class MainTurret: NewTurret
 		{
-		  class HitTurret
-		  {
-			armor = 0.8;
-			material = 60;
-			name = "vez";
-			visual = "vez";
-			passThrough = 1;
-		  };
-		  class HitGun
-		  {
-			armor = 0.6;
-			material = 60;
-			name = "zbran";
-			visual = "zbran";
-			passThrough = 1;
-		  };
+			class HitPoints
+			{
+				class HitTurret
+				{
+					armor = 0.8;
+					material = 60;
+					name = "vez";
+					visual = "vez";
+					passThrough = 1;
+				};
+				class HitGun
+				{
+					armor = 0.6;
+					material = 60;
+					name = "zbran";
+					visual = "zbran";
+					passThrough = 1;
+				};
+			};
+			stabilizedInAxes = 0;
+			body = "MainTurret";
+			gun = "MainGun";
+			animationSourceBody = "mainTurret";
+			animationSourceGun = "mainGun";
+			gunnerAction = "RHIB_Gunner";
+			gunnerGetInAction = "GetInMedium";
+			gunnerGetOutAction = "GetOutMedium";
+			ejectDeadGunner = 1;
+			outGunnerMayFire = 1;
+			inGunnerMayFire = 0;
+			minElev = -25;
+			maxElev = 60;
+			initElev = 5;
+			minTurn = -135;
+			maxTurn = 135;
+			initTurn = 0;
+			soundServo[] = {"\ca\sounds\vehicles\servos\turret-1",0.0056234132,1.0};
+			gunBeg = "usti hlavne";
+			gunEnd = "konec hlavne";
+			weapons[] = {"M2"};
+			magazines[] = {};
+			gunnerName = "$STR_POSITION_FRONTGUNNER";
+			gunnerOpticsModel = "\ca\weapons\optika_empty";
+			gunnerForceOptics = 0;
+			startEngine = 0;
+			commanding = 2;
+			primaryGunner = 0;
+			primaryObserver = 1;
+			class ViewOptics
+			{
+				initAngleX = 0;
+				minAngleX = -30;
+				maxAngleX = 30;
+				initAngleY = 0;
+				minAngleY = -100;
+				maxAngleY = 100;
+				initFov = 0.7;
+				minFov = 0.25;
+				maxFov = 1.1;
+			};
+			class ViewGunner
+			{
+				initAngleX = 5;
+				minAngleX = -65;
+				maxAngleX = 85;
+				initAngleY = 0;
+				minAngleY = -150;
+				maxAngleY = 150;
+				initFov = 0.7;
+				minFov = 0.25;
+				maxFov = 1.1;
+			};
 		};
-		stabilizedInAxes = 0;
-		body = "MainTurret";
-		gun = "MainGun";
-		animationSourceBody = "mainTurret";
-		animationSourceGun = "mainGun";
-		gunnerAction = "RHIB_Gunner";
-		gunnerGetInAction = "GetInMedium";
-		gunnerGetOutAction = "GetOutMedium";
-		ejectDeadGunner = 1;
-		outGunnerMayFire = 1;
-		inGunnerMayFire = 0;
-		minElev = -25;
-		maxElev = 60;
-		initElev = 5;
-		minTurn = -135;
-		maxTurn = 135;
-		initTurn = 0;
-		soundServo[] = {
-		  "\ca\sounds\vehicles\servos\turret-1",
-		  0.00562341,
-		  1
-		};
-		gunBeg = "usti hlavne";
-		gunEnd = "konec hlavne";
-		weapons[] = {
-		  "M2"
-		};
-		magazines[] = {
-		  "100Rnd_127x99_M2",
-		  "100Rnd_127x99_M2",
-		  "100Rnd_127x99_M2"
-		};
-		gunnerName = $STR_POSITION_FRONTGUNNER;
-		gunnerOpticsModel = "\ca\weapons\optika_empty";
-		gunnerForceOptics = 0;
-		startEngine = 0;
-		commanding = 2;
-		primaryGunner = 0;
-		primaryObserver = 1;
-		class ViewOptics
-		{
-		  initAngleX = 0;
-		  minAngleX = -30;
-		  maxAngleX = 30;
-		  initAngleY = 0;
-		  minAngleY = -100;
-		  maxAngleY = 100;
-		  initFov = 0.7;
-		  minFov = 0.25;
-		  maxFov = 1.1;
-		};
-		class ViewGunner
-		{
-		  initAngleX = 5;
-		  minAngleX = -65;
-		  maxAngleX = 85;
-		  initAngleY = 0;
-		  minAngleY = -150;
-		  maxAngleY = 150;
-		  initFov = 0.7;
-		  minFov = 0.25;
-		  maxFov = 1.1;
-		};
-	  };
-	};
-	class Library
-	{
-	  libTextDesc = $STR_LIB_RHIB;
-	};
-	extCameraPosition[] = {
-	  0,
-	  4,
-	  -14
-	};
-	class Damage
-	{
-	  tex[] = {
-	  };
-	  mat[] = {
-		"ca\water\data\rhib.rvmat",
-		"ca\water\data\rhib.rvmat",
-		"ca\water\data\rhib_destruct.rvmat",
-		"ca\water\data\rhib_dash.rvmat",
-		"ca\water\data\rhib_dash.rvmat",
-		"ca\water\data\rhib_dash_destruct.rvmat"
-	  };
 	};
 };
+
+class RHIB2Turret;
+class RHIB2Turret_DZ : RHIB2Turret
+{
+	scope = public;
+	displayName = $STR_VEH_NAME_RHIB_MK19;
+	enablemanualfire = 0;
+	crew = "";
+	typicalCargo[] = {};
+	class TransportMagazines {};
+	class TransportWeapons {};
+	class Turrets;
+	class MainTurret;	
+};
+
+class RHIB2Turret_DZE : RHIB2Turret_DZ
+{
+	class Turrets: Turrets
+	{
+		class MainTurret: MainTurret
+		{
+			magazines[] = {};
+		};
+		class BackTurret: MainTurret
+		{
+			body = "Turret_2";
+			gun = "Gun_2";
+			animationSourceBody = "Turret_2";
+			animationSourceGun = "Gun_2";
+			animationSourceHatch = "";
+			selectionFireAnim = "zasleh_1";
+			stabilizedInAxes = 0;
+			proxyIndex = 2;
+			gunnerName = "$STR_POSITION_REARGUNNER";
+			commanding = -2;
+			gunnerOpticsModel = "\ca\weapons\optika_empty";
+			minElev = -50;
+			maxElev = 25;
+			initElev = -5;
+			minTurn = 120;
+			maxTurn = 240;
+			initTurn = 180;
+			weapons[] = {"MK19"};				
+			gunBeg = "usti hlavne_1";
+			gunEnd = "konec hlavne_1";
+			primaryGunner = 1;
+			primaryObserver = 0;
+			memoryPointGun = "kulas_1";
+			memoryPointGunnerOptics = "gunnerview_1";
+		};
+	};
+};

SQF/dayz_code/stringtable.xml

@@ -8436,6 +8436,14 @@
 		<Key ID="STR_VEH_NAME_TT650_INS">
 			<English>Yamaha TT650</English>
 		</Key>
+		<Key ID="STR_VEH_NAME_RHIB_M2">
+			<English>RHIB (M2)</English>
+			<Russian>НЛЖК (M2)</Russian>
+		</Key>	
+		<Key ID="STR_VEH_NAME_RHIB_MK19">
+			<English>RHIB (MK 19)</English>
+			<Russian>НЛЖК (Мод. 19)</Russian>
+		</Key>		
 		<Key ID="STR_VEH_NAME_PBX">
 			<English>PBX</English>
 			<Russian>Моторная лодка ПВХ</Russian>

SQF/dayz_server/system/dynamic_vehicle.sqf

@@ -124,7 +124,7 @@ if (toLower worldName in ["caribou","chernarus","cmr_ovaron","dayznogova","dingo
 		["JetSkiYanahui_Case_Red",_Ratio1],
 		["JetSkiYanahui_Case_Yellow",_Ratio1],
 		["PBX",_Ratio3],
-		["RHIB",_Ratio3],
+		["RHIB_DZE",_Ratio3],
 		["Smallboat_1",_Ratio3],
 		["Smallboat_2",_Ratio3],
 		["Zodiac",_Ratio3]