diff --git a/Mine2d/assets/blocks/cobalt-ore.png b/Mine2d/assets/blocks/cobalt-ore.png new file mode 100644 index 0000000..f9c71be Binary files /dev/null and b/Mine2d/assets/blocks/cobalt-ore.png differ diff --git a/Mine2d/assets/blocks/copper-ore.png b/Mine2d/assets/blocks/copper-ore.png new file mode 100644 index 0000000..bea3eaf Binary files /dev/null and b/Mine2d/assets/blocks/copper-ore.png differ diff --git a/Mine2d/assets/blocks/diamond-ore.png b/Mine2d/assets/blocks/diamond-ore.png new file mode 100644 index 0000000..0158264 Binary files /dev/null and b/Mine2d/assets/blocks/diamond-ore.png differ diff --git a/Mine2d/assets/blocks/gold-ore.png b/Mine2d/assets/blocks/gold-ore.png new file mode 100644 index 0000000..6ead141 Binary files /dev/null and b/Mine2d/assets/blocks/gold-ore.png differ diff --git a/Mine2d/assets/blocks/iron-ore.png b/Mine2d/assets/blocks/iron-ore.png new file mode 100644 index 0000000..e54ea5a Binary files /dev/null and b/Mine2d/assets/blocks/iron-ore.png differ diff --git a/Mine2d/assets/blocks/lead-ore.png b/Mine2d/assets/blocks/lead-ore.png new file mode 100644 index 0000000..c2a9fe7 Binary files /dev/null and b/Mine2d/assets/blocks/lead-ore.png differ diff --git a/Mine2d/assets/blocks/platinum-ore.png b/Mine2d/assets/blocks/platinum-ore.png new file mode 100644 index 0000000..1ef5181 Binary files /dev/null and b/Mine2d/assets/blocks/platinum-ore.png differ diff --git a/Mine2d/assets/blocks/silver-ore.png b/Mine2d/assets/blocks/silver-ore.png new file mode 100644 index 0000000..35f07ba Binary files /dev/null and b/Mine2d/assets/blocks/silver-ore.png differ diff --git a/Mine2d/assets/blocks/tine-ore.png b/Mine2d/assets/blocks/tine-ore.png new file mode 100644 index 0000000..f317747 Binary files /dev/null and b/Mine2d/assets/blocks/tine-ore.png differ diff --git a/Mine2d/assets/blocks/tungsten-ore.png b/Mine2d/assets/blocks/tungsten-ore.png new file mode 100644 index 0000000..2c09c51 Binary files /dev/null and b/Mine2d/assets/blocks/tungsten-ore.png differ diff --git a/Mine2d/assets/blocks/uranium-ore.png b/Mine2d/assets/blocks/uranium-ore.png new file mode 100644 index 0000000..27eef8a Binary files /dev/null and b/Mine2d/assets/blocks/uranium-ore.png differ diff --git a/Mine2d/assets/blocks/zinc-ore.png b/Mine2d/assets/blocks/zinc-ore.png new file mode 100644 index 0000000..7d79182 Binary files /dev/null and b/Mine2d/assets/blocks/zinc-ore.png differ diff --git a/Mine2d/assets/character/character.aseprite b/Mine2d/assets/character/character.aseprite new file mode 100644 index 0000000..e27eafe Binary files /dev/null and b/Mine2d/assets/character/character.aseprite differ diff --git a/Mine2d/assets/character/character.png b/Mine2d/assets/character/character.png new file mode 100644 index 0000000..0a4900d Binary files /dev/null and b/Mine2d/assets/character/character.png differ diff --git a/Mine2d/assets/items/diamond.png b/Mine2d/assets/items/diamond.png new file mode 100644 index 0000000..bc99a1f Binary files /dev/null and b/Mine2d/assets/items/diamond.png differ diff --git a/Mine2d/assets/items/raw-cobalt.png b/Mine2d/assets/items/raw-cobalt.png new file mode 100644 index 0000000..d959c9d Binary files /dev/null and b/Mine2d/assets/items/raw-cobalt.png differ diff --git a/Mine2d/assets/items/raw-copper.png b/Mine2d/assets/items/raw-copper.png new file mode 100644 index 0000000..8d82705 Binary files /dev/null and b/Mine2d/assets/items/raw-copper.png differ diff --git a/Mine2d/assets/items/raw-gold.png b/Mine2d/assets/items/raw-gold.png new file mode 100644 index 0000000..cf1c62c Binary files /dev/null and b/Mine2d/assets/items/raw-gold.png differ diff --git a/Mine2d/assets/items/raw-iron.png b/Mine2d/assets/items/raw-iron.png new file mode 100644 index 0000000..589f665 Binary files /dev/null and b/Mine2d/assets/items/raw-iron.png differ diff --git a/Mine2d/assets/items/raw-lead.png b/Mine2d/assets/items/raw-lead.png new file mode 100644 index 0000000..4b35437 Binary files /dev/null and b/Mine2d/assets/items/raw-lead.png differ diff --git a/Mine2d/assets/items/raw-platinum.png b/Mine2d/assets/items/raw-platinum.png new file mode 100644 index 0000000..e473946 Binary files /dev/null and b/Mine2d/assets/items/raw-platinum.png differ diff --git a/Mine2d/assets/items/raw-silver.png b/Mine2d/assets/items/raw-silver.png new file mode 100644 index 0000000..9713e9b Binary files /dev/null and b/Mine2d/assets/items/raw-silver.png differ diff --git a/Mine2d/assets/items/raw-tin.png b/Mine2d/assets/items/raw-tin.png new file mode 100644 index 0000000..4789d0d Binary files /dev/null and b/Mine2d/assets/items/raw-tin.png differ diff --git a/Mine2d/assets/items/raw-tungsten.png b/Mine2d/assets/items/raw-tungsten.png new file mode 100644 index 0000000..c5e47a4 Binary files /dev/null and b/Mine2d/assets/items/raw-tungsten.png differ diff --git a/Mine2d/assets/items/raw-uranium.png b/Mine2d/assets/items/raw-uranium.png new file mode 100644 index 0000000..1ea3103 Binary files /dev/null and b/Mine2d/assets/items/raw-uranium.png differ diff --git a/Mine2d/assets/items/raw-zinc.png b/Mine2d/assets/items/raw-zinc.png new file mode 100644 index 0000000..0fb3b87 Binary files /dev/null and b/Mine2d/assets/items/raw-zinc.png differ diff --git a/Mine2d/game/core/PlayerEntity.cs b/Mine2d/game/core/PlayerEntity.cs index b7070d6..340871a 100644 --- a/Mine2d/game/core/PlayerEntity.cs +++ b/Mine2d/game/core/PlayerEntity.cs @@ -41,8 +41,6 @@ public class PlayerEntity { X = inputState.GetAxis(InputAxis.Horizontal) * movement.Speed.X }; - Console.WriteLine(movement.IsGrounded); - Console.WriteLine(movement.CurrentVelocity); player.Position += movement.CurrentVelocity; } diff --git a/Mine2d/game/core/world/WorldGenerator.cs b/Mine2d/game/core/world/WorldGenerator.cs new file mode 100644 index 0000000..2f2a4c0 --- /dev/null +++ b/Mine2d/game/core/world/WorldGenerator.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Mine2d.game.core.tiles; + +namespace Mine2d.game.core.world; + +public struct GenerationSettings { + public int xOffset { get; set; } + public int yOffset { get; set; } + public Tiles tile { get; set; } + + public int GetWeight(int height) { + return (int)((-Math.Pow(height - this.xOffset, 2)*0.01) + this.yOffset); + } +} + +public class WorldGenerator +{ + List settings = new (); + + public WorldGenerator() { + this.settings.Add(new GenerationSettings { + xOffset = 50, + yOffset = 16, + tile = Tiles.Stone + }); + } +} \ No newline at end of file diff --git a/Mine2d/game/frontend/renderer/PlayerRenderer.cs b/Mine2d/game/frontend/renderer/PlayerRenderer.cs index 2f8209d..49018cf 100644 --- a/Mine2d/game/frontend/renderer/PlayerRenderer.cs +++ b/Mine2d/game/frontend/renderer/PlayerRenderer.cs @@ -4,11 +4,18 @@ namespace Mine2d.game.frontend.renderer; public class PlayerRenderer : IRenderer { + private IntPtr playerTexture; + public void Render() { + if(this.playerTexture == IntPtr.Zero) + { + this.playerTexture = Context.Get().TextureFactory.LoadTexture("character.character"); + } var ctx = Context.Get(); var camera = ctx.FrontendGameState.Camera; var scale = ctx.FrontendGameState.Settings.GameScale; + var (width, height) = ctx.Window.GetSize(); foreach (var player in ctx.GameState.Players) { if (player.Name == ctx.FrontendGameState.PlayerName) @@ -20,11 +27,18 @@ public class PlayerRenderer : IRenderer ctx.Renderer.SetColor(255, 0, 0); } - ctx.Renderer.DrawRect( - (player.Position.X - (int)camera.Position.X) * scale, - (player.Position.Y - (int)camera.Position.Y) * scale - 28 * scale, - 14 * scale, - 28 * scale + // ctx.Renderer.DrawRect( + // (player.Position.X - (int)camera.Position.X) * scale, + // (player.Position.Y - (int)camera.Position.Y) * scale - 28 * scale, + // 14 * scale, + // 28 * scale + // ); + ctx.Renderer.DrawTexture( + this.playerTexture, + width / 2, + (height / 2) - (31 * scale), + 16 * scale, + 32 * scale ); } } diff --git a/Mine2d/ores.md b/Mine2d/ores.md new file mode 100644 index 0000000..e9f7076 --- /dev/null +++ b/Mine2d/ores.md @@ -0,0 +1,20 @@ +- Iron ore: #A9A9A9 +- Copper ore: #B87333 +- Tin ore: #668080 +- Silver ore: #C0C0C0 +- Gold ore: #FFD700 +- Lead ore: #A9A9A9 +- Nickel ore: #A8A8A8 +- Platinum ore: #E5E4E2 +- Cobalt ore: #0047AB +- Zinc ore: #A9A9A9 +- Tungsten ore: #BFBFBF +- Uranium ore: #00FF00 +- Diamond ore: #B9F2FF +- Emerald ore: #50C878 +- Ruby ore: #E0115F +- Mythril ore: #C5C9C7 +- Adamantine ore: #B5A642 +- Orichalcum ore: #90713D +- Celestite ore: #5DADE2 +- Aetherium ore: #00FFFF \ No newline at end of file