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.

Sign up for GitHub

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

Project Infinite Arms Dealer #338

Merged
merged 6 commits into from
Oct 21, 2024
Merged

Project Infinite Arms Dealer #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
760adbc
Project Infinite Arms Dealer
Azodion Sep 25, 2024
d29d9a0
Naming Consistency
Azodion Sep 26, 2024
1e8f16f
Merge branch 'unstable' into ProjInf_Arms_Dealer
Azodion Oct 6, 2024
c9a60a0
Merge pull request #355 from Azodion/JCA_Arms_Dealer
stutpip123 Oct 8, 2024
73b3f2d
Merge branch 'TestingBranch' into ProjInf_Arms_Dealer
stutpip123 Oct 8, 2024
06a3d9f
Merge branch 'unstable' into ProjInf_Arms_Dealer
stutpip123 Oct 21, 2024
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
12 changes: 12 additions & 0 deletions A3A/addons/hals/Addons/store/config.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ class cfgHALsStore
#include "config\fow.hpp"
#include "config\eaw.hpp"
#include "config\cwr.hpp"
#include "config\ProjInfAD.hpp"
#include "config\JCAArsenal.hpp"
};

Expand Down Expand Up @@ -831,6 +832,17 @@ class cfgHALsStore
"opticsCWR"
};
};
class projinf_stock
{
displayName = $STR_ARMS_DEALER_STORE;
categories[] = {
"handgunsProjInfAD",
"riflesProjInfAD",
"sniperRiflesProjInfAD",
"muzzlesProjInfAD",
"opticsProjInfAD",
"magazinesProjInfAD",
"underbarrelProjInfAD"
class jca_stock
{
displayName = $STR_ARMS_DEALER_STORE;
Expand Down
206 changes: 206 additions & 0 deletions A3A/addons/hals/Addons/store/config/ProjInfAD.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,206 @@
class handgunsProjInfAD
{
displayName = __EVAL(formatText ["%1 %2", localize "STR_A3AU_PROJINF", localize "STR_A3AU_handguns"]);
picture = "a3\ui_f\data\gui\Rsc\RscDisplayArsenal\handgun_ca.paa";

ITEM(bnae_l35_virtual, 150, PISTOL_STOCK);
ITEM(bnae_l35_c_virtual, 150, PISTOL_STOCK);
ITEM(bnae_r1_virtual, 200, PISTOL_STOCK);
ITEM(bnae_r1_c_virtual, 200, PISTOL_STOCK);
ITEM(bnae_r1_e_virtual, 200, PISTOL_STOCK);
ITEM(bnae_r1_m_virtual, 200, PISTOL_STOCK);
ITEM(bnae_r1_t_virtual, 200, PISTOL_STOCK);
ITEM(bnae_saa_c_virtual, 200, PISTOL_STOCK);
ITEM(bnae_saa_virtual, 200, PISTOL_STOCK);
};

class riflesProjInfAD
{
displayName = __EVAL(formatText ["%1 %2", localize "STR_A3AU_PROJINF", localize "STR_A3AU_rifles"]);
picture = "a3\ui_f\data\gui\Rsc\RscDisplayArsenal\primaryWeapon_ca.paa";

ITEM(bnae_rk95_virtual, 800, RIFLE_STOCK);
ITEM(bnae_rk95_camo1_virtual, 800, RIFLE_STOCK);
ITEM(bnae_rk95r_virtual, 1000, RIFLE_STOCK);
ITEM(bnae_rk95r_camo1_virtual, 1000, RIFLE_STOCK);

ITEM(bnae_spr220_virtual, 600, RIFLE_STOCK);
ITEM(bnae_spr220_camo1_virtual, 600, RIFLE_STOCK);
ITEM(bnae_spr220_so_virtual, 500, RIFLE_STOCK);
ITEM(bnae_spr220_so_camo1_virtual, 500, RIFLE_STOCK);

ITEM(bnae_mk1_short_virtual, 600, RIFLE_STOCK);
ITEM(bnae_m97_virtual, 600, RIFLE_STOCK);
ITEM(bnae_m97_camo1_virtual, 600, RIFLE_STOCK);
ITEM(bnae_m97_s_virtual, 500, RIFLE_STOCK);
};

class sniperRiflesProjInfAD
{
displayName = __EVAL(formatText ["%1 %2", localize "STR_A3AU_PROJINF", localize "STR_A3AU_sniperRifles"]);
picture = "a3\ui_f\data\gui\Rsc\RscDisplayArsenal\primaryWeapon_ca.paa";

ITEM(bnae_mk1_virtual, 600, RIFLE_STOCK);
ITEM(bnae_mk1_t_virtual, 650, RIFLE_STOCK);
ITEM(bnae_mk1_t_camo1_virtual, 650, RIFLE_STOCK);

ITEM(bnae_falkor_blk_virtual, 1600, RIFLE_STOCK);
ITEM(bnae_falkor_camo1_virtual, 1600, RIFLE_STOCK);
ITEM(bnae_falkor_snd_virtual, 1600, RIFLE_STOCK);
ITEM(bnae_falkor_camo2_virtual, 1600, RIFLE_STOCK);

ITEM(bnae_trg42_virtual, 1750, RIFLE_STOCK);
ITEM(bnae_trg42_camo2_virtual, 1750, RIFLE_STOCK);
ITEM(bnae_trg42_camo1_virtual, 1750, RIFLE_STOCK);
ITEM(bnae_trg42_mmrs_virtual, 1750, RIFLE_STOCK);
ITEM(bnae_trg42_mmrs_camo1_virtual, 1750, RIFLE_STOCK);
ITEM(bnae_trg42_f_virtual, 1750, RIFLE_STOCK);
ITEM(bnae_trg42_f_camo1_virtual, 1750, RIFLE_STOCK);
ITEM(bnae_trg42_f_mmrs_virtual, 1750, RIFLE_STOCK);
ITEM(bnae_trg42_f_mmrs_camo1_virtual, 1750, RIFLE_STOCK);
};
class muzzlesProjInfAD
{
displayName = __EVAL(formatText ["%1 %2", localize "STR_A3AU_PROJINF", localize "STR_A3AU_muzzles"]);
picture = "a3\ui_f\data\gui\Rsc\RscDisplayArsenal\itemMuzzle_ca.paa";

ITEM(bnae_suppressor_v2_virtual, 100, MZ_STOCK);
ITEM(bnae_suppressor_covblk_virtual, 100, MZ_STOCK);
ITEM(bnae_suppressor_covdrt_virtual, 100, MZ_STOCK);

ITEM(bnae_muzzle_blk_virtual, 60, MZ_STOCK);
ITEM(bnae_muzzle_snd_virtual, 60, MZ_STOCK);
ITEM(bnae_silencer_virtual, 120, MZ_STOCK);

ITEM(bnae_suppressor_v4_virtual, 60, MZ_STOCK);
ITEM(bnae_suppressor_v3_virtual, 60, MZ_STOCK);
};

class opticsProjInfAD
{
displayName = __EVAL(formatText ["%1 %2", localize "STR_A3AU_PROJINF", localize "STR_A3AU_sights"]);
picture = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\ItemOptic_ca.paa";

class bnae_scope_blk_virtual {
price = 150;
stock = 50;
};
class bnae_scope_mtp_virtual {
price = 150;
stock = 50;
};
class bnae_scope_snd_virtual {
price = 150;
stock = 50;
};
class bnae_scope_v2_virtual {
price = 150;
stock = 50;
};
class bnae_truglo_blk_virtual {
price = 120;
stock = 50;
};
class bnae_truglo_snd_virtual {
price = 120;
stock = 50;
};
class bnae_scope_v3_virtual {
price = 100;
stock = 50;
};
};

class magazinesProjInfAD
{
displayName = __EVAL(formatText["%1 %2", localize "STR_A3AU_PROJINF", localize "STR_A3AU_magazines"]);
picture = "a3\ui_f\data\gui\Rsc\RscDisplayArsenal\cargoMag_ca.paa";
///////////////////////////////////////////////////////
// Pistols, SMGs
///////////////////////////////////////////////////////

class 8Rnd_9x19_Magazine {
price = 30;
stock = MAGAZINE_STOCK;
};
class 8Rnd_45ACP_Magazine {
price = 40;
stock = MAGAZINE_STOCK;
};
class 8Rnd_45GAP_Magazine {
price = 40;
stock = MAGAZINE_STOCK;
};
class 8Rnd_45Super_Magazine {
price = 40;
stock = MAGAZINE_STOCK;
};
class 6Rnd_357M_Magazine {
price = 50;
stock = MAGAZINE_STOCK;
};


///////////////////////////////////////////////////////
// RIFLES
///////////////////////////////////////////////////////

class 2Rnd_00_Buckshot_Magazine {
price = 20;
stock = MAGAZINE_STOCK;
};
class 2Rnd_Slug_Magazine {
price = 20;
stock = MAGAZINE_STOCK;
};
class 5Rnd_00_Buckshot_Magazine {
price = 35;
stock = MAGAZINE_STOCK;
};
class 5Rnd_Slug_Magazine {
price = 35;
stock = MAGAZINE_STOCK;
};
class 6Rnd_00_Buckshot_Magazine {
price = 50;
stock = MAGAZINE_STOCK;
};
class 6Rnd_Slug_Magazine {
price = 50;
stock = MAGAZINE_STOCK;
};
class 30Rnd_762x39_Magazine {
price = 70;
stock = MAGAZINE_STOCK;
};

///////////////////////////////////////////////////////
// DMRs, Sniper Rifles
///////////////////////////////////////////////////////
class 10Rnd_303_Magazine {
price = 60;
stock = MAGAZINE_STOCK;
};
class 5Rnd_338LM_Magazine {
price = 150;
stock = MAGAZINE_STOCK;
};
class 5Rnd_APDS_338LM_Magazine {
price = 200;
stock = MAGAZINE_STOCK;
};
class 10Rnd_300WM_Magazine {
price = 120;
stock = MAGAZINE_STOCK;
};
};

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

ITEM(bnae_holder_virtual, 30, 150);
ITEM(bnae_bipod_blk_virtual, 50, 150);
ITEM(bnae_bipod_snd_virtual, 50, 150);
};
21 changes: 14 additions & 7 deletions A3A/addons/hals/Stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -861,14 +861,21 @@
<Korean>Cold War ReArmed</Korean>
<French>Cold War ReArmed</French>
</Key>
<Key ID="STR_A3AU_PROJINF">
<Original>P.I.</Original>
<German>P.I.</German>
<Russian>P.I.</Russian>
<Chinesesimp>P.I.</Chinesesimp>
<Korean>P.I.</Korean>
<French>P.I.</French>
<Key ID="STR_A3AU_JCA_ARSENAL">
<Original>JCA</Original>
<German>JCA</German>
<Russian>JCA</Russian>
<Chinesesimp>JCA</Chinesesimp>
<Korean>JCA</Korean>
<French>JCA</French>
</Key>
<Original>JCA</Original>
<German>JCA</German>
<Russian>JCA</Russian>
<Chinesesimp>JCA</Chinesesimp>
<Korean>JCA</Korean>
<French>JCA</French>
</Key>
</Container>
</Package>
</Project>
4 changes: 4 additions & 0 deletions A3A/addons/ultimate/config/trader/cfgTraderAddons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,10 @@
addons[] = {"sab_navallegends"};
vehicles = "vehicles_navleg";
};
class addons_projinf : addons_base
{
addons[] = {"bnae_core"};
weapons = "weapons_projinf";
class addons_jca : addons_base
{
addons[] = {"Weapons_F_JCA_IA","Weapons_F_JCA_IA_Accessories","Weapons_F_JCA_IA_LongRangeRifles_AWM","Weapons_F_JCA_IA_Pistols_P226","Weapons_F_JCA_IA_Pistols_P320","Weapons_F_JCA_IA_Rifles_M4A1","Weapons_F_JCA_IA_Rifles_M4A4","Weapons_F_JCA_IA_Rifles_SR10","Weapons_F_JCA_IA_Rifles_SR25","Weapons_F_JCA_IA_SMGs_MP5"};
Expand Down
3 changes: 3 additions & 0 deletions A3A/addons/ultimate/config/trader/cfgTraderWeapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,9 @@
{
prefix = "cwrstock";
};
class weapons_projinf : weapons_base
{
prefix = "projinf_stock"
class weapons_jca : weapons_base
{
prefix = "jca_stock"
Expand Down