diff --git a/DangerousD/Content/Content.mgcb b/DangerousD/Content/Content.mgcb index ea7bb60..b3ce6cc 100644 --- a/DangerousD/Content/Content.mgcb +++ b/DangerousD/Content/Content.mgcb @@ -140,7 +140,7 @@ /processorParam:TextureFormat=Color /build:menuFon.jpg -#begin MenuFon2.jpg +#begin menuFon2.jpg /importer:TextureImporter /processor:TextureProcessor /processorParam:ColorKeyColor=255,0,255,255 @@ -150,7 +150,7 @@ /processorParam:ResizeToPowerOfTwo=False /processorParam:MakeSquare=False /processorParam:TextureFormat=Color -/build:MenuFon2.jpg +/build:menuFon2.jpg #begin menuFon3.jpg /importer:TextureImporter @@ -255,7 +255,7 @@ /processorParam:Quality=Best /build:sounds/shotgun_shot.mp3 -#begin SmokeAnimation2.png +#begin smokeAnimation2.png /importer:TextureImporter /processor:TextureProcessor /processorParam:ColorKeyColor=255,0,255,255 @@ -265,7 +265,7 @@ /processorParam:ResizeToPowerOfTwo=False /processorParam:MakeSquare=False /processorParam:TextureFormat=Color -/build:SmokeAnimation2.png +/build:smokeAnimation2.png #begin textboxbackground1-1.png /importer:TextureImporter diff --git a/DangerousD/Content/Door.tsx b/DangerousD/Content/Door.tsx index a250dd5..8e5687c 100644 --- a/DangerousD/Content/Door.tsx +++ b/DangerousD/Content/Door.tsx @@ -1,4 +1,4 @@ - + diff --git a/DangerousD/Content/LastLvl.tmx b/DangerousD/Content/LastLvl.tmx new file mode 100644 index 0000000..2efe988 --- /dev/null +++ b/DangerousD/Content/LastLvl.tmx @@ -0,0 +1,130 @@ + + + + + + +410,410,410,410,410,410,410,410,410,410,410,410,410,410,410,410, +410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + + +410,410,410,410,410,410,410,410,410,410,410,410,410,410,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,410,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,410,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,410,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,410,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,410,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,410,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,410,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,410,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,410,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,410,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,410,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,410,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,410,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,410,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,410,0,0 + + +410,410,410,410,410,410,410,410,410,410,410,410,410,410,410,410, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + + +410,410,410,410,410,410,410,410,410,410,410,410,410,410,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + + + + + + +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,376,375,369,370,388,389,726,390,369,370,376,389,376,388,726, +0,376,389,369,370,390,726,388,388,369,370,390,726,388,389,389, +0,388,726,369,370,390,377,375,377,369,370,431,389,389,431,431, +0,389,431,369,370,377,377,389,388,369,370,431,389,375,375,431, +0,377,377,369,370,390,376,389,431,369,370,375,375,726,388,390, +0,388,431,369,370,388,390,376,726,369,370,375,377,376,388,377, +0,388,375,369,370,376,375,377,388,369,370,376,375,389,388,431, +0,390,726,369,370,377,431,431,388,369,370,389,390,390,376,377, +0,377,376,369,370,389,377,431,376,369,370,389,431,726,431,388, +0,377,431,369,370,375,390,390,377,369,370,375,377,389,388,376, +0,390,390,369,370,431,376,389,390,369,370,390,431,376,389,390, +0,431,377,369,370,376,390,388,388,369,370,377,375,390,389,377, +0,390,726,369,370,375,377,726,390,369,370,389,376,388,388,375, +0,390,389,382,383,388,377,388,390,382,383,431,726,390,388,431, +0,389,377,395,396,389,431,377,431,395,396,375,388,726,376,389 + + +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +389,388,375,369,370,388,377,389,389,369,370,390,375,0,0,0, +390,388,726,369,370,375,726,376,726,369,370,388,375,0,0,0, +388,389,431,369,370,726,377,726,431,369,370,377,375,0,0,0, +388,376,431,369,370,377,375,726,726,369,370,431,376,0,0,0, +376,389,388,369,370,377,390,431,389,369,370,376,431,0,0,0, +389,388,389,369,370,376,726,390,377,369,370,389,377,0,0,0, +431,377,389,369,370,431,726,726,389,369,370,431,390,0,0,0, +390,389,377,369,370,390,390,376,431,369,370,390,376,0,0,0, +388,388,377,369,370,388,431,390,388,369,370,389,377,0,0,0, +388,389,390,369,370,726,377,377,388,369,370,390,390,0,0,0, +388,376,390,369,370,377,377,389,726,369,370,375,726,0,0,0, +431,726,390,369,370,375,431,377,726,369,370,389,389,0,0,0, +390,388,726,369,370,389,375,390,388,369,370,377,726,0,0,0, +375,375,375,382,383,376,390,726,388,382,383,431,726,0,0,0, +389,389,390,395,396,390,390,726,390,395,396,431,390,0,0,0 + + + + + + + + + + + + + + diff --git a/DangerousD/Content/animations/DeathFromGhost b/DangerousD/Content/animations/DeathFromGhost new file mode 100644 index 0000000..b4ef48e --- /dev/null +++ b/DangerousD/Content/animations/DeathFromGhost @@ -0,0 +1 @@ +{"id":"DeathFromGhost","textureName":"deathAnimation","startSpriteRectangle":{"X":1,"Y":246,"Width":48,"Height":48},"frameSecond":[{"Item1":0,"Item2":10}],"textureFrameInterval":1,"framesCount":5,"isCycle":false,"offset":"0, 0"} diff --git a/DangerousD/Content/animations/DeathFromHunchman b/DangerousD/Content/animations/DeathFromHunchman new file mode 100644 index 0000000..a00ed27 --- /dev/null +++ b/DangerousD/Content/animations/DeathFromHunchman @@ -0,0 +1 @@ +{"id":"DeathFromHunchman","textureName":"deathAnimation","startSpriteRectangle":{"X":1,"Y":1,"Width":48,"Height":48},"frameSecond":[{"Item1":0,"Item2":10}],"textureFrameInterval":1,"framesCount":5,"isCycle":false,"offset":"0, 0"} diff --git a/DangerousD/Content/animations/DeathFromSilasHand b/DangerousD/Content/animations/DeathFromSilasHand new file mode 100644 index 0000000..ef28c10 --- /dev/null +++ b/DangerousD/Content/animations/DeathFromSilasHand @@ -0,0 +1 @@ +{"id":"DeathFromSilasHand","textureName":"deathAnimation","startSpriteRectangle":{"X":1,"Y":295,"Width":48,"Height":48},"frameSecond":[{"Item1":0,"Item2":10}],"textureFrameInterval":1,"framesCount":5,"isCycle":false,"offset":"0, 0"} diff --git a/DangerousD/Content/animations/DeathFromSilasMaster b/DangerousD/Content/animations/DeathFromSilasMaster new file mode 100644 index 0000000..3f9a76b --- /dev/null +++ b/DangerousD/Content/animations/DeathFromSilasMaster @@ -0,0 +1 @@ +{"id":"DeathFromSilasMaster","textureName":"deathAnimation","startSpriteRectangle":{"X":1,"Y":295,"Width":48,"Height":48},"frameSecond":[{"Item1":0,"Item2":10}],"textureFrameInterval":1,"framesCount":5,"isCycle":false,"offset":"0, 0"} diff --git a/DangerousD/Content/animations/DeathFromSlime b/DangerousD/Content/animations/DeathFromSlime new file mode 100644 index 0000000..5a692f6 --- /dev/null +++ b/DangerousD/Content/animations/DeathFromSlime @@ -0,0 +1 @@ +{"id":"DeathFromSlime","textureName":"deathAnimation","startSpriteRectangle":{"X":1,"Y":50,"Width":48,"Height":48},"frameSecond":[{"Item1":0,"Item2":10}],"textureFrameInterval":1,"framesCount":5,"isCycle":false,"offset":"0, 0"} diff --git a/DangerousD/Content/animations/DeathFromSpider b/DangerousD/Content/animations/DeathFromSpider new file mode 100644 index 0000000..98a08a5 --- /dev/null +++ b/DangerousD/Content/animations/DeathFromSpider @@ -0,0 +1 @@ +{"id":"DeathFromSpider","textureName":"deathAnimation","startSpriteRectangle":{"X":1,"Y":148,"Width":48,"Height":48},"frameSecond":[{"Item1":0,"Item2":10}],"textureFrameInterval":1,"framesCount":5,"isCycle":false,"offset":"0, 0"} diff --git a/DangerousD/Content/animations/DeathFromWerewolf b/DangerousD/Content/animations/DeathFromWerewolf new file mode 100644 index 0000000..8f0b150 --- /dev/null +++ b/DangerousD/Content/animations/DeathFromWerewolf @@ -0,0 +1 @@ +{"id":"DeathFromWerewolf","textureName":"deathAnimation","startSpriteRectangle":{"X":1,"Y":197,"Width":48,"Height":48},"frameSecond":[{"Item1":0,"Item2":10}],"textureFrameInterval":1,"framesCount":5,"isCycle":false,"offset":"0, 0"} diff --git a/DangerousD/Content/animations/playerShootBoomUpLeft b/DangerousD/Content/animations/playerShootBoomUpLeft new file mode 100644 index 0000000..093eb3c --- /dev/null +++ b/DangerousD/Content/animations/playerShootBoomUpLeft @@ -0,0 +1 @@ +{"id":"playerShootBoomUpLeft","textureName":"playerAnimation","startSpriteRectangle":{"X":267,"Y":34,"Width":24,"Height":32},"frameSecond":[{"Item1":0,"Item2":12}],"textureFrameInterval":1,"framesCount":2,"isCycle":false,"offset":"0, 0"} diff --git a/DangerousD/Content/animations/playerShootBoomUpRight b/DangerousD/Content/animations/playerShootBoomUpRight new file mode 100644 index 0000000..3f70e03 --- /dev/null +++ b/DangerousD/Content/animations/playerShootBoomUpRight @@ -0,0 +1,24 @@ +{ + "id": "playerShootBoomUpRight", + "textureName": "playerAnimation", + "startSpriteRectangle": { + "X": 267, + "Y": 1, + "Width": 24, + "Height": 32 + }, + "frameSecond": [ + { + "Item1": 0, + "Item2": 3 + }, + { + "Item1": 1, + "Item2": 20 + } + ], + "textureFrameInterval": 1, + "framesCount": 2, + "isCycle": false, + "offset": "0, 0" +} diff --git a/DangerousD/Content/lvl.tmx b/DangerousD/Content/lvl.tmx index 5fcea6a..5d448e5 100644 --- a/DangerousD/Content/lvl.tmx +++ b/DangerousD/Content/lvl.tmx @@ -1,5 +1,5 @@ - + @@ -683,7 +683,7 @@ - + @@ -698,13 +698,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/DangerousD/Content/MenuFon2.jpg b/DangerousD/Content/menuFon2.jpg similarity index 100% rename from DangerousD/Content/MenuFon2.jpg rename to DangerousD/Content/menuFon2.jpg diff --git a/DangerousD/Content/SmokeAnimation2.png b/DangerousD/Content/smokeAnimation2.png similarity index 100% rename from DangerousD/Content/SmokeAnimation2.png rename to DangerousD/Content/smokeAnimation2.png diff --git a/DangerousD/GameCore/GUI/DeathGUI.cs b/DangerousD/GameCore/GUI/DeathGUI.cs index bb91470..ce73850 100644 --- a/DangerousD/GameCore/GUI/DeathGUI.cs +++ b/DangerousD/GameCore/GUI/DeathGUI.cs @@ -13,7 +13,7 @@ internal class DeathGUI : AbstractGui { int wigth = AppManager.Instance.inGameResolution.X; int height = AppManager.Instance.inGameResolution.Y; - float scaler = AppManager.Instance.resolution.Y / (float)AppManager.Instance.inGameHUDHelperResolution.Y; + float scaler = AppManager.Instance.inGameResolution.Y / (float)AppManager.Instance.inGameHUDHelperResolution.Y; var menuBackground = new DrawableUIElement(Manager) { rectangle = new Rectangle(0, 0, wigth, height), textureName = "deathBackground" }; Elements.Add(menuBackground); menuBackground.LoadTexture(AppManager.Instance.Content); @@ -23,7 +23,7 @@ internal class DeathGUI : AbstractGui Elements.Add(butMenu); butMenu.LeftButtonPressed += () => { - AppManager.Instance.ChangeGameState(GameState.Menu); + AppManager.Instance.Restart("lvl"); }; foreach (var item in Elements) { diff --git a/DangerousD/GameCore/GUI/HUD.cs b/DangerousD/GameCore/GUI/HUD.cs index 0e24ff6..7b7a199 100644 --- a/DangerousD/GameCore/GUI/HUD.cs +++ b/DangerousD/GameCore/GUI/HUD.cs @@ -16,22 +16,26 @@ namespace DangerousD.GameCore.GUI { int wigth = AppManager.Instance.inGameResolution.X; int height = AppManager.Instance.inGameResolution.Y; - float scaler = AppManager.Instance.resolution.Y / (float)AppManager.Instance.inGameHUDHelperResolution.Y; + float scaler = AppManager.Instance.inGameResolution.Y / (float)AppManager.Instance.inGameHUDHelperResolution.Y; Texture2D texture; SpriteFont spriteFont; public void Draw(SpriteBatch spriteBatch) { spriteBatch.Begin(); - spriteBatch.Draw(texture, new Rectangle(wigth / 35 - 2, height / 35 - 2, 120 + 2, 70 + 2), Color.DarkRed); - spriteBatch.DrawString(spriteFont, "AMMO", new Vector2(wigth / 34 + 4, height / 30 - 6), Color.Gray, 0, Vector2.Zero, 1.8f, SpriteEffects.None, 0); - spriteBatch.DrawString(spriteFont, "AMMO", new Vector2(wigth / 34 + 1, height / 30 - 6), Color.White, 0, Vector2.Zero, 1.8f, SpriteEffects.None, 0); + spriteBatch.Draw(texture, new Rectangle( + (int)((wigth / 35 - 2) * scaler), + (int)((height / 35 - 2) * scaler), + (int)((120 + 2) * scaler), + (int)((70 + 2) * scaler)), Color.DarkRed); + spriteBatch.DrawString(spriteFont, "AMMO", new Vector2((wigth / 34 + 4)* scaler, height / 30 - 6), Color.Gray, 0, Vector2.Zero, 1.8f, SpriteEffects.None, 0); + spriteBatch.DrawString(spriteFont, "AMMO", new Vector2((wigth / 34 + 1 )* scaler, height / 30 - 6), Color.White, 0, Vector2.Zero, 1.8f, SpriteEffects.None, 0); for (int i = 1; i < 6; i++) { if (i <= AppManager.Instance.GameManager.players[0].Bullets) { - spriteBatch.Draw(texture, new Rectangle(wigth / 30 + i * 13 + 2, height / 17 + 4, 5, 20), new Color(0.8f, 0.8f, 0, 1f)); - spriteBatch.Draw(texture, new Rectangle(wigth / 30 + i * 13, height / 17 + 4, 5, 20), Color.Yellow); + spriteBatch.Draw(texture, new Rectangle((int)((wigth / 30 + i * 13 + 2) * scaler), (int)((height / 17 + 4) * scaler), (int)((5) * scaler), (int)((20) * scaler)), new Color(0.8f, 0.8f, 0, 1f)); + spriteBatch.Draw(texture, new Rectangle((int)((wigth / 30 + i * 13) * scaler), (int)((height / 17 + 4) * scaler), (int)((5) * scaler), (int)((20) * scaler)), Color.Yellow); } else { diff --git a/DangerousD/GameCore/GUI/LobbyGUI.cs b/DangerousD/GameCore/GUI/LobbyGUI.cs index 3b8b9ab..90ba3c9 100644 --- a/DangerousD/GameCore/GUI/LobbyGUI.cs +++ b/DangerousD/GameCore/GUI/LobbyGUI.cs @@ -25,7 +25,7 @@ namespace DangerousD.GameCore.GUI { int screenWidth = AppManager.Instance.inGameResolution.X; int screenHeight = AppManager.Instance.inGameResolution.Y; - float scaler = AppManager.Instance.resolution.Y / (float)AppManager.Instance.inGameHUDHelperResolution.Y; + float scaler = AppManager.Instance.inGameResolution.Y / (float)AppManager.Instance.inGameHUDHelperResolution.Y; var lobbyBackground = new DrawableUIElement(Manager) { rectangle = new Rectangle(0, 0, screenWidth, screenHeight), textureName = "menuFon3" }; Elements.Add(lobbyBackground); diff --git a/DangerousD/GameCore/GUI/LoginGUI.cs b/DangerousD/GameCore/GUI/LoginGUI.cs index 5b7f972..7d5ee76 100644 --- a/DangerousD/GameCore/GUI/LoginGUI.cs +++ b/DangerousD/GameCore/GUI/LoginGUI.cs @@ -26,7 +26,7 @@ namespace DangerousD.GameCore.GUI { int screenWidth = AppManager.Instance.inGameResolution.X; int screenHeight = AppManager.Instance.inGameResolution.Y; - float scaler = AppManager.Instance.resolution.Y / (float)AppManager.Instance.inGameHUDHelperResolution.Y; + float scaler = AppManager.Instance.inGameResolution.Y / (float)AppManager.Instance.inGameHUDHelperResolution.Y; var loginBackground = new DrawableUIElement(Manager) { rectangle = new Rectangle(0, 0, screenWidth, screenHeight), textureName = "menuFon2" }; Elements.Add(loginBackground); diff --git a/DangerousD/GameCore/GUI/MenuGUI.cs b/DangerousD/GameCore/GUI/MenuGUI.cs index 214e747..48f42c0 100644 --- a/DangerousD/GameCore/GUI/MenuGUI.cs +++ b/DangerousD/GameCore/GUI/MenuGUI.cs @@ -24,7 +24,7 @@ internal class MenuGUI : AbstractGui { int wigth = AppManager.Instance.inGameHUDHelperResolution.X; int height = AppManager.Instance.inGameHUDHelperResolution.Y; - float scaler = AppManager.Instance.resolution.Y / (float)AppManager.Instance.inGameHUDHelperResolution.Y; + float scaler = AppManager.Instance.inGameResolution.Y / (float)AppManager.Instance.inGameHUDHelperResolution.Y; var menuBackground = new DrawableUIElement(Manager) { rectangle = new Rectangle(0, 0, wigth, height), textureName = "menuFon" }; Elements.Add(menuBackground); diff --git a/DangerousD/GameCore/GUI/OptionsGUI.cs b/DangerousD/GameCore/GUI/OptionsGUI.cs index 18ccd77..53b1953 100644 --- a/DangerousD/GameCore/GUI/OptionsGUI.cs +++ b/DangerousD/GameCore/GUI/OptionsGUI.cs @@ -15,7 +15,7 @@ namespace DangerousD.GameCore.GUI { int wigth = AppManager.Instance.inGameHUDHelperResolution.X; int height = AppManager.Instance.inGameHUDHelperResolution.Y; - float scaler = AppManager.Instance.resolution.Y / (float)AppManager.Instance.inGameHUDHelperResolution.Y; + float scaler = AppManager.Instance.inGameResolution.Y / (float)AppManager.Instance.inGameHUDHelperResolution.Y; var menuBackground = new DrawableUIElement(Manager) { rectangle = new Rectangle(0, 0, wigth, height), textureName = "optionsBackground" }; //Elements.Add(menuBackground); menuBackground.LoadTexture(AppManager.Instance.Content); diff --git a/DangerousD/GameCore/GameObjects/Entities/Door.cs b/DangerousD/GameCore/GameObjects/Entities/Door.cs index cacaf22..fe18355 100644 --- a/DangerousD/GameCore/GameObjects/Entities/Door.cs +++ b/DangerousD/GameCore/GameObjects/Entities/Door.cs @@ -37,15 +37,19 @@ namespace DangerousD.GameCore.GameObjects.Entities public override void OnCollision(GameObject gameObject) { base.OnCollision(gameObject); - if (gameObject is Player) + if (this is not TeleportingDoor) { - Player player = (Player)gameObject; - if (player.isUping) + if (gameObject is Player) { - AppManager.Instance.GameManager.Remove(this); - //тут спавн лута + Player player = (Player)gameObject; + if (player.isUping) + { + AppManager.Instance.GameManager.Remove(this); + //тут спавн лута + } } } + } } } diff --git a/DangerousD/GameCore/GameObjects/Entities/SilasBall.cs b/DangerousD/GameCore/GameObjects/Entities/SilasBall.cs index 94e7ca6..157b410 100644 --- a/DangerousD/GameCore/GameObjects/Entities/SilasBall.cs +++ b/DangerousD/GameCore/GameObjects/Entities/SilasBall.cs @@ -1,4 +1,5 @@ -using DangerousD.GameCore.Graphics; +using DangerousD.GameCore.GameObjects.LivingEntities; +using DangerousD.GameCore.Graphics; using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; using System; @@ -14,12 +15,15 @@ namespace DangerousD.GameCore.GameObjects.Entities { private Vector2 v; + public string name; public SilasBall(Vector2 position) : base(position) { Height = 24; Width = 24; acceleration = Vector2.Zero; - + name = "SilasHand"; + + } public SilasBall(Vector2 position, Vector2 velosity) : base(position) { @@ -28,7 +32,8 @@ namespace DangerousD.GameCore.GameObjects.Entities acceleration = Vector2.Zero; velocity = velosity; v = velosity; - + name = "SilasHand"; + } protected override GraphicsComponent GraphicsComponent { get; } = new(new List { "SilasBallMove" }, "SilasBallMove"); @@ -48,5 +53,21 @@ namespace DangerousD.GameCore.GameObjects.Entities } + public void Attack() + { + AppManager.Instance.GameManager.GetPlayer1.Death(name); + } + public override void OnCollision(GameObject gameObject) + { + base.OnCollision(gameObject); + if (gameObject is Player) + { + if (AppManager.Instance.GameManager.players[0].IsAlive) + { + Attack(); + + } + } + } } } diff --git a/DangerousD/GameCore/GameObjects/Entities/TeleportingDoor.cs b/DangerousD/GameCore/GameObjects/Entities/TeleportingDoor.cs new file mode 100644 index 0000000..558771d --- /dev/null +++ b/DangerousD/GameCore/GameObjects/Entities/TeleportingDoor.cs @@ -0,0 +1,54 @@ +using DangerousD.GameCore.GameObjects.LivingEntities; +using Microsoft.Xna.Framework; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DangerousD.GameCore.GameObjects.Entities +{ + internal class TeleportingDoor : Door + { + public Vector2 Target; + public bool IsVisible = true; + public Action action; + public TeleportingDoor(Vector2 position, Vector2 size, Rectangle sourceRectangle, Vector2 target, Action action) : base(position, size, sourceRectangle) + { + Target = target; + this.action = action; + } + public override void OnCollision(GameObject gameObject) + { + if (IsVisible) + { + if (gameObject is Player) + { + Player player = (Player)gameObject; + if (player.isUping) + { + IsVisible = false; + + } + } + } + else + { + if (gameObject is Player) + { + Player player = (Player)gameObject; + if (player.isUping) + { + player.SetPosition(Target); + if (action!=null) + { + action(); + } + + } + } + } + } + + } +} diff --git a/DangerousD/GameCore/GameObjects/GameObject.cs b/DangerousD/GameCore/GameObjects/GameObject.cs index 8526427..9a37c58 100644 --- a/DangerousD/GameCore/GameObjects/GameObject.cs +++ b/DangerousD/GameCore/GameObjects/GameObject.cs @@ -15,6 +15,7 @@ namespace DangerousD.GameCore protected Vector2 _pos; public Vector2 Pos => _pos; public int id; + public bool isChildEntity = false; public bool isIdFromHost = false; public int Width { get; set; } public int Height { get; set; } @@ -63,9 +64,7 @@ namespace DangerousD.GameCore if (AppManager.Instance.InputManager.CollisionsCheat) { spriteBatch.Draw(debugTexture, - new Rectangle(Rectangle.X - GraphicsComponent.CameraPosition.X, - Rectangle.Y - GraphicsComponent.CameraPosition.Y, Rectangle.Width, Rectangle.Height), - Color.White); + new Rectangle((Rectangle.X - GraphicsComponent.CameraPosition.X) * GraphicsComponent.scaling, (Rectangle.Y - GraphicsComponent.CameraPosition.Y) * GraphicsComponent.scaling, Rectangle.Width * GraphicsComponent.scaling, Rectangle.Height * GraphicsComponent.scaling),Color.White); } } diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/CoreEnemy.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/CoreEnemy.cs index 38b1cc0..5f33df9 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/CoreEnemy.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/CoreEnemy.cs @@ -36,9 +36,9 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities public abstract void Move(GameTime gameTime); - public void TakeDamage(int damage) + public virtual void TakeDamage() { - monster_health -= damage; + monster_health--; if (monster_health <= 0) { Death(); diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SilasHands.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SilasHands.cs index 15018ea..3e2a1b8 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SilasHands.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SilasHands.cs @@ -19,7 +19,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters Width = 16; Height = 16; monster_health = 2; - monster_speed = 2; + monster_speed = 1; acceleration = Vector2.Zero; } @@ -28,7 +28,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters public override void Attack() { - + AppManager.Instance.GameManager.GetPlayer1.Death(name); } public override void Attack(GameTime gameTime) @@ -38,7 +38,13 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters public override void Death() { - throw new NotImplementedException(); + for (int i = 0; i < 3; i++) + { + Particle particle = new Particle(Pos); + } + + AppManager.Instance.GameManager.Remove(this); + } public override void Move(GameTime gameTime) @@ -71,12 +77,30 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters { base.Update(gameTime); Move(gameTime); - if ((Pos.X + 20 <= AppManager.Instance.GameManager.GetPlayer1.Pos.X || Pos.X - 20 >= AppManager.Instance.GameManager.GetPlayer1.Pos.X)&&(Pos.Y + 20 <= AppManager.Instance.GameManager.GetPlayer1.Pos.Y || Pos.Y - 20 >= AppManager.Instance.GameManager.GetPlayer1.Pos.Y)) - { - - AppManager.Instance.GameManager.GetPlayer1.Death(name); - } + GraphicsComponent.Update(); } + public void TakeDamage() + { + monster_health--; + GraphicsComponent.StartAnimation("SilasHandMove"); + Particle particle = new Particle(Pos); + if (monster_health <= 0) + { + Death(); + } + } + public override void OnCollision(GameObject gameObject) + { + if (gameObject is Player) + { + if (AppManager.Instance.GameManager.players[0].IsAlive) + { + Attack(); + + } + } + base.OnCollision(gameObject); + } } } diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SilasMaster.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SilasMaster.cs index 6b436b7..46b1cc4 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SilasMaster.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SilasMaster.cs @@ -16,6 +16,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters private int attackTime = 60; private int moveTime = 360; private int currentTime = 0; + private int interval = 0; int leftBorder; int rightBorder; List hands = new List(); @@ -119,9 +120,18 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters public override void Update(GameTime gameTime) { base.Update(gameTime); + for (int i = 0; i < hands.Count; i++) + { + if (!AppManager.Instance.GameManager.GetAllGameObjects.Contains(hands[i])) + { + hands.RemoveAt(i); + } + } + + if (hands.Count<2) { - hands.Add(new SilasHands(new Vector2(Pos.X + 60, Pos.Y + 120))); + hands.Add(new SilasHands(new Vector2(Pos.X + 30, Pos.Y + 30))); } if (GraphicsComponent.CurrentAnimation.Id == "SilasMove") { diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Zombie.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Zombie.cs index 90fdfc2..60bad2c 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Zombie.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Zombie.cs @@ -8,13 +8,12 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using DangerousD.GameCore.Managers; -using DangerousD.GameCore.GameObjects; +using DangerousD.GameCore.Network; namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters { public class Zombie : CoreEnemy { - private bool isAttack; float leftBorder; float rightBorder; @@ -32,6 +31,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters rightBorder = (int)position.X + 100; physicsManager = new PhysicsManager(); Random random = new Random(); + monster_health = 2; if(random.Next(0, 2) == 0) { isGoRight = true; @@ -58,21 +58,25 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters Target(); Move(gameTime); } - fixBorder(); + //fixBorder(); base.Update(gameTime); } public override void Attack() { - velocity.X = 0; isAttaking = true; + PlayAttackAnimation(); + AppManager.Instance.GameManager.GetClosestPlayer(Pos).Death(name); + } + public void PlayAttackAnimation() + { + velocity.X = 0; if (isGoRight) { if (GraphicsComponent.GetCurrentAnimation != "ZombieRightAttack") { GraphicsComponent.StartAnimation("ZombieRightAttack"); } - AppManager.Instance.GameManager.players[0].Death(name); } else if (!isGoRight) { @@ -80,7 +84,6 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters { GraphicsComponent.StartAnimation("ZombieLeftAttack"); } - AppManager.Instance.GameManager.players[0].Death(name); } } @@ -121,12 +124,19 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters } public override void OnCollision(GameObject gameObject) { - if(gameObject is Player) + if (gameObject.id == AppManager.Instance.GameManager.GetClosestPlayer(Pos).id && AppManager.Instance.GameManager.GetClosestPlayer(Pos).IsAlive) { - if (AppManager.Instance.GameManager.players[0].IsAlive) + if (AppManager.Instance.multiPlayerStatus != MultiPlayerStatus.Client) { Attack(); - + } + } + else if (gameObject is Player) + { + if (AppManager.Instance.multiPlayerStatus == MultiPlayerStatus.Host) + { + NetworkTask task = new NetworkTask(); + AppManager.Instance.NetworkTasks.Add(task.KillPlayer(gameObject.id, name)); } } base.OnCollision(gameObject); @@ -174,10 +184,9 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters public override void Attack(GameTime gameTime) {} - public void TakeDamage() + public override void TakeDamage() { monster_health--; - GraphicsComponent.StartAnimation("ZombieRightAttack"); Particle particle = new Particle(Pos); if (monster_health <= 0) { diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Player/AnimationRectangle.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Player/AnimationRectangle.cs index 25e01f0..e199e4d 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Player/AnimationRectangle.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Player/AnimationRectangle.cs @@ -18,17 +18,22 @@ namespace DangerousD.GameCore.GameObjects.PlayerDeath PlayDeath(DeathType); } - protected override GraphicsComponent GraphicsComponent { get; } = new(new List {"DeathFromZombie"}, + protected override GraphicsComponent GraphicsComponent { get; } = new(new List {"DeathFromZombie", "DeathFromSilasHand" }, "DeathFromZombie"); public GraphicsComponent Gr => GraphicsComponent; private void PlayDeath(string deathName) { - if (GraphicsComponent.GetCurrentAnimation != "DeathFromZombie") - { - GraphicsComponent.StartAnimation("DeathFromZombie"); - } + //if (GraphicsComponent.GetCurrentAnimation != "DeathFromZombie") + //{ + // GraphicsComponent.StartAnimation("DeathFromZombie"); + //} + //if (GraphicsComponent.GetCurrentAnimation != "DeathFromSilasHand") + //{ + // GraphicsComponent.StartAnimation("DeathFromSilasHand"); + //} + GraphicsComponent.StartAnimation(deathName); } } diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Player/Player.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Player/Player.cs index e076bc0..ac868db 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Player/Player.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Player/Player.cs @@ -10,6 +10,7 @@ using Microsoft.Xna.Framework.Input; using Microsoft.Xna.Framework.Graphics; using DangerousD.GameCore.GameObjects.LivingEntities.Monsters; using DangerousD.GameCore.Network; +using DangerousD.GameCore.GameObjects.MapObjects; namespace DangerousD.GameCore.GameObjects.LivingEntities { @@ -65,6 +66,10 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities { bullets++; } + if(a == "playerShootBoomUpRight" || a == "playerShootBoomUpLeft") + { + isShooting = false; + } }; } @@ -73,7 +78,8 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities public bool IsAlive { get { return isAlive; } } protected override GraphicsComponent GraphicsComponent { get; } = new(new List { "playerMoveLeft", "playerMoveRight", "DeathFromZombie", "playerRightStay", "playerStayLeft", - "playerJumpRight" , "playerJumpLeft", "playerShootLeft", "playerShootRight", "playerReload", "smokeAfterShoot", "playerShootUpRight", "playerShootUpLeft"}, "playerReload"); + "playerJumpRight" , "playerJumpLeft", "playerShootLeft", "playerShootRight", "playerReload", "smokeAfterShoot", "playerShootUpRight", "playerShootUpLeft", "playerShootBoomUpRight", + "playerShootBoomUpLeft"}, "playerReload"); public void Attack() { @@ -87,12 +93,29 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities { base.OnCollision(gameObject); } + public Rectangle GetShootRectangle(bool isRight) + { + if (isRight) + return new Rectangle((int)Pos.X, (int)(Pos.Y) + 10, shootLength + Width, Height / 2); + else + return new Rectangle((int)Pos.X-shootLength, (int)(Pos.Y) + 10, shootLength, Height / 2); + } public override void Draw(SpriteBatch spriteBatch) { if (isVisible) { base.Draw(spriteBatch); } + if (AppManager.Instance.InputManager.CollisionsCheat) + { + Rectangle attackRect = GetShootRectangle(isRight); + spriteBatch.Draw(debugTexture, + new Rectangle((attackRect.X - GraphicsComponent.CameraPosition.X) * GraphicsComponent.scaling, + (attackRect.Y - GraphicsComponent.CameraPosition.Y) * GraphicsComponent.scaling, + attackRect.Width * GraphicsComponent.scaling, + attackRect.Height * GraphicsComponent.scaling), Color.White); + + } } public void Death(string monsterName) { @@ -101,7 +124,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities return; } isAttacked = true; - if (monsterName == "Zombie") + if(monsterName == "Zombie") { AnimationRectangle deathRectangle = new AnimationRectangle(Pos, "DeathFrom" + monsterName); deathRectangle.Gr.actionOfAnimationEnd += (a) => @@ -112,7 +135,29 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities } }; } - else if (monsterName == "Spider") + else if(monsterName == "Spider") + { + AnimationRectangle deathRectangle = new AnimationRectangle(Pos, "DeathFrom" + monsterName); + deathRectangle.Gr.actionOfAnimationEnd += (a) => + { + if (a == "DeathFrom" + monsterName) + { + AppManager.Instance.ChangeGameState(GameState.Death); + } + }; + } + else if (monsterName == "SilasHand") + { + AnimationRectangle deathRectangle = new AnimationRectangle(Pos, "DeathFrom" + monsterName); + deathRectangle.Gr.actionOfAnimationEnd += (a) => + { + if (a == "DeathFrom" + monsterName) + { + AppManager.Instance.ChangeGameState(GameState.Death); + } + }; + } + else if (monsterName == "SilasBall") { AnimationRectangle deathRectangle = new AnimationRectangle(Pos, "DeathFrom" + monsterName); deathRectangle.Gr.actionOfAnimationEnd += (a) => @@ -145,28 +190,45 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities bullets--; if (isRight) { - StartCicycleAnimation("playerShootRight"); - var targets = AppManager.Instance.GameManager.physicsManager.CheckRectangle(new Rectangle((int)Pos.X, (int)(Pos.Y - 10f), shootLength + 24, 10), typeof(Zombie)).OrderBy(x => (x.Pos - Pos).LengthSquared()); - if (targets.Count() > 0) + if (!isUping) { - Zombie targetZombie = (Zombie)targets.First(); - targetZombie.TakeDamage(); - } - SmokeAfterShoot smokeAfterShoot = new SmokeAfterShoot(new Vector2(Pos.X + 30, Pos.Y + 7)); - } - else - { - StartCicycleAnimation("playerShootLeft"); - var targets = AppManager.Instance.GameManager.physicsManager.CheckRectangle(new Rectangle((int)Pos.X - shootLength, (int)(Pos.Y - 10f), shootLength, 10), typeof(Zombie)); - if (targets != null) - { - foreach (var target in targets) + StartCicycleAnimation("playerShootRight"); + var targets = AppManager.Instance.GameManager.physicsManager.CheckRectangle(new Rectangle((int)Pos.X, (int)(Pos.Y - 10f), shootLength + 24, 10), typeof(Zombie)).OrderBy(x => (x.Pos - Pos).LengthSquared()); + if (targets.Count() > 0) { - Zombie targetZombie = (Zombie)target; + Zombie targetZombie = (Zombie)targets.First(); targetZombie.TakeDamage(); } + SmokeAfterShoot smokeAfterShoot = new SmokeAfterShoot(new Vector2(Pos.X + 30, Pos.Y + 7)); + } + else + { + StartCicycleAnimation("playerShootBoomUpRight"); + Bullet bullet = new Bullet(new Vector2(Pos.X + 16, Pos.Y)); + bullet.ShootUpRight(); + SmokeAfterShoot smokeAfterShoot = new SmokeAfterShoot(new Vector2(Pos.X + 12, Pos.Y - 8)); + } + } + else if(!isRight) + { + if (!isUping) + { + StartCicycleAnimation("playerShootLeft"); + var targets = AppManager.Instance.GameManager.physicsManager.CheckRectangle(new Rectangle((int)Pos.X, (int)(Pos.Y - 10f), shootLength + 24, 10), typeof(Zombie)).OrderBy(x => (x.Pos - Pos).LengthSquared()); + if (targets.Count() > 0) + { + Zombie targetZombie = (Zombie)targets.First(); + targetZombie.TakeDamage(); + } + SmokeAfterShoot smokeAfterShoot = new SmokeAfterShoot(new Vector2(Pos.X - 12, Pos.Y + 7)); + } + else + { + StartCicycleAnimation("playerShootBoomUpLeft"); + Bullet bullet = new Bullet(new Vector2(Pos.X, Pos.Y)); + bullet.ShootUpLeft(); + SmokeAfterShoot smokeAfterShoot = new SmokeAfterShoot(new Vector2(Pos.X - 6, Pos.Y - 7)); } - SmokeAfterShoot smokeAfterShoot = new SmokeAfterShoot(new Vector2(Pos.X - 12, Pos.Y + 7)); } } } @@ -187,7 +249,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities FallingThroughPlatform = false; } GraphicsComponent.SetCameraPosition(Pos); - if (!isAttacked || AppManager.Instance.InputManager.InvincibilityCheat) + if (!isAttacked || AppManager.Instance.InputManager.InvincibilityCheat) { if (!isShooting) { @@ -230,14 +292,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities } else if (AppManager.Instance.InputManager.VectorMovementDirection.X == 0)//стоит { - if (bullets < 5) - { - if (GraphicsComponent.GetCurrentAnimation != "playerReload") - { - GraphicsComponent.StartAnimation("playerReload"); - } - } - else if (isRight) + if (isRight) { if (isUping) { @@ -246,6 +301,13 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities GraphicsComponent.StartAnimation("playerShootUpRight"); } } + else if (bullets < 5) + { + if (GraphicsComponent.GetCurrentAnimation != "playerReload") + { + GraphicsComponent.StartAnimation("playerReload"); + } + } else { GraphicsComponent.StartAnimation("playerRightStay"); @@ -260,6 +322,13 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities GraphicsComponent.StartAnimation("playerShootUpLeft"); } } + else if (bullets < 5) + { + if (GraphicsComponent.GetCurrentAnimation != "playerReload") + { + GraphicsComponent.StartAnimation("playerReload"); + } + } else { GraphicsComponent.StartAnimation("playerStayLeft"); @@ -279,13 +348,51 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities isOnGround = false; } - public class Bullet : GameObjects.LivingEntity + public class Bullet : LivingEntity { public Bullet(Vector2 position) : base(position) { + Height = 5; + Width = 5; + } + protected override GraphicsComponent GraphicsComponent { get; } = new(new List { "playerMoveLeft"}, "playerMoveLeft"); + Vector2 direction; + Vector2 maindirection; + public void ShootUpRight() + { + direction = new Vector2(1, -1); + acceleration = Vector2.Zero; + velocity = new Vector2(10, 10) * direction; + maindirection = velocity; + } + public void ShootUpLeft() + { + direction = new Vector2(-1, -1); + acceleration = Vector2.Zero; + velocity = new Vector2(10, 10) * direction; + maindirection = velocity; + } + public override void OnCollision(GameObject gameObject) + { + if (gameObject is not Player) + { + if (gameObject is CoreEnemy) + { + CoreEnemy enemy = (CoreEnemy)gameObject; + enemy.TakeDamage(); + AppManager.Instance.GameManager.Remove(this); + } + base.OnCollision(gameObject); + } + } + public override void Update(GameTime gameTime) + { + if (maindirection!=velocity) + { + AppManager.Instance.GameManager.Remove(this); + } + base.Update(gameTime); } - protected override GraphicsComponent GraphicsComponent { get; } = new("ZombieMoveLeft"); - } } } diff --git a/DangerousD/GameCore/GameObjects/LivingEntity.cs b/DangerousD/GameCore/GameObjects/LivingEntity.cs index 78ea17c..72d61f4 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntity.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntity.cs @@ -10,6 +10,8 @@ public abstract class LivingEntity : Entity public Vector2 velocity; public Vector2 acceleration; + public Vector2 Acceleration { get; private set; } + public LivingEntity(Vector2 position) : base(position) { acceleration = new Vector2(0, 30); diff --git a/DangerousD/GameCore/Graphics/GraphicsComponent.cs b/DangerousD/GameCore/Graphics/GraphicsComponent.cs index 1ac6aa8..9b6a8df 100644 --- a/DangerousD/GameCore/Graphics/GraphicsComponent.cs +++ b/DangerousD/GameCore/Graphics/GraphicsComponent.cs @@ -8,6 +8,7 @@ using Microsoft.Xna.Framework.Graphics; using System; using System.Collections.Generic; using System.Linq; +using System.Security.Cryptography.X509Certificates; using System.Text; namespace DangerousD.GameCore.Graphics @@ -20,7 +21,7 @@ namespace DangerousD.GameCore.Graphics private List textures; private List texturesNames; private AnimationContainer currentAnimation; - static private int scaling = 4; + static public int scaling = 4; public int parentId; public AnimationContainer CurrentAnimation { diff --git a/DangerousD/GameCore/Managers/AppManager.cs b/DangerousD/GameCore/Managers/AppManager.cs index 8bb94c1..73e9662 100644 --- a/DangerousD/GameCore/Managers/AppManager.cs +++ b/DangerousD/GameCore/Managers/AppManager.cs @@ -17,7 +17,7 @@ using System.Threading.Tasks; namespace DangerousD.GameCore { public enum MultiPlayerStatus { SinglePlayer, Host, Client } - public enum GameState { Menu, Options, Lobby, Game, Login, Death, + public enum GameState { Menu, Options, Lobby, Game, Login, Death, HUD, GameOver } public class AppManager : Game @@ -30,17 +30,16 @@ namespace DangerousD.GameCore public MultiPlayerStatus multiPlayerStatus { get; private set; } = MultiPlayerStatus.SinglePlayer; public Point resolution; public Point inGameResolution = new Point(1920, 1080); - public Point inGameHUDHelperResolution = new Point(1920, 1080); + public Point inGameHUDHelperResolution= new Point(1920, 1080); IDrawableObject MenuGUI; IDrawableObject OptionsGUI; IDrawableObject LoginGUI; IDrawableObject LobbyGUI; IDrawableObject DeathGUI; - //IDrawableObject HUD; + IDrawableObject HUD; public DebugHUD DebugHUD; - public HUD HUD; public List NetworkTasks = new List(); - + public string currentMap; public GameManager GameManager { get; private set; } = new(); public AnimationBuilder AnimationBuilder { get; private set; } = new AnimationBuilder(); public NetworkManager NetworkManager { get; private set; } = new NetworkManager(); @@ -63,7 +62,11 @@ namespace DangerousD.GameCore NetworkManager.GetReceivingMessages += NetworkSync; resolution = SettingsManager.Resolution; - + SetIsFullScreen(!SettingsManager.IsFullScreen); + SetIsFullScreen(SettingsManager.IsFullScreen); + _graphics.PreferredBackBufferWidth = resolution.X; + _graphics.PreferredBackBufferHeight = resolution.Y; + _graphics.IsFullScreen = false; gameState = GameState.Menu; MenuGUI = new MenuGUI(); LoginGUI = new LoginGUI(); @@ -72,8 +75,9 @@ namespace DangerousD.GameCore DeathGUI = new DeathGUI(); HUD = new HUD(); DebugHUD = new DebugHUD(); - UIManager.resolution = new Point(_graphics.PreferredBackBufferWidth, _graphics.PreferredBackBufferHeight); - UIManager.resolutionInGame = resolution; + UIManager.resolution = resolution; + UIManager.resolutionInGame = inGameResolution; + currentMap = "lvl"; } protected override void Initialize() @@ -104,7 +108,7 @@ namespace DangerousD.GameCore GameObject.debugTexture.SetData(new Color[] { new Color(1, 0,0,0.25f) }); SoundManager.LoadSounds(); SoundManager.StartAmbientSound("DoomTestSong"); - renderTarget = new RenderTarget2D(GraphicsDevice, resolution.X, resolution.Y); + renderTarget = new RenderTarget2D(GraphicsDevice, inGameResolution.X, inGameResolution.Y); } protected override void Update(GameTime gameTime) @@ -136,6 +140,7 @@ namespace DangerousD.GameCore case GameState.Game: HUD.Update(gameTime); GameManager.Update(gameTime); + break; default: break; @@ -167,6 +172,9 @@ namespace DangerousD.GameCore case GameState.Death: DeathGUI.Draw(_spriteBatch); break; + case GameState.HUD: + HUD.Draw(_spriteBatch); + break; case GameState.Game: _spriteBatch.Begin(SpriteSortMode.Deferred, null, SamplerState.PointClamp); GameManager.Draw(_spriteBatch); @@ -200,12 +208,15 @@ namespace DangerousD.GameCore case GameState.Lobby: break; case GameState.Game: +<<<<<<< HEAD GameManager.mapManager.LoadLevel("map"); +======= + GameManager.mapManager.LoadLevel(currentMap); +>>>>>>> main GameManager.FindBorders(); - break; case GameState.Death: break; @@ -220,7 +231,12 @@ namespace DangerousD.GameCore { switch (networkTask.operation) { - case NetworkTaskOperationEnum.TakeDamage: + case NetworkTaskOperationEnum.DeleteObject: + GameObject gameObject = GameManager.GetAllGameObjects.Find(x => x.id == networkTask.objId); + if (gameObject != null) + { + GameManager.Remove(gameObject); + } break; case NetworkTaskOperationEnum.SendSound: SoundManager.StartSound(networkTask.name, networkTask.position, GameManager.GetPlayer1.Pos); @@ -242,6 +258,11 @@ namespace DangerousD.GameCore case NetworkTaskOperationEnum.ChangeState: if (networkTask.objId != GameManager.GetPlayer1.id) { + List gcs = new List(); + foreach (var player in GameManager.players) + { + gcs.Add(player.GetGraphicsComponent()); + } LivingEntity entity = GameManager.livingEntities.Find(x => x.id == networkTask.objId); if (entity != null) { @@ -276,7 +297,13 @@ namespace DangerousD.GameCore remoteConnectedPlayer.id = networkTask.objId; remoteConnectedPlayer.GetGraphicsComponent().parentId = networkTask.objId; break; - default: + case NetworkTaskOperationEnum.KillPlayer: + Player player1 = GameManager.players.Find(x => x.id==networkTask.objId); + player1.Death(networkTask.name); + NetworkTask task1 = new NetworkTask(); + NetworkTasks.Add(task1.DeleteObject(player1.id)); + break; + default: break; } } @@ -304,5 +331,11 @@ namespace DangerousD.GameCore _graphics.IsFullScreen = fullscrin; _graphics.ApplyChanges(); } + public void Restart(string map) + { + GameManager = new(); + ChangeGameState(GameState.Menu); + currentMap = map; + } } } diff --git a/DangerousD/GameCore/Managers/GameManager.cs b/DangerousD/GameCore/Managers/GameManager.cs index 8d1c7c4..c3afb92 100644 --- a/DangerousD/GameCore/Managers/GameManager.cs +++ b/DangerousD/GameCore/Managers/GameManager.cs @@ -192,5 +192,10 @@ namespace DangerousD.GameCore } } } + + public Player GetClosestPlayer(Vector2 position) + { + return players.OrderBy(x => (x.Pos - position).Length()).First(); + } } } \ No newline at end of file diff --git a/DangerousD/GameCore/Managers/SettingsManager.cs b/DangerousD/GameCore/Managers/SettingsManager.cs index b781ef1..277a146 100644 --- a/DangerousD/GameCore/Managers/SettingsManager.cs +++ b/DangerousD/GameCore/Managers/SettingsManager.cs @@ -87,6 +87,6 @@ namespace DangerousD.GameCore.Managers [JsonProperty("SoundEffectsVolume")] public float SoundEffectsVolume { get; set; } = 1; [JsonProperty("Resolution")] - public Point Resolution { get; set; } = new Point(1920,1080); + public Point Resolution { get; set; } = new Point(1366,768); } } diff --git a/DangerousD/GameCore/Network/NetworkTask.cs b/DangerousD/GameCore/Network/NetworkTask.cs index 8611d78..f9b6072 100644 --- a/DangerousD/GameCore/Network/NetworkTask.cs +++ b/DangerousD/GameCore/Network/NetworkTask.cs @@ -20,18 +20,6 @@ namespace DangerousD.GameCore.Network public Type type { get; set; } public NetworkTask() { } - /// - /// Нанести урон сущности - /// - /// - /// - public NetworkTask(int LivingEntityId, int Damage) - { - operation = NetworkTaskOperationEnum.TakeDamage; - objId = LivingEntityId; - value = Damage; - } - /// /// Проиграть звук на позиции /// @@ -49,14 +37,12 @@ namespace DangerousD.GameCore.Network /// /// /// - /// /// - public NetworkTask(Type EntityType, Vector2 EntityPosition, Vector2 EntityVelocity, int ParentId) + public NetworkTask(Type EntityType, Vector2 EntityPosition, int ParentId) { operation = NetworkTaskOperationEnum.CreateEntity; type = EntityType; position = EntityPosition; - velocity = EntityVelocity; objId = ParentId; } @@ -134,5 +120,18 @@ namespace DangerousD.GameCore.Network position = playerPosition; return this; } + public NetworkTask DeleteObject(int objectId) + { + operation = NetworkTaskOperationEnum.DeleteObject; + objId = objectId; + return this; + } + public NetworkTask KillPlayer(int playerId, string mosterName) + { + operation = NetworkTaskOperationEnum.KillPlayer; + name = mosterName; + objId = playerId; + return this; + } } } diff --git a/DangerousD/GameCore/Network/NetworkTaskOperationEnum.cs b/DangerousD/GameCore/Network/NetworkTaskOperationEnum.cs index 7fad430..5b746f5 100644 --- a/DangerousD/GameCore/Network/NetworkTaskOperationEnum.cs +++ b/DangerousD/GameCore/Network/NetworkTaskOperationEnum.cs @@ -9,6 +9,6 @@ namespace DangerousD.GameCore.Network [Serializable] public enum NetworkTaskOperationEnum { - TakeDamage, SendSound, CreateEntity, SendPosition, ChangeState, ConnectToHost, GetClientPlayerId, AddConnectedPlayer + DeleteObject, SendSound, CreateEntity, SendPosition, ChangeState, ConnectToHost, GetClientPlayerId, AddConnectedPlayer, KillPlayer } }