update versions

PodeCaradox · Jul 31, 2024 · d794d6b · d794d6b
1 parent 874ad8a
commit d794d6b
Show file tree

Hide file tree

Showing 54 changed files with 1,821 additions and 93 deletions.
diff --git a/src/assets/brushes/building_brushes.data b/src/assets/brushes/building_brushes.data
@@ -1,4 +1,40 @@
-{
+{	
+	"gate_new_brush": {
+        "BrushEntities": [
+            {
+                "Name": "gate_new",
+                "RandomFactor": 1
+            }
+        ],
+        "BrushType": "BuildingBrush"
+    },	
+	"tower_round_brush": {
+        "BrushEntities": [
+            {
+                "Name": "tower_round",
+                "RandomFactor": 1
+            }
+        ],
+        "BrushType": "BuildingBrush"
+    },	
+	"tower_small_new_brush": {
+        "BrushEntities": [
+            {
+                "Name": "tower_small_new",
+                "RandomFactor": 1
+            }
+        ],
+        "BrushType": "BuildingBrush"
+    },
+	"new_tower_brush": {
+        "BrushEntities": [
+            {
+                "Name": "new_tower",
+                "RandomFactor": 1
+            }
+        ],
+        "BrushType": "BuildingBrush"
+    },
     "apple_farm_brush": {
         "BrushEntities": [
             {

diff --git a/src/assets/brushes/object_brushes.data b/src/assets/brushes/object_brushes.data
@@ -4,6 +4,18 @@
             {
                 "Name": "tree_0",
                 "RandomFactor": 1
+            },
+			{
+                "Name": "tree_1",
+                "RandomFactor": 1
+            },
+			{
+                "Name": "tree_2",
+                "RandomFactor": 1
+            },
+			{
+                "Name": "tree_3",
+                "RandomFactor": 1
             }
         ],
         "BrushType": "StaticObjectBrush"

diff --git a/src/assets/game_ui/game_menu.interface b/src/assets/game_ui/game_menu.interface
@@ -458,20 +458,20 @@
                         "type": "CustomRectangle",
                         "Rectangle": {
                             "x": 1,
-                            "y": 65,
+                            "y": 0,
                             "width": 608,
                             "height": 36
                         }
                     },
                     "Position": {
                         "x": -304,
-                        "y": -101
+                        "y": -37
                     },
                     "ImageSource": {
                         "x": 0,
-                        "y": 0,
+                        "y": 64,
                         "width": 610,
-                        "height": 101
+                        "height": 37
                     }
                 }, {
                     "EventType": "OpenSubMenu",
@@ -813,7 +813,6 @@
                 }
             ]
         },
