Moving components folder to be in a better spot

Nhawdge · Jan 30, 2024 · ba1796a · ba1796a
1 parent ae450ce
commit ba1796a
Show file tree

Hide file tree

Showing 53 changed files with 71 additions and 55 deletions.
diff --git a/Components/LayerAir.cs b/Components/LayerAir.cs
diff --git a/Components/LayerBoat.cs b/Components/LayerBoat.cs
diff --git a/Components/LayerWater.cs b/Components/LayerWater.cs
diff --git a/Entities/Archetypes/CannonBuilder.cs b/Entities/Archetypes/CannonBuilder.cs
@@ -1,4 +1,4 @@
-using NovemberPirates.Components;
+using NovemberPirates.Scenes.Levels.Components;
 using NovemberPirates.Utilities.Data;
 
 namespace NovemberPirates.Entities.Archetypes

diff --git a/Entities/Archetypes/CannonballBuilder.cs b/Entities/Archetypes/CannonballBuilder.cs
@@ -1,6 +1,6 @@
 using Arch.Core;
 using Arch.Core.Extensions;
-using NovemberPirates.Components;
+using NovemberPirates.Scenes.Levels.Components;
 using NovemberPirates.Utilities;
 using Raylib_CsLo;
 using System.Numerics;

diff --git a/Entities/Archetypes/EffectsBuilder.cs b/Entities/Archetypes/EffectsBuilder.cs
@@ -2,6 +2,7 @@
 using Arch.Core.Extensions;
 using NovemberPirates.Components;
 using NovemberPirates.Extensions;
+using NovemberPirates.Scenes.Levels.Components;
 using NovemberPirates.Utilities;
 using Raylib_CsLo;
 using System.Numerics;

diff --git a/Entities/Archetypes/EnemyBuilder.cs b/Entities/Archetypes/EnemyBuilder.cs
@@ -1,6 +1,6 @@
 using Arch.Core;
 using Arch.Core.Extensions;
-using NovemberPirates.Components;
+using NovemberPirates.Scenes.Levels.Components;
 using NovemberPirates.Utilities;
 using NovemberPirates.Utilities.Data;
 using System.Numerics;

diff --git a/Entities/Archetypes/PickupBuilder.cs b/Entities/Archetypes/PickupBuilder.cs
@@ -1,6 +1,6 @@
 using Arch.Core;
 using Arch.Core.Extensions;
-using NovemberPirates.Components;
+using NovemberPirates.Scenes.Levels.Components;
 using NovemberPirates.Utilities;
 using System.Numerics;
 

diff --git a/Entities/Archetypes/PlayerBuilder.cs b/Entities/Archetypes/PlayerBuilder.cs
@@ -1,6 +1,6 @@
 using Arch.Core;
 using Arch.Core.Extensions;
-using NovemberPirates.Components;
+using NovemberPirates.Scenes.Levels.Components;
 using NovemberPirates.Utilities;
 using System.Numerics;
 

diff --git a/Extensions/MiscExtensions.cs b/Extensions/MiscExtensions.cs
@@ -1,4 +1,4 @@
-using NovemberPirates.Components;
+using NovemberPirates.Scenes.Levels.Components;
 using Raylib_CsLo;
 using System.Numerics;
 

diff --git a/Components/AiPathPoint.cs → Scenes/Levels/Components/AiPathPoint.cs b/Components/AiPathPoint.cs → Scenes/Levels/Components/AiPathPoint.cs
@@ -1,6 +1,6 @@
 using System.Numerics;
 
