Fixes tile formulation.

hyper2snyper · Jan 30, 2025 · 21937a4 · 21937a4
1 parent d23c8ce
commit 21937a4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 14 deletions.
diff --git a/Backend/WorldData/Map.cs b/Backend/WorldData/Map.cs
@@ -99,7 +99,7 @@ void LoadTerrain()
                 terrain.heightMax = results.GetFloat(4);
                 terrain.landType = results.GetString(5);
                 if (terrain.landType == "Ocean" && terrain.heightMax > oceanHeightMax) oceanHeightMax = terrain.heightMax;
-                if (terrain.landType == "Highland" && terrain.heightMin < highlandMin) highlandMin = terrain.heightMin;
+                if (terrain.landType == "Mountain" && terrain.heightMin < highlandMin) highlandMin = terrain.heightMin;
                 terrains.Add(terrain);
             }
 
@@ -194,10 +194,12 @@ public void GenerateTiles()
                     {
                         for (int y = 0; y < TILE_SIZE; y++)
                         {
-                            if (tileX * TILE_SIZE + x > MAP_PIXEL_WIDTH) continue;
-                            if (tileY * TILE_SIZE + y > MAP_PIXEL_HEIGHT) continue;
+                            int pixelPosX = (tileX * TILE_SIZE) + x;
+                            int pixelPosY = (tileY * TILE_SIZE) + y;
+							if (pixelPosX > MAP_PIXEL_WIDTH) continue;
+                            if (pixelPosY > MAP_PIXEL_HEIGHT) continue;
 
-                            string landType = terrainMap[x, y].name;
+                            string landType = terrainMap[pixelPosX, pixelPosY].name;
                             if (landTypes.ContainsKey(landType))
                             {
                                 landTypes[landType]++;

diff --git a/Backend/WorldData/Unit.cs b/Backend/WorldData/Unit.cs
@@ -32,14 +32,12 @@ public Unit()
 
         public override void SerializeFields()
         {
-            SerializeField(health);
-            SerializeField("sssssaaaaa");
+
         }
 
         public override void DeserializeFields()
         {
-            health = DeserializeField<int>();
-            string r = DeserializeField<string>();
+
         }
     }
 }
diff --git a/Backend/WorldData/World.cs b/Backend/WorldData/World.cs
@@ -16,12 +16,6 @@ public World()
             ClientCommunicator.RegisterData<Bitmap>("WorldImage", map.worldImage);
             ClientCommunicator.RegisterData<World>("World", map);
 
-            units.Add(new Unit());
-            units.Add(new Unit());
-            units.Add(new Unit());
-            units.Add(new Unit());
-            units.Add(new Unit());
-            units.Add(new Unit());
 
         }
 

diff --git a/LocalData/BackendDatabase.db b/LocalData/BackendDatabase.db