Merge pull request #753 from Sparker95/development

Version 0.53
Sparker95 · Nov 11, 2020 · 4a2035b · 4a2035b
2 parents 0efe56a + 36894e0
commit 4a2035b
Show file tree

Hide file tree

Showing 157 changed files with 241,221 additions and 129,449 deletions.
diff --git a/.gitignore b/.gitignore
@@ -31,11 +31,12 @@ src/config/user_local_config.hpp
 ~*
 editing.*
 *.preproc
-Vindicta.*/init.sqf
-Vindicta.*/cba_settings.sqf
-Vindicta.*/onPlayerRespawn.sqf
-Vindicta.*/description.ext
-Vindicta.*/stringtable.xml
+Vindicta*.*/init.sqf
+Vindicta*.*/cba_settings.sqf
+Vindicta*.*/onPlayerRespawn.sqf
+Vindicta*.*/description.ext
+Vindicta*.*/stringtable.xml
+Vindicta*.*/pboVariant.hpp
 
 #ADDON
 

diff --git a/StaticGunMarkup.VR/mission.sqm b/StaticGunMarkup.VR/mission.sqm
@@ -0,0 +1,204 @@
+version=53;
+class EditorData
+{
+	moveGridStep=2;
+	angleGridStep=0.2617994;
+	scaleGridStep=1;
+	autoGroupingDist=10;
+	toggles=578;
+	class ItemIDProvider
+	{
+		nextID=10;
+	};
+	class Camera
+	{
+		pos[]={29.097462,30.382195,101.04221};
+		dir[]={-0.053726986,-0.35692701,-0.93270844};
+		up[]={-0.020544222,0.93393886,-0.35672948};
+		aside[]={-0.99841779,3.2785001e-006,0.057502706};
+	};
+};
+binarizationWanted=0;
+addons[]=
+{
+	"A3_Structures_F_Mil_Cargo",
+	"A3_Static_F"
+};
+class AddonsMetaData
+{
+	class List
+	{
+		items=2;
+		class Item0
+		{
+			className="A3_Structures_F_Mil";
+			name="Arma 3 - Military Buildings and Structures";
+			author="Bohemia Interactive";
+			url="https://www.arma3.com";
+		};
+		class Item1
+		{
+			className="A3_Static_F";
+			name="Arma 3 Alpha - Turrets";
+			author="Bohemia Interactive";
+			url="https://www.arma3.com";
+		};
+	};
+};
+randomSeed=1103247;
+class ScenarioData
+{
+	author="Sparker";
+};
+class Mission
+{
+	class Intel
+	{
+		timeOfChanges=1800.0002;
+		startWeather=0;
+		startWind=0.1;
+		startWaves=0.1;
+		forecastWeather=0;
+		forecastWind=0.1;
+		forecastWaves=0.1;
+		forecastLightnings=0.1;
+		wavesForced=1;
+		windForced=1;
+		year=2035;
+		day=28;
+		hour=13;
+		minute=37;
+		startFogDecay=0.014;
+		forecastFogDecay=0.014;
+	};
+	class Entities
+	{
+		items=8;
+		class Item0
+		{
+			dataType="Object";
+			class PositionInfo
+			{
+				position[]={15.984385,17.886209,47.836243};
+			};
+			side="Empty";
+			flags=5;
+			class Attributes
+			{
+			};
+			id=0;
+			type="Land_Cargo_Tower_V3_F";
+		};
+		class Item1
+		{
+			dataType="Object";
+			class PositionInfo
+			{
+				position[]={37.962921,9.9050007,47.535946};
+			};
+			side="Empty";
+			flags=5;
+			class Attributes
+			{
+			};
+			id=1;
+			type="Land_Cargo_Patrol_V3_F";
+		};
+		class Item2
+		{
+			dataType="Object";
+			class PositionInfo
+			{
+				position[]={20.992947,24.549778,46.953659};
+				angles[]={0,1.5706688,0};
+			};
+			side="Empty";
+			flags=4;
+			class Attributes
+			{
+			};
+			id=4;
+			type="B_HMG_01_high_F";
+		};
+		class Item3
+		{
+			dataType="Object";
+			class PositionInfo
+			{
+				position[]={13.031603,24.463329,43.043339};
+				angles[]={0,3.1603746,0};
+			};
+			side="Empty";
+			class Attributes
+			{
+			};
+			id=5;
+			type="B_HMG_01_high_F";
+			atlOffset=0.43844414;
+		};
+		class Item4
+		{
+			dataType="Object";
+			class PositionInfo
+			{
+				position[]={12.17606,24.549778,52.240131};
+				angles[]={0,0.0035524201,0};
+			};
+			side="Empty";
+			flags=4;
+			class Attributes
+			{
+			};
+			id=6;
+			type="B_HMG_01_high_F";
+		};
+		class Item5
+		{
+			dataType="Object";
+			class PositionInfo
+			{
+				position[]={20.445402,24.549778,51.478111};
+				angles[]={0,0.86362177,0};
+			};
+			side="Empty";
+			flags=4;
+			class Attributes
+			{
+			};
+			id=7;
+			type="B_HMG_01_high_F";
+		};
+		class Item6
+		{
+			dataType="Object";
+			class PositionInfo
+			{
+				position[]={36.66058,11.004334,46.686123};
+				angles[]={0,3.1733482,0};
+			};
+			side="Empty";
+			flags=4;
+			class Attributes
+			{
+			};
+			id=8;
+			type="B_HMG_01_high_F";
+		};
+		class Item7
+		{
+			dataType="Object";
+			class PositionInfo
+			{
+				position[]={39.219986,11.004333,46.607414};
+				angles[]={0,3.1480174,0};
+			};
+			side="Empty";
+			flags=4;
+			class Attributes
+			{
+			};
+			id=9;
+			type="B_HMG_01_high_F";
+		};
+	};
+};
diff --git a/Vindicta-Addon/addons/items/CfgMagazines.hpp b/Vindicta-Addon/addons/items/CfgMagazines.hpp
@@ -8,8 +8,8 @@ class CfgMagazines
 		mass=0;
 		scope=2;
 		count = 1;
