From c3c42506fade7e9d4b521d647dead1609c2b6c66 Mon Sep 17 00:00:00 2001 From: Talon Date: Wed, 21 Apr 2021 14:14:14 +0200 Subject: [PATCH] Very basic crash functionality --- .../DesignTimeBuild/.dtbcache.v2 | Bin 63152 -> 63152 bytes .vs/EvilSatellites/v16/.suo | Bin 105984 -> 107008 bytes EvilSatellites/EvilSatellites.csproj | 3 +++ EvilSatellites/Objects/Debris.cs | 2 +- EvilSatellites/Objects/Player.cs | 7 +++++++ EvilSatellites/Weapons/AbstractWeapon.cs | 4 ++-- EvilSatellites/Weapons/IWeapon.cs | 2 +- EvilSatellites/Weapons/LaserMG.cs | 6 ++++++ 8 files changed, 20 insertions(+), 4 deletions(-) diff --git a/.vs/EvilSatellites/DesignTimeBuild/.dtbcache.v2 b/.vs/EvilSatellites/DesignTimeBuild/.dtbcache.v2 index 81c69e1200ebdc1fce4fbde8abe792b43ac94ce0..a2e60590bd3ac7fdfbacc36855039486683bf12b 100644 GIT binary patch delta 150 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.manifest Icon.ico + + d:\EvilSatellites\ + diff --git a/EvilSatellites/Objects/Debris.cs b/EvilSatellites/Objects/Debris.cs index 95e690f..2b227e2 100644 --- a/EvilSatellites/Objects/Debris.cs +++ b/EvilSatellites/Objects/Debris.cs @@ -56,7 +56,7 @@ namespace EvilSatellites.Objects var player = (Player)obj; if (player.Vacuuming) { - player.CurrentWeapon.RemainingAmmo += rnd.Next(player.CurrentWeapon.MaxAmmo); + player.CurrentWeapon.Reload(rnd.Next(player.CurrentWeapon.MaxAmmo)); Destroy(); return; } diff --git a/EvilSatellites/Objects/Player.cs b/EvilSatellites/Objects/Player.cs index f547923..10939f0 100644 --- a/EvilSatellites/Objects/Player.cs +++ b/EvilSatellites/Objects/Player.cs @@ -203,6 +203,13 @@ namespace EvilSatellites.Objects } dmgSound += "/int/" + (rnd.Next(2)+1).ToString()+".wav"; Screen.Manager.Sound.PlayOneshot(dmgSound); + if (Health < 1) + { + Destroy(); + Screen.Manager.Sound.PlayOneshot(@"sfx/physics/crashes/1.wav"); + System.Threading.Thread.Sleep(2000); + Environment.Exit(0); + } } public void IncreaseHealth(float amount) diff --git a/EvilSatellites/Weapons/AbstractWeapon.cs b/EvilSatellites/Weapons/AbstractWeapon.cs index 70117de..b7fec3f 100644 --- a/EvilSatellites/Weapons/AbstractWeapon.cs +++ b/EvilSatellites/Weapons/AbstractWeapon.cs @@ -16,7 +16,7 @@ namespace EvilSatellites.Weapons Stopping } - public class AbstractWeapon : IWeapon + public abstract class AbstractWeapon : IWeapon { public IGameObject _wielder; public float FireRate { get; set; } @@ -29,6 +29,6 @@ namespace EvilSatellites.Weapons public virtual void Reload() { } public virtual void Stop() { } public virtual void Update(GameTime time) { } - + public abstract void Reload(int amount); } } diff --git a/EvilSatellites/Weapons/IWeapon.cs b/EvilSatellites/Weapons/IWeapon.cs index cc7cf10..df68099 100644 --- a/EvilSatellites/Weapons/IWeapon.cs +++ b/EvilSatellites/Weapons/IWeapon.cs @@ -11,7 +11,7 @@ namespace EvilSatellites.Weapons public interface IWeapon { void Shoot(GameTime time); - void Reload(); + void Reload(int amount); void Stop(); void Update(GameTime time); float FireRate { get; set; } diff --git a/EvilSatellites/Weapons/LaserMG.cs b/EvilSatellites/Weapons/LaserMG.cs index 0501b6b..0466e66 100644 --- a/EvilSatellites/Weapons/LaserMG.cs +++ b/EvilSatellites/Weapons/LaserMG.cs @@ -113,5 +113,11 @@ namespace EvilSatellites.Weapons base.Update(time); } + public override void Reload(int amount) + { + RemainingAmmo += amount; + sfxReload.Reset(); + sfxReload.Play(); + } } }