Fixed Love Lab Hearts! (#905)

* Fixed Hearts(???????)

* """Fixed""" hearts

* Fixed Love Lab Hearts!

(well okay there's still a *tiny* visual glitch I'm not sure how to attack yet but this is infinitely better than what it was)

* Fixed furry animations to be more accurate

Assets/Resources/Games/loveLab.prefab

@@ -596,6 +596,7 @@ Transform:
   - {fileID: 4352296737110256235}
   - {fileID: 7647075704793663215}
   - {fileID: 8099365789100165778}
+  - {fileID: 7620821406320402323}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -661,6 +662,7 @@ MonoBehaviour:
   canCallForFlask: 1
   isHolding: 0
   counter: 0
+  startBeat: 0
   clouds: {fileID: 1922318453852840058}
   cloudSpeed: 0.06
   cloudDistance: 30
@@ -683,7 +685,8 @@ MonoBehaviour:
   girlHearts: []
   completeHearts: []
   currentHearts: 
-  endPoint: {fileID: 1217812902585448614}
+  endPoint: {fileID: 7492619980896112047}
+  spawnPoint: {x: 2.7, y: 0}
   shaderColorsDebug:
   - _ColorAlpha
   - _ColorBravo
@@ -12179,6 +12182,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 3181055819505295525}
+  - component: {fileID: 5727956151531486914}
   m_Layer: 0
   m_Name: Heart (1)
   m_TagString: Untagged
@@ -12202,6 +12206,43 @@ Transform:
   m_Father: {fileID: 3429383938462062733}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &5727956151531486914
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1482603683011656876}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4ac4985fbd444824ba80ae18fc8d0fc6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  whatHeartType: 2
+  prevHeartBeat: 0
+  heartBeat: 0
+  nextHeartBeat: 0
+  heartAnim: {fileID: 2267575062970559703}
+  death: {fileID: 3634140067569462563}
+  outline: {fileID: 1482603683011656876}
+  fill: {fileID: 1482603683011656876}
+  stop: 0
+  addPos: 0
+  startPos: 0
+  length: 0
+  heartCount: 0
+  hasChecked: 0
+  playBackSpeed: 0
+  intervalSpeed: 0
+  _step: 0
+  tweenComplete: 0
+  onlyOne: 1
+  end: {x: 0, y: 0, z: 0}
+  timer: 0
+  isWaiting: 1
+  dropStart: {x: 0, y: 0, z: 0}
+  currentBeat: 0
+  endValue: 0
 --- !u!1 &1508548489959844048
 GameObject:
   m_ObjectHideFlags: 0
@@ -13860,6 +13901,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 8457364593320657144}
+  - component: {fileID: 4013968317955737354}
   m_Layer: 0
   m_Name: Heart (2)
   m_TagString: Untagged
@@ -13883,6 +13925,43 @@ Transform:
   m_Father: {fileID: 3429383938462062733}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4013968317955737354
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2467223038916596584}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4ac4985fbd444824ba80ae18fc8d0fc6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  whatHeartType: 0
+  prevHeartBeat: 0
+  heartBeat: 0
+  nextHeartBeat: 0
+  heartAnim: {fileID: 3007423772511442550}
+  death: {fileID: 3625583753263701273}
+  outline: {fileID: 2467223038916596584}
+  fill: {fileID: 2467223038916596584}
+  stop: 0
+  addPos: 0
+  startPos: 0
+  length: 0
+  heartCount: 0
+  hasChecked: 0
+  playBackSpeed: 0
+  intervalSpeed: 0
+  _step: 0
+  tweenComplete: 0
+  onlyOne: 1
+  end: {x: 0, y: 0, z: 0}
+  timer: 0
+  isWaiting: 1
+  dropStart: {x: 0, y: 0, z: 0}
+  currentBeat: 0
+  endValue: 0
 --- !u!1 &2545510530621710180
 GameObject:
   m_ObjectHideFlags: 0
@@ -19409,7 +19488,7 @@ Transform:
   m_Children:
   - {fileID: 3368113456851434604}
   - {fileID: 7766427145776930279}
-  - {fileID: 1217812902585448614}
+  - {fileID: 7492619980896112047}
   m_Father: {fileID: 878409105178889012}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -31375,6 +31454,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1987359879521276587}
+  - component: {fileID: 3803804922883146632}
   m_Layer: 0
   m_Name: Heart
   m_TagString: Untagged
@@ -31398,6 +31478,43 @@ Transform:
   m_Father: {fileID: 3429383938462062733}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3803804922883146632
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4559355415321406050}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4ac4985fbd444824ba80ae18fc8d0fc6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  whatHeartType: 1
+  prevHeartBeat: 0
+  heartBeat: 0
+  nextHeartBeat: 0
+  heartAnim: {fileID: 4861883477444535933}
+  death: {fileID: 4409609671814389056}
+  outline: {fileID: 4559355415321406050}
+  fill: {fileID: 4559355415321406050}
+  stop: 0
+  addPos: 0
+  startPos: 0
+  length: 0
+  heartCount: 0
+  hasChecked: 0
+  playBackSpeed: 0
+  intervalSpeed: 0
+  _step: 0
+  tweenComplete: 0
+  onlyOne: 1
+  end: {x: 0, y: 0, z: 0}
+  timer: 0
+  isWaiting: 1
+  dropStart: {x: 0, y: 0, z: 0}
+  currentBeat: 0
+  endValue: 0
 --- !u!1 &4711397537335041467
 GameObject:
   m_ObjectHideFlags: 0
@@ -31941,37 +32058,6 @@ Transform:
   m_Father: {fileID: 4352296737110256235}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &5142976589145930095
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1217812902585448614}
-  m_Layer: 0
-  m_Name: EndPoint
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1217812902585448614
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5142976589145930095}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 4674094147555684652}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &5307057251015753346
 GameObject:
   m_ObjectHideFlags: 0
@@ -32542,6 +32628,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 605755663413265918}
+  - component: {fileID: 3930674089318777729}
   m_Layer: 0
   m_Name: Heart (3)
   m_TagString: Untagged
@@ -32565,6 +32652,43 @@ Transform:
   m_Father: {fileID: 3429383938462062733}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3930674089318777729
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5720462754445386488}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4ac4985fbd444824ba80ae18fc8d0fc6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  whatHeartType: 2
+  prevHeartBeat: 0
+  heartBeat: 0
+  nextHeartBeat: 0
+  heartAnim: {fileID: 6103692014218111335}
+  death: {fileID: 3014678009227994866}
+  outline: {fileID: 5720462754445386488}
+  fill: {fileID: 5720462754445386488}
+  stop: 0
+  addPos: 0
+  startPos: 0
+  length: 0
+  heartCount: 0
+  hasChecked: 0
+  playBackSpeed: 0
+  intervalSpeed: 0
+  _step: 0
+  tweenComplete: 0
+  onlyOne: 1
+  end: {x: 0, y: 0, z: 0}
+  timer: 0
+  isWaiting: 1
+  dropStart: {x: 0, y: 0, z: 0}
+  currentBeat: 0
+  endValue: 0
 --- !u!1 &5748955415339632706
 GameObject:
   m_ObjectHideFlags: 0
