Update from Upstream

CoreSystems.csproj

@@ -21,7 +21,7 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
     <LangVersion>6</LangVersion>
-    <CodeAnalysisRuleSet>WeaponCore.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -32,14 +32,33 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
     <LangVersion>7</LangVersion>
-    <CodeAnalysisRuleSet>WeaponCore.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>
+    </CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup>
     <RootNamespace>WeaponCore</RootNamespace>
   </PropertyGroup>
   <PropertyGroup>
     <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>6</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
   <ItemGroup>
     <None Include=".editorconfig" />
     <None Include="Data\BlockCategories.sbc">
@@ -118,7 +137,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="packages.config" />
-    <None Include="CoreSystems.ruleset" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Data\Scripts\CoreSystems\Api\ApiServer.cs">
@@ -430,9 +448,6 @@
     <Compile Include="Data\Scripts\CoreSystems\Support\MathFuncs.cs">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Compile>
-    <Compile Include="Data\Scripts\CoreSystems\Support\Spawn.cs">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Compile>
     <Compile Include="Data\Scripts\CoreSystems\AudioVisual\AvShot.cs">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Compile>
@@ -532,9 +547,6 @@
     <Compile Include="Data\Scripts\CoreSystems\Support\Draw\DrawExts.cs">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Compile>
-    <Compile Include="Data\Scripts\CoreSystems\Support\DsAutoResetEvent.cs">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Compile>
     <Compile Include="Data\Scripts\CoreSystems\EntityComp\ModelSupport\Dummies.cs">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Compile>
@@ -687,9 +699,6 @@
       <Private>False</Private>
     </Reference>
   </ItemGroup>
-  <ItemGroup>
-    <Analyzer Include="..\..\..\Documents\SE\SEWhitelistChecker.dll" />
-  </ItemGroup>
   <ItemGroup>
     <Content Include="Textures\Display_add.dds">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

CoreSystems.sln

