From c5e4b5ecdc5d9eb50d7415deef6aa5f449b2959d Mon Sep 17 00:00:00 2001 From: JoshuaNavarro Date: Mon, 22 Jul 2019 17:15:23 -0700 Subject: [PATCH] Finished target enemy. They now die on being hit by a projectile. Also cleaned up a debug log. --- .../SeasideScrambleMinigame/SSCEnemies/SSCE_Target.cs | 4 +--- .../SSCMenus/CharacterSelectScreen.cs | 4 ++-- .../SeasideScrambleMinigame/SeasideScramble.cs | 2 +- .../StardustCore/Animations/AnimationManager.cs | 11 +++++++++++ .../StardustCore/UIUtilities/TextureManager.cs | 6 +++--- 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/GeneralMods/Revitalize/Framework/Minigame/SeasideScrambleMinigame/SSCEnemies/SSCE_Target.cs b/GeneralMods/Revitalize/Framework/Minigame/SeasideScrambleMinigame/SSCEnemies/SSCE_Target.cs index 7a5f2fa2..a7f8add2 100644 --- a/GeneralMods/Revitalize/Framework/Minigame/SeasideScrambleMinigame/SSCEnemies/SSCE_Target.cs +++ b/GeneralMods/Revitalize/Framework/Minigame/SeasideScrambleMinigame/SSCEnemies/SSCE_Target.cs @@ -37,9 +37,7 @@ namespace Revitalize.Framework.Minigame.SeasideScrambleMinigame.SSCEnemies public override void update(GameTime time) { - base.update(time); - - if(this.sprite.animation.currentAnimationName=="None" && this.targetHit) + if(this.sprite.animation.IsAnimationPlaying==false && this.targetHit) { this.shouldDie = true; } diff --git a/GeneralMods/Revitalize/Framework/Minigame/SeasideScrambleMinigame/SSCMenus/CharacterSelectScreen.cs b/GeneralMods/Revitalize/Framework/Minigame/SeasideScrambleMinigame/SSCMenus/CharacterSelectScreen.cs index 4e44a3e5..2b5cdd96 100644 --- a/GeneralMods/Revitalize/Framework/Minigame/SeasideScrambleMinigame/SSCMenus/CharacterSelectScreen.cs +++ b/GeneralMods/Revitalize/Framework/Minigame/SeasideScrambleMinigame/SSCMenus/CharacterSelectScreen.cs @@ -472,8 +472,8 @@ namespace Revitalize.Framework.Minigame.SeasideScrambleMinigame.SSCMenus } SSCEnemies.SSCE_Target.Spawn_SSCE_Target(new Vector2(100, 100), Color.Blue); - SSCEnemies.SSCE_Target.Spawn_SSCE_Target(new Vector2(200, 100), Color.Red); - SSCEnemies.SSCE_Target.Spawn_SSCE_Target(new Vector2(300, 100), Color.Green); + // SSCEnemies.SSCE_Target.Spawn_SSCE_Target(new Vector2(200, 100), Color.Red); + //SSCEnemies.SSCE_Target.Spawn_SSCE_Target(new Vector2(300, 100), Color.Green); } /// diff --git a/GeneralMods/Revitalize/Framework/Minigame/SeasideScrambleMinigame/SeasideScramble.cs b/GeneralMods/Revitalize/Framework/Minigame/SeasideScrambleMinigame/SeasideScramble.cs index 5dae7b0f..7efeb376 100644 --- a/GeneralMods/Revitalize/Framework/Minigame/SeasideScrambleMinigame/SeasideScramble.cs +++ b/GeneralMods/Revitalize/Framework/Minigame/SeasideScrambleMinigame/SeasideScramble.cs @@ -377,7 +377,6 @@ namespace Revitalize.Framework.Minigame.SeasideScrambleMinigame { player.update(time); } - this.enemies.update(time); } else { @@ -385,6 +384,7 @@ namespace Revitalize.Framework.Minigame.SeasideScrambleMinigame { if (player.playerID == SSCEnums.PlayerID.One) this.camera.centerOnPosition(player.position); player.update(time); + this.enemies.update(time); } } diff --git a/GeneralMods/StardustCore/Animations/AnimationManager.cs b/GeneralMods/StardustCore/Animations/AnimationManager.cs index 2ec98bc8..e147ed12 100644 --- a/GeneralMods/StardustCore/Animations/AnimationManager.cs +++ b/GeneralMods/StardustCore/Animations/AnimationManager.cs @@ -24,6 +24,17 @@ namespace StardustCore.Animations public bool IsNull => this.defaultDrawFrame == null && this.objectTexture == null; + /// + /// Checks to see if there is an animation playing. + /// + public bool IsAnimationPlaying + { + get + { + return !(this.defaultDrawFrame == this.currentAnimation); + } + } + /// Construct an instance. public AnimationManager() { } diff --git a/GeneralMods/StardustCore/UIUtilities/TextureManager.cs b/GeneralMods/StardustCore/UIUtilities/TextureManager.cs index 2d3ec51f..24c00499 100644 --- a/GeneralMods/StardustCore/UIUtilities/TextureManager.cs +++ b/GeneralMods/StardustCore/UIUtilities/TextureManager.cs @@ -211,7 +211,7 @@ namespace StardustCore.UIUtilities { Texture2DExtended textureExtended = new Texture2DExtended(ModCore.ModHelper, ModCore.Manifest, Path.Combine(relativePath, Path.GetFileName(file))); - ModCore.log("Found texture: " + textureExtended.Name); + //ModCore.log("Found texture: " + textureExtended.Name); textureExtended.texture.Name = ModCore.Manifest.UniqueID + "_" + this.name + "_" + textureExtended.Name; @@ -222,7 +222,7 @@ namespace StardustCore.UIUtilities { Texture2DExtended textureExtended = new Texture2DExtended(Helper, Manifest, Path.Combine(relativePath, Path.GetFileName(file))); - ModCore.log("Found texture: " + textureExtended.Name); + //ModCore.log("Found texture: " + textureExtended.Name); textureExtended.texture.Name = Manifest.UniqueID + "_" + this.name + "_" + textureExtended.Name; @@ -234,7 +234,7 @@ namespace StardustCore.UIUtilities Texture2DExtended textureExtended = new Texture2DExtended(ContentPack, Path.Combine(relativePath, Path.GetFileName(file))); textureExtended.texture.Name = ContentPack.Manifest.UniqueID + "_" + this.name + "_" + textureExtended.Name; - ModCore.log("Found texture: " + textureExtended.Name); + //ModCore.log("Found texture: " + textureExtended.Name); //this.addTexture(textureExtended.Name, textureExtended); }