-namespace NovemberPirates.Components
+namespace NovemberPirates.Scenes.Levels.Components
 {
     internal class AiPathPoint
     {

diff --git a/Components/AudioEvent.cs → Scenes/Levels/Components/AudioEvent.cs b/Components/AudioEvent.cs → Scenes/Levels/Components/AudioEvent.cs
@@ -1,7 +1,7 @@
 using NovemberPirates.Utilities;
 using System.Numerics;
 
-namespace NovemberPirates.Components
+namespace NovemberPirates.Scenes.Levels.Components
 {
     internal class AudioEvent
     {

diff --git a/Components/Cannon.cs → Scenes/Levels/Components/Cannon.cs b/Components/Cannon.cs → Scenes/Levels/Components/Cannon.cs
@@ -1,7 +1,7 @@
 using NovemberPirates.Utilities.Data;
 using System.Numerics;
 
-namespace NovemberPirates.Components
+namespace NovemberPirates.Scenes.Levels.Components
 {
     internal class Cannon
     {

diff --git a/Components/Cannonball.cs → Scenes/Levels/Components/Cannonball.cs b/Components/Cannonball.cs → Scenes/Levels/Components/Cannonball.cs
@@ -1,6 +1,6 @@
 using System.Numerics;
 
-namespace NovemberPirates.Components
+namespace NovemberPirates.Scenes.Levels.Components
 {
     internal class Cannonball
     {

diff --git a/Components/CrewMember.cs → Scenes/Levels/Components/CrewMember.cs b/Components/CrewMember.cs → Scenes/Levels/Components/CrewMember.cs
@@ -1,6 +1,6 @@
 using System.Numerics;
 
-namespace NovemberPirates.Components
+namespace NovemberPirates.Scenes.Levels.Components
 {
     internal class CrewMember
     {

diff --git a/Components/Effect.cs → Scenes/Levels/Components/Effect.cs b/Components/Effect.cs → Scenes/Levels/Components/Effect.cs
@@ -1,7 +1,7 @@
 using System.Numerics;
 using System.Runtime.CompilerServices;
 
-namespace NovemberPirates.Components
+namespace NovemberPirates.Scenes.Levels.Components
 {
     internal class Effect
     {

diff --git a/Scenes/Levels/Components/LayerAir.cs b/Scenes/Levels/Components/LayerAir.cs
@@ -0,0 +1,6 @@
+namespace NovemberPirates.Scenes.Levels.Components
+{
+    internal class LayerAir
+    {
+    }
+}
diff --git a/Scenes/Levels/Components/LayerBoat.cs b/Scenes/Levels/Components/LayerBoat.cs
@@ -0,0 +1,6 @@
+namespace NovemberPirates.Scenes.Levels.Components
+{
+    internal class LayerBoat
+    {
+    }
+}
diff --git a/Scenes/Levels/Components/LayerWater.cs b/Scenes/Levels/Components/LayerWater.cs
@@ -0,0 +1,6 @@
+namespace NovemberPirates.Scenes.Levels.Components
+{
+    internal class LayerWater
+    {
+    }
+}
diff --git a/Components/MapTile.cs → Scenes/Levels/Components/MapTile.cs b/Components/MapTile.cs → Scenes/Levels/Components/MapTile.cs
@@ -1,6 +1,6 @@
 using System.Numerics;
 
-namespace NovemberPirates.Components
+namespace NovemberPirates.Scenes.Levels.Components
 {
     internal class MapTile
     {

diff --git a/Components/Npc.cs → Scenes/Levels/Components/Npc.cs b/Components/Npc.cs → Scenes/Levels/Components/Npc.cs
@@ -1,4 +1,4 @@
-namespace NovemberPirates.Components
+namespace NovemberPirates.Scenes.Levels.Components
 {
     internal class Npc
     {

diff --git a/Components/PatrolPoint.cs → Scenes/Levels/Components/PatrolPoint.cs b/Components/PatrolPoint.cs → Scenes/Levels/Components/PatrolPoint.cs
@@ -1,6 +1,6 @@
 using System.Numerics;
 
-namespace NovemberPirates.Components
+namespace NovemberPirates.Scenes.Levels.Components
 {
     internal class PatrolPoint
     {

diff --git a/Components/Player.cs → Scenes/Levels/Components/Player.cs b/Components/Player.cs → Scenes/Levels/Components/Player.cs
@@ -1,7 +1,7 @@
 using NovemberPirates.Utilities;
 using System.Numerics;
 
-namespace NovemberPirates.Components
+namespace NovemberPirates.Scenes.Levels.Components
 {
     internal class Player
     {

diff --git a/Components/Port.cs → Scenes/Levels/Components/Port.cs b/Components/Port.cs → Scenes/Levels/Components/Port.cs
@@ -1,6 +1,6 @@
 using System.Numerics;
 
-namespace NovemberPirates.Components
+namespace NovemberPirates.Scenes.Levels.Components
 {
     internal class Port
     {

diff --git a/Components/Render.cs → Scenes/Levels/Components/Render.cs b/Components/Render.cs → Scenes/Levels/Components/Render.cs
@@ -2,7 +2,7 @@
 using Raylib_CsLo;
 using System.Numerics;
 
-namespace NovemberPirates.Components
+namespace NovemberPirates.Scenes.Levels.Components
 {
     internal class Render
     {
@@ -62,8 +62,8 @@ public enum OriginAlignment
         public virtual Rectangle Source
         {
             get => new Rectangle(
-                    Column * SpriteWidth + (2 * Column) + 1,
-                    Row * SpriteHeight + (2 * Row) + 1,
+                    Column * SpriteWidth + 2 * Column + 1,
+                    Row * SpriteHeight + 2 * Row + 1,
                     SpriteWidth * (IsFlipped ? -1 : 1),
                     SpriteHeight
                     );

diff --git a/Components/Ship.cs → Scenes/Levels/Components/Ship.cs b/Components/Ship.cs → Scenes/Levels/Components/Ship.cs
@@ -2,7 +2,7 @@
 using NovemberPirates.Utilities.Data;
 using System.Numerics;
 
-namespace NovemberPirates.Components
+namespace NovemberPirates.Scenes.Levels.Components
 {
     internal class Ship
     {

diff --git a/Components/Spawner.cs → Scenes/Levels/Components/Spawner.cs b/Components/Spawner.cs → Scenes/Levels/Components/Spawner.cs
@@ -1,6 +1,6 @@
 using System.Numerics;
 
-namespace NovemberPirates.Components
+namespace NovemberPirates.Scenes.Levels.Components
 {
     internal class Spawner
     {

diff --git a/Components/Sprite.cs → Scenes/Levels/Components/Sprite.cs b/Components/Sprite.cs → Scenes/Levels/Components/Sprite.cs
@@ -4,7 +4,7 @@
 using System.Numerics;
 using System.Text.Json;
 
-namespace NovemberPirates.Components
+namespace NovemberPirates.Scenes.Levels.Components
 {
     internal class Sprite : Render
     {
@@ -137,7 +137,7 @@ public Frame(long x, long y, long w, long h, float duration)
                 Y = (int)y;
                 W = (int)w;
                 H = (int)h;
-                Duration = (float)duration;
+                Duration = duration;
             }
 
             public Frame(Rectangle rect, float duration)

diff --git a/Components/Wind.cs → Scenes/Levels/Components/Wind.cs b/Components/Wind.cs → Scenes/Levels/Components/Wind.cs
@@ -1,6 +1,6 @@
 using System.Numerics;
 
-namespace NovemberPirates.Components
+namespace NovemberPirates.Scenes.Levels.Components
 {
     internal class Wind
     {

diff --git a/Components/Wood.cs → Scenes/Levels/Components/Wood.cs b/Components/Wood.cs → Scenes/Levels/Components/Wood.cs
@@ -1,6 +1,6 @@
 using System.Numerics;
 
-namespace NovemberPirates.Components
+namespace NovemberPirates.Scenes.Levels.Components
 {
     internal class Wood
     {

diff --git a/Scenes/Levels/OceanScene.cs b/Scenes/Levels/OceanScene.cs
@@ -1,6 +1,7 @@
 using Arch.Core;
 using Arch.Core.Extensions;
 using NovemberPirates.Components;
+using NovemberPirates.Scenes.Levels.Components;
 using NovemberPirates.Scenes.Levels.Systems;
 using NovemberPirates.Utilities;
 using NovemberPirates.Utilities.Maps;

diff --git a/Scenes/Levels/Systems/AudioSystem.cs b/Scenes/Levels/Systems/AudioSystem.cs
@@ -2,6 +2,7 @@
 using Arch.Core.Extensions;
 using NovemberPirates.Components;
 using NovemberPirates.Extensions;
+using NovemberPirates.Scenes.Levels.Components;
 using NovemberPirates.Systems;
 using NovemberPirates.Utilities;
 using Raylib_CsLo;

diff --git a/Scenes/Levels/Systems/CameraSystem.cs b/Scenes/Levels/Systems/CameraSystem.cs
@@ -1,6 +1,6 @@
 using Arch.Core;
 using Arch.Core.Extensions;
-using NovemberPirates.Components;
+using NovemberPirates.Scenes.Levels.Components;
 using NovemberPirates.Systems;
 using Raylib_CsLo;
 using System.Numerics;

diff --git a/Scenes/Levels/Systems/CannonBallSystem.cs b/Scenes/Levels/Systems/CannonBallSystem.cs
@@ -1,7 +1,7 @@
 using Arch.Core;
 using Arch.Core.Extensions;
-using NovemberPirates.Components;
 using NovemberPirates.Entities.Archetypes;
+using NovemberPirates.Scenes.Levels.Components;
 using NovemberPirates.Systems;
 using NovemberPirates.Utilities;
 using Raylib_CsLo;

diff --git a/Scenes/Levels/Systems/DebugSystem.cs b/Scenes/Levels/Systems/DebugSystem.cs
@@ -2,6 +2,7 @@
 using Arch.Core.Extensions;
 using NovemberPirates.Components;
 using NovemberPirates.Extensions;
+using NovemberPirates.Scenes.Levels.Components;
 using NovemberPirates.Systems;
 using Raylib_CsLo;
 

diff --git a/Scenes/Levels/Systems/EffectsSystem.cs b/Scenes/Levels/Systems/EffectsSystem.cs
@@ -1,7 +1,7 @@
 using Arch.Core;
 using Arch.Core.Extensions;
-using NovemberPirates.Components;
 using NovemberPirates.Entities.Archetypes;
+using NovemberPirates.Scenes.Levels.Components;
 using NovemberPirates.Systems;
 using Raylib_CsLo;
 using System.Numerics;

diff --git a/Scenes/Levels/Systems/EnemyControlSystem.cs b/Scenes/Levels/Systems/EnemyControlSystem.cs
@@ -3,6 +3,7 @@
 using NovemberPirates.Components;
 using NovemberPirates.Entities.Archetypes;
 using NovemberPirates.Extensions;
+using NovemberPirates.Scenes.Levels.Components;
 using NovemberPirates.Systems;
 using NovemberPirates.Utilities;
 using NovemberPirates.Utilities.Data;

diff --git a/Scenes/Levels/Systems/PickupSystem.cs b/Scenes/Levels/Systems/PickupSystem.cs
@@ -2,7 +2,9 @@
 using Arch.Core.Extensions;
 using NovemberPirates.Components;
 using NovemberPirates.Extensions;
+using NovemberPirates.Scenes.Levels.Components;
 using NovemberPirates.Systems;
+using NovemberPirates.Utilities.Data;
 using Raylib_CsLo;
 using System.Numerics;
 

diff --git a/Scenes/Levels/Systems/PlayerControlSystem.cs b/Scenes/Levels/Systems/PlayerControlSystem.cs
@@ -3,6 +3,7 @@
 using NovemberPirates.Components;
 using NovemberPirates.Entities.Archetypes;
 using NovemberPirates.Extensions;
+using NovemberPirates.Scenes.Levels.Components;
 using NovemberPirates.Systems;
 using NovemberPirates.Utilities;
 using Raylib_CsLo;

diff --git a/Scenes/Levels/Systems/PortSystem.cs b/Scenes/Levels/Systems/PortSystem.cs
@@ -2,6 +2,7 @@
 using Arch.Core.Extensions;
 using NovemberPirates.Components;
 using NovemberPirates.Extensions;
+using NovemberPirates.Scenes.Levels.Components;
 using NovemberPirates.Systems;
 using Raylib_CsLo;
 

diff --git a/Scenes/Levels/Systems/RenderSystem.cs b/Scenes/Levels/Systems/RenderSystem.cs
@@ -2,6 +2,7 @@
 using Arch.Core.Extensions;
 using NovemberPirates.Components;
 using NovemberPirates.Extensions;
+using NovemberPirates.Scenes.Levels.Components;
 using NovemberPirates.Systems;
 using Raylib_CsLo;
 using System.Numerics;

diff --git a/Scenes/Levels/Systems/ShipControlSystem.cs b/Scenes/Levels/Systems/ShipControlSystem.cs
@@ -3,6 +3,7 @@
 using NovemberPirates.Components;
 using NovemberPirates.Entities.Archetypes;
 using NovemberPirates.Extensions;
+using NovemberPirates.Scenes.Levels.Components;
 using NovemberPirates.Systems;
 using NovemberPirates.Utilities;
 using QuickType.Map;

diff --git a/Scenes/Levels/Systems/SpawningSystem.cs b/Scenes/Levels/Systems/SpawningSystem.cs
@@ -3,6 +3,7 @@
 using NovemberPirates.Components;
 using NovemberPirates.Entities.Archetypes;
 using NovemberPirates.Extensions;
+using NovemberPirates.Scenes.Levels.Components;
 using NovemberPirates.Systems;
 using Raylib_CsLo;
 

diff --git a/Scenes/Levels/Systems/UiSystem.cs b/Scenes/Levels/Systems/UiSystem.cs
@@ -2,6 +2,7 @@
 using Arch.Core.Extensions;
 using NovemberPirates.Components;
 using NovemberPirates.Extensions;
+using NovemberPirates.Scenes.Levels.Components;
 using NovemberPirates.Scenes.Menus.MainMenu;
 using NovemberPirates.Systems;
 using Raylib_CsLo;

diff --git a/Scenes/Levels/Systems/WindSystem.cs b/Scenes/Levels/Systems/WindSystem.cs
@@ -3,6 +3,7 @@
 using NovemberPirates.Components;
 using NovemberPirates.Entities.Archetypes;
 using NovemberPirates.Extensions;
+using NovemberPirates.Scenes.Levels.Components;
 using NovemberPirates.Systems;
 using Raylib_CsLo;
 

diff --git a/Scenes/Menus/Components/SpriteButton.cs b/Scenes/Menus/Components/SpriteButton.cs
@@ -1,4 +1,4 @@
-using NovemberPirates.Components;
+using NovemberPirates.Scenes.Levels.Components;
 
 namespace NovemberPirates.Scenes.Menus.Components
 {

diff --git a/Scenes/Menus/MainMenu/MainMenuScene.cs b/Scenes/Menus/MainMenu/MainMenuScene.cs
@@ -1,5 +1,6 @@
 using NovemberPirates.Components;
 using NovemberPirates.Scenes.Levels;
+using NovemberPirates.Scenes.Levels.Components;
 using NovemberPirates.Scenes.Menus.Components;
 using NovemberPirates.Scenes.Menus.Systems;
 using NovemberPirates.Utilities;

diff --git a/Utilities/Data/DataExtensions.cs b/Utilities/Data/DataExtensions.cs
@@ -1,4 +1,4 @@
-using NovemberPirates.Components;
+using NovemberPirates.Scenes.Levels.Components;
 
 namespace NovemberPirates.Utilities.Data
 {