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

Merge branch 'DevelopmentX' into UpdateZombie

Browse source
This commit is contained in:
SergoDobro 2024-08-19 19:21:18 +03:00 • committed by GitHub
commit f9aeb1319c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
29 changed files with 526 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
MonogameLibrary/UI/Elements/HoverWindow.cs Normal file
View file

@ -0,0 +1,91 @@
using Microsoft.Xna.Framework.Graphics;
using MonogameLibrary.UI.Base;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using MonogameLibrary.UI.Enums;
using System;
using System.Collections.Generic;
using System.Security.Cryptography.X509Certificates;
using System.Text;
using System.Threading;
using Microsoft.Xna.Framework.Content;
namespace MonogameLibrary.UI.Elements;
public class HoverWindow : DrawableUIElement
{
public string tagItem;
public string discriptions;
public Dictionary<string, int> resourcesNeededToCraft;
private List<Label> Labels = new List<Label>();
public float scale2;
public string fontName2;
public Color fontColor2;
public string itemTextureName1;
private DrawableUIElement icon;
private Label itemName;
private Label discription;
private int labelIndex = 0;
public HoverWindow(UIManager manager, int layerIndex = 0, string textureName = "") : base(manager, layerIndex, textureName)
{
}
public void Initialize(ContentManager content)
{
icon = new DrawableUIElement(Manager)
{
rectangle = new Rectangle(rectangle.X + rectangle.Width / 20, rectangle.Y + rectangle.Width / 20, rectangle.Width / 5, rectangle.Width / 5),
mainColor = Color.White, textureName = itemTextureName1
};
icon.LoadTexture(content);
itemName = new Label(Manager)
{
rectangle = new Rectangle(rectangle.X + rectangle.Width / 20 + rectangle.Width / 5 + rectangle.Width / 20, rectangle.Y + rectangle.Width / 10, rectangle.Width / 3 * 2, rectangle.Width / 5 ),
fontColor = fontColor2, text = tagItem, scale = scale2, fontName = fontName2, mainColor = Color.Transparent, textAligment = TextAligment.Left
};
itemName.LoadTexture(content);
discription = new Label(Manager)
{
rectangle = new Rectangle(rectangle.X + rectangle.Width / 20, rectangle.Y + rectangle.Width / 20 + rectangle.Width / 5 + rectangle.Width / 20, rectangle.Width / 5, rectangle.Width / 5),
fontColor = fontColor2, text = discriptions, scale = scale2 / 1.5f, fontName = fontName2, mainColor = Color.Transparent, textAligment = TextAligment.Left
};
discription.LoadTexture(content);
foreach (var resource in resourcesNeededToCraft)
{
Label res = new Label(Manager)
{
rectangle = new Rectangle(rectangle.X + rectangle.Width / 2 - rectangle.Width / 3 / 2, rectangle.Y + rectangle.Width / 20 + rectangle.Width / 5 + rectangle.Width / 5 + rectangle.Width / 20 + (rectangle.Width / 10 + rectangle.Width / 40) * labelIndex, rectangle.Width / 3, rectangle.Width / 10),
fontColor = fontColor2, text = resource.Key + " " + resource.Value, scale = scale2, fontName = fontName2, mainColor = Color.Transparent
};
res.LoadTexture(content);
Labels.Add(res);
labelIndex++;
}
}
public override void LoadTexture(ContentManager content)
{
base.LoadTexture(content);
}
public void Update(GameTime gameTime)
{
labelIndex = 0;
icon.rectangle = new Rectangle(rectangle.X + rectangle.Width / 20, rectangle.Y + rectangle.Width / 20, rectangle.Width / 5, rectangle.Width / 5);
itemName.rectangle = new Rectangle(rectangle.X + rectangle.Width / 20 + rectangle.Width / 5 + rectangle.Width / 20,
rectangle.Y + rectangle.Width / 10, rectangle.Width / 3 * 2, rectangle.Width / 5);
discription.rectangle = new Rectangle(rectangle.X + rectangle.Width / 20,
rectangle.Y + rectangle.Width / 20 + rectangle.Width / 5 + rectangle.Width / 20, rectangle.Width / 5,
rectangle.Width / 5);
foreach (var label in Labels)
{
label.rectangle = new Rectangle(rectangle.X + rectangle.Width / 2 - rectangle.Width / 3 / 2,
rectangle.Y + rectangle.Width / 20 + rectangle.Width / 5 + rectangle.Width / 5 + rectangle.Width / 20 +
(rectangle.Width / 10 + rectangle.Width / 40) * labelIndex, rectangle.Width / 3, rectangle.Width / 10);
labelIndex++;
}
}
}

50
MonogameLibrary/UI/Elements/itemDisplayButton.cs → MonogameLibrary/UI/Elements/ItemDisplayButton.cs
View file

