Fix automatic generation of Rio de Janeiro airdrop spawns and set the storage of custom airdrops in Airdrops.xml

Author: RestoreMonarchy

AirdropManager3/AirdropManager3.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>net48</TargetFramework>
 	<LangVersion>latest</LangVersion>
 	<RootNamespace>RestoreMonarchy.AirdropManager3</RootNamespace>
-    <Version>3.0.4</Version>
+    <Version>3.0.5</Version>
   </PropertyGroup>
 
   <ItemGroup>

AirdropManager3/Configurations/AirdropSpawnsXmlConfiguration.cs

@@ -1,15 +1,12 @@
 using RestoreMonarchy.AirdropManager3.Helpers;
 using RestoreMonarchy.AirdropManager3.Models;
-using Rocket.Core.Logging;
 using SDG.Unturned;
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Xml.Serialization;
 using UnityEngine;
-using Logger = Rocket.Core.Logging.Logger;
 
 namespace RestoreMonarchy.AirdropManager3.Configurations
 {
@@ -53,26 +50,29 @@ public void Save()
 
         private AirdropSpawnsConfiguration Create()
         {
-            IEnumerable<Node> nodes = ReflectionHelper.GetLevelNodesNodes();
-            
-            if (nodes == null)
+            IReadOnlyList<LocationDevkitNode> locationNodes = LocationDevkitNodeSystem.Get().GetAllNodes();
+            List<AirdropDevkitNode> airdropNodes = ReflectionHelper.GetLevelManagerAirdropNodes();
+
+            if (locationNodes == null)
             {
-                throw new Exception("Nodes are null.");
+                locationNodes = [];
             }
 
-            IEnumerable<LocationNode> locationNodes = nodes.OfType<LocationNode>().ToArray();
-            IEnumerable<AirdropNode> airdropNodes = nodes.OfType<AirdropNode>().ToArray();
+            if (airdropNodes == null)
+            {
+                throw new Exception("Airdrop nodes are null. Please check if the level is loaded and airdrop nodes are present.");
+            }
 
             List<AirdropSpawn> airdropSpawns = new();
-            foreach (AirdropNode airdropNode in airdropNodes)
+            foreach (AirdropDevkitNode airdropNode in airdropNodes)
             {
-                Vector3 position = airdropNode.point;
-                LocationNode nearestNode = locationNodes.OrderBy(n => Vector3.Distance(n.point, position)).FirstOrDefault();
+                Vector3 position = airdropNode.transform.position;
+                LocationDevkitNode nearestNode = locationNodes.OrderBy(n => Vector3.Distance(n.transform.position, position)).FirstOrDefault();
 
                 AirdropSpawn airdropSpawn = new()
                 {
                     AirdropId = airdropNode.id,
-                    Name = nearestNode?.name ?? null,
+                    Name = nearestNode?.locationName ?? null,
                     X = position.x,
                     Y = position.y,
                     Z = position.z

AirdropManager3/Configurations/AirdropsXmlConfiguration.cs

@@ -1,9 +1,6 @@
-using RestoreMonarchy.AirdropManager3.Helpers;
-using RestoreMonarchy.AirdropManager3.Models;
-using Rocket.Core.Logging;
+using RestoreMonarchy.AirdropManager3.Models;
 using SDG.Unturned;
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Xml.Serialization;
@@ -111,6 +108,14 @@ private AirdropsConfiguration Create()
                 }
             }
 
+            LevelAsset levelAsset = Level.getAsset();
+            AssetReference<AirdropAsset> assetReference = levelAsset != null ? levelAsset.airdropRef : AssetReference<AirdropAsset>.invalid;
+            AirdropAsset airdropAsset = null;
+            if (!assetReference.isNull)
+            {
+                airdropAsset = assetReference.Find();
+            }
+
             List<Airdrop> airdrops = new();
             foreach (ushort spawnId in spawnIds)
             {
@@ -129,6 +134,22 @@ private AirdropsConfiguration Create()
                     Name = spawnAsset.name,
                     Items = items
                 };
+
+                if (airdropAsset != null)
+                {
+                    ItemStorageAsset barricade = airdropAsset.barricadeRef.Find() as ItemStorageAsset;
+                    if (barricade != null)
+                    {
+                        airdrop.Storage = new()
+                        {
+                            BarricadeId = barricade.id,
+                            Name = barricade.FriendlyName,
+                            Width = barricade.storage_x,
+                            Height = barricade.storage_y
+                        };
+                    }
+                }
+
                 airdrops.Add(airdrop);
             }