Merge pull request #1643 from arma2WillRobinson/rrpatch2

RedRyder post-server testing fixes
This commit is contained in:
vbawol
2015-03-04 08:55:52 -06:00
27 changed files with 63 additions and 37 deletions

View File

@@ -1 +1 @@
\z\addons\redryder z\addons\redryder

View File

@@ -32,14 +32,14 @@ class CfgAmmo
{ {
class BulletBase; class BulletBase;
class 177_BB : BulletBase { class 177_BB : BulletBase {
model = "z\addons\redryder\models\BB_Round.p3d"; model = "\z\addons\redryder\models\BB_Round.p3d";
simulation = shotShell; simulation = shotShell;
soundHit[] = {0, 1}; soundHit[] = {0, 1};
hit = 3.7; hit = 4.5;
indirectHit = 0; indirectHit = 0;
indirectHitRange = 0; indirectHitRange = 0;
visibleFire = 10; visibleFire = 10;
audibleFire = 10; audibleFire = 0.5;
visibleFireTime = 3; visibleFireTime = 3;
deflecting = 5; deflecting = 5;
airFriction = -0.001064; airFriction = -0.001064;
@@ -56,15 +56,16 @@ class CfgMagazines
class 350Rnd_BB_Magazine : CA_Magazine class 350Rnd_BB_Magazine : CA_Magazine
{ {
scope = 2; scope = 2;
model = "z\addons\redryder\models\bb_magazine.p3d"; model = "\z\addons\redryder\models\bb_magazine.p3d";
picture = "z\addons\redryder\textures\bb_magazine_picture.paa"; picture = "\z\addons\redryder\textures\bb_magazine_picture.paa";
displayName = "350 Count 177 Cal. BBs"; displayName = "350 Count .177 BBs";
count = 350; count = 350;
ammo = 177_BB; ammo = 177_BB;
initSpeed = 175; 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}; reloadMagazineSound[] = {"Ca\sounds\Weapons\rifles\M1014-reload", db - 40, 1, 20};
descriptionShort = "350 Zinc Coated .177, 4.5mm BBs"; descriptionShort = "350 Zinc Coated .177, 4.5mm BBs";
weight = 0.2;
}; };
}; };
class CfgWeapons class CfgWeapons
@@ -80,7 +81,9 @@ class CfgWeapons
recoil = "recoil_single_pistol_2outof3"; recoil = "recoil_single_pistol_2outof3";
recoilProne = "recoil_single_pistol_prone_2outof3"; recoilProne = "recoil_single_pistol_prone_2outof3";
reloadTime = 0.45; 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; dispersion = 0.00045;
minRange = 0; minRange = 0;
minRangeProbab = 0.30; minRangeProbab = 0.30;
@@ -88,7 +91,7 @@ class CfgWeapons
midRangeProbab = 0.7; midRangeProbab = 0.7;
maxRange = 75; maxRange = 75;
maxRangeProbab = 0.05; 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"}; handAnim[] = {"OFP2_ManSkeleton", "\Ca\weapons\data\Anim\M24.rtm"};
}; };
}; };

View File

