Update smokes and flares

SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp

@@ -162,6 +162,8 @@ AmmoUS[] =
 	{Loot_MAGAZINE,		1,		FlareWhite_M203},
 	{Loot_MAGAZINE,		1,		FlareGreen_M203},
 	{Loot_MAGAZINE,		1,		1Rnd_Smoke_M203},
+	{Loot_MAGAZINE,		1,		1Rnd_SmokeRed_M203},
+	{Loot_MAGAZINE,		1,		1Rnd_SmokeGreen_M203},
 	
 	// Hand grenades
 	{Loot_MAGAZINE,		1,		SmokeShell},
@@ -225,11 +227,12 @@ AmmoEU[] =
 	{Loot_MAGAZINE,		1,		FlareWhite_M203},
 	{Loot_MAGAZINE,		1,		FlareGreen_M203},
 	{Loot_MAGAZINE,		1,		1Rnd_Smoke_M203},
+	{Loot_MAGAZINE,		1,		1Rnd_SmokeYellow_M203},
 	
 	// Hand grenades
-	{Loot_MAGAZINE,		1,		SmokeShell},
+	{Loot_MAGAZINE,		1,		SmokeShellYellow},
-	{Loot_MAGAZINE,		1,		SmokeShellRed},
+	{Loot_MAGAZINE,		1,		SmokeShellBlue},
-	{Loot_MAGAZINE,		1,		SmokeShellGreen},
+	{Loot_MAGAZINE,		1,		SmokeShellOrange},
 	{Loot_MAGAZINE,		1,		HandGrenade_West}
 };
 

SQF/dayz_code/Configs/CfgMagazines/CfgMagazines.hpp

@@ -37,19 +37,6 @@ class CfgMagazines
 	//Consumables: food, drinks etc.
 	#include "Consumables\Consumables.hpp"
 	
-	/*class 5Rnd_86x70_L115A1: CA_Magazine //.338 Lapua Magnum
-	{
-		scope = 2;
-		displayName = $STR_BAF_CFGMAGAZINES_5RND_86X70_L115A10;
-		descriptionShort = $STR_BAF_CFGMAGAZINES_5RND_86X70_L115A10_0;
-		ammo=B_86x70_Ball_noTracer;
-		count=5;
-		initSpeed = 936; //TODO
-		picture="\CA\weapons_BAF\data\UI\M_lrr_CA.paa"; 
-		// descriptionShort = $STR_DSS_10RND_M107; TODO
-	};*/
-	
-	
 	//EPOCH ADDITIONS
 	
 	#include "VehicleAmmo.hpp"

SQF/dayz_code/Configs/CfgMagazines/Magazines/Grenades.hpp

