From 62e6adb4fb12333e8cb68d5f1b673d1e0cf776d9 Mon Sep 17 00:00:00 2001 From: He-Man Date: Thu, 17 Jan 2019 22:11:15 +0100 Subject: [PATCH] A2 Mags --- Sources/epoch_config/Configs/CfgItemSort.hpp | 2 +- Sources/epoch_config/Configs/CfgPricing.hpp | 2 +- .../epoch_server_settings/configs/CfgLootTable.h | 15 +++++++++++++-- .../configs/CfgLootTable_CUP.h | 12 ++++++++++++ .../configs/CfgLootTable_MAD.h | 15 +++++++++++++-- .../configs/CfgLootTable_MADCUP.h | 12 ++++++++++++ 6 files changed, 52 insertions(+), 6 deletions(-) diff --git a/Sources/epoch_config/Configs/CfgItemSort.hpp b/Sources/epoch_config/Configs/CfgItemSort.hpp index c283b5f5..6d942a40 100644 --- a/Sources/epoch_config/Configs/CfgItemSort.hpp +++ b/Sources/epoch_config/Configs/CfgItemSort.hpp @@ -722,7 +722,7 @@ class CfgItemSort "30Rnd_762x39_Mag", // A2 Mags - "Bizon_64Rnd_9x19", + "Bizon_64Rnd_9x18", "20Rnd_762x51_DMR", "20Rnd_762x51_FNFAL", "30Rnd_556x45_G36", diff --git a/Sources/epoch_config/Configs/CfgPricing.hpp b/Sources/epoch_config/Configs/CfgPricing.hpp index 34579560..86255865 100644 --- a/Sources/epoch_config/Configs/CfgPricing.hpp +++ b/Sources/epoch_config/Configs/CfgPricing.hpp @@ -2746,7 +2746,7 @@ class CfgPricing }; // A2 Mags - class Bizon_64Rnd_9x19 + class Bizon_64Rnd_9x18 { price = 5; tax = 0.9; diff --git a/Sources/epoch_server_settings/configs/CfgLootTable.h b/Sources/epoch_server_settings/configs/CfgLootTable.h index 4efa4f88..4d1d284a 100644 --- a/Sources/epoch_server_settings/configs/CfgLootTable.h +++ b/Sources/epoch_server_settings/configs/CfgLootTable.h @@ -499,10 +499,21 @@ class CfgLootTable { { "RifleAmmo_30Rnd_45ACP_Mag_SMG_01", "CfgLootTable" }, 16 }, { { "30Rnd_9x21_Mag", "magazine" }, 17 }, { { "5Rnd_rollins_mag", "magazine" }, 20 }, - { { "50Rnd_570x28_SMG_03", "magazine" }, 10 } + { { "50Rnd_570x28_SMG_03", "magazine" }, 10 }, + { { "RifleAmmo_A2", "CfgLootTable" }, 10 } }; }; - + class RifleAmmo_A2 + { + { { "Bizon_64Rnd_9x18", "magazine" }, 4 }, + { { "20Rnd_762x51_DMR", "magazine" }, 2 }, + { { "20Rnd_762x51_FNFAL", "magazine" }, 2 }, + { { "30Rnd_556x45_G36", "magazine" }, 4 }, + { { "10Rnd_303", "magazine" }, 2 }, + { { "100Rnd_556x45_BetaCMag", "magazine" }, 2 }, + { { "10Rnd_762x54_SVD", "magazine" }, 2 }, + { { "10Rnd_9x39_SP5_VSS", "magazine" }, 2 } + }; class RifleAmmo_30Rnd_556x45_Stanag { items[] = { diff --git a/Sources/epoch_server_settings/configs/CfgLootTable_CUP.h b/Sources/epoch_server_settings/configs/CfgLootTable_CUP.h index 8c9431ae..f3708104 100644 --- a/Sources/epoch_server_settings/configs/CfgLootTable_CUP.h +++ b/Sources/epoch_server_settings/configs/CfgLootTable_CUP.h @@ -834,9 +834,21 @@ class CfgLootTable_CUP { { "30Rnd_9x21_Mag", "magazine" }, 12 }, { { "5Rnd_rollins_mag", "magazine" }, 15 }, { { "50Rnd_570x28_SMG_03", "magazine" }, 10 }, + { { "RifleAmmo_A2", "CfgLootTable" }, 10 }, { { "CUP_RifleAmmo", "CfgLootTable" }, 26 } }; }; + class RifleAmmo_A2 + { + { { "Bizon_64Rnd_9x18", "magazine" }, 4 }, + { { "20Rnd_762x51_DMR", "magazine" }, 2 }, + { { "20Rnd_762x51_FNFAL", "magazine" }, 2 }, + { { "30Rnd_556x45_G36", "magazine" }, 4 }, + { { "10Rnd_303", "magazine" }, 2 }, + { { "100Rnd_556x45_BetaCMag", "magazine" }, 2 }, + { { "10Rnd_762x54_SVD", "magazine" }, 2 }, + { { "10Rnd_9x39_SP5_VSS", "magazine" }, 2 } + }; class CUP_RifleAmmo { items[] = { diff --git a/Sources/epoch_server_settings/configs/CfgLootTable_MAD.h b/Sources/epoch_server_settings/configs/CfgLootTable_MAD.h index 42d1b266..d177ddb8 100644 --- a/Sources/epoch_server_settings/configs/CfgLootTable_MAD.h +++ b/Sources/epoch_server_settings/configs/CfgLootTable_MAD.h @@ -501,10 +501,21 @@ class CfgLootTable_MAD { { "RifleAmmo_30Rnd_45ACP_Mag_SMG_01", "CfgLootTable" }, 16 }, { { "30Rnd_9x21_Mag", "magazine" }, 17 }, { { "5Rnd_rollins_mag", "magazine" }, 20 }, - { { "50Rnd_570x28_SMG_03", "magazine" }, 10 } + { { "50Rnd_570x28_SMG_03", "magazine" }, 10 }, + { { "RifleAmmo_A2", "CfgLootTable" }, 10 }, }; }; - + class RifleAmmo_A2 + { + { { "Bizon_64Rnd_9x18", "magazine" }, 4 }, + { { "20Rnd_762x51_DMR", "magazine" }, 2 }, + { { "20Rnd_762x51_FNFAL", "magazine" }, 2 }, + { { "30Rnd_556x45_G36", "magazine" }, 4 }, + { { "10Rnd_303", "magazine" }, 2 }, + { { "100Rnd_556x45_BetaCMag", "magazine" }, 2 }, + { { "10Rnd_762x54_SVD", "magazine" }, 2 }, + { { "10Rnd_9x39_SP5_VSS", "magazine" }, 2 } + }; class RifleAmmo_30Rnd_556x45_Stanag { items[] = { diff --git a/Sources/epoch_server_settings/configs/CfgLootTable_MADCUP.h b/Sources/epoch_server_settings/configs/CfgLootTable_MADCUP.h index 7307b703..3e717062 100644 --- a/Sources/epoch_server_settings/configs/CfgLootTable_MADCUP.h +++ b/Sources/epoch_server_settings/configs/CfgLootTable_MADCUP.h @@ -836,9 +836,21 @@ class CfgLootTable_MADCUP { { "30Rnd_9x21_Mag", "magazine" }, 12 }, { { "5Rnd_rollins_mag", "magazine" }, 15 }, { { "50Rnd_570x28_SMG_03", "magazine" }, 10 }, + { { "RifleAmmo_A2", "CfgLootTable" }, 10 }, { { "CUP_RifleAmmo", "CfgLootTable" }, 26 } }; }; + class RifleAmmo_A2 + { + { { "Bizon_64Rnd_9x18", "magazine" }, 4 }, + { { "20Rnd_762x51_DMR", "magazine" }, 2 }, + { { "20Rnd_762x51_FNFAL", "magazine" }, 2 }, + { { "30Rnd_556x45_G36", "magazine" }, 4 }, + { { "10Rnd_303", "magazine" }, 2 }, + { { "100Rnd_556x45_BetaCMag", "magazine" }, 2 }, + { { "10Rnd_762x54_SVD", "magazine" }, 2 }, + { { "10Rnd_9x39_SP5_VSS", "magazine" }, 2 } + }; class CUP_RifleAmmo { items[] = {