-
 		"LandSubMenu": {
             "Alignment": "RightTop",
             "MenuItems": [{
@@ -1213,7 +1212,13 @@
                     "Position": {
                         "x": -304,
                         "y": -101
-                    }
+                    },
+					"ImageSource": {
+                        "x": 0,
+                        "y": 0,
+                        "width": 610,
+                        "height": 64
+					}
                 }, {
                     "EventType": "SelectBrush",
                     "EventName": "apple_farm_brush",
@@ -1346,7 +1351,13 @@
                     "Position": {
                         "x": -304,
                         "y": -101
-                    }
+                    },
+					"ImageSource": {
+                        "x": 0,
+                        "y": 0,
+                        "width": 610,
+                        "height": 64
+					}
                 }, {
                     "EventType": "SelectBrush",
                     "EventName": "brewery_brush",
@@ -1435,7 +1446,13 @@
                     "Position": {
                         "x": -304,
                         "y": -101
-                    }
+                    },
+					"ImageSource": {
+                        "x": 0,
+                        "y": 0,
+                        "width": 610,
+                        "height": 64
+					}
                 }, {
                     "EventType": "SelectBrush",
                     "EventName": "wood_cutter_brush",
@@ -1502,7 +1519,13 @@
                     "Position": {
                         "x": -304,
                         "y": -101
-                    }
+                    },
+					"ImageSource": {
+                        "x": 0,
+                        "y": 0,
+                        "width": 610,
+                        "height": 64
+					}
                 }, {
                     "EventType": "SelectBrush",
                     "EventName": "black_smith_brush",
@@ -1613,7 +1636,13 @@
                     "Position": {
                         "x": -304,
                         "y": -101
-                    }
+                    },
+					"ImageSource": {
+                        "x": 0,
+                        "y": 0,
+                        "width": 610,
+                        "height": 64
+					}
                 }, {
                     "EventType": "SelectBrush",
                     "EventName": "house_1_brush",
@@ -1790,7 +1819,13 @@
                     "Position": {
                         "x": -304,
                         "y": -101
-                    }
+                    },
+					"ImageSource": {
+                        "x": 0,
+                        "y": 0,
+                        "width": 610,
+                        "height": 64
+					}
                 }, {
                     "EventType": "SelectBrush",
                     "EventName": "granary_brush",
@@ -1901,7 +1936,13 @@
                     "Position": {
                         "x": -304,
                         "y": -101
-                    }
+                    },
+					"ImageSource": {
+                        "x": 0,
+                        "y": 0,
+                        "width": 610,
+                        "height": 64
+					}
                 }, {
                     "EventType": "SelectBrush",
                     "EventName": "church_small_brush",
@@ -1990,7 +2031,13 @@
                     "Position": {
                         "x": -304,
                         "y": -101
-                    }
+                    },
+					"ImageSource": {
+                        "x": 0,
+                        "y": 0,
+                        "width": 610,
+                        "height": 64
+					}
                 }, {
                     "EventType": "SelectBrush",
                     "EventName": "brush_wall_wooden_0",
@@ -2057,7 +2104,13 @@
                     "Position": {
                         "x": -304,
                         "y": -101
-                    }
+                    },
+					"ImageSource": {
+                        "x": 0,
+                        "y": 0,
+                        "width": 610,
+                        "height": 64
+					}
                 }, {
                     "EventType": "SelectBrush",
                     "EventName": "gate_1_brush",
@@ -2102,6 +2155,28 @@
                         "width": 56,
                         "height": 56
                     }
+                }, {
+                    "EventType": "SelectBrush",
+                    "EventName": "gate_new_brush",
+                    "CollisionObject": {
+                        "type": "CustomRectangle",
+                        "Rectangle": {
+                            "x": 0,
+                            "y": 0,
+                            "width": 56,
+                            "height": 56
+                        }
+                    },
+                    "Position": {
+                        "x": -177,
+                        "y": -96
+                    },
+                    "ImageSource": {
+                        "x": 112,
+                        "y": 581,
+                        "width": 56,
+                        "height": 56
+                    }
                 }
             ]
         },
@@ -2124,7 +2199,13 @@
                     "Position": {
                         "x": -304,
                         "y": -101
-                    }
+                    },
+					"ImageSource": {
+                        "x": 0,
+                        "y": 0,
+                        "width": 610,
+                        "height": 64
+					}
                 }, {
                     "EventType": "SelectBrush",
                     "EventName": "tower_smallc_brush",
@@ -2213,6 +2294,72 @@
                         "width": 56,
                         "height": 56
                     }
+                }, {
+                    "EventType": "SelectBrush",
+                    "EventName": "new_tower_brush",
+                    "CollisionObject": {
+                        "type": "CustomRectangle",
+                        "Rectangle": {
+                            "x": 0,
+                            "y": 0,
+                            "width": 56,
+                            "height": 56
+                        }
+                    },
+                    "Position": {
+                        "x": -57,
+                        "y": -96
+                    },
+                    "ImageSource": {
+                        "x": 224,
+                        "y": 637,
+                        "width": 56,
+                        "height": 56
+                    }
+				}, {
+                    "EventType": "SelectBrush",
+                    "EventName": "tower_round_brush",
+                    "CollisionObject": {
+                        "type": "CustomRectangle",
+                        "Rectangle": {
+                            "x": 0,
+                            "y": 0,
+                            "width": 56,
+                            "height": 56
+                        }
+                    },
+                    "Position": {
+                        "x": 17,
+                        "y": -96
+                    },
+                    "ImageSource": {
+                        "x": 280,
+                        "y": 637,
+                        "width": 56,
+                        "height": 56
+                    }
+				}, {
+                    "EventType": "SelectBrush",
+                    "EventName": "tower_small_new_brush",
+                    "CollisionObject": {
+                        "type": "CustomRectangle",
+                        "Rectangle": {
+                            "x": 0,
+                            "y": 0,
+                            "width": 56,
+                            "height": 56
+                        }
+                    },
+                    "Position": {
+                        "x": 77,
+                        "y": -96
+                    },
+                    "ImageSource": {
+                        "x": 336,
+                        "y": 637,
+                        "width": 56,
+                        "height": 56
+                    }
                 }
             ]
         },
