From 845a671e4b350656f3a6476526be8c60db31f704 Mon Sep 17 00:00:00 2001 From: SpeedSter Date: Mon, 30 Jul 2018 00:38:38 -0700 Subject: [PATCH 01/10] Update ItemListNIA.hpp Missing semicolons --- TRADERS/NIA/ItemListNIA.hpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/TRADERS/NIA/ItemListNIA.hpp b/TRADERS/NIA/ItemListNIA.hpp index 0e11ad9..23c0a1e 100644 --- a/TRADERS/NIA/ItemListNIA.hpp +++ b/TRADERS/NIA/ItemListNIA.hpp @@ -195,11 +195,11 @@ class hlc_50rnd_762x51_M_FAL { quality = 1; price = 60; }; class hlc_50rnd_762x51_M_G3 { quality = 1; price = 60; }; class hlc_50rnd_9x19_B_9mmar { quality = 1; price = 60; }; - class hlc_5Rnd_12G_Buck_Trench { quality = 1; price = 30; } - class hlc_5Rnd_12G_DISTRACTION_Trench { quality = 1; price = 30; } - class hlc_5Rnd_12G_Slug_Trench { quality = 1; price = 30; } - class hlc_5Rnd_792_AP_Kar98 { quality = 1; price = 30; } - class hlc_5Rnd_792_T_Kar98 { quality = 1; price = 30; } + class hlc_5Rnd_12G_Buck_Trench { quality = 1; price = 30; }; + class hlc_5Rnd_12G_DISTRACTION_Trench { quality = 1; price = 30; }; + class hlc_5Rnd_12G_Slug_Trench { quality = 1; price = 30; }; + class hlc_5Rnd_792_AP_Kar98 { quality = 1; price = 30; }; + class hlc_5Rnd_792_T_Kar98 { quality = 1; price = 30; }; class hlc_5rnd_3006_1903 { quality = 1; price = 30; }; class hlc_5rnd_300WM_AP_AWM { quality = 1; price = 30; }; class hlc_5rnd_300WM_BTSP_AWM { quality = 1; price = 30; }; @@ -460,4 +460,4 @@ class hlc_rifle_M1903A1OMR { quality = 2; price = 1000; }; class hlc_rifle_M1903A1_unertl { quality = 2; price = 1000; }; class hlc_rifle_bcmblackjack { quality = 2; price = 900; }; - class hlc_rifle_g3a3vris { quality = 2; price = 900; }; \ No newline at end of file + class hlc_rifle_g3a3vris { quality = 2; price = 900; }; From 3a91e7af27881939bdcadfd80079cd510a826955 Mon Sep 17 00:00:00 2001 From: SpeedSter Date: Mon, 30 Jul 2018 00:49:05 -0700 Subject: [PATCH 02/10] Update TraderCategoriesNIA.hpp Naming for consistency --- TRADERS/NIA/TraderCategoriesNIA.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TRADERS/NIA/TraderCategoriesNIA.hpp b/TRADERS/NIA/TraderCategoriesNIA.hpp index b714901..32afd32 100644 --- a/TRADERS/NIA/TraderCategoriesNIA.hpp +++ b/TRADERS/NIA/TraderCategoriesNIA.hpp @@ -287,7 +287,7 @@ class NIAMiniGun class NIAAmmunition { - name = "NIA Ammo"; + name = "NIA Ammunition"; icon = "a3\ui_f\data\gui\Rsc\RscDisplayArsenal\itemacc_ca.paa"; items[]= { @@ -457,4 +457,4 @@ class NIAMiniGun "hlc_VOG25_AK" //"hlc_50Rnd_44mag_FUN", }; - }; \ No newline at end of file + }; From da2109376bcbb94415dd372cd5c99174ebea49be Mon Sep 17 00:00:00 2001 From: SpeedSter Date: Mon, 30 Jul 2018 01:11:09 -0700 Subject: [PATCH 03/10] Update TraderCategoriesFFAA.hpp Naming for consistency --- TRADERS/FFAA/TraderCategoriesFFAA.hpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/TRADERS/FFAA/TraderCategoriesFFAA.hpp b/TRADERS/FFAA/TraderCategoriesFFAA.hpp index a075020..c9cb2e6 100644 --- a/TRADERS/FFAA/TraderCategoriesFFAA.hpp +++ b/TRADERS/FFAA/TraderCategoriesFFAA.hpp @@ -33,7 +33,7 @@ }; class FFAAbackpack { - name = "FFAA backpack"; + name = "FFAA Backpacks"; icon = "a3\ui_f\data\gui\Rsc\RscDisplayArsenal\itemacc_ca.paa"; items[] = { @@ -50,7 +50,7 @@ }; class FFAAUniform { - name = "FFAA Uniform"; + name = "FFAA Uniforms"; icon = "a3\ui_f\data\gui\Rsc\RscDisplayArsenal\itemacc_ca.paa"; items[] = { @@ -68,7 +68,7 @@ }; class FFAAVest { - name = "FFAA Vest"; + name = "FFAA Vests"; icon = "a3\ui_f\data\gui\Rsc\RscDisplayArsenal\itemacc_ca.paa"; items[] = { @@ -89,7 +89,7 @@ }; class FFAAfaceware { - name = "FFAA faceware"; + name = "FFAA Glasses"; icon = "a3\ui_f\data\gui\Rsc\RscDisplayArsenal\itemacc_ca.paa"; items[] = { @@ -110,7 +110,7 @@ }; class FFAAPointerAttachments { - name = "Pointer Attachments"; + name = "FFAA Pointer Attachments"; icon = "a3\ui_f\data\gui\Rsc\RscDisplayArsenal\itemacc_ca.paa"; items[] = { @@ -119,7 +119,7 @@ }; class FFAABipodAttachments { - name = "Bipod Attachments"; + name = "FFAA Bipod Attachments"; icon = "a3\ui_f\data\gui\Rsc\RscDisplayArsenal\itembipod_ca.paa"; items[] = { @@ -339,4 +339,4 @@ "ffaa_et_vamtac_trans", "ffaa_et_vamtac_trans_blind" }; - }; \ No newline at end of file + }; From c22ab2c88c80ba425317e00f9e9521f38c8c0627 Mon Sep 17 00:00:00 2001 From: SpeedSter Date: Mon, 30 Jul 2018 02:00:46 -0700 Subject: [PATCH 04/10] Update ItemListNIA.hpp --- TRADERS/NIA/ItemListNIA.hpp | 56 ++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/TRADERS/NIA/ItemListNIA.hpp b/TRADERS/NIA/ItemListNIA.hpp index 0e11ad9..7a7af23 100644 --- a/TRADERS/NIA/ItemListNIA.hpp +++ b/TRADERS/NIA/ItemListNIA.hpp @@ -12,11 +12,11 @@ class hlc_muzzle_Agendasix { quality = 2; price = 100; }; class hlc_muzzle_Agendasix10mm { quality = 2; price = 100; }; class hlc_muzzle_Tundra { quality = 2; price = 100; }; - class hlc_muzzle_snds_AUG { quality = 2; price = 100; }; + //class hlc_muzzle_snds_AUG { quality = 2; price = 100; };//Removed, may be back class hlc_muzzle_snds_HK33 { quality = 2; price = 100; }; class hlc_muzzle_snds_M14 { quality = 2; price = 100; }; class hlc_muzzle_snds_a6AUG { quality = 2; price = 100; }; - class hlc_muzzle_snds_fal { quality = 2; price = 100; }; + //class hlc_muzzle_snds_fal { quality = 2; price = 100; };//Removed, may be back class hlc_muzzle_snds_g3 { quality = 2; price = 100; }; /////////////////////////////////////////////////////////////////////////////// @@ -76,15 +76,15 @@ class hlc_100Rnd_792x57_M_MG42 { quality = 1; price = 70; }; class hlc_100Rnd_792x57_T_MG42 { quality = 1; price = 70; }; class hlc_100rnd_556x45_EPR_G36 { quality = 1; price = 30; }; - class hlc_10Rnd_303_AP_enfield { quality = 1; price = 30; }; - class hlc_10Rnd_303_B_enfield { quality = 1; price = 30; }; - class hlc_10Rnd_303_T_enfield { quality = 1; price = 30; }; - class hlc_10Rnd_45ACP_B_hk45 { quality = 1; price = 30; }; + //class hlc_10Rnd_303_AP_enfield { quality = 1; price = 30; };//Removed, may be back + //class hlc_10Rnd_303_B_enfield { quality = 1; price = 30; };//Removed, may be back + //class hlc_10Rnd_303_T_enfield { quality = 1; price = 30; };//Removed, may be back + //class hlc_10Rnd_45ACP_B_hk45 { quality = 1; price = 30; };//Removed, may be back class hlc_10rnd_12g_buck_S12 { quality = 1; price = 30; }; class hlc_10rnd_12g_slug_S12 { quality = 1; price = 30; }; - class hlc_12Rnd_45ACP_B_mk23 { quality = 1; price = 40; }; - class hlc_12Rnd_45ACP_S_mk23 { quality = 1; price = 40; }; - class hlc_12Rnd_45ACP_T_mk23 { quality = 1; price = 40; }; + //class hlc_12Rnd_45ACP_B_mk23 { quality = 1; price = 40; };//Removed, may be back + //class hlc_12Rnd_45ACP_S_mk23 { quality = 1; price = 40; };//Removed, may be back + //class hlc_12Rnd_45ACP_T_mk23 { quality = 1; price = 40; };//Removed, may be back class hlc_200Rnd_792x57_AP_MG42 { quality = 1; price = 100; }; class hlc_200Rnd_792x57_B_MG42 { quality = 1; price = 100; }; class hlc_200Rnd_792x57_M_MG42 { quality = 1; price = 100; }; @@ -129,9 +129,9 @@ class hlc_25Rnd_9x19mm_subsonic_AUG { quality = 1; price = 30; }; class hlc_30Rnd_10mm_B_MP5 { quality = 1; price = 30; }; class hlc_30Rnd_10mm_JHP_MP5 { quality = 1; price = 30; }; - class hlc_30Rnd_303_AP_bren { quality = 1; price = 50; }; - class hlc_30Rnd_303_B_bren { quality = 1; price = 50; }; - class hlc_30Rnd_303_T_bren { quality = 1; price = 50; }; + //class hlc_30Rnd_303_AP_bren { quality = 1; price = 50; };//Removed, may be back + //class hlc_30Rnd_303_B_bren { quality = 1; price = 50; };//Removed, may be back + //class hlc_30Rnd_303_T_bren { quality = 1; price = 50; };//Removed, may be back class hlc_30Rnd_545x39_B_AK { quality = 1; price = 30; }; class hlc_30Rnd_545x39_EP_ak { quality = 1; price = 30; }; class hlc_30Rnd_545x39_S_AK { quality = 1; price = 30; }; @@ -166,7 +166,7 @@ class hlc_30rnd_556x45_t_HK33 { quality = 1; price = 40; }; class hlc_30rnd_556x45_tdim_HK33 { quality = 1; price = 40; }; class hlc_30rnd_762x39_s_ak { quality = 1; price = 40; }; - class hlc_32rnd_9x19_B_sten { quality = 1; price = 50; }; + //class hlc_32rnd_9x19_B_sten { quality = 1; price = 50; };//Removed, may be back class hlc_40Rnd_556x45_B_AUG { quality = 1; price = 40; }; class hlc_40Rnd_556x45_SOST_AUG { quality = 1; price = 40; }; class hlc_40Rnd_556x45_SPR_AUG { quality = 1; price = 40; }; @@ -176,11 +176,11 @@ class hlc_45Rnd_762x39_t_rpk { quality = 1; price = 30; }; class hlc_500rnd_762x51_Belt { quality = 1; price = 1000; }; class hlc_500rnd_762x51_Cinematic { quality = 6; price = 1000; }; - class hlc_50Rnd_44mag_B_deagle { quality = 1; price = 50; }; + //class hlc_50Rnd_44mag_B_deagle { quality = 1; price = 50; };//Removed, may be back class hlc_50Rnd_45ACP_B_1921 { quality = 1; price = 50; }; class hlc_50Rnd_45ACP_T_1921 { quality = 1; price = 50; }; - class hlc_50Rnd_57x28_FMJ_P90 { quality = 1; price = 50; }; - class hlc_50Rnd_57x28_JHP_P90 { quality = 1; price = 50; }; + //class hlc_50Rnd_57x28_FMJ_P90 { quality = 1; price = 50; };//Removed, may be back + //class hlc_50Rnd_57x28_JHP_P90 { quality = 1; price = 50; };//Removed, may be back class hlc_50Rnd_762x51_B_M14 { quality = 1; price = 50; }; class hlc_50Rnd_762x51_B_MG3 { quality = 1; price = 50; }; class hlc_50Rnd_762x51_Barrier_MG3 { quality = 1; price = 50; }; @@ -195,11 +195,11 @@ class hlc_50rnd_762x51_M_FAL { quality = 1; price = 60; }; class hlc_50rnd_762x51_M_G3 { quality = 1; price = 60; }; class hlc_50rnd_9x19_B_9mmar { quality = 1; price = 60; }; - class hlc_5Rnd_12G_Buck_Trench { quality = 1; price = 30; } - class hlc_5Rnd_12G_DISTRACTION_Trench { quality = 1; price = 30; } - class hlc_5Rnd_12G_Slug_Trench { quality = 1; price = 30; } - class hlc_5Rnd_792_AP_Kar98 { quality = 1; price = 30; } - class hlc_5Rnd_792_T_Kar98 { quality = 1; price = 30; } + //class hlc_5Rnd_12G_Buck_Trench { quality = 1; price = 30; };//Removed, may be back + //class hlc_5Rnd_12G_DISTRACTION_Trench { quality = 1; price = 30; };//Removed, may be back + //class hlc_5Rnd_12G_Slug_Trench { quality = 1; price = 30; };//Removed, may be back + //class hlc_5Rnd_792_AP_Kar98 { quality = 1; price = 30; };//Removed, may be back + //class hlc_5Rnd_792_T_Kar98 { quality = 1; price = 30; };//Removed, may be back class hlc_5rnd_3006_1903 { quality = 1; price = 30; }; class hlc_5rnd_300WM_AP_AWM { quality = 1; price = 30; }; class hlc_5rnd_300WM_BTSP_AWM { quality = 1; price = 30; }; @@ -208,13 +208,13 @@ class hlc_5rnd_300WM_T_AWM { quality = 1; price = 30; }; class hlc_5rnd_300WM_mk248_AWM { quality = 1; price = 30; }; class hlc_60Rnd_545x39_t_rpk { quality = 1; price = 30; }; - class hlc_6Rnd_735_B_Carcano { quality = 1; price = 30; }; - class hlc_6Rnd_735_T_Carcano { quality = 1; price = 30; }; + //class hlc_6Rnd_735_B_Carcano { quality = 1; price = 30; };//Removed, may be back + //class hlc_6Rnd_735_T_Carcano { quality = 1; price = 30; };//Removed, may be back class hlc_75Rnd_762x39_m_rpk { quality = 1; price = 70; }; - class hlc_8Rnd_44mag_B_deagle { quality = 1; price = 40; }; - class hlc_8Rnd_44mag_JHP_deagle { quality = 1; price = 40; }; - class hlc_8Rnd_45ACP_B_hk45 { quality = 1; price = 40; }; - class hlc_8Rnd_45ACP_T_hk45 { quality = 1; price = 40; }; + //class hlc_8Rnd_44mag_B_deagle { quality = 1; price = 40; };//Removed, may be back + //class hlc_8Rnd_44mag_JHP_deagle { quality = 1; price = 40; };//Removed, may be back + //class hlc_8Rnd_45ACP_B_hk45 { quality = 1; price = 40; };//Removed, may be back + //class hlc_8Rnd_45ACP_T_hk45 { quality = 1; price = 40; };//Removed, may be back //class HLC_AK_ammobox { quality = 6; price = 1000; }; @@ -460,4 +460,4 @@ class hlc_rifle_M1903A1OMR { quality = 2; price = 1000; }; class hlc_rifle_M1903A1_unertl { quality = 2; price = 1000; }; class hlc_rifle_bcmblackjack { quality = 2; price = 900; }; - class hlc_rifle_g3a3vris { quality = 2; price = 900; }; \ No newline at end of file + class hlc_rifle_g3a3vris { quality = 2; price = 900; }; From 339865a0d6fa27e3e3b3525e536f2a56782b540d Mon Sep 17 00:00:00 2001 From: SpeedSter Date: Mon, 30 Jul 2018 02:11:49 -0700 Subject: [PATCH 05/10] Update TraderCategoriesNIA.hpp --- TRADERS/NIA/TraderCategoriesNIA.hpp | 58 ++++++++++++++--------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/TRADERS/NIA/TraderCategoriesNIA.hpp b/TRADERS/NIA/TraderCategoriesNIA.hpp index b714901..13969a0 100644 --- a/TRADERS/NIA/TraderCategoriesNIA.hpp +++ b/TRADERS/NIA/TraderCategoriesNIA.hpp @@ -11,11 +11,11 @@ "hlc_muzzle_Agendasix", "hlc_muzzle_Agendasix10mm", "hlc_muzzle_Tundra", - "hlc_muzzle_snds_AUG", + //"hlc_muzzle_snds_AUG",//Removed, may be back "hlc_muzzle_snds_HK33", "hlc_muzzle_snds_M14", "hlc_muzzle_snds_a6AUG", - "hlc_muzzle_snds_fal", + //"hlc_muzzle_snds_fal",//Removed, may be back "hlc_muzzle_snds_g3" }; }; @@ -287,7 +287,7 @@ class NIAMiniGun class NIAAmmunition { - name = "NIA Ammo"; + name = "NIA Ammunition"; icon = "a3\ui_f\data\gui\Rsc\RscDisplayArsenal\itemacc_ca.paa"; items[]= { @@ -308,15 +308,15 @@ class NIAMiniGun "hlc_100Rnd_792x57_M_MG42", "hlc_100Rnd_792x57_T_MG42", "hlc_100rnd_556x45_EPR_G36", - "hlc_10Rnd_303_AP_enfield", - "hlc_10Rnd_303_B_enfield", - "hlc_10Rnd_303_T_enfield", - "hlc_10Rnd_45ACP_B_hk45", + //"hlc_10Rnd_303_AP_enfield",//Removed, may be back + //"hlc_10Rnd_303_B_enfield",//Removed, may be back + //"hlc_10Rnd_303_T_enfield",//Removed, may be back + //"hlc_10Rnd_45ACP_B_hk45", //Removed, may be back "hlc_10rnd_12g_buck_S12", "hlc_10rnd_12g_slug_S12", - "hlc_12Rnd_45ACP_B_mk23", - "hlc_12Rnd_45ACP_S_mk23", - "hlc_12Rnd_45ACP_T_mk23", + //"hlc_12Rnd_45ACP_B_mk23",//Removed, may be back + //"hlc_12Rnd_45ACP_S_mk23",//Removed, may be back + //"hlc_12Rnd_45ACP_T_mk23",//Removed, may be back "hlc_200Rnd_792x57_AP_MG42", "hlc_200Rnd_792x57_B_MG42", "hlc_200Rnd_792x57_M_MG42", @@ -361,9 +361,9 @@ class NIAMiniGun "hlc_25Rnd_9x19mm_subsonic_AUG", "hlc_30Rnd_10mm_B_MP5", "hlc_30Rnd_10mm_JHP_MP5", - "hlc_30Rnd_303_AP_bren", - "hlc_30Rnd_303_B_bren", - "hlc_30Rnd_303_T_bren", + //"hlc_30Rnd_303_AP_bren",//Removed, may be back + //"hlc_30Rnd_303_B_bren",//Removed, may be back + //"hlc_30Rnd_303_T_bren",//Removed, may be back "hlc_30Rnd_545x39_B_AK", "hlc_30Rnd_545x39_EP_ak", "hlc_30Rnd_545x39_S_AK", @@ -398,7 +398,7 @@ class NIAMiniGun "hlc_30rnd_556x45_t_HK33", "hlc_30rnd_556x45_tdim_HK33", "hlc_30rnd_762x39_s_ak", - "hlc_32rnd_9x19_B_sten", + //"hlc_32rnd_9x19_B_sten",//Removed, may be back "hlc_40Rnd_556x45_B_AUG", "hlc_40Rnd_556x45_SOST_AUG", "hlc_40Rnd_556x45_SPR_AUG", @@ -408,11 +408,11 @@ class NIAMiniGun "hlc_45Rnd_762x39_t_rpk", "hlc_500rnd_762x51_Belt", "hlc_500rnd_762x51_Cinematic", - "hlc_50Rnd_44mag_B_deagle", + //"hlc_50Rnd_44mag_B_deagle",//Removed, may be back "hlc_50Rnd_45ACP_B_1921", "hlc_50Rnd_45ACP_T_1921", - "hlc_50Rnd_57x28_FMJ_P90", - "hlc_50Rnd_57x28_JHP_P90", + //"hlc_50Rnd_57x28_FMJ_P90",//Removed, may be back + //"hlc_50Rnd_57x28_JHP_P90",//Removed, may be back "hlc_50Rnd_762x51_B_M14", "hlc_50Rnd_762x51_B_MG3", "hlc_50Rnd_762x51_Barrier_MG3", @@ -427,11 +427,11 @@ class NIAMiniGun "hlc_50rnd_762x51_M_FAL", "hlc_50rnd_762x51_M_G3", "hlc_50rnd_9x19_B_9mmar", - "hlc_5Rnd_12G_Buck_Trench", - "hlc_5Rnd_12G_DISTRACTION_Trench", - "hlc_5Rnd_12G_Slug_Trench", - "hlc_5Rnd_792_AP_Kar98", - "hlc_5Rnd_792_T_Kar98", + //"hlc_5Rnd_12G_Buck_Trench",//Removed, may be back + //"hlc_5Rnd_12G_DISTRACTION_Trench",//Removed, may be back + //"hlc_5Rnd_12G_Slug_Trench",//Removed, may be back + //"hlc_5Rnd_792_AP_Kar98",//Removed, may be back + //"hlc_5Rnd_792_T_Kar98",//Removed, may be back "hlc_5rnd_3006_1903", "hlc_5rnd_300WM_AP_AWM", "hlc_5rnd_300WM_BTSP_AWM", @@ -440,13 +440,13 @@ class NIAMiniGun "hlc_5rnd_300WM_T_AWM", "hlc_5rnd_300WM_mk248_AWM", "hlc_60Rnd_545x39_t_rpk", - "hlc_6Rnd_735_B_Carcano", - "hlc_6Rnd_735_T_Carcano", + //"hlc_6Rnd_735_B_Carcano",//Removed, may be back + //"hlc_6Rnd_735_T_Carcano",//Removed, may be back "hlc_75Rnd_762x39_m_rpk", - "hlc_8Rnd_44mag_B_deagle", - "hlc_8Rnd_44mag_JHP_deagle", - "hlc_8Rnd_45ACP_B_hk45", - "hlc_8Rnd_45ACP_T_hk45", + //"hlc_8Rnd_44mag_B_deagle",//Removed, may be back + //"hlc_8Rnd_44mag_JHP_deagle",//Removed, may be back + //"hlc_8Rnd_45ACP_B_hk45",//Removed, may be back + //"hlc_8Rnd_45ACP_T_hk45",//Removed, may be back "hlc_GRD_Red", "hlc_GRD_White", "hlc_GRD_blue", @@ -457,4 +457,4 @@ class NIAMiniGun "hlc_VOG25_AK" //"hlc_50Rnd_44mag_FUN", }; - }; \ No newline at end of file + }; From 5ac5642b692b146714456f2912dfb17c329b8721 Mon Sep 17 00:00:00 2001 From: SpeedSter Date: Mon, 30 Jul 2018 02:32:10 -0700 Subject: [PATCH 06/10] Revert "Update ItemListNIA.hpp" --- TRADERS/NIA/ItemListNIA.hpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/TRADERS/NIA/ItemListNIA.hpp b/TRADERS/NIA/ItemListNIA.hpp index abf850e..7a7af23 100644 --- a/TRADERS/NIA/ItemListNIA.hpp +++ b/TRADERS/NIA/ItemListNIA.hpp @@ -195,11 +195,11 @@ class hlc_50rnd_762x51_M_FAL { quality = 1; price = 60; }; class hlc_50rnd_762x51_M_G3 { quality = 1; price = 60; }; class hlc_50rnd_9x19_B_9mmar { quality = 1; price = 60; }; - class hlc_5Rnd_12G_Buck_Trench { quality = 1; price = 30; }; - class hlc_5Rnd_12G_DISTRACTION_Trench { quality = 1; price = 30; }; - class hlc_5Rnd_12G_Slug_Trench { quality = 1; price = 30; }; - class hlc_5Rnd_792_AP_Kar98 { quality = 1; price = 30; }; - class hlc_5Rnd_792_T_Kar98 { quality = 1; price = 30; }; + //class hlc_5Rnd_12G_Buck_Trench { quality = 1; price = 30; };//Removed, may be back + //class hlc_5Rnd_12G_DISTRACTION_Trench { quality = 1; price = 30; };//Removed, may be back + //class hlc_5Rnd_12G_Slug_Trench { quality = 1; price = 30; };//Removed, may be back + //class hlc_5Rnd_792_AP_Kar98 { quality = 1; price = 30; };//Removed, may be back + //class hlc_5Rnd_792_T_Kar98 { quality = 1; price = 30; };//Removed, may be back class hlc_5rnd_3006_1903 { quality = 1; price = 30; }; class hlc_5rnd_300WM_AP_AWM { quality = 1; price = 30; }; class hlc_5rnd_300WM_BTSP_AWM { quality = 1; price = 30; }; From 3d0ecfaa20f2da401a7dbb57c91e57e3e4522801 Mon Sep 17 00:00:00 2001 From: SpeedSter Date: Mon, 30 Jul 2018 14:09:37 -0700 Subject: [PATCH 07/10] Spacing consistency class NIAMiniGun Merely cosmetic --- TRADERS/NIA/TraderCategoriesNIA.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TRADERS/NIA/TraderCategoriesNIA.hpp b/TRADERS/NIA/TraderCategoriesNIA.hpp index 13969a0..59d6b94 100644 --- a/TRADERS/NIA/TraderCategoriesNIA.hpp +++ b/TRADERS/NIA/TraderCategoriesNIA.hpp @@ -274,7 +274,7 @@ -class NIAMiniGun + class NIAMiniGun { name = "NIA Minigun"; icon = "a3\ui_f\data\gui\Rsc\RscDisplayArsenal\itemacc_ca.paa"; From 0de789fc72ecb8a2adef8a1a92513612990d6919 Mon Sep 17 00:00:00 2001 From: SpeedSter Date: Wed, 1 Aug 2018 21:51:08 -0700 Subject: [PATCH 08/10] Remove duplicate / misplaced items in ItemListSMAW class SMA_AAC_762_sdn6 and it's variants are in the wrong category. These are suppressors and moved to the proper category and adjusted pricing. class SMA_ANPEQ15_TOP_TAN_SCAR is repeated a line down. This removes member already defined script errors in combination with the changes in TraderCategoriesSMAW --- TRADERS/SMA/ItemListSMAW.hpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/TRADERS/SMA/ItemListSMAW.hpp b/TRADERS/SMA/ItemListSMAW.hpp index 7ceae64..e0f598c 100644 --- a/TRADERS/SMA/ItemListSMAW.hpp +++ b/TRADERS/SMA/ItemListSMAW.hpp @@ -121,11 +121,6 @@ class SMA_AAC_MPW_16_OD { quality = 6; price = 800; }; class SMA_AAC_MPW_16_Desert { quality = 6; price = 800; }; class SMA_AAC_MPW_16_Tan { quality = 6; price = 800; }; - class SMA_AAC_762_sdn6 { quality = 6; price = 800; }; - class SMA_AAC_762_sdn6_w { quality = 6; price = 800; }; - class SMA_AAC_762_sdn6_d { quality = 6; price = 800; }; - class SMA_AAC_762_sdn6_T { quality = 6; price = 800; }; - class SMA_AAC_762_sdn6_G { quality = 6; price = 800; }; class SMA_Tavor_F { quality = 6; price = 800; }; class SMA_TavorOD_F { quality = 6; price = 800; }; class SMA_TavorBLK_F { quality = 6; price = 800; }; @@ -217,7 +212,6 @@ class SMA_ANPEQ15_TOP_TAN_M4 { quality = 6; price = 150; }; class SMA_ANPEQ15_TOP_BLK_M4 { quality = 6; price = 150; }; class SMA_ANPEQ15_TOP_TAN_SCAR { quality = 6; price = 150; }; - class SMA_ANPEQ15_TOP_TAN_SCAR { quality = 6; price = 150; }; class SMA_ANPEQ15_TOP_BLK_SCAR { quality = 6; price = 150; }; class SMA_ANPEQ15_TOP_TAN_ACR { quality = 6; price = 150; }; class SMA_ANPEQ15_TOP_BLK_ACR { quality = 6; price = 150; }; @@ -332,9 +326,11 @@ class SMA_rotex_blk { quality = 6; price = 400; }; class SMA_rotex_tan { quality = 6; price = 400; }; class SMA_rotex_gry { quality = 6; price = 400; }; - class SMA_AAC_762_sdn6 { quality = 6; price = 400; }; - class SMA_AAC_762_sdn6_w { quality = 6; price = 400; }; - class SMA_AAC_762_sdn6_d { quality = 6; price = 400; }; + class SMA_AAC_762_sdn6 { quality = 6; price = 400; }; + class SMA_AAC_762_sdn6_w { quality = 6; price = 400; }; + class SMA_AAC_762_sdn6_d { quality = 6; price = 400; }; + class SMA_AAC_762_sdn6_T { quality = 6; price = 400; }; + class SMA_AAC_762_sdn6_G { quality = 6; price = 400; }; /////////////////////////////////////////////////////////////////////////////// // Ammunition From cd8e9e9513bee35b2837af8f9bf86d00ad2231b1 Mon Sep 17 00:00:00 2001 From: SpeedSter Date: Wed, 1 Aug 2018 21:55:10 -0700 Subject: [PATCH 09/10] Fix suppressor categorization in TraderCat...SMAW --- TRADERS/SMA/TraderCategoriesSMAW.hpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/TRADERS/SMA/TraderCategoriesSMAW.hpp b/TRADERS/SMA/TraderCategoriesSMAW.hpp index 4c49783..a0c579c 100644 --- a/TRADERS/SMA/TraderCategoriesSMAW.hpp +++ b/TRADERS/SMA/TraderCategoriesSMAW.hpp @@ -124,11 +124,6 @@ "SMA_AAC_MPW_16_OD", "SMA_AAC_MPW_16_Desert", "SMA_AAC_MPW_16_Tan", - "SMA_AAC_762_sdn6", - "SMA_AAC_762_sdn6_w", - "SMA_AAC_762_sdn6_d", - "SMA_AAC_762_sdn6_T", - "SMA_AAC_762_sdn6_G", "SMA_Tavor_F", "SMA_TavorOD_F", "SMA_TavorBLK_F", @@ -363,7 +358,9 @@ "SMA_rotex_gry", "SMA_AAC_762_sdn6", "SMA_AAC_762_sdn6_w", - "SMA_AAC_762_sdn6_d" + "SMA_AAC_762_sdn6_d", + "SMA_AAC_762_sdn6_T", + "SMA_AAC_762_sdn6_G" }; }; From c114e78279f1b97faceb80fd8bd06c5d7339c740 Mon Sep 17 00:00:00 2001 From: SpeedSter Date: Thu, 9 Aug 2018 18:27:37 -0700 Subject: [PATCH 10/10] Missing end block comment RHSUSFW Categories Assume the blank space is where the block comment would end. After having manually created a separated mod list, this block comment list is not correct. Temporary fix until I can finish the split mod lists. --- TRADERS/RHSUSFW/TraderCategoriesRHSUSFW.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TRADERS/RHSUSFW/TraderCategoriesRHSUSFW.hpp b/TRADERS/RHSUSFW/TraderCategoriesRHSUSFW.hpp index 094bfc7..a3397d9 100644 --- a/TRADERS/RHSUSFW/TraderCategoriesRHSUSFW.hpp +++ b/TRADERS/RHSUSFW/TraderCategoriesRHSUSFW.hpp @@ -509,7 +509,7 @@ "rhs_weap_m4a1_grip2", "rhs_weap_mk18_grip2", "rhs_weap_mk18_grip2_KAC" - + */ }; };