diff --git a/Assets/Prefabs/Trick.prefab b/Assets/Prefabs/Trick.prefab index c9050d7..8ade7d4 100644 --- a/Assets/Prefabs/Trick.prefab +++ b/Assets/Prefabs/Trick.prefab @@ -184,3 +184,4 @@ MonoBehaviour: targetRefreshInterval: 0.4 consumeDistance: 0.35 wanderInterval: 1.2 + trickPrefab: {fileID: 700000000, guid: 8bf8957665594a718535d06aba0cdee7, type: 3} diff --git a/Assets/SFX/Gremlin_nah.wav b/Assets/SFX/Gremlin_nah.wav new file mode 100644 index 0000000..5c299ff Binary files /dev/null and b/Assets/SFX/Gremlin_nah.wav differ diff --git a/Assets/SFX/console3.wav b/Assets/SFX/console3.wav new file mode 100644 index 0000000..546a6c3 Binary files /dev/null and b/Assets/SFX/console3.wav differ diff --git a/Assets/SFX/console_1.wav b/Assets/SFX/console_1.wav new file mode 100644 index 0000000..ea31a7d Binary files /dev/null and b/Assets/SFX/console_1.wav differ diff --git a/Assets/SFX/console_2.wav b/Assets/SFX/console_2.wav new file mode 100644 index 0000000..a9d4dac Binary files /dev/null and b/Assets/SFX/console_2.wav differ diff --git a/Assets/SFX/gremlin_YAH.wav b/Assets/SFX/gremlin_YAH.wav new file mode 100644 index 0000000..9008dad Binary files /dev/null and b/Assets/SFX/gremlin_YAH.wav differ diff --git a/Assets/SFX/gremlin_ah-ah.wav b/Assets/SFX/gremlin_ah-ah.wav new file mode 100644 index 0000000..f91d6cc Binary files /dev/null and b/Assets/SFX/gremlin_ah-ah.wav differ diff --git a/Assets/SFX/gremlin_blablabla.wav b/Assets/SFX/gremlin_blablabla.wav new file mode 100644 index 0000000..20fdc74 Binary files /dev/null and b/Assets/SFX/gremlin_blablabla.wav differ diff --git a/Assets/SFX/gremlin_ehehe.wav b/Assets/SFX/gremlin_ehehe.wav new file mode 100644 index 0000000..b3334d3 Binary files /dev/null and b/Assets/SFX/gremlin_ehehe.wav differ diff --git a/Assets/SFX/gremlin_ehehehehehe.wav b/Assets/SFX/gremlin_ehehehehehe.wav new file mode 100644 index 0000000..c77e205 Binary files /dev/null and b/Assets/SFX/gremlin_ehehehehehe.wav differ diff --git a/Assets/SFX/gremlin_geah.wav b/Assets/SFX/gremlin_geah.wav new file mode 100644 index 0000000..e5a48c5 Binary files /dev/null and b/Assets/SFX/gremlin_geah.wav differ diff --git a/Assets/SFX/gremlin_gehehehayhehaw.wav b/Assets/SFX/gremlin_gehehehayhehaw.wav new file mode 100644 index 0000000..fa86890 Binary files /dev/null and b/Assets/SFX/gremlin_gehehehayhehaw.wav differ diff --git a/Assets/SFX/gremlin_hehe.wav b/Assets/SFX/gremlin_hehe.wav new file mode 100644 index 0000000..8332797 Binary files /dev/null and b/Assets/SFX/gremlin_hehe.wav differ diff --git a/Assets/SFX/gremlin_megoblemah.wav b/Assets/SFX/gremlin_megoblemah.wav new file mode 100644 index 0000000..8de2139 Binary files /dev/null and b/Assets/SFX/gremlin_megoblemah.wav differ diff --git a/Assets/SFX/gremlin_melmenemene.wav b/Assets/SFX/gremlin_melmenemene.wav new file mode 100644 index 0000000..c7971bd Binary files /dev/null and b/Assets/SFX/gremlin_melmenemene.wav differ diff --git a/Assets/SFX/gremlin_neaea.wav b/Assets/SFX/gremlin_neaea.wav new file mode 100644 index 0000000..34084e5 Binary files /dev/null and b/Assets/SFX/gremlin_neaea.wav differ diff --git a/Assets/SFX/gremlin_neah.wav b/Assets/SFX/gremlin_neah.wav new file mode 100644 index 0000000..1c1a546 Binary files /dev/null and b/Assets/SFX/gremlin_neah.wav differ diff --git a/Assets/SFX/gremlin_neahahaha.wav b/Assets/SFX/gremlin_neahahaha.wav new file mode 100644 index 0000000..38a21c2 Binary files /dev/null and b/Assets/SFX/gremlin_neahahaha.wav differ diff --git a/Assets/SFX/gremlin_rah.wav b/Assets/SFX/gremlin_rah.wav new file mode 100644 index 0000000..fc91ad9 Binary files /dev/null and b/Assets/SFX/gremlin_rah.wav differ diff --git a/Assets/Scripts/TrickController.cs b/Assets/Scripts/TrickController.cs index 55e56f3..c27237f 100644 --- a/Assets/Scripts/TrickController.cs +++ b/Assets/Scripts/TrickController.cs @@ -10,6 +10,7 @@ public class TrickController : MonoBehaviour [SerializeField] private float targetRefreshInterval = 0.4f; [SerializeField] private float consumeDistance = 0.35f; [SerializeField] private float wanderInterval = 1.2f; + [SerializeField] private TrickController trickPrefab; private Rigidbody2D body; private Transform target; @@ -144,15 +145,28 @@ public class TrickController : MonoBehaviour continue; } + var spawnPosition = hit.transform.position; Destroy(hit.gameObject); if (target == hit.transform) { target = null; } + SpawnTrick(spawnPosition); break; } } + private void SpawnTrick(Vector3 position) + { + if (trickPrefab != null) + { + Instantiate(trickPrefab, position, Quaternion.identity); + return; + } + + Instantiate(gameObject, position, Quaternion.identity); + } + public void SetCarried(bool carried) { isCarried = carried;