Trick on the Class: object paths

Assets/Resources/Sfx/games/trickClass/ball_impact.wav.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ec3bba05764765f49a8893a344f0c7eb
+guid: ae64c1b23b472a84095f08244d8970d5
 AudioImporter:
   externalObjects: {}
   serializedVersion: 6

Assets/Resources/Sfx/games/trickClass/chair_impact.wav.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 29fd1b0766d4d534da285bdfae8fdffc
+guid: 899954cedf6adff4faa4c00e4e13d1e1
 AudioImporter:
   externalObjects: {}
   serializedVersion: 6

Assets/Resources/Sfx/games/trickClass/girl_toss_ball.wav.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 939fcc837d67982458448227a1fce0bd
+guid: 4f9383c25aa437143ac4871b279a717d
 AudioImporter:
   externalObjects: {}
   serializedVersion: 6

Assets/Resources/Sfx/games/trickClass/girl_toss_chair.wav.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6361223a3ade2494b820610888e60881
+guid: 7f0d4d64f3ad4fb49bc27705f72f3ea7
 AudioImporter:
   externalObjects: {}
   serializedVersion: 6

Assets/Resources/Sfx/games/trickClass/girl_toss_phone.wav.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: bb5254d1a44760049b7503a037a2327a
+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/trickClass/girl_toss_plane.wav.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: e5667ad346b21924bb3eb9121742e015
+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/trickClass/girl_toss_shock.wav.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 5aa3063431b0ef44786e37b0a641f2d7
+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/trickClass/player_dodge.wav.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 8d92d1a184a485343af185c4183870dc
+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/trickClass/reng2.mp3.meta

@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: 517b0b447c31c9246af9ffbbede86b6c
-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/trickClass/reng3.mp3.meta

@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: 6fdda4212221b3b46851f0584e4ba2a9
-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/trickClass/reng4.mp3.meta

@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: f0fa7f420c1550749aa91496c66eccfe
-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/trickClass/reng5.mp3.meta

@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: 5aaa86f8315b8794a817f4ef24e5b213
-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/trickClass/shock_impact.wav.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 9d1964df951320b47a569807e375b70b
+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/TrickClass/mobTrick_parts00.png.meta

@@ -13,7 +13,7 @@ TextureImporter:
     second: mobTrick_girl_torso
   - first:
       213: 8820173711875456571
-    second: mobTrick_bg_desk
+    second: mobTrick_bgDesk3
   - first:
       213: -5080462231089324230
     second: mobTrick_obj00
@@ -26,6 +26,12 @@ TextureImporter:
   - first:
       213: -6991096701230948288
     second: mobTrick_player_torso00
+  - first:
+      213: -1817635648121096723
+    second: mobTrick_bgDesk2
+  - first:
+      213: 1483037001529718006
+    second: mobTrick_bgDesk1
   externalObjects: {}
   serializedVersion: 11
   mipmaps:
@@ -123,7 +129,7 @@ TextureImporter:
         width: 116
         height: 123
       alignment: 0
-      pivot: {x: 0, y: 0}
+      pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       physicsShape: []
@@ -144,7 +150,7 @@ TextureImporter:
         width: 41
         height: 37
       alignment: 0
-      pivot: {x: 0, y: 0}
+      pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       physicsShape: []
@@ -165,7 +171,7 @@ TextureImporter:
         width: 85
         height: 74
       alignment: 0
-      pivot: {x: 0, y: 0}
+      pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       physicsShape: []
@@ -178,13 +184,13 @@ TextureImporter:
       edges: []
       weights: []
     - serializedVersion: 2
-      name: mobTrick_bg_desk
+      name: mobTrick_bgDesk3
       rect:
         serializedVersion: 2
-        x: 416
+        x: 81
-        y: 1710
+        y: 710
-        width: 286
+        width: 1238
-        height: 301
+        height: 268
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -207,7 +213,7 @@ TextureImporter:
         width: 149
         height: 137
       alignment: 0
-      pivot: {x: 0, y: 0}
+      pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       physicsShape: []
@@ -228,7 +234,7 @@ TextureImporter:
         width: 217
         height: 73
       alignment: 0
-      pivot: {x: 0, y: 0}
+      pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       physicsShape: []
@@ -249,7 +255,7 @@ TextureImporter:
         width: 334
         height: 367
       alignment: 0
-      pivot: {x: 0, y: 0}
+      pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       physicsShape: []
@@ -270,7 +276,7 @@ TextureImporter:
         width: 265
         height: 265
       alignment: 0
-      pivot: {x: 0, y: 0}
+      pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       physicsShape: []
@@ -282,6 +288,48 @@ TextureImporter:
       indices: 
       edges: []
       weights: []