@@ -1,20 +1,26 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31112.23
+# Visual Studio Version 17
+VisualStudioVersion = 17.13.35806.99 d17.13
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreSystems", "CoreSystems.csproj", "{A02FF223-D75F-45ED-84F4-63ED89AFCCE9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{A02FF223-D75F-45ED-84F4-63ED89AFCCE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A02FF223-D75F-45ED-84F4-63ED89AFCCE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A02FF223-D75F-45ED-84F4-63ED89AFCCE9}.Debug|x64.ActiveCfg = Debug|x64
+		{A02FF223-D75F-45ED-84F4-63ED89AFCCE9}.Debug|x64.Build.0 = Debug|x64
 		{A02FF223-D75F-45ED-84F4-63ED89AFCCE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A02FF223-D75F-45ED-84F4-63ED89AFCCE9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A02FF223-D75F-45ED-84F4-63ED89AFCCE9}.Release|x64.ActiveCfg = Release|x64
+		{A02FF223-D75F-45ED-84F4-63ED89AFCCE9}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Data/Audio.sbc

@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<Definitions xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <Sounds>
+        <Sound>
+            <Id>
+                <TypeId>MyObjectBuilder_AudioDefinition</TypeId>
+                <SubtypeId>ArcWepShipGatlingShot</SubtypeId>
+            </Id>
+            <Category>SHOT</Category>
+            <MaxDistance>200</MaxDistance>
+            <PreventSynchronization>0</PreventSynchronization>
+            <DynamicMusicCategory>HeavyFight</DynamicMusicCategory>
+            <DynamicMusicAmount>3</DynamicMusicAmount>
+            <DistantSounds>
+                <DistantSound DistanceCrossfade="10" Distance="200" Sound="WepShipGatlingShotDistant1" />
+            </DistantSounds>
+            <Volume>0.7</Volume>
+            <Waves>
+                <Wave Type="D3">
+                    <Start>Audio\ARC\WEP\ArcWepShipGatlingShot3d01.wav</Start>
+                </Wave>
+                <Wave Type="D3">
+                    <Start>Audio\ARC\WEP\ArcWepShipGatlingShot3d02.wav</Start>
+                </Wave>
+                <Wave Type="D3">
+                    <Start>Audio\ARC\WEP\ArcWepShipGatlingShot3d03.wav</Start>
+                </Wave>
+                <Wave Type="D3">
+                    <Start>Audio\ARC\WEP\ArcWepShipGatlingShot3d04.wav</Start>
+                </Wave>
+                <Wave Type="D3">
+                    <Start>Audio\ARC\WEP\ArcWepShipGatlingShot3d05.wav</Start>
+                </Wave>
+                <Wave Type="D3">
+                    <Start>Audio\ARC\WEP\ArcWepShipGatlingShot3d06.wav</Start>
+                </Wave>
+                <Wave Type="D3">
+                    <Start>Audio\ARC\WEP\ArcWepShipGatlingShot3d07.wav</Start>
+                </Wave>
+            </Waves>
+        </Sound>
+    </Sounds>
+</Definitions>

Data/BlockVariantGroups.sbc

@@ -19,6 +19,8 @@
                 <Block Type="MyObjectBuilder_ConveyorSorter" Subtype="LargeRailgun" />
                 <Block Type="MyObjectBuilder_SmallMissileLauncher" Subtype="LargeBlockLargeCalibreGun" />
                 <Block Type="MyObjectBuilder_SmallMissileLauncherReload" Subtype="SmallBlockMediumCalibreGun" />
+				<Block Type="MyObjectBuilder_SmallMissileLauncher" Subtype="LargeFlareLauncher" />
+                <Block Type="MyObjectBuilder_SmallMissileLauncher" Subtype="SmallFlareLauncher" />
             </Blocks>
         </BlockVariantGroup>
 
@@ -30,8 +32,12 @@
             <Blocks>
                 <Block Type="MyObjectBuilder_LargeGatlingTurret" Subtype="" />
                 <Block Type="MyObjectBuilder_LargeGatlingTurret" Subtype="SmallGatlingTurret" />
+				<Block Type="MyObjectBuilder_LargeGatlingTurret" Subtype="LargeGatlingTurretReskin" />
+                <Block Type="MyObjectBuilder_LargeGatlingTurret" Subtype="SmallGatlingTurretReskin" />
                 <Block Type="MyObjectBuilder_LargeMissileTurret" Subtype="" />
                 <Block Type="MyObjectBuilder_LargeMissileTurret" Subtype="SmallMissileTurret" />
+				<Block Type="MyObjectBuilder_LargeMissileTurret" Subtype="LargeMissileTurretReskin" />
+                <Block Type="MyObjectBuilder_LargeMissileTurret" Subtype="SmallMissileTurretReskin" />
                 <Block Type="MyObjectBuilder_LargeMissileTurret" Subtype="LargeCalibreTurret" />
                 <Block Type="MyObjectBuilder_LargeMissileTurret" Subtype="LargeBlockMediumCalibreTurret" />
                 <Block Type="MyObjectBuilder_LargeMissileTurret" Subtype="SmallBlockMediumCalibreTurret" />

Data/Scripts/CoreSystems/Ai/AiComp/AiCompRun.cs

@@ -1,5 +1,4 @@
-using System;
-using VRage.Game.Components;
+using VRage.Game.Components;
 
 namespace CoreSystems.Support
 {

Data/Scripts/CoreSystems/Ai/AiConstruct.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using CoreSystems.Platform;
 using CoreSystems.Projectiles;
 using Sandbox.Game.Entities;
@@ -441,6 +440,19 @@ internal static void CombatBlockUpdates(Ai cAi)//Obligatory comment to annoy com
                     double rangeToTarg = double.MaxValue;
                     var currentAim = aFB.LookAtPosition == null ? Vector3D.Zero : (Vector3D)aFB.LookAtPosition;
                     var hasTarg = aCB.SearchEnemyComponent.FoundEnemy != null;
+
+                    if (aCB.IsWorking && aFB.IsWorking && Session.I.IsServer)
+                    {
+                        if (hasTarg)
+                        {
+                            var targTopmost = aCB.SearchEnemyComponent.FoundEnemy.GetTopMostParent();
+                            if (checkAi.Construct.Data.Repo.FocusData.Target != targTopmost.EntityId)
+                                checkAi.Construct.Focus.ServerChangeFocus((MyEntity)targTopmost, checkAi, 0, Focus.ChangeMode.Add, true);
+                        }
+                        else if (checkAi.Construct.Data.Repo.FocusData.Target != 0)
+                            checkAi.Construct.Focus.ServerChangeFocus(null, checkAi, 0, Focus.ChangeMode.Release, true);
+                    }
+
                     var targSphere = new BoundingSphereD(hasTarg ? aCB.SearchEnemyComponent.FoundEnemy.PositionComp.WorldAABB.Center : Vector3D.Zero, 1); //Does the radius really matter here?  use actual enemy or lead position?
 
                     if (currentAim != Vector3D.Zero && !stopFiring)
@@ -453,9 +465,17 @@ internal static void CombatBlockUpdates(Ai cAi)//Obligatory comment to annoy com
                     {
                         foreach (var comp in ais[x].WeaponComps)
                         {
-                            if (comp.HasTurret || comp.HasScanTrackOnly) continue;
+                            if (comp.HasTurret || comp.HasScanTrackOnly || comp.PrimaryWeapon.System.RadioType != WeaponCore.Data.Scripts.CoreSystems.Comms.Radio.RadioTypes.Slave) continue;
 
-                            if (comp.HasGuidance)
+                            if (comp.PrimaryWeapon.System.RadioType == WeaponCore.Data.Scripts.CoreSystems.Comms.Radio.RadioTypes.Slave)
+                            {
+                                var shoot = comp.PrimaryWeapon.Target.HasTarget;
+                                if (shoot && comp.Data.Repo.Values.State.Trigger == CoreComponent.Trigger.Off)
+                                    comp.ShootManager.RequestShootSync(0, ShootManager.RequestType.On);
+                                else if ((stopFiring || !shoot) && comp.Data.Repo.Values.State.Trigger == CoreComponent.Trigger.On)
+                                    comp.ShootManager.RequestShootSync(0, ShootManager.RequestType.Off);
+                            }
+                            else if (comp.HasGuidance)
                             {
                                 bool shoot = hasTarg ? rangeToTarg <= comp.PrimaryWeapon.MaxTargetDistance && MathFuncs.TargetSphereInCone(ref targSphere, ref comp.PrimaryWeapon.AimCone) : false;
                                 if (shoot && comp.Data.Repo.Values.State.Trigger == CoreComponent.Trigger.Off)
@@ -477,8 +497,8 @@ internal static void CombatBlockUpdates(Ai cAi)//Obligatory comment to annoy com
                             }
                         }
                     }
-                    if (aCB.MarkedForClose) checkAi.Construct.ActiveCombatBlock = null;
-                    if (aFB.MarkedForClose) checkAi.Construct.ActiveFlightBlock = null; //Placed these removals here so we can flip triggers "off" the last time the method runs
+                    if (aCB.MarkedForClose || !aCB.IsWorking) checkAi.Construct.ActiveCombatBlock = null;
+                    if (aFB.MarkedForClose || !aFB.IsWorking) checkAi.Construct.ActiveFlightBlock = null; //Placed these removals here so we can flip triggers "off" the last time the method runs
                 }
             }
 
