Merge pull request #1 from BlurOne-GIT/develop

Port to new MmgEngine
BlurOne-GIT · Apr 7, 2024 · a8ee8ea · a8ee8ea
2 parents 6a9588b + 157fbf3
commit a8ee8ea
Show file tree

Hide file tree

Showing 56 changed files with 2,564 additions and 3,302 deletions.
diff --git a/Logical/Animation.cs b/Logical/Animation.cs
diff --git a/Logical/Ball.cs b/Logical/Ball.cs
@@ -3,10 +3,11 @@
 using System.Linq;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
+using MmgEngine;
 
 namespace Logical;
 
-public class Ball : Component, IUpdateable
+public class Ball : SimpleImage
 {
     #region Fields
     public static event EventHandler BallCreated;
@@ -26,8 +27,8 @@ public BallColors BallColor {
         {
             _ballColor = value;
             if (_shallSound)
-                LevelTextures.ColorChange.Play(MathF.Pow((float)Configs.SfxVolume * 0.1f, 2), 0, 0);
-            Texture = LevelTextures.Ball[(int)_ballColor];
+                LevelResources.ColorChange.Play(MathF.Pow(Configs.SfxVolume * 0.1f, 2), 0, 0);
+            ChangeTexture(LevelResources.Ball[(int)_ballColor]);
         }
     }
     public Direction MovementDirection
@@ -37,59 +38,57 @@ public Direction MovementDirection
         {
             _direction = value;
             if (_shallSound)
-                LevelTextures.Bounce.Play(MathF.Pow((float)Configs.SfxVolume * 0.1f, 2), 0, 0);
-            switch (_direction)
+                LevelResources.Bounce.Play(MathF.Pow(Configs.SfxVolume * 0.1f, 2), 0, 0);
+            _movement = _direction switch
             {
-                case Direction.Left: _movement = new Vector2(-1f, 0f); break;
-                case Direction.Up: _movement = new Vector2(0f, -1f); break;
-                case Direction.Right: _movement = new Vector2(1f, 0f); break;
-                case Direction.Down: _movement = new Vector2(0f, 1f); break;
-            }
+                Direction.Left => new Vector2(-1f, 0f),
+                Direction.Up => new Vector2(0f, -1f),
+                Direction.Right => new Vector2(1f, 0f),
+                Direction.Down => new Vector2(0f, 1f),
+                _ => _movement
+            };
         }
     }
-    public Vector2 Position
+    public new Vector2 Position
     { 
-        get => _position;
-        set 
+        get => base.Position;
+        set
         {
-            if (!_justTeleported)
-            {
-                _justTeleported = true;
-                if (_shallSound)
-                    LevelTextures.Tp.Play(MathF.Pow((float)Configs.SfxVolume * 0.1f, 2), 0, 0);
-                _position = value; 
-            }    
+            if (_justTeleported) return;
+
+            _justTeleported = true;
+            if (_shallSound)
+                LevelResources.Tp.Play(MathF.Pow(Configs.SfxVolume * 0.1f, 2), 0, 0);
+            base.Position = value;
         }
     }
     #endregion
 
-    public Ball(Vector2 position, Direction direction, BallColors ballColor, bool willSound)
+    public Ball(Game game, Vector2 position, Direction direction, BallColors ballColor, bool willSound) : base(game, LevelResources.Ball[(int)ballColor], position, 7)
     {
         _shallSound = false;
-        _position = position;
         MovementDirection = direction;
         BallColor = ballColor;
         AllBalls.Add(this);
         _shallSound = willSound;
         BallCreated?.Invoke(this, EventArgs.Empty);
-        zIndex = 7;
-        IsEnabled = true;
     }
 
     public void Bounce() => MovementDirection = Statics.ReverseDirection[MovementDirection];
 
-    public override void Dispose()
+    protected override void Dispose(bool disposing)
     {
         BallDestroyed?.Invoke(this, EventArgs.Empty);
         AllBalls.Remove(this);
+        base.Dispose(disposing);
     }
 
-    public void Update(GameTime gameTime)
+    public override void Update(GameTime gameTime)
     {
-        _position += _movement;
-        if (_position.X is < -10 or > 320 || _position.Y is < -10 or > 256)
+        base.Position += _movement;
+        if (Position.X is < -10 or > 320 || Position.Y is < -10 or > 256)
         {
-            LevelTextures.Explode.Play(MathF.Pow(Configs.SfxVolume * 0.1f, 2), 0, 0);
+            LevelResources.Explode.Play(MathF.Pow(Configs.SfxVolume * 0.1f, 2), 0, 0);
             Dispose();
         }
         if (_justTeleported)

diff --git a/Logical/Block.cs b/Logical/Block.cs
diff --git a/Logical/Blocks/Block.cs b/Logical/Blocks/Block.cs
@@ -0,0 +1,44 @@
+using System.Collections.Generic;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+using MmgEngine;
+
+namespace Logical.Blocks;
+
+public abstract class Block : SimpleImage
+{
+    #region Fields
+    public readonly byte FileValue;
+    public readonly bool HasArgument = false;
+    public readonly byte Argument;
+    protected Point Pos;
+    #endregion
+
+    public Block(Game game, Texture2D texture2D, Point arrayPosition, byte xx, byte yy = 0)
+        : base(
+            game,
+            texture2D,
+            new Vector2(16 + arrayPosition.X * 36, 46 + arrayPosition.Y * 36),
+            0
+            )
+    {
+        Pos = arrayPosition;
+        FileValue = xx;
+
+        if (yy == 0) 
+            return;
+
+        HasArgument = false;
+        Argument = yy;
+    }
+}
+
+public interface IReloadable
+{
+    public void Reload(Block[,] blocks);
+}
+
+public interface IOverlayable
+{
+    public IEnumerable<DrawableGameComponent> GetOverlayables();
+}