progtime/DangerousD
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into livingEntitiesVlad

Browse source
This commit is contained in:
N4K 2023-08-18 17:32:03 +03:00
commit 6714513814
25 changed files with 523 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
DangerousD/Content/Door.tsx
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<tileset version="1.10" tiledversion="1.10.2" name="Door" tilewidth="32" tileheight="48" tilecount="2" columns="2">
<image source="door.png" width="64" height="48"/>
<image source="doors.png" width="64" height="48"/>
</tileset>

130
DangerousD/Content/LastLvl.tmx Normal file
View file

@ -0,0 +1,130 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="left-up" width="30" height="20" tilewidth="16" tileheight="16" infinite="1" nextlayerid="7" nextobjectid="5">
<tileset firstgid="1" source="map.tsx"/>
<layer id="2" name="Platform" class="StopTile" width="30" height="20">
<data encoding="csv">
<chunk x="-32" y="0" width="16" height="16">
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
</chunk>
<chunk x="-16" y="0" width="16" height="16">
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
</chunk>
<chunk x="-32" y="16" width="16" height="16">
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
</chunk>
<chunk x="-16" y="16" width="16" height="16">
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
</chunk>
</data>
</layer>
<layer id="3" name="BackGround" class="Tile" width="30" height="20">
<data encoding="csv">
<chunk x="-32" y="0" width="16" height="16">
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
</chunk>
<chunk x="-16" y="0" width="16" height="16">
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
</chunk>
</data>
</layer>
<objectgroup id="5" name="SilasMaster" class="LivingEntities.Monsters.SilasMaster">
<object id="1" x="-279.333" y="121.333">
<point/>
</object>
</objectgroup>
<objectgroup id="6" name="player" class="LivingEntities.Player">
<object id="3" x="-329.333" y="111.333">
<point/>
</object>
</objectgroup>
</map>

1
DangerousD/Content/animations/DeathFromSilasHand Normal file
View file

@ -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"}

40
DangerousD/Content/lvl.tmx
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="left-up" width="30" height="20" tilewidth="16" tileheight="16" infinite="1" nextlayerid="15" nextobjectid="80">
<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="left-up" width="30" height="20" tilewidth="16" tileheight="16" infinite="1" nextlayerid="18" nextobjectid="105">
<tileset firstgid="1" name="map" tilewidth="16" tileheight="16" tilecount="871" columns="13">
<image source="tiles.BMP" width="208" height="1072"/>
</tileset>
@ -683,7 +683,7 @@
<object id="36" x="70" y="181">
<point/>
</object>
<object id="37" x="20" y="87">
<object id="37" x="39.3333" y="87.6667">
<point/>
</object>
<object id="38" x="99.5" y="84.5">
@ -698,13 +698,47 @@
<object id="41" x="582" y="83">
<point/>
</object>
<object id="80" x="-139.333" y="84">
<point/>
</object>
<object id="81" x="620.667" y="180">
<point/>
</object>
<object id="103" x="-96.6667" y="270">
<point/>
</object>
<object id="104" x="693.333" y="477.333">
<point/>
</object>
</objectgroup>
<objectgroup id="15" name="Monster" class="LivingEntities.Monsters">
<object id="82" type="FlameSkull" x="68.6667" y="279.333">
<point/>
</object>
<object id="97" type="Werewolf" x="536" y="88.6667">
<point/>
</object>
</objectgroup>
<objectgroup id="17" name="Hunchman" class="LivingEntities.Monsters.Hunchman">
<object id="98" x="-92" y="144">
<point/>
</object>
<object id="99" x="115.333" y="182">
<point/>
</object>
<object id="100" x="191.333" y="277.333">
<point/>
</object>
<object id="101" x="249.333" y="88.6667">
<point/>
</object>
</objectgroup>
<objectgroup id="10" name="Player" class="LivingEntities.Player">
<object id="47" x="-500" y="461.333">
<point/>
</object>
</objectgroup>
<objectgroup id="12" name="Doors" class="Entities.Door">
<objectgroup id="12" name="Doors" class="Entities.Door" visible="0">
<object id="69" gid="873" x="640" y="64" width="32" height="48"/>
<object id="70" gid="872" x="672" y="192" width="32" height="48"/>
<object id="71" gid="872" x="672" y="288" width="32" height="48"/>

