removed rpg launcher and changed alt-shift-click to shift-click

whistleman · Jul 30, 2016 · 288ee74 · 288ee74
1 parent 2f01e2d
commit 288ee74
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 31 deletions.
diff --git a/Functions/fn_SelectStartingPoint.sqf b/Functions/fn_SelectStartingPoint.sqf
@@ -10,7 +10,7 @@ _pos   = _mapclickparams select 0;
 _shift = _mapclickparams select 2;
 _alt   = _mapclickparams select 3;
 
-if (_alt && _shift) then {
+if (_shift) then {
 	// Remove map
 	_tagged unassignItem "itemmap";
 	_tagged removeItem "itemmap";

diff --git a/Functions/fn_showHint.sqf b/Functions/fn_showHint.sqf
@@ -10,11 +10,11 @@ if (typename _tagger == "STRING") then {
 
 		CASE "start": {
 			systemchat format ["Goodluck everyone! %1 is the first tagger", name _tagged];
-			systemchat format ["%1 may choose a starting position on the map by alt-shift-clicking on a position on the map.", name _tagged];
+			systemchat format ["%1 may choose a starting position on the map by shift-clicking on a position on the map.", name _tagged];
 		};
 
 		case "wrongclick":	{
-			if (player == _tagged) then {systemchat format ["%1, you did not use alt-shift-click!", _tagged];};
+			if (player == _tagged) then {systemchat format ["%1, you did not use shift-click!", _tagged];};
 		};
 
 		case "run":			{

diff --git a/description.ext b/description.ext
@@ -45,8 +45,8 @@ class Params
 	class WIS_Weapon
 	{
 		title 		= "Weapon";
-		texts[] 	= {"ACP-C2 .45"  ,"Zubr .45 with sight"          ,"Vermin SMG .45 ACP","Sting 9 mm with sight","MXC 6.5 mm"    ,"MXM 6.5 mm with RCO sight","GM6 Lynx 12.7 mm" ,"RPG-42 Alamut"};
-		values[]	= {0,1,2,3,4,5,6,7};
+		texts[] 	= {"ACP-C2 .45"  ,"Zubr .45 with sight"          ,"Vermin SMG .45 ACP","Sting 9 mm with sight","MXC 6.5 mm"    ,"MXM 6.5 mm with RCO sight","GM6 Lynx 12.7 mm"};
+		values[]	= {0,1,2,3,4,5,6};
 		default = 0;
 	};
 	class WIS_TaggitDebug

diff --git a/mission.sqm b/mission.sqm
@@ -8,14 +8,14 @@ class EditorData
 	toggles=1;
 	class ItemIDProvider
 	{
-		nextID=18;
+		nextID=20;
 	};
 	class Camera
 	{
-		pos[]={2182.8884,24.798454,5776.1533};
-		dir[]={-0.40352991,-0.69537669,-0.59466344};
-		up[]={-0.390459,0.71864861,-0.57540208};
-		aside[]={-0.82747394,-1.2567034e-007,0.56151199};
+		pos[]={2216.1648,37.316452,5769.4463};
+		dir[]={-0.7477358,-0.64264935,-0.16707157};
+		up[]={-0.62718219,0.76616234,-0.14013581};
+		aside[]={-0.21806195,-4.4834451e-007,0.9759447};
 	};
 };
 binarizationWanted=0;
@@ -62,11 +62,14 @@ class ScenarioData
 	showHUD=0;
 	showWatch=0;
 	saving=0;
+	aIKills=1;
+	disabledAI=1;
 	joinUnassigned=0;
-	respawn=2;
 	class Header
 	{
 		gameType="Sandbox";
+		minPlayers=2;
+		maxPlayers=8;
 	};
 };
 class CustomAttributes
@@ -89,24 +92,6 @@ class CustomAttributes
 							"ARRAY"
 						};
 					};
-					class value
-					{
-						items=1;
-						class Item0
-						{
-							class data
-							{
-								class type
-								{
-									type[]=
-									{
-										"STRING"
-									};
-								};
-								value="Counter";
-							};
-						};
-					};
 				};
 			};
 		};
@@ -350,6 +335,7 @@ class Mission
 {
 	class Intel
 	{
+		overviewText="Have you ever played ""Tag""? Well, not like this!";
 		timeOfChanges=1800.0002;
 		startWeather=0.30000001;
 		startWind=0.1;

diff --git a/taggit-init.sqf b/taggit-init.sqf
@@ -1,13 +1,13 @@
 //Defines
-_weaponsarray 		= ["hgun_ACPC2_F","hgun_Pistol_heavy_02_Yorris_F","SMG_01_F","SMG_02_ACO_F","arifle_MXC_F","arifle_MXM_Hamr_pointer_F","srifle_GM6_LRPS_F","launch_RPG32_F"];
+_weaponsarray 		= ["hgun_ACPC2_F","hgun_Pistol_heavy_02_Yorris_F","SMG_01_F","SMG_02_ACO_F","arifle_MXC_F","arifle_MXM_Hamr_pointer_F","srifle_GM6_LRPS_F"];
 WIS_TagWeapon 		= _weaponsarray select ("WIS_Weapon" call BIS_fnc_getParamValue);
 _MagazineArray  	= getArray (ConfigFile >> "CfgWeapons" >> WIS_TagWeapon >> "Magazines");
 WIS_TagMagazine 	= _MagazineArray select 0;
 WIS_Taggit_Debug 	= "WIS_TaggitDebug" call BIS_fnc_getParamValue;
 WIS_Taggit_AreaSize = "WIS_AreaSize" call BIS_fnc_getParamValue;
 _uniformarray 		= ["NoChange","U_B_GhillieSuit", "U_O_V_Soldier_Viper_F"];
 WIS_Taggit_Uniform	= _uniformarray select ("WIS_Uniform" call BIS_fnc_getParamvalue);
-_visionarray 		= ["NoChange", "NVGoggles", "H_HelmetSpecO_ghex_F"];
+_visionarray 		= ["NoChange", "NVGoggles", "H_HelmetO_ViperSP_ghex_F"];
 WIS_Taggit_Vision	= _visionarray select ("WIS_Vision" call BIS_fnc_getParamvalue);
 
 [ format ["%1 hasInterface", name player]] call WIS_fnc_debug;