Merge pull request #10 from ToastinYou/dev

Update 2.2.0

.gitignore

@@ -23,6 +23,7 @@ bld/
 [Bb]in/
 [Oo]bj/
 [Ll]og/
+build/*
 
 # Visual Studio 2015/2017 cache/options directory
 .vs/

Client/Client.csproj

@@ -32,7 +32,8 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="CitizenFX.Core.Client, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\CitizenFX.Core.Client.1.0.1290\lib\net45\CitizenFX.Core.Client.dll</HintPath>
+      <HintPath>..\packages\CitizenFX.Core.Client.1.0.3212\lib\net45\CitizenFX.Core.Client.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -49,7 +50,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
-    <None Include="__resource.lua">
+    <None Include="fxmanifest.lua">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

Client/Main.cs

@@ -1,36 +1,34 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using CitizenFX.Core;
+using CitizenFX.Core;
 using CitizenFX.Core.Native;
-using CitizenFX.Core.UI;
+using System;
+using System.Threading.Tasks;
 
 namespace Client
 {
     public class Main : BaseScript
     {
-        private bool _reticleAllowed = false;
-
-        private List<WeaponHash> _overrideDisable = new List<WeaponHash>()
-        {
-            WeaponHash.Unarmed, WeaponHash.StunGun, WeaponHash.SniperRifle, WeaponHash.HeavySniper,
-            WeaponHash.HeavySniperMk2, WeaponHash.MarksmanRifle,
-        };
+        private bool _reticleAllowed, _stunGunReticleAllowed;
 
         public Main()
         {
             Log("Resource loaded.");
-            TriggerServerEvent("NoReticle:Server:GetPlayerReticleAceAllowed", Game.Player.Handle);
+            TriggerServerEvent("NoReticle:Server:GetAcePermissions", Game.Player.Handle);
         }
 
         [EventHandler("NoReticle:Client:SetPlayerReticleAceAllowed")]
         private void SetPlayerReticleAceAllowed()
         {
-            Screen.ShowNotification("Allowing reticle.", true);
+            Log("Allowing reticle.");
             _reticleAllowed = true;
         }
 
+        [EventHandler("NoReticle:Client:SetStunGunReticleAllowed")]
+        private void SetStunGunReticleAllowed()
+        {
+            Log("Allowing stun gun reticle.");
+            _stunGunReticleAllowed = true;
+        }
+
         [Tick]
         private async Task ProcessTask()
         {
@@ -39,9 +37,8 @@ private async Task ProcessTask()
 
             if (w != null)
             {
-                WeaponHash wHash = w.Hash;
-
-                if (!_overrideDisable.Contains(wHash) && API.GetHashKey(wHash.ToString()) != -1783943904) // add MarksmanRifle MKII
+                // disable reticle for musket and all weapons EXCEPT snipers, unarmed, stungun (if permissions allowed), and aircraft (w.Group == 0).
+                if (w.Hash == WeaponHash.Musket || !(w.Group == WeaponGroup.Sniper || w.Group == WeaponGroup.Unarmed || (_stunGunReticleAllowed && w.Group == WeaponGroup.Stungun) || w.Group == 0))
                 {
                     // if ace perm "Reticle" is not allowed (cannot have reticle) then..
                     if (!_reticleAllowed)
@@ -59,7 +56,7 @@ private async Task ProcessTask()
         /// <param name="msg">Message to display.</param>
         private void Log(string msg)
         {
-            Debug.Write($"[NoReticle] - {msg}");
+            Debug.Write($"[NoReticle]: {msg}\n");
         }
     }
 }

Client/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.0")]
-[assembly: AssemblyFileVersion("2.1.0")]
+[assembly: AssemblyVersion("2.2.0")]
+[assembly: AssemblyFileVersion("2.2.0")]

Client/fxmanifest.lua

@@ -0,0 +1,14 @@
+fx_version 'cerulean'
+games { 'gta5' }
+
+author 'ToastinYou'
+description 'No Reticle / Reticle Disabler'
+version '2.2.0'
+
+client_scripts {
+	'Client.net.dll',
+}
+
+server_scripts {
+	'Server.net.dll',
+}

Client/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="CitizenFX.Core.Client" version="1.0.1290" targetFramework="net452" />
+  <package id="CitizenFX.Core.Client" version="1.0.3212" targetFramework="net452" />
 </packages>

Server/Main.cs

@@ -7,14 +7,19 @@ public class Main : BaseScript
     {
         public Main() { }
 
-        [EventHandler("NoReticle:Server:GetPlayerReticleAceAllowed")]
-        private void GetPlayerReticleAceAllowed([FromSource] Player p)
+        [EventHandler("NoReticle:Server:GetAcePermissions")]
+        private void GetAcePermissions([FromSource] Player p)
         {
             // if ace permission 'Reticle' is allowed for the player then show the reticle..
-            if (API.IsPlayerAceAllowed(p.Handle, "Reticle") == true)
+            if (API.IsPlayerAceAllowed(p.Handle, "Reticle"))
             {
                 p.TriggerEvent("NoReticle:Client:SetPlayerReticleAceAllowed");
             }
+            // if ace permission 'ReticleStunGun' is allowed for the player then show the reticle..
+            if (API.IsPlayerAceAllowed(p.Handle, "ReticleStunGun"))
+            {
+                p.TriggerEvent("NoReticle:Client:SetStunGunReticleAllowed");
+            }
         }
     }
 }

Server/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.0")]
-[assembly: AssemblyFileVersion("2.1.0")]
+[assembly: AssemblyVersion("2.2.0")]
+[assembly: AssemblyFileVersion("2.2.0")]

Server/Server.csproj

@@ -14,15 +14,15 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
-    <DebugType>embedded</DebugType>
+    <DebugType>portable</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\build\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>embedded</DebugType>
+    <DebugType>portable</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\build\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
@@ -32,7 +32,8 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="CitizenFX.Core.Server, Version=0.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\CitizenFX.Core.Server.1.0.1290\lib\net45\CitizenFX.Core.Server.dll</HintPath>
+      <HintPath>..\packages\CitizenFX.Core.Server.1.0.3212\lib\net45\CitizenFX.Core.Server.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

Server/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="CitizenFX.Core.Server" version="1.0.1290" targetFramework="net452" />
+  <package id="CitizenFX.Core.Server" version="1.0.3212" targetFramework="net452" />
 </packages>