Just some project cleanup

Nhawdge · Nov 15, 2023 · e048523 · e048523
1 parent a6fb17e
commit e048523
Show file tree

Hide file tree

Showing 21 changed files with 15 additions and 29 deletions.
diff --git a/Assets/Button1.png → Assets/Originals/Button1.png b/Assets/Button1.png → Assets/Originals/Button1.png
diff --git a/Assets/Button2.png → Assets/Originals/Button2.png b/Assets/Button2.png → Assets/Originals/Button2.png
diff --git a/Assets/How_to_play_hover.png → Assets/Originals/How_to_play_hover.png b/Assets/How_to_play_hover.png → Assets/Originals/How_to_play_hover.png
diff --git a/Assets/How_to_play_no_hover.png → Assets/Originals/How_to_play_no_hover.png b/Assets/How_to_play_no_hover.png → Assets/Originals/How_to_play_no_hover.png
diff --git a/Assets/Start_hover.png → Assets/Originals/Start_hover.png b/Assets/Start_hover.png → Assets/Originals/Start_hover.png
diff --git a/Assets/Start_not_hover.png → Assets/Originals/Start_not_hover.png b/Assets/Start_not_hover.png → Assets/Originals/Start_not_hover.png
diff --git a/Assets/credits_hover.png → Assets/Originals/credits_hover.png b/Assets/credits_hover.png → Assets/Originals/credits_hover.png
diff --git a/Assets/credits_not_hover.png → Assets/Originals/credits_not_hover.png b/Assets/credits_not_hover.png → Assets/Originals/credits_not_hover.png
diff --git a/Assets/words1.png b/Assets/words1.png
diff --git a/Assets/words2.png b/Assets/words2.png
diff --git a/Assets/words3.png b/Assets/words3.png
diff --git a/Assets/words4.png b/Assets/words4.png
diff --git a/Assets/words5.png b/Assets/words5.png
diff --git a/Assets/words6.png b/Assets/words6.png
diff --git a/Scenes/Levels/Systems/EffectsSystem.cs b/Scenes/Levels/Systems/EffectsSystem.cs
@@ -33,7 +33,6 @@ internal override void Update(World world)
                     var rotatedOffset = RayMath.Vector2Rotate(offset, direction);
 
                     sprite.Position = truePosition + rotatedOffset;
-
                 }
                 else
                 {

diff --git a/Scenes/Levels/Systems/EnemyControlSystem.cs b/Scenes/Levels/Systems/EnemyControlSystem.cs
@@ -50,6 +50,7 @@ internal override void Update(World world)
                     ship.Crew = 0;
                     var percent = (100 + ship.HullHealth) / 100;
                     sprite.Color.a = (byte)(255 * percent);
+                    ship.HullHealth -= Raylib.GetFrameTime();
                 }
                 if (ship.HullHealth <= -100)
                 {

diff --git a/Scenes/Levels/Systems/RenderSystem.cs b/Scenes/Levels/Systems/RenderSystem.cs
@@ -44,7 +44,6 @@ internal override void Update(World world)
                 }
             });
 
-
             var effectSprites = new QueryDescription().WithAll<Sprite, Effect, LayerWater>().WithNone<MapTile>();
             world.Query(in effectSprites, (entity) =>
             {

diff --git a/Scenes/Menus/MainMenu/CreditsScene.cs b/Scenes/Menus/MainMenu/CreditsScene.cs
@@ -8,14 +8,23 @@ internal class CreditsScene : BaseScene
         public CreditsScene()
         {
             Systems.Add(new MenuSystem());
+
+            World.Create(new UiTitle { Text = @"Credits", Order = 1 });
+            World.Create(new UiTitle { Text = @"Nhawdge - Code", Order = 2 });
+            World.Create(new UiTitle { Text = @"Kaitlyn Schmidt - Game Design", Order = 3 });
+            World.Create(new UiTitle { Text = @"Game Design and Project Management?", Order = 4 });
+            World.Create(new UiTitle { Text = @"Barun Sinha - Sounds", Order = 5 });
+            World.Create(new UiTitle { Text = @"UnicornGirlie - Art ", Order = 6 });
+            World.Create(new UiTitle { Text = @"Kenney.nl - Pirate Asset Pack", Order = 7 });
+
             World.Create(new UiButton
             {
                 Text = "Back",
                 Action = () =>
                 {
                     NovemberPiratesEngine.Instance.ActiveScene = new MainMenuScene();
                 },
-                Order = 5
+                Order = 9
             });
         }
     }

diff --git a/Scenes/Menus/MainMenu/MainMenuScene.cs b/Scenes/Menus/MainMenu/MainMenuScene.cs
@@ -1,5 +1,4 @@
-using Arch.Core.Extensions;
-using NovemberPirates.Components;
+using NovemberPirates.Components;
 using NovemberPirates.Scenes.Levels;
 using NovemberPirates.Scenes.Menus.Components;
 using NovemberPirates.Scenes.Menus.Systems;
@@ -38,7 +37,6 @@ public MainMenuScene()
                 }
             });
 
