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

HAFM Arms Dealer Fix #425

Open
wants to merge 3 commits into
base: unstable
Choose a base branch
from
Open
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
3 changes: 2 additions & 1 deletion A3A/addons/core/Templates/Templates/CUP/templates.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,8 @@

class HAFM_Base : CUP_Base
{
requiredAddons[] = {"CUP_Creatures_People_Civil_Russia", "CUP_BaseConfigs", "CUP_AirVehicles_Core", "HAFM_Acc"}; // units, weapons, vehicles
requiredAddons[] = {"CUP_Creatures_People_Civil_Russia", "CUP_BaseConfigs", "CUP_AirVehicles_Core", "HAFM_Acc"};
priority = 61;
};
//CUP NorAF
class NorAF_Base : CUP_Base
Expand Down
1 change: 1 addition & 0 deletions A3A/addons/hals/Addons/store/config.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ class cfgHALsStore
#include "config\ylarms.hpp"
#include "config\ProjInfAD.hpp"
#include "config\JCAArsenal.hpp"
#include "config\hafm.hpp"
};

class stores
Expand Down
8 changes: 2 additions & 6 deletions A3A/addons/hals/Addons/store/config/hafm.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@
ITEM(HAFM_G3A3RIS, 900, RIFLE_STOCK);// HAFM_20rnd_G3A3_762
ITEM(HAFM_G3A4, 800, RIFLE_STOCK);// HAFM_20rnd_G3A3_762
ITEM(HAFM_G3A3_SG, 800, RIFLE_STOCK);// HAFM_20rnd_G3A3_762
ITEM(HAFM_G3A3, 800, RIFLE_STOCK);// HAFM_20rnd_G3A3_762
ITEM(HAFM_G3A3, 800, RIFLE_STOCK);// HAFM_20rnd_G3A3_762
ITEM(HAFM_HK416, 800, RIFLE_STOCK);// M4DD But Cooler Looking | hafm_mag_30Rnd_556x45_M855_Stanag/hafm_mag_30Rnd_556x45_M855A1_Stanag/hafm_mag_30Rnd_556x45_Mk318_Stanag
ITEM(HAFM_HK416GL, 1250, RIFLE_STOCK);// M4DD But Cooler Looking and UGL | hafm_mag_30Rnd_556x45_M855_Stanag/hafm_mag_30Rnd_556x45_M855A1_Stanag/hafm_mag_30Rnd_556x45_Mk318_Stanag
ITEM(HAFM_M4A1, 800, RIFLE_STOCK);// M4DD But Older | hafm_mag_30Rnd_556x45_M855_Stanag/hafm_mag_30Rnd_556x45_M855A1_Stanag/hafm_mag_30Rnd_556x45_Mk318_Stanag
Expand Down Expand Up @@ -93,8 +91,6 @@
ITEM(hafm_mag_30Rnd_556x45_M855A1_Stanag, 100, MZ_STOCK);
ITEM(hafm_mag_30Rnd_556x45_Mk318_Stanag, 100, MZ_STOCK);
ITEM(hafm_mag_arrow, 80, MZ_STOCK);
ITEM(hafm_mag_arrow_exp, 400, MZ_STOCK);
ITEM(HAFM_G36C, 100, MZ_STOCK);
ITEM(HAFM_20rnd_G3A3_762, 150, MZ_STOCK);
ITEM(HAFM_HK21_762, 150, MZ_STOCK);
ITEM(HAFM_20rnd_M14_762, 150, MZ_STOCK);
Expand All @@ -106,7 +102,7 @@
};

class pointersHAFM{
displayName = __EVAL(formatText ["%1 %2 %3 %4 %5", localize "STR_A3AU_hafm", localize "STR_A3AU_barret", localize "STR_A3AU_handles", localize "STR_A3AU_and", localize "STR_A3AU_bipods"]);
displayName = __EVAL(formatText ["%1 %2 %3 %4 %5", localize "STR_A3AU_hafm", localize "STR_A3AU_pointers"]);
picture = "a3\ui_f\data\gui\Rsc\RscDisplayArsenal\itemAcc_ca.paa";

ITEM(HAFM_acc_PEQ15_side, 100, PN_STOCK);
Expand Down Expand Up @@ -142,7 +138,7 @@
};

class underbarrelHAFM{
displayName = __EVAL(formatText ["%1 %2", localize "STR_A3AU_hafm", localize "STR_A3AU_bagsStatics"]);
displayName = __EVAL(formatText ["%1 %2", localize "STR_A3AU_hafm", localize "STR_A3AU_bipods"]);
picture = "a3\ui_f\data\gui\Rsc\RscDisplayArsenal\itemBipod_ca.paa";

ITEM(HAFM_Harris_Bipod, 100, 50);
Expand Down
6 changes: 0 additions & 6 deletions A3A/addons/hals/Stringtable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -904,12 +904,6 @@
<Russian>HAFM</Russian>
<Korean>HAFM</Korean>
<French>HAFM</French>
<Key ID="STR_A3AU_ylarms">
<Original>YLArms</Original>
<English>YLArms</English>
<Russian>YLArms</Russian>
<Korean>YLArms</Korean>
<French>YLArms</French>
</Key>
<Key ID="STR_A3AU_PROJINF">
<Original>P.I.</Original>
Expand Down
1 change: 1 addition & 0 deletions A3A/addons/ultimate/config/cfgForbiddenItems.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ class forbiddenItems
#include "cfgForbiddenItemsSMA.hpp"
#include "cfgForbiddenItemsTOW.hpp"
#include "cfgForbiddenItemsUns.hpp"
#include "cfgForbiddenItemsHAFM.hpp"
};
6 changes: 6 additions & 0 deletions A3A/addons/ultimate/config/cfgForbiddenItemsHAFM.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
class HAFM_limited_base : forbidden_limited_base
{
addons[] = {"HAFM_Acc"};
};

class hafm_mag_arrow_exp : HAFM_limited_base {};