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

Add JR muzzles to pistols and compatibility with APEX bipod #436

Merged
merged 1 commit into from
Jul 16, 2016
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
41 changes: 41 additions & 0 deletions addons/jr/cfgweapons.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -894,4 +894,45 @@ class CfgWeapons {
};
};

class Pistol;

class Pistol_Base_F : Pistol {
class WeaponSlotsInfo;
};

class hgun_ACPC2_F : Pistol_Base_F {
class WeaponSlotsInfo : WeaponSlotsInfo {
class MuzzleSlot : asdg_MuzzleSlot_45ACP {
iconPosition[] = {0.25, 0.4};
iconScale = 0.2;
};
};
};

class hgun_P07_F : Pistol_Base_F {
class WeaponSlotsInfo : WeaponSlotsInfo {
class MuzzleSlot : asdg_MuzzleSlot_9MM {
iconPosition[] = {0.24, 0.35};
iconScale = 0.2;
};
};
};

class hgun_Pistol_heavy_01_F : Pistol_Base_F {
class WeaponSlotsInfo : WeaponSlotsInfo {
class MuzzleSlot : asdg_MuzzleSlot_45ACP {
iconPosition[] = {0.24, 0.35};
iconScale = 0.2;
};
};
};

class hgun_Rook40_F : Pistol_Base_F {
class WeaponSlotsInfo : WeaponSlotsInfo {
class MuzzleSlot : asdg_MuzzleSlot_9MM {
iconPosition[] = {0.3, 0.38};
iconScale = 0.2;
};
};
};
};
1 change: 1 addition & 0 deletions addons/jr/jr_classes.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ class asdg_UnderSlot: asdg_SlotInfo { // Base under barrel slot
bipod_02_F_hex = 1;
bipod_03_F_blk = 1;
bipod_03_F_oli = 1;
bipod_01_F_khk = 1;
};
};

Expand Down
29 changes: 29 additions & 0 deletions addons/jr_prep/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -212,4 +212,33 @@ class CfgWeapons {
};
};

class Pistol;

class Pistol_Base_F : Pistol {
class WeaponSlotsInfo;
};

class hgun_ACPC2_F : Pistol_Base_F {
class WeaponSlotsInfo : WeaponSlotsInfo {
delete MuzzleSlot;
};
};

class hgun_P07_F : Pistol_Base_F {
class WeaponSlotsInfo : WeaponSlotsInfo {
delete MuzzleSlot;
};
};

class hgun_Pistol_heavy_01_F : Pistol_Base_F {
class WeaponSlotsInfo : WeaponSlotsInfo {
delete MuzzleSlot;
};
};

class hgun_Rook40_F : Pistol_Base_F {
class WeaponSlotsInfo : WeaponSlotsInfo {
delete MuzzleSlot;
};
};
};