Skip to content

Commit

Permalink
remove obsolete fix, fix #3545
Browse files Browse the repository at this point in the history
  • Loading branch information
@commy2
commy2 committed Mar 6, 2016
1 parent de6af27 commit 79db282
Showing 1 changed file with 31 additions and 45 deletions.
76 changes: 31 additions & 45 deletions addons/smallarms/CfgWeapons.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,18 +58,12 @@ class CfgWeapons {
// Grenade launchers /////////////////////////////////////
// Updated strings are in weapon configs.
class GrenadeLauncher;
class UGL_F : GrenadeLauncher {};
class UGL_F: GrenadeLauncher {};

// MXs ////////////////////////////////////////////////////

class arifle_MX_Base_F : Rifle_Base_F {
//magazines[] = {"30Rnd_65x39_caseless_mag", "30Rnd_65x39_caseless_mag_Tracer", "100Rnd_65x39_caseless_mag", "100Rnd_65x39_caseless_mag_Tracer"};

// http://www.bushmaster.com/acr/#/intro
// 800 rpm (whatever, fictional lol)

//class Single : Mode_SemiAuto {};
class Single : Mode_SemiAuto {
class arifle_MX_Base_F: Rifle_Base_F {
class Single: Mode_SemiAuto {
reloadTime = 0.075;
};

Expand All @@ -78,20 +72,20 @@ class CfgWeapons {
};
};

class arifle_MX_SW_F : arifle_MX_Base_F {
class arifle_MX_SW_F: arifle_MX_Base_F {
modes[] = {"Single", "manual", "close", "short", "medium", "far_optic1", "far_optic2"};

//class Single : Single {};
//class manual : FullAuto {};
//class Single: Single {};
//class manual: FullAuto {};
};

// Katibas ////////////////////////////////////////////////////

class arifle_katiba_Base_F : Rifle_Base_F {
class arifle_katiba_Base_F: Rifle_Base_F {
// http://world.guns.ru/assault/iran/khaybar-kh2002-e.html
// 800 rpm

class Single : Mode_SemiAuto {
class Single: Mode_SemiAuto {
reloadTime = 0.075;
};

Expand All @@ -102,16 +96,16 @@ class CfgWeapons {

// SDAR //////////////////////////////////////////////////

class SDAR_base_F : Rifle_Base_F {
class SDAR_base_F: Rifle_Base_F {
modes[] = {"Single", "FullAuto"}; // Leave in the imaginary full-auto mode because, whatever.
};

// Tavor TRG ////////////////////////////////////////////////

class Tavor_base_F : Rifle_Base_F {
class Tavor_base_F: Rifle_Base_F {
// http://www.israel-weapon.com/files/brochure_2012/IWI_TAVOR_AR.pdf
// 700 ~1000 rpm (850)
class Single : Mode_SemiAuto {
class Single: Mode_SemiAuto {
reloadTime = 0.07;
};

Expand All @@ -122,10 +116,10 @@ class CfgWeapons {

// Mk20 (F2000) //////////////////////////////////////////////////

class mk20_base_F : Rifle_Base_F {
class mk20_base_F: Rifle_Base_F {
// http://www.fnherstal.com/primary-menu/products-capabilities/rifles/technical-data/product/182/232/182/1/_/fn-f2000R-standard.html
// 850 rpm
class Single : Mode_SemiAuto {
class Single: Mode_SemiAuto {
reloadTime = 0.07;
};

Expand All @@ -136,14 +130,14 @@ class CfgWeapons {

// SMG Vermin ////////////////////////////////////////////////////

class SMG_01_Base : Rifle_Base_F {
class SMG_01_Base: Rifle_Base_F {
// http://kriss-usa.com/pdf/operatormanual/
// 1200 rpm
class Single : Mode_SemiAuto {
class Single: Mode_SemiAuto {
reloadTime = 0.05;
};

class Burst : Mode_Burst {
class Burst: Mode_Burst {
burst = 2;
reloadTime = 0.05;
};
Expand All @@ -155,17 +149,17 @@ class CfgWeapons {

// SMG Scorpion ////////////////////////////////////////////////////

class SMG_02_base_F : Rifle_Base_F {
class SMG_02_base_F: Rifle_Base_F {
//http://www.czub.cz/zbrojovka/cz-manual/Instruction-Manual-Scorpion-EVO-3-A1_en.pdf
// 1150 rpm

class Single : Mode_SemiAuto {
class Single: Mode_SemiAuto {
// http://www.stengg.com/upload/915fGdhTi3ggnnGQGGL.pdf
// 900-1100 rpm (1000rpm)
reloadTime = 0.052;
};

class Burst : Mode_Burst {
class Burst: Mode_Burst {
reloadTime = 0.052;
};

Expand All @@ -177,11 +171,9 @@ class CfgWeapons {
// SMG PDW2000 ///////////////////////////////////////////////////

class pdw2000_base_F: Rifle_Base_F {
magazines[] = {"30Rnd_9x21_Mag"};

modes[] = {"Single", "FullAuto"}; // No burst on this thing

class Single : Mode_SemiAuto {
class Single: Mode_SemiAuto {
// http://www.stengg.com/upload/915fGdhTi3ggnnGQGGL.pdf
// 900-1100 rpm (1000rpm)
reloadTime = 0.06;
Expand All @@ -194,32 +186,26 @@ class CfgWeapons {

// Pistols //////////////////////////////////////////////

class hgun_P07_F : Pistol_Base_F {
magazines[] = {"16Rnd_9x21_Mag"};
};

class hgun_Rook40_F : Pistol_Base_F {
magazines[] = {"16Rnd_9x21_Mag"};
};

/*class hgun_ACPC2_F: Pistol_Base_F {};
/*class hgun_P07_F: Pistol_Base_F {};
class hgun_Rook40_F: Pistol_Base_F {};
class hgun_ACPC2_F: Pistol_Base_F {};
class hgun_Pistol_heavy_01_F: Pistol_Base_F {};
class hgun_Pistol_heavy_02_F: Pistol_Base_F {};*/

// LMGs //////////////////////////////////////////////

class LMG_Mk200_F : Rifle_Long_Base_F {
class LMG_Mk200_F: Rifle_Long_Base_F {
modes[] = {"manual", "Single", "close", "short", "medium", "far_optic1", "far_optic2"};

class manual : Mode_FullAuto {
class manual: Mode_FullAuto {
// http://www.defensereview.com/kac-stoner-lmg-belt-fed-5-56mm-nato-lightweight-light-machine-gun-squad-automatic-weapon-lmgsaw-displayed-at-sofic-2010/
// 550 rpm
reloadTime = 0.109;
};

// Add semi-auto mode.
// Inherit from 'manual' for sound reasons.
class Single : manual {
class Single: manual {
reloadTime = 0.109;
dispersion = 0.00175; // radians. Equal to 6 MOA.
autofire = 0;
Expand All @@ -233,28 +219,28 @@ class CfgWeapons {
class LMG_Zafir_F: Rifle_Long_Base_F {
modes[] = {"FullAuto", "Single", "close", "short", "medium", "far_optic1", "far_optic2"};

class FullAuto : Mode_FullAuto {
class FullAuto: Mode_FullAuto {
reloadTime = 0.070; // 850 RPM on gas position 1
};
};

// Sniper and anti-materiel rifles /////////////////////////////////

class EBR_base_F : Rifle_Long_Base_F {
class EBR_base_F: Rifle_Long_Base_F {
// EMR/EBR is typically issued semi-auto AFAIK
modes[] = {"Single", "single_close_optics1", "single_medium_optics1", "single_far_optics1"};
cursor = "arifle";
};

class LRR_base_F : Rifle_Long_Base_F {
class LRR_base_F: Rifle_Long_Base_F {
cursor = "arifle";
};

class GM6_base_F : Rifle_Long_Base_F {
class GM6_base_F: Rifle_Long_Base_F {
cursor = "arifle";

// Fuck your balancing, BI.
class Single : Mode_SemiAuto {
class Single: Mode_SemiAuto {
// 250 rpm is probably the limit of the finger on a heavy bullpup trigger like this thing must have.
reloadTime = 0.24;
};
Expand Down

0 comments on commit 79db282

Please sign in to comment.