Great Merge Completed (TODO: GUI recheck)

Code Refactoring (moving gameobjects between folders)

ZoFo/GameCore/GameManagers/CollisionManager/CollisionComponent.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Reflection.Metadata;
 using System.Text;
 using System.Threading.Tasks;
-using ZoFo.GameCore.GameObjects;
+using ZoFo.GameCore.GameObjects.Entities.LivingEntities.Player;
 
 namespace ZoFo.GameCore.GameManagers.CollisionManager
 {

ZoFo/GameCore/GameObjects/AttackEntities/Bullet.cs

@@ -1,7 +0,0 @@
-using System;
-
-namespace ZoFo.GameCore.GameObjects;
-public class Bullet : Projectile
-{
-
-}

ZoFo/GameCore/GameObjects/AttackEntities/Rock.cs

@@ -1,7 +0,0 @@
-using System;
-
-namespace ZoFo.GameCore.GameObjects;
-public class Rock : Projectile
-{
-
-}

ZoFo/GameCore/GameObjects/BaseClasses/Collectable.cs

@@ -1,7 +0,0 @@
-using System;
-
-namespace ZoFo.GameCore.GameObjects;
-public class Collectable : Entity
-{
-
-}

ZoFo/GameCore/GameObjects/Entities/Entity.cs

@@ -1,33 +1,33 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-
-namespace ZoFo.GameCore.GameObjects
-{
-    public abstract class Entity : GameObject
-    {
-        public int Id { get; set; }
-      public void CollisionComponent()
-        {
-
-        }
-
-        public void AnimationComponent()
-         {
-
-         }
-
-        public void UpdateLogic()
-        {
-
-        }
-
-    }
-}
-
-//вектор
-//вилосити
-//поситион
-//текстура
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+
+namespace ZoFo.GameCore.GameObjects.Entities
+{
+    public abstract class Entity : GameObject
+    {
+        public int Id { get; set; }
+        public void CollisionComponent()
+        {
+
+        }
+
+        public void AnimationComponent()
+        {
+
+        }
+
+        public void UpdateLogic()
+        {
+
+        }
+
+    }
+}
+
+//вектор
+//вилосити
+//поситион
+//текстура

ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/Collectable.cs

@@ -0,0 +1,7 @@
+using System;
+
+namespace ZoFo.GameCore.GameObjects.Entities.Interactables.Collectables;
+public class Collectable : Entity
+{
+
+}

ZoFo/GameCore/GameObjects/Entities/LivingEntities/Enemies/Enemy.cs

@@ -1,11 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.Net.Mime;
-using System.Reflection;
-using Microsoft.Xna.Framework.Content;
-
-namespace ZoFo.GameCore.GameObjects;
-public class Enemy : LivingEntity
-{
-
+using System;
+using System.Collections.Generic;
+using System.Net.Mime;
+using System.Reflection;
+using Microsoft.Xna.Framework.Content;
+
+namespace ZoFo.GameCore.GameObjects.Entities.LivingEntities.Enemies;
+public class Enemy : LivingEntity
+{
+
 }

ZoFo/GameCore/GameObjects/Entities/LivingEntities/LivingEntity.cs

@@ -1,20 +1,21 @@
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using System;
-
-namespace ZoFo.GameCore.GameObjects;
-public class LivingEntity : Entity
-{
-    public Vector2 velocity;
-    public Vector2 position;
-
-    public void TextureLoad(SpriteBatch spriteBatch)
-    {
-
-    }
-
-}
-
-
-
-
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+using System;
+using ZoFo.GameCore.GameObjects.Entities;
+
+namespace ZoFo.GameCore.GameObjects.Entities.LivingEntities;
+public class LivingEntity : Entity
+{
+    public Vector2 velocity;
+    public Vector2 position;
+
+    public void TextureLoad(SpriteBatch spriteBatch)
+    {
+
+    }
+
+}
+
+
+
+

ZoFo/GameCore/GameObjects/Entities/LivingEntities/Player/IPlayerWeaponAttack.cs

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

ZoFo/GameCore/GameObjects/Entities/LivingEntities/Player/LootData.cs

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

ZoFo/GameCore/GameObjects/Entities/LivingEntities/Player/Player.cs

@@ -0,0 +1,7 @@
+using System;
+
+namespace ZoFo.GameCore.GameObjects.Entities.LivingEntities.Player;
+public class Player : LivingEntity
+{
+
+}

ZoFo/GameCore/GameObjects/Entities/LivingEntities/Player/PlayerAttacks/GunAttack.cs

@@ -4,9 +4,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace ZoFo.GameCore.GameObjects
+namespace ZoFo.GameCore.GameObjects.Entities.LivingEntities.Player.PlayerAttacks
 {
-    internal class GunAttack:IPlayerWeaponAttack
+    internal class GunAttack : IPlayerWeaponAttack
     {
 
     }

ZoFo/GameCore/GameObjects/Entities/LivingEntities/Player/PlayerAttacks/HandAttack.cs

@@ -4,9 +4,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace ZoFo.GameCore.GameObjects
+namespace ZoFo.GameCore.GameObjects.Entities.LivingEntities.Player.PlayerAttacks
 {
-    internal class HandAttack:IPlayerWeaponAttack
+    internal class HandAttack : IPlayerWeaponAttack
     {
 
     }

ZoFo/GameCore/GameObjects/Entities/LivingEntities/Player/PlayerAttacks/SwordAttack.cs

@@ -4,9 +4,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace ZoFo.GameCore.GameObjects
+namespace ZoFo.GameCore.GameObjects.Entities.LivingEntities.Player.PlayerAttacks
 {
-    internal class SwordAttack:IPlayerWeaponAttack
+    internal class SwordAttack : IPlayerWeaponAttack
     {
 
     }

ZoFo/GameCore/GameObjects/Entities/LivingEntities/Projectiles/Bullet.cs

@@ -0,0 +1,7 @@
+using System;
+
+namespace ZoFo.GameCore.GameObjects.Entities.LivingEntities.Projectiles;
+public class Bullet : Projectile
+{
+
+}

ZoFo/GameCore/GameObjects/Entities/LivingEntities/Projectiles/Rock.cs

@@ -0,0 +1,7 @@
+using System;
+
+namespace ZoFo.GameCore.GameObjects.Entities.LivingEntities.Projectiles;
+public class Rock : Projectile
+{
+
+}

ZoFo/GameCore/GameObjects/Player/Player.cs

@@ -1,7 +0,0 @@
-using System;
-
-namespace ZoFo.GameCore.GameObjects;
-public class Player : LivingEntity
-{
-
-}

ZoFo/GameCore/GameObjects/Projectile.cs

@@ -1,4 +1,5 @@
 using System;
+using ZoFo.GameCore.GameObjects.Entities.LivingEntities;
 
 namespace ZoFo.GameCore.GameObjects;
 public class Projectile : LivingEntity

ZoFo/GameCore/GameObjects/StopObjects/StopObject.cs

@@ -0,0 +1,8 @@
+using System;
+
+namespace ZoFo.GameCore.GameObjects.StopObjects;
+
+public class StopObject
+{
+
+}

ZoFo/GameCore/GameObjects/Tiles/StopObject.cs

@@ -1,8 +0,0 @@
-using System;
-
-namespace ZoFo.GameCore.GameObjects;
-
-public class StopObject
-{
-
-}

ZoFo/GameCore/Server.cs

@@ -9,6 +9,7 @@ using ZoFo.GameCore.GameManagers.NetworkManager;
 using ZoFo.GameCore.GameManagers.NetworkManager.Updates;
 using ZoFo.GameCore.GameManagers.NetworkManager.Updates.ServerToClient;
 using ZoFo.GameCore.GameObjects;
+using ZoFo.GameCore.GameObjects.Entities;
 
 namespace ZoFo.GameCore
 {

ZoFo/ZoFo.csproj

@@ -10,6 +10,11 @@
         <ApplicationManifest>app.manifest</ApplicationManifest>
         <ApplicationIcon>Icon.ico</ApplicationIcon>
     </PropertyGroup>
+    <ItemGroup>
+      <Compile Remove="GameCore\GameObjects\BaseClasses\**" />
+      <EmbeddedResource Remove="GameCore\GameObjects\BaseClasses\**" />
+      <None Remove="GameCore\GameObjects\BaseClasses\**" />
+    </ItemGroup>
     <ItemGroup>
         <None Remove="Icon.ico" />
         <None Remove="Icon.bmp" />