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

Update JR for 1.70 #669

Merged
merged 1 commit into from
May 20, 2017
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
36 changes: 34 additions & 2 deletions addons/jr/cfgweapons.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,21 @@ class CfgWeapons {
class WeaponSlotsInfo;
};

class Launcher;

class Launcher_Base_F : Launcher {
class WeaponSlotsInfo;
};

class launch_Titan_base : Launcher_Base_F {
class WeaponSlotsInfo : WeaponSlotsInfo {
class PointerSlot : asdg_FrontSideRail {
iconPosition[] = {0.2, 0.45};
iconScale = 0.25;
};
};
};

class EBR_base_F: Rifle_Long_Base_F {
class WeaponSlotsInfo;
};
Expand Down Expand Up @@ -591,11 +606,11 @@ class CfgWeapons {
class hgun_PDW2000_F : pdw2000_base_F {
class WeaponSlotsInfo : WeaponSlotsInfo {
class MuzzleSlot : asdg_MuzzleSlot_9MM_SMG {
iconPosition[] = {0.0, 0.45};
iconPosition[] = {0.1, 0.41};
iconScale = 0.2;
};
class CowsSlot: asdg_OpticRail1913 {
iconPosition[] = {0.5, 0.4};
iconPosition[] = {0.4, 0.32};
iconScale = 0.15;
};
};
Expand Down Expand Up @@ -842,6 +857,10 @@ class CfgWeapons {
iconPosition[] = {0.25, 0.4};
iconScale = 0.2;
};
class PointerSlot : asdg_PistolUnderRail {
iconPosition[] = {0.48, 0.54};
iconScale = 0.25;
};
};
};

Expand All @@ -860,6 +879,19 @@ class CfgWeapons {
iconPosition[] = {0.24, 0.35};
iconScale = 0.2;
};
class PointerSlot : asdg_PistolUnderRail {
iconPosition[] = {0.47, 0.55};
iconScale = 0.3;
};
};
};

class hgun_Pistol_heavy_02_F : Pistol_Base_F {
class WeaponSlotsInfo : WeaponSlotsInfo {
class PointerSlot : asdg_PistolUnderRail {
iconPosition[] = {0.35, 0.6};
iconScale = 0.3;
};
};
};

Expand Down
11 changes: 11 additions & 0 deletions addons/jr/jr_classes.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,16 @@ class asdg_UnderSlot: asdg_SlotInfo { // Base under barrel slot
};
};

class asdg_PistolUnderRail: asdg_SlotInfo { // under rail for handguns
linkProxy = "\a3\data_f\proxies\weapon_slots\SIDE";
displayName = "$STR_A3_PointerSlot0";
iconPicture = "\a3\weapons_f_mark\Data\UI\attachment_under";
iconPinpoint = "Bottom";
class compatibleItems {
acc_flashlight_pistol = 1;
};
};

// Picattiny rails for optic mounts

class asdg_OpticRail1913: asdg_OpticRail { // the "medium" rail, long enough to fit any optic, but not enough to attach a clip-on NVS in front of a long scope.
Expand All @@ -75,6 +85,7 @@ class asdg_OpticRail1913: asdg_OpticRail { // the "medium" rail, long enough to
optic_Holosight_blk_F = 1;
optic_Holosight_khk_F = 1;
optic_Holosight_smg_blk_F = 1;
optic_Holosight_smg_khk_F = 1;
optic_DMS = 1;
optic_DMS_ghex_F = 1;
optic_LRPS = 1;
Expand Down
20 changes: 20 additions & 0 deletions addons/jr_prep/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,17 @@ class CfgWeapons {
class WeaponSlotsInfo;
};

class Launcher;
class Launcher_Base_F : Launcher {
class WeaponSlotsInfo;
};

class launch_Titan_base : Launcher_Base_F {
class WeaponSlotsInfo : WeaponSlotsInfo {
delete PointerSlot;
};
};

class EBR_base_F: Rifle_Long_Base_F {
class WeaponSlotsInfo;
};
Expand Down Expand Up @@ -224,6 +235,7 @@ class CfgWeapons {
class hgun_ACPC2_F : Pistol_Base_F {
class WeaponSlotsInfo : WeaponSlotsInfo {
delete MuzzleSlot;
delete PointerSlot;
};
};

Expand All @@ -236,6 +248,14 @@ class CfgWeapons {
class hgun_Pistol_heavy_01_F : Pistol_Base_F {
class WeaponSlotsInfo : WeaponSlotsInfo {
delete MuzzleSlot;
delete PointerSlot;
};
};

class hgun_Pistol_heavy_02_F : Pistol_Base_F {
class WeaponSlotsInfo : WeaponSlotsInfo {
delete MuzzleSlot;
delete PointerSlot;
};
};

Expand Down