-		displayName="Military documents";
-		descriptionShort = "A few military documents. Pick it up to study the intel.";
+		displayName=$STR_ITEM_DOCUMENTS;
+		descriptionShort = $STR_ITEM_DOCUMENTS_DESC_1;
 		picture = QPATHTOF(icons\inv_ic_mildocs1.paa);
 		model = "\A3\Structures_F_EPC\Items\Documents\Document_01_F.p3d";
 	};
@@ -19,8 +19,8 @@ class CfgMagazines
 		mass=0;
 		scope=2;
 		count = 1;
-		displayName="Military documents";
-		descriptionShort = "Some military documents. Pick it up to study the intel.";
+		displayName=$STR_ITEM_DOCUMENTS;
+		descriptionShort = $STR_ITEM_DOCUMENTS_DESC_2;
 		picture = QPATHTOF(icons\inv_ic_mildocs2.paa);
 		model = "\A3\Structures_F\Items\Documents\FilePhotos_F.p3d";
 	};
@@ -30,8 +30,8 @@ class CfgMagazines
 		mass = 0.1;
 		scope=2;
 		count = 1;
-		displayName="Tactical tablet";
-		descriptionShort = "A military tactical tablet. Pick it up to study the intel.";
+		displayName=$STR_ITEM_TACTICAL_TABLET;
+		descriptionShort = $STR_ITEM_TACTICAL_TABLET_DESC;
 		picture = QPATHTOF(icons\inv_ic_tabletTactical.paa);
 		model = "\A3\Props_F_Exp_A\Military\Equipment\Tablet_02_F.p3d";
 	};
@@ -41,8 +41,8 @@ class CfgMagazines
 		mass = 0.1;
 		scope=2;
 		count = 1;
-		displayName="Personal tablet";
-		descriptionShort = "A personal tablet. Pick it up to study the intel";
+		displayName=$STR_ITEM_PERSONAL_TABLET;
+		descriptionShort = $STR_ITEM_PERSONAL_TABLET_DESC;
 		picture = QPATHTOF(icons\inv_ic_tabletWhite.paa);
 		model = "\A3\Structures_F_Heli\Items\Electronics\Tablet_01_F.p3d";
 	};
@@ -59,8 +59,8 @@ class CfgMagazines
 		count = 1; // Ammount of bullets, we make it so that one box = one box in the arsenal, ok?
 		mass = 8; // In arma it's really volume, not mass
 		scope=2;
-		displayName="Construction resources";
-		descriptionShort = "Resources to build different things";
+		displayName=$STR_ITEM_CONSTRUCTION_RESOURCES;
+		descriptionShort = $STR_ITEM_CONSTRUCTION_RESOURCES_DESC;
 		picture = "\A3\EditorPreviews_F_Orange\Data\CfgVehicles\Land_Brick_01_F.jpg";
 		hiddenSelections[] = {};
 		hiddenSelectionsTextures[] = {};
@@ -72,8 +72,8 @@ class CfgMagazines
 		count = 1;
 		mass = 0.1;
 		scope = 2;
-		displayName="Strange pills";
-		descriptionShort = "!! Don't use it if you can't tolerate flashing images !! Double-click to use. Carefully.";
+		displayName=$STR_ITEM_STRANGE_PILLS;
+		descriptionShort = $STR_ITEM_STRANGE_PILLS_DESC;
 		picture = QPATHTOF(icons\inv_ic_pills.paa);
 		model = "\A3\Structures_F_EPA\Items\Medical\Antibiotic_F.p3d";
 	};