RecentRunner/CollectorMono
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Made lucas the Main character and also added collision

Browse Source
This commit is contained in:
Solargale
2020-06-25 00:45:34 -06:00
parent 86cc05f0d7
commit 944f0ff712
12 changed files with 167 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Collector/src/Dimension/Autotiling.cs Normal file
View File

@@ -0,0 +1,7 @@
namespace Collector.Character
{
public class Autotiling
{
}
}

43
Collector/src/Dimension/Chunks.cs
View File

@@ -5,6 +5,8 @@ using System.Collections.Generic;
using Collector.ThirdPartyCode;
using Humper;
using Microsoft.Xna.Framework;
using MonoGame.Extended;
using Collision = Collector.Character.Collision;
namespace Collector.Dimension
{
@@ -13,7 +15,8 @@ namespace Collector.Dimension
public static Dictionary<Tuple<int, int, int>, Blocks> LoadedChunks { get; } = new Dictionary<Tuple<int, int, int>, Blocks>();
private static readonly Dictionary<Tuple<int, int, int>, Blocks> SavedChunks = new Dictionary<Tuple<int, int, int>, Blocks>();
private static readonly Dictionary<Tuple<int, int>, Collision> savedCollisions = new Dictionary<Tuple<int, int>, Collision>();
public static readonly Dictionary<Tuple<int,int>, Collision> loadedCollisions = new Dictionary<Tuple<int, int>, Collision>();
public static readonly Dictionary<Tuple<int, int>, Collision> loadedCollisions = new Dictionary<Tuple<int, int>, Collision>();
public static readonly List<Blocks> Impassable = new List<Blocks>();
private static readonly OpenSimplexNoise Gen1 = new OpenSimplexNoise(IRestrictions.Seed+ 1);
@@ -32,8 +35,8 @@ namespace Collector.Dimension
var tuple = new Tuple<int, int, int>(x, y, z);
var pair = new Tuple<int, int>(x, y);
loadedCollisions[pair] = new Collision(x,y,IRestrictions.TileSize,false);
savedCollisions[pair] = new Collision(x,y,IRestrictions.TileSize,false);
loadedCollisions[pair] = new Collision(x,y,IRestrictions.TileSize);
savedCollisions[pair] = new Collision(x,y,IRestrictions.TileSize);
LoadedChunks[tuple] = name;
SavedChunks[tuple] = name;
}
@@ -55,16 +58,16 @@ namespace Collector.Dimension
if (!LoadedChunks.ContainsKey(tuple)) return;
if (LoadedChunks[tuple].Equals(Blocks.BlockAir)) return;
loadedCollisions[pair] = null;
savedCollisions[pair] = null;
loadedCollisions.Remove(pair);
savedCollisions.Remove(pair);
LoadedChunks[tuple] = Blocks.BlockAir;
SavedChunks[tuple] = Blocks.BlockAir;
}
public static void UngenerateChunk(int x, int y) {
var startX = x << IRestrictions.ChunkShift;
var startY = y << IRestrictions.ChunkShift;
public static void UngenerateChunk(float x, float y) {
var startX = (int)x << IRestrictions.ChunkShift;
var startY = (int)y << IRestrictions.ChunkShift;
var endX = startX + IRestrictions.ChunkSize;
var endY = startY + IRestrictions.ChunkSize;
@@ -83,9 +86,9 @@ namespace Collector.Dimension
}
}
public static void GenerateChunk(int x, int y) {
var startX = x << IRestrictions.ChunkShift;
var startY = y << IRestrictions.ChunkShift;
public static void GenerateChunk(float x, float y) {
var startX = (int)x << IRestrictions.ChunkShift;
var startY = (int)y << IRestrictions.ChunkShift;
var endX = startX + IRestrictions.ChunkSize;
var endY = startY + IRestrictions.ChunkSize;
@@ -97,8 +100,16 @@ namespace Collector.Dimension
LoadedChunks.Add(triple,SavedChunks[triple]);
}
else {
LoadedChunks.Add(triple, GetTerrain(i, j));
SavedChunks.Add(triple, GetTerrain(i,j));
var terrain = GetTerrain(i, j);
var pair = new Tuple<int, int>(i, j);
if (Impassable.Contains(terrain))
{
loadedCollisions[pair] = new Collision(i,j,IRestrictions.TileSize);
savedCollisions[pair] = new Collision(i,j,IRestrictions.TileSize);
}
LoadedChunks.Add(triple, terrain);
SavedChunks.Add(triple, terrain);
}
}
}
@@ -147,7 +158,7 @@ namespace Collector.Dimension
return GetBiomeBlock(moisture, elevation);
}
private static Blocks GetBiomeBlock(double moisture, double elevation) {
var biome = GetBiome(moisture, elevation);
if (biome.Equals("Tundra")) return Blocks.BlockSnow;
@@ -196,8 +207,8 @@ namespace Collector.Dimension
return moisture < 0.66 ? "TropicalSeasonalForest" : "TropicalRainForest";
}
public static bool IsEmpty(int x, int y){
return !LoadedChunks.ContainsKey(new Tuple<int,int,int>(x * 8, y * 8,0));
public static bool IsEmpty(float x, float y){
return !LoadedChunks.ContainsKey(new Tuple<int,int,int>((int)x * 8, (int)y * 8,0));
}
}
}

