Merge pull request #1643 from arma2WillRobinson/rrpatch2

RedRyder post-server testing fixes
2025-12-13 19:52:38 +03:00 · 2015-03-04 08:55:52 -06:00
parent 420df74924 10003f4ebf
commit ccd98e3a4c
27 changed files with 63 additions and 37 deletions
--- a/SQF/redryder/$PBOPREFIX$
+++ b/SQF/redryder/$PBOPREFIX$
@@ -1 +1 @@
-\z\addons\redryder
+z\addons\redryder
--- a/SQF/redryder/config.cpp
+++ b/SQF/redryder/config.cpp
@@ -32,14 +32,14 @@ class CfgAmmo
 {
    class BulletBase;
 	class 177_BB : BulletBase {
-		model = "z\addons\redryder\models\BB_Round.p3d";
+		model = "\z\addons\redryder\models\BB_Round.p3d";
 		simulation = shotShell;
 		soundHit[] = {0, 1};
-		hit = 3.7;
+		hit = 4.5;
 		indirectHit = 0;
 		indirectHitRange = 0;
 		visibleFire = 10;
-		audibleFire = 10;
+		audibleFire = 0.5;
 		visibleFireTime = 3;
 		deflecting = 5;
 		airFriction = -0.001064;
@@ -56,15 +56,16 @@ class CfgMagazines
 	class 350Rnd_BB_Magazine : CA_Magazine 
 	{   
 		scope = 2;
-		model = "z\addons\redryder\models\bb_magazine.p3d";	
-		picture = "z\addons\redryder\textures\bb_magazine_picture.paa"; 
-		displayName = "350 Count 177 Cal. BBs";
+		model = "\z\addons\redryder\models\bb_magazine.p3d";	
+		picture = "\z\addons\redryder\textures\bb_magazine_picture.paa"; 
+		displayName = "350 Count .177 BBs";
 		count = 350;
 		ammo = 177_BB;
 		initSpeed = 175;
-		sound[] = {"z\addons\redryder\M9SD_S1", db + 8, 1,60}; 
+		sound[] = {"\z\addons\redryder\M9SD_S1", db + 8, 1,60}; 
 		reloadMagazineSound[] = {"Ca\sounds\Weapons\rifles\M1014-reload", db - 40, 1, 20};
 		descriptionShort = "350 Zinc Coated .177, 4.5mm BBs";
+		weight = 0.2;
 	};
 };
 class CfgWeapons
@@ -80,7 +81,9 @@ class CfgWeapons
 		recoil = "recoil_single_pistol_2outof3";
 		recoilProne = "recoil_single_pistol_prone_2outof3";
 		reloadTime = 0.45;
-		sound[] = {"z\addons\redryder\RedRyder\M9SD_S1", db + 8, 1, 60}; 
+		sound[] = {"\z\addons\redryder\M9SD_S1", db + 8, 1, 60}; 
+		autoFire = 0;
+		dexterity = 0.4;
 		dispersion = 0.00045;
 		minRange = 0;
 		minRangeProbab = 0.30;
@@ -88,7 +91,7 @@ class CfgWeapons
 		midRangeProbab = 0.7;
 		maxRange = 75;
 		maxRangeProbab = 0.05;
-		picture = "z\addons\redryder\textures\redryder_picture.paa"; 
+		picture = "\z\addons\redryder\textures\redryder_picture.paa"; 
 		handAnim[] = {"OFP2_ManSkeleton", "\Ca\weapons\data\Anim\M24.rtm"};
 	};
 };
