Editor Prep for 1.2.0

* Removed Selection Box from Ammo Spawner
* Commented out code in CaptureZone
* Fixed Magazine Duplicator to use proper magazine capacity compare
* Removed Potatos BGM code
* Added Modul button for later mod compatiblity
* Fixed Sniper Gizmo to have no rotation
* Added Icons to Editor
* Started Faction Editor portion
* Added New feature buttons to Character and Item Category
* Updated Assets to reflect new Modul Button

Packer-SupplyRaid/src/Plugin/src/Scripts/SR_AmmoSpawner.cs

@@ -39,7 +39,6 @@ public class SR_AmmoSpawner : MonoBehaviour
         private List<FVRObject.OTagSet> m_validSets = new List<FVRObject.OTagSet>();
 
         private float m_scanTick = 1f;
-        public Transform selectedBox;
 
         //Ammo
         List<AmmoRound> ammoList = new List<AmmoRound>();
@@ -222,7 +221,6 @@ public void TogglePages()
             ammoPage.SetActive(!roundPage.activeSelf);
         }
 
-
         private void Start()
         {
             instance = this;
@@ -898,5 +896,4 @@ public class AmmoClass
             //public bool hasAmmo = false;
         }
     }
-
 }

Packer-SupplyRaid/src/Plugin/src/Scripts/SR_CaptureZone.cs

@@ -110,12 +110,13 @@ void CaptureZoneScan()
                     if (SR_Compass.instance && SR_Compass.instance.captureText.gameObject.activeSelf == false)
                     {
                         SR_Compass.instance.captureText.gameObject.SetActive(true);
+                        /*
                         //BGM
                         if (SupplyRaidPlugin.bgmEnabled)
                         {
                             BGM.SetHoldMusic(SR_Manager.instance.CurrentCaptures);
                         }
-
+                        */
                     }
 
                     if(SR_Compass.instance)
@@ -150,11 +151,13 @@ void CaptureZoneScan()
                         if (SR_Manager.instance.captureProtection <= 0)
                         {
                             SR_Manager.PlayFailSFX();
+                            /*
                             //BGM
                             if (SupplyRaidPlugin.bgmEnabled)
                             {
                                 BGM.SetHoldMusic(SR_Manager.instance.CurrentCaptures);
                             }
+                            */
                         }
                         if (SR_Compass.instance)
                             SR_Compass.instance.captureText.gameObject.SetActive(false);

Packer-SupplyRaid/src/Plugin/src/Scripts/SR_MagazineDuplicator.cs

@@ -192,7 +192,7 @@ private void SetupCosts()
                     //Update Magazine Cost Calculation
                     costUpgrade = SR_Manager.Character().GetRoundCost(
                         SR_Manager.instance.character.upgradeMagazineCost,
-                        m_detectedMag.m_capacity,
+                        magazineUpgrade.MagazineCapacity,
                         multiplier);
 
                     if (magazineUpgrade.ItemID == m_detectedMag.ObjectWrapper.ItemID)

Packer-SupplyRaid/src/Plugin/src/Scripts/SR_Manager.cs

@@ -382,20 +382,24 @@ void Start()
             //Random the Random
             Random.InitState((int)Time.realtimeSinceStartup);
 
+            /*
             if (SupplyRaidPlugin.bgmEnabled)
             {
                 Invoke("LoadBGM", 0.25f);
             }
+            */
         }
 
         void LoadBGM()
         {
+            /*
             //BGM
             if (SupplyRaidPlugin.bgmEnabled)
             {
                 BGM.SpawnPanel(spawnMenu.transform.position + Vector3.up, spawnMenu.transform.rotation);
                 BGM.InitializeSoundtrackInterface();
             }
+            */
         }
 
         void OnDisable()
@@ -513,11 +517,13 @@ public void LaunchGame()
             //DEBUG
             //StartCoroutine(SR_Global.SpawnAllLevelSosigs());
 
+            /*
             //BGM
             if (SupplyRaidPlugin.bgmEnabled)
             {
                 BGM.SetTakeMusic(CurrentCaptures);
             }
+            */
         }
 
         void SetupSupplyPoints()