@@ -2235,7 +2382,13 @@
                     "Position": {
                         "x": -304,
                         "y": -101
-                    }
+                    },
+					"ImageSource": {
+                        "x": 0,
+                        "y": 0,
+                        "width": 610,
+                        "height": 64
+					}
                 }, {
                     "EventType": "SelectBrush",
                     "EventName": "armory_brush",

diff --git a/src/assets/images/images.data b/src/assets/images/images.data
@@ -38,6 +38,11 @@
    "Path":"images\\world\\objects\\trees",
    "DataType":"png",
    "CsType":"environment"
+ },
+  "tree_trunk":{
+   "Path":"images\\world\\objects\\trees",
+   "DataType":"png",
+   "CsType":"environment"
  },
   "decorativ":{
    "Path":"images\\world\\objects\\decorative",

diff --git a/src/assets/images/ui/game_interface.png b/src/assets/images/ui/game_interface.png
diff --git a/src/assets/images/world/buildings/objects_on_top/objects_on_top3.png b/src/assets/images/world/buildings/objects_on_top/objects_on_top3.png
diff --git a/src/assets/images/world/buildings/objects_tiled/objects_tiled1.png b/src/assets/images/world/buildings/objects_tiled/objects_tiled1.png
diff --git a/src/assets/images/world/elevation/wall_elevation.png b/src/assets/images/world/elevation/wall_elevation.png
diff --git a/src/assets/images/world/objects/trees/tree.png b/src/assets/images/world/objects/trees/tree.png
diff --git a/src/assets/images/world/objects/trees/tree_trunk.png b/src/assets/images/world/objects/trees/tree_trunk.png
diff --git a/src/assets/images/world/terrain/land.png b/src/assets/images/world/terrain/land.png
diff --git a/src/assets/mipmaps/entities/animals/color_table1_1024.png b/src/assets/mipmaps/entities/animals/color_table1_1024.png
diff --git a/src/assets/mipmaps/entities/animals/color_table1_512.png b/src/assets/mipmaps/entities/animals/color_table1_512.png
diff --git a/src/assets/mipmaps/entities/animals/color_table_1024.png b/src/assets/mipmaps/entities/animals/color_table_1024.png
diff --git a/src/assets/mipmaps/entities/animals/color_table_512.png b/src/assets/mipmaps/entities/animals/color_table_512.png
diff --git a/src/assets/mipmaps/ui/game_interface_1024.png b/src/assets/mipmaps/ui/game_interface_1024.png
diff --git a/src/assets/mipmaps/ui/game_interface_512.png b/src/assets/mipmaps/ui/game_interface_512.png
diff --git a/src/assets/mipmaps/world/buildings/objects_on_top/objects_on_top1_1024.png b/src/assets/mipmaps/world/buildings/objects_on_top/objects_on_top1_1024.png
diff --git a/src/assets/mipmaps/world/buildings/objects_on_top/objects_on_top1_512.png b/src/assets/mipmaps/world/buildings/objects_on_top/objects_on_top1_512.png
diff --git a/src/assets/mipmaps/world/buildings/objects_on_top/objects_on_top2_1024.png b/src/assets/mipmaps/world/buildings/objects_on_top/objects_on_top2_1024.png
diff --git a/src/assets/mipmaps/world/buildings/objects_on_top/objects_on_top2_512.png b/src/assets/mipmaps/world/buildings/objects_on_top/objects_on_top2_512.png
diff --git a/src/assets/mipmaps/world/buildings/objects_on_top/objects_on_top3_1024.png b/src/assets/mipmaps/world/buildings/objects_on_top/objects_on_top3_1024.png
diff --git a/src/assets/mipmaps/world/buildings/objects_on_top/objects_on_top3_512.png b/src/assets/mipmaps/world/buildings/objects_on_top/objects_on_top3_512.png
diff --git a/src/assets/mipmaps/world/buildings/objects_tiled/objects_tiled1_1024.png b/src/assets/mipmaps/world/buildings/objects_tiled/objects_tiled1_1024.png
diff --git a/src/assets/mipmaps/world/buildings/objects_tiled/objects_tiled1_512.png b/src/assets/mipmaps/world/buildings/objects_tiled/objects_tiled1_512.png
diff --git a/src/assets/mipmaps/world/debugging/debug_tiles_1024.png b/src/assets/mipmaps/world/debugging/debug_tiles_1024.png
diff --git a/src/assets/mipmaps/world/debugging/debug_tiles_512.png b/src/assets/mipmaps/world/debugging/debug_tiles_512.png
diff --git a/src/assets/mipmaps/world/effects/world_effects_1024.png b/src/assets/mipmaps/world/effects/world_effects_1024.png
diff --git a/src/assets/mipmaps/world/effects/world_effects_512.png b/src/assets/mipmaps/world/effects/world_effects_512.png
diff --git a/src/assets/mipmaps/world/elevation/land_elevation_1024.png b/src/assets/mipmaps/world/elevation/land_elevation_1024.png
diff --git a/src/assets/mipmaps/world/elevation/land_elevation_512.png b/src/assets/mipmaps/world/elevation/land_elevation_512.png
diff --git a/src/assets/mipmaps/world/elevation/wall_elevation_1024.png b/src/assets/mipmaps/world/elevation/wall_elevation_1024.png
diff --git a/src/assets/mipmaps/world/elevation/wall_elevation_512.png b/src/assets/mipmaps/world/elevation/wall_elevation_512.png
diff --git a/src/assets/mipmaps/world/elevation/water_elevation_1024.png b/src/assets/mipmaps/world/elevation/water_elevation_1024.png
diff --git a/src/assets/mipmaps/world/elevation/water_elevation_512.png b/src/assets/mipmaps/world/elevation/water_elevation_512.png
diff --git a/src/assets/mipmaps/world/objects/decorative/decorativ_1024.png b/src/assets/mipmaps/world/objects/decorative/decorativ_1024.png
diff --git a/src/assets/mipmaps/world/objects/decorative/decorativ_512.png b/src/assets/mipmaps/world/objects/decorative/decorativ_512.png
diff --git a/src/assets/mipmaps/world/objects/trees/tree_1024.png b/src/assets/mipmaps/world/objects/trees/tree_1024.png
diff --git a/src/assets/mipmaps/world/objects/trees/tree_512.png b/src/assets/mipmaps/world/objects/trees/tree_512.png
diff --git a/src/assets/mipmaps/world/objects/trees/tree_trunk_1024.png b/src/assets/mipmaps/world/objects/trees/tree_trunk_1024.png
diff --git a/src/assets/mipmaps/world/objects/trees/tree_trunk_512.png b/src/assets/mipmaps/world/objects/trees/tree_trunk_512.png
diff --git a/src/assets/mipmaps/world/terrain/land_1024.png b/src/assets/mipmaps/world/terrain/land_1024.png
diff --git a/src/assets/mipmaps/world/terrain/land_512.png b/src/assets/mipmaps/world/terrain/land_512.png
diff --git a/src/assets/mipmaps/world/terrain/wall_1024.png b/src/assets/mipmaps/world/terrain/wall_1024.png
diff --git a/src/assets/mipmaps/world/terrain/wall_512.png b/src/assets/mipmaps/world/terrain/wall_512.png
diff --git a/src/assets/mipmaps/world/terrain/water_1024.png b/src/assets/mipmaps/world/terrain/water_1024.png
diff --git a/src/assets/mipmaps/world/terrain/water_512.png b/src/assets/mipmaps/world/terrain/water_512.png
diff --git a/src/assets/shaders/render_world.wgsl b/src/assets/shaders/render_world.wgsl
@@ -13,9 +13,9 @@ struct SingleInstance
 //4 * 4 = 16 bytes
 struct TileData
 {
-	TileIndex: u32,
+	TileIndex: u32, // could be 24 bits also 8 free
 	Color: u32,//Shadow Color
-	MiniMapColor: u32,
+	MiniMapColor: u32, // only need rgb 8 bits free
 	Elevation: f32,
 };