2
DangerousD/GameCore/GUI/DeathGUI.cs
View file

@ -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);

16
DangerousD/GameCore/GUI/HUD.cs
View file

@ -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
{

2
DangerousD/GameCore/GUI/LobbyGUI.cs
View file

@ -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);

2
DangerousD/GameCore/GUI/LoginGUI.cs
View file

@ -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);

2
DangerousD/GameCore/GUI/MenuGUI.cs
View file

@ -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);

2
DangerousD/GameCore/GUI/OptionsGUI.cs
View file

@ -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);

4
DangerousD/GameCore/GameObjects/Entities/Door.cs
View file

@ -37,6 +37,8 @@ namespace DangerousD.GameCore.GameObjects.Entities
public override void OnCollision(GameObject gameObject)
{
base.OnCollision(gameObject);
if (this is not TeleportingDoor)
{
if (gameObject is Player)
{
Player player = (Player)gameObject;
@ -47,5 +49,7 @@ namespace DangerousD.GameCore.GameObjects.Entities
}
}
}
}
}
}

23
DangerousD/GameCore/GameObjects/Entities/SilasBall.cs
View file

@ -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,11 +15,14 @@ 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,6 +32,7 @@ namespace DangerousD.GameCore.GameObjects.Entities
acceleration = Vector2.Zero;
velocity = velosity;
v = velosity;
name = "SilasHand";
}
@ -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();
}
}
}
}
}

54
DangerousD/GameCore/GameObjects/Entities/TeleportingDoor.cs Normal file
View file

@ -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();
}
}
}
}
}
}
}

5
DangerousD/GameCore/GameObjects/GameObject.cs
View file

@ -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);
}
}

71
DangerousD/GameCore/GameObjects/LivingEntities/Monsters/FrankBalls.cs
View file

@ -15,6 +15,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
private Rectangle collision;
private Vector2 position;
private bool isFlyRight = true;
private bool isFlyUp = true;
private bool isAttacking = false;
public Rectangle Collision
@ -29,34 +30,32 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
Width = 40;
Height = 40;
monster_speed = 3;
velocity = new Vector2(3,-3);
acceleration = Vector2.Zero;
}
protected override GraphicsComponent GraphicsComponent { get; } = new(new List<string> { "BallMoveRight" }, "BallMoveRight");
public override void Update(GameTime gameTime)
{
if(!isAttacking)
{
Move(gameTime);
}
AppManager.Instance.DebugHUD.Set(name, velocity.ToString());
base.Update(gameTime);
}
public override void Attack()
{
collision = new Rectangle((int)position.X, (int)position.Y, 40, 40);
isAttacking = true;
if(isFlyRight)
}
public override void OnCollision(GameObject gameObject)
{
if (gameObject is Player)
{
if (AppManager.Instance.GameManager.players[0].IsAlive)
{
AppManager.Instance.GameManager.players[0].Death(name);
}
else if(!isFlyRight)
{
AppManager.Instance.GameManager.players[0].Death(name);
}
base.OnCollision(gameObject);
}
public override void Death()
@ -66,21 +65,55 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
public override void Move(GameTime gameTime)
{
velocity.X = 0;
velocity.Y = 0;
var getColsHor = AppManager.Instance.GameManager.physicsManager.CheckRectangle(new Rectangle((int)Pos.X, (int)Pos.Y + Height / 2 - 2, 50, 2));
var getColsVer= AppManager.Instance.GameManager.physicsManager.CheckRectangle(new Rectangle((int)Pos.X, (int)Pos.Y + Height / 2 - 2, 50, 2)); ;
if (isFlyRight)
{
velocity.X += monster_speed;
velocity.Y += monster_speed;
}
else if(!isFlyRight)
getColsHor = AppManager.Instance.GameManager.physicsManager.CheckRectangle(new Rectangle((int)Pos.X, (int)Pos.Y , 42, 40));
if(getColsHor.Count > 0)
{
velocity.X -= monster_speed;
velocity.Y -= monster_speed;
isFlyRight = false;
velocity.X = -velocity.X;
}
}
else
{
getColsHor = AppManager.Instance.GameManager.physicsManager.CheckRectangle(new Rectangle((int)Pos.X-2, (int)Pos.Y, 42, 40));
if (getColsHor.Count > 0)
{
isFlyRight = true;
velocity.X = -velocity.X;
}
}
if (isFlyUp)
{
getColsVer = AppManager.Instance.GameManager.physicsManager.CheckRectangle(new Rectangle((int)Pos.X , (int)Pos.Y-3, 40, 43));
if (getColsVer.Count > 0)
{
isFlyUp = false;
velocity.Y = -velocity.Y;
}
}
else
{
getColsVer = AppManager.Instance.GameManager.physicsManager.CheckRectangle(new Rectangle((int)Pos.X, (int)Pos.Y, 40, 43));
if (getColsVer.Count > 0)
{
isFlyUp = true;
velocity.Y = -velocity.Y;
}
}
}
<<<<<<< HEAD
public override void Target()
=======
public void Target()
>>>>>>> 211eac278c07f06a177b7be1fc84dd05cbf5c449
{
throw new NotImplementedException();
}

