diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini index 6f8f30975..38f15e642 100644 --- a/Config/DefaultInput.ini +++ b/Config/DefaultInput.ini @@ -108,8 +108,8 @@ DoubleClickTime=0.200000 +ActionMappings=(ActionName="SLGenericTrigger",bShift=False,bCtrl=False,bAlt=True,bCmd=False,Key=N) +ActionMappings=(ActionName="VizQCineCamTrigger",bShift=False,bCtrl=False,bAlt=True,bCmd=False,Key=K) +ActionMappings=(ActionName="VizQCineCamEffectTrigger",bShift=False,bCtrl=False,bAlt=True,bCmd=False,Key=J) -+ActionMappings=(ActionName="SLAudioStartTrigger",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Vive_Right_Trackpad_Up) -+ActionMappings=(ActionName="SLAudioStopTrigger",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Vive_Right_Trackpad_Down) ++ActionMappings=(ActionName="SLAudioStopTrigger",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=X) ++ActionMappings=(ActionName="SLAudioStartTrigger",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Y) +AxisMappings=(AxisName="LeftGrasp",Scale=1.000000,Key=Vive_Left_Trigger_Axis) +AxisMappings=(AxisName="RightGrasp",Scale=1.000000,Key=Vive_Right_Trigger_Axis) DefaultPlayerInputClass=/Script/EnhancedInput.EnhancedPlayerInput diff --git a/Config/DefaultRos.ini b/Config/DefaultRos.ini index 4f6f7c5d3..23a3e3b7b 100644 --- a/Config/DefaultRos.ini +++ b/Config/DefaultRos.ini @@ -1,5 +1,5 @@ [/Script/UROSBridge.RosSettings] -ROSBridgeServerHost=192.168.101.245 +ROSBridgeServerHost=192.168.56.101 diff --git a/Config/SteamVRBindings/steamvr_manifest.json b/Config/SteamVRBindings/steamvr_manifest.json index 917c6cbde..5ba19dd41 100644 --- a/Config/SteamVRBindings/steamvr_manifest.json +++ b/Config/SteamVRBindings/steamvr_manifest.json @@ -183,14 +183,6 @@ "name": "/actions/main/in/RightGraspHelper", "type": "boolean" }, - { - "name": "/actions/main/in/SLAudioStartTrigger", - "type": "boolean" - }, - { - "name": "/actions/main/in/SLAudioStopTrigger", - "type": "boolean" - }, { "name": "/actions/main/in/LeftGrasp axis", "type": "vector1" @@ -449,8 +441,6 @@ "/actions/main/in/SLTrigger": "SLTrigger", "/actions/main/in/LeftGraspHelper": "LeftGraspHelper", "/actions/main/in/RightGraspHelper": "RightGraspHelper", - "/actions/main/in/SLAudioStartTrigger": "SLAudioStartTrigger", - "/actions/main/in/SLAudioStopTrigger": "SLAudioStopTrigger", "/actions/main/in/LeftGrasp axis": "LeftGrasp", "/actions/main/in/RightGrasp axis": "RightGrasp", "/actions/main": "Main Game Actions" diff --git a/Config/SteamVRBindings/vive_controller.json b/Config/SteamVRBindings/vive_controller.json index 56011b367..d7ea78afa 100644 --- a/Config/SteamVRBindings/vive_controller.json +++ b/Config/SteamVRBindings/vive_controller.json @@ -141,36 +141,6 @@ } } }, - { - "mode": "dpad", - "path": "/user/hand/right/input/trackpad", - "parameters": - { - "sub_mode": "click" - }, - "inputs": - { - "north": - { - "output": "/actions/main/in/SLAudioStartTrigger" - } - } - }, - { - "mode": "dpad", - "path": "/user/hand/right/input/trackpad", - "parameters": - { - "sub_mode": "click" - }, - "inputs": - { - "south": - { - "output": "/actions/main/in/SLAudioStopTrigger" - } - } - }, { "mode": "trigger", "path": "/user/hand/left/input/trigger", diff --git a/Content/Levels/Laborraum.umap b/Content/Levels/Laborraum.umap index 7addfa30c..6f462d489 100644 Binary files a/Content/Levels/Laborraum.umap and b/Content/Levels/Laborraum.umap differ diff --git a/Content/Maps/Apartment/Breakfast_Map_1.umap b/Content/Maps/Apartment/Breakfast_Map_1.umap new file mode 100644 index 000000000..b9b83642c Binary files /dev/null and b/Content/Maps/Apartment/Breakfast_Map_1.umap differ diff --git a/Content/Maps/Apartment/Main.umap b/Content/Maps/Apartment/Main.umap index fba367082..f4f784217 100644 Binary files a/Content/Maps/Apartment/Main.umap and b/Content/Maps/Apartment/Main.umap differ diff --git a/Content/Maps/Simulation/MaxFullness/BP_Simulator_MaxFullness_SMBlueCup.uasset b/Content/Maps/Simulation/MaxFullness/BP_Simulator_MaxFullness_SMBlueCup.uasset index c31423ba5..8071136a4 100644 Binary files a/Content/Maps/Simulation/MaxFullness/BP_Simulator_MaxFullness_SMBlueCup.uasset and b/Content/Maps/Simulation/MaxFullness/BP_Simulator_MaxFullness_SMBlueCup.uasset differ diff --git a/Content/Maps/Simulation/PouringSimulator_1.umap b/Content/Maps/Simulation/PouringSimulator_1.umap index c2310287a..ea5b0fe46 100644 Binary files a/Content/Maps/Simulation/PouringSimulator_1.umap and b/Content/Maps/Simulation/PouringSimulator_1.umap differ diff --git a/Content/Maps/Simulation/SM_Blue_cup/BP_SM_Blue_Cup25.uasset b/Content/Maps/Simulation/SM_Blue_cup/BP_SM_Blue_Cup25.uasset new file mode 100644 index 000000000..352c8e83f Binary files /dev/null and b/Content/Maps/Simulation/SM_Blue_cup/BP_SM_Blue_Cup25.uasset differ diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_BigBowl/BP_SM_Blue_Cup100.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_BigBowl/BP_SM_Blue_Cup100.uasset new file mode 100644 index 000000000..2b86a15db Binary files /dev/null and b/Content/Maps/Simulation/SM_Blue_cup/DestSM_BigBowl/BP_SM_Blue_Cup100.uasset differ diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_BigBowl/BP_SM_Blue_Cup25.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_BigBowl/BP_SM_Blue_Cup25.uasset new file mode 100644 index 000000000..546e1a00f Binary files /dev/null and b/Content/Maps/Simulation/SM_Blue_cup/DestSM_BigBowl/BP_SM_Blue_Cup25.uasset differ diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_BigBowl/BP_SM_Blue_Cup50.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_BigBowl/BP_SM_Blue_Cup50.uasset new file mode 100644 index 000000000..09541eba2 Binary files /dev/null and b/Content/Maps/Simulation/SM_Blue_cup/DestSM_BigBowl/BP_SM_Blue_Cup50.uasset differ diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_BigBowl/BP_SM_Blue_Cup75.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_BigBowl/BP_SM_Blue_Cup75.uasset new file mode 100644 index 000000000..1dc0dc2ec Binary files /dev/null and b/Content/Maps/Simulation/SM_Blue_cup/DestSM_BigBowl/BP_SM_Blue_Cup75.uasset differ diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_Blue_Cup/BP_SM_Blue_Cup100.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_Blue_Cup/BP_SM_Blue_Cup100.uasset new file mode 100644 index 000000000..96cf0323e Binary files /dev/null and b/Content/Maps/Simulation/SM_Blue_cup/DestSM_Blue_Cup/BP_SM_Blue_Cup100.uasset differ diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_Blue_Cup/BP_SM_Blue_Cup25.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_Blue_Cup/BP_SM_Blue_Cup25.uasset new file mode 100644 index 000000000..c2a9aac71 Binary files /dev/null and b/Content/Maps/Simulation/SM_Blue_cup/DestSM_Blue_Cup/BP_SM_Blue_Cup25.uasset differ diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_Blue_Cup/BP_SM_Blue_Cup50.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_Blue_Cup/BP_SM_Blue_Cup50.uasset new file mode 100644 index 000000000..025ca50fd Binary files /dev/null and b/Content/Maps/Simulation/SM_Blue_cup/DestSM_Blue_Cup/BP_SM_Blue_Cup50.uasset differ diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_Blue_Cup/BP_SM_Blue_Cup75.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_Blue_Cup/BP_SM_Blue_Cup75.uasset new file mode 100644 index 000000000..7f7d1fcfc Binary files /dev/null and b/Content/Maps/Simulation/SM_Blue_cup/DestSM_Blue_Cup/BP_SM_Blue_Cup75.uasset differ diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_Cup/BP_SM_Blue_Cup100.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_Cup/BP_SM_Blue_Cup100.uasset new file mode 100644 index 000000000..579b127e3 Binary files /dev/null and b/Content/Maps/Simulation/SM_Blue_cup/DestSM_Cup/BP_SM_Blue_Cup100.uasset differ diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_Cup/BP_SM_Blue_Cup25.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_Cup/BP_SM_Blue_Cup25.uasset new file mode 100644 index 000000000..b7d938e22 Binary files /dev/null and b/Content/Maps/Simulation/SM_Blue_cup/DestSM_Cup/BP_SM_Blue_Cup25.uasset differ diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_Cup/BP_SM_Blue_Cup50.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_Cup/BP_SM_Blue_Cup50.uasset new file mode 100644 index 000000000..e18559bac Binary files /dev/null and b/Content/Maps/Simulation/SM_Blue_cup/DestSM_Cup/BP_SM_Blue_Cup50.uasset differ diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_Cup/BP_SM_Blue_Cup75.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_Cup/BP_SM_Blue_Cup75.uasset new file mode 100644 index 000000000..389871a67 Binary files /dev/null and b/Content/Maps/Simulation/SM_Blue_cup/DestSM_Cup/BP_SM_Blue_Cup75.uasset differ diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_EspressoCup/BP_SM_Blue_Cup100.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_EspressoCup/BP_SM_Blue_Cup100.uasset new file mode 100644 index 000000000..17491a77a Binary files /dev/null and b/Content/Maps/Simulation/SM_Blue_cup/DestSM_EspressoCup/BP_SM_Blue_Cup100.uasset differ diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_MilkPitcher/BP_SM_Blue_Cup100.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_MilkPitcher/BP_SM_Blue_Cup100.uasset new file mode 100644 index 000000000..32445a747 Binary files /dev/null and b/Content/Maps/Simulation/SM_Blue_cup/DestSM_MilkPitcher/BP_SM_Blue_Cup100.uasset differ diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_MilkPitcher/BP_SM_Blue_Cup25.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_MilkPitcher/BP_SM_Blue_Cup25.uasset new file mode 100644 index 000000000..f7ac7512a Binary files /dev/null and b/Content/Maps/Simulation/SM_Blue_cup/DestSM_MilkPitcher/BP_SM_Blue_Cup25.uasset differ diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_MilkPitcher/BP_SM_Blue_Cup50.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_MilkPitcher/BP_SM_Blue_Cup50.uasset new file mode 100644 index 000000000..faef2b9e8 Binary files /dev/null and b/Content/Maps/Simulation/SM_Blue_cup/DestSM_MilkPitcher/BP_SM_Blue_Cup50.uasset differ diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_MilkPitcher/BP_SM_Blue_Cup75.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_MilkPitcher/BP_SM_Blue_Cup75.uasset new file mode 100644 index 000000000..9860453da Binary files /dev/null and b/Content/Maps/Simulation/SM_Blue_cup/DestSM_MilkPitcher/BP_SM_Blue_Cup75.uasset differ diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_RedBowl/BP_SM_Blue_Cup100.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_RedBowl/BP_SM_Blue_Cup100.uasset new file mode 100644 index 000000000..0d0a49d22 Binary files /dev/null and b/Content/Maps/Simulation/SM_Blue_cup/DestSM_RedBowl/BP_SM_Blue_Cup100.uasset differ diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_RedBowl/BP_SM_Blue_Cup25.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_RedBowl/BP_SM_Blue_Cup25.uasset new file mode 100644 index 000000000..7aee14c2e Binary files /dev/null and b/Content/Maps/Simulation/SM_Blue_cup/DestSM_RedBowl/BP_SM_Blue_Cup25.uasset differ diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_RedBowl/BP_SM_Blue_Cup50.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_RedBowl/BP_SM_Blue_Cup50.uasset new file mode 100644 index 000000000..62b5d4af2 Binary files /dev/null and b/Content/Maps/Simulation/SM_Blue_cup/DestSM_RedBowl/BP_SM_Blue_Cup50.uasset differ diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_RedBowl/BP_SM_Blue_Cup75.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_RedBowl/BP_SM_Blue_Cup75.uasset new file mode 100644 index 000000000..28d3c73ba Binary files /dev/null and b/Content/Maps/Simulation/SM_Blue_cup/DestSM_RedBowl/BP_SM_Blue_Cup75.uasset differ diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSMCup/BP_SMBigBowl100.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSMCup/BP_SMBigBowl100.uasset index dddea1703..8052e1e03 100644 Binary files a/Content/Maps/Simulation/SourceBigBowl/DestSMCup/BP_SMBigBowl100.uasset and b/Content/Maps/Simulation/SourceBigBowl/DestSMCup/BP_SMBigBowl100.uasset differ diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSMCup/BP_SMBigBowl25.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSMCup/BP_SMBigBowl25.uasset new file mode 100644 index 000000000..32030a81a Binary files /dev/null and b/Content/Maps/Simulation/SourceBigBowl/DestSMCup/BP_SMBigBowl25.uasset differ diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSMCup/BP_SMBigBowl50.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSMCup/BP_SMBigBowl50.uasset index a55b1fe7e..04aa149b6 100644 Binary files a/Content/Maps/Simulation/SourceBigBowl/DestSMCup/BP_SMBigBowl50.uasset and b/Content/Maps/Simulation/SourceBigBowl/DestSMCup/BP_SMBigBowl50.uasset differ diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSMCup/BP_SMBigBowl75.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSMCup/BP_SMBigBowl75.uasset new file mode 100644 index 000000000..02dfd1b7e Binary files /dev/null and b/Content/Maps/Simulation/SourceBigBowl/DestSMCup/BP_SMBigBowl75.uasset differ diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_BigBowl/BP_SMBigBowl100.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_BigBowl/BP_SMBigBowl100.uasset new file mode 100644 index 000000000..cc953e8e8 Binary files /dev/null and b/Content/Maps/Simulation/SourceBigBowl/DestSM_BigBowl/BP_SMBigBowl100.uasset differ diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_BigBowl/BP_SMBigBowl25.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_BigBowl/BP_SMBigBowl25.uasset new file mode 100644 index 000000000..180fc8c7b Binary files /dev/null and b/Content/Maps/Simulation/SourceBigBowl/DestSM_BigBowl/BP_SMBigBowl25.uasset differ diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_BigBowl/BP_SMBigBowl50.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_BigBowl/BP_SMBigBowl50.uasset new file mode 100644 index 000000000..0d76549e5 Binary files /dev/null and b/Content/Maps/Simulation/SourceBigBowl/DestSM_BigBowl/BP_SMBigBowl50.uasset differ diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_BigBowl/BP_SMBigBowl75.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_BigBowl/BP_SMBigBowl75.uasset new file mode 100644 index 000000000..1cceaae54 Binary files /dev/null and b/Content/Maps/Simulation/SourceBigBowl/DestSM_BigBowl/BP_SMBigBowl75.uasset differ diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl10.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl10.uasset deleted file mode 100644 index cfe9cba5c..000000000 Binary files a/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl10.uasset and /dev/null differ diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl100.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl100.uasset new file mode 100644 index 000000000..1c9169c0e Binary files /dev/null and b/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl100.uasset differ diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl25.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl25.uasset index 03a5b98f2..e3b0647d2 100644 Binary files a/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl25.uasset and b/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl25.uasset differ diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl50.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl50.uasset index 687c704b7..fc5d7c336 100644 Binary files a/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl50.uasset and b/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl50.uasset differ diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl75.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl75.uasset new file mode 100644 index 000000000..83b9c306c Binary files /dev/null and b/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl75.uasset differ diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_EspressoCup/BP_SMBigBowl10.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_EspressoCup/BP_SMBigBowl10.uasset index 58a0ecea7..b2beecfc2 100644 Binary files a/Content/Maps/Simulation/SourceBigBowl/DestSM_EspressoCup/BP_SMBigBowl10.uasset and b/Content/Maps/Simulation/SourceBigBowl/DestSM_EspressoCup/BP_SMBigBowl10.uasset differ diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl10.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl10.uasset deleted file mode 100644 index 554609d17..000000000 Binary files a/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl10.uasset and /dev/null differ diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl100.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl100.uasset index 06a86fbca..98182531a 100644 Binary files a/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl100.uasset and b/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl100.uasset differ diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl25.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl25.uasset index eb21fed10..fc3e240b8 100644 Binary files a/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl25.uasset and b/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl25.uasset differ diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl50.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl50.uasset index bf3d8a971..c4a02d900 100644 Binary files a/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl50.uasset and b/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl50.uasset differ diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl75.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl75.uasset new file mode 100644 index 000000000..199b43a6d Binary files /dev/null and b/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl75.uasset differ diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_RedBowl/BP_SMBigBowl100.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_RedBowl/BP_SMBigBowl100.uasset index 0e61db4f3..1a4a2b1ac 100644 Binary files a/Content/Maps/Simulation/SourceBigBowl/DestSM_RedBowl/BP_SMBigBowl100.uasset and b/Content/Maps/Simulation/SourceBigBowl/DestSM_RedBowl/BP_SMBigBowl100.uasset differ diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_RedBowl/BP_SMBigBowl25.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_RedBowl/BP_SMBigBowl25.uasset new file mode 100644 index 000000000..6c61a371e Binary files /dev/null and b/Content/Maps/Simulation/SourceBigBowl/DestSM_RedBowl/BP_SMBigBowl25.uasset differ diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_RedBowl/BP_SMBigBowl50.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_RedBowl/BP_SMBigBowl50.uasset index 6a348b474..39611e837 100644 Binary files a/Content/Maps/Simulation/SourceBigBowl/DestSM_RedBowl/BP_SMBigBowl50.uasset and b/Content/Maps/Simulation/SourceBigBowl/DestSM_RedBowl/BP_SMBigBowl50.uasset differ diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_RedBowl/BP_SMBigBowl75.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_RedBowl/BP_SMBigBowl75.uasset new file mode 100644 index 000000000..ff53b219c Binary files /dev/null and b/Content/Maps/Simulation/SourceBigBowl/DestSM_RedBowl/BP_SMBigBowl75.uasset differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSMCup/BP_SMRedBowl100.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSMCup/BP_SMRedBowl100.uasset index c2eb9d7c6..057224d27 100644 Binary files a/Content/Maps/Simulation/SourceRedBowl/DestSMCup/BP_SMRedBowl100.uasset and b/Content/Maps/Simulation/SourceRedBowl/DestSMCup/BP_SMRedBowl100.uasset differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSMCup/BP_SMRedBowl25.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSMCup/BP_SMRedBowl25.uasset index bfa4d7af5..b5c8b0c70 100644 Binary files a/Content/Maps/Simulation/SourceRedBowl/DestSMCup/BP_SMRedBowl25.uasset and b/Content/Maps/Simulation/SourceRedBowl/DestSMCup/BP_SMRedBowl25.uasset differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSMCup/BP_SMRedBowl50.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSMCup/BP_SMRedBowl50.uasset index c1370165d..f47d60931 100644 Binary files a/Content/Maps/Simulation/SourceRedBowl/DestSMCup/BP_SMRedBowl50.uasset and b/Content/Maps/Simulation/SourceRedBowl/DestSMCup/BP_SMRedBowl50.uasset differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSMCup/BP_SMRedBowl75.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSMCup/BP_SMRedBowl75.uasset new file mode 100644 index 000000000..db586bd4b Binary files /dev/null and b/Content/Maps/Simulation/SourceRedBowl/DestSMCup/BP_SMRedBowl75.uasset differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_BigBowl/BP_SMBigBowl100.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_BigBowl/BP_SMBigBowl100.uasset index c4de1053c..0f6540ed4 100644 Binary files a/Content/Maps/Simulation/SourceRedBowl/DestSM_BigBowl/BP_SMBigBowl100.uasset and b/Content/Maps/Simulation/SourceRedBowl/DestSM_BigBowl/BP_SMBigBowl100.uasset differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_BigBowl/BP_SMBigBowl25.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_BigBowl/BP_SMBigBowl25.uasset new file mode 100644 index 000000000..b2055e616 Binary files /dev/null and b/Content/Maps/Simulation/SourceRedBowl/DestSM_BigBowl/BP_SMBigBowl25.uasset differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_BigBowl/BP_SMBigBowl50.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_BigBowl/BP_SMBigBowl50.uasset index 173681d1f..0e56b8d91 100644 Binary files a/Content/Maps/Simulation/SourceRedBowl/DestSM_BigBowl/BP_SMBigBowl50.uasset and b/Content/Maps/Simulation/SourceRedBowl/DestSM_BigBowl/BP_SMBigBowl50.uasset differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_BigBowl/BP_SMBigBowl75.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_BigBowl/BP_SMBigBowl75.uasset new file mode 100644 index 000000000..2de0c1040 Binary files /dev/null and b/Content/Maps/Simulation/SourceRedBowl/DestSM_BigBowl/BP_SMBigBowl75.uasset differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMBigBowl100.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMBigBowl100.uasset new file mode 100644 index 000000000..b248bf7e1 Binary files /dev/null and b/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMBigBowl100.uasset differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMBigBowl25.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMBigBowl25.uasset new file mode 100644 index 000000000..47d457e86 Binary files /dev/null and b/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMBigBowl25.uasset differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMBigBowl50.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMBigBowl50.uasset new file mode 100644 index 000000000..231d67855 Binary files /dev/null and b/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMBigBowl50.uasset differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMBigBowl75.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMBigBowl75.uasset new file mode 100644 index 000000000..61e446466 Binary files /dev/null and b/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMBigBowl75.uasset differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl10.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl10.uasset deleted file mode 100644 index fdc70217c..000000000 Binary files a/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl10.uasset and /dev/null differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl100.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl100.uasset deleted file mode 100644 index dfbe11d55..000000000 Binary files a/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl100.uasset and /dev/null differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl25.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl25.uasset deleted file mode 100644 index 68df4bbe9..000000000 Binary files a/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl25.uasset and /dev/null differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl50.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl50.uasset deleted file mode 100644 index 373fa1150..000000000 Binary files a/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl50.uasset and /dev/null differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_EspressoCup/BP_SMBigBowl10.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_EspressoCup/BP_SMBigBowl10.uasset index 21d3736e8..89b3de062 100644 Binary files a/Content/Maps/Simulation/SourceRedBowl/DestSM_EspressoCup/BP_SMBigBowl10.uasset and b/Content/Maps/Simulation/SourceRedBowl/DestSM_EspressoCup/BP_SMBigBowl10.uasset differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl10.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl10.uasset deleted file mode 100644 index 293a47b23..000000000 Binary files a/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl10.uasset and /dev/null differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl100.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl100.uasset index 742bea107..c53672dc1 100644 Binary files a/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl100.uasset and b/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl100.uasset differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl25.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl25.uasset index eff12f450..e4d8fbedb 100644 Binary files a/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl25.uasset and b/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl25.uasset differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl50.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl50.uasset index cdaacb8ce..770dff27c 100644 Binary files a/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl50.uasset and b/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl50.uasset differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl75.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl75.uasset new file mode 100644 index 000000000..6295c033d Binary files /dev/null and b/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl75.uasset differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_RedBowl/BP_SMRedBowl100.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_RedBowl/BP_SMRedBowl100.uasset new file mode 100644 index 000000000..b0a54a936 Binary files /dev/null and b/Content/Maps/Simulation/SourceRedBowl/DestSM_RedBowl/BP_SMRedBowl100.uasset differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_RedBowl/BP_SMRedBowl25.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_RedBowl/BP_SMRedBowl25.uasset new file mode 100644 index 000000000..df8428e3c Binary files /dev/null and b/Content/Maps/Simulation/SourceRedBowl/DestSM_RedBowl/BP_SMRedBowl25.uasset differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_RedBowl/BP_SMRedBowl50.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_RedBowl/BP_SMRedBowl50.uasset new file mode 100644 index 000000000..2ee79de58 Binary files /dev/null and b/Content/Maps/Simulation/SourceRedBowl/DestSM_RedBowl/BP_SMRedBowl50.uasset differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_RedBowl/BP_SMRedBowl75.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_RedBowl/BP_SMRedBowl75.uasset new file mode 100644 index 000000000..a0e258159 Binary files /dev/null and b/Content/Maps/Simulation/SourceRedBowl/DestSM_RedBowl/BP_SMRedBowl75.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCup/DestSMBigBowl/BP_SMCup100.uasset b/Content/Maps/Simulation/SourceSMCup/DestSMBigBowl/BP_SMCup100.uasset index d894da0ff..2461777f3 100644 Binary files a/Content/Maps/Simulation/SourceSMCup/DestSMBigBowl/BP_SMCup100.uasset and b/Content/Maps/Simulation/SourceSMCup/DestSMBigBowl/BP_SMCup100.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCup/DestSMBigBowl/BP_SMCup75.uasset b/Content/Maps/Simulation/SourceSMCup/DestSMBigBowl/BP_SMCup75.uasset new file mode 100644 index 000000000..dec56eedb Binary files /dev/null and b/Content/Maps/Simulation/SourceSMCup/DestSMBigBowl/BP_SMCup75.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_BlueCup/BP_SMCup100.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_BlueCup/BP_SMCup100.uasset index e172bb68c..8e51f656b 100644 Binary files a/Content/Maps/Simulation/SourceSMCup/DestSM_BlueCup/BP_SMCup100.uasset and b/Content/Maps/Simulation/SourceSMCup/DestSM_BlueCup/BP_SMCup100.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_BlueCup/BP_SMCup25.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_BlueCup/BP_SMCup25.uasset index 2924c4b93..4ca2933c7 100644 Binary files a/Content/Maps/Simulation/SourceSMCup/DestSM_BlueCup/BP_SMCup25.uasset and b/Content/Maps/Simulation/SourceSMCup/DestSM_BlueCup/BP_SMCup25.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_BlueCup/BP_SMCup50.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_BlueCup/BP_SMCup50.uasset index bb7b4c4eb..b8fc999e0 100644 Binary files a/Content/Maps/Simulation/SourceSMCup/DestSM_BlueCup/BP_SMCup50.uasset and b/Content/Maps/Simulation/SourceSMCup/DestSM_BlueCup/BP_SMCup50.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_BlueCup/BP_SMCup75.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_BlueCup/BP_SMCup75.uasset new file mode 100644 index 000000000..26f052d01 Binary files /dev/null and b/Content/Maps/Simulation/SourceSMCup/DestSM_BlueCup/BP_SMCup75.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_Cup/BP_SMCup100.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_Cup/BP_SMCup100.uasset new file mode 100644 index 000000000..f4dc733db Binary files /dev/null and b/Content/Maps/Simulation/SourceSMCup/DestSM_Cup/BP_SMCup100.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_Cup/BP_SMCup100_old.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_Cup/BP_SMCup100_old.uasset new file mode 100644 index 000000000..a8c7b884f Binary files /dev/null and b/Content/Maps/Simulation/SourceSMCup/DestSM_Cup/BP_SMCup100_old.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_Cup/BP_SMCup25.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_Cup/BP_SMCup25.uasset new file mode 100644 index 000000000..c58fe9fe0 Binary files /dev/null and b/Content/Maps/Simulation/SourceSMCup/DestSM_Cup/BP_SMCup25.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_Cup/BP_SMCup50.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_Cup/BP_SMCup50.uasset new file mode 100644 index 000000000..18ef89fd5 Binary files /dev/null and b/Content/Maps/Simulation/SourceSMCup/DestSM_Cup/BP_SMCup50.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_Cup/BP_SMCup75.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_Cup/BP_SMCup75.uasset new file mode 100644 index 000000000..bd20a773f Binary files /dev/null and b/Content/Maps/Simulation/SourceSMCup/DestSM_Cup/BP_SMCup75.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_EspressoCup/BP_SMCup100.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_EspressoCup/BP_SMCup100.uasset index 8703295a6..33c15e7f3 100644 Binary files a/Content/Maps/Simulation/SourceSMCup/DestSM_EspressoCup/BP_SMCup100.uasset and b/Content/Maps/Simulation/SourceSMCup/DestSM_EspressoCup/BP_SMCup100.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_MilkPitcher/BP_SMCup100.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_MilkPitcher/BP_SMCup100.uasset index e00a4ded6..7b3d2af38 100644 Binary files a/Content/Maps/Simulation/SourceSMCup/DestSM_MilkPitcher/BP_SMCup100.uasset and b/Content/Maps/Simulation/SourceSMCup/DestSM_MilkPitcher/BP_SMCup100.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_MilkPitcher/BP_SMCup25.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_MilkPitcher/BP_SMCup25.uasset index e3984425e..4402e892e 100644 Binary files a/Content/Maps/Simulation/SourceSMCup/DestSM_MilkPitcher/BP_SMCup25.uasset and b/Content/Maps/Simulation/SourceSMCup/DestSM_MilkPitcher/BP_SMCup25.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_MilkPitcher/BP_SMCup50.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_MilkPitcher/BP_SMCup50.uasset index 7ed2a6e19..1f332e577 100644 Binary files a/Content/Maps/Simulation/SourceSMCup/DestSM_MilkPitcher/BP_SMCup50.uasset and b/Content/Maps/Simulation/SourceSMCup/DestSM_MilkPitcher/BP_SMCup50.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_MilkPitcher/BP_SMCup75.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_MilkPitcher/BP_SMCup75.uasset new file mode 100644 index 000000000..de6236e67 Binary files /dev/null and b/Content/Maps/Simulation/SourceSMCup/DestSM_MilkPitcher/BP_SMCup75.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_RedBowl/BP_SMCup100.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_RedBowl/BP_SMCup100.uasset index c33df3dcb..a93863640 100644 Binary files a/Content/Maps/Simulation/SourceSMCup/DestSM_RedBowl/BP_SMCup100.uasset and b/Content/Maps/Simulation/SourceSMCup/DestSM_RedBowl/BP_SMCup100.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_RedBowl/BP_SMCup75.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_RedBowl/BP_SMCup75.uasset new file mode 100644 index 000000000..94839b136 Binary files /dev/null and b/Content/Maps/Simulation/SourceSMCup/DestSM_RedBowl/BP_SMCup75.uasset differ diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSMRedBawl/BP_SMMilkPitcher100.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSMRedBawl/BP_SMMilkPitcher100.uasset new file mode 100644 index 000000000..2c536ed5c Binary files /dev/null and b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSMRedBawl/BP_SMMilkPitcher100.uasset differ diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSMRedBawl/BP_SMMilkPitcher25.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSMRedBawl/BP_SMMilkPitcher25.uasset new file mode 100644 index 000000000..6f563ffe6 Binary files /dev/null and b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSMRedBawl/BP_SMMilkPitcher25.uasset differ diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSMRedBawl/BP_SMMilkPitcher50.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSMRedBawl/BP_SMMilkPitcher50.uasset new file mode 100644 index 000000000..e77436f35 Binary files /dev/null and b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSMRedBawl/BP_SMMilkPitcher50.uasset differ diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSMRedBawl/BP_SMMilkPitcher75.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSMRedBawl/BP_SMMilkPitcher75.uasset new file mode 100644 index 000000000..d3f0ea718 Binary files /dev/null and b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSMRedBawl/BP_SMMilkPitcher75.uasset differ diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSMRedBawl/BP_SMRedBowl100.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSMRedBawl/BP_SMRedBowl100.uasset deleted file mode 100644 index 6b80d8eaf..000000000 Binary files a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSMRedBawl/BP_SMRedBowl100.uasset and /dev/null differ diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_BigBowl/BP_SMMilkPitcher100.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_BigBowl/BP_SMMilkPitcher100.uasset new file mode 100644 index 000000000..faeca5ff7 Binary files /dev/null and b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_BigBowl/BP_SMMilkPitcher100.uasset differ diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_BigBowl/BP_SMMilkPitcher25.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_BigBowl/BP_SMMilkPitcher25.uasset new file mode 100644 index 000000000..f891e4b04 Binary files /dev/null and b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_BigBowl/BP_SMMilkPitcher25.uasset differ diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_BigBowl/BP_SMMilkPitcher50.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_BigBowl/BP_SMMilkPitcher50.uasset new file mode 100644 index 000000000..84792b59c Binary files /dev/null and b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_BigBowl/BP_SMMilkPitcher50.uasset differ diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_BigBowl/BP_SMMilkPitcher75.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_BigBowl/BP_SMMilkPitcher75.uasset new file mode 100644 index 000000000..a45b372d8 Binary files /dev/null and b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_BigBowl/BP_SMMilkPitcher75.uasset differ diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Blue_Cup/BP_SMMilkPitcher100.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Blue_Cup/BP_SMMilkPitcher100.uasset new file mode 100644 index 000000000..7029f4a93 Binary files /dev/null and b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Blue_Cup/BP_SMMilkPitcher100.uasset differ diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Blue_Cup/BP_SMMilkPitcher25.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Blue_Cup/BP_SMMilkPitcher25.uasset new file mode 100644 index 000000000..691f10d14 Binary files /dev/null and b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Blue_Cup/BP_SMMilkPitcher25.uasset differ diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Blue_Cup/BP_SMMilkPitcher50.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Blue_Cup/BP_SMMilkPitcher50.uasset new file mode 100644 index 000000000..ed66d368a Binary files /dev/null and b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Blue_Cup/BP_SMMilkPitcher50.uasset differ diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Blue_Cup/BP_SMMilkPitcher75.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Blue_Cup/BP_SMMilkPitcher75.uasset new file mode 100644 index 000000000..5ef68fbda Binary files /dev/null and b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Blue_Cup/BP_SMMilkPitcher75.uasset differ diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Blue_Cup/BP_SMRedBowl100.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Blue_Cup/BP_SMRedBowl100.uasset deleted file mode 100644 index 86bf13711..000000000 Binary files a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Blue_Cup/BP_SMRedBowl100.uasset and /dev/null differ diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Cup/BP_SMMilkPitcher100.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Cup/BP_SMMilkPitcher100.uasset new file mode 100644 index 000000000..9e773d278 Binary files /dev/null and b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Cup/BP_SMMilkPitcher100.uasset differ diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Cup/BP_SMMilkPitcher25.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Cup/BP_SMMilkPitcher25.uasset new file mode 100644 index 000000000..912a54a73 Binary files /dev/null and b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Cup/BP_SMMilkPitcher25.uasset differ diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Cup/BP_SMMilkPitcher50.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Cup/BP_SMMilkPitcher50.uasset new file mode 100644 index 000000000..d438a46ca Binary files /dev/null and b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Cup/BP_SMMilkPitcher50.uasset differ diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Cup/BP_SMMilkPitcher75.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Cup/BP_SMMilkPitcher75.uasset new file mode 100644 index 000000000..0dd48b213 Binary files /dev/null and b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Cup/BP_SMMilkPitcher75.uasset differ diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_EspressoCup/BP_SMMilkPitcher100.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_EspressoCup/BP_SMMilkPitcher100.uasset new file mode 100644 index 000000000..6db60e638 Binary files /dev/null and b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_EspressoCup/BP_SMMilkPitcher100.uasset differ diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_MilkPitcher/BP_SMMilkPitcher100.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_MilkPitcher/BP_SMMilkPitcher100.uasset new file mode 100644 index 000000000..4400cca60 Binary files /dev/null and b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_MilkPitcher/BP_SMMilkPitcher100.uasset differ diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_MilkPitcher/BP_SMMilkPitcher25.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_MilkPitcher/BP_SMMilkPitcher25.uasset new file mode 100644 index 000000000..f67f90182 Binary files /dev/null and b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_MilkPitcher/BP_SMMilkPitcher25.uasset differ diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_MilkPitcher/BP_SMMilkPitcher25_2.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_MilkPitcher/BP_SMMilkPitcher25_2.uasset new file mode 100644 index 000000000..622594162 Binary files /dev/null and b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_MilkPitcher/BP_SMMilkPitcher25_2.uasset differ diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_MilkPitcher/BP_SMMilkPitcher50.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_MilkPitcher/BP_SMMilkPitcher50.uasset new file mode 100644 index 000000000..c837c68fe Binary files /dev/null and b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_MilkPitcher/BP_SMMilkPitcher50.uasset differ diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_MilkPitcher/BP_SMMilkPitcher75.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_MilkPitcher/BP_SMMilkPitcher75.uasset new file mode 100644 index 000000000..f72dbb521 Binary files /dev/null and b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_MilkPitcher/BP_SMMilkPitcher75.uasset differ diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMBigBowl/BP_SMEspressoCup100.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMBigBowl/BP_SMEspressoCup100.uasset index 2fc31bba7..5f93385e9 100644 Binary files a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMBigBowl/BP_SMEspressoCup100.uasset and b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMBigBowl/BP_SMEspressoCup100.uasset differ diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMBigBowl/BP_SMEspressoCup25.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMBigBowl/BP_SMEspressoCup25.uasset new file mode 100644 index 000000000..b7b0c4c73 Binary files /dev/null and b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMBigBowl/BP_SMEspressoCup25.uasset differ diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMBigBowl/BP_SMEspressoCup50.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMBigBowl/BP_SMEspressoCup50.uasset index a61aa7d27..7ca3f2246 100644 Binary files a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMBigBowl/BP_SMEspressoCup50.uasset and b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMBigBowl/BP_SMEspressoCup50.uasset differ diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMBigBowl/BP_SMEspressoCup75.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMBigBowl/BP_SMEspressoCup75.uasset new file mode 100644 index 000000000..54b3eacea Binary files /dev/null and b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMBigBowl/BP_SMEspressoCup75.uasset differ diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMCup/BP_SMEspressoCup100.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMCup/BP_SMEspressoCup100.uasset index c5807384c..32afb010b 100644 Binary files a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMCup/BP_SMEspressoCup100.uasset and b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMCup/BP_SMEspressoCup100.uasset differ diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMCup/BP_SMEspressoCup25.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMCup/BP_SMEspressoCup25.uasset new file mode 100644 index 000000000..76b7c1808 Binary files /dev/null and b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMCup/BP_SMEspressoCup25.uasset differ diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMCup/BP_SMEspressoCup50.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMCup/BP_SMEspressoCup50.uasset index f58690c0b..a2ab488e1 100644 Binary files a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMCup/BP_SMEspressoCup50.uasset and b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMCup/BP_SMEspressoCup50.uasset differ diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMCup/BP_SMEspressoCup75.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMCup/BP_SMEspressoCup75.uasset new file mode 100644 index 000000000..8d6aa81a8 Binary files /dev/null and b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMCup/BP_SMEspressoCup75.uasset differ diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMMilkPitcher/BP_SMEspressoCup100.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMMilkPitcher/BP_SMEspressoCup100.uasset index 6b0f3456f..1a20ae1c0 100644 Binary files a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMMilkPitcher/BP_SMEspressoCup100.uasset and b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMMilkPitcher/BP_SMEspressoCup100.uasset differ diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMMilkPitcher/BP_SMEspressoCup25.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMMilkPitcher/BP_SMEspressoCup25.uasset new file mode 100644 index 000000000..2c3714421 Binary files /dev/null and b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMMilkPitcher/BP_SMEspressoCup25.uasset differ diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMMilkPitcher/BP_SMEspressoCup50.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMMilkPitcher/BP_SMEspressoCup50.uasset index 9d3f5f53f..3f6443e75 100644 Binary files a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMMilkPitcher/BP_SMEspressoCup50.uasset and b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMMilkPitcher/BP_SMEspressoCup50.uasset differ diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMMilkPitcher/BP_SMEspressoCup75.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMMilkPitcher/BP_SMEspressoCup75.uasset new file mode 100644 index 000000000..f839653a7 Binary files /dev/null and b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMMilkPitcher/BP_SMEspressoCup75.uasset differ diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_Blue_Cup/BP_SMEspressoCup100.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_Blue_Cup/BP_SMEspressoCup100.uasset index ffef360c7..e0bb44d6a 100644 Binary files a/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_Blue_Cup/BP_SMEspressoCup100.uasset and b/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_Blue_Cup/BP_SMEspressoCup100.uasset differ diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_Blue_Cup/BP_SMEspressoCup25.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_Blue_Cup/BP_SMEspressoCup25.uasset new file mode 100644 index 000000000..959779987 Binary files /dev/null and b/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_Blue_Cup/BP_SMEspressoCup25.uasset differ diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_Blue_Cup/BP_SMEspressoCup50.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_Blue_Cup/BP_SMEspressoCup50.uasset index fa0e31348..7ec34ea21 100644 Binary files a/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_Blue_Cup/BP_SMEspressoCup50.uasset and b/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_Blue_Cup/BP_SMEspressoCup50.uasset differ diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_Blue_Cup/BP_SMEspressoCup75.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_Blue_Cup/BP_SMEspressoCup75.uasset new file mode 100644 index 000000000..0aa659621 Binary files /dev/null and b/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_Blue_Cup/BP_SMEspressoCup75.uasset differ diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_RedBowl/BP_SMEspressoCup100.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_RedBowl/BP_SMEspressoCup100.uasset index b63b99b6f..bdee9a544 100644 Binary files a/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_RedBowl/BP_SMEspressoCup100.uasset and b/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_RedBowl/BP_SMEspressoCup100.uasset differ diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_RedBowl/BP_SMEspressoCup25.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_RedBowl/BP_SMEspressoCup25.uasset new file mode 100644 index 000000000..23a0bc75d Binary files /dev/null and b/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_RedBowl/BP_SMEspressoCup25.uasset differ diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_RedBowl/BP_SMEspressoCup50.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_RedBowl/BP_SMEspressoCup50.uasset index 6d43007de..4e8fb9787 100644 Binary files a/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_RedBowl/BP_SMEspressoCup50.uasset and b/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_RedBowl/BP_SMEspressoCup50.uasset differ diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_RedBowl/BP_SMEspressoCup75.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_RedBowl/BP_SMEspressoCup75.uasset new file mode 100644 index 000000000..1f943fe5a Binary files /dev/null and b/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_RedBowl/BP_SMEspressoCup75.uasset differ diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/SM_EspressoCup/BP_SMEspressoCup100.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/SM_EspressoCup/BP_SMEspressoCup100.uasset new file mode 100644 index 000000000..73f7f0401 Binary files /dev/null and b/Content/Maps/Simulation/SourceSM_espressoCup/SM_EspressoCup/BP_SMEspressoCup100.uasset differ diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/SM_EspressoCup/BP_SMEspressoCup25.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/SM_EspressoCup/BP_SMEspressoCup25.uasset new file mode 100644 index 000000000..7e6d052b1 Binary files /dev/null and b/Content/Maps/Simulation/SourceSM_espressoCup/SM_EspressoCup/BP_SMEspressoCup25.uasset differ diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/SM_EspressoCup/BP_SMEspressoCup50.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/SM_EspressoCup/BP_SMEspressoCup50.uasset new file mode 100644 index 000000000..faabf67eb Binary files /dev/null and b/Content/Maps/Simulation/SourceSM_espressoCup/SM_EspressoCup/BP_SMEspressoCup50.uasset differ diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/SM_EspressoCup/BP_SMEspressoCup75.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/SM_EspressoCup/BP_SMEspressoCup75.uasset new file mode 100644 index 000000000..9c8834540 Binary files /dev/null and b/Content/Maps/Simulation/SourceSM_espressoCup/SM_EspressoCup/BP_SMEspressoCup75.uasset differ diff --git a/Content/Models/IAIKitchen/Dishes/BigBowl/SM_BigBowl_01.uasset b/Content/Models/IAIKitchen/Dishes/BigBowl/SM_BigBowl_01.uasset index 18fd20f78..0be75a83d 100644 Binary files a/Content/Models/IAIKitchen/Dishes/BigBowl/SM_BigBowl_01.uasset and b/Content/Models/IAIKitchen/Dishes/BigBowl/SM_BigBowl_01.uasset differ diff --git a/Content/Models/IAIKitchen/Dishes/JeroenCup/SM_BlueCylinderCup.uasset b/Content/Models/IAIKitchen/Dishes/JeroenCup/SM_BlueCylinderCup.uasset index eae7793a1..e30af2db4 100644 Binary files a/Content/Models/IAIKitchen/Dishes/JeroenCup/SM_BlueCylinderCup.uasset and b/Content/Models/IAIKitchen/Dishes/JeroenCup/SM_BlueCylinderCup.uasset differ diff --git a/Content/Models/Misc/PouringParticle/BP_CupWithSphereParticles.uasset b/Content/Models/Misc/PouringParticle/BP_CupWithSphereParticles.uasset index a1ad88956..112a788e3 100644 Binary files a/Content/Models/Misc/PouringParticle/BP_CupWithSphereParticles.uasset and b/Content/Models/Misc/PouringParticle/BP_CupWithSphereParticles.uasset differ diff --git a/Content/Models/Misc/PouringParticle/BP_SM_BigBowl.uasset b/Content/Models/Misc/PouringParticle/BP_SM_BigBowl.uasset index f9ac58314..20d1d857a 100644 Binary files a/Content/Models/Misc/PouringParticle/BP_SM_BigBowl.uasset and b/Content/Models/Misc/PouringParticle/BP_SM_BigBowl.uasset differ diff --git a/Content/Models/Misc/PouringParticle/BP_SM_Table.uasset b/Content/Models/Misc/PouringParticle/BP_SM_Table.uasset index 2b4ea5e14..5a7cfbd5f 100644 Binary files a/Content/Models/Misc/PouringParticle/BP_SM_Table.uasset and b/Content/Models/Misc/PouringParticle/BP_SM_Table.uasset differ diff --git a/Content/Models/Misc/PouringParticle/BP_SphereParticlesWorks.uasset b/Content/Models/Misc/PouringParticle/BP_SphereParticlesWorks.uasset new file mode 100644 index 000000000..f7ba1ed2b Binary files /dev/null and b/Content/Models/Misc/PouringParticle/BP_SphereParticlesWorks.uasset differ diff --git a/Content/Models/Misc/PouringParticle/SM_BigBowl_1.uasset b/Content/Models/Misc/PouringParticle/SM_BigBowl_1.uasset index 5abcf1ada..ae9b43b8e 100644 Binary files a/Content/Models/Misc/PouringParticle/SM_BigBowl_1.uasset and b/Content/Models/Misc/PouringParticle/SM_BigBowl_1.uasset differ diff --git a/Plugins/USemLog b/Plugins/USemLog index f60e093fe..1ec3f1edb 160000 --- a/Plugins/USemLog +++ b/Plugins/USemLog @@ -1 +1 @@ -Subproject commit f60e093fe5e10cdc39d7676b673cca61a9bb23a7 +Subproject commit 1ec3f1edb0192c2e290632f3e4a25a16c216d137 diff --git a/SavedData.csv b/SavedData.csv new file mode 100644 index 000000000..082dd051b --- /dev/null +++ b/SavedData.csv @@ -0,0 +1,4 @@ +SourceContainer,DestinationContainer,PouringTime,RotationSpeed,MaximumAngle,SourcePosX,SourcePosY,SourcePosZ,DestPosX,DestPosY,DestPosZ,NumberOfParticles,IsPouringFailed +SM_Cup,SM_Blue_Cup,2.485097,1.0,110.0,-0.06665,-6.788941,63.928764,-0.066666,0.375078,49.741776,132,True +SM_Cup,SM_Blue_Cup,1.969125,1.0,110.0,-0.06665,-6.788941,63.928764,-0.066666,0.375078,49.741776,132,True + diff --git a/Source/RobCoG/Private/BP_ParentActor.cpp b/Source/RobCoG/Private/BP_ParentActor.cpp index d2a9da557..eaa4fc084 100644 --- a/Source/RobCoG/Private/BP_ParentActor.cpp +++ b/Source/RobCoG/Private/BP_ParentActor.cpp @@ -37,7 +37,7 @@ void ABP_ParentActor::EndPlay(const EEndPlayReason::Type reason) { SaveDirectory += TEXT("SavedData.csv"); // if overwriting is allowed then overwrite the file each time the game starts. - FString FinalString = TEXT("SourceContainer,DestinationContainer,PouringTime,RotationSpeed,MinimumAngle,MaximumAngle,SourcePosX,SourcePosY,SourcePosZ,DestPosX,DestPosY,DestPosZ,NumberOfParticles,IsPouringFailed"); + FString FinalString = TEXT("SourceContainer,DestinationContainer,PouringTime,RotationSpeed,MaximumAngle,SourcePosX,SourcePosY,SourcePosZ,DestPosX,DestPosY,DestPosZ,NumberOfParticles,IsPouringFailed"); FinalString += LINE_TERMINATOR; FString FinalOutPutStr = ""; @@ -74,11 +74,11 @@ void ABP_ParentActor::EndPlay(const EEndPlayReason::Type reason) { // this is basically time stamps from first and last raws and getting how long it took to pour. double PouringTime = 0.0; - FString MinimumPouringAngle, MaximumPouringAngle; + FString MaximumPouringAngle; // check if all data are correctly logged from the blueprint if(LastRawArrayData.Num() > 5 && FirstRawArrayData.Num() > 5) { PouringTime = FCString::Atod(*LastRawArrayData[2]) - FCString::Atod(*FirstRawArrayData[2]); - MinimumPouringAngle = FirstRawArrayData[4]; + //MinimumPouringAngle = FirstRawArrayData[4]; MaximumPouringAngle = LastRawArrayData[4]; } @@ -95,7 +95,7 @@ void ABP_ParentActor::EndPlay(const EEndPlayReason::Type reason) { FinalOutPutStr += FString::SanitizeFloat(PouringTime) + TEXT(","); } else if (i == 4) { - FinalOutPutStr += MinimumPouringAngle + TEXT(","); + //FinalOutPutStr += MinimumPouringAngle + TEXT(","); FinalOutPutStr += MaximumPouringAngle + TEXT(","); } else {