+    - serializedVersion: 2
+      name: mobTrick_bgDesk2
+      rect:
+        serializedVersion: 2
+        x: 40
+        y: 353
+        width: 1441
+        height: 299
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: de5b7ae120676c6e0800000000000000
+      internalID: -1817635648121096723
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: mobTrick_bgDesk1
+      rect:
+        serializedVersion: 2
+        x: 40
+        y: 53
+        width: 1814
+        height: 257
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 6f470f0ab4ec49410800000000000000
+      internalID: 1483037001529718006
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
     outline: []
     physicsShape: []
     bones: []

Assets/Scripts/Games/TrickClass/MobTrickObj.cs

@@ -0,0 +1,34 @@
+using System.Collections;
+using System.Collections.Generic;
+using System;
+using UnityEngine;
+using NaughtyBezierCurves;
+
+using HeavenStudio.Util;
+
+namespace HeavenStudio.Games.Scripts_TrickClass
+{
+    public class MobTrickObj : PlayerActionObject
+    {
+        public bool flyType;
+        public float startBeat;
+        bool flying = true;
+
+        float flyBeats;
+
+        [NonSerialized] public BezierCurve3D curve;
+
+        private TrickClass game;
+
+        private void Awake()
+        {
+            game = TrickClass.instance;
+        }
+
+        // Update is called once per frame
+        void Update()
+        {
+            
+        }
+    }
+}

Assets/Scripts/Games/TrickClass/MobTrickObj.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: eb420e9087e23a64eb3ca43a7620c211
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Games/TrickClass/TrickClass.cs

@@ -1,14 +1,40 @@
+using DG.Tweening;
+using NaughtyBezierCurves;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
+using HeavenStudio.Util;
+
 namespace HeavenStudio.Games
 {
     /**
         mob_Trick
     **/
+
+    using Scripts_TrickClass;
     public class TrickClass : MonoBehaviour
     {
+        public enum TrickObjType {
+            Plane,
+            Shock,
+            Ball,
+            Chair,
+            Phone
+        }
+
+        [Header("References")]
+        public GameObject ballPrefab;
+        public GameObject planePrefab;
+        public GameObject shockPrefab;
+        public Transform objHolder;
+
+        [Header("Curves")]
+        public BezierCurve3D ballTossCurve;
+        public BezierCurve3D ballMissCurve;
+        public BezierCurve3D planeTossCurve;
+        public BezierCurve3D planeMissCurve;
+        public BezierCurve3D shockTossCurve;
 
         public static TrickClass instance;
 
@@ -16,5 +42,44 @@ namespace HeavenStudio.Games
         {
             instance = this;
         }
+
+        public void TossObject(float beat, int type)
+        {
+            switch (type)
+            {
+                case (int) TrickObjType.Plane:
+                    Jukebox.PlayOneShotGame("trickClass/girl_toss_plane");
+                    break;
+                default:
+                    Jukebox.PlayOneShotGame("trickClass/girl_toss_ball");
+                    break;
+            }
+            SpawnObject(beat, type);
+        }
+
+        public void SpawnObject(float beat, int type)
+        {
+            GameObject objectToSpawn;
+            BezierCurve3D curve;
+            bool isPlane = false;
+            switch (type)
+            {
+                case (int) TrickObjType.Plane:
+                    objectToSpawn = planePrefab;
+                    curve = planeTossCurve;
+                    isPlane = true;
+                    break;
+                default:
+                    objectToSpawn = ballPrefab;
+                    curve = ballTossCurve;
+                    break;
+            }
+            var mobj = GameObject.Instantiate(objectToSpawn, objHolder);
+            var thinker = mobj.GetComponent<MobTrickObj>();
+
+            thinker.startBeat = beat;
+            thinker.flyType = isPlane;
+            thinker.curve = curve;
+        }
     }
 }

Assets/Scripts/Minigames.cs

@@ -464,7 +464,13 @@ namespace HeavenStudio
                 }),
                 new Minigame("trickClass", "Trick on the Class\n<color=#eb5454>[WIP don't use]</color>", "C0171D", false, false, new List<GameAction>()
                 {
-
+                    new GameAction("toss",                   delegate
+                    {
+                        TrickClass.instance.TossObject(eventCaller.currentEntity.beat, eventCaller.currentEntity.type);
+                    }, 3, false, new List<Param>()
+                    {
+                        new Param("type", TrickClass.TrickObjType.Ball, "Object", "The object to toss")
+                    }),
                 }),
                 /*new Minigame("spaceDance", "Space Dance", "B888F8", new List<GameAction>()
                 {