diff --git a/GreatSpringGameJam/Content/Content.mgcb b/GreatSpringGameJam/Content/Content.mgcb index 0728e54..0d1ccb0 100644 --- a/GreatSpringGameJam/Content/Content.mgcb +++ b/GreatSpringGameJam/Content/Content.mgcb @@ -115,3 +115,8 @@ /processor:SongProcessor /build:Songs/SpringPlains.wav +#begin Sounds/GnomeCollect.ogg +/importer:OggImporter +/processor:SoundEffectProcessor +/build:Sounds/GnomeCollect.ogg + diff --git a/GreatSpringGameJam/Content/Sounds/ButtonPress.ogg b/GreatSpringGameJam/Content/Sounds/ButtonPress.ogg index 5c2334f..8f6a6d9 100644 Binary files a/GreatSpringGameJam/Content/Sounds/ButtonPress.ogg and b/GreatSpringGameJam/Content/Sounds/ButtonPress.ogg differ diff --git a/GreatSpringGameJam/Content/Sounds/GnomeCollect.ogg b/GreatSpringGameJam/Content/Sounds/GnomeCollect.ogg new file mode 100644 index 0000000..fa7525e Binary files /dev/null and b/GreatSpringGameJam/Content/Sounds/GnomeCollect.ogg differ diff --git a/GreatSpringGameJam/Content/Sounds/PlantGrow.ogg b/GreatSpringGameJam/Content/Sounds/PlantGrow.ogg index 612935a..fd6e1f9 100644 Binary files a/GreatSpringGameJam/Content/Sounds/PlantGrow.ogg and b/GreatSpringGameJam/Content/Sounds/PlantGrow.ogg differ diff --git a/GreatSpringGameJam/Content/Sounds/PlatformAppear.ogg b/GreatSpringGameJam/Content/Sounds/PlatformAppear.ogg index f3eb13f..e5db9d5 100644 Binary files a/GreatSpringGameJam/Content/Sounds/PlatformAppear.ogg and b/GreatSpringGameJam/Content/Sounds/PlatformAppear.ogg differ diff --git a/GreatSpringGameJam/Content/Sounds/SnowBlower.ogg b/GreatSpringGameJam/Content/Sounds/SnowBlower.ogg index 110fb14..8fdd5b3 100644 Binary files a/GreatSpringGameJam/Content/Sounds/SnowBlower.ogg and b/GreatSpringGameJam/Content/Sounds/SnowBlower.ogg differ diff --git a/GreatSpringGameJam/Content/Sounds/Sounds.aup b/GreatSpringGameJam/Content/Sounds/Sounds.aup index 248a0e7..ef5f726 100644 --- a/GreatSpringGameJam/Content/Sounds/Sounds.aup +++ b/GreatSpringGameJam/Content/Sounds/Sounds.aup @@ -1,56 +1,66 @@ - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + diff --git a/GreatSpringGameJam/Content/Sounds/Sounds_data/e08/d08/e08083c0.au b/GreatSpringGameJam/Content/Sounds/Sounds_data/e08/d08/e08083c0.au new file mode 100644 index 0000000..c901608 Binary files /dev/null and b/GreatSpringGameJam/Content/Sounds/Sounds_data/e08/d08/e08083c0.au differ diff --git a/GreatSpringGameJam/Content/Sounds/Sounds_data/e08/d08/e0808675.au b/GreatSpringGameJam/Content/Sounds/Sounds_data/e08/d08/e0808675.au new file mode 100644 index 0000000..c7f7c9d Binary files /dev/null and b/GreatSpringGameJam/Content/Sounds/Sounds_data/e08/d08/e0808675.au differ diff --git a/GreatSpringGameJam/Content/Sounds/Sounds_data/e08/d08/e08086e8.au b/GreatSpringGameJam/Content/Sounds/Sounds_data/e08/d08/e08086e8.au new file mode 100644 index 0000000..20c4dbc Binary files /dev/null and b/GreatSpringGameJam/Content/Sounds/Sounds_data/e08/d08/e08086e8.au differ diff --git a/GreatSpringGameJam/Content/Sounds/Sounds_data/e08/d08/e08087a6.au b/GreatSpringGameJam/Content/Sounds/Sounds_data/e08/d08/e08087a6.au deleted file mode 100644 index d6979d1..0000000 Binary files a/GreatSpringGameJam/Content/Sounds/Sounds_data/e08/d08/e08087a6.au and /dev/null differ diff --git a/GreatSpringGameJam/Content/Sounds/Sounds_data/e08/d08/e0808854.au b/GreatSpringGameJam/Content/Sounds/Sounds_data/e08/d08/e0808854.au new file mode 100644 index 0000000..020cefe Binary files /dev/null and b/GreatSpringGameJam/Content/Sounds/Sounds_data/e08/d08/e0808854.au differ diff --git a/GreatSpringGameJam/Content/Sounds/Sounds_data/e08/d08/e080885b.au b/GreatSpringGameJam/Content/Sounds/Sounds_data/e08/d08/e080885b.au new file mode 100644 index 0000000..1a9de99 Binary files /dev/null and b/GreatSpringGameJam/Content/Sounds/Sounds_data/e08/d08/e080885b.au differ diff --git a/GreatSpringGameJam/Content/Sounds/Sounds_data/e08/d08/e08088fa.au b/GreatSpringGameJam/Content/Sounds/Sounds_data/e08/d08/e08088fa.au deleted file mode 100644 index 489594e..0000000 Binary files a/GreatSpringGameJam/Content/Sounds/Sounds_data/e08/d08/e08088fa.au and /dev/null differ diff --git a/GreatSpringGameJam/Content/Sounds/Sounds_data/e08/d08/e0808a3d.au b/GreatSpringGameJam/Content/Sounds/Sounds_data/e08/d08/e0808a3d.au deleted file mode 100644 index 4b25c72..0000000 Binary files a/GreatSpringGameJam/Content/Sounds/Sounds_data/e08/d08/e0808a3d.au and /dev/null differ diff --git a/GreatSpringGameJam/Content/Sounds/Sounds_data/e08/d08/e0808d8c.au b/GreatSpringGameJam/Content/Sounds/Sounds_data/e08/d08/e0808d8c.au deleted file mode 100644 index a890551..0000000 Binary files a/GreatSpringGameJam/Content/Sounds/Sounds_data/e08/d08/e0808d8c.au and /dev/null differ diff --git a/GreatSpringGameJam/Content/Sounds/Sounds_data/e08/d08/e0808f8a.au b/GreatSpringGameJam/Content/Sounds/Sounds_data/e08/d08/e0808f8a.au deleted file mode 100644 index 2e99931..0000000 Binary files a/GreatSpringGameJam/Content/Sounds/Sounds_data/e08/d08/e0808f8a.au and /dev/null differ diff --git a/GreatSpringGameJam/Content/Sounds/Sounds_data/e08/d08/e0808f9f.au b/GreatSpringGameJam/Content/Sounds/Sounds_data/e08/d08/e0808f9f.au new file mode 100644 index 0000000..5f958a3 Binary files /dev/null and b/GreatSpringGameJam/Content/Sounds/Sounds_data/e08/d08/e0808f9f.au differ diff --git a/GreatSpringGameJam/Content/Sounds/WateringCan.ogg b/GreatSpringGameJam/Content/Sounds/WateringCan.ogg index 4b2bed0..b232054 100644 Binary files a/GreatSpringGameJam/Content/Sounds/WateringCan.ogg and b/GreatSpringGameJam/Content/Sounds/WateringCan.ogg differ diff --git a/GreatSpringGameJam/Gnome.cs b/GreatSpringGameJam/Gnome.cs index 8650675..74f6c2e 100644 --- a/GreatSpringGameJam/Gnome.cs +++ b/GreatSpringGameJam/Gnome.cs @@ -1,7 +1,9 @@ using System; using Microsoft.Xna.Framework; +using Microsoft.Xna.Framework.Audio; using Microsoft.Xna.Framework.Graphics; using MLEM.Misc; +using MLEM.Startup; using MLEM.Textures; namespace GreatSpringGameJam { @@ -11,8 +13,10 @@ namespace GreatSpringGameJam { } public override void Update(GameTime time) { - if (GameImpl.Instance.Player.Bounds.Contains(this.Position + Vector2.One / 2)) + if (GameImpl.Instance.Player.Bounds.Intersects(new RectangleF(this.Position, Vector2.One))) { + MlemGame.LoadContent("Sounds/GnomeCollect").Play(); this.Map.RemoveEntity(this); + } } public override void Draw(GameTime time, SpriteBatch batch) {