Merge pull request #41 from noxsicarius/master

CleanUp & Fixes
noxsicarius · Mar 16, 2014 · 5a39ba2 · 5a39ba2
2 parents 73f93cb + a13365d
commit 5a39ba2
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 57 deletions.
diff --git a/admintools/AdminToolsMain.sqf b/admintools/AdminToolsMain.sqf
@@ -1,10 +1,8 @@
 _pathtotools = "admintools\tools\";
-//_pathtoskins = "admintools\skins\";
 _pathtoweapon = "admintools\weaponkits\";
 _pathtovehicles = "admintools\vehicles\";
 _pathtocrates = "admintools\crates\";
 _EXECscript1 = 'player execVM "'+_pathtotools+'%1"';
-//_EXECscript2 = 'player execVM "'+_pathtoskins'%1"';
 _EXECscript3 = 'player execVM "'+_pathtoweapon+'%1"';
 _EXECscript5 = 'player execVM "'+_pathtovehicles+'%1"';
 _EXECscript6 = 'player execVM "'+_pathtocrates+'%1"';
@@ -45,12 +43,12 @@ AdminMenu =
 	["Teleport To Player", [], "", -5, [["expression", format[_EXECscript1, "TpToPlayer.sqf"]]], "1", "1"],
 	["Toggle God Mode", [],  "", -5, [["expression", format[_EXECscript1,"malplayerGM.sqf"]]], "1", "1"],
 	["Zombie Shield",[],"",-5,[["expression",format[_EXECscript1,"zombieshield.sqf"]]],"1","1"],
-	["Toggle Flying", [],  "", -5, [["expression", format[_EXECscript1,"malfly.sqf"]]], "1", "1"],
-	["Humanity Menu >>", [], "#USER:HumanityMenu", -5, [["expression", ""]], "1", "1"],
 	["Point to Repair (Temp)", [],  "", -5, [["expression", format[_EXECscript1,"malpointrepair.sqf"]]], "1", "1"],
 	["Point to Delete (Perm)",[],"",-5,[["expression",format[_EXECscript1,"DatabaseRemove.sqf"]]],"1","1"],
 	["Heal (25m)", [],  "", -5, [["expression", format[_EXECscript1,"healp.sqf"]]], "1", "1"],	
 	["Invisibility", [],  "", -5, [["expression", format[_EXECscript1,"malinvisinit.sqf"]]], "1", "1"],			
+	["Toggle Flying", [],  "", -5, [["expression", format[_EXECscript1,"malfly.sqf"]]], "1", "1"],
+	["Humanity Menu >>", [], "#USER:HumanityMenu", -5, [["expression", ""]], "1", "1"],
 	["Infinite Ammo", [],  "", -5, [["expression", format[_EXECscript1,"malinfammo.sqf"]]], "1", "1"],	
 	["Toggle Grass", [],  "", -5, [["expression", format[_EXECscript1,"malgrasson.sqf"]]], "1", "1"],
 	["", [], "", -5, [["expression", ""]], "1", "0"],

diff --git a/admintools/tools/TpToPlayer.sqf b/admintools/tools/TpToPlayer.sqf
@@ -30,7 +30,7 @@ if (pselect5 != "exit") then
 	{
 		if(name _x == _name) then
 		{			
-			hint format ["Teleporting to %1", _name];
+			titleText[format["Teleporting to %1", _name],"PLAIN DOWN"];
 			(vehicle player) attachTo [_x, [2, 2, 0]];
 			sleep 0.25;
 			detach (vehicle player);

diff --git a/admintools/tools/malgrasson.sqf b/admintools/tools/malgrasson.sqf
@@ -1,22 +1,13 @@
 // Toggle grass on or off
-// last edit: NoxSicarius
+if(isNil "grassToggle") then{grassToggle = true;} else {grassToggle = !grassToggle;};
 
-if(isNil "grassToggle") then
+if (grassToggle) then 
 {
-	grassToggle = 0;
-};
-
-if (grassToggle == 0) then 
-{
-	grassToggle = 1;
 	cutText ["Grass - OFF", "PLAIN DOWN"];
 	setterraingrid 50;
 }
 else
 {
-	grassToggle = 0;
 	cutText ["Grass - ON", "PLAIN DOWN"];
 	setterraingrid 25;};
-};
-
-
+};
diff --git a/admintools/tools/malinfammo.sqf b/admintools/tools/malinfammo.sqf
@@ -1,24 +1,19 @@
 // Malory's Infinite Ammo 
 