18
Collector/src/Dimension/Collision.cs
View File

@@ -1,18 +0,0 @@
using Microsoft.Xna.Framework;
namespace Collector.Dimension
{
public class Collision
{
private readonly int _tileWidth;
private bool _entity;
public Rectangle Rectangle { get; private set; }
public Collision(int x, int y,int tileWidth, bool entity)
{
_entity = entity;
_tileWidth = tileWidth;
Rectangle = new Rectangle(x,y,tileWidth,tileWidth);
}
}
}

18
Collector/src/Dimension/Inventory.cs
View File

@@ -1,18 +0,0 @@
using System.Collections.Generic;
using Collector.Dimension;
public class Inventory {
private LinkedList<ItemStack> inventory = new LinkedList<ItemStack>();
public LinkedList<ItemStack> GetInventory() {
return inventory;
}
public void SetInventory(LinkedList<ItemStack> inventory) {
this.inventory = inventory;
}
public void RemoveItem(ItemStack itemStack){
inventory.Remove(itemStack);
}
}

12
Collector/src/Dimension/World.cs
View File

@@ -4,14 +4,14 @@ using Collector.Character;
namespace Collector.Dimension
{
public static class World {
private static void GenerateWorld(int x, int y)
private static void GenerateWorld(float x, float y)
{
if (Chunks.IsEmpty(x, y)) {
Chunks.GenerateChunk(x, y);
}
}
private static void UngenerateWorld(int x, int y) {
private static void UngenerateWorld(float x, float y) {
if (!Chunks.IsEmpty(x, y)) {
Chunks.UngenerateChunk(x, y);
}
@@ -34,22 +34,22 @@ namespace Collector.Dimension
//Down
UngenerateWorld(
Player.X / (IRestrictions.SuperChunkSize * IRestrictions.ChunkSize)+i,
(Player.Y / (IRestrictions.SuperChunkSize * IRestrictions.ChunkSize))+IRestrictions.RenderDistance
Player.Y / (IRestrictions.SuperChunkSize * IRestrictions.ChunkSize)+IRestrictions.RenderDistance
);
//Up
UngenerateWorld(
Player.X / (IRestrictions.SuperChunkSize * IRestrictions.ChunkSize)+i,
(Player.Y / (IRestrictions.SuperChunkSize * IRestrictions.ChunkSize))-IRestrictions.RenderDistance
Player.Y / (IRestrictions.SuperChunkSize * IRestrictions.ChunkSize)-IRestrictions.RenderDistance
);
//Right
UngenerateWorld(
Player.X / (IRestrictions.SuperChunkSize * IRestrictions.ChunkSize)-IRestrictions.RenderDistance,
(Player.Y / (IRestrictions.SuperChunkSize * IRestrictions.ChunkSize))+i
Player.Y / (IRestrictions.SuperChunkSize * IRestrictions.ChunkSize)+i
);
//Left
UngenerateWorld(
Player.X / (IRestrictions.SuperChunkSize * IRestrictions.ChunkSize)+IRestrictions.RenderDistance,
(Player.Y / (IRestrictions.SuperChunkSize * IRestrictions.ChunkSize))+i
Player.Y / (IRestrictions.SuperChunkSize * IRestrictions.ChunkSize)+i
);
}
}

8
Collector/src/Dimension/WorldRenderer.cs
View File

@@ -18,6 +18,9 @@ namespace Collector.Dimension
_inputController = inputController;
_spriteBatch = spriteBatch;
_main = main;
Chunks.Impassable.Add(Blocks.BlockWater);
Chunks.Impassable.Add(Blocks.BlockRoof);
Chunks.Impassable.Add(Blocks.BlockWall);
}
private static void DrawWorld(SpriteBatch batch, int layer)
@@ -40,10 +43,11 @@ namespace Collector.Dimension
{
//Higher means draws in a lower layer
DrawWorld(_spriteBatch,0);
_playerMouse.Draw();
DrawWorld(_spriteBatch,1);
_inputController.Draw();
_inputController.PlayerInput(_main,_playerMouse,gameTime);
DrawWorld(_spriteBatch,2);
_inputController.PlayerInput(_main,gameTime);
//DrawWorld(_spriteBatch,2);
}
}
}