Merge pull request #2 from DayZMod/Development

Sync with base
DayZMod · Jul 19, 2016 · 9ceff6d · 9ceff6d
2 parents c36e5f1 + 4881e00
commit 9ceff6d
Show file tree

Hide file tree

Showing 91 changed files with 1,687 additions and 984 deletions.
diff --git a/Documentation/Credits.md b/Documentation/Credits.md
@@ -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)) License Info - https://github.com/DayZMod/DayZ/issues/696
 
 ------------------------
 Art Work

diff --git a/SQF/credits.txt b/SQF/credits.txt
@@ -4,8 +4,26 @@ Community Dev Project Managers:
 * [R4Z0R49] - (https://github.com/R4Z0R49)
 * [AlbyBDPK] - (https://github.com/AlbyBDPK)
 
+-------------------------
+Current Contributions
+-------------------------
+
+These contributors have made many changes, over a fairly long time span, or
+for many different parts of the code.
+
+ * kichilron (https://github.com/kichilron)
+ * [JST](https://github.com/Cybersam248)
+ * [DDesmond] (https://github.com/ddesmond)
+ * Skinkicker
+ * Maca
+ * Andrew
+ * William
+ * cyrq (https://github.com/cyrq)
+ * markus.ua (Russian Translations)
+ * Illetier (German Translations)
+
 ------------------------
-Contributions
+Past Contributions
 ------------------------
 
 These contributors have made specific changes for a particular bug fix or
@@ -54,19 +72,10 @@ feature.
  * Aj (Leadz)
  * Ander
  * Shauneh
- * kichilron (https://github.com/kichilron)
- * [JST](https://github.com/Cybersam248)
- * [DDesmond] (https://github.com/ddesmond)
- * Skinkicker
- * Maca
- * Andrew
- * William
- * cyrq (https://github.com/cyrq)
- * markus.ua (Russian Translations)
- * Illetier (German Translations)
- * ILoveBeans (https://github.com/ILoveBeans)
- * Flamberg (https://github.com/Flamberg)
-
+ * [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)) License Info - https://github.com/DayZMod/DayZ/issues/696
 
 ------------------------
 Art Work

diff --git a/SQF/dayz_buildings/configs/ItemDIYBooks.hpp b/SQF/dayz_buildings/configs/ItemDIYBooks.hpp
@@ -1,5 +1,5 @@
 // Devlopment only system - Comment out for stable (Search KeyWord - VERSION)
-//#define _Devlopment_
+#define _Devlopment_
 
 class ItemDIY_wood: ItemCore {
 	scope = 2;

diff --git a/SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp b/SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp
@@ -14,14 +14,14 @@ class CfgLoot
 		#define DZ_BP_Czech DZ_CivilBackpack_EP1
 		#define DZ_BP_Coyote DZ_Backpack_EP1
 
-		#define ItemBloodbagAPos bloodBagAPos
-		#define ItemBloodbagANeg bloodBagANeg
-		#define ItemBloodbagBPos bloodBagBPos
-		#define ItemBloodbagBNeg bloodBagBNeg
-		#define ItemBloodbagABPos bloodBagABPos
-		#define ItemBloodbagABNeg bloodBagABNeg
-		#define ItemBloodbagOPos bloodBagOPos
-		#define ItemBloodbagONeg bloodBagONeg
+		#define ItemBloodbagAPos bloodBagAPOS
+		#define ItemBloodbagANeg bloodBagANEG
+		#define ItemBloodbagBPos bloodBagBPOS
+		#define ItemBloodbagBNeg bloodBagBNEG
+		#define ItemBloodbagABPos bloodBagABPOS
+		#define ItemBloodbagABNeg bloodBagABNEG
+		#define ItemBloodbagOPos bloodBagOPOS
+		#define ItemBloodbagONeg bloodBagONEG
 
 		#define ItemBloodTester bloodTester
 		#define ItemTransfusionKit transfusionKit

diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/SupBizon.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/SupBizon.hpp
@@ -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
 	{

diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/SupMakarov.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/SupMakarov.hpp
@@ -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
 	{

diff --git a/SQF/dayz_code/Configs/CfgMagazines/Consumables/Soda.hpp b/SQF/dayz_code/Configs/CfgMagazines/Consumables/Soda.hpp
@@ -251,7 +251,7 @@ class ItemSherbet : ItemSoda
 	model = "z\addons\dayz_communityassets\models\soda_sherbet_clean_full.p3d";
 	picture = "\z\addons\dayz_communityassets\pictures\equip_soda_sherbet_clean_full_ca.paa";
 	displayName = $STR_ITEMSODA_FULL_CLEAN_CODE_NAME_15;
-	descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_NAME_15;
+	descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_15;
 
 	Nutrition[] = {90,0,500,0};
 

diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/45ACP.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/45ACP.hpp
@@ -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";
 

diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/545x39.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/545x39.hpp
@@ -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

diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/556x45.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/556x45.hpp
@@ -1,5 +1,7 @@
 class 200Rnd_556x45_M249: CA_Magazine
 {
+	displayName = $STR_DZ_MAG_200RND_556X45_M249_NAME;
+
 	cartridgeName = "556x45";
 
 	class ItemActions
@@ -22,6 +24,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";
 
@@ -47,6 +50,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
@@ -72,7 +77,8 @@ 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";
 
 	class ItemActions
@@ -98,6 +104,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";
 

diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x39.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x39.hpp
@@ -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";
 

diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x51.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x51.hpp
@@ -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";
 
 	class ItemActions

diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x54r.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x54r.hpp
@@ -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";
 
@@ -22,6 +23,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

diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/9x18.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/9x18.hpp
@@ -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
 	{

diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/9x19.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/9x19.hpp
@@ -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_MP5_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,7 +40,8 @@ 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_MP5SD_NAME;
+
 	cartridgeName = "9x19_SD";
 
 	class ItemActions
@@ -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";
 
@@ -100,9 +110,10 @@ 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
 	{
@@ -127,12 +138,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";
-
-	displayName = $STR_DZ_MAG_17RND_9X19_GLOCK17SD;
-
-	count = 17;
+	displayName = $STR_DZ_MAG_17RND_9X19_GLOCK17SD_NAME;
 
 	cartridgeName = "9x19_SD";
+
+	count = 17;
 
 	class ItemActions
 	{
@@ -161,7 +171,8 @@ 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";
 
 	class ItemActions
@@ -173,6 +184,8 @@ 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";