Fixed bug occuring when assigning fact during hint-animation + Set default of...

Fixed bug occuring when assigning fact during hint-animation + Set default of selected scroll to OppositeLen

Assets/Scenes/Release/TreeWorld_Release_02.unity

@@ -44005,6 +44005,11 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 75
       objectReference: {fileID: 0}
+    - target: {fileID: 293934904814280933, guid: b996060e27da25c498842defc1996d84,
+        type: 3}
+      propertyPath: preferredStartScrollName
+      value: OppositeLen
+      objectReference: {fileID: 0}
     - target: {fileID: 293934904949885392, guid: b996060e27da25c498842defc1996d84,
         type: 3}
       propertyPath: m_AnchoredPosition.y

Assets/Scenes/TreeWorld.unity

@@ -44328,6 +44328,11 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 150
       objectReference: {fileID: 0}
+    - target: {fileID: 293934904814280933, guid: b996060e27da25c498842defc1996d84,
+        type: 3}
+      propertyPath: preferredStartScrollName
+      value: OppositeLen
+      objectReference: {fileID: 0}
     - target: {fileID: 293934904949885392, guid: b996060e27da25c498842defc1996d84,
         type: 3}
       propertyPath: m_AnchoredPosition.y

Assets/Scripts/InteractionEngine/ImageHintAnimation.cs

@@ -5,7 +5,7 @@
 public class ImageHintAnimation : MonoBehaviour
 {
     public Image imageToChange;
-    private Color imageToChangeDefaultColor;
+    public Color imageToChangeDefaultColor { get; set; }
 
     private Color animationStartColor;
     private Color animationEndColor;
@@ -42,13 +42,19 @@ public void AnimationTrigger()
         }
     }
 
+    public void ResetAnimation()
+    {
+        if (imageToChange != null)
+        {
+            Reset();
+        }
+    }
+
     private void Animate()
     {
         if (timer >= animateDuration)
         {
-            animating = false;
-            timer = 0;
-            imageToChange.color = imageToChangeDefaultColor;
+            Reset();
         }
         else
         {
@@ -57,6 +63,13 @@ private void Animate()
 
     }
 
+    private void Reset()
+    {
+        animating = false;
+        timer = 0;
+        imageToChange.color = imageToChangeDefaultColor;
+    }
+
     private void updateAnimationParameters() {
         animationStartColor = globalSettings.hintAnimationStartColor;
         animationEndColor = globalSettings.hintAnimationEndColor;

Assets/Scripts/InventoryStuff/DisplayScrolls.cs

@@ -7,6 +7,8 @@
 
 public class DisplayScrolls : MonoBehaviour
 {
+    public string preferredStartScrollName;
+
     public List<Scroll> scrolls;
     public GameObject[] ScrollButtons;
     public GameObject ScrollPrefab;
@@ -98,6 +100,11 @@ void BuildScrolls(string jsonString)
             obj.transform.GetChild(0).gameObject.GetComponent<TextMeshProUGUI>().text = this.scrolls[i].label;
             ScrollButtons[i] = obj;
         }
-        this.DetailScreen.GetComponent<ScrollDetails>().setScroll(this.scrolls[0]);
+
+        Scroll preferredStartScroll = this.scrolls.Find(x => x.label.Equals(preferredStartScrollName));
+        if(preferredStartScroll != null)
+            this.DetailScreen.GetComponent<ScrollDetails>().setScroll(preferredStartScroll);
+        else
+            this.DetailScreen.GetComponent<ScrollDetails>().setScroll(this.scrolls[0]);
     }
 }

Assets/Scripts/InventoryStuff/DropHandling.cs

@@ -16,6 +16,10 @@ public void OnDrop(PointerEventData eventData){
         Destroy(current);
 
         current = Instantiate(eventData.pointerDrag,Vector3.zero, Quaternion.identity);
+        //Set imageToChangeDefaultColor of current: Fix so that current won't take the color
+        //the dragged item was having during animation
+        current.GetComponent<ImageHintAnimation>().imageToChangeDefaultColor = eventData.pointerDrag.GetComponent<ImageHintAnimation>().imageToChangeDefaultColor;
+        current.GetComponent<ImageHintAnimation>().ResetAnimation();
 
         current.transform.SetParent(gameObject.transform, false);