W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-04 23:32:53 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Credit updates for Sound Files.

Browse Source 
Vanilla development commits:

e578c6cb39

c575f09c4b

Also synced spacing and tabs from:

73d557806e
This commit is contained in:
ebaydayz
2016-07-10 16:44:07 -04:00
parent 73d557806e
commit da5c5bf6cc
17 changed files with 52 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +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
@@ -64,7 +64,7 @@ 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
@@ -91,7 +91,7 @@ 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";
class ItemActions

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

@@ -3,7 +3,7 @@
class 30Rnd_9x19_UZI : CA_Magazine
{
displayName = $STR_DZ_MAG_30RND_9X19_UZI_NAME;
cartridgeName = "9x19";
class ItemActions
@@ -15,7 +15,7 @@ class 30Rnd_9x19_UZI : CA_Magazine
class 30Rnd_9x19_MP5 : CA_Magazine
{
displayName = $STR_DZ_MAG_30RND_9X19_MP5SD_NAME;
cartridgeName = "9x19";
class ItemActions
@@ -27,7 +27,7 @@ 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
@@ -41,7 +41,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";
class ItemActions
@@ -109,7 +109,7 @@ class 17Rnd_9x19_glock17 : CA_Magazine
};
class 15Rnd_9x19_M9SD : 15Rnd_9x19_M9
{
{
picture = "\z\addons\dayz_communityweapons\magazines\data\m_m9sd_ca.paa";
displayName = $STR_DZ_MAG_15RND_9X19_M9SD_NAME;
@@ -137,11 +137,11 @@ 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";
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
@@ -172,7 +172,7 @@ class 64Rnd_9x19_Bizon : CA_Magazine
{
model = "z\addons\dayz_communityweapons\magazines\bizon.p3d";
displayName = $STR_DZ_MAG_64RND_9X19_BIZON_NAME;
cartridgeName = "9x19";
class ItemActions
@@ -185,6 +185,7 @@ 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";

10
SQF/dayz_code/Configs/CfgWeapons/Rifles/Remington870.hpp
View File

@@ -25,10 +25,6 @@ class Remington870_DZ : Rifle
2Rnd_12Gauge_Slug,
2Rnd_12Gauge_Buck
};
class Attachments
{
Attachment_FL = "Remington870_FL_DZ";
};
handAnim[] = {"OFP2_ManSkeleton", "\Ca\weapons_E\Data\Anim\LeeEnfield.rtm"};
@@ -50,6 +46,10 @@ class Remington870_DZ : Rifle
recoil = "recoil_single_primary_9outof10";
recoilProne = "recoil_single_primary_prone_8outof10";
};
class Attachments
{
Attachment_FL = "Remington870_FL_DZ";
};
};
class Remington870_FL_DZ : Remington870_DZ
@@ -59,7 +59,7 @@ class Remington870_FL_DZ : Remington870_DZ
descriptionShort = $STR_DZ_WPN_R870_FL_DESC;
R870_FLASHLIGHT;
class ItemActions
{
class RemoveFlashlight

1
SQF/dayz_code/credits.txt
View File

@@ -75,6 +75,7 @@ feature.
* [Nick Chow] (https://github.com/Purplish)
* bittedanke (https://github.com/bittedanke) - fixing a problem with chances.
* ebaydayz (https://github.com/ebaydayz)
* xyberviri (https://github.com/xyberviri) - ((action_open_backpack_0.ogg - action_open_backpack_4.ogg), (action_open_inventory_0.ogg - action_open_inventory_4.ogg)) Licesne Info - https://github.com/DayZMod/DayZ/issues/696
------------------------
Art Work

4
SQF/dayz_code/stringtable.xml
View File

@@ -3225,7 +3225,7 @@
<Czech>Puškohled, používá se pro vylepšení zbraní.</Czech>
<German>Zielfernrohr-Erweiterung für Schusswaffen.</German>
</Key>
<Key ID="STR_ATTACHMENT_NAME_SILENCER_M9">
<English>[A] Silencer (M9)</English>
<Russian>[М] 9мм глуш. (М9)</Russian>
@@ -3250,7 +3250,7 @@
<Czech>Tlumič, používá se pro vylepšení M4A1, jež již má CCO a kamufláž.</Czech>
<German>Ein Schalldämpfer, der an eine M4A1 angebracht werden kann.</German>
</Key>
<Key ID="STR_ATTACHMENT_NAME_SILENCER_SCAR">
<English>[A] Silencer (SCAR)</English>
<Russian>[М] ПБС (SCAR)</Russian>