diff --git a/Subsurface/Content/Items/Weapons/explosives.xml b/Subsurface/Content/Items/Weapons/explosives.xml index 6c87ff27a..8fd7dc4dc 100644 --- a/Subsurface/Content/Items/Weapons/explosives.xml +++ b/Subsurface/Content/Items/Weapons/explosives.xml @@ -104,7 +104,7 @@ - + - + diff --git a/Subsurface/Source/Events/Missions/CargoMission.cs b/Subsurface/Source/Events/Missions/CargoMission.cs index 5e5af4770..27bb8dbe8 100644 --- a/Subsurface/Source/Events/Missions/CargoMission.cs +++ b/Subsurface/Source/Events/Missions/CargoMission.cs @@ -69,11 +69,11 @@ namespace Barotrauma return; } - Vector2 position = new Vector2( - Rand.Range(cargoRoom.Rect.X + 20, cargoRoom.Rect.Right - 20, false), - cargoRoom.Rect.Y - cargoRoom.Rect.Height + 10.0f); + //Vector2 position = new Vector2( + // Rand.Range(cargoRoom.Rect.X + 20, cargoRoom.Rect.Right - 20, false), + // cargoRoom.Rect.Y - cargoRoom.Rect.Height + 10.0f); - var item = new Item(itemPrefab, position, cargoRoom.Submarine); + var item = new Item(itemPrefab, cargoSpawnPos.Position + Rand.Vector(10.0f, false), cargoRoom.Submarine); item.FindHull(); items.Add(item); diff --git a/Subsurface/Source/Events/Missions/Mission.cs b/Subsurface/Source/Events/Missions/Mission.cs index 1f59422fc..5bab7f6ac 100644 --- a/Subsurface/Source/Events/Missions/Mission.cs +++ b/Subsurface/Source/Events/Missions/Mission.cs @@ -137,6 +137,10 @@ namespace Barotrauma { return null; } + else if (string.IsNullOrWhiteSpace(missionType)) + { + matchingElements = doc.Root.Elements().ToList(); + } else { matchingElements = doc.Root.Elements().ToList().FindAll(m => m.Name.ToString().ToLowerInvariant().Replace("mission", "") == missionType);