-if (isnil "malinfam" ) then {malinfam=0};
+if (isnil "malinfam" ) then {malinfam=true;} else {malinfam = !malinfam;};
 
-if (malinfam==0) then
+if (malinfam) then
 {
-	malinfam=1;
 	hint "Infinite Ammo and No Recoil - ON";
-	while {malinfam==1} do
+	while {malinfam} do
 	{
 	vehicle player setVehicleAmmo 0.99;
 	vehicle player setUnitRecoilCoefficient 0;
 	sleep 0.01;
 	}
 
 }
-else
-{
-hint "Infinite Ammo and No Recoil - OFF";
-malinfam=0;
-};
+else{hint "Infinite Ammo and No Recoil - OFF";};
 
 
 

diff --git a/admintools/tools/speedboost.sqf b/admintools/tools/speedboost.sqf
@@ -1,34 +1,38 @@
-waituntil {!isnull (finddisplay 46)};
-(findDisplay 46) displayAddEventHandler ["KeyDown","_this select 1 call MY_KEYDOWN_FNC;false;"];
-MY_KEYDOWN_FNC = {
+if (isNil "speedToggle") then {speedToggle = true;} else { speedToggle = !speedToggle;};
 
-_vcl = vehicle player;
-if(_vcl == player)exitwith{};
+if (speedToggle) then {
+	waituntil {!isnull (finddisplay 46)};
+	SPEED_UP =(findDisplay 46) displayAddEventHandler ["KeyDown","_this select 1 call MY_KEYDOWN_FNC;false;"];
 
-_nos = _vcl getvariable "nitro";
-_supgrade = _vcl getvariable "supgrade";
+	MY_KEYDOWN_FNC = {
 
-if(isEngineOn _vcl) then
-{
-switch (_this) do {
-case 17: {
-if(isEngineOn _vcl and !isnil "_supgrade") then
-{
-_vcl SetVelocity [(velocity _vcl select 0) * 1.011, (velocity _vcl select 1) *1.011, (velocity _vcl select 2) * 0.99];
-} else {
-_vcl setvariable ["supgrade", 1, true];
-};
-};
-case 42: {
-if(isEngineOn _vcl and !isnil "_nos") then
-{
-_vcl setVelocity [(velocity _vcl select 0) * 1.01, (velocity _vcl select 1) * 1.01, (velocity _vcl select 2) * 0.99];
-} else {
-_vcl setvariable ["nitro", 1, true];
-};
-};
-};
-};
-};
+		_vcl = vehicle player;
+		if(_vcl == player)exitwith{};
 
-hint "Speed Boost";
+		_nos = _vcl getvariable "nitro";
+		_supgrade = _vcl getvariable "supgrade";
+
+		if(isEngineOn _vcl) then
+		{
+			switch (_this) do {
+				case 17: {
+					if(isEngineOn _vcl and !isnil "_supgrade") then
+					{
+						_vcl SetVelocity [(velocity _vcl select 0) * 1.011, (velocity _vcl select 1) *1.011, (velocity _vcl select 2) * 0.99];
+					} else {_vcl setvariable ["supgrade", 1, true];};
+				};
+				case 42: {
+					if(isEngineOn _vcl and !isnil "_nos") then
+					{
+						_vcl setVelocity [(velocity _vcl select 0) * 1.01, (velocity _vcl select 1) * 1.01, (velocity _vcl select 2) * 0.99];
+					} else {_vcl setvariable ["nitro", 1, true];};
+				};
+			};
+		};
+	};
+	titleText ["Speed Boost - ON","PLAIN DOWN"];titleFadeOut 2;
+}
+else{
+	(findDisplay 46) displayRemoveEventHandler ["KeyDown", SPEED_UP];
+	titleText ["Speed Boost - OFF","PLAIN DOWN"];titleFadeOut 2;
+};
diff --git a/admintools/tools/zombieshield.sqf b/admintools/tools/zombieshield.sqf
@@ -1,4 +1,4 @@
-if (isNil "SheildMe") then {SheildMe = true;} else {SheildMe = !SheildMe};
+if (isNil "SheildMe") then {SheildMe = true;} else {SheildMe = !SheildMe;};
  if(SheildMe) then {
  zombieDistanceScreen = 
 [