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

Mag names, Attachments names, Translation fixes

Browse Source 
Vanilla development commit:

af9e009bae

- renamed magazines for better sorting
- renamed attachments for better sorting ([A] prefix added) some fixes,
some strings moved to proper section
- Remington 870 added to new attachment system (weapon flashlight)
- Double-barrel shotgun will now spawns with pellets and has Doubleshot
option (maybe this will make it more popular?)
This commit is contained in:
ebaydayz
2016-07-10 15:25:36 -04:00
parent 4ff088c80c
commit 73d557806e
19 changed files with 628 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SQF/dayz_code/Configs/CfgMagazines/Attachments/SupBizon.hpp
View File

@@ -7,8 +7,8 @@ class Attachment_SupBizon : CA_Magazine
model = "z\addons\dayz_communityassets\models\surpressor.p3d";
picture = "\z\addons\dayz_communityassets\pictures\attachment_silencer.paa";
displayName = $STR_ATTACHMENT_NAME_SILENCER_BIZON;
descriptionShort = $STR_ATTACHMENT_DESC_SILENCER_BIZON;
displayName = $STR_DZ_ATT_SUP9BIZON_NAME;
descriptionShort = $STR_DZ_ATT_SUP9BIZON_DESC;
class ItemActions
{

4
SQF/dayz_code/Configs/CfgMagazines/Attachments/SupMakarov.hpp
View File

@@ -7,8 +7,8 @@ class Attachment_SupMakarov : CA_Magazine
model = "z\addons\dayz_communityassets\models\surpressor.p3d";
picture = "\z\addons\dayz_communityassets\pictures\attachment_silencer.paa";
displayName = $STR_ATTACHMENT_NAME_SILENCER_MAKAROV;
descriptionShort = $STR_ATTACHMENT_DESC_SILENCER_MAKAROV;
displayName = $STR_DZ_ATT_SUP9PM_NAME;
descriptionShort = $STR_DZ_ATT_SUP9PM_DESC;
class ItemActions
{

2
SQF/dayz_code/Configs/CfgMagazines/Magazines/45ACP.hpp
View File

@@ -2,6 +2,7 @@ class 7Rnd_45ACP_1911: CA_Magazine
{
model = "\dayz_equip\models\ammo_1911.p3d";
//picture = "\dayz_equip\textures\equip_1911_ca.paa";
displayName = $STR_DZ_MAG_7RND_45ACP_1911_NAME;
cartridgeName = "45ACP";
@@ -23,6 +24,7 @@ class 6Rnd_45ACP: CA_Magazine
{
model = "\dayz_equip\models\ammo_acp45.p3d";
//picture = "\dayz_equip\textures\equip_45acp_ca.paa";
displayName = $STR_DZ_MAG_6RND_45ACP_NAME;
cartridgeName = "45ACP";

4
SQF/dayz_code/Configs/CfgMagazines/Magazines/545x39.hpp
View File

@@ -1,7 +1,7 @@
class 30Rnd_545x39_AK : CA_Magazine
{
picture = "\z\addons\dayz_communityweapons\magazines\data\m_ak74_ca.paa";
displayName = $STR_DZ_MAG_30RND_545x39_AK_NAME;
cartridgeName = "545x39";
class ItemActions
@@ -13,7 +13,7 @@ class 30Rnd_545x39_AK : CA_Magazine
class 30Rnd_545x39_AKSD : 30Rnd_545x39_AK
{
picture = "\z\addons\dayz_communityweapons\magazines\data\m_ak74sd_ca.paa";
displayName = $STR_DZ_MAG_30RND_545x39_AKSD_NAME;
cartridgeName = "545x39_SD";
class ItemActions

7
SQF/dayz_code/Configs/CfgMagazines/Magazines/556x45.hpp
View File

@@ -1,5 +1,7 @@
class 200Rnd_556x45_M249: CA_Magazine
{
displayName = $STR_DZ_MAG_200RND_556X45_M249_NAME;
cartridgeName = "556x45";
type = WeaponSlotItem; // Only takes up one gear slot in Epoch
@@ -35,6 +37,7 @@ class 20Rnd_556x45_Stanag;
class 30Rnd_556x45_Stanag : 20Rnd_556x45_Stanag
{
//model = "\dayz_equip\models\mag30.p3d";
displayName = $STR_DZ_MAG_30RND_556x45_STANAG_NAME;
cartridgeName = "556x45";
@@ -60,6 +63,8 @@ class 30Rnd_556x45_Stanag : 20Rnd_556x45_Stanag
class 30Rnd_556x45_G36 : 30Rnd_556x45_Stanag
{
displayName = $STR_DZ_MAG_30RND_556x45_G36_NAME;
cartridgeName = "556x45";
class ItemActions
@@ -85,6 +90,7 @@ class 30Rnd_556x45_G36 : 30Rnd_556x45_Stanag
class 30Rnd_556x45_StanagSD : 30Rnd_556x45_Stanag
{
picture = "\z\addons\dayz_communityweapons\magazines\data\m_30stanagsd_ca.paa";
displayName = $STR_DZ_MAG_30RND_556x45_STANAGSD_NAME;
cartridgeName = "556x45_SD";
@@ -111,6 +117,7 @@ class 30Rnd_556x45_StanagSD : 30Rnd_556x45_Stanag
class 30Rnd_556x45_G36SD : 30Rnd_556x45_G36
{
picture = "\z\addons\dayz_communityweapons\magazines\data\m_g36sd_ca.paa";
displayName = $STR_DZ_MAG_30RND_556x45_G36SD_NAME;
cartridgeName = "556x45_SD";

3
SQF/dayz_code/Configs/CfgMagazines/Magazines/762x39.hpp
View File

@@ -4,7 +4,7 @@ class 30Rnd_762x39_AK47 : CA_Magazine
{
model = "z\addons\dayz_communityweapons\magazines\ak47.p3d";
picture = "\z\addons\dayz_communityweapons\magazines\data\m_ak47_ca.paa";
displayName = $STR_DZ_MAG_30RND_762X39_AK47;
displayName = $STR_DZ_MAG_30RND_762X39_AK47_NAME;
cartridgeName = "762x39";
@@ -42,6 +42,7 @@ class 75Rnd_762x39_RPK : 30Rnd_762x39_AK47
class 30Rnd_762x39_SA58 : CA_Magazine
{
model = "z\addons\dayz_communityweapons\magazines\vz58.p3d";
displayName = $STR_DZ_MAG_30RND_762X39_SA58_NAME;
cartridgeName = "762x39";

10
SQF/dayz_code/Configs/CfgMagazines/Magazines/762x51.hpp
View File

@@ -1,5 +1,7 @@
class 20Rnd_762x51_FNFAL : CA_Magazine
{
displayName = $STR_DZ_MAG_20RND_762X51_FNFAL_NAME;
cartridgeName = "762x51";
class ItemActions
@@ -11,6 +13,7 @@ class 20Rnd_762x51_FNFAL : CA_Magazine
class 20Rnd_762x51_DMR : CA_Magazine
{
model = "\dayz_equip\models\mag20.p3d";
displayName = $STR_DZ_MAG_20RND_762X51_DMR_NAME;
cartridgeName = "762x51";
@@ -20,7 +23,7 @@ class 20Rnd_762x51_DMR : CA_Magazine
class ReloadMag
{
text = "Split into 4 x M24";
text = $STR_MAG_SPLIT_4X5M24;
script = "spawn player_reloadMag;";
use[] = {"20Rnd_762x51_DMR"};
output[] = {"5Rnd_762x51_M24", "5Rnd_762x51_M24", "5Rnd_762x51_M24", "5Rnd_762x51_M24"};
@@ -31,6 +34,7 @@ class 20Rnd_762x51_DMR : CA_Magazine
class 5Rnd_762x51_M24 : CA_Magazine
{
model = "\dayz_equip\models\mag5rnd.p3d";
displayName = $STR_DZ_MAG_5RND_762X51_M24_NAME;
cartridgeName = "762x51";
@@ -40,7 +44,7 @@ class 5Rnd_762x51_M24 : CA_Magazine
class ReloadMag
{
text = "Combine for DMR";
text = $STR_MAG_CONV_M24_DMR;
script = "spawn player_reloadMag;";
use[] = {"5Rnd_762x51_M24", "5Rnd_762x51_M24", "5Rnd_762x51_M24", "5Rnd_762x51_M24"};
output[] = {"20Rnd_762x51_DMR"};
@@ -50,6 +54,8 @@ class 5Rnd_762x51_M24 : CA_Magazine
class 100Rnd_762x51_M240: CA_Magazine
{
displayName = $STR_DZ_MAG_100RND_762X51_M240_NAME;
cartridgeName = "762x51";
type = WeaponSlotItem; // Only takes up one gear slot in Epoch

3
SQF/dayz_code/Configs/CfgMagazines/Magazines/762x54r.hpp
View File

@@ -1,6 +1,7 @@
class 100Rnd_762x54_PK : CA_Magazine
{
model = "z\addons\dayz_communityweapons\magazines\pk.p3d";
displayName = $STR_DZ_MAG_100RND_762x54_PK_NAME;
cartridgeName = "762x54";
type = WeaponSlotItem; // Only takes up one gear slot in Epoch
@@ -23,6 +24,8 @@ class 50Rnd_762x54_UK59 : 100Rnd_762x54_PK
class 10Rnd_762x54_SVD : CA_Magazine
{
displayName = $STR_DZ_MAG_10RND_762x54_SVD_NAME;
cartridgeName = "762x54";
class ItemActions

2
SQF/dayz_code/Configs/CfgMagazines/Magazines/9x18.hpp
View File

@@ -1,5 +1,6 @@
class 8Rnd_9x18_Makarov : CA_Magazine
{
displayName = $STR_DZ_MAG_8RND_9X18_PM_NAME;
class ItemActions
{
COMBINE_MAG
@@ -9,6 +10,7 @@ class 8Rnd_9x18_Makarov : CA_Magazine
class 8Rnd_9x18_MakarovSD : 8Rnd_9x18_Makarov
{
picture = "\z\addons\dayz_communityweapons\magazines\data\m_makarovsd_ca.paa";
displayName = $STR_DZ_MAG_8RND_9X18_PMSD_NAME;
class ItemActions
{

28
SQF/dayz_code/Configs/CfgMagazines/Magazines/9x19.hpp
View File

@@ -2,6 +2,8 @@
class 30Rnd_9x19_UZI : CA_Magazine
{
displayName = $STR_DZ_MAG_30RND_9X19_UZI_NAME;
cartridgeName = "9x19";
class ItemActions
@@ -12,6 +14,8 @@ class 30Rnd_9x19_UZI : CA_Magazine
class 30Rnd_9x19_MP5 : CA_Magazine
{
displayName = $STR_DZ_MAG_30RND_9X19_MP5SD_NAME;
cartridgeName = "9x19";
class ItemActions
@@ -22,6 +26,8 @@ class 30Rnd_9x19_MP5 : CA_Magazine
class 30Rnd_9x19_UZI_SD : CA_Magazine
{
displayName = $STR_DZ_MAG_30RND_9X19_UZISD_NAME;
cartridgeName = "9x19_SD";
class ItemActions
@@ -34,6 +40,7 @@ class 30Rnd_9x19_MP5SD : CA_Magazine
{
model = "\ca\CommunityConfigurationProject_E\Gameplay_ActualModelsOfWeaponMagazinesVisibleOnTheGround\p3d\30Rnd_9x19_MP5.p3d";
picture = "\z\addons\dayz_communityweapons\magazines\data\m_mp5sd_ca.paa";
displayName = $STR_DZ_MAG_30RND_9X19_MP5_NAME;
cartridgeName = "9x19_SD";
@@ -49,6 +56,8 @@ class 30Rnd_9x19_MP5SD : CA_Magazine
class 15Rnd_9x19_M9 : CA_Magazine
{
displayName = $STR_DZ_MAG_15RND_9X19_M9_NAME;
cartridgeName = "9x19";
class ItemActions
@@ -75,6 +84,7 @@ class 17Rnd_9x19_glock17 : CA_Magazine
{
model = "z\addons\dayz_communityweapons\magazines\g17.p3d";
picture = "\z\addons\dayz_communityweapons\magazines\data\m_glock17_ca.paa";
displayName = $STR_DZ_MAG_17RND_9X19_GLOCK17_NAME;
cartridgeName = "9x19";
@@ -99,10 +109,11 @@ class 17Rnd_9x19_glock17 : CA_Magazine
};
class 15Rnd_9x19_M9SD : 15Rnd_9x19_M9
{
cartridgeName = "9x19_SD";
{
picture = "\z\addons\dayz_communityweapons\magazines\data\m_m9sd_ca.paa";
displayName = $STR_DZ_MAG_15RND_9X19_M9SD_NAME;
cartridgeName = "9x19_SD";
class ItemActions
{
@@ -126,14 +137,13 @@ class 15Rnd_9x19_M9SD : 15Rnd_9x19_M9
class 17Rnd_9x19_glock17SD : 15Rnd_9x19_M9SD
{
picture = "\z\addons\dayz_communityweapons\magazines\data\m_glock17sd_ca.paa";
displayName = $STR_DZ_MAG_17RND_9X19_GLOCK17SD;
count = 17;
picture = "\z\addons\dayz_communityweapons\magazines\data\m_glock17sd_ca.paa";
displayName = $STR_DZ_MAG_17RND_9X19_GLOCK17SD_NAME;
cartridgeName = "9x19_SD";
count = 17;
class ItemActions
{
COMBINE_MAG
@@ -161,6 +171,7 @@ class 17Rnd_9x19_glock17SD : 15Rnd_9x19_M9SD
class 64Rnd_9x19_Bizon : CA_Magazine
{
model = "z\addons\dayz_communityweapons\magazines\bizon.p3d";
displayName = $STR_DZ_MAG_64RND_9X19_BIZON_NAME;
cartridgeName = "9x19";
@@ -173,6 +184,7 @@ class 64Rnd_9x19_Bizon : CA_Magazine
class 64Rnd_9x19_SD_Bizon : CA_Magazine
{
picture = "\z\addons\dayz_communityweapons\magazines\data\m_bizonsd_ca.paa";
displayName = $STR_DZ_MAG_64RND_9X19_BIZONSD_NAME;
cartridgeName = "9x19_SD";

8
SQF/dayz_code/Configs/CfgMagazines/Magazines/Misc.hpp
View File

@@ -2,6 +2,9 @@
class 5x_22_LR_17_HMR;
class 5Rnd_17HMR : 5x_22_LR_17_HMR
{
displayName = $STR_DZ_MAG_5RND_17HMR_NAME;
descriptionShort = $STR_DZ_MAG_5RND_17HMR_DESC;
model = "\dayz_equip\models\mag5rnd.p3d";
class ItemActions
@@ -15,6 +18,7 @@ class 10x_303;
class 10Rnd_303British : 10x_303
{
model = "\dayz_equip\models\mag10rnd.p3d";
displayName = $STR_DZ_MAG_10RND_303BRITISH_NAME;
class ItemActions
{
@@ -29,8 +33,8 @@ class 15Rnd_W1866_Slug : CA_Magazine
model = "\z\addons\dayz_communityassets\models\winammo.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_winammo_ca.paa";
displayName = $STR_MAG_NAME_2;
descriptionShort = $STR_MAG_DESC_2;
displayName = $STR_DZ_MAG_15RND_W1866_NAME;
descriptionShort = $STR_DZ_MAG_15RND_W1866_DESC;
ammo = B_1866_Slug;
count = 15;

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

@@ -5,6 +5,8 @@ class 8Rnd_12Gauge_Slug : 8Rnd_B_Beneli_74Slug
{
model = "\z\addons\dayz_communityassets\models\greenshotgunslugs.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_greenshotgunslugs_ca.paa";
displayName = $STR_DZ_MAG_8RND_12GAUGE_SLUG_NAME;
descriptionShort = $STR_DZ_MAG_8RND_12GAUGE_SLUG_DESC;
cartridgeName = "12Gauge_Slug";
@@ -14,7 +16,7 @@ class 8Rnd_12Gauge_Slug : 8Rnd_B_Beneli_74Slug
class ReloadMag
{
text = "Split into 4 x 2 rounds";
text = $STR_MAG_SPLIT_8TO2X4;
script = "spawn player_reloadMag;";
use[] = {"8Rnd_12Gauge_Slug"};
output[] =
@@ -32,8 +34,8 @@ class 2Rnd_12Gauge_Slug : 8Rnd_12Gauge_Slug
{
model = "\z\addons\dayz_communityassets\models\2shells_slugshot.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_2shells_slugshot_CA.paa";
displayName = $STR_MAG_NAME_8;
descriptionShort = $STR_MAG_DESC_8;
displayName = $STR_DZ_MAG_2RND_12GAUGE_SLUG_NAME;
descriptionShort = $STR_DZ_MAG_2RND_12GAUGE_SLUG_DESC;
count = 2;
@@ -43,7 +45,7 @@ class 2Rnd_12Gauge_Slug : 8Rnd_12Gauge_Slug
class ReloadMag
{
text = $STR_MAG_COMBINE_1;
text = $STR_MAG_COMBINE_2X4IN8;
script = "spawn player_reloadMag;";
use[] =
{
@@ -69,6 +71,8 @@ class 8Rnd_12Gauge_Buck : 8Rnd_B_Beneli_Pellets
{
model = "\z\addons\dayz_communityassets\models\redshotgunpellets.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_redshotgunpellets_ca.paa";
displayName = $STR_DZ_MAG_8RND_12GAUGE_BUCK_NAME;
descriptionShort = $STR_DZ_MAG_8RND_12GAUGE_BUCK_DESC;
class ItemActions
{
@@ -76,7 +80,7 @@ class 8Rnd_12Gauge_Buck : 8Rnd_B_Beneli_Pellets
class ReloadMag
{
text = "Split into 4 x 2 rounds";
text = $STR_MAG_SPLIT_8TO2X4;
script = "spawn player_reloadMag;";
use[] = {"8Rnd_12Gauge_Buck"};
output[] =
@@ -94,8 +98,8 @@ class 2Rnd_12Gauge_Buck : 8Rnd_12Gauge_Buck
{
model = "\z\addons\dayz_communityassets\models\2shells_slugshot.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_2shells_pellet_ca.paa";
displayName = $STR_MAG_NAME_9;
descriptionShort = $STR_MAG_DESC_9;
displayName = $STR_DZ_MAG_2RND_12GAUGE_BUCK_NAME;
descriptionShort = $STR_DZ_MAG_2RND_12GAUGE_BUCK_DESC;
count = 2;
@@ -105,7 +109,7 @@ class 2Rnd_12Gauge_Buck : 8Rnd_12Gauge_Buck
class ReloadMag
{
text = $STR_MAG_COMBINE_1;
text = $STR_MAG_COMBINE_2X4IN8;
script = "spawn player_reloadMag;";
use[] =
{