@ -9,10 +9,11 @@ using System.Security.Cryptography.X509Certificates;
using System.Text;
using System.Threading;
using Microsoft.Xna.Framework.Content;
using Microsoft.Xna.Framework.Input;
namespace MonogameLibrary.UI.Elements;
public class ItemDisplayButton : DrawableUIElement
public class ItemDisplayButton : Button
{
public int count;
public string itemTextureName;
@ -23,6 +24,11 @@ public class ItemDisplayButton : DrawableUIElement
public string text1;
public float scale1;
private DrawableUIElement icon;
private HoverState presentState = HoverState.None;
private HoverWindow hoverWindow = null;
private ContentManager content;
public string discriptions1;
public Dictionary<string, int> resourcesNeededToCraft1;
public ItemDisplayButton(UIManager manager) : base(manager)
@ -51,6 +57,7 @@ public class ItemDisplayButton : DrawableUIElement
public override void LoadTexture(ContentManager content)
{
this.content = content;
icon.LoadTexture(content);
base.LoadTexture(content);
if (itemTextureName == "")
@ -72,6 +79,47 @@ public class ItemDisplayButton : DrawableUIElement
}
}
public bool Update(GameTime gameTime)
{
if (hoverState == HoverState.Hovering)
{
if (presentState != hoverState)
{
hoverWindow = new HoverWindow(Manager)
{
rectangle = new Rectangle(Mouse.GetState().Position.X, Mouse.GetState().Position.Y, rectangle.Width, rectangle.Height * 10),
mainColor = Color.Gray,
tagItem = text1,
discriptions = discriptions1,
resourcesNeededToCraft = resourcesNeededToCraft1,
fontColor2 = fontColor1,
fontName2 = fontName1,
scale2 = scale1,
itemTextureName1 = itemTextureName
};
hoverWindow.Initialize(content);
hoverWindow.LoadTexture(content);
}
hoverWindow.rectangle.X = Mouse.GetState().Position.X;
hoverWindow.rectangle.Y = Mouse.GetState().Position.Y;
hoverWindow.Update(gameTime);
}
else if (hoverState == HoverState.None)
{
if (presentState != hoverState)
{
return true;
}
}
presentState = hoverState;
return false;
}
public override void Draw(SpriteBatch _spriteBatch)
{
base.Draw(_spriteBatch);

71
MonogameLibrary/UI/Elements/ItemDisplayLabel.cs
View file

@ -9,6 +9,7 @@ using System.Security.Cryptography.X509Certificates;
using System.Text;
using System.Threading;
using Microsoft.Xna.Framework.Content;
using Microsoft.Xna.Framework.Input;
namespace MonogameLibrary.UI.Elements;
@ -23,6 +24,12 @@ public class ItemDisplayLabel : DrawableUIElement
public string text1;
public float scale1;
private DrawableUIElement icon;
private HoverState presentState = HoverState.None;
private HoverWindow hoverWindow = null;
public string discriptions1;
public Dictionary<string, int> resourcesNeededToCraft1;
public HoverState hoverState = HoverState.None;
private ContentManager content;
public ItemDisplayLabel(UIManager manager) : base(manager)
@ -51,6 +58,7 @@ public class ItemDisplayLabel : DrawableUIElement
public override void LoadTexture(ContentManager content)
{
this.content = content;
icon.LoadTexture(content);
base.LoadTexture(content);
if (itemTextureName == "")
@ -72,8 +80,71 @@ public class ItemDisplayLabel : DrawableUIElement
}
}
public bool Update(GameTime gameTime)
{
if (rectangle.Intersects(new Rectangle(Mouse.GetState().Position, Point.Zero)))
{
hoverState = HoverState.Hovering;
}
else
{
hoverState = HoverState.None;
}
if (hoverState == HoverState.Hovering)
{
if (presentState != hoverState)
{
if (resourcesNeededToCraft1 == null)
{
resourcesNeededToCraft1 = new Dictionary<string, int>();
}
hoverWindow = new HoverWindow(Manager)
{
rectangle = new Rectangle(Mouse.GetState().Position.X, Mouse.GetState().Position.Y, rectangle.Width, rectangle.Height * 10),
mainColor = Color.Gray,
tagItem = text1,
discriptions = discriptions1,
resourcesNeededToCraft = resourcesNeededToCraft1,
fontColor2 = fontColor1,
fontName2 = fontName1,
scale2 = scale1,
itemTextureName1 = itemTextureName
};
hoverWindow.Initialize(content);
hoverWindow.LoadTexture(content);
}
hoverWindow.rectangle.X = Mouse.GetState().Position.X;
hoverWindow.rectangle.Y = Mouse.GetState().Position.Y;
hoverWindow.Update(gameTime);
}
else if (hoverState == HoverState.None)
{
if (presentState != hoverState)
{
return true;
}
}
presentState = hoverState;
return false;
}
public override void Draw(SpriteBatch _spriteBatch)
{
if (hoverState == HoverState.None)
{
_spriteBatch.Draw(texture, rectangle, Color.White);
}
else if (hoverState == HoverState.Hovering)
{
_spriteBatch.Draw(texture, rectangle, new Color(211, 211, 211));
}
base.Draw(_spriteBatch);
_spriteBatch.Draw(texture, rectangle, Color.White);
}
}

7
ZoFo/Content/Content.mgcb
View file

