From a46f724f1f94c7e7e617e728eed1b6fbf26fd7ce Mon Sep 17 00:00:00 2001
From: Regalis <regalis@undertowgames.com>
Date: Thu, 19 Nov 2015 18:01:54 +0200
Subject: [PATCH] "Subinventory" (= jumpsuit pockets etc) bugfixes, quest
 message fix

---
 Subsurface/Content/Items/Clothes/clothes.xml |   8 +++-
 Subsurface/Content/Quests.xml                |   8 ++--
 Subsurface/Source/Items/Inventory.cs         |  42 +++++++++++++------
 Subsurface_Solution.v12.suo                  | Bin 742400 -> 745472 bytes
 4 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/Subsurface/Content/Items/Clothes/clothes.xml b/Subsurface/Content/Items/Clothes/clothes.xml
index a0b34fed0..59e3f8d2c 100644
--- a/Subsurface/Content/Items/Clothes/clothes.xml
+++ b/Subsurface/Content/Items/Clothes/clothes.xml
@@ -103,7 +103,9 @@
       <sprite texture="engigear.png" limb="LeftLeg" sourcerect="33,0,20,51" origin="0.5,0.5" depth="0.15" hidelimb="true"/>      
     </Wearable>
 
-    <ItemContainer containable="smallitem" capacity="5"/>
+    <ItemContainer capacity="5">
+      <Containable name="smallitem"/>
+    </ItemContainer>
   </Item>
 
   <Item
@@ -127,7 +129,9 @@
       <sprite texture="engigear.png" limb="LeftLeg" sourcerect="33,77,20,51" origin="0.5,0.5" depth="0.15" hidelimb="true"/>
     </Wearable>
 
-    <ItemContainer containable="smallitem" capacity="5"/>
+    <ItemContainer capacity="5">
+      <Containable name="smallitem"/>
+    </ItemContainer>
   </Item>
 </Items>
 
diff --git a/Subsurface/Content/Quests.xml b/Subsurface/Content/Quests.xml
index 666c2f833..281ca49a1 100644
--- a/Subsurface/Content/Quests.xml
+++ b/Subsurface/Content/Quests.xml
@@ -9,7 +9,7 @@
     failuremessage="Retrieving the artifact failed"
     successmessage="The artifact has been succesfully retrieved"
     itemname="Skyholder Artifact">
-    <message header="Artifact collected" message="The artifact is now on board. Navigate the submarine out of the cavern to claim the reward."/>
+    <message header="Artifact collected" text="The artifact is now on board. Navigate the submarine out of the cavern to claim the reward."/>
   </SalvageQuest>
 
   <SalvageQuest
@@ -21,7 +21,7 @@
     failuremessage="Retrieving the artifact failed"
     successmessage="The artifact has been succesfully retrieved"
     itemname="Thermal Artifact">
-    <message header="Artifact collected" message="The artifact is now on board. Navigate the submarine out of the cavern to claim the reward."/>
+    <message header="Artifact collected" text="The artifact is now on board. Navigate the submarine out of the cavern to claim the reward."/>
   </SalvageQuest>
 
   <MonsterQuest
@@ -32,7 +32,7 @@
     radarlabel="Moloch"
     successmessage="The Moloch has been killed."
     monsterfile="Content/Characters/Moloch/moloch.xml">
-    <message header="Target terminated" message="The moloch is dead. Navigate the submarine out of the cavern to claim the reward."/>
+    <message header="Target terminated" text="The moloch is dead. Navigate the submarine out of the cavern to claim the reward."/>
   </MonsterQuest>
 
   <MonsterQuest
@@ -43,7 +43,7 @@
     radarlabel="Tiger Thresher"
     successmessage="The Tiger Thresher has been killed."
     monsterfile="Content/Characters/TigerThresher/tigerthresher.xml">
-    <message header="Target terminated" message="The thresher is dead. Navigate the submarine out of the cavern to claim the reward."/>
+    <message header="Target terminated" text="The thresher is dead. Navigate the submarine out of the cavern to claim the reward."/>
   </MonsterQuest>
 
   <MonsterQuest