38
DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SilasHands.cs
View file

@ -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);
}
}
}

12
DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SilasMaster.cs
View file

@ -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<SilasHands> hands = new List<SilasHands>();
@ -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")
{

21
DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Zombie.cs
View file

@ -8,7 +8,7 @@ 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
{
@ -63,6 +63,10 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
}
public override void Attack()
{
AppManager.Instance.GameManager.GetPlayer1.Death(name);
}
public void PlayAttackAnimation()
{
velocity.X = 0;
isAttaking = true;
@ -72,7 +76,6 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
{
GraphicsComponent.StartAnimation("ZombieRightAttack");
}
AppManager.Instance.GameManager.players[0].Death(name);
}
else if (!isGoRight)
{
@ -80,7 +83,6 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
{
GraphicsComponent.StartAnimation("ZombieLeftAttack");
}
AppManager.Instance.GameManager.players[0].Death(name);
}
}
@ -121,12 +123,19 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
}
public override void OnCollision(GameObject gameObject)
{
if(gameObject is Player)
if (gameObject.id == AppManager.Instance.GameManager.GetPlayer1.id && AppManager.Instance.GameManager.GetPlayer1.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);

6
DangerousD/GameCore/GameObjects/LivingEntities/Player/AnimationRectangle.cs
View file

@ -18,7 +18,7 @@ namespace DangerousD.GameCore.GameObjects.PlayerDeath
PlayDeath(DeathType);
}
protected override GraphicsComponent GraphicsComponent { get; } = new(new List<string> {"DeathFromZombie"},
protected override GraphicsComponent GraphicsComponent { get; } = new(new List<string> {"DeathFromZombie", "DeathFromSilasHand" },
"DeathFromZombie");
public GraphicsComponent Gr => GraphicsComponent;
@ -29,6 +29,10 @@ namespace DangerousD.GameCore.GameObjects.PlayerDeath
{
GraphicsComponent.StartAnimation("DeathFromZombie");
}
if (GraphicsComponent.GetCurrentAnimation != "DeathFromSilasHand")
{
GraphicsComponent.StartAnimation("DeathFromSilasHand");
}
}
}

52
DangerousD/GameCore/GameObjects/LivingEntities/Player/Player.cs
View file

@ -87,12 +87,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)
{
@ -123,6 +140,28 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
}
};
}
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) =>
{
if (a == "DeathFrom" + monsterName)
{
AppManager.Instance.ChangeGameState(GameState.Death);
}
};
}
isAlive = false;
}
public void Jump()
@ -151,6 +190,13 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
{
Zombie targetZombie = (Zombie)targets.First();
targetZombie.TakeDamage();
}
targets = AppManager.Instance.GameManager.physicsManager.CheckRectangle(GetShootRectangle(isRight), typeof(SilasHands)).OrderBy(x => (x.Pos - Pos).LengthSquared());
if (targets.Count() > 0)
{
SilasHands targetHand = (SilasHands)targets.First();
targetHand.TakeDamage();
}
SmokeAfterShoot smokeAfterShoot = new SmokeAfterShoot(new Vector2(Pos.X + 30, Pos.Y + 7));
}
@ -166,6 +212,12 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
targetZombie.TakeDamage();
}
}
targets = AppManager.Instance.GameManager.physicsManager.CheckRectangle(GetShootRectangle(isRight), typeof(SilasHands));
if (targets.Count() > 0)
{
SilasHands targetHand = (SilasHands)targets.First();
targetHand.TakeDamage();
}
SmokeAfterShoot smokeAfterShoot = new SmokeAfterShoot(new Vector2(Pos.X - 12, Pos.Y + 7));
}
}