@ -34,6 +34,13 @@
/processorParam:TextureFormat=Compressed
/build:Fonts/Font3.spritefont
#begin Fonts/Font4.spritefont
/importer:FontDescriptionImporter
/processor:FontDescriptionProcessor
/processorParam:PremultiplyAlpha=True
/processorParam:TextureFormat=Compressed
/build:Fonts/Font4.spritefont
#begin MapData/TileMaps/main.tmj
/copy:MapData/TileMaps/main.tmj

64
ZoFo/Content/Fonts/Font4.spritefont Normal file
View file

@ -0,0 +1,64 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file contains an xml description of a font, and will be read by the XNA
Framework Content Pipeline. Follow the comments to customize the appearance
of the font in your game, and to change the characters which are available to draw
with.
-->
<XnaContent xmlns:Graphics="Microsoft.Xna.Framework.Content.Pipeline.Graphics">
<Asset Type="Graphics:FontDescription">
<!--
Modify this string to change the font that will be imported.
-->
<FontName>Troubleside-lgjxX.ttf</FontName>
<!--
Size is a float value, measured in points. Modify this value to change
the size of the font.
-->
<Size>50</Size>
<!--
Spacing is a float value, measured in pixels. Modify this value to change
the amount of spacing in between characters.
-->
<Spacing>0</Spacing>
<!--
UseKerning controls the layout of the font. If this value is true, kerning information
will be used when placing characters.
-->
<UseKerning>true</UseKerning>
<!--
Style controls the style of the font. Valid entries are "Regular", "Bold", "Italic",
and "Bold, Italic", and are case sensitive.
-->
<Style>Regular</Style>
<!--
If you uncomment this line, the default character will be substituted if you draw
or measure text that contains characters which were not included in the font.
-->
<!-- <DefaultCharacter>*</DefaultCharacter> -->
<!--
CharacterRegions control what letters are available in the font. Every
character from Start to End will be built and made available for drawing. The
default range is from 32, (ASCII space), to 126, ('~'), covering the basic Latin
character set. The characters are ordered according to the Unicode standard.
See the documentation for more information.
-->
<CharacterRegions>
<CharacterRegion>
<Start>32</Start>
<End>127</End>
</CharacterRegion>
<CharacterRegion>
<Start>&#1040;</Start>
<End>&#1112;</End>
</CharacterRegion>
</CharacterRegions>
</Asset>
</XnaContent>

BIN
ZoFo/Content/Fonts/Troubleside-lgjxX.ttf Normal file
View file

Binary file not shown.

37
ZoFo/GameCore/Client.cs
View file