@@ -857,11 +863,13 @@ public void CapturedPoint()
 
             CurrentCaptures++;
 
+            /*
             //BGM
             if (SupplyRaidPlugin.bgmEnabled)
             {
                 BGM.SetTakeMusic(CurrentCaptures);
             }
+            */
 
             if (inEndless)
                 endlessLevel++;

Packer-SupplyRaid/src/Plugin/src/Scripts/SR_ModTable.cs

@@ -32,6 +32,9 @@ public class SR_ModTable : MonoBehaviour
         public GameObject menuAdapters;
 
 
+        [Header("Modul Support")]
+        public GameObject modulButton;
+
         [System.Serializable]
         public class TableButton
         {
@@ -61,7 +64,7 @@ public class TableButton
         public void Setup()
         {
             instance = this;
-            colbuffer = new Collider[50];
+            colbuffer = new Collider[60];
 
             //Get All Muzzle Brakes
             modernEras.Add(FVRObject.OTagEra.PostWar);
@@ -238,7 +241,7 @@ public void BuyAttachment(int i)
 
             bool forceSecondary = false;
 
-            if (i == 1) //Iron Sights
+            if (i == 1 || i == 2) //Iron Sights & scopes
                 forceSecondary = true;
 
             if (SR_Global.SpawnLoot(buttons[i].attachmentTable, null, spawnPoints, forceSecondary))

Packer-SupplyRaid/src/Plugin/src/Scripts/SR_SupplyPoint.cs

@@ -265,7 +265,7 @@ void OnDrawGizmos()
                     Gizmos.DrawSphere(sniperPoints[i].position + (Vector3.up * 1.75f), 0.25f);
 
                     spawnSize = new Vector3(sniperPoints[i].lossyScale.x * spawnRadius, 0.1f, sniperPoints[i].lossyScale.z * spawnRadius);
-                    Gizmos.matrix = Matrix4x4.TRS(sniperPoints[i].position, sniperPoints[i].rotation, spawnSize);
+                    Gizmos.matrix = Matrix4x4.TRS(sniperPoints[i].position, Quaternion.identity, spawnSize);
                     Gizmos.DrawWireCube(Vector3.zero, Vector3.one);
                 }
             }

Packer-SupplyRaid/src/Plugin/src/SupplyRaidPlugin.cs

@@ -14,13 +14,13 @@ namespace SupplyRaid
 	[BepInPlugin(PluginInfo.GUID, PluginInfo.NAME, PluginInfo.VERSION)]
 	[BepInProcess("h3vr.exe")]
 	[BepInDependency("VIP.TommySoucy.H3MP", BepInDependency.DependencyFlags.SoftDependency)]
-    [BepInDependency("dll.potatoes.ptnhbgml", BepInDependency.DependencyFlags.SoftDependency)]
+    //[BepInDependency("dll.potatoes.ptnhbgml", BepInDependency.DependencyFlags.SoftDependency)]
     [BepInDependency(AtlasConstants.Guid, AtlasConstants.Version)]
     public class SupplyRaidPlugin : BaseUnityPlugin
 	{
 		private readonly Hooks _hooks;
 		public static bool h3mpEnabled = false;
-		public static bool bgmEnabled = false;
+		//public static bool bgmEnabled = false;
 		public static bool loadTnH = false;
 		public static Text tnhButtonText = null;
 		//public static Dictionary<int, SR_SosigEnemyTemplate> customSosigs = new Dictionary<int, SR_SosigEnemyTemplate>();
@@ -36,7 +36,7 @@ private void Awake()
 		{
             AtlasPlugin.Loaders["supplyraid"] = new SandboxLoader();
             h3mpEnabled = Chainloader.PluginInfos.ContainsKey("VIP.TommySoucy.H3MP");
-			bgmEnabled = Chainloader.PluginInfos.ContainsKey("dll.potatoes.ptnhbgml");
+			//bgmEnabled = Chainloader.PluginInfos.ContainsKey("dll.potatoes.ptnhbgml");
 
             SceneManager.activeSceneChanged += ChangedActiveScene;
         }