From 1d06522bd8c81378b2dd6d944294ca8f25b38874 Mon Sep 17 00:00:00 2001
From: Regalis <regalis@undertowgames.com>
Date: Thu, 26 May 2016 16:04:37 +0300
Subject: [PATCH] Nitroglyserine -> nitroglycerin, fixed Mission.LoadRandom
 returning null if the missiontype parameter isn't set, cargo is placed at the
 cargo spawnpoint instead of a random position within the hull it's inside

---
 Subsurface/Content/Items/Weapons/explosives.xml   | 2 +-
 Subsurface/Content/Missions.xml                   | 6 +++---
 Subsurface/Source/Events/Missions/CargoMission.cs | 8 ++++----
 Subsurface/Source/Events/Missions/Mission.cs      | 4 ++++
 4 files changed, 12 insertions(+), 8 deletions(-)

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 @@
   </Item>
 
   <Item
-    name="Nitroglyserine"
+    name="Nitroglycerin"
     category="Material"
     description="A highly unstable liquid that may explode when subjected to heat or physical shock."
     spritecolor="1.0,1.0,1.0,1.0"
diff --git a/Subsurface/Content/Missions.xml b/Subsurface/Content/Missions.xml
index 7f7f16426..533354ac4 100644
--- a/Subsurface/Content/Missions.xml
+++ b/Subsurface/Content/Missions.xml
@@ -129,16 +129,16 @@
 
   <CargoMission
     name="Handle with care"
-    description="Local reseachers are offering 2000 credits for delivering a large amount of nitroglycerine to [location2]."
+    description="Local reseachers are offering 2000 credits for delivering a large amount of nitroglycerin to [location2]."
     commonness="15"
     reward="2000"
     successmessage="The chemicals have been successfully delivered.">
     <Items>
       <Item name="Explosive Crate">
-        <Item name="Nitroglyserine" amount="10"/>
+        <Item name="Nitroglycerin" amount="10"/>
       </Item>
       <Item name="Explosive Crate">
-        <Item name="Nitroglyserine" amount="10"/>
+        <Item name="Nitroglycerin" amount="10"/>
       </Item>
     </Items>
   </CargoMission>
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);