@ -23,7 +23,6 @@ using System.Web;
using ZoFo.GameCore.GUI;
using ZoFo.GameCore.GameObjects.Entities.Interactables.Collectables;
using ZoFo.GameCore.GameObjects.MapObjects.StopObjects;
using ZoFo.GameCore.GameObjects.Entities.LivingEntities.Enemies;
using ZoFo.GameCore.Graphics;
using Newtonsoft.Json.Linq;
using Newtonsoft.Json;
@ -112,8 +111,13 @@ namespace ZoFo.GameCore
}
networkManager.SendData();//set to ticks
if (myPlayer!=null)
GraphicsComponent.CameraPosition = (myPlayer.position + myPlayer.graphicsComponent.ObjectDrawRectangle.Size.ToVector2()/2 - AppManager.Instance.CurentScreenResolution.ToVector2()/(2*GraphicsComponent.scaling)).ToPoint();
if (myPlayer != null)
GraphicsComponent.CameraPosition =
((GraphicsComponent.CameraPosition.ToVector2() *0.9f +
(myPlayer.position + myPlayer.graphicsComponent.ObjectDrawRectangle.Size.ToVector2() / 2 - AppManager.Instance.CurentScreenResolution.ToVector2() / (2 * GraphicsComponent.scaling)
) * 0.1f
) )
.ToPoint();
}
internal void Draw(SpriteBatch spriteBatch)
{
@ -151,34 +155,33 @@ namespace ZoFo.GameCore
(update as UpdateStopObjectCreated).Size.GetPoint().ToVector2(),
(update as UpdateStopObjectCreated).sourceRectangle.GetRectangle(),
(update as UpdateStopObjectCreated).tileSetName,
(update as UpdateStopObjectCreated).collisions.Select(x =>x.GetRectangle()).ToArray()
(update as UpdateStopObjectCreated).collisions.Select(x => x.GetRectangle()).ToArray()
));
}
else if (update is UpdateGameObjectCreated)
{
GameObject created_gameObject;
if ((update as UpdateGameObjectCreated).GameObjectType == "EntittyForAnimationTests")
gameObjects.Add(new EntittyForAnimationTests((update as UpdateGameObjectCreated).position));
if ((update as UpdateGameObjectCreated).GameObjectType == "Player")
if((update as UpdateGameObjectCreated).GameObjectType == "Player")
{
created_gameObject = new Player((update as UpdateGameObjectCreated).position);
players.Add(created_gameObject as Player);
myPlayer = players[0];
gameObjects.Add(created_gameObject);
}
if ((update as UpdateGameObjectCreated).GameObjectType == "Ammo")
else if((update as UpdateGameObjectCreated).GameObjectType == "Ammo")
gameObjects.Add(new Ammo((update as UpdateGameObjectCreated).position));
if ((update as UpdateGameObjectCreated).GameObjectType == "Zombie")
else if((update as UpdateGameObjectCreated).GameObjectType == "Zombie")
gameObjects.Add(new Zombie((update as UpdateGameObjectCreated).position));
else
{
Type t = Type.GetType("ZoFo.GameCore.GameObjects." + (update as UpdateGameObjectCreated).GameObjectType);
GameObject gameObject = Activator.CreateInstance(t, (update as UpdateGameObjectCreated).position) as GameObject;
if (gameObject is Entity)
(gameObject as Entity).SetIdByClient((update as UpdateGameObjectCreated).IdEntity);
gameObjects.Add(gameObject);
}
(gameObjects.Last() as Entity).SetIdByClient((update as UpdateGameObjectCreated).IdEntity);
//var a = Assembly.GetAssembly(typeof(GameObject));
//gameObjects.Add( TODO reflection
//Activator.CreateInstance(Type.GetType("ZoFo.GameCore.GameObjects.Entities.EntittyForAnimationTests")
///*(update as UpdateGameObjectCreated).GameObjectType*/, new []{ new Vector2(100, 100) })
//as GameObject
//);
}
else if (update is UpdatePosition)
{

94
ZoFo/GameCore/GUI/BaseGUI.cs
View file

@ -19,17 +19,20 @@ namespace ZoFo.GameCore.GUI;
public class BaseGUI : AbstractGUI
{
private DrawableUIElement menuBackground;
private List<ItemDisplayLabel> ItemDisplayButtonsList;
private List<ItemDisplayLabel> ItemDisplayLabelsList;
private List<ItemDisplayButton> ItemDisplayButtonsList;
private int buttonIndex = 0;
private string textureName;
protected override void CreateUI()
{
ItemDisplayButtonsList = new List<ItemDisplayLabel>();
ItemDisplayLabelsList = new List<ItemDisplayLabel>();
ItemDisplayButtonsList = new List<ItemDisplayButton>();
int width = AppManager.Instance.CurentScreenResolution.X;
int height = AppManager.Instance.CurentScreenResolution.Y;
Dictionary<string, int> playerItems = AppManager.Instance.playerData.items;
Dictionary<string, ItemInfo> items = AppManager.Instance.ItemManager.tagItemPairs;
int numberCraftItem = 0;
menuBackground = new DrawableUIElement(Manager)
{
@ -46,69 +49,112 @@ public class BaseGUI : AbstractGUI
fontName = "Fonts\\Font"
});
DrawableUIElement baseHudBack = new DrawableUIElement(Manager)
DrawableUIElement baseItemBack = new DrawableUIElement(Manager)
{
rectangle = new Rectangle(width / 2 - (int)(width / 1.5) / 2, height / 2 - (int)(height / 1.5) / 2,
(int)(width / 1.5), (int)(height / 1.5)),
rectangle = new Rectangle(width / 2 - (height / 16 + (int)(width / 2.5)) / 2,
height / 2 - (int)(height / 1.5) / 2,
height / 40 + width / 5, (int)(height / 1.5)),
mainColor = Color.LightGray
};
Elements.Add(baseHudBack);
Elements.Add(baseItemBack);
DrawableUIElement baseCraftBack = new DrawableUIElement(Manager)
{
rectangle = new Rectangle(width / 2 + height / 160, height / 2 - (int)(height / 1.5) / 2,
height / 40 + width / 5, (int)(height / 1.5)),
mainColor = Color.LightGray
};
Elements.Add(baseCraftBack);
//player itams
foreach (var item in playerItems)
{
textureName = AppManager.Instance.ItemManager.GetItemInfo(item.Key).textureName;
if (item.Value > 0)
{
ItemInfo itemInfo = AppManager.Instance.ItemManager.GetItemInfo(item.Key);
var temp = new ItemDisplayLabel(Manager)
{
rectangle = new Rectangle(width / 2 - (int)(width / 1.5) / 2 + height / 80,
height / 2 - (int)(height / 1.5) / 2 + height / 80 + (height / 20 + height / 80) * (buttonIndex),
rectangle = new Rectangle(width / 2 - (height / 16 + (int)(width / 2.5)) / 2 + height / 80,
height / 2 - (int)(height / 1.5) / 2 + height / 80 +
(height / 20 + height / 80) * (buttonIndex),
(int)(width / 5), (int)(height / 20)),
text1 = item.Key,
scale1 = 0.4f,
count = item.Value,
itemTextureName = textureName,
itemTextureName = itemInfo.textureName,
fontColor1 = Color.White,
mainColor = Color.Gray,
fontName1 = "Fonts\\Font3"
fontName1 = "Fonts\\Font4",
discriptions1 = itemInfo.description,
resourcesNeededToCraft1 = itemInfo.resourcesNeededToCraft
};
Elements.Add(temp);
temp.Initialize();
temp.LoadTexture(AppManager.Instance.Content);
ItemDisplayButtonsList.Add(temp);
ItemDisplayLabelsList.Add(temp);
buttonIndex++;
}
}
// craftable items
buttonIndex = 0;
foreach (var item in items)
{
try
{
ItemInfo itemInfo = AppManager.Instance.ItemManager.GetItemInfo(item.Key);
if (itemInfo.isCraftable)
{
var temp = new ItemDisplayLabel(Manager)
Dictionary<string, int> needToCraft =
AppManager.Instance.ItemManager.GetItemInfo(item.Key).resourcesNeededToCraft;
numberCraftItem = playerItems[needToCraft.Keys.First()] / needToCraft.Values.First();
foreach (var itemNeedToCraft in needToCraft)
{
rectangle = new Rectangle(width / 2 - (int)(width / 1.5) / 2 + height / 40 + width / 5,
int xValue = playerItems[itemNeedToCraft.Key] / itemNeedToCraft.Value;
if (numberCraftItem > xValue)
{
numberCraftItem = xValue;
}
}
if (numberCraftItem > 0)
{
var temp = new ItemDisplayButton(Manager)
{
rectangle = new Rectangle(
width / 2 - (height / 16 + (int)(width / 2.5)) / 2 + height / 20 + width / 5,
height / 2 - (int)(height / 1.5) / 2 + height / 80 +
(height / 20 + height / 80) * (buttonIndex),
(int)(width / 5), (int)(height / 20)),
text1 = item.Key,
scale1 = 0.4f,
count = 0,
count = numberCraftItem,
itemTextureName = itemInfo.textureName,
fontColor1 = Color.White,
mainColor = Color.Gray,
fontName1 = "Fonts\\Font3"
fontName1 = "Fonts\\Font4",
discriptions1 = itemInfo.description,
resourcesNeededToCraft1 = itemInfo.resourcesNeededToCraft
};
Elements.Add(temp);
temp.Initialize();
temp.LoadTexture(AppManager.Instance.Content);
ItemDisplayButtonsList.Add(temp);
temp.LeftButtonPressed += () =>
{
AppManager.Instance.playerData.CraftItem(item.Key);
AppManager.Instance.SetGUI(new BaseGUI());
};
buttonIndex++;
}
}
}
catch
{
}
}
Button bTExit = new Button(Manager)
{
@ -123,5 +169,19 @@ public class BaseGUI : AbstractGUI
public override void Update(GameTime gameTime)
{
base.Update(gameTime);
foreach (var item in ItemDisplayButtonsList)
{
if (item.Update(gameTime))
{
AppManager.Instance.SetGUI(new BaseGUI());
}
}
foreach (var item in ItemDisplayLabelsList)
{
if (item.Update(gameTime))
{
AppManager.Instance.SetGUI(new BaseGUI());
}
}
}
}

6
ZoFo/GameCore/GameManagers/AppManager.cs
View file

@ -12,6 +12,7 @@ using ZoFo.GameCore.GameManagers.ItemManager;
using ZoFo.GameCore.GUI;
using static System.Collections.Specialized.BitVector32;
using MonogameLibrary.UI.Base;
using ZoFo.GameCore.GameManagers.AssetsManager;
using ZoFo.GameCore.GameObjects;
namespace ZoFo.GameCore.GameManagers
@ -40,6 +41,7 @@ namespace ZoFo.GameCore.GameManagers
public ItemManager.ItemManager ItemManager;
public SettingsManager SettingsManager;
public SoundManager SoundManager;
public AssetManager AssetManager;
public AnimationBuilder animationBuilder { get; set; }
@ -56,6 +58,7 @@ namespace ZoFo.GameCore.GameManagers
Content.RootDirectory = "Content";
IsMouseVisible = true;
server = new Server();
playerData = new PlayerData();
ItemManager = new ItemManager.ItemManager();
Instance = this;
@ -63,6 +66,7 @@ namespace ZoFo.GameCore.GameManagers
SettingsManager = new SettingsManager();
SettingsManager.LoadSettings();
SoundManager = new SoundManager();
AssetManager = new AssetManager();
SoundManager.LoadSounds();
@ -101,7 +105,7 @@ namespace ZoFo.GameCore.GameManagers
protected override void Update(GameTime gameTime)
{
if (GamePad.GetState(PlayerIndex.One).Buttons.Back == ButtonState.Pressed ||
Keyboard.GetState().IsKeyDown(Keys.Escape)) { server.CloseConnection(); Exit(); }
Keyboard.GetState().IsKeyDown(Keys.Escape)) { server?.CloseConnection(); Exit(); }
// debugHud.Set("key", "value");

9
ZoFo/GameCore/GameManagers/AssetsManager/AssetContainer.cs Normal file
View file

@ -0,0 +1,9 @@
using System.Collections.Generic;
namespace ZoFo.GameCore.GameManagers.AssetsManager;
public class AssetContainer
{
public List<string> Animations;
public string IdleAnimation;
}

18
ZoFo/GameCore/GameManagers/AssetsManager/AssetManager.cs Normal file
View file

@ -0,0 +1,18 @@
using System.Collections.Generic;
namespace ZoFo.GameCore.GameManagers.AssetsManager;
public class AssetManager
{
public AssetContainer Zombie = new()
{
Animations = ["zombie_damaged", "zombie_walk", "zombie_idle", "zombie_attack", "zombie_death"],
IdleAnimation = "zombie_walk"
};
public AssetContainer Player = new()
{
Animations = [ "player_look_down" ],
IdleAnimation = "player_look_down"
};
}

9
ZoFo/GameCore/GameManagers/CollisionManager/CollisionManager.cs
View file

@ -30,9 +30,10 @@ namespace ZoFo.GameCore.GameManagers.CollisionManager
/// <summary>
/// минимальный накоп изменения перед перевдижением
/// </summary>
const float minimalValueToChange = 4;
const float minimalValueToChange = 0;
public void CheckComponentCollision(CollisionComponent componentOfEntity)
{
//ADD CHECKSPEED TODO
var entity = componentOfEntity.gameObject as LivingEntity;
//for (int i = 0; i < ObjectsWithCollisions.Count; i++)
//{
@ -74,7 +75,8 @@ namespace ZoFo.GameCore.GameManagers.CollisionManager
}
else
{
entity.position.X += entity.velocity.X; //update player position
entity.position.X += (int)entity.velocity.X; //update player position
//entity.position.X = (float)Math.Round(entity.position.X, 2);
newRect.X = tryingRectX.X;//значение по X для нового РЕК приравниваем к значению испытуемого РЕК
}
@ -112,7 +114,8 @@ namespace ZoFo.GameCore.GameManagers.CollisionManager
}
else
{
entity.position.Y += entity.velocity.Y;
entity.position.Y += (int)entity.velocity.Y;
//entity.position.Y = (float)Math.Round(entity.position.Y, 2);
newRect.Y = tryingRectY.Y;//значение по X для нового РЕК приравниваем к значению испытуемого РЕК
}
entity.velocity.Y = 0;

4
ZoFo/GameCore/GameManagers/ItemManager/ItemInfo.cs
View file

@ -14,16 +14,18 @@ namespace ZoFo.GameCore.GameManagers.ItemManager
public string textureName;
Texture2D itemTexture;
public bool isCraftable;
public string description;
public Dictionary<string, int> resourcesNeededToCraft;
public ItemInfo (string tag)
{
this.tag = tag;
}
public ItemInfo(string tag,string textureName,bool isCraftable, Dictionary<string, int> resourcesNeededToCraft)
public ItemInfo(string tag, string description, string textureName, bool isCraftable, Dictionary<string, int> resourcesNeededToCraft)
{
this.tag = tag;
this.textureName = textureName;
this.description = description;
this.isCraftable = isCraftable;
this.resourcesNeededToCraft = resourcesNeededToCraft;
}

10
ZoFo/GameCore/GameManagers/ItemManager/ItemManager.cs
View file

@ -25,13 +25,13 @@ namespace ZoFo.GameCore.GameManagers.ItemManager
public void Initialize()
{
tagItemPairs = new Dictionary<string, ItemInfo>();
tagItemPairs.Add("wood", new ItemInfo("wood","Textures\\Test\\wood",false,null));
tagItemPairs.Add("rock", new ItemInfo("rock", "Textures\\Test\\rock", false, null));
tagItemPairs.Add("steel", new ItemInfo("steel", "Textures\\Test\\steel", false, null));
tagItemPairs.Add("pickaxe", new ItemInfo("steel", "Textures\\Test\\pickaxe", true, new Dictionary<string, int>()
tagItemPairs.Add("wood", new ItemInfo("wood", "бревна кусок", "Textures\\Test\\wood",false,null));
tagItemPairs.Add("rock", new ItemInfo("rock", "пять галек", "Textures\\Test\\rock", false, null));
tagItemPairs.Add("steel", new ItemInfo("steel", "метал, метал, \nжелезо, метал", "Textures\\Test\\steel", false, null));
tagItemPairs.Add("pickaxe", new ItemInfo("steel", "прямой путь к \nстановлению каменьщиком", "Textures\\Test\\pickaxe", true, new Dictionary<string, int>()
{
{"wood", 2},
{"Steel", 3}
{"steel", 3}
}));
}

12
ZoFo/GameCore/GameManagers/ItemManager/PlayerData.cs
View file

@ -35,14 +35,24 @@ namespace ZoFo.GameCore.GameManagers.ItemManager
{
items[item.Key] -= item.Value;
}
if (items.Keys.Contains(itemTag))
{
items[itemTag] += 1;
}
else
{
items.Add(itemTag, 1);
}
return true;
}
public void LoadPlayerData()
{
//TODO
items = new Dictionary<string, int>();
items.Add("wood", 2);
items.Add("wood", 5);
items.Add("steel", 110);
items.Add("rock", 6);
}

2
ZoFo/GameCore/GameManagers/NetworkManager/ServerNetworkManager.cs
View file

@ -85,7 +85,7 @@ namespace ZoFo.GameCore.GameManagers.NetworkManager
var databytes = Encoding.UTF8.GetBytes(data);
foreach (Socket socket in clients)
{
clients[0].SendAsync(databytes, SocketFlags.Partial);
clients[0].SendAsync(databytes);
}
for (int i = 0; i < 200 && i< datasToSend.Count; i++)
updates.RemoveAt(0);

2
ZoFo/GameCore/GameObjects/Entities/EntittyForAnimationTests.cs
View file

@ -6,7 +6,7 @@ using System.Text;
using System.Threading.Tasks;
using ZoFo.GameCore.Graphics;
namespace ZoFo.GameCore.GameObjects.Entities
namespace ZoFo.GameCore.GameObjects
{
internal class EntittyForAnimationTests : Entity
{

4
ZoFo/GameCore/GameObjects/Entities/Entity.cs
View file

@ -6,14 +6,14 @@ using Microsoft.Xna.Framework.Graphics;
using ZoFo.GameCore.GameManagers;
using ZoFo.GameCore.GameManagers.CollisionManager;
namespace ZoFo.GameCore.GameObjects.Entities
namespace ZoFo.GameCore.GameObjects
{
public abstract class Entity : GameObject
{
//public override GraphicsComponent graphicsComponent => null;
public CollisionComponent collisionComponent { get; protected set; }
public int Id { get; set; }
static int totalEntitiesCreated = 0;
static int totalEntitiesCreated = 1;
protected Entity(Vector2 position) : base(position)
{
Id = totalEntitiesCreated;

2
ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/Ammo.cs
View file

@ -11,7 +11,7 @@ using ZoFo.GameCore.Graphics;
using Microsoft.Xna.Framework.Graphics;
using ZoFo.GameCore.GUI;
namespace ZoFo.GameCore.GameObjects.Entities.Interactables.Collectables
namespace ZoFo.GameCore.GameObjects
{
class Ammo:Collectable
{

2
ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/Collectable.cs
View file

@ -4,7 +4,7 @@ using ZoFo.GameCore.GameManagers;
using ZoFo.GameCore.GameManagers.CollisionManager;
using ZoFo.GameCore.GameManagers.NetworkManager.Updates.ServerToClient;
namespace ZoFo.GameCore.GameObjects.Entities.Interactables.Collectables;
namespace ZoFo.GameCore.GameObjects;
public class Collectable : Interactable
{
protected static readonly string _path = "Textures/icons/Collectables/";

2
ZoFo/GameCore/GameObjects/Entities/Interactables/Interactable.cs
View file

@ -5,7 +5,7 @@ using ZoFo.GameCore.GameManagers.NetworkManager.Updates.ServerToClient;
using ZoFo.GameCore.GameObjects.Entities.LivingEntities.Player;
using ZoFo.GameCore.Graphics;
namespace ZoFo.GameCore.GameObjects.Entities.Interactables;
namespace ZoFo.GameCore.GameObjects;
public class Interactable : Entity
{

2
ZoFo/GameCore/GameObjects/Entities/LivingEntities/Enemies/Enemy.cs
View file

@ -5,7 +5,7 @@ using System.Reflection;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Content;
namespace ZoFo.GameCore.GameObjects.Entities.LivingEntities.Enemies;
namespace ZoFo.GameCore.GameObjects;
public class Enemy : LivingEntity
{
protected float speed;

3
ZoFo/GameCore/GameObjects/Entities/LivingEntities/Enemies/Zombie.cs
View file

@ -9,10 +9,11 @@ using System.Threading.Tasks;
using ZoFo.GameCore.GameManagers;
using ZoFo.GameCore.GameManagers.CollisionManager;
using ZoFo.GameCore.GameManagers.NetworkManager.Updates.ServerToClient;
using ZoFo.GameCore.GameManagers.AssetsManager;
using ZoFo.GameCore.Graphics;
using ZoFo.GameCore.GUI;
namespace ZoFo.GameCore.GameObjects.Entities.LivingEntities.Enemies
namespace ZoFo.GameCore.GameObjects
{
class Zombie : Enemy
{

2
ZoFo/GameCore/GameObjects/Entities/LivingEntities/LivingEntity.cs
View file

@ -6,7 +6,7 @@ using ZoFo.GameCore.GameManagers;
using ZoFo.GameCore.GameManagers.CollisionManager;
using ZoFo.GameCore.Graphics;
namespace ZoFo.GameCore.GameObjects.Entities.LivingEntities;
namespace ZoFo.GameCore.GameObjects;
public class LivingEntity : Entity
{
/// <summary>

2
ZoFo/GameCore/GameObjects/Entities/LivingEntities/Player/LootData.cs
View file

@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ZoFo.GameCore.GameObjects.Entities.LivingEntities.Player
namespace ZoFo.GameCore.GameObjects
{
class LootData
{

9
ZoFo/GameCore/GameObjects/Entities/LivingEntities/Player/Player.cs
View file

@ -4,12 +4,13 @@ using System;
using System.Collections.Generic;
using Microsoft.Xna.Framework.Input;
using ZoFo.GameCore.GameManagers;
using ZoFo.GameCore.GameManagers.AssetsManager;
using ZoFo.GameCore.GameManagers.CollisionManager;
using ZoFo.GameCore.GameManagers.NetworkManager.Updates.ClientToServer;
using ZoFo.GameCore.GameManagers.NetworkManager.Updates.ServerToClient;
using ZoFo.GameCore.Graphics;
namespace ZoFo.GameCore.GameObjects.Entities.LivingEntities.Player;
namespace ZoFo.GameCore.GameObjects;
public class Player : LivingEntity
{
@ -21,14 +22,14 @@ public class Player : LivingEntity
//public bool IsTryingToShoot { get; set; }
private float speed;
private int health;
public override GraphicsComponent graphicsComponent { get; } = new AnimatedGraphicsComponent(new List<string> { "player_look_down" }, "player_look_down");
public override GraphicsComponent graphicsComponent { get; } = new AnimatedGraphicsComponent(AppManager.Instance.AssetManager.Player);
private LootData lootData;
//public bool isTryingToInteract { get; set; }
public Player(Vector2 position) : base(position)
{
graphicsComponent.ObjectDrawRectangle = new Rectangle(0, 0, 30, 30);
collisionComponent.stopRectangle = new Rectangle(0, 20, 30, 10);
speed = 10;
speed = 5;
//isTryingToInteract = false;
//IsTryingToShoot = false;
@ -43,7 +44,7 @@ public class Player : LivingEntity
}
public void MovementLogic()
{
velocity = InputPlayerRotation * speed;
velocity += InputPlayerRotation * speed;
}
public void HandleNewInput(UpdateInput updateInput)
{

21
ZoFo/GameCore/GameObjects/MapObjects/MapObject.cs
View file

@ -10,7 +10,7 @@ using ZoFo.GameCore.GameManagers;
using ZoFo.GameCore.GameManagers.NetworkManager.Updates.ServerToClient;
using ZoFo.GameCore.Graphics;
namespace ZoFo.GameCore.GameObjects.MapObjects
namespace ZoFo.GameCore.GameObjects
{
public class MapObject : GameObject
{
@ -34,6 +34,25 @@ namespace ZoFo.GameCore.GameObjects.MapObjects
(graphicsComponent as StaticGraphicsComponent).LoadContent();
this.sourceRectangle = sourceRectangle;
}
/// <summary>
/// Конструктор для объектов с карты с анимациями, REDO
/// </summary>
/// <param name="position"></param>
/// <param name="size"></param>
/// <param name="sourceRectangle"></param>
/// <param name="textureName"></param>
/// <param name="sourceRectangles"></param>
/// <param name="frameSize"></param>
public MapObject(Vector2 position, Vector2 size, Rectangle sourceRectangle, string textureName, Rectangle sourceRectangles, int frameSize) : base(position)
{
//graphicsComponent for source
(graphicsComponent as StaticGraphicsComponent)._textureName = textureName;
(graphicsComponent as StaticGraphicsComponent).BuildComponent(textureName);
(graphicsComponent as StaticGraphicsComponent).ObjectDrawRectangle = new Rectangle((int)position.X, (int)position.Y, (int)size.X, (int)size.Y);
(graphicsComponent as StaticGraphicsComponent).LoadContent();
this.sourceRectangle = sourceRectangle;
}
public override void Draw(SpriteBatch spriteBatch)
{

11
ZoFo/GameCore/Graphics/AnimatedGraphicsComponent.cs
View file

@ -4,6 +4,7 @@ using System.Linq;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using ZoFo.GameCore.GameManagers;
using ZoFo.GameCore.GameManagers.AssetsManager;
using ZoFo.GameCore.GUI;
namespace ZoFo.GameCore.Graphics
@ -60,7 +61,17 @@ namespace ZoFo.GameCore.Graphics
private int interval;
private int lastInterval;
private Rectangle sourceRectangle;
public AnimatedGraphicsComponent(AssetContainer asset)
{
Build(asset.Animations, asset.IdleAnimation);
}
public AnimatedGraphicsComponent(List<string> animationsId, string neitralAnimationId)
{
Build(animationsId, neitralAnimationId);
}
private void Build(List<string> animationsId, string neitralAnimationId)
{
//this._spriteBatch = _spriteBatch;
currentFrame = 0;

1
ZoFo/GameCore/Server.cs
View file

@ -17,7 +17,6 @@ using ZoFo.GameCore.GameManagers.NetworkManager.Updates.ServerToClient;
using ZoFo.GameCore.GameObjects;
using ZoFo.GameCore.GameObjects.Entities;
using ZoFo.GameCore.GameObjects.Entities.Interactables.Collectables;
using ZoFo.GameCore.GameObjects.Entities.LivingEntities.Enemies;
using ZoFo.GameCore.GameObjects.Entities.LivingEntities.Player;
using ZoFo.GameCore.GameObjects.MapObjects;
using ZoFo.GameCore.GameObjects.MapObjects.StopObjects;