-
             World.Create(new SpriteButton
             {
                 Text = "HowToPlay",
@@ -79,7 +77,6 @@ public MainMenuScene()
                 }
             });
 
-
             World.Create(new UiButton
             {
                 Text = "Exit",
@@ -89,9 +86,6 @@ public MainMenuScene()
                 },
                 Order = 5
             });
-
-
-
         }
     }
 }
diff --git a/Scenes/Menus/Systems/MenuSystem.cs b/Scenes/Menus/Systems/MenuSystem.cs
@@ -1,6 +1,5 @@
 using Arch.Core;
 using Arch.Core.Extensions;
-using NovemberPirates.Components;
 using NovemberPirates.Extensions;
 using NovemberPirates.Scenes.Menus.Components;
 using NovemberPirates.Systems;
@@ -12,7 +11,6 @@ namespace NovemberPirates.Scenes.Menus.Systems
 {
     internal class MenuSystem : GameSystem
     {
-
         internal override void Update(World world) { }
 
         internal override void UpdateNoCamera(World world)
@@ -22,7 +20,7 @@ internal override void UpdateNoCamera(World world)
 
             var centerPoint = new Vector2(Raylib.GetScreenWidth() / 2, Raylib.GetScreenHeight() / 2);
 
-            var dummyrect = new Rectangle(centerPoint.X - 200, centerPoint.Y - 150, 400, 400);
+            var dummyrect = new Rectangle(centerPoint.X - 200, centerPoint.Y - 300, 400, 500);
             //RayGui.GuiDummyRec(dummyrect, "");
             var index = 0;
 
@@ -38,11 +36,7 @@ internal override void UpdateNoCamera(World world)
                     var titleComponent = entity.Get<UiTitle>();
 
                     var text = titleComponent.Text;
-                    var rect = new Rectangle(centerPoint.X - 100, 200 + 50 * titleComponent.Order, 200, 100);
-                    //RayGui.GuiTextBox(text, centerPoint.X - 200, centerPoint.Y - 200, 24, Raylib.ORANGE);
-
-
-                    // TODO fix font size
+                    var rect = new Rectangle(centerPoint.X - 100, 0 + 50 * titleComponent.Order, 200, 100);
 
                     RayGui.GuiLabel(rect, text);
                 }
@@ -64,9 +58,6 @@ internal override void UpdateNoCamera(World world)
                 {
                     var button = entity.Get<SpriteButton>();
 
-                    //var rect = dummyrect with { x = dummyrect.x + 100, y = dummyrect.y + (60 * button.Order), width = 200, height = 50 };
-                    //Raylib.DrawTexture(sprite, rect.x, rect.y, Raylib.WHITE);
-
                     button.ButtonSprite.Play("Normal");
                     button.TextSprite.Play(button.Text);
                     if (Raylib.CheckCollisionPointRec(Raylib.GetMousePosition(), button.ButtonSprite.Destination))
@@ -80,13 +71,7 @@ internal override void UpdateNoCamera(World world)
                     }
                     button.ButtonSprite.Draw();
                     button.TextSprite.Draw();
-
-                    //if (RayGui.GuiButton(rect, button.Text))
-                    //{
-                    //    button.Action();
-                    //}
                 }
-
             });
         }
     }

diff --git a/Utilities/TextureManager.cs b/Utilities/TextureManager.cs
@@ -1,5 +1,4 @@
-using NovemberPirates.Components;
-using Raylib_CsLo;
+using Raylib_CsLo;
 
 namespace NovemberPirates.Utilities
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,7 +33,6 @@ internal override void Update(World world) @@
                         var rotatedOffset = RayMath.Vector2Rotate(offset, direction);
                         sprite.Position = truePosition + rotatedOffset;
                     }
                     else
                     {
@@ Expand Down @@