Menu clean up, wow, much impressed

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

Hide file tree

Showing 32 changed files with 275 additions and 25 deletions.
diff --git a/Assets/Art/Button.json b/Assets/Art/Button.json
@@ -0,0 +1,33 @@
+{ "frames": [
+   {
+    "filename": "Normal-0",
+    "frame": { "x": 1, "y": 1, "w": 378, "h": 143 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 378, "h": 143 },
+    "sourceSize": { "w": 378, "h": 143 },
+    "duration": 100
+   },
+   {
+    "filename": "Hover-1",
+    "frame": { "x": 381, "y": 1, "w": 378, "h": 143 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 378, "h": 143 },
+    "sourceSize": { "w": 378, "h": 143 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3-rc6-x64",
+  "image": "Button.png",
+  "format": "RGBA8888",
+  "size": { "w": 760, "h": 145 },
+  "scale": "1",
+  "frameTags": [
+   { "name": "Normal", "from": 0, "to": 0, "direction": "forward", "color": "#000000ff" },
+   { "name": "Hover", "from": 1, "to": 1, "direction": "forward", "color": "#000000ff" }
+  ]
+ }
+}
diff --git a/Assets/Art/Button.png b/Assets/Art/Button.png
diff --git a/Assets/Art/Main_Menu.png b/Assets/Art/Main_Menu.png
diff --git a/Assets/Art/words.json b/Assets/Art/words.json
@@ -0,0 +1,73 @@
+{ "frames": [
+   {
+    "filename": "Start-0",
+    "frame": { "x": 1, "y": 1, "w": 378, "h": 143 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 378, "h": 143 },
+    "sourceSize": { "w": 378, "h": 143 },
+    "duration": 100
+   },
+   {
+    "filename": "StartHover-1",
+    "frame": { "x": 381, "y": 1, "w": 378, "h": 143 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 378, "h": 143 },
+    "sourceSize": { "w": 378, "h": 143 },
+    "duration": 100
+   },
+   {
+    "filename": "HowToPlay-2",
+    "frame": { "x": 761, "y": 1, "w": 378, "h": 143 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 378, "h": 143 },
+    "sourceSize": { "w": 378, "h": 143 },
+    "duration": 100
+   },
+   {
+    "filename": "HowToPlayHover-3",
+    "frame": { "x": 1, "y": 146, "w": 378, "h": 143 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 378, "h": 143 },
+    "sourceSize": { "w": 378, "h": 143 },
+    "duration": 100
+   },
+   {
+    "filename": "Credits-4",
+    "frame": { "x": 381, "y": 146, "w": 378, "h": 143 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 378, "h": 143 },
+    "sourceSize": { "w": 378, "h": 143 },
+    "duration": 100
+   },
+   {
+    "filename": "CreditsHover-5",
+    "frame": { "x": 761, "y": 146, "w": 378, "h": 143 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 378, "h": 143 },
+    "sourceSize": { "w": 378, "h": 143 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3-rc6-x64",
+  "image": "words.png",
+  "format": "RGBA8888",
+  "size": { "w": 1140, "h": 290 },
+  "scale": "1",
+  "frameTags": [
+   { "name": "Start", "from": 0, "to": 0, "direction": "forward", "color": "#000000ff" },
+   { "name": "StartHover", "from": 1, "to": 1, "direction": "forward", "color": "#000000ff" },
+   { "name": "HowToPlay", "from": 2, "to": 2, "direction": "forward", "color": "#000000ff" },
+   { "name": "HowToPlayHover", "from": 3, "to": 3, "direction": "forward", "color": "#000000ff" },
+   { "name": "Credits", "from": 4, "to": 4, "direction": "forward", "color": "#000000ff" },
+   { "name": "CreditsHover", "from": 5, "to": 5, "direction": "forward", "color": "#000000ff" }
+  ]
+ }
+}
diff --git a/Assets/Art/words.png b/Assets/Art/words.png
diff --git a/Assets/Aseprite/Button.ase b/Assets/Aseprite/Button.ase
diff --git a/Assets/Aseprite/words.ase b/Assets/Aseprite/words.ase
diff --git a/Assets/Button1.png b/Assets/Button1.png
diff --git a/Assets/Button2.png b/Assets/Button2.png
diff --git a/Assets/How_to_play_hover.png b/Assets/How_to_play_hover.png
diff --git a/Assets/How_to_play_no_hover.png b/Assets/How_to_play_no_hover.png
diff --git a/Assets/Start_hover.png b/Assets/Start_hover.png
diff --git a/Assets/Start_not_hover.png b/Assets/Start_not_hover.png
diff --git a/Assets/credits_hover.png b/Assets/credits_hover.png
diff --git a/Assets/credits_not_hover.png b/Assets/credits_not_hover.png
diff --git a/Assets/lavanda.rgs b/Assets/lavanda.rgs
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/NovemberPiratesEngine.cs b/NovemberPiratesEngine.cs
@@ -18,6 +18,7 @@ public void StartGame()
             Raylib.InitWindow(1280, 720, "November Pirates");
             Raylib.SetTargetFPS(60);
             Raylib.InitAudioDevice();
+            Raylib.SetExitKey(0);
             Camera = new Camera2D
             {
                 zoom = 1.0f,

diff --git a/Scenes/Levels/OceanScene.cs b/Scenes/Levels/OceanScene.cs
@@ -19,7 +19,6 @@ internal OceanScene()
             Systems.Add(new ShipControlSystem());
             Systems.Add(new CameraSystem());
             Systems.Add(new WindSystem());
-            Systems.Add(new UiSystem());
             Systems.Add(new DebugSystem());
             Systems.Add(new CannonBallSystem());
             Systems.Add(new EnemyControlSystem());
@@ -29,6 +28,7 @@ internal OceanScene()
             Systems.Add(new AudioSystem());
             Systems.Add(new NavigationSystem());
             Systems.Add(new PlayerControlSystem());
+            Systems.Add(new UiSystem());
 
             var mapDetails = MapManager.Instance.LoadMap("Level_0", World);
             MapEdge = mapDetails.MapEdge;

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.Menus.MainMenu;
 using NovemberPirates.Systems;
 using Raylib_CsLo;
 
@@ -29,6 +30,12 @@ internal override void UpdateNoCamera(World world)
                 Raylib.DrawText(Raylib.GetFrameTime().ToString(), 10, 70, 20, Raylib.RED);
                 Raylib.DrawFPS(10, 90);
             }
+
+
+            if (Raylib.IsKeyPressed(KeyboardKey.KEY_ESCAPE))
+            {
+                NovemberPiratesEngine.Instance.ActiveScene = new PauseScene(NovemberPiratesEngine.Instance.ActiveScene);
+            }
         }
     }
 }
diff --git a/Scenes/Menus/Components/SpriteButton.cs b/Scenes/Menus/Components/SpriteButton.cs
@@ -0,0 +1,11 @@
+using NovemberPirates.Components;
+
+namespace NovemberPirates.Scenes.Menus.Components
+{
+    internal class SpriteButton : UiTitle
+    {
+        internal Sprite ButtonSprite;
+        internal Sprite TextSprite;
+        internal Action Action { get; set; } = () => { };
+    }
+}
diff --git a/Scenes/Menus/MainMenu/CreditsScene.cs b/Scenes/Menus/MainMenu/CreditsScene.cs
@@ -1,15 +1,22 @@
-using NovemberPirates.Scenes.Menus.Systems;
+using NovemberPirates.Scenes.Menus.Components;
+using NovemberPirates.Scenes.Menus.Systems;
 
 namespace NovemberPirates.Scenes.Menus.MainMenu
 {
     internal class CreditsScene : BaseScene
     {
         public CreditsScene()
         {
-
             Systems.Add(new MenuSystem());
-
-
+            World.Create(new UiButton
+            {
+                Text = "Back",
+                Action = () =>
+                {
+                    NovemberPiratesEngine.Instance.ActiveScene = new MainMenuScene();
+                },
+                Order = 5
+            });
         }
     }
 }
diff --git a/Scenes/Menus/MainMenu/HowToPlayScene.cs b/Scenes/Menus/MainMenu/HowToPlayScene.cs
@@ -18,15 +18,15 @@ public HowToPlayScene()
             var instructions3 = World.Create<UiTitle>();
             instructions3.Set(new UiTitle { Text = @"F2 for the debugger I'm proud of", Order = 3 });
 
-            var backButton = new UiButton
+            World.Create(new UiButton
             {
                 Text = "Back",
                 Action = () =>
                 {
                     NovemberPiratesEngine.Instance.ActiveScene = new MainMenuScene();
                 },
-                Order = 6
-            };
+                Order = 5
+            });
         }
 
     }