--- a/SQF/redryder/textures/bb_rv.rvmat
+++ b/SQF/redryder/textures/bb_rv.rvmat
@@ -8,7 +8,7 @@ PixelShaderID="NormalMapSpecularMap";
 VertexShaderID="NormalMap";
 class Stage1
 {
-	texture="addons\redryder\textures\bb_NOHQ.paa";		//will need to be changed
+	texture="z\addons\redryder\textures\bb_NOHQ.paa";
 	uvSource="tex";
 	class uvTransform
 	{
@@ -20,7 +20,7 @@ class Stage1
 };
 class Stage2
 {
-	texture="addons\redryder\textures\bb_SMDI.paa";		//will need to be changed
+	texture="z\addons\redryder\textures\bb_SMDI.paa";
 	uvSource="tex";
 	class uvTransform
 	{
--- a/SQF/redryder/textures/redryder.rvmat
+++ b/SQF/redryder/textures/redryder.rvmat
@@ -8,7 +8,7 @@ PixelShaderID="NormalMapSpecularMap";
 VertexShaderID="NormalMap";
 class Stage1
 {
-	texture="addons\redryder\textures\redmap_NOHQ.paa";		//will need to be changed
+	texture="z\addons\redryder\textures\redmap_NOHQ.paa";
 	uvSource="tex";
 	class uvTransform
 	{
@@ -20,7 +20,7 @@ class Stage1
 };
 class Stage2
 {
-	texture="addons\redryder\textures\redmap1sd2_SMDI.paa";		//will need to be changed
+	texture="z\addons\redryder\textures\redmap1sd2_SMDI.paa";
 	uvSource="tex";
 	class uvTransform
 	{
--- a/Files/MPMissions/DayZ_Epoch_1.Takistan/mission.sqm
+++ b/Files/MPMissions/DayZ_Epoch_1.Takistan/mission.sqm
@@ -19,7 +19,8 @@ class Mission
 		"csj_gyroac",
 		"map_eu",
 		"jetskiyanahuiaddon",
-		"warfarebuildings"
+		"warfarebuildings",
+		"redryder"
 	};
 	addOnsAuto[]=
 	{
--- a/Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/mission.sqm
+++ b/Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/mission.sqm
@@ -20,7 +20,8 @@ class Mission
 		"glt_m300t",
 		"pook_h13",
 		"csj_gyroac",
-		"map_eu"
+		"map_eu",
+		"redryder"
 	};
 	addOnsAuto[]=
 	{
--- a/Files/MPMissions/DayZ_Epoch_11.Chernarus/mission.sqm
+++ b/Files/MPMissions/DayZ_Epoch_11.Chernarus/mission.sqm
@@ -18,7 +18,8 @@ class Mission
 		"pook_h13",
 		"csj_gyroac",
 		"map_eu",
-		"jetskiyanahuiaddon"
+		"jetskiyanahuiaddon",
+		"redryder"
 	};
 	addOnsAuto[]=
 	{
--- a/Files/MPMissions/DayZ_Epoch_12.isladuala/mission.sqm
+++ b/Files/MPMissions/DayZ_Epoch_12.isladuala/mission.sqm
@@ -21,7 +21,8 @@ class Mission
 		"pook_h13",
 		"csj_gyroac",
 		"map_eu",
-		"jetskiyanahuiaddon"
+		"jetskiyanahuiaddon",
+		"redryder"
 	};
 	addOnsAuto[]=
 	{
--- a/Files/MPMissions/DayZ_Epoch_13.Tavi/mission.sqm
+++ b/Files/MPMissions/DayZ_Epoch_13.Tavi/mission.sqm
@@ -19,7 +19,8 @@ class Mission
 		"pook_h13",
 		"csj_gyroac",
 		"map_eu",
-		"jetskiyanahuiaddon"
+		"jetskiyanahuiaddon",
+		"redryder"
 	};
 	addOnsAuto[]=
 	{
--- a/Files/MPMissions/DayZ_Epoch_15.namalsk/mission.sqm
+++ b/Files/MPMissions/DayZ_Epoch_15.namalsk/mission.sqm
@@ -21,7 +21,8 @@ class Mission
 		"pook_h13",
 		"csj_gyroac",
 		"map_eu",
-		"jetskiyanahuiaddon"
+		"jetskiyanahuiaddon",
+		"redryder"
 	};
 	addOnsAuto[]=
 	{
--- a/Files/MPMissions/DayZ_Epoch_16.Panthera2/mission.sqm
+++ b/Files/MPMissions/DayZ_Epoch_16.Panthera2/mission.sqm
@@ -21,7 +21,8 @@ class Mission
 		"pook_h13",
 		"csj_gyroac",
 		"map_eu",
-		"jetskiyanahuiaddon"
+		"jetskiyanahuiaddon",
+		"redryder"
 	};
 	addOnsAuto[]=
 	{
--- a/Files/MPMissions/DayZ_Epoch_17.Chernarus/mission.sqm
+++ b/Files/MPMissions/DayZ_Epoch_17.Chernarus/mission.sqm
@@ -15,7 +15,8 @@ class Mission
 		"pook_h13",
 		"csj_gyroac",
 		"map_eu",
-		"jetskiyanahuiaddon"
+		"jetskiyanahuiaddon",
+		"redryder"
 	};
 	addOnsAuto[]=
 	{
--- a/Files/MPMissions/DayZ_Epoch_18.Sara/mission.sqm
+++ b/Files/MPMissions/DayZ_Epoch_18.Sara/mission.sqm
@@ -15,7 +15,8 @@ class Mission
 		"csj_gyroac",
 		"pook_h13",
 		"map_eu",
-		"jetskiyanahuiaddon"
+		"jetskiyanahuiaddon",
+		"redryder"
 	};
 	addOnsAuto[]=
 	{
--- a/Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/mission.sqm
+++ b/Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/mission.sqm
@@ -15,7 +15,8 @@ class Mission
 		"pook_h13",
 		"csj_gyroac",
 		"map_eu",
-		"jetskiyanahuiaddon"
+		"jetskiyanahuiaddon",
+		"redryder"
 	};
 	addOnsAuto[]=
 	{
--- a/Files/MPMissions/DayZ_Epoch_2.Utes/mission.sqm
+++ b/Files/MPMissions/DayZ_Epoch_2.Utes/mission.sqm
@@ -21,7 +21,8 @@ class Mission
 		"pook_h13",
 		"csj_gyroac",
 		"map_eu",
-		"jetskiyanahuiaddon"
+		"jetskiyanahuiaddon",
+		"redryder"
 	};
 	addOnsAuto[]=
 	{
--- a/Files/MPMissions/DayZ_Epoch_20.fapovo/mission.sqm
+++ b/Files/MPMissions/DayZ_Epoch_20.fapovo/mission.sqm
@@ -32,7 +32,8 @@ class Mission
 		"pook_h13",
 		"csj_gyroac",
 		"map_eu",
-		"jetskiyanahuiaddon"
+		"jetskiyanahuiaddon",
+		"redryder"
 	};
 	addOnsAuto[]=
 	{
--- a/Files/MPMissions/DayZ_Epoch_21.Caribou/mission.sqm
+++ b/Files/MPMissions/DayZ_Epoch_21.Caribou/mission.sqm
@@ -18,7 +18,8 @@ class Mission
 		"pook_h13",
 		"csj_gyroac",
 		"map_eu",
-		"jetskiyanahuiaddon"
+		"jetskiyanahuiaddon",
+		"redryder"
 	};
 	addOnsAuto[]=
 	{
--- a/Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/mission.sqm
+++ b/Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/mission.sqm
@@ -15,7 +15,8 @@ class Mission
 		"csj_gyroac",
 		"map_eu",
 		"jetskiyanahuiaddon",
-		"pook_h13"
+		"pook_h13",
+		"redryder"
 	};
 	addOnsAuto[]=
 	{
--- a/Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/mission.sqm
+++ b/Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/mission.sqm
@@ -21,7 +21,8 @@ class Mission
 		"pook_h13",
 		"csj_gyroac",
 		"map_eu",
-		"jetskiyanahuiaddon"
+		"jetskiyanahuiaddon",
+		"redryder"
 	};
 	addOnsAuto[]=
 	{
--- a/Files/MPMissions/DayZ_Epoch_24.Napf/mission.sqm
+++ b/Files/MPMissions/DayZ_Epoch_24.Napf/mission.sqm
@@ -19,7 +19,8 @@ class Mission
 		"pook_h13",
 		"csj_gyroac",
 		"map_eu",
-		"jetskiyanahuiaddon"
+		"jetskiyanahuiaddon",
+		"redryder"
 	};
 	addOnsAuto[]=
 	{
--- a/Files/MPMissions/DayZ_Epoch_25.sauerland/mission.sqm
+++ b/Files/MPMissions/DayZ_Epoch_25.sauerland/mission.sqm
@@ -19,7 +19,8 @@ class Mission
 		"pook_h13",
 		"csj_gyroac",
 		"map_eu",
-		"jetskiyanahuiaddon"
+		"jetskiyanahuiaddon",
+		"redryder"
 	};
 	addOnsAuto[]=
 	{
--- a/Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/mission.sqm
+++ b/Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/mission.sqm
@@ -20,7 +20,8 @@ class Mission
 		"glt_m300t",
 		"pook_h13",
 		"csj_gyroac",
-		"map_eu"
+		"map_eu",
+		"redryder"
 	};
 	addOnsAuto[]=
 	{
--- a/Files/MPMissions/DayZ_Epoch_4.Zargabad/mission.sqm
+++ b/Files/MPMissions/DayZ_Epoch_4.Zargabad/mission.sqm
@@ -19,7 +19,8 @@ class Mission
 		"camisc_e",
 		"glt_m300t",
 		"pook_h13",
-		"csj_gyroac"
+		"csj_gyroac",
+		"redryder"
 	};
 	addOnsAuto[]=
 	{
--- a/Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/mission.sqm
+++ b/Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/mission.sqm
@@ -18,7 +18,8 @@ class Mission
 		"glt_m300t",
 		"pook_h13",
 		"csj_gyroac",
-		"map_eu"
+		"map_eu",
+		"redryder"
 	};
 	addOnsAuto[]=
 	{
--- a/Files/MPMissions/DayZ_Epoch_6.Dingor/mission.sqm
+++ b/Files/MPMissions/DayZ_Epoch_6.Dingor/mission.sqm
@@ -34,7 +34,8 @@ class Mission
 		"pook_h13",
 		"csj_gyroac",
 		"map_eu",
-		"jetskiyanahuiaddon"
+		"jetskiyanahuiaddon",
+		"redryder"
 	};
 	addOnsAuto[]=
 	{
--- a/Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/mission.sqm
+++ b/Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/mission.sqm
@@ -18,7 +18,8 @@ class Mission
 		"glt_m300t",
 		"pook_h13",
 		"csj_gyroac",
-		"map_eu"
+		"map_eu",
+		"redryder"
 	};
 	addOnsAuto[]=
 	{
--- a/Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/mission.sqm
+++ b/Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/mission.sqm
@@ -18,7 +18,8 @@ class Mission
 		"glt_m300t",
 		"pook_h13",
 		"csj_gyroac",
-		"map_eu"
+		"map_eu",
+		"redryder"
 	};
 	addOnsAuto[]=
 	{