diff --git a/Subsurface/Source/Items/Inventory.cs b/Subsurface/Source/Items/Inventory.cs
index 0a67f83f5..41420f01b 100644
--- a/Subsurface/Source/Items/Inventory.cs
+++ b/Subsurface/Source/Items/Inventory.cs
@@ -208,8 +208,6 @@ namespace Barotrauma
         {
             bool mouseOn = rect.Contains(PlayerInput.MousePosition);
 
-            DrawSlot(spriteBatch, rect, (draggingItem == item && !mouseOn) ? null : item, mouseOn, isSubSlot, drawItem);
-
             if (mouseOn)
             {
                 if (draggingItem == null)
@@ -226,18 +224,27 @@ namespace Barotrauma
                         doubleClickedItem = item;
                     }
 
-                    selectedSlot = slotIndex;
+                    //selectedSlot = slotIndex;
                     TryPutItem(draggingItem, slotIndex);
                     draggingItem = null;
                 }
 
-                if (!isSubSlot) selectedSlot = slotIndex;
+                if (!isSubSlot && selectedSlot == -1)
+                {
+                    System.Diagnostics.Debug.WriteLine("DSFG");
+                    selectedSlot = slotIndex;
+                }
             }
 
-            if (selectedSlot == slotIndex)
+            if (selectedSlot == slotIndex && !isSubSlot)
             {
+                System.Diagnostics.Debug.WriteLine("sdfg: "+selectedSlot+" - "+slotIndex);
+
+                selectedSlot = -1;
+
                 if (item == null) return;
 
+
                 int itemCapacity = item.Capacity;
                 if (itemCapacity == 0) return;
 
@@ -247,25 +254,36 @@ namespace Barotrauma
                 if (slotIndex<0 || slotIndex>=items.Length) return;
 #endif
 
+                Rectangle containerRect = new Rectangle(rect.X - 5, rect.Y - (40 + 10) * itemCapacity - 5,
+                        rect.Width + 10, rect.Height + (40 + 10) * itemCapacity + 10);
+
+                Rectangle subRect = rect;
+                subRect.Height = 40;
 
-                Rectangle containerRect = new Rectangle(rect.X - 5, rect.Y - (rect.Height + 10) * itemCapacity - 5,
-                        rect.Width + 10, rect.Height + (rect.Height + 10) * itemCapacity + 10);
 
                 selectedSlot = containerRect.Contains(PlayerInput.MousePosition) ? slotIndex : -1;
+                System.Diagnostics.Debug.WriteLine(selectedSlot);
 
+                GUI.DrawRectangle(spriteBatch, containerRect, Color.Black*0.8f, true);
                 GUI.DrawRectangle(spriteBatch, containerRect, Color.White);
 
                 Item[] containedItems = null;
                 if (items[slotIndex] != null) containedItems = items[slotIndex].ContainedItems;
 
-                if (containedItems == null || !containedItems.Any()) return;
-
-                for (int i = 0; i < itemCapacity; i++)
+                if (containedItems != null) 
                 {
-                    rect.Y = rect.Y - rect.Height - 10;
-                    UpdateSlot(spriteBatch, rect, selectedSlot, i < containedItems.Count() ? containedItems[i] : null, true);
+                    for (int i = 0; i < itemCapacity; i++)
+                    {
+                        subRect.Y = subRect.Y - subRect.Height - 10;
+                        UpdateSlot(spriteBatch, subRect, selectedSlot, i < containedItems.Count() ? containedItems[i] : null, true);
+                    }
                 }
+
+
             }
+
+            DrawSlot(spriteBatch, rect, (draggingItem == item && !mouseOn) ? null : item, mouseOn, isSubSlot, drawItem);
+
         }
 
         protected void DrawSlot(SpriteBatch spriteBatch, Rectangle rect, Item item, bool isHighLighted, bool isSubSlot, bool drawItem=true)
diff --git a/Subsurface_Solution.v12.suo b/Subsurface_Solution.v12.suo
index 2860880c5a103ac8ed565932d795ee597dc71700..0ee4a6faa01d248b4883bdfd18c6411adc492327 100644
GIT binary patch
delta 8635
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

delta 8248
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