Better UI scaling, quest tweaking, contentpackage hash bugfix, misc bugfixes

Subsurface/Events/Quests/MonsterQuest.cs

@@ -16,14 +16,6 @@ namespace Subsurface
 
         Character monster;
 
-        public override string RadarLabel
-        {
-            get
-            {
-                return monster.SpeciesName;
-            }
-        }
-
         public override Vector2 RadarPosition
         {
             get
@@ -35,7 +27,6 @@ namespace Subsurface
         public MonsterQuest(XElement element)
             : base(element)
         {
-            //monsterName = ToolBox.GetAttributeString(element, "monstername", "");
             monsterFile = ToolBox.GetAttributeString(element, "monsterfile", "");
         }
 
@@ -48,7 +39,11 @@ namespace Subsurface
 
         public override void End()
         {
-            if (!monster.IsDead) return;
+            if (!monster.IsDead)
+            {
+                new GUIMessageBox("Quest failed", failureMessage);
+                return;
+            }
             
             GiveReward();
 

Subsurface/Events/Quests/Quest.cs

@@ -20,8 +20,10 @@ namespace Subsurface
 
         protected bool completed;
 
-        private string successMessage;
-        private string failureMessage;
+        protected string successMessage;
+        protected string failureMessage;
+
+        protected string radarLabel;
 
         private int reward;
 
@@ -47,7 +49,7 @@ namespace Subsurface
 
         public virtual string RadarLabel
         {
-            get { return ""; }
+            get { return radarLabel; }
         }
 
         public virtual Vector2 RadarPosition
@@ -65,6 +67,8 @@ namespace Subsurface
 
             successMessage = ToolBox.GetAttributeString(element, "successmessage", "");
             failureMessage = ToolBox.GetAttributeString(element, "failuremessage", "");
+
+            radarLabel = ToolBox.GetAttributeString(element, "radarlabel", "");
         }
 
         public static Quest LoadRandom(Location[] locations, Random rand)

Subsurface/Events/Quests/SalvageQuest.cs

@@ -13,14 +13,6 @@ namespace Subsurface
 
         Item item;
 
-        public override string RadarLabel
-        {
-            get
-            {
-                return "Infrasonic signal";
-            }
-        }
-
         public override Vector2 RadarPosition
         {
             get
@@ -52,8 +44,11 @@ namespace Subsurface
 
         public override void End()
         {
-            if (item.CurrentHull == null) return;
-
+            if (item.CurrentHull == null)
+            {
+                new GUIMessageBox("Quest failed", failureMessage);
+                return;
+            }
             item.Remove();
 
             GiveReward();