W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-19 14:42:56 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update shotgun ammo names

Browse Source 
See:
634214570c
This commit is contained in:
ebaydayz
2016-03-11 14:10:45 -05:00
parent 09b656abc3
commit 01529e51bc
12 changed files with 112 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp
View File

@@ -168,8 +168,8 @@ class CfgLootLegacy {
,{"FoodCanPasta",0.05}
,{"8Rnd_9x18_Makarov",0.07}
,{"7Rnd_45ACP_1911",0.05}
,{"2Rnd_shotgun_74Slug",0.05}
,{"2Rnd_shotgun_74Pellets",0.05}
,{"2Rnd_12Gauge_Slug",0.05}
,{"2Rnd_12Gauge_Buck",0.05}
,{"ItemBandage",0.06}
,{"ItemPainkiller",0.06}
,{"FoodBioMeat",0.01}
@@ -190,8 +190,8 @@ class CfgLootLegacy {
,{"FoodCanPasta",0.05}
,{"8Rnd_9x18_Makarov",0.07}
,{"7Rnd_45ACP_1911",0.05}
,{"2Rnd_shotgun_74Slug",0.05}
,{"2Rnd_shotgun_74Pellets",0.05}
,{"2Rnd_12Gauge_Slug",0.05}
,{"2Rnd_12Gauge_Buck",0.05}
,{"ItemBandage",0.06}
,{"ItemPainkiller",0.06}
,{"FoodBioMeat",0.01}
@@ -231,8 +231,8 @@ class CfgLootLegacy {
,{"5x_22_LR_17_HMR",0.01}
,{"10x_303",0.04}
,{"6Rnd_45ACP",0.04}
,{"2Rnd_shotgun_74Slug",0.05}
,{"2Rnd_shotgun_74Pellets",0.05}
,{"2Rnd_12Gauge_Slug",0.05}
,{"2Rnd_12Gauge_Buck",0.05}
,{"8Rnd_9x18_Makarov",0.08}
,{"15Rnd_W1866_Slug",0.02}
,{"WoodenArrow",0.04}
@@ -263,8 +263,8 @@ class CfgLootLegacy {
,{"5x_22_LR_17_HMR",0.01}
,{"10x_303",0.04}
,{"6Rnd_45ACP",0.04}
,{"2Rnd_shotgun_74Slug",0.05}
,{"2Rnd_shotgun_74Pellets",0.05}
,{"2Rnd_12Gauge_Slug",0.05}
,{"2Rnd_12Gauge_Buck",0.05}
,{"8Rnd_9x18_Makarov",0.09}
,{"15Rnd_W1866_Slug",0.02}
,{"WoodenArrow",0.04}
@@ -311,7 +311,7 @@ class CfgLootLegacy {
,{"30Rnd_545x39_AK",0.04}
,{"5Rnd_762x51_M24",0.01}
,{"5Rnd_86x70_L115A1",0.01}
,{"8Rnd_B_Beneli_74Slug",0.04}
,{"8Rnd_12Gauge_Slug",0.04}
,{"1Rnd_HE_M203",0.01}
,{"FlareWhite_M203",0.01}
,{"FlareGreen_M203",0.01}
@@ -322,7 +322,7 @@ class CfgLootLegacy {
,{"SmokeShell",0.04}
,{"SmokeShellRed",0.02}
,{"SmokeShellGreen",0.02}
,{"8Rnd_B_Beneli_Pellets",0.04}
,{"8Rnd_12Gauge_Buck",0.04}
,{"30Rnd_556x45_StanagSD",0.01}
,{"30Rnd_9x19_MP5",0.02}
,{"30Rnd_9x19_MP5SD",0.01}
@@ -355,7 +355,7 @@ class CfgLootLegacy {
,{"30Rnd_545x39_AK",0.04}
,{"5Rnd_762x51_M24",0.01}
,{"5Rnd_86x70_L115A1",0.01}
,{"8Rnd_B_Beneli_74Slug",0.04}
,{"8Rnd_12Gauge_Slug",0.04}
,{"1Rnd_HE_M203",0.01}
,{"FlareWhite_M203",0.01}
,{"FlareGreen_M203",0.01}
@@ -366,7 +366,7 @@ class CfgLootLegacy {
,{"SmokeShell",0.04}
,{"SmokeShellRed",0.02}
,{"SmokeShellGreen",0.02}
,{"8Rnd_B_Beneli_Pellets",0.04}
,{"8Rnd_12Gauge_Buck",0.04}
,{"30Rnd_556x45_StanagSD",0.01}
,{"30Rnd_9x19_MP5",0.02}
,{"30Rnd_9x19_MP5SD",0.01}
@@ -386,7 +386,7 @@ class CfgLootLegacy {
,{"7Rnd_45ACP_1911",0.08}
,{"6Rnd_45ACP",0.08}
,{"15Rnd_W1866_Slug",0.14}
,{"8Rnd_B_Beneli_Pellets",0.16}
,{"8Rnd_12Gauge_Buck",0.16}
,{"HandRoadFlare",0.07}
,{"8Rnd_9x18_MakarovSD",0.01}
,{"ItemComboLock",0.05}

22
SQF/dayz_code/Configs/CfgLoot/CfgLootSmall.hpp
View File

@@ -18,8 +18,8 @@ class CfgLootSmall {
{"FoodCanPasta",0.05},
{"8Rnd_9x18_Makarov",0.07},
{"7Rnd_45ACP_1911",0.05},
{"2Rnd_shotgun_74Slug",0.05},
{"2Rnd_shotgun_74Pellets",0.05},
{"2Rnd_12Gauge_Slug",0.05},
{"2Rnd_12Gauge_Buck",0.05},
{"ItemBandage",0.06},
{"ItemPainkiller",0.06},
{"FoodBioMeat",0.01},
@@ -37,8 +37,8 @@ class CfgLootSmall {
{"FoodCanPasta",0.05},
{"8Rnd_9x18_Makarov",0.07},
{"7Rnd_45ACP_1911",0.05},
{"2Rnd_shotgun_74Slug",0.05},
{"2Rnd_shotgun_74Pellets",0.05},
{"2Rnd_12Gauge_Slug",0.05},
{"2Rnd_12Gauge_Buck",0.05},
{"ItemBandage",0.06},
{"ItemPainkiller",0.06},
{"FoodBioMeat",0.01},
@@ -77,8 +77,8 @@ class CfgLootSmall {
{"5x_22_LR_17_HMR",0.01},
{"10x_303",0.04},
{"6Rnd_45ACP",0.04},
{"2Rnd_shotgun_74Slug",0.05},
{"2Rnd_shotgun_74Pellets",0.05},
{"2Rnd_12Gauge_Slug",0.05},
{"2Rnd_12Gauge_Buck",0.05},
{"8Rnd_9x18_Makarov",0.09},
{"15Rnd_W1866_Slug",0.02},
{"WoodenArrow",0.04},
@@ -106,8 +106,8 @@ class CfgLootSmall {
{"5x_22_LR_17_HMR",0.01},
{"10x_303",0.04},
{"6Rnd_45ACP",0.04},
{"2Rnd_shotgun_74Slug",0.05},
{"2Rnd_shotgun_74Pellets",0.05},
{"2Rnd_12Gauge_Slug",0.05},
{"2Rnd_12Gauge_Buck",0.05},
{"8Rnd_9x18_Makarov",0.09},
{"15Rnd_W1866_Slug",0.02},
{"WoodenArrow",0.04},
@@ -152,7 +152,7 @@ class CfgLootSmall {
{"30Rnd_545x39_AK",0.04},
{"5Rnd_762x51_M24",0.01},
{"5Rnd_86x70_L115A1",0.01},
{"8Rnd_B_Beneli_74Slug",0.04},
{"8Rnd_12Gauge_Slug",0.04},
{"1Rnd_HE_M203",0.01},
{"FlareWhite_M203",0.01},
{"FlareGreen_M203",0.01},
@@ -163,7 +163,7 @@ class CfgLootSmall {
{"SmokeShell",0.04},
{"SmokeShellRed",0.02},
{"SmokeShellGreen",0.02},
{"8Rnd_B_Beneli_Pellets",0.04},
{"8Rnd_12Gauge_Buck",0.04},
{"30Rnd_556x45_StanagSD",0.01},
{"30Rnd_9x19_MP5",0.02},
{"30Rnd_9x19_MP5SD",0.01},
@@ -181,7 +181,7 @@ class CfgLootSmall {
{"7Rnd_45ACP_1911",0.08},
{"6Rnd_45ACP",0.08},
{"15Rnd_W1866_Slug",0.14},
{"8Rnd_B_Beneli_Pellets",0.17},
{"8Rnd_12Gauge_Buck",0.17},
{"HandRoadFlare",0.08},
{"8Rnd_9x18_MakarovSD",0.01},
{"ItemComboLock",0.05},

8
SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp
View File

@@ -13,10 +13,10 @@ AmmoCivilian[] =
{Loot_MAGAZINE, 1, 5Rnd_17HMR},
//Shotgun
{Loot_MAGAZINE, 1, 8Rnd_B_Beneli_Pellets},
{Loot_MAGAZINE, 3, 8Rnd_B_Beneli_74Slug},
{Loot_MAGAZINE, 3, 2Rnd_shotgun_74Pellets},
{Loot_MAGAZINE, 5, 2Rnd_shotgun_74Slug}
{Loot_MAGAZINE, 1, 8Rnd_12Gauge_Buck},
{Loot_MAGAZINE, 3, 8Rnd_12Gauge_Slug},
{Loot_MAGAZINE, 3, 2Rnd_12Gauge_Buck},
{Loot_MAGAZINE, 5, 2Rnd_12Gauge_Slug}
};
militaryVehicleAmmo[] = { //DZE
{Loot_MAGAZINE, 2, 2000Rnd_762x51_M134}

2
SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Police.hpp
View File

@@ -4,7 +4,7 @@ ZombiePolice[] =
{Loot_MAGAZINE, 2, 7Rnd_45ACP_1911},
{Loot_MAGAZINE, 2, ItemDocument},
{Loot_MAGAZINE, 3, 6Rnd_45ACP},
{Loot_MAGAZINE, 1, 8Rnd_B_Beneli_Pellets},
{Loot_MAGAZINE, 1, 8Rnd_12Gauge_Buck},
{Loot_MAGAZINE, 1, ItemHotwireKit},
{Loot_MAGAZINE, 2, ItemComboLock},
{Loot_MAGAZINE, 3, HandRoadFlare}

48
SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp
View File

@@ -836,54 +836,6 @@ class ItemLockbox: CA_Magazine
};
};
class PartWoodPile: CA_Magazine
{
scope = public;
count = 1;
type = 256;
displayName = $STR_EQUIP_NAME_40;
model = "\dayz_equip\models\woodPile.p3d";
picture = "\dayz_equip\textures\equip_woodPile_ca.paa";
descriptionShort = $STR_EQUIP_DESC_40;
class ItemActions {
class Build {
text = $STR_EPOCH_PLAYER_241;
script = "spawn player_build;";
require[] = {"ItemMatchbox_DZE"};
create = "Land_Fire_DZ";
};
class Crafting
{
text = $STR_EPOCH_PLAYER_242;
script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
neednearby[] = {"sawmill"};
requiretools[] = {"ItemToolbox","ItemKnife"};
output[] = {{"PartWoodLumber",1}};
input[] = {{"PartWoodPile",2}};
};
class Crafting1
{
text = $STR_EPOCH_PLAYER_243;
script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
neednearby[] = {};
requiretools[] = {"ItemKnife"};
output[] = {{"WoodenArrow",3}};
input[] = {{"PartWoodPile",1},{"ItemTrashRazor",1}};
};
class Crafting2
{
text = $STR_EPOCH_PLAYER_244;
script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
neednearby[] = {};
requiretools[] = {"ItemToolbox","ItemKnife"};
output[] = {{"stick_fence_kit",1}};
input[] = {{"PartWoodPile",6}};
};
};
};
class PartPlankPack: CA_Magazine
{
scope = public;

41
SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp
View File

@@ -45,7 +45,7 @@ class ItemPlank : CA_Magazine
};
};
};
/* Redifined in DZE/Misc
class PartWoodPile : CA_Magazine
{
scope = public;
@@ -56,4 +56,41 @@ class PartWoodPile : CA_Magazine
picture = "\dayz_equip\textures\equip_woodPile_ca.paa";
displayName = $STR_EQUIP_NAME_40;
descriptionShort = $STR_EQUIP_DESC_40;
}; */
class ItemActions {
class Build {
text = $STR_EPOCH_PLAYER_241;
script = "spawn player_build;";
require[] = {"ItemMatchbox_DZE"};
create = "Land_Fire_DZ";
};
class Crafting
{
text = $STR_EPOCH_PLAYER_242;
script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
neednearby[] = {"sawmill"};
requiretools[] = {"ItemToolbox","ItemKnife"};
output[] = {{"PartWoodLumber",1}};
input[] = {{"PartWoodPile",2}};
};
class Crafting1
{
text = $STR_EPOCH_PLAYER_243;
script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
neednearby[] = {};
requiretools[] = {"ItemKnife"};
output[] = {{"WoodenArrow",3}};
input[] = {{"PartWoodPile",1},{"ItemTrashRazor",1}};
};
class Crafting2
{
text = $STR_EPOCH_PLAYER_244;
script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
neednearby[] = {};
requiretools[] = {"ItemToolbox","ItemKnife"};
output[] = {{"stick_fence_kit",1}};
input[] = {{"PartWoodPile",6}};
};
};
};

38
SQF/dayz_code/Configs/CfgMagazines/Magazines/Shotgun.hpp
View File

@@ -59,25 +59,6 @@ class 2Rnd_12Gauge_Slug : 8Rnd_12Gauge_Slug
};
};
};
class 2Rnd_shotgun_74Slug: 2Rnd_12Gauge_Slug {
count=2;
class ItemActions {
class ReloadMag {
text="Combine to 8 rounds";
script="spawn player_reloadMag;";
use[]= {
"2Rnd_shotgun_74Slug",
"2Rnd_shotgun_74Slug",
"2Rnd_shotgun_74Slug",
"2Rnd_shotgun_74Slug"
};
output[]= {
"8Rnd_12Gauge_Slug" //USE THIS AMMO TYPE INSTEAD OF 8Rnd_B_Beneli_74Slug
};
};
};
};
/* Buckshot */
@@ -137,23 +118,4 @@ class 2Rnd_12Gauge_Buck : 8Rnd_12Gauge_Buck
};
};
};
};
class 2Rnd_shotgun_74Pellets: 2Rnd_12Gauge_Buck {
displayName="2Rnd. Pellets";
count=2;
class ItemActions {
class ReloadMag {
text="Combine to 8 rounds";
script="spawn player_reloadMag;";
use[]= {
"2Rnd_shotgun_74Pellets",
"2Rnd_shotgun_74Pellets",
"2Rnd_shotgun_74Pellets",
"2Rnd_shotgun_74Pellets"
};
output[]= {
"8Rnd_12Gauge_Buck" //USE THIS TYPE INSTEAD OF 8Rnd_B_Beneli_Pellets
};
};
};
};