From ce99ffd793284f86038ee31096a0a3ce2975a12c Mon Sep 17 00:00:00 2001 From: Daniel McAssey Date: Tue, 25 Mar 2014 23:41:34 +0000 Subject: [PATCH] no message --- .../SolarFusion/Core/Input/InputHelper.cs | 14 ++------------ .../SolarFusion/Core/Input/InputManager.cs | 10 ++++++---- .../SolarFusion/Core/Level/LevelManager.cs | 6 ++++++ .../Core/Screen/GUIScreens/ScreenCredits.cs | 9 +++++++-- .../Core/Screen/GameScreens/ScreenGame.cs | 3 +++ .../SolarFusion/SolarFusion/Core/SysConfig.cs | 2 ++ .../Core/Data/Players/asterix.xml | 14 +++++++------- .../SolarFusionContent/Core/Data/players.xml | 2 +- .../SolarFusionContent.contentproj | 15 ++++++++------- .../Characters/asterix/spritesheet.png | Bin 196554 -> 21014 bytes 10 files changed, 42 insertions(+), 33 deletions(-) diff --git a/SolarFusion/SolarFusion/SolarFusion/Core/Input/InputHelper.cs b/SolarFusion/SolarFusion/SolarFusion/Core/Input/InputHelper.cs index 04ee042..6d92606 100644 --- a/SolarFusion/SolarFusion/SolarFusion/Core/Input/InputHelper.cs +++ b/SolarFusion/SolarFusion/SolarFusion/Core/Input/InputHelper.cs @@ -56,18 +56,16 @@ static public void endUpdate() public void AddKeyboardInput(Keys keyPressed, bool isReleased) { if (mKeyboard.ContainsKey(keyPressed)) - { return; - } + mKeyboard.Add(keyPressed, isReleased); } public void AddGamepadInput(Buttons buttonPressed, bool isReleased) { if (mGamepad.ContainsKey(buttonPressed)) - { return; - } + mGamepad.Add(buttonPressed, isReleased); } @@ -78,16 +76,12 @@ public bool IsPressed(PlayerIndex? playerIndex) if (mKeyboard[aKey] == true) { if (CurrentKeyboardState.IsKeyDown(aKey) == true && PreviousKeyboardState.IsKeyDown(aKey) == false) - { return true; - } } else { if (CurrentKeyboardState.IsKeyDown(aKey)) - { return true; - } } } @@ -96,16 +90,12 @@ public bool IsPressed(PlayerIndex? playerIndex) if (mGamepad[aButton] == true) { if (CurrentGamePadState[playerIndex].IsButtonDown(aButton) == true && PreviousGamePadState[playerIndex].IsButtonDown(aButton) == false) - { return true; - } } else { if (CurrentGamePadState[playerIndex].IsButtonDown(aButton)) - { return true; - } } } diff --git a/SolarFusion/SolarFusion/SolarFusion/Core/Input/InputManager.cs b/SolarFusion/SolarFusion/SolarFusion/Core/Input/InputManager.cs index 3e34162..a3f6592 100644 --- a/SolarFusion/SolarFusion/SolarFusion/Core/Input/InputManager.cs +++ b/SolarFusion/SolarFusion/SolarFusion/Core/Input/InputManager.cs @@ -30,8 +30,9 @@ public InputManager() this.AddGamePadInput("NAV_SELECT", SysConfig.INPUT_GAMEPAD_SELECT, true); this.AddGamePadInput("NAV_CANCEL", SysConfig.INPUT_GAMEPAD_CANCEL, true); - this.AddGamePadInput("GLOBAL_START", SysConfig.INPUT_GAMEPAD_START, false); - this.AddGamePadInput("GAME_PAUSE", SysConfig.INPUT_GAMEPAD_START, false); + this.AddGamePadInput("GLOBAL_START", SysConfig.INPUT_GAMEPAD_START, true); + this.AddGamePadInput("GLOBAL_DEBUG", SysConfig.INPUT_GAMEPAD_DEBUG, true); + this.AddGamePadInput("GAME_PAUSE", SysConfig.INPUT_GAMEPAD_START, true); this.AddGamePadInput("PLAY_MOVE_LEFT", SysConfig.INPUT_GAMEPAD_LEFT_DPAD, false); this.AddGamePadInput("PLAY_MOVE_LEFT", SysConfig.INPUT_GAMEPAD_LEFT_STICK, false); @@ -49,8 +50,9 @@ public InputManager() this.AddKeyboardInput("NAV_SELECT", SysConfig.INPUT_KEYBOARD_SELECT, true); this.AddKeyboardInput("NAV_CANCEL", SysConfig.INPUT_KEYBOARD_CANCEL, true); - this.AddKeyboardInput("GLOBAL_START", SysConfig.INPUT_KEYBOARD_START, false); - this.AddKeyboardInput("GAME_PAUSE", SysConfig.INPUT_KEYBOARD_CANCEL, false); + this.AddKeyboardInput("GLOBAL_START", SysConfig.INPUT_KEYBOARD_START, true); + this.AddKeyboardInput("GLOBAL_DEBUG", SysConfig.INPUT_KEYBOARD_DEBUG, true); + this.AddKeyboardInput("GAME_PAUSE", SysConfig.INPUT_KEYBOARD_CANCEL, true); this.AddKeyboardInput("PLAY_MOVE_LEFT", SysConfig.INPUT_KEYBOARD_LEFT, false); this.AddKeyboardInput("PLAY_MOVE_RIGHT", SysConfig.INPUT_KEYBOARD_RIGHT, false); diff --git a/SolarFusion/SolarFusion/SolarFusion/Core/Level/LevelManager.cs b/SolarFusion/SolarFusion/SolarFusion/Core/Level/LevelManager.cs index c3d3635..dc70f64 100644 --- a/SolarFusion/SolarFusion/SolarFusion/Core/Level/LevelManager.cs +++ b/SolarFusion/SolarFusion/SolarFusion/Core/Level/LevelManager.cs @@ -63,6 +63,12 @@ public LevelTilemap CurrentGameMap { get { return this._obj_map; } } + + public bool Debug + { + get { return this.mDebugEnabled; } + set { this.mDebugEnabled = value; } + } #endregion // !Properties diff --git a/SolarFusion/SolarFusion/SolarFusion/Core/Screen/GUIScreens/ScreenCredits.cs b/SolarFusion/SolarFusion/SolarFusion/Core/Screen/GUIScreens/ScreenCredits.cs index 5e33c22..259e774 100644 --- a/SolarFusion/SolarFusion/SolarFusion/Core/Screen/GUIScreens/ScreenCredits.cs +++ b/SolarFusion/SolarFusion/SolarFusion/Core/Screen/GUIScreens/ScreenCredits.cs @@ -82,11 +82,16 @@ public override void update() public override void render() { + // Draw the selected entry in yellow, otherwise white. + Color tmenuimgclr = Color.White; + + // Modify the alpha to fade text out during transitions. + tmenuimgclr *= this.CurrentTransitionAlpha; + base.render(); this.ScreenManager.SpriteBatch.Begin(); - for (int i = 0; i < this.mCreditList.Count; i++) - this.ScreenManager.SpriteBatch.DrawString(this.ScreenManager.DefaultGUIFont, this.mCreditList[i].FullString, this.mCreditList[i].TextPosition, Color.White, 0f, this.mCreditList[i].TextOrigin, this.mTextScale, SpriteEffects.None, 0f); + this.ScreenManager.SpriteBatch.DrawString(this.ScreenManager.DefaultGUIFont, this.mCreditList[i].FullString, this.mCreditList[i].TextPosition, tmenuimgclr, 0f, this.mCreditList[i].TextOrigin, this.mTextScale, SpriteEffects.None, 0f); this.ScreenManager.SpriteBatch.End(); } diff --git a/SolarFusion/SolarFusion/SolarFusion/Core/Screen/GameScreens/ScreenGame.cs b/SolarFusion/SolarFusion/SolarFusion/Core/Screen/GameScreens/ScreenGame.cs index 428351f..40ded43 100644 --- a/SolarFusion/SolarFusion/SolarFusion/Core/Screen/GameScreens/ScreenGame.cs +++ b/SolarFusion/SolarFusion/SolarFusion/Core/Screen/GameScreens/ScreenGame.cs @@ -68,6 +68,9 @@ public override void update() //Update per frame if (this.GlobalInput.IsPressed("PLAY_WEAPON_FIRE", this.ControllingPlayer)) //If player presses the jump button (Spacebar/A) this._obj_activeplayer.fire(); + if (this.GlobalInput.IsPressed("GLOBAL_DEBUG", this.ControllingPlayer)) //If player presses the jump button (Spacebar/A) + this._obj_levelmanager.Debug = !this._obj_levelmanager.Debug; + base.update(); } diff --git a/SolarFusion/SolarFusion/SolarFusion/Core/SysConfig.cs b/SolarFusion/SolarFusion/SolarFusion/Core/SysConfig.cs index 73a96fc..e2ad9e5 100644 --- a/SolarFusion/SolarFusion/SolarFusion/Core/SysConfig.cs +++ b/SolarFusion/SolarFusion/SolarFusion/Core/SysConfig.cs @@ -64,6 +64,7 @@ public class SysConfig public const Buttons INPUT_GAMEPAD_JUMP = Buttons.A; public const Buttons INPUT_GAMEPAD_FIRE = Buttons.RightShoulder; + public const Buttons INPUT_GAMEPAD_DEBUG = Buttons.RightStick; //Default Keyboard Controls public const Keys INPUT_KEYBOARD_UP = Keys.Up; @@ -77,5 +78,6 @@ public class SysConfig public const Keys INPUT_KEYBOARD_JUMP = Keys.Space; public const Keys INPUT_KEYBOARD_FIRE = Keys.X; + public const Keys INPUT_KEYBOARD_DEBUG = Keys.F2; } } diff --git a/SolarFusion/SolarFusion/SolarFusionContent/Core/Data/Players/asterix.xml b/SolarFusion/SolarFusion/SolarFusionContent/Core/Data/Players/asterix.xml index 5600139..89af7ab 100644 --- a/SolarFusion/SolarFusion/SolarFusionContent/Core/Data/Players/asterix.xml +++ b/SolarFusion/SolarFusion/SolarFusionContent/Core/Data/Players/asterix.xml @@ -7,27 +7,27 @@ 1 10 - right left + right idle 10 10 - 3 + 8 - right - 15 + left + 5 - left - 15 + right + 5 idle - 1 + 3 1.8 diff --git a/SolarFusion/SolarFusion/SolarFusionContent/Core/Data/players.xml b/SolarFusion/SolarFusion/SolarFusionContent/Core/Data/players.xml index c897a6f..a4d4883 100644 --- a/SolarFusion/SolarFusion/SolarFusionContent/Core/Data/players.xml +++ b/SolarFusion/SolarFusion/SolarFusionContent/Core/Data/players.xml @@ -2,6 +2,6 @@ dr_jumpista - + asterix \ No newline at end of file diff --git a/SolarFusion/SolarFusion/SolarFusionContent/SolarFusionContent.contentproj b/SolarFusion/SolarFusion/SolarFusionContent/SolarFusionContent.contentproj index dd3a932..9e3a04b 100644 --- a/SolarFusion/SolarFusion/SolarFusionContent/SolarFusionContent.contentproj +++ b/SolarFusion/SolarFusion/SolarFusionContent/SolarFusionContent.contentproj @@ -1094,13 +1094,6 @@ TextureProcessor - - - spritesheet - TextureImporter - TextureProcessor - - spritesheet @@ -1157,6 +1150,14 @@ TextureProcessor + + + + spritesheet + TextureImporter + TextureProcessor + +