Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ballistics - Move dispersion to optional #7558

Merged
merged 1 commit into from
Feb 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions optionals/realisticdispersion/$PBOPREFIX$
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
z\ace\addons\realisticdispersion
295 changes: 295 additions & 0 deletions optionals/realisticdispersion/CfgWeapons.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,295 @@
class Mode_SemiAuto;
class Mode_Burst;
class Mode_FullAuto;

class CfgWeapons {
class Rifle_Base_F;
class Rifle_Long_Base_F: Rifle_Base_F {};

// GM6 Lynx
class GM6_base_F: Rifle_Long_Base_F {
class Single: Mode_SemiAuto {
dispersion = MOA_TO_RAD(0.45);
};
};

// M200 Intervention
class LRR_base_F: Rifle_Long_Base_F {
class Single: Mode_SemiAuto {
dispersion = MOA_TO_RAD(0.50);
};
};

// MX
class arifle_MX_Base_F: Rifle_Base_F {
class Single: Mode_SemiAuto {
dispersion = MOA_TO_RAD(0.90);
};

class FullAuto: Mode_FullAuto {
dispersion = MOA_TO_RAD(0.90);
};
};

// KH2002 Sama
class arifle_katiba_Base_F: Rifle_Base_F {
class Single: Mode_SemiAuto {
dispersion = MOA_TO_RAD(0.90);
};

class FullAuto: Mode_FullAuto {
dispersion = MOA_TO_RAD(0.90);
};
};

// CTAR-21
class Tavor_base_F: Rifle_Base_F {
class Single: Mode_SemiAuto {
dispersion = MOA_TO_RAD(1.12);
};

class FullAuto: Mode_FullAuto {
dispersion = MOA_TO_RAD(1.12);
};
};

// F2000
class mk20_base_F: Rifle_Base_F {
class Single: Mode_SemiAuto {
dispersion = MOA_TO_RAD(1.12);
};

class FullAuto: Mode_FullAuto {
dispersion = MOA_TO_RAD(1.12);
};
};

// Noreen "Bad News" ULR
class DMR_02_base_F: Rifle_Long_Base_F {
class Single: Mode_SemiAuto {
dispersion = MOA_TO_RAD(0.61);
};
};

// VS-121
class DMR_01_base_F: Rifle_Long_Base_F {
class Single: Mode_SemiAuto {
dispersion = MOA_TO_RAD(0.81);
};

class FullAuto: Mode_FullAuto {
dispersion = MOA_TO_RAD(0.81);
};
};

// Mk14 Mod 1 EBR
class EBR_base_F: Rifle_Long_Base_F {
class Single: Mode_SemiAuto {
dispersion = MOA_TO_RAD(0.81);
};

class FullAuto: Mode_FullAuto {
dispersion = MOA_TO_RAD(0.81);
};
};

// SIG 556
class DMR_03_base_F: Rifle_Long_Base_F {
class Single: Mode_SemiAuto {
dispersion = MOA_TO_RAD(0.81);
};

class FullAuto: Mode_FullAuto {
dispersion = MOA_TO_RAD(0.81);
};
};

// ASP-1 Kir
class DMR_04_base_F: Rifle_Long_Base_F {
class Single: Mode_SemiAuto {
dispersion = MOA_TO_RAD(1.0);
};
};

// Cyrus
class DMR_05_base_F: Rifle_Long_Base_F {
class Single: Mode_SemiAuto {
dispersion = MOA_TO_RAD(0.67);
};

class FullAuto: Mode_FullAuto {
dispersion = MOA_TO_RAD(0.67);
};
};

// M14
class DMR_06_base_F: Rifle_Long_Base_F {
class Single: Mode_SemiAuto {
dispersion = MOA_TO_RAD(0.81);
};

class FullAuto: Mode_FullAuto {
dispersion = MOA_TO_RAD(0.81);
};
};

class DMR_06_hunter_base_F: DMR_06_base_F {
class Single: Single {
dispersion = MOA_TO_RAD(0.81);
};
};

// MX LSW
class arifle_MX_SW_F: arifle_MX_Base_F {
class Single: Mode_SemiAuto {
dispersion = MOA_TO_RAD(0.90);
};

class FullAuto: Mode_FullAuto {
dispersion = MOA_TO_RAD(0.90);
};
};

// MXM
class arifle_MXM_F: arifle_MX_Base_F {
class Single: Single {
dispersion = MOA_TO_RAD(0.90);
};

class FullAuto: FullAuto {
dispersion = MOA_TO_RAD(0.90);
};
};

// HK416A5 11"
class arifle_SPAR_01_base_F: Rifle_Base_F {
class Single: Mode_SemiAuto {
dispersion = MOA_TO_RAD(1.12);
};

class FullAuto: Mode_FullAuto {
dispersion = MOA_TO_RAD(1.12);
};
};

// HK416A5 14.5"
class arifle_SPAR_02_base_F: Rifle_Base_F {
class Single: Mode_SemiAuto {
dispersion = MOA_TO_RAD(1.12);
};

class FullAuto: Mode_FullAuto {
dispersion = MOA_TO_RAD(1.12);
};
};

// HK417A2 20"
class arifle_SPAR_03_base_F: Rifle_Base_F {
class Single: Mode_SemiAuto {
dispersion = MOA_TO_RAD(0.81);
};

class FullAuto: Mode_FullAuto {
dispersion = MOA_TO_RAD(0.81);
};
};

// RFB SDAR
class SDAR_base_F: Rifle_Base_F {
class Single: Mode_SemiAuto {
dispersion = MOA_TO_RAD(3.0);
};

class Burst: Mode_Burst {
dispersion = MOA_TO_RAD(3.0);
};

class FullAuto: Mode_FullAuto {
dispersion = MOA_TO_RAD(3.0);
};
};

// QBZ-95-1
class arifle_CTAR_base_F: Rifle_Base_F {
class Single: Mode_SemiAuto {
dispersion = MOA_TO_RAD(1.12);
};

class FullAuto: Mode_FullAuto {
dispersion = MOA_TO_RAD(1.12);
};
};

// QBU-88
class DMR_07_base_F: Rifle_Long_Base_F {
class Single: Mode_SemiAuto {
dispersion = MOA_TO_RAD(1.01);
};
};

// QBZ-95-1 LSW
class arifle_CTARS_base_F: Rifle_Base_F {
class Single: Mode_SemiAuto {
dispersion = MOA_TO_RAD(1.12);
};

class FullAuto: Mode_FullAuto {
dispersion = MOA_TO_RAD(1.12);
};
};

// Type 115
class arifle_ARX_base_F: Rifle_Base_F {
class Single: Mode_SemiAuto {
dispersion = MOA_TO_RAD(0.90);
};

class FullAuto: Mode_FullAuto {
dispersion = MOA_TO_RAD(0.90);
};
};

// KH2002C Sama
class arifle_Katiba_C_F: arifle_katiba_Base_F {
class Single: Single {
dispersion = MOA_TO_RAD(0.90);
};

class FullAuto: FullAuto {
dispersion = MOA_TO_RAD(0.90);
};
};

// MXC
class arifle_MXC_F: arifle_MX_Base_F {
class Single: Single {
dispersion = MOA_TO_RAD(0.90);
};

class FullAuto: FullAuto {
dispersion = MOA_TO_RAD(0.90);
};
};

// TAR-21
class arifle_TRG21_F: Tavor_base_F {
class Single: Single {
dispersion = MOA_TO_RAD(1.12);
};

class FullAuto: FullAuto {
dispersion = MOA_TO_RAD(1.12);
};
};

// F2000 Tactical
class arifle_Mk20C_F: mk20_base_F {
class Single: Single {
dispersion = MOA_TO_RAD(1.12);
};

class FullAuto: FullAuto {
dispersion = MOA_TO_RAD(1.12);
};
};
};
17 changes: 17 additions & 0 deletions optionals/realisticdispersion/config.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#include "script_component.hpp"

class CfgPatches {
class ADDON {
name = COMPONENT_NAME;
units[] = {};
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_ballistics"};
author = ECSTRING(common,ACETeam);
authors[] = {"Ruthberg"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

#include "CfgWeapons.hpp"
6 changes: 6 additions & 0 deletions optionals/realisticdispersion/script_component.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#define COMPONENT realisticdispersion
#define COMPONENT_BEAUTIFIED Realistic Dispersion

#include "\z\ace\addons\main\script_mod.hpp"

#include "\z\ace\addons\main\script_macros.hpp"