vinzenz/servicepoint-tanks
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

destructible walls

Browse source
This commit is contained in:
Vinzenz Schroeter 2024-04-16 18:55:34 +02:00
parent a0a0762f84
commit dec571d8c1
5 changed files with 72 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

13
TanksServer/GameLogic/CollideBulletsWithMap.cs
View file

@ -4,10 +4,17 @@ internal sealed class CollideBulletsWithMap(BulletManager bullets, MapService ma
{
public Task TickAsync()
{
bullets.RemoveWhere(BulletHitsWall);
bullets.RemoveWhere(TryHitAndDestroyWall);
return Task.CompletedTask;
}
private bool BulletHitsWall(Bullet bullet) =>
map.Current.IsWall(bullet.Position.ToPixelPosition());
private bool TryHitAndDestroyWall(Bullet bullet)
{
var pixel = bullet.Position.ToPixelPosition();
if (!map.Current.IsWall(pixel))
return false;
map.Current.DestroyWallAt(pixel);
return true;
}
}

35
TanksServer/GameLogic/MapService.cs
View file

@ -12,20 +12,25 @@ internal sealed class MapService
public const ushort PixelsPerRow = TilesPerRow * TileSize;
public const ushort PixelsPerColumn = TilesPerColumn * TileSize;
public Map[] All { get; }
private readonly Dictionary<string, bool[,]> _maps = new();
public Map Current { get; set; }
public IEnumerable<string> MapNames => _maps.Keys;
public Map Current { get; private set; }
public MapService()
{
var textMaps = Directory.EnumerateFiles("./assets/maps/", "*.txt").Select(LoadMapString);
var pngMaps = Directory.EnumerateFiles("./assets/maps/", "*.png").Select(LoadMapPng);
foreach (var file in Directory.EnumerateFiles("./assets/maps/", "*.txt"))
LoadMapString(file);
foreach (var file in Directory.EnumerateFiles("./assets/maps/", "*.png"))
LoadMapPng(file);
All = textMaps.Concat(pngMaps).ToArray();
Current = All[Random.Shared.Next(All.Length)];
var chosenMapIndex = Random.Shared.Next(_maps.Count);
var chosenMapName = _maps.Keys.Skip(chosenMapIndex).First();
Current = new Map(chosenMapName, _maps[chosenMapName]);
}
private static Map LoadMapPng(string file)
private void LoadMapPng(string file)
{
using var image = Image.Load<Rgba32>(file);
@ -39,10 +44,10 @@ internal sealed class MapService
for (var x = 0; x < image.Width; x++)
walls[x, y] = image[x, y] == whitePixel;
return new Map(Path.GetFileName(file),walls);
_maps.Add(Path.GetFileName(file), walls);
}
private static Map LoadMapString(string file)
private void LoadMapString(string file)
{
var map = File.ReadAllText(file).ReplaceLineEndings(string.Empty).Trim();
if (map.Length != TilesPerColumn * TilesPerRow)
@ -65,7 +70,15 @@ internal sealed class MapService
}
}
return new Map(Path.GetFileName(file), walls);
_maps.Add(Path.GetFileName(file), walls);
}
public bool TrySwitchTo(string name)
{
if (!_maps.TryGetValue(name, out var mapData))
return false;
Current = new Map(name, mapData);
return true;
}
}
@ -90,4 +103,6 @@ internal sealed class Map(string name, bool[,] walls)
return false;
}
public void DestroyWallAt(PixelPosition pixel) => walls[pixel.X, pixel.Y] = false;
}