@@ -855,13 +875,9 @@ internal void Clean()
             {
                 if (TotalEffect > 0)
                 {
-                    try
-                    {
-                        PlayerMap player;
-                        var playerName = Session.I.Players.TryGetValue(Ai.AiOwner, out player) ? player.Player.DisplayName ?? string.Empty : string.Empty;
-                        Log.Stats($"{Ai.TopEntity?.DisplayName}, {playerName}, {(long)TotalEffect}, {TotalPrimaryEffect}, {TotalAoeEffect}, {TotalShieldEffect}, {TotalProjectileEffect}", "griddmgstats");
-                    }
-                    catch (Exception ex) { Log.Line($"Exception in ConstructClean: {ex}", null, true); }
+                    PlayerMap player;
+                    var playerName = Session.I.Players.TryGetValue(Ai.AiOwner, out player) ? player.Player.DisplayName ?? string.Empty : string.Empty;
+                    Log.Stats($"{Ai.TopEntity?.DisplayName}, {playerName}, {(long)TotalEffect}, {TotalPrimaryEffect}, {TotalAoeEffect}, {TotalShieldEffect}, {TotalProjectileEffect}", "griddmgstats");
                 }
 
                 if (WeaponGroups.Count > 0)

Data/Scripts/CoreSystems/Ai/AiData.cs

@@ -5,8 +5,6 @@
 
 namespace CoreSystems
 {
-    using static Session;
-
     public class AiData
     {
         public Ai Ai;