@@ -8,7 +8,7 @@ PixelShaderID="NormalMapSpecularMap";
VertexShaderID="NormalMap"; VertexShaderID="NormalMap";
class Stage1 class Stage1
{ {
texture="addons\redryder\textures\bb_NOHQ.paa"; //will need to be changed texture="z\addons\redryder\textures\bb_NOHQ.paa";
uvSource="tex"; uvSource="tex";
class uvTransform class uvTransform
{ {
@@ -20,7 +20,7 @@ class Stage1
}; };
class Stage2 class Stage2
{ {
texture="addons\redryder\textures\bb_SMDI.paa"; //will need to be changed texture="z\addons\redryder\textures\bb_SMDI.paa";
uvSource="tex"; uvSource="tex";
class uvTransform class uvTransform
{ {

View File

@@ -8,7 +8,7 @@ PixelShaderID="NormalMapSpecularMap";
VertexShaderID="NormalMap"; VertexShaderID="NormalMap";
class Stage1 class Stage1
{ {
texture="addons\redryder\textures\redmap_NOHQ.paa"; //will need to be changed texture="z\addons\redryder\textures\redmap_NOHQ.paa";
uvSource="tex"; uvSource="tex";
class uvTransform class uvTransform
{ {
@@ -20,7 +20,7 @@ class Stage1
}; };
class Stage2 class Stage2
{ {
texture="addons\redryder\textures\redmap1sd2_SMDI.paa"; //will need to be changed texture="z\addons\redryder\textures\redmap1sd2_SMDI.paa";
uvSource="tex"; uvSource="tex";
class uvTransform class uvTransform
{ {

View File

@@ -19,7 +19,8 @@ class Mission
"csj_gyroac", "csj_gyroac",
"map_eu", "map_eu",
"jetskiyanahuiaddon", "jetskiyanahuiaddon",
"warfarebuildings" "warfarebuildings",
"redryder"
}; };
addOnsAuto[]= addOnsAuto[]=
{ {

View File

@@ -20,7 +20,8 @@ class Mission
"glt_m300t", "glt_m300t",
"pook_h13", "pook_h13",
"csj_gyroac", "csj_gyroac",
"map_eu" "map_eu",
"redryder"
}; };
addOnsAuto[]= addOnsAuto[]=
{ {

View File

@@ -18,7 +18,8 @@ class Mission
"pook_h13", "pook_h13",
"csj_gyroac", "csj_gyroac",
"map_eu", "map_eu",
"jetskiyanahuiaddon" "jetskiyanahuiaddon",
"redryder"
}; };
addOnsAuto[]= addOnsAuto[]=
{ {

View File

@@ -21,7 +21,8 @@ class Mission
"pook_h13", "pook_h13",
"csj_gyroac", "csj_gyroac",
"map_eu", "map_eu",
"jetskiyanahuiaddon" "jetskiyanahuiaddon",
"redryder"
}; };
addOnsAuto[]= addOnsAuto[]=
{ {

View File

@@ -19,7 +19,8 @@ class Mission
"pook_h13", "pook_h13",
"csj_gyroac", "csj_gyroac",
"map_eu", "map_eu",
"jetskiyanahuiaddon" "jetskiyanahuiaddon",
"redryder"
}; };
addOnsAuto[]= addOnsAuto[]=
{ {

View File

@@ -21,7 +21,8 @@ class Mission
"pook_h13", "pook_h13",
"csj_gyroac", "csj_gyroac",
"map_eu", "map_eu",
"jetskiyanahuiaddon" "jetskiyanahuiaddon",
"redryder"
}; };
addOnsAuto[]= addOnsAuto[]=
{ {

View File

@@ -21,7 +21,8 @@ class Mission
"pook_h13", "pook_h13",
"csj_gyroac", "csj_gyroac",
"map_eu", "map_eu",
"jetskiyanahuiaddon" "jetskiyanahuiaddon",
"redryder"
}; };
addOnsAuto[]= addOnsAuto[]=
{ {

View File

@@ -15,7 +15,8 @@ class Mission
"pook_h13", "pook_h13",
"csj_gyroac", "csj_gyroac",
"map_eu", "map_eu",
"jetskiyanahuiaddon" "jetskiyanahuiaddon",
"redryder"
}; };
addOnsAuto[]= addOnsAuto[]=
{ {

View File

@@ -15,7 +15,8 @@ class Mission
"csj_gyroac", "csj_gyroac",
"pook_h13", "pook_h13",
"map_eu", "map_eu",
"jetskiyanahuiaddon" "jetskiyanahuiaddon",
"redryder"
}; };
addOnsAuto[]= addOnsAuto[]=
{ {

View File

@@ -15,7 +15,8 @@ class Mission
"pook_h13", "pook_h13",
"csj_gyroac", "csj_gyroac",
"map_eu", "map_eu",
"jetskiyanahuiaddon" "jetskiyanahuiaddon",
"redryder"
}; };
addOnsAuto[]= addOnsAuto[]=
{ {

View File

@@ -21,7 +21,8 @@ class Mission
"pook_h13", "pook_h13",
"csj_gyroac", "csj_gyroac",
"map_eu", "map_eu",
"jetskiyanahuiaddon" "jetskiyanahuiaddon",
"redryder"
}; };
addOnsAuto[]= addOnsAuto[]=
{ {

View File

@@ -32,7 +32,8 @@ class Mission
"pook_h13", "pook_h13",
"csj_gyroac", "csj_gyroac",
"map_eu", "map_eu",
"jetskiyanahuiaddon" "jetskiyanahuiaddon",
"redryder"
}; };
addOnsAuto[]= addOnsAuto[]=
{ {

View File

@@ -18,7 +18,8 @@ class Mission
"pook_h13", "pook_h13",
"csj_gyroac", "csj_gyroac",
"map_eu", "map_eu",
"jetskiyanahuiaddon" "jetskiyanahuiaddon",
"redryder"
}; };
addOnsAuto[]= addOnsAuto[]=
{ {

View File

@@ -15,7 +15,8 @@ class Mission
"csj_gyroac", "csj_gyroac",
"map_eu", "map_eu",
"jetskiyanahuiaddon", "jetskiyanahuiaddon",
"pook_h13" "pook_h13",
"redryder"
}; };
addOnsAuto[]= addOnsAuto[]=
{ {

View File

@@ -21,7 +21,8 @@ class Mission
"pook_h13", "pook_h13",
"csj_gyroac", "csj_gyroac",
"map_eu", "map_eu",
"jetskiyanahuiaddon" "jetskiyanahuiaddon",
"redryder"
}; };
addOnsAuto[]= addOnsAuto[]=
{ {

View File

@@ -19,7 +19,8 @@ class Mission
"pook_h13", "pook_h13",
"csj_gyroac", "csj_gyroac",
"map_eu", "map_eu",
"jetskiyanahuiaddon" "jetskiyanahuiaddon",
"redryder"
}; };
addOnsAuto[]= addOnsAuto[]=
{ {

View File

@@ -19,7 +19,8 @@ class Mission
"pook_h13", "pook_h13",
"csj_gyroac", "csj_gyroac",
"map_eu", "map_eu",
"jetskiyanahuiaddon" "jetskiyanahuiaddon",
"redryder"
}; };
addOnsAuto[]= addOnsAuto[]=
{ {

View File

@@ -20,7 +20,8 @@ class Mission
"glt_m300t", "glt_m300t",
"pook_h13", "pook_h13",
"csj_gyroac", "csj_gyroac",
"map_eu" "map_eu",
"redryder"
}; };
addOnsAuto[]= addOnsAuto[]=
{ {

View File

@@ -19,7 +19,8 @@ class Mission
"camisc_e", "camisc_e",
"glt_m300t", "glt_m300t",
"pook_h13", "pook_h13",
"csj_gyroac" "csj_gyroac",
"redryder"
}; };
addOnsAuto[]= addOnsAuto[]=
{ {

View File

@@ -18,7 +18,8 @@ class Mission
"glt_m300t", "glt_m300t",
"pook_h13", "pook_h13",
"csj_gyroac", "csj_gyroac",
"map_eu" "map_eu",
"redryder"
}; };
addOnsAuto[]= addOnsAuto[]=
{ {

View File

@@ -34,7 +34,8 @@ class Mission
"pook_h13", "pook_h13",
"csj_gyroac", "csj_gyroac",
"map_eu", "map_eu",
"jetskiyanahuiaddon" "jetskiyanahuiaddon",
"redryder"
}; };
addOnsAuto[]= addOnsAuto[]=
{ {

View File

@@ -18,7 +18,8 @@ class Mission
"glt_m300t", "glt_m300t",
"pook_h13", "pook_h13",
"csj_gyroac", "csj_gyroac",
"map_eu" "map_eu",
"redryder"
}; };
addOnsAuto[]= addOnsAuto[]=
{ {

View File

@@ -18,7 +18,8 @@ class Mission
"glt_m300t", "glt_m300t",
"pook_h13", "pook_h13",
"csj_gyroac", "csj_gyroac",
"map_eu" "map_eu",
"redryder"
}; };
addOnsAuto[]= addOnsAuto[]=
{ {