Terrain generation

OpenPolytopia.Common/City.cs

@@ -11,6 +11,15 @@ namespace OpenPolytopia.Common;
 public class CityManager(Grid grid) {
   private readonly List<uint> _cities = [];
 
+  /// <summary>
+  /// Grid indexes of the registered cities
+  /// </summary>
+  /// <remarks>
+  /// The city with id <c>i</c> is at position <c>i - 1</c>; don't modify this list because the
+  /// ids are positions in it, use <see cref="RegisterCity(uint)"/> to add a city
+  /// </remarks>
+  public IReadOnlyList<uint> Cities => _cities;
+
   /// <summary>
   /// Access to the <see cref="CityData"/>
   /// </summary>

OpenPolytopia.Common/EmbeddedResources.cs

@@ -1,8 +1,18 @@
 namespace OpenPolytopia.Common;
 
 using System.Reflection;
+using System.Text.Json;
+using System.Text.Json.Serialization.Metadata;
+using System.Text.Unicode;
 
 public static class EmbeddedResources {
+  // serialization conventions shared by all the json resources
+  private static readonly JsonSerializerOptions _jsonOptions = new() {
+    Encoder = System.Text.Encodings.Web.JavaScriptEncoder.Create(UnicodeRanges.All),
+    TypeInfoResolver = JsonTypeInfoResolver.Combine(TribeGenerationContext.Default, TroopGenerationContext.Default),
+    PropertyNamingPolicy = JsonNamingPolicy.SnakeCaseLower
+  };
+
   /// <summary>
   /// Get the troops data from the json file
   /// </summary>
@@ -13,6 +23,20 @@ public static class EmbeddedResources {
   /// </summary>
   public static string TribesData => GetResource("OpenPolytopia.Common.resources.tribes.json");
 
+  /// <summary>
+  /// Deserializes the troops from the embedded json file
+  /// </summary>
+  /// <returns>the troops data, or null if the json is empty</returns>
+  public static TroopsSerializedData? LoadTroops() =>
+    JsonSerializer.Deserialize<TroopsSerializedData>(TroopsData, _jsonOptions);
+
+  /// <summary>
+  /// Deserializes the tribes from the embedded json file
+  /// </summary>
+  /// <returns>the tribes data, or null if the json is empty</returns>
+  public static TribesSerializedData? LoadTribes() =>
+    JsonSerializer.Deserialize<TribesSerializedData>(TribesData, _jsonOptions);
+
   /// <summary>
   /// Returns the content of an embedded resource
   /// </summary>

OpenPolytopia.Common/Extensions.cs

@@ -44,7 +44,7 @@ public static class ULongExtensions {
   /// <param name="position">the position where to set bits starting from the right</param>
   [MethodImpl(MethodImplOptions.AggressiveInlining)]
   public static void SetBits(this ref ulong value, ulong data, ulong bits, int position) =>
-    value = value.ClearBits(bits, position) | (data << position);
+    value = value.ClearBits(bits, position) | ((data & bits) << position);
 
   /// <summary>
   /// Get the bits
@@ -77,7 +77,7 @@ public static class UIntExtensions {
   /// <param name="position">the position where to set bits starting from the right</param>
   [MethodImpl(MethodImplOptions.AggressiveInlining)]
   public static void SetBits(this ref uint value, uint data, uint bits, int position) =>
-    value = value.ClearBits(bits, position) | (data << position);
+    value = value.ClearBits(bits, position) | ((data & bits) << position);
 
   /// <summary>
   /// Get the bits
@@ -110,7 +110,7 @@ public static class IntExtensions {
   /// <param name="position">the position where to set bits starting from the right</param>
   [MethodImpl(MethodImplOptions.AggressiveInlining)]
   public static void SetBits(this ref int value, int data, int bits, int position) =>
-    value = value.ClearBits(bits, position) | (data << position);
+    value = value.ClearBits(bits, position) | ((data & bits) << position);
 
   /// <summary>
   /// Get the bits

OpenPolytopia.Common/Grid.cs

@@ -64,6 +64,19 @@ public Tile this[uint index] {
   [MethodImpl(MethodImplOptions.AggressiveInlining)]
   public uint GridPositionToIndex(int x, int y) => (uint)((y * size) + x);
 
+  [MethodImpl(MethodImplOptions.AggressiveInlining)]
+  public Vector2I IndexToGridPosition(uint index) {
+    var x = index % size;
+    var y = index / size;
+    return new Vector2I((int)x, (int)y);
+  }
+
+  [MethodImpl(MethodImplOptions.AggressiveInlining)]
+  public void IndexToGridPosition(uint index, out uint x, out uint y) {
+    x = index % size;
+    y = index / size;
+  }
+
   /// <summary>
   /// Modifies a given tile
   /// </summary>
@@ -251,7 +264,12 @@ public bool Ruin {
   /// <summary>
   /// The type of the tile
   /// </summary>
-  public TileKind Kind => (TileKind)_inner.GetBits(THREE_BITS, TILEKIND_POSITION);
+  public TileKind Kind {
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    get => (TileKind)_inner.GetBits(THREE_BITS, TILEKIND_POSITION);
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    set => _inner.SetBits((ulong)value, THREE_BITS, TILEKIND_POSITION);
+  }
 
   /// <summary>
   /// The tile modifier castable to the corresponding enum

OpenPolytopia.Common/Player.cs

@@ -0,0 +1,4 @@
+namespace OpenPolytopia.Common;
+
+public record Player(TribeType Tribe, int Id) {
+}