diff --git a/Scenes/Menus/MainMenu/MainMenuScene.cs b/Scenes/Menus/MainMenu/MainMenuScene.cs
@@ -1,7 +1,10 @@
 using Arch.Core.Extensions;
+using NovemberPirates.Components;
 using NovemberPirates.Scenes.Levels;
 using NovemberPirates.Scenes.Menus.Components;
 using NovemberPirates.Scenes.Menus.Systems;
+using NovemberPirates.Utilities;
+using System.Numerics;
 
 namespace NovemberPirates.Scenes.Menus.MainMenu
 {
@@ -11,41 +14,69 @@ public MainMenuScene()
         {
             Systems.Add(new MenuSystem());
 
-            var title = World.Create<UiTitle>();
+            //var title = World.Create<UiTitle>();
+            //var uiTitle = new UiTitle() { Text = "November Pirates" };
+            //title.Set(uiTitle);
 
-            var uiTitle = new UiTitle() { Text = "November Pirates" };
-            title.Set(uiTitle);
-
-            var button = World.Create<UiButton>();
-            button.Set(new UiButton
+            World.Create(new SpriteButton
             {
-                Text = "Start Game",
+                Text = "Start",
                 Action = () =>
                 {
                     NovemberPiratesEngine.Instance.ActiveScene = new OceanScene();
                 },
-                Order = 1
+                Order = 1,
+                TextSprite = new Sprite(TextureKey.Words, "Assets/Art/words")
+                {
+                    Position = new Vector2(750, 150),
+                    OriginPos = Render.OriginAlignment.LeftTop
+                },
+                ButtonSprite = new Sprite(TextureKey.Button, "Assets/Art/Button")
+                {
+                    Position = new Vector2(750, 150),
+                    OriginPos = Render.OriginAlignment.LeftTop
+                }
             });
 
 
-            World.Create(new UiButton
+            World.Create(new SpriteButton
             {
-                Text = "How to Play",
+                Text = "HowToPlay",
                 Action = () =>
                 {
                     NovemberPiratesEngine.Instance.ActiveScene = new HowToPlayScene();
                 },
-                Order = 2
+                Order = 2,
+                TextSprite = new Sprite(TextureKey.Words, "Assets/Art/words")
+                {
+                    Position = new Vector2(750, 300),
+                    OriginPos = Render.OriginAlignment.LeftTop,
+                },
+                ButtonSprite = new Sprite(TextureKey.Button, "Assets/Art/Button")
+                {
+                    Position = new Vector2(750, 300),
+                    OriginPos = Render.OriginAlignment.LeftTop
+                }
             });
 
-            World.Create(new UiButton
+            World.Create(new SpriteButton
             {
                 Text = "Credits",
                 Action = () =>
                 {
                     NovemberPiratesEngine.Instance.ActiveScene = new CreditsScene();
                 },
-                Order = 3
+                Order = 3,
+                TextSprite = new Sprite(TextureKey.Words, "Assets/Art/words")
+                {
+                    Position = new Vector2(750, 450),
+                    OriginPos = Render.OriginAlignment.LeftTop
+                },
+                ButtonSprite = new Sprite(TextureKey.Button, "Assets/Art/Button")
+                {
+                    Position = new Vector2(750, 450),
+                    OriginPos = Render.OriginAlignment.LeftTop
+                }
             });
 
 
@@ -55,7 +86,6 @@ public MainMenuScene()
                 Action = () =>
                 {
                     Environment.Exit(0);
-                    //NovemberPiratesEngine.Instance.ActiveScene = new HowToPlayScene();
                 },
                 Order = 5
             });

diff --git a/Scenes/Menus/MainMenu/PauseScene.cs b/Scenes/Menus/MainMenu/PauseScene.cs
@@ -0,0 +1,53 @@
+using NovemberPirates.Scenes.Menus.Components;
+using NovemberPirates.Scenes.Menus.Systems;
+
+namespace NovemberPirates.Scenes.Menus.MainMenu
+{
+    internal class PauseScene : BaseScene
+    {
+        public PauseScene(BaseScene lastScene)
+        {
+            Systems.Add(new MenuSystem());
+
+            World.Create(new UiButton
+            {
+                Text = "Resume",
+                Action = () =>
+                {
+                    NovemberPiratesEngine.Instance.ActiveScene = lastScene;
+                },
+                Order = 1
+            });
+
+            World.Create(new UiButton
+            {
+                Text = "Settings",
+                Action = () =>
+                {
+                    //NovemberPiratesEngine.Instance.ActiveScene = new MainMenuScene();
+                },
+                Order = 2
+            });
+
+            World.Create(new UiButton
+            {
+                Text = "Main Menu",
+                Action = () =>
+                {
+                    NovemberPiratesEngine.Instance.ActiveScene = new MainMenuScene();
+                },
+                Order = 3
+            });
+
+            World.Create(new UiButton
+            {
+                Text = "Exit Game",
+                Action = () =>
+                {
+                    Environment.Exit(0);
+                },
+                Order = 5
+            });
+        }
+    }
+}