@@ -164,6 +164,7 @@ class FlareWhite_GP25: CA_Magazine {
 	scope = 2;
 	type = 16;
 	displayName = "$STR_DN_FLAREWHITE_GP25";
+	descriptionShort = "$str_dss_1rnd_flarewhite_gp25";
 	picture = "\Ca\weapons_E\Data\icons\M_GP25_white_CA.paa";
 	model = "\z\addons\dayz_epoch_w\magazine\dze_gp_flare.p3d";
 	ammo = "F_40mm_White";

SQF/dayz_code/Configs/CfgServerTrader/Category/Ammunition.hpp

@@ -133,8 +133,17 @@ class Category_25 {
 	class SmokeShellGreen {type = "trade_items";buy[] = {2,"ItemSilverBar"};sell[] = {1,"ItemSilverBar"};};
 	class SmokeShellRed {type = "trade_items";buy[] = {2,"ItemSilverBar"};sell[] = {1,"ItemSilverBar"};};
 	class SmokeShellYellow {type = "trade_items";buy[] = {2,"ItemSilverBar"};sell[] = {1,"ItemSilverBar"};};
+	class SmokeShellPurple {type = "trade_items";buy[] = {2,"ItemSilverBar"};sell[] = {1,"ItemSilverBar"};};
+	class SmokeShellBlue {type = "trade_items";buy[] = {2,"ItemSilverBar"};sell[] = {1,"ItemSilverBar"};};
+	class SmokeShellOrange {type = "trade_items";buy[] = {2,"ItemSilverBar"};sell[] = {1,"ItemSilverBar"};};
 	class 1Rnd_Smoke_M203 {type = "trade_items";buy[] = {4,"ItemSilverBar"};sell[] = {2,"ItemSilverBar"};};
+	class 1Rnd_SmokeYellow_M203 {type = "trade_items";buy[] = {4,"ItemSilverBar"};sell[] = {2,"ItemSilverBar"};};
+	class 1Rnd_SmokeGreen_M203 {type = "trade_items";buy[] = {4,"ItemSilverBar"};sell[] = {2,"ItemSilverBar"};};
+	class 1Rnd_SmokeRed_M203 {type = "trade_items";buy[] = {4,"ItemSilverBar"};sell[] = {2,"ItemSilverBar"};};
 	class 1Rnd_Smoke_GP25 {type = "trade_items";buy[] = {4,"ItemSilverBar"};sell[] = {2,"ItemSilverBar"};};
+	class 1Rnd_SmokeRed_GP25 {type = "trade_items";buy[] = {4,"ItemSilverBar"};sell[] = {2,"ItemSilverBar"};};
+	class 1Rnd_SmokeYellow_GP25 {type = "trade_items";buy[] = {4,"ItemSilverBar"};sell[] = {2,"ItemSilverBar"};};
+	class 1Rnd_SmokeGreen_GP25 {type = "trade_items";buy[] = {4,"ItemSilverBar"};sell[] = {2,"ItemSilverBar"};};
 };
 
 //Chem-lites/Flares

SQF/dayz_code/stringtable.xml

@@ -15101,6 +15101,17 @@
 			<Polish>Kaliber: 7.62x51mm &lt;br/&gt;Naboje: 5 &lt;br/&gt;Używane w: M24, M40</Polish>
 			<Hungarian>Kaliber: 7.62x51mm &lt;br/&gt; Töltények: 5 &lt;br/&gt; Hozzá tartozó fegyver: M24, M40</Hungarian>
         </Key>		
+        <Key ID="str_dss_1rnd_flarewhite_gp25">
+			<English>Type: Flare &lt;br/&gt;Rounds: 1 &lt;br/&gt;Used in: GP-25 grenade launcher</English>
+			<French>Type: Fusée &lt;br/&gt;Munitions : 1 &lt;br/&gt;Utilisé avec : lance-grenades GP-25</French>
+			<Spanish>Tipo: Bengala &lt;br/&gt;Cargas: 1 &lt;br/&gt;Uso: lanzagranadas GP-25</Spanish>
+			<Italian>Tipo: Razzo luminoso &lt;br/&gt;Munizioni: 1 &lt;br/&gt;Si usa in: lanciagranate GP-25</Italian>
+			<Hungarian>Típus: Jelzőfény &lt;br/&gt; Lőszer: 1 &lt;br/&gt; Hozzá tartozó fegyver: GP-25 gránátvető</Hungarian>
+			<Polish>Typ: Flara &lt;br/&gt;Naboje: 1 &lt;br/&gt;Używane w: granatnik GP-25</Polish>
+			<Russian>Тип: сигнальная ракета &lt;br/&gt;Количество: 1 &lt;br/&gt;Используется в: ГП-25</Russian>
+			<German>Typ: Leuchtgeschoss &lt;br/&gt;Schuss: 1 &lt;br/&gt;Verwendet in: GP-25 Granatwerfer</German>
+			<Czech>Typ: světlice &lt;br/&gt;Nábojů: 1 &lt;br/&gt;Pro: granátomet GP-25</Czech>			
+        </Key>	
 		
 		<!-- **** Vehicle Ammo **** -->