Skip to content

Commit

Permalink
Blackmarket updates (#319)
Browse files Browse the repository at this point in the history 
* Update from sheet

* Fix FFAA dealer, add FL, SL, SW dealers

* Fix duplicate classes
  • Loading branch information
@SilenceIsFatto
SilenceIsFatto authored Sep 5, 2024
1 parent 5981526 commit 8def736
Show file tree
Hide file tree
Showing 19 changed files with 248 additions and 124 deletions.
11 changes: 11 additions & 0 deletions A3A/addons/ultimate/config/trader/vehicles/vehicles_3cbbaf.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,17 @@ class vehicles_3cbbaf : vehicles_base
ITEM(UK3CB_BAF_LandRover_WMIK_GPMG_FFR_Green_A_MTP, 2000, "ARMEDCAR", VEHICLE_CONDITION_ARMEDCAR);
ITEM(UK3CB_BAF_LandRover_WMIK_GMG_FFR_Green_A_MTP, 8200, "ARMEDCAR", VEHICLE_CONDITION_ARMEDCAR);
ITEM(UK3CB_BAF_Panther_GPMG_Green_A_MTP, 5500, "ARMEDCAR", VEHICLE_CONDITION_ARMEDCAR);
ITEM(UK3CB_BAF_Merlin_HC3_18_GPMG_MTP, 14600, "HELI", VEHICLE_CONDITION_HELI);
ITEM(UK3CB_BAF_Merlin_HC3_24_MTP, 15900, "HELI", VEHICLE_CONDITION_HELI);
ITEM(UK3CB_BAF_Merlin_HC3_32_MTP, 18300, "HELI", VEHICLE_CONDITION_HELI);
ITEM(UK3CB_BAF_Merlin_HC4_18_GPMG_MTP, 14600, "HELI", VEHICLE_CONDITION_HELI);
ITEM(UK3CB_BAF_Merlin_HC4_24_MTP, 15900, "HELI", VEHICLE_CONDITION_HELI);
ITEM(UK3CB_BAF_Merlin_HC4_32_MTP, 18300, "HELI", VEHICLE_CONDITION_HELI);
ITEM(UK3CB_BAF_Merlin_HM2_18_MTP, 16600, "HELI", VEHICLE_CONDITION_HELI);
ITEM(UK3CB_BAF_Wildcat_AH1_6_Generic_MTP, 31605, "HELI", VEHICLE_CONDITION_HELI);
ITEM(UK3CB_BAF_Wildcat_AH1_8_Generic_MTP, 32205, "HELI", VEHICLE_CONDITION_HELI);
ITEM(UK3CB_BAF_Wildcat_HMA2_TRN_8A_MTP, 15400, "HELI", VEHICLE_CONDITION_HELI);
ITEM(UK3CB_BAF_Apache_AH1_Generic_MTP, 40131, "HELI", VEHICLE_CONDITION_HELI);
ITEM(UK3CB_BAF_Static_L111A1_Deployed_Low_MTP, 3600, "STATICMG", VEHICLE_CONDITION_STATICMG);
ITEM(UK3CB_BAF_Static_L134A1_Deployed_High_MTP, 7200, "STATICMG", VEHICLE_CONDITION_STATICMG);
ITEM(UK3CB_BAF_Static_L134A1_Deployed_Low_MTP, 7200, "STATICMG", VEHICLE_CONDITION_STATICMG);
Expand Down
10 changes: 10 additions & 0 deletions A3A/addons/ultimate/config/trader/vehicles/vehicles_3cbf.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,16 @@ class vehicles_3cbf : vehicles_base
ITEM(UK3CB_KRG_I_M939_MLRS, 36600, "ARTILLERY", VEHICLE_CONDITION_ARTILLERY);
ITEM(UK3CB_KRG_I_MTVR_MLRS, 36600, "ARTILLERY", VEHICLE_CONDITION_ARTILLERY);
ITEM(UK3CB_LDF_I_RM70_MG, 36600, "ARTILLERY", VEHICLE_CONDITION_ARTILLERY);
ITEM(UK3CB_ION_I_Desert_Bell412_Utility, 13200, "HELI", VEHICLE_CONDITION_HELI);
ITEM(UK3CB_ION_I_Desert_Bell412_Armed, 18300, "HELI", VEHICLE_CONDITION_HELI);
ITEM(UK3CB_ION_I_Desert_Bell412_Armed_AT, 22500, "HELI", VEHICLE_CONDITION_HELI);
ITEM(UK3CB_ION_I_Woodland_Merlin, 12000, "HELI", VEHICLE_CONDITION_HELI);
ITEM(UK3CB_ION_I_Desert_Orca_Armed_MULTI, 29600, "HELI", VEHICLE_CONDITION_HELI);
ITEM(UK3CB_ION_I_Desert_Unarmed_MH9, 7800, "HELI", VEHICLE_CONDITION_HELI);
ITEM(UK3CB_ION_I_Woodland_Benches_MH9, 9000, "HELI", VEHICLE_CONDITION_HELI);
ITEM(UK3CB_I_G_UH1H_M240_FIA, 9400, "HELI", VEHICLE_CONDITION_HELI);
ITEM(UK3CB_I_G_UH1H_GUNSHIP_FIA, 17400, "HELI", VEHICLE_CONDITION_HELI);
ITEM(UK3CB_I_G_UH1H_FIA, 8400, "HELI", VEHICLE_CONDITION_HELI);
ITEM(UK3CB_ADA_I_L39_PYLON, 59100, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(UK3CB_UN_I_Cessna_T41_Armed_AT, 19600, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(UK3CB_AAF_B_Gripen_G, 86850, "PLANE", VEHICLE_CONDITION_PLANE);
Expand Down
2 changes: 2 additions & 0 deletions A3A/addons/ultimate/config/trader/vehicles/vehicles_csla.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ class vehicles_csla : vehicles_base
ITEM(CSLA_RM51_noinsignia, 39000, "ARTILLERY", VEHICLE_CONDITION_ARTILLERY);
ITEM(CSLA_RM70_noinsignia, 40260, "ARTILLERY", VEHICLE_CONDITION_ARTILLERY);
ITEM(CSLA_ShKH77_noinsignia, 33440, "ARTILLERY", VEHICLE_CONDITION_ARTILLERY);
ITEM(US85_zodiac, 1400, "BOAT", VEHICLE_CONDITION_BOAT);
ITEM(CSLA_lodka, 1700, "BOAT", VEHICLE_CONDITION_BOAT);
ITEM(AFMC_AH1F, 21900, "HELI", VEHICLE_CONDITION_HELI);
ITEM(AFMC_UH60, 16560, "HELI", VEHICLE_CONDITION_HELI);
ITEM(AFMC_UH60M240, 10350, "HELI", VEHICLE_CONDITION_HELI);
Expand Down
43 changes: 43 additions & 0 deletions A3A/addons/ultimate/config/trader/vehicles/vehicles_cup.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,49 @@ class vehicles_cup : vehicles_base
ITEM(CUP_O_Mi24_Mk3_CSAT_T, 45253, "HELI", VEHICLE_CONDITION_HELI);
ITEM(CUP_O_Ka52_RU, 45493, "HELI", VEHICLE_CONDITION_HELI);
ITEM(CUP_O_Ka50_DL_SLA, 39452, "HELI", VEHICLE_CONDITION_HELI);
ITEM(CUP_I_412_Mil_Transport_PMC, 14000, "HELI", VEHICLE_CONDITION_HELI);
ITEM(CUP_I_412_Mil_Utility_PMC, 13400, "HELI", VEHICLE_CONDITION_HELI);
ITEM(CUP_I_412_Military_Radar_PMC, 13400, "HELI", VEHICLE_CONDITION_HELI);
ITEM(CUP_I_412_dynamicLoadout_PMC, 23975, "HELI", VEHICLE_CONDITION_HELI);
ITEM(CUP_B_CH47F_USA, 15150, "HELI", VEHICLE_CONDITION_HELI);
ITEM(CUP_B_Merlin_HC3_GB, 16600, "HELI", VEHICLE_CONDITION_HELI);
ITEM(CUP_B_Merlin_HC3_Armed_GB, 17100, "HELI", VEHICLE_CONDITION_HELI);
ITEM(CUP_B_CH53E_GER, 18700, "HELI", VEHICLE_CONDITION_HELI);
ITEM(CUP_B_SA330_Puma_HC1_BAF, 11700, "HELI", VEHICLE_CONDITION_HELI);
ITEM(CUP_B_SA330_Puma_HC2_BAF, 11700, "HELI", VEHICLE_CONDITION_HELI);
ITEM(CUP_B_UH60M_Unarmed_US, 11700, "HELI", VEHICLE_CONDITION_HELI);
ITEM(CUP_B_UH60M_Unarmed_FFV_US, 12000, "HELI", VEHICLE_CONDITION_HELI);
ITEM(CUP_B_UH60M_US, 12450, "HELI", VEHICLE_CONDITION_HELI);
ITEM(CUP_B_UH60M_FFV_US, 12750, "HELI", VEHICLE_CONDITION_HELI);
ITEM(CUP_B_MH60L_DAP_2x_US, 27895, "HELI", VEHICLE_CONDITION_HELI);
ITEM(CUP_B_MH60L_DAP_4x_US, 30177, "HELI", VEHICLE_CONDITION_HELI);
ITEM(CUP_B_UH1D_GER_KSK, 12500, "HELI", VEHICLE_CONDITION_HELI);
ITEM(CUP_B_UH1D_armed_GER_KSK, 22200, "HELI", VEHICLE_CONDITION_HELI);
ITEM(CUP_B_UH1D_gunship_GER_KSK, 23000, "HELI", VEHICLE_CONDITION_HELI);
ITEM(CUP_B_MH6J_OBS_USA, 13300, "HELI", VEHICLE_CONDITION_HELI);
ITEM(CUP_B_MH6J_USA, 14500, "HELI", VEHICLE_CONDITION_HELI);
ITEM(CUP_B_AH6M_USA, 28870, "HELI", VEHICLE_CONDITION_HELI);
ITEM(CUP_B_AW159_Unarmed_GB, 13900, "HELI", VEHICLE_CONDITION_HELI);
ITEM(CUP_B_AW159_GB, 37508, "HELI", VEHICLE_CONDITION_HELI);
ITEM(CUP_B_Mi35_Dynamic_CZ, 39846, "HELI", VEHICLE_CONDITION_HELI);
ITEM(CUP_B_AH1Z_Dynamic_USMC, 34602, "HELI", VEHICLE_CONDITION_HELI);
ITEM(CUP_B_AH64D_DL_USA, 40608, "HELI", VEHICLE_CONDITION_HELI);
ITEM(CUP_B_AH1_DL_BAF, 40608, "HELI", VEHICLE_CONDITION_HELI);
ITEM(CUP_B_AH64_DL_USA, 38108, "HELI", VEHICLE_CONDITION_HELI);
ITEM(CUP_O_C47_SLA, 20900, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(CUP_B_C130J_GB, 41000, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(CUP_B_MV22_USMC, 30200, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(CUP_B_MV22_USMC_RAMPGUN, 30200, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(CUP_B_CESSNA_T41_UNARMED_USA, 10600, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(CUP_B_CESSNA_T41_ARMED_USA, 10600, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(CUP_B_L39_CZ_GREY, 53500, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(CUP_B_A10_DYN_USA, 76375, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(CUP_O_Su25_Dyn_SLA, 71625, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(CUP_B_GR9_DYN_GB, 71912, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(CUP_O_SU34_SLA, 105162, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(CUP_B_JAS39_HIL, 67100, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(CUP_B_F35B_BAF, 105725, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(CUP_B_F35B_Stealth_BAF, 56750, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(CUP_B_RBS70_ACR, 7500, "STATICAA", VEHICLE_CONDITION_STATICAA);
ITEM(CUP_B_Stinger_AA_pod_Base_USMC, 7500, "STATICAA", VEHICLE_CONDITION_STATICAA);
ITEM(CUP_O_Igla_AA_pod_SLA, 7500, "STATICAA", VEHICLE_CONDITION_STATICAA);
Expand Down
10 changes: 5 additions & 5 deletions A3A/addons/ultimate/config/trader/vehicles/vehicles_cw.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,16 @@ class vehicles_cw : vehicles_base
ITEM(3as_CIS_Vulture_F, 76500, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(3as_Tri_Fighter_DynamicLoadout, 76500, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(3AS_Keeradak_F, 8000, "STATICAA", VEHICLE_CONDITION_STATICAA);
ITEM(3as_FlakCannon, 8000, "STATICAA", VEHICLE_CONDITION_STATICAA);
ITEM(AA_Turret, 5000, "STATICAA", VEHICLE_CONDITION_STATICAA);
ITEM(3as_FlakCannon, 8000, "STATICAA", VEHICLE_CONDITION_STATICAA);
ITEM(AA_Turret, 5000, "STATICAA", VEHICLE_CONDITION_STATICAA);
ITEM(3AS_DF9_AA, 5000, "STATICAA", VEHICLE_CONDITION_STATICAA);
ITEM(3AS_DF9_Rocket, 7500, "STATICAA", VEHICLE_CONDITION_STATICAA);
ITEM(3AS_J1_Proton_Cannon, 8000, "STATICAT", VEHICLE_CONDITION_STATICAT);
ITEM(3AS_Venator_Cannon_Small, 8000, "STATICAT", VEHICLE_CONDITION_STATICAT);
ITEM(3as_ParticleCannon, 8000, "STATICAT", VEHICLE_CONDITION_STATICAT);
ITEM(3AS_J1_Proton_Cannon, 8000, "STATICAT", VEHICLE_CONDITION_STATICAT);
ITEM(3AS_DF9_AT, 9000, "STATICAT", VEHICLE_CONDITION_STATICAT);
ITEM(3AS_J10s_F, 4500, "STATICMG", VEHICLE_CONDITION_STATICMG);
ITEM(3AS_HeavyRepeater_Unarmoured, 4500, "STATICMG", VEHICLE_CONDITION_STATICMG);
ITEM(3AS_HeavyRepeater_Unarmoured, 4500, "STATICMG", VEHICLE_CONDITION_STATICMG);
ITEM(3AS_HeavyRepeater_Armoured, 4500, "STATICMG", VEHICLE_CONDITION_STATICMG);
ITEM(3AS_StationaryTurret, 4500, "STATICMG", VEHICLE_CONDITION_STATICMG);
ITEM(ls_turret_gar_ewebLight, 3600, "STATICMG", VEHICLE_CONDITION_STATICMG);
Expand All @@ -81,6 +81,6 @@ class vehicles_cw : vehicles_base
ITEM(CW_Ifrit, 1080, "UNARMEDCAR", VEHICLE_CONDITION_UNARMEDCAR);
ITEM(CW_Ifrit_CIS, 1080, "UNARMEDCAR", VEHICLE_CONDITION_UNARMEDCAR);
ITEM(CW_Ifrit_Mando, 1080, "UNARMEDCAR", VEHICLE_CONDITION_UNARMEDCAR);
ITEM(3AS_Fliknot_F, 500, "UNARMEDCAR", VEHICLE_CONDITION_UNARMEDCAR);
ITEM(3AS_ISP_Transport, 1300, "UNARMEDCAR", VEHICLE_CONDITION_UNARMEDCAR);
ITEM(3AS_Fliknot_F, 500, "UNARMEDCAR", VEHICLE_CONDITION_UNARMEDCAR);
};
10 changes: 10 additions & 0 deletions A3A/addons/ultimate/config/trader/vehicles/vehicles_ffaa.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,16 @@ class vehicles_ffaa : vehicles_base
ITEM(ffaa_et_vamtac_st5_spike, 18200, "ARMEDCAR", VEHICLE_CONDITION_ARMEDCAR);
ITEM(ffaa_et_m109, 34100, "ARTILLERY", VEHICLE_CONDITION_ARTILLERY);
ITEM(ffaa_et_vamtac_cardom, 24000, "ARTILLERY", VEHICLE_CONDITION_ARTILLERY);
ITEM(ffaa_famet_cougar_armed, 12000, "HELI", VEHICLE_CONDITION_HELI);
ITEM(ffaa_famet_cougar, 8400, "HELI", VEHICLE_CONDITION_HELI);
ITEM(ffaa_famet_ch47_mg_cargo, 6100, "HELI", VEHICLE_CONDITION_HELI);
ITEM(ffaa_famet_ch47_mg, 13600, "HELI", VEHICLE_CONDITION_HELI);
ITEM(ffaa_famet_ec135, 9500, "HELI", VEHICLE_CONDITION_HELI);
ITEM(ffaa_famet_tigre, 31220, "HELI", VEHICLE_CONDITION_HELI);
ITEM(ffaa_nh90_nfh_transport, 22300, "HELI", VEHICLE_CONDITION_HELI);
ITEM(ffaa_nh90_tth_armed, 15100, "HELI", VEHICLE_CONDITION_HELI);
ITEM(ffaa_nh90_tth_cargo, 10000, "HELI", VEHICLE_CONDITION_HELI);
ITEM(ffaa_nh90_tth_transport, 16000, "HELI", VEHICLE_CONDITION_HELI);
ITEM(ffaa_ar_harrier, 93400, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(ffaa_ea_ef18m, 101350, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(ffaa_spike_tripode, 9000, "STATICAA", VEHICLE_CONDITION_STATICAA);
Expand Down
30 changes: 15 additions & 15 deletions A3A/addons/ultimate/config/trader/vehicles/vehicles_flyleg.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@ class vehicles_flyleg : vehicles_base
ITEM(sab_fl_ju88a, 22375, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(sab_fl_ju86, 18125, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(sab_fl_ju52, 15400, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(sab_fl_g50, 15280, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(sab_fl_a6m, 15720, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(sab_fl_he162, 24000, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(sab_fl_yak3, 12000, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(sab_fl_hurricane, 12000, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(sab_fl_spitfire_mk1, 12000, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(sab_fl_spitfire_mk5, 12500, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(sab_fl_spitfire_mkxiv, 13000, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(sab_fl_p51d, 20140, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(sab_fl_p51b, 20140, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(sab_fl_f4f, 16600, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(sab_fl_sbd, 17150, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(sab_fl_hurricane_2, 20920, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(sab_fl_tempest, 20920, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(sab_fl_dh98, 20920, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(sab_fl_g50, 15280, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(sab_fl_a6m, 15720, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(sab_fl_he162, 24000, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(sab_fl_yak3, 12000, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(sab_fl_hurricane, 12000, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(sab_fl_spitfire_mk1, 12000, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(sab_fl_spitfire_mk5, 12500, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(sab_fl_spitfire_mkxiv, 13000, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(sab_fl_p51d, 20140, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(sab_fl_p51b, 20140, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(sab_fl_f4f, 16600, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(sab_fl_sbd, 17150, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(sab_fl_hurricane_2, 20920, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(sab_fl_tempest, 20920, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(sab_fl_dh98, 20920, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(sab_fl_airfieldtractor, 500, "UNARMEDCAR", VEHICLE_CONDITION_UNARMEDCAR);
ITEM(sab_fl_scooter_39, 500, "UNARMEDCAR", VEHICLE_CONDITION_UNARMEDCAR);
ITEM(sab_fl_scooter_53, 500, "UNARMEDCAR", VEHICLE_CONDITION_UNARMEDCAR);
Expand Down
12 changes: 6 additions & 6 deletions A3A/addons/ultimate/config/trader/vehicles/vehicles_gm.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ class vehicles_gm : vehicles_base
ITEM(gm_gc_army_ural375d_mlrs_noinsignia, 54900, "ARTILLERY", VEHICLE_CONDITION_ARTILLERY);
ITEM(gm_gc_army_2s1_noinsignia, 40260, "ARTILLERY", VEHICLE_CONDITION_ARTILLERY);
ITEM(gm_gc_army_2p16_noinsignia, 198000, "ARTILLERY", VEHICLE_CONDITION_ARTILLERY);
ITEM(gm_pl_army_2p16_noinsignia, 198000, "ARTILLERY", VEHICLE_CONDITION_ARTILLERY);
ITEM(gm_pl_army_2s1_noinsignia, 40260, "ARTILLERY", VEHICLE_CONDITION_ARTILLERY);
ITEM(gm_pl_army_2p16, 198000, "ARTILLERY", VEHICLE_CONDITION_ARTILLERY);
ITEM(gm_pl_army_2s1, 40260, "ARTILLERY", VEHICLE_CONDITION_ARTILLERY);
ITEM(gm_pl_army_ural375d_mlrs, 60390, "ARTILLERY", VEHICLE_CONDITION_ARTILLERY);
ITEM(gm_ge_army_ch53g_noinsignia, 11400, "HELI", VEHICLE_CONDITION_HELI);
ITEM(gm_ge_army_ch53gs_noinsignia, 11400, "HELI", VEHICLE_CONDITION_HELI);
Expand Down Expand Up @@ -87,10 +87,10 @@ class vehicles_gm : vehicles_base
ITEM(gm_ge_army_Leopard1a1a2_noinsignia, 43700, "TANK", VEHICLE_CONDITION_TANK);
ITEM(gm_ge_army_Leopard1a3a1_noinsignia, 43700, "TANK", VEHICLE_CONDITION_TANK);
ITEM(gm_ge_army_Leopard1a5_noinsignia, 46700, "TANK", VEHICLE_CONDITION_TANK);
ITEM(gm_pl_army_pt76b_noinsignia, 19800, "TANK", VEHICLE_CONDITION_TANK);
ITEM(gm_pl_army_t55_noinsignia, 40200, "TANK", VEHICLE_CONDITION_TANK);
ITEM(gm_pl_army_t55a_noinsignia, 43500, "TANK", VEHICLE_CONDITION_TANK);
ITEM(gm_pl_army_t55ak_noinsignia, 43500, "TANK", VEHICLE_CONDITION_TANK);
ITEM(gm_pl_army_pt76b, 19800, "TANK", VEHICLE_CONDITION_TANK);
ITEM(gm_pl_army_t55, 40200, "TANK", VEHICLE_CONDITION_TANK);
ITEM(gm_pl_army_t55a, 43500, "TANK", VEHICLE_CONDITION_TANK);
ITEM(gm_pl_army_t55ak, 43500, "TANK", VEHICLE_CONDITION_TANK);
ITEM(gm_gc_army_t55am2_noinsignia, 46500, "TANK", VEHICLE_CONDITION_TANK);
ITEM(gm_gc_army_t55am2b_noinsignia, 46500, "TANK", VEHICLE_CONDITION_TANK);
ITEM(gm_ge_army_u1300l_medic, 7900, "UNARMEDCAR", VEHICLE_CONDITION_UNARMEDCAR);
Expand Down
3 changes: 3 additions & 0 deletions A3A/addons/ultimate/config/trader/vehicles/vehicles_includes.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,6 @@
#include "vehicles_cwriiiusmc.hpp"
#include "vehicles_csa38.hpp"
#include "vehicles_eaw.hpp"
#include "vehicles_navleg.hpp"
#include "vehicles_flyleg.hpp"
#include "vehicles_scrtwpns.hpp"
30 changes: 15 additions & 15 deletions A3A/addons/ultimate/config/trader/vehicles/vehicles_navleg.hpp
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
class vehicles_navleg : vehicles_base
{
ITEM(sab_nl_enterprise_gun_127mm, 10000, "STATICAT", VEHICLE_CONDITION_STATICAA);
ITEM(sab_nl_enterprise_gun_20mm, 5000, "STATICAA", VEHICLE_CONDITION_STATICAA);
ITEM(sab_nl_enterprise_gun_40mm, 15000, "STATICAA", VEHICLE_CONDITION_STATICAA);
ITEM(sab_nl_vessel_a, 1900, "BOAT", VEHICLE_CONDITION_BOAT);
ITEM(sab_nl_vessel_b, 3400, "BOAT", VEHICLE_CONDITION_BOAT);
ITEM(sab_nl_vessel_c, 1600, "BOAT", VEHICLE_CONDITION_BOAT);
ITEM(sab_nl_vessel_d, 1900, "BOAT", VEHICLE_CONDITION_BOAT);
ITEM(sab_nl_vessel_e, 1900, "BOAT", VEHICLE_CONDITION_BOAT);
ITEM(sab_nl_liberty, 117500, "BOAT", VEHICLE_CONDITION_BOAT);
ITEM(sab_nl_sims, 175000, "BOAT", VEHICLE_CONDITION_BOAT);
ITEM(sab_nl_foxhound, 169000, "BOAT", VEHICLE_CONDITION_BOAT);
ITEM(sab_nl_dido, 292500, "BOAT", VEHICLE_CONDITION_BOAT);
ITEM(sab_nl_cleveland, 436250, "BOAT", VEHICLE_CONDITION_BOAT);
ITEM(sab_nl_hood, 590000, "BOAT", VEHICLE_CONDITION_BOAT);
ITEM(sab_nl_t22, 171000, "BOAT", VEHICLE_CONDITION_BOAT);
ITEM(sab_nl_mutsuki, 147000, "BOAT", VEHICLE_CONDITION_BOAT);
ITEM(sab_nl_fubuki, 211000, "BOAT", VEHICLE_CONDITION_BOAT);
ITEM(sab_nl_vincenzo, 159000, "BOAT", VEHICLE_CONDITION_BOAT);
ITEM(sab_nl_zara, 286500, "BOAT", VEHICLE_CONDITION_BOAT);
ITEM(sab_nl_scharnhorst, 565000, "BOAT", VEHICLE_CONDITION_BOAT);
ITEM(sab_nl_u557, 83500, "BOAT", VEHICLE_CONDITION_BOAT);
ITEM(sab_nl_sims, 175000, "BOAT", VEHICLE_CONDITION_BOAT);
ITEM(sab_nl_foxhound, 169000, "BOAT", VEHICLE_CONDITION_BOAT);
ITEM(sab_nl_dido, 292500, "BOAT", VEHICLE_CONDITION_BOAT);
ITEM(sab_nl_cleveland, 436250, "BOAT", VEHICLE_CONDITION_BOAT);
ITEM(sab_nl_hood, 590000, "BOAT", VEHICLE_CONDITION_BOAT);
ITEM(sab_nl_t22, 171000, "BOAT", VEHICLE_CONDITION_BOAT);
ITEM(sab_nl_mutsuki, 147000, "BOAT", VEHICLE_CONDITION_BOAT);
ITEM(sab_nl_fubuki, 211000, "BOAT", VEHICLE_CONDITION_BOAT);
ITEM(sab_nl_vincenzo, 159000, "BOAT", VEHICLE_CONDITION_BOAT);
ITEM(sab_nl_zara, 286500, "BOAT", VEHICLE_CONDITION_BOAT);
ITEM(sab_nl_scharnhorst, 565000, "BOAT", VEHICLE_CONDITION_BOAT);
ITEM(sab_nl_u557, 83500, "BOAT", VEHICLE_CONDITION_BOAT);
ITEM(sab_nl_enterprise_gun_20mm, 5000, "STATICAA", VEHICLE_CONDITION_STATICAA);
ITEM(sab_nl_enterprise_gun_40mm, 15000, "STATICAA", VEHICLE_CONDITION_STATICAA);
ITEM(sab_nl_enterprise_gun_127mm, 10000, "STATICAT", VEHICLE_CONDITION_STATICAT);
};
1 change: 1 addition & 0 deletions A3A/addons/ultimate/config/trader/vehicles/vehicles_optre.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ class vehicles_optre : vehicles_base
ITEM(OPTRE_FC_T26_AI, 4320, "STATICMG", VEHICLE_CONDITION_STATICMG);
ITEM(OPTRE_Static_M41_Ins_IND, 4950, "STATICMG", VEHICLE_CONDITION_STATICMG);
ITEM(OPTRE_Static_M247T_Tripod_CMA, 3600, "STATICMG", VEHICLE_CONDITION_STATICMG);
ITEM(Plasma_Mortar, 13000, "STATICMORTAR", VEHICLE_CONDITION_STATICMORTAR);
ITEM(OPTRE_M808B_UNSC, 43400, "TANK", VEHICLE_CONDITION_TANK);
ITEM(OPTRE_M808BM_UNSC, 46700, "TANK", VEHICLE_CONDITION_TANK);
ITEM(OPTRE_M808L, 48200, "TANK", VEHICLE_CONDITION_TANK);
Expand Down
19 changes: 9 additions & 10 deletions A3A/addons/ultimate/config/trader/vehicles/vehicles_pedagne.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,15 @@ class vehicles_pedagne : vehicles_base
ITEM(ASZ_Cougar_6x6, 4900, "ARMEDCAR", VEHICLE_CONDITION_ARMEDCAR);
ITEM(ASZ_VTML_hitrole_LR, 11300, "ARMEDCAR", VEHICLE_CONDITION_ARMEDCAR);
ITEM(ASZ_VTML_M2_Protect, 4300, "ARMEDCAR", VEHICLE_CONDITION_ARMEDCAR);
ITEM(ffaa_famet_cougar_armed, 12000, "HELI", VEHICLE_CONDITION_HELI);
ITEM(ffaa_famet_cougar, 8400, "HELI", VEHICLE_CONDITION_HELI);
ITEM(ffaa_famet_ch47_mg_cargo, 6100, "HELI", VEHICLE_CONDITION_HELI);
ITEM(ffaa_famet_ch47_mg, 13600, "HELI", VEHICLE_CONDITION_HELI);
ITEM(ffaa_famet_ec135, 9500, "HELI", VEHICLE_CONDITION_HELI);
ITEM(ffaa_famet_tigre, 31220, "HELI", VEHICLE_CONDITION_HELI);
ITEM(ffaa_nh90_nfh_transport, 22300, "HELI", VEHICLE_CONDITION_HELI);
ITEM(ffaa_nh90_tth_armed, 15100, "HELI", VEHICLE_CONDITION_HELI);
ITEM(ffaa_nh90_tth_cargo, 10000, "HELI", VEHICLE_CONDITION_HELI);
ITEM(ffaa_nh90_tth_transport, 16000, "HELI", VEHICLE_CONDITION_HELI);
ITEM(ASZ_A129, 39700, "HELI", VEHICLE_CONDITION_HELI);
ITEM(ASZ_AB212_AM, 10200, "HELI", VEHICLE_CONDITION_HELI);
ITEM(ASZ_AB212_MM_asw_AS12, 13740, "HELI", VEHICLE_CONDITION_HELI);
ITEM(ASZ_AB212_EI_FFAR, 13500, "HELI", VEHICLE_CONDITION_HELI);
ITEM(ASZ_AB212_AM_ico, 8550, "HELI", VEHICLE_CONDITION_HELI);
ITEM(ASZ_AB212_EI_M21, 15150, "HELI", VEHICLE_CONDITION_HELI);
ITEM(DDL_C27J_AM, 20200, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(ASZ_AV8B, 93300, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(ASZ_EFA, 100900, "PLANE", VEHICLE_CONDITION_PLANE);
ITEM(asz_spikeLR_tripode, 7500, "STATICAT", VEHICLE_CONDITION_STATICAT);
ITEM(ASZ_Centauro_B1, 43100, "TANK", VEHICLE_CONDITION_TANK);
ITEM(ASZ_Ariete, 46700, "TANK", VEHICLE_CONDITION_TANK);
Expand Down
Loading

0 comments on commit 8def736

Please sign in to comment.