Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Add new entity spawn test & fix misc bugs (#19953)

Browse Source
This commit is contained in:
Leon Friedrich
2023-10-16 16:54:10 +11:00
committed by GitHub
parent 1f0c9314fd
commit 00e274ea38
14 changed files with 149 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Shared/Storage/EntitySpawnEntry.cs
View File

@@ -78,12 +78,12 @@ public static class EntitySpawnCollection
/// <param name="entries">The entity spawn entries.</param>
/// <param name="random">Resolve param.</param>
/// <returns>A list of entity prototypes that should be spawned.</returns>
public static List<string?> GetSpawns(IEnumerable<EntitySpawnEntry> entries,
public static List<string> GetSpawns(IEnumerable<EntitySpawnEntry> entries,
IRobustRandom? random = null)
{
IoCManager.Resolve(ref random);
var spawned = new List<string?>();
var spawned = new List<string>();
var ungrouped = CollectOrGroups(entries, out var orGroupedSpawns);
foreach (var entry in ungrouped)
@@ -93,6 +93,9 @@ public static class EntitySpawnCollection
if (entry.SpawnProbability != 1f && !random.Prob(entry.SpawnProbability))
continue;
if (entry.PrototypeId == null)
continue;
var amount = (int) entry.GetAmount(random);
for (var i = 0; i < amount; i++)
@@ -116,6 +119,9 @@ public static class EntitySpawnCollection
if (diceRoll > cumulative)
continue;
if (entry.PrototypeId == null)
break;
// Dice roll succeeded, add item and break loop
var amount = (int) entry.GetAmount(random);

6
Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
View File

@@ -22,6 +22,7 @@ using Robust.Shared.Network;
using Robust.Shared.Physics;
using Robust.Shared.Physics.Components;
using Robust.Shared.Physics.Systems;
using Robust.Shared.Prototypes;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
@@ -260,9 +261,12 @@ public abstract class SharedEntityStorageSystem : EntitySystem
}
_joints.RecursiveClearJoints(toInsert);
if (!component.Contents.Insert(toInsert, EntityManager))
return false;
var inside = EnsureComp<InsideEntityStorageComponent>(toInsert);
inside.Storage = container;
return component.Contents.Insert(toInsert, EntityManager);
return true;
}
public bool Remove(EntityUid toRemove, EntityUid container, SharedEntityStorageComponent? component = null, TransformComponent? xform = null)