@@ -40081,6 +40205,37 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!1 &7784569542689620913
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7492619980896112047}
+  m_Layer: 0
+  m_Name: EndPoint
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7492619980896112047
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7784569542689620913}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.013117568, y: 1.63773, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4674094147555684652}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &7802884331815006546
 GameObject:
   m_ObjectHideFlags: 0
@@ -45805,6 +45960,37 @@ Transform:
   m_Father: {fileID: 7132799052978497352}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8709141480864242041
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7620821406320402323}
+  m_Layer: 0
+  m_Name: spawnPoint
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7620821406320402323
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8709141480864242041}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -2.7, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 878409105178889012}
+  m_RootOrder: 12
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &8858862843781676607
 GameObject:
   m_ObjectHideFlags: 0

Assets/Resources/Prefabs/Games/LoveLab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 18333e51c9fad9e41a8c51c6ef857983
+guid: 6ff8cdd9dc207a34288b4961d175d83e
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Resources/Sfx/games/LoveLab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bcbc46590d08f424792fb2fbb6ff48f0
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sfx/games/LoveLab/bagHeart.ogg.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 5001c1cad8515ad4799f21e3902c54df
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sfx/games/LoveLab/bagHeartLast.ogg.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 5d365840c1c0a2c499b90e74f8c44f9a
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sfx/games/LoveLab/data.json

@@ -0,0 +1,498 @@
+{
+  "id": "loveLab",
+  "name": "Love Lab",
+  "series": "ds",
+  "objects": [
+    {
+      "type": "cue",
+      "id": "*/shakeUp",
+      "name": "shake - up",
+      "deprecatedIDs": [
+        "loveLab/shake1"
+      ],
+      "subtext": "",
+      "duration": 0.25,
+      "responseIDs": [
+        "*/shakeUp"
+      ]
+    },
+    {
+      "type": "cue",
+      "id": "*/shakeDown",
+      "name": "shake - down",
+      "deprecatedIDs": [
+        "loveLab/shake2"
+      ],
+      "subtext": "",
+      "duration": 0.25,
+      "responseIDs": [
+        "*/shakeDown"
+      ]
+    },
+    {
+      "type": "cue",
+      "id": "*/leftCatch",
+      "name": "left - catch",
+      "deprecatedIDs": [],
+      "subtext": "",
+      "duration": 0.5,
+      "responseIDs": [
+        "*/rightCatch"
+      ]
+    },
+    {
+      "type": "cue",
+      "id": "*/leftThrow",
+      "name": "left - throw",
+      "deprecatedIDs": [],
+      "subtext": "",
+      "duration": 0.5,
+      "responseIDs": [
+        "*/rightThrow"
+      ]
+    },
+    {
+      "type": "cue",
+      "id": "*/rightCatch",
+      "name": "right - catch",
+      "deprecatedIDs": [],
+      "subtext": "",
+      "duration": 0.5
+    },
+    {
+      "type": "cue",
+      "id": "*/rightThrow",
+      "name": "right - throw",
+      "deprecatedIDs": [],
+      "subtext": "",
+      "duration": 0.5
+    },
+    {
+      "type": "cue",
+      "id": "*/rightThrowNoShake",
+      "name": "right - throw - no shake",
+      "deprecatedIDs": [],
+      "subtext": "",
+      "duration": 0.5
+    },
+    {
+      "type": "cue",
+      "id": "*/heartsCombine",
+      "name": "hearts - combine",
+      "deprecatedIDs": [
+        "loveLab/heartCombine"
+      ],
+      "subtext": "",
+      "duration": 1.0
+    },
+    {
+      "type": "cue",
+      "id": "*/bagHeart",
+      "name": "bag - heart",
+      "deprecatedIDs": [
+        "loveLab/heartBag"
+      ],
+      "subtext": "",
+      "duration": 0.0625,
+      "repitchable": true
+    },
+    {
+      "type": "cue",
+      "id": "*/bagHeartLast",
+      "name": "bag - last heart",
+      "deprecatedIDs": [
+        "loveLab/heartBagLong"
+      ],
+      "subtext": "",
+      "duration": 0.0625,
+      "repitchable": true
+    },
+    {
+      "type": "pattern",
+      "id": "*_1heart",
+      "name": "1 heart pattern",
+      "deprecatedIDs": [],
+      "cues": [
+        {
+          "id": "*/leftCatch",
+          "beat": 0.0
+        },
+        {
+          "id": "*/leftThrow",
+          "beat": 1.0
+        },
+        {
+          "id": "*/rightCatch",
+          "beat": 2.0
+        },
+        {
+          "id": "*/rightThrow",
+          "beat": 3.0
+        },
+        {
+          "id": "*/heartsCombine",
+          "beat": 4.0
+        },
+        {
+          "id": "*/bagHeartLast",
+          "beat": 5.25
+        }
+      ],
+      "subtext": ""
+    },
+    {
+      "type": "pattern",
+      "id": "*_1heartOffbeat",
+      "name": "1 heart offbeat pattern",
+      "deprecatedIDs": [],
+      "cues": [
+        {
+          "id": "*/leftCatch",
+          "beat": 0.0
+        },
+        {
+          "id": "*/leftThrow",
+          "beat": 0.5
+        },
+        {
+          "id": "*/rightCatch",
+          "beat": 2.0
+        },
+        {
+          "id": "*/rightThrow",
+          "beat": 2.5
+        },
+        {
+          "id": "*/heartsCombine",
+          "beat": 3.5
+        },
+        {
+          "id": "*/bagHeartLast",
+          "beat": 4.75
+        }
+      ],
+      "subtext": ""
+    },
+    {
+      "type": "pattern",
+      "id": "*_2heart",
+      "name": "2 heart pattern",
+      "deprecatedIDs": [],
+      "cues": [
+        {
+          "id": "*/leftCatch",
+          "beat": 0.0
+        },
+        {
+          "id": "*/shakeUp",
+          "beat": 0.5
+        },
+        {
+          "id": "*/shakeDown",
+          "beat": 0.75
+        },
+        {
+          "id": "*/leftThrow",
+          "beat": 1.0
+        },
+        {
+          "id": "*/rightCatch",
+          "beat": 2.0
+        },
+        {
+          "id": "*/shakeUp",
+          "beat": 2.5
+        },
+        {
+          "id": "*/shakeDown",
+          "beat": 2.75
+        },
+        {
+          "id": "*/rightThrow",
+          "beat": 3.0
+        },
+        {
+          "id": "*/heartsCombine",
+          "beat": 4.0
+        },
+        {
+          "id": "*_heartPour2",
+          "beat": 5.25
+        }
+      ],
+      "subtext": ""
+    },
+    {
+      "type": "pattern",
+      "id": "*_3heart",
+      "name": "3 heart pattern",
+      "deprecatedIDs": [],
+      "cues": [
+        {
+          "id": "*/leftCatch",
+          "beat": 0.0
+        },
+        {
+          "id": "*/shakeUp",
+          "beat": 1.0
+        },
+        {
+          "id": "*/shakeDown",
+          "beat": 1.25
+        },
+        {
+          "id": "*/shakeUp",
+          "beat": 1.5
+        },
+        {
+          "id": "*/shakeDown",
+          "beat": 1.75
+        },
+        {
+          "id": "*/leftThrow",
+          "beat": 2.0
+        },
+        {
+          "id": "*/rightCatch",
+          "beat": 4.0
+        },
+        {
+          "id": "*/shakeUp",
+          "beat": 5.0
+        },
+        {
+          "id": "*/shakeDown",
+          "beat": 5.25
+        },
+        {
+          "id": "*/shakeUp",
+          "beat": 5.5
+        },
+        {
+          "id": "*/shakeDown",
+          "beat": 5.75
+        },
+        {
+          "id": "*/rightThrow",
+          "beat": 6.0
+        },
+        {
+          "id": "*/heartsCombine",
+          "beat": 7.0
+        },
+        {
+          "id": "*_heartPour3",
+          "beat": 8.25
+        }
+      ],
+      "subtext": ""
+    },
+    {
+      "type": "pattern",
+      "id": "*_5heart",
+      "name": "5 heart pattern",
+      "deprecatedIDs": [],
+      "cues": [
+        {
+          "id": "*/leftCatch",
+          "beat": 0.0
+        },
+        {
+          "id": "*/shakeUp",
+          "beat": 0.5
+        },
+        {
+          "id": "*/shakeDown",
+          "beat": 0.75
+        },
+        {
+          "id": "*/shakeUp",
+          "beat": 1.0
+        },
+        {
+          "id": "*/shakeDown",
+          "beat": 1.25
+        },
+        {
+          "id": "*/shakeUp",
+          "beat": 2.0
+        },
+        {
+          "id": "*/shakeDown",
+          "beat": 2.25
+        },
+        {
+          "id": "*/shakeUp",
+          "beat": 2.5
+        },
+        {
+          "id": "*/shakeDown",
+          "beat": 2.75
+        },
+        {
+          "id": "*/leftThrow",
+          "beat": 3.0
+        },
+        {
+          "id": "*/rightCatch",
+          "beat": 4.0
+        },
+        {
+          "id": "*/shakeUp",
+          "beat": 4.5
+        },
+        {
+          "id": "*/shakeDown",
+          "beat": 4.75
+        },
+        {
+          "id": "*/shakeUp",
+          "beat": 5.0
+        },
+        {
+          "id": "*/shakeDown",
+          "beat": 5.25
+        },
+        {
+          "id": "*/shakeUp",
+          "beat": 6.0
+        },
+        {
+          "id": "*/shakeDown",
+          "beat": 6.25
+        },
+        {
+          "id": "*/shakeUp",
+          "beat": 6.5
+        },
+        {
+          "id": "*/shakeDown",
+          "beat": 6.75
+        },
+        {
+          "id": "*/rightThrow",
+          "beat": 7.0
+        },
+        {
+          "id": "*/heartsCombine",
+          "beat": 8.0
+        },
+        {
+          "id": "*_heartPour5",
+          "beat": 9.25
+        }
+      ],
+      "subtext": ""
+    },
+    {
+      "type": "pattern",
+      "id": "*_heartPour2",
+      "name": "bag - 2 hearts",
+      "deprecatedIDs": [
+        "loveLab/heartPour2"
+      ],
+      "cues": [
+        {
+          "id": "*/bagHeart",
+          "beat": 0.0
+        },
+        {
+          "id": "*/bagHeartLast",
+          "beat": 0.0625,
+          "semitone": 2
+        }
+      ],
+      "subtext": ""
+    },
+    {
+      "type": "pattern",
+      "id": "*_heartPour3",
+      "name": "bag - 3 hearts",
+      "deprecatedIDs": [
+        "loveLab/heartPour3"
+      ],
+      "cues": [
+        {
+          "id": "*/bagHeart",
+          "beat": 0.0
+        },
+        {
+          "id": "*/bagHeart",
+          "beat": 0.0625,
+          "semitone": 2
+        },
+        {
+          "id": "*/bagHeartLast",
+          "beat": 0.125,
+          "semitone": 4
+        }
+      ],
+      "subtext": ""
+    },
+    {
+      "type": "pattern",
+      "id": "*_heartPour4",
+      "name": "bag - 4 hearts",
+      "deprecatedIDs": [
+        "loveLab/heartPour4"
+      ],
+      "cues": [
+        {
+          "id": "*/bagHeart",
+          "beat": 0.0
+        },
+        {
+          "id": "*/bagHeart",
+          "beat": 0.0625,
+          "semitone": 2
+        },
+        {
+          "id": "*/bagHeart",
+          "beat": 0.125,
+          "semitone": 4
+        },
+        {
+          "id": "*/bagHeartLast",
+          "beat": 0.1875,
+          "semitone": 7
+        }
+      ],
+      "subtext": ""
+    },
+    {
+      "type": "pattern",
+      "id": "*_heartPour5",
+      "name": "bag - 5 hearts",
+      "deprecatedIDs": [
+        "loveLab/heartPour5"
+      ],
+      "cues": [
+        {
+          "id": "*/bagHeart",
+          "beat": 0.0
+        },
+        {
+          "id": "*/bagHeart",
+          "beat": 0.0625,
+          "semitone": 2
+        },
+        {
+          "id": "*/bagHeart",
+          "beat": 0.125,
+          "semitone": 4
+        },
+        {
+          "id": "*/bagHeart",
+          "beat": 0.1875,
+          "semitone": 7
+        },
+        {
+          "id": "*/bagHeartLast",
+          "beat": 0.25,
+          "semitone": 8
+        }
+      ],
+      "subtext": ""
+    }
+  ]
+}

Assets/Resources/Sfx/games/LoveLab/data.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 96fc052bc6321d6468b281f578a38615
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sfx/games/LoveLab/heartsCombine.ogg.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 6ad78a65458497e4bbf5e014b13cd4aa
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sfx/games/LoveLab/icon.png.meta

@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: d4088c23eec591647aef842b5d2338e7
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sfx/games/LoveLab/leftCatch.ogg.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: f5c958dfd94eed64499ffdd58f22bec1
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sfx/games/LoveLab/leftThrow.ogg.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 3df8bda7d85675940b2a63118ff3a8a0
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sfx/games/LoveLab/rightCatch.ogg.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 8fe1b51137560cd4c945c63b54dbbe8e
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sfx/games/LoveLab/rightThrow.ogg.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 5ce08fb206f01ee45aa9a7f56901cead
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sfx/games/LoveLab/rightThrowNoShake.ogg.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 543cd551a7aa7da4d853683ae285c548
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sfx/games/LoveLab/shakeDown.ogg.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 418d00ec2fb656046a2e60e19bf03221
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sfx/games/LoveLab/shakeUp.ogg.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 9788272175a86d247b7748c46fb739a1
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sprites/Games/LoveLab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7a3a6850f8f2c3a4e84b5fa400e0345a
+guid: 2cf138e649216b240ac16d46232ea2a1
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Resources/Sprites/Games/LoveLab/Animations/Arm.controller

@@ -1,5 +1,31 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1102 &-8450846382201522188
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: MittenGrabStart
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: cbccd1a1ba3434b4fa99e77aba5e4074, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1102 &-7635207036721169125
 AnimatorState:
   serializedVersion: 6
@@ -220,6 +246,9 @@ AnimatorStateMachine:
   - serializedVersion: 1
     m_State: {fileID: 6443092733853443119}
     m_Position: {x: 550, y: 650, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -8450846382201522188}
+    m_Position: {x: 585, y: 715, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []

Assets/Resources/Sprites/Games/LoveLab/Animations/HeartIdle.anim

@@ -28,7 +28,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.06666667
+        time: 0.13333334
         value: {x: -0.039, y: 0, z: 0}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
@@ -37,7 +37,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.13333334
+        time: 0.26666668
         value: {x: -0.072, y: 0, z: 0}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
@@ -46,7 +46,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.23333333
+        time: 0.46666667
         value: {x: -0.039, y: 0, z: 0}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
@@ -55,7 +55,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.3
+        time: 0.6
         value: {x: 0, y: 0, z: 0}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
@@ -90,7 +90,7 @@ AnimationClip:
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 0.3
+    m_StopTime: 0.6
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0
@@ -119,7 +119,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.06666667
+        time: 0.13333334
         value: -0.039
         inSlope: Infinity
         outSlope: Infinity
@@ -128,7 +128,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.13333334
+        time: 0.26666668
         value: -0.072
         inSlope: Infinity
         outSlope: Infinity
@@ -137,7 +137,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.23333333
+        time: 0.46666667
         value: -0.039
         inSlope: Infinity
         outSlope: Infinity
@@ -146,7 +146,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.3
+        time: 0.6
         value: 0
         inSlope: Infinity
         outSlope: Infinity
@@ -173,15 +173,6 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.06666667
-        value: 0
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.13333334
         value: 0
@@ -192,7 +183,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.23333333
+        time: 0.26666668
         value: 0
         inSlope: Infinity
         outSlope: Infinity
@@ -201,7 +192,16 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.3
+        time: 0.46666667
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.6
         value: 0
         inSlope: Infinity
         outSlope: Infinity
@@ -228,15 +228,6 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.06666667
-        value: 0
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.13333334
         value: 0
@@ -247,7 +238,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.23333333
+        time: 0.26666668
         value: 0
         inSlope: Infinity
         outSlope: Infinity
@@ -256,7 +247,16 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.3
+        time: 0.46666667
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.6
         value: 0
         inSlope: Infinity
         outSlope: Infinity

Assets/Resources/Sprites/Games/LoveLab/Animations/MittenGrabStart.anim

@@ -0,0 +1,663 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: MittenGrabStart
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: 0, y: 0, z: -3.11}
+        inSlope: {x: Infinity, y: 0, z: 0}
+        outSlope: {x: Infinity, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: Sleeve
+  m_PositionCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: -1.445, y: -1.095, z: 0}
+        inSlope: {x: Infinity, y: 0, z: 0}
+        outSlope: {x: Infinity, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: Flask
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: -1.4440001, y: -0.94200003, z: 0}
+        inSlope: {x: Infinity, y: 0, z: 0}
+        outSlope: {x: Infinity, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: Hand
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: -0.694, y: -0.399, z: 0}
+        inSlope: {x: Infinity, y: 0, z: 0}
+        outSlope: {x: Infinity, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: Sleeve
+  m_ScaleCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: 0.53132063, y: 0.5313206, z: 0.5313206}
+        inSlope: {x: Infinity, y: 0, z: 0}
+        outSlope: {x: Infinity, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: Sleeve
+  m_FloatCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: Flask
+    classID: 1
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: ImpactLeft
+    classID: 1
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: ImpactRight
+    classID: 1
+    script: {fileID: 0}
+  m_PPtrCurves:
+  - curve:
+    - time: 0
+      value: {fileID: -1142424825, guid: 32b8969086bedeb45b1cb9a4a9c5cddb, type: 3}
+    attribute: m_Sprite
+    path: Flask
+    classID: 212
+    script: {fileID: 0}
+  - curve:
+    - time: 0
+      value: {fileID: 1306806546, guid: 32b8969086bedeb45b1cb9a4a9c5cddb, type: 3}
+    attribute: m_Sprite
+    path: Hand
+    classID: 212
+    script: {fileID: 0}
+  - curve:
+    - time: 0
+      value: {fileID: 1476451571, guid: 32b8969086bedeb45b1cb9a4a9c5cddb, type: 3}
+    attribute: m_Sprite
+    path: Sleeve
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 4144374205
+      attribute: 1
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 2270227889
+      attribute: 1
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 1631782123
+      attribute: 1
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 1631782123
+      attribute: 4
+      script: {fileID: 0}
+      typeID: 4
+      customType: 4
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 1631782123
+      attribute: 3
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 4144374205
+      attribute: 2086281974
+      script: {fileID: 0}
+      typeID: 1
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 3569047711
+      attribute: 2086281974
+      script: {fileID: 0}
+      typeID: 1
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 2545798676
+      attribute: 2086281974
+      script: {fileID: 0}
+      typeID: 1
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 4144374205
+      attribute: 0
+      script: {fileID: 0}
+      typeID: 212
+      customType: 23
+      isPPtrCurve: 1
+    - serializedVersion: 2
+      path: 2270227889
+      attribute: 0
+      script: {fileID: 0}
+      typeID: 212
+      customType: 23
+      isPPtrCurve: 1
+    - serializedVersion: 2
+      path: 1631782123
+      attribute: 0
+      script: {fileID: 0}
+      typeID: 212
+      customType: 23
+      isPPtrCurve: 1
+    pptrCurveMapping:
+    - {fileID: -1142424825, guid: 32b8969086bedeb45b1cb9a4a9c5cddb, type: 3}
+    - {fileID: 1306806546, guid: 32b8969086bedeb45b1cb9a4a9c5cddb, type: 3}
+    - {fileID: 1476451571, guid: 32b8969086bedeb45b1cb9a4a9c5cddb, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.016666668
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 1
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: -1.445
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.x
+    path: Flask
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: -1.095
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.y
+    path: Flask
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.z
+    path: Flask
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: Flask
+    classID: 1
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: -1.4440001
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.x
+    path: Hand
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: -0.94200003
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.y
+    path: Hand
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.z
+    path: Hand
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: ImpactLeft
+    classID: 1
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: ImpactRight
+    classID: 1
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: -0.694
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.x
+    path: Sleeve
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: -0.399
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.y
+    path: Sleeve
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.z
+    path: Sleeve
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: localEulerAnglesRaw.x
+    path: Sleeve
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: localEulerAnglesRaw.y
+    path: Sleeve
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: -3.11
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: localEulerAnglesRaw.z
+    path: Sleeve
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.53132063
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalScale.x
+    path: Sleeve
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.5313206
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalScale.y
+    path: Sleeve
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.5313206
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalScale.z
+    path: Sleeve
+    classID: 4
+    script: {fileID: 0}
+  m_EulerEditorCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalEulerAngles.x
+    path: Sleeve
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalEulerAngles.y
+    path: Sleeve
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalEulerAngles.z
+    path: Sleeve
+    classID: 4
+    script: {fileID: 0}
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []

Assets/Resources/Sprites/Games/LoveLab/Animations/MittenGrabStart.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cbccd1a1ba3434b4fa99e77aba5e4074
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sprites/Games/LoveLab/Flask.mat

@@ -84,7 +84,7 @@ Material:
     m_Colors:
     - _AddColor: {r: 0, g: 0, b: 0, a: 0}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _ColorAlpha: {r: 0.02909997, g: 0.4054601, b: 0.97, a: 1}
+    - _ColorAlpha: {r: 0.043137245, g: 0.074509725, b: 0.34901962, a: 1}
     - _ColorBravo: {r: 1, g: 1, b: 1, a: 1}
     - _ColorDelta: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Resources/Sprites/Games/LoveLab/GirlFlask.mat

@@ -84,7 +84,7 @@ Material:
     m_Colors:
     - _AddColor: {r: 0, g: 0, b: 0, a: 0}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _ColorAlpha: {r: 0.972549, g: 0.3764706, b: 0.03137255, a: 1}
+    - _ColorAlpha: {r: 0.91611767, g: 0.86906433, b: 0.16539083, a: 1}
     - _ColorBravo: {r: 1, g: 1, b: 1, a: 1}
     - _ColorDelta: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Resources/Sprites/Games/LoveLab/WeirdFlask.mat

@@ -84,7 +84,7 @@ Material:
     m_Colors:
     - _AddColor: {r: 0, g: 0, b: 0, a: 0}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _ColorAlpha: {r: 0.8313726, g: 0.2039216, b: 0.5058824, a: 1}
+    - _ColorAlpha: {r: 0, g: 0.6472839, b: 0.03720841, a: 1}
     - _ColorBravo: {r: 1, g: 1, b: 1, a: 1}
     - _ColorDelta: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Scripts/Games/LoveLab/LoveLab.cs

@@ -65,6 +65,7 @@ namespace HeavenStudio.Games.Loaders
                 {
                     function = delegate { LoveLab.instance.mainBoxGuy(e.currentEntity.beat, e.currentEntity["type"]); },
                     defaultLength = 2f,
+                    resizable = false,
                     parameters = new List<Param>()
                     {
                         new Param("type", LoveLab.boxGuyAction.takeAway, "Action", "Box Guy's Actions")
@@ -122,9 +123,10 @@ namespace HeavenStudio.Games.Loaders
                     priority = 1
                 }
             }
-        //new List<string>() { "ntr", "normal" },
+        //new List<string>() { "ntr", "repeat" },
         //"ntrlab", "en",
         //new List<string>() { "en" }
+        //chronologicalSortKey: 19
         );
     }
 }
@@ -206,6 +208,8 @@ namespace HeavenStudio.Games
         bool isLong = false;
         int isLongCount = 0;
         bool canCloudsMove = true;
+        bool hasShakenUp = false;
+        public double startBeat;
 
         [Header("Clouds")]
         [SerializeField] GameObject clouds;
@@ -238,6 +242,7 @@ namespace HeavenStudio.Games
         List<PlayerActionEvent> currentEvents;
         [SerializeField] List<int> currentHearts;
         [SerializeField] Transform endPoint;
+        [SerializeField] Vector3 spawnPoint;
         #endregion
 
 
@@ -389,10 +394,17 @@ namespace HeavenStudio.Games
                     Destroy(flaskObj);
                     weirdInstantiatedFlask.RemoveAt(0);
 
-                    labAssistantArm.DoScaledAnimationAsync("MittenGrab", 1f);
+                    labAssistantArm.DoScaledAnimationAsync("MittenGrabStart", 1f);
                 }),
 
-                new BeatAction.Action(beat + (addBeat + .5f), delegate
+                new BeatAction.Action(beat + (addBeat+1f), delegate
+                {
+
+                    labAssistantArm.DoScaledAnimationAsync("MittenGrab", 1f);
+                }),
+                
+
+                new BeatAction.Action(beat + (addBeat + 1.5f), delegate
                 {
                     labAssistantArm.DoScaledAnimationAsync("MittenLetGo", .5f);
                 }),
@@ -707,7 +719,7 @@ namespace HeavenStudio.Games
                 }
                 else
                 {
-                    ScheduleInput(beat, (length + addForEndBeat) + addDelay, InputAction_DPad, onUp, onMiss, onEmpty);
+                    ScheduleInput(beat, (length + addForEndBeat) + addDelay, IA_DPadPressing, onUp, onMiss, onEmpty);
                 }
 
             }
@@ -832,6 +844,7 @@ namespace HeavenStudio.Games
 
         public static void onUp(PlayerActionEvent caller, float beat)
         {
+            instance.hasShakenUp = true;
             SoundByte.PlayOneShotGame("loveLab/shakeUp");
             instance.labGirlArm.DoScaledAnimationAsync("ShakeFlaskUp");
             LoveLabHearts gh = Instantiate(instance.girlHeartObj, instance.heartHolder).GetComponent<LoveLabHearts>();
@@ -845,12 +858,14 @@ namespace HeavenStudio.Games
 
         public static void onDownAuto(PlayerActionEvent caller, float beat)
         {
+            instance.hasShakenUp = false;
             SoundByte.PlayOneShotGame("loveLab/shakeDown");
             instance.labGirlArm.DoScaledAnimationAsync("ShakeFlaskDown");
         }
 
         public static void onRelease(PlayerActionEvent caller, float beat)
         {
+            instance.hasShakenUp = false;
             instance.labGirlHead.DoScaledAnimationAsync("GirlIdleFace");
             SoundByte.PlayOneShotGame("loveLab/rightThrowNoShake");
             instance.labGirlArm.DoScaledAnimationAsync("ThrowFlask");
@@ -876,11 +891,13 @@ namespace HeavenStudio.Games
 
                     SoundByte.PlayOneShotGame("loveLab/heartsCombine");
 
-                    foreach(LoveLabHearts h in instance.girlHearts)
+                     foreach(LoveLabHearts h in instance.girlHearts)
                     {
                         h.stop = true;
                     }
 
+                    var additionalHearts = 0.063f;
+
                     for(int x = 0; x < instance.currentHearts[0]; x++)
                     {
                         instance.guyHearts[0].heartAnim.Play("HeartMerge");
@@ -888,25 +905,35 @@ namespace HeavenStudio.Games
 
                         LoveLabHearts a = Instantiate(instance.completeHeartObj, instance.heartHolder).GetComponent<LoveLabHearts>();
                         a.transform.position = new Vector2(a.transform.position.x, instance.girlHearts[0].transform.position.y);
+                        var additionalHeartLength = (0.063f * instance.girlHearts.Count);
                         a.heartBeat = caller.startBeat + caller.timer + 1f;
-                        a.end = instance.endPoint;
+                        a.dropStart = a.transform.position;
+                        a.end = instance.endPoint.position;
                         instance.completeHearts.Add(a);
-
+                        a.timer = (2.25f + additionalHeartLength);
+                        a.isWaiting = false;
                         //a.goDown();
 
                         instance.guyHearts.RemoveAt(0);
                         instance.girlHearts.RemoveAt(0);
                     }
 
-                    var additionalHearts = 0.063f;
-
-                    for(int x = 0; x < lastCounter; x++)
-                    {
-                        //Debug.LogWarning(2.25f + (additionalHearts * x));
-                        instance.completeHearts[x].timer = (2.25f + (additionalHearts * x));
-                    }
-
                     instance.currentHearts.RemoveAt(0);
+
+
+
+                    //for(int x = 0; x < lastCounter, x++)
+                    //{
+                        //Debug.LogWarning(2.25f + (additionalHearts * x));
+                        //instance.completeHearts[x].dropStart = instance.completeHearts[x].transform.position;
+                        
+                        //instance.completeHearts[x].timer = (2.25f + (additionalHearts * x));
+                        //instance.completeHearts[x].isWaiting = false;
+                    //}
+                    
+
+                    
+                    //instance.currentHearts.Clear();
                 }),
             });
 
@@ -946,6 +973,7 @@ namespace HeavenStudio.Games
             //SoundByte.PlayOneShot("miss");
             if (instance.hasMissed) return;
 
+            instance.hasShakenUp = false;
             instance.isHolding = false;
             instance.hasMissed = true;
             instance.labGuyHead.DoScaledAnimationAsync("GuyIdleFace");
@@ -1205,22 +1233,35 @@ namespace HeavenStudio.Games
             catch { }
         }
 
+        protected static bool IA_TouchDpadPress(out double dt)
+        {
+            
+            return PlayerInput.GetSlide(out dt) &&  !instance.hasShakenUp;
+        }
+        protected static bool IA_TouchDpadRelease(out double dt)
+        {
+            
+            return PlayerInput.GetSlide(out dt) &&  instance.hasShakenUp;
+        }
+
+
+
 
         #region IA
         const int IA_AltPress = IAMAXCAT;
 
         public static PlayerInput.InputAction IA_FlickPress =
             new("NtrLabFlickPress", new int[] { IAPressCat, IAFlickCat, IAPressCat },
-            IA_PadBasicPress, IA_TouchFlick, IA_BatonBasicPress);
+            IA_PadBasicPress, IA_TouchBasicPressing, IA_BatonBasicPress);
         public static PlayerInput.InputAction IA_FlickRelease =
             new("NtrLabFlickRelease", new int[] { IAReleaseCat, IAFlickCat, IAReleaseCat },
             IA_PadBasicRelease, IA_TouchFlick, IA_BatonBasicRelease);
         public static PlayerInput.InputAction IA_DPadRelease =
             new("NtrLabDPadRelease", new int[] { IAReleaseCat, IAFlickCat, IAReleaseCat },
-                IA_PadAnyUp, IA_TouchFlick, IA_BatonBasicRelease);
+                IA_PadAnyUp, IA_TouchDpadRelease, IA_BatonBasicRelease);
         public static PlayerInput.InputAction IA_DPadPressing =
-            new("NtrLabDPadRelease", new int[] { IAReleaseCat, IAFlickCat, IAReleaseCat },
+            new("NtrLabDPadPress", new int[] { IAReleaseCat, IAFlickCat, IAReleaseCat },
-                IA_PadAnyPressingDown, IA_TouchBasicPressing, IA_BatonBasicPressing);
+                IA_PadAnyPressingDown, IA_TouchDpadPress, IA_BatonBasicPressing);
 
         protected static bool IA_TouchNrmPress(out double dt)
         {
@@ -1408,6 +1449,8 @@ namespace HeavenStudio.Games
             var cond = Conductor.instance;
             var songPos = cond.songPositionInBeatsAsDouble;
 
+            float normalizedBeat = Conductor.instance.GetPositionFromBeat(startBeat, 5f);
+
             if (!cond.isPlaying)
             {
                 preChecks(songPos);
@@ -1419,10 +1462,10 @@ namespace HeavenStudio.Games
                 {
                     foreach (QueuedFlask flask in queuedFlask)
                     {
-                        switch (flask.type)
+                        //switch (flask.type)
-                        {
+                        //{
-                        
+                        //
-                        }
+                        //}
                     }
                     queuedFlask.Clear();
                 }
@@ -1440,24 +1483,44 @@ namespace HeavenStudio.Games
             {
                 Debug.LogWarning("whiff");
                 labGirlArm.DoScaledAnimationAsync("WhiffGrab");
+                
                 isHolding = true;
+
+                
             }
             else if (PlayerInput.GetIsAction(InputAction_BasicRelease) && !IsExpectingInputNow(InputAction_BasicRelease))
             {
                 labGirlArm.DoScaledAnimationAsync("ArmIdle");
+                instance.hasShakenUp = false;
                 isHolding = false;
             }
 
             #endregion
 
+                
+
             #region whiff up and down
             if (PlayerInput.GetIsAction(IA_DPadPressing) && PlayerInput.GetIsAction(InputAction_BasicPressing) && (!IsExpectingInputNow(IA_DPadPressing) && !IsExpectingInputNow(IA_DPadRelease)))
             {
-                onWhiffUp();
+                
+                    onWhiffUp();
+
+                    if (PlayerInput.CurrentControlStyle == InputController.ControlStyles.Touch)
+                {
+                    instance.hasShakenUp = true;
+                }
+            
             }
             else if (PlayerInput.GetIsAction(IA_DPadRelease) && PlayerInput.GetIsAction(InputAction_BasicPressing) && (!IsExpectingInputNow(IA_DPadRelease) && !IsExpectingInputNow(IA_DPadPressing)))
             {
-                onWhiffDown();
+
+                    onWhiffDown();
+
+                    if (PlayerInput.CurrentControlStyle == InputController.ControlStyles.Touch)
+                {
+                    instance.hasShakenUp = false;
+                }
+
             }
             #endregion
 
@@ -1577,11 +1640,13 @@ namespace HeavenStudio.Games
         #region Lab Girl Actions
         public void onWhiffUp()
         {
+            if (hasShakenUp && PlayerInput.CurrentControlStyle == InputController.ControlStyles.Touch) return;
             labGirlArm.DoScaledAnimationAsync("WhiffUp", 0.75f);
         }
 
         public void onWhiffDown()
         {
+            if (!hasShakenUp && PlayerInput.CurrentControlStyle == InputController.ControlStyles.Touch) return;
             labGirlArm.DoScaledAnimationAsync("WhiffDown", 0.75f);
         }
 

Assets/Scripts/Games/LoveLab/LoveLabHearts.cs

@@ -38,14 +38,18 @@ namespace HeavenStudio.Games.Scripts_LoveLab
         double endTime;
         public int heartCount;
         public bool hasChecked;
-        float playBackSpeed;
+        public float playBackSpeed;
         public double intervalSpeed;
         public float _step;
         public bool tweenComplete;
         Tween movePos;
         public bool onlyOne = true;
-        public Transform end;
+        public Vector3 end;
         public double timer;
+        public bool isWaiting = true;
+        SpriteRenderer heartRenderer;
+        public Vector3 dropStart;
+        public double currentBeat;
 
         //y = 0 (endpoint)
 
@@ -62,7 +66,8 @@ namespace HeavenStudio.Games.Scripts_LoveLab
         }
 
         private void Awake()
-        {
+        {if (whatHeartType != heartType.completeHeart)
+            {
             if(heartCount == 0)
             {
                 transform.position = new Vector2(transform.position.x, transform.position.y + 2f);
@@ -71,21 +76,33 @@ namespace HeavenStudio.Games.Scripts_LoveLab
             {
                 transform.position = new Vector2(transform.position.x, transform.position.y + 4f);
             }
+            }
             
             playBackSpeed = Timeline.instance.PlaybackSpeed.value;
             addPos = 2.5f; //3f
+            heartRenderer = this.GetComponent<SpriteRenderer>();
+            //dropStart = new Vector3 (transform.position.x, origPos.y+(addPos), transform.position.z);
+            
         }
 
         void Start()
         {
+            DOTween.SetTweensCapacity(2000, 100);
             game = LoveLab.instance;
             cond = Conductor.instance;
             timeLine = Timeline.instance;
             origPos = transform.position;
             //Debug.LogWarning(testContainer);
             speedMultiplier = game.speedForHeartsMultiplier;
+            //end.position = new Vector2(-2.7f, -3f);
             //test = (((float)intervalSpeed / cond.GetBpmAtBeat(heartBeat)) * playBackSpeed);
 
+            //var currentBeat = cond.songPositionInBeatsAsDouble;
+            //if (whatHeartType == heartType.completeHeart)
+            //{
+            //    tempDestroy(currentBeat+1.25f); //temporary until I can get the drop to work -- Wook
+            //}
+
             if(heartCount == 0)
             {
                 _step = 1;
@@ -101,21 +118,27 @@ namespace HeavenStudio.Games.Scripts_LoveLab
             //{
             //    addPos = 1.5f;
             //}
-            DOTween.timeScale = playBackSpeed;
+            //DOTween.timeScale = playBackSpeed;
             var a = (float)(length * cond.secPerBeat) / playBackSpeed;
-            Debug.LogWarning("Length: " + length);
+            //Debug.LogWarning("Length: " + length);
-            Debug.LogWarning("Sec per beat: " + cond.secPerBeat);
+            //Debug.LogWarning("Sec per beat: " + cond.secPerBeat);
-            Debug.LogWarning("Playback: " + playBackSpeed);
+            //Debug.LogWarning("Playback: " + playBackSpeed);
-            debugSmth<float>(ref a);
+            //debugSmth<float>(ref a);
             endValue = transform.position.y + addPos;
-            upTween = transform.DOMoveY(endValue, (float)((length * cond.secPerBeat) / playBackSpeed)).SetEase(Ease.OutBack).OnComplete(restartTween);
+            upTween = transform.DOMoveY(endValue, (float)((length * cond.secPerBeat) / playBackSpeed)).SetEase(Ease.OutBack);
+            //.OnComplete(restartTween);
 
             //s
         }
 
         public void debugSmth<T>(ref T idk)
         {
-            Debug.LogWarning(idk);
+            //Debug.LogWarning(idk);
+        }
+
+        public void startDrop()
+        {
+            
         }
 
         public void updateBeat()
@@ -128,17 +151,15 @@ namespace HeavenStudio.Games.Scripts_LoveLab
             transform.position = new Vector3(transform.position.x, transform.position.y + .1f * playBackSpeed);
         }
 
-        public void restartTween()
+        
-        {
-            upTween.ChangeEndValue(endValue);
-            upTween.Restart();
-        }
 
         public Tweener upTween;
         public float endValue;
 
         void FixedUpdate()
         {
+            currentBeat = cond.songPositionInBeatsAsDouble;
+
             if(!stop && whatHeartType != heartType.completeHeart)
             {
                 //DOTween.timeScale = .7f * playBackSpeed;
@@ -150,31 +171,92 @@ namespace HeavenStudio.Games.Scripts_LoveLab
                 //transform.DOMoveY(origPos.y + (addPos), (float)((intervalSpeed / cond.GetBpmAtBeat(heartBeat)) * 60)).SetEase(Ease.OutBack);
                 //transform.DOMoveY(origPos.y + (addPos), (float)((intervalSpeed * cond.secPerBeat / cond.GetBpmAtBeat(heartBeat)) * 60) * playBackSpeed).SetEase(Ease.OutBack);
                 //transform.DOMoveY(origPos.y + (addPos), (float)((intervalSpeed * cond.secPerBeat / cond.GetBpmAtBeat(heartBeat)) * 60) * playBackSpeed).SetEase(Ease.OutBack);
-                // goUp((float)((intervalSpeed * cond.secPerBeat / cond.GetBpmAtBeat(heartBeat)) * 60) * playBackSpeed);
+                goUp((float)((intervalSpeed * cond.secPerBeat / cond.GetBpmAtBeat(heartBeat)) * 60) * playBackSpeed);
-                //goUp((float)((length * cond.secPerBeat)) / playBackSpeed);    
+                //goUp((float)((length*cond.secPerBeat))/playBackSpeed);
-                upTween.ChangeEndValue(endValue);
+                //DOTween.timeScale = playBackSpeed;
-                var t = ((float)cond.secPerBeat * length) * (transform.position.y - origPos.y) / ((origPos.y + addPos) - origPos.y);
+                //DOTween.timeScale = cond.pitchedSecPerBeat;
-                upTween.Goto((float)t, true);
+                //float normalizedBeat = Conductor.instance.GetPositionFromBeat(heartBeat, length);
+                //if (normalizedBeat <= 1) goUp((float)(((length * cond.secPerBeat)) / playBackSpeed));    
+                //upTween.ChangeEndValue(new Vector3(transform.position.x, endValue, transform.position.z));
+                //var t = ((float)cond.secPerBeat * length) * (transform.position.y - origPos.y) / addPos;
+                //upTween.Goto((float)t, true);
             }
-            else if(whatHeartType == heartType.completeHeart)
+            else if (!isWaiting)
             {
-                transform.DOMoveY(-1f, (float)(cond.secPerBeat / intervalSpeed) * playBackSpeed).SetEase(Ease.InBack);
+
+                float normalizedBeat = Conductor.instance.GetPositionFromBeat(heartBeat, ((timer/2)*playBackSpeed));
+                
+                float newPosY = EasingFunction.EaseInQuad(dropStart.y, end.y, normalizedBeat);
+
+                if (normalizedBeat<=1) transform.position = new Vector2(dropStart.x, newPosY);
+                else Destroy(this.gameObject);
+                //else destroyWhenDone();
+
+                //if (normalizedBeat >= 1) {destroyWhenDone();}
+                //transform.position = Vector2.Lerp(dropStart, end.position, newPosY);
+                //transform.position = new Vector2(transform.position.x, newPosY);
+
+                //if (isWaiting)
+                //{
+                    
+                    //transform.DOMoveY(transform.position.y, (float)(cond.secPerBeat / intervalSpeed) * playBackSpeed).SetEase(Ease.InBack);
+                //}
+                //else if (!isWaiting)
+                //{
+                    //DOTween.timeScale = cond.songPositionInBeats;
+                    
+                    //HandleHeartDrop( (float)timer);
+                //}
+                //transform.DOMoveY(transform.position.y, (float)(cond.secPerBeat / intervalSpeed) * playBackSpeed).SetEase(Ease.InBack);
+                //goDown();
+                
             }
+            //else {transform.position = new Vector2(dropStart.x, dropStart.y);}
 
             //transform.position = Vector3.Lerp(origPos, new Vector3(origPos.x, origPos.y + addPos), Mathf.SmoothStep(0, 1, testContainer));
         }
 
         public void goUp(float timer)
         {
+            
             transform.DOMoveY(origPos.y + (addPos), timer).SetEase(Ease.OutBack);
+            //float newPosY = EasingFunction.EaseInQuad(origPos.y, (origPos.y+(addPos)), timer);
+            //transform.position = new Vector2(transform.position.x, newPosY);
         }
 
         public void goDown()
         {
-            Debug.LogWarning("go down");
+            //DOTween.timeScale = cond.pitchedSecPerBeat;
+            //transform.DOLocalMoveY(end.position.y, (float)timer).From(true).SetEase(Ease.InBack);
+            //Debug.LogWarning("go down");
+            
+            //DOTween.timeScale = playBackSpeed;
             //DOTween.timeScale = cond.secPerBeat * playBackSpeed;
-            transform.DOMoveY(end.position.y, 2.25f).SetEase(Ease.OutBack);
+            //double fallingTimeScale = cond.secPerBeat * playBackSpeed;
-            // sorting layer = 1020
+            
+            //transform.DOMoveY(end.position.y, 2.25f).SetEase(Ease.InBack);
+             //sorting layer = 1020
+        }
+
+        public void HandleHeartDrop(float fallDuration, double currentBeat)
+        {
+
+           
+
+
+            //float dropTimeScale = length * cond.pitchedSecPerBeat;
+            //float newYValue = Mathf.Lerp(dropStart.y, end.position.y, dropTimeScale);
+            //transform.position = new Vector3 (transform.position.x, newYValue, transform.position.z);
+            //heartRenderer.sortingOrder = 1020;
+            //float dropTimeScale = (length/cond.secPerBeat)/playBackSpeed;
+            //transform.DOMove (new Vector2 (transform.position.x, end.position.y), ((length*cond.pitchedSecPerBeat)), false).SetEase(Ease.InQuad);
+            //if (transform.position.y == end.position.y) destroyWhenDone();
+
+            //var currentBeat = cond.songPositionInBeatsAsDouble;
+            //float currentBeatPosition = ((float)currentBeat*fallDuration);
+            ////float newPosY = EasingFunction.EaseInSine(dropStart.y, end.position.y, currentBeatPosition);
+            //transform.position = new Vector2(transform.position.x, newPosY);
+            
         }
         
 
@@ -183,6 +265,15 @@ namespace HeavenStudio.Games.Scripts_LoveLab
             Destroy(this.gameObject);
         }
 
+        public void tempDestroy(double startBeat)
+        {
+            BeatAction.New(game, new List<BeatAction.Action>()
+            {
+            new BeatAction.Action(startBeat + 1f, delegate
+                {Destroy(this.gameObject);}),});
+
+        }
+
         public async void deadHeart()
         {
             //just instantiate this shit idk

Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs

@@ -383,6 +383,16 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader NtrBackbeatLoader failed!");
             }
 
+            game = NtrLabLoader.AddGame(eventCaller);
+            if (game != null)
+            {
+                eventCaller.minigames.Add(game.name, game);
+            }
+            else
+            {
+                Debug.LogWarning("Game loader NtrLabLoader failed!");
+            }
+
             game = CtrLumBEARjackLoader.AddGame(eventCaller);
             if (game != null)
             {

ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset

@@ -396,5 +396,9 @@ MonoBehaviour:
   - Assets/Scripts/Games/Fireworks/Fireworks.cs
   - Assets/X-PostProcessing/Effects/ColorAdjustmentHue/Editor/ColorAdjustmentHueEditor.cs
   - Assets/Scripts/Games/FlipperFlop/FlipperFlop.cs
+  - Assets/Scripts/Games/LoveLab/LoveLabHearts.cs
+  - Assets/Scripts/Games/LoveLab/LoveLab.cs
+  - Assets/Scripts/Games/LoveLab/LoveLabFlask.cs
+  - Assets/Scripts/Games/LoveLab/LoveLabHeartMisc.cs
   PathsToSkipImportEvent: []
   PathsToIgnoreOverwriteSettingOnAttribute: []