3
DangerousD/GameCore/Graphics/GraphicsComponent.cs
View file

@ -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<Texture2D> textures;
private List<string> texturesNames;
private AnimationContainer currentAnimation;
static private int scaling = 4;
static public int scaling = 4;
public int parentId;
public AnimationContainer CurrentAnimation
{

62
DangerousD/GameCore/Managers/AppManager.cs
View file

@ -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
@ -36,11 +36,10 @@ namespace DangerousD.GameCore
IDrawableObject LoginGUI;
IDrawableObject LobbyGUI;
IDrawableObject DeathGUI;
//IDrawableObject HUD;
IDrawableObject HUD;
public DebugHUD DebugHUD;
public HUD HUD;
public List<NetworkTask> NetworkTasks = new List<NetworkTask>();
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<Color>(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,9 +208,23 @@ namespace DangerousD.GameCore
case GameState.Lobby:
break;
case GameState.Game:
<<<<<<< HEAD
GameManager.mapManager.LoadLevel("map");
GameManager.FindBorders();
=======
<<<<<<< HEAD
<<<<<<< HEAD
GameManager.mapManager.LoadLevel("map");
=======
GameManager.mapManager.LoadLevel("lvl");
>>>>>>> main
=======
GameManager.mapManager.LoadLevel("lvl");
>>>>>>> 211eac278c07f06a177b7be1fc84dd05cbf5c449
>>>>>>> main
GameManager.FindBorders();
break;
case GameState.Death:
break;
@ -217,7 +239,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);
@ -239,6 +266,11 @@ namespace DangerousD.GameCore
case NetworkTaskOperationEnum.ChangeState:
if (networkTask.objId != GameManager.GetPlayer1.id)
{
List<GraphicsComponent> gcs = new List<GraphicsComponent>();
foreach (var player in GameManager.players)
{
gcs.Add(player.GetGraphicsComponent());
}
LivingEntity entity = GameManager.livingEntities.Find(x => x.id == networkTask.objId);
if (entity != null)
{
@ -273,6 +305,12 @@ namespace DangerousD.GameCore
remoteConnectedPlayer.id = networkTask.objId;
remoteConnectedPlayer.GetGraphicsComponent().parentId = networkTask.objId;
break;
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;
}
@ -301,5 +339,9 @@ namespace DangerousD.GameCore
_graphics.IsFullScreen = fullscrin;
_graphics.ApplyChanges();
}
public void Restart(string map)
{
}
}
}

2
DangerousD/GameCore/Managers/SettingsManager.cs
View file

@ -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);
}
}

29
DangerousD/GameCore/Network/NetworkTask.cs
View file

@ -20,18 +20,6 @@ namespace DangerousD.GameCore.Network
public Type type { get; set; }
public NetworkTask() { }
/// <summary>
/// Нанести урон сущности
/// </summary>
/// <param name="LivingEntityId"></param>
/// <param name="Damage"></param>
public NetworkTask(int LivingEntityId, int Damage)
{
operation = NetworkTaskOperationEnum.TakeDamage;
objId = LivingEntityId;
value = Damage;
}
/// <summary>
/// Проиграть звук на позиции
/// </summary>
@ -49,14 +37,12 @@ namespace DangerousD.GameCore.Network
/// </summary>
/// <param name="EntityType"></param>
/// <param name="EntityPosition"></param>
/// <param name="EntityVelocity"></param>
/// <param name="ParentId"></param>
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;
}
}
}

2
DangerousD/GameCore/Network/NetworkTaskOperationEnum.cs
View file

@ -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
}
}