diff --git a/Main.tscn b/Main.tscn index 6cab439..5ced615 100644 --- a/Main.tscn +++ b/Main.tscn @@ -1,8 +1,7 @@ -[gd_scene load_steps=26 format=4 uid="uid://5ske2hm55rce"] +[gd_scene load_steps=30 format=4 uid="uid://5ske2hm55rce"] [ext_resource type="PackedScene" uid="uid://n2lpy72tkyc8" path="res://storm/StormManager.tscn" id="1_gcxt1"] [ext_resource type="Script" path="res://main.gd" id="1_pg2kh"] -[ext_resource type="PackedScene" uid="uid://bxctpr0tfqidf" path="res://ui/UI.tscn" id="1_ve2mn"] [ext_resource type="Theme" uid="uid://d035h7upxrw3h" path="res://theme.tres" id="1_xbn5h"] [ext_resource type="TileSet" uid="uid://dhy53lakrlutm" path="res://TIleSet.tres" id="2_68wnv"] [ext_resource type="Script" path="res://Level.gd" id="4_8xbmx"] @@ -14,14 +13,20 @@ [ext_resource type="PackedScene" uid="uid://b22pr3istdhcv" path="res://ui/BuildingMenu.tscn" id="7_hnxcf"] [ext_resource type="Script" path="res://ui_level.gd" id="9_8qp2o"] [ext_resource type="Script" path="res://ui.gd" id="10_vm6py"] +[ext_resource type="Texture2D" uid="uid://cd205j7rs5ph7" path="res://ui/buildingmeny.png" id="11_psgyr"] +[ext_resource type="Texture2D" uid="uid://rtrb5p3o61i4" path="res://ui/essence_icon.png" id="12_2i27n"] [ext_resource type="PackedScene" path="res://Night.tscn" id="13_8fvl0"] +[ext_resource type="Script" path="res://ui/counters.gd" id="13_fqswr"] [ext_resource type="AudioStream" uid="uid://dfxndvkdey800" path="res://light version final(1).wav" id="13_tvksj"] [ext_resource type="Script" path="res://start.gd" id="14_3fkxs"] [ext_resource type="Script" path="res://small_wave.gd" id="14_d8e1g"] +[ext_resource type="Texture2D" uid="uid://dwm8p1koiqee8" path="res://wood.png" id="14_dmibc"] [ext_resource type="AudioStream" uid="uid://dk2thkxy31doi" path="res://heavy version.wav" id="14_frsfx"] +[ext_resource type="Texture2D" uid="uid://ckbq5ipvom580" path="res://stone.png" id="15_scpqp"] [sub_resource type="Animation" id="Animation_ycb31"] resource_name = "start" +length = 2.0 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true @@ -70,6 +75,42 @@ tracks/3/keys = { "update": 0, "values": [Color(1, 1, 1, 1), Color(1, 1, 1, 0)] } +tracks/4/type = "value" +tracks/4/imported = false +tracks/4/enabled = false +tracks/4/path = NodePath("CanvasLayer/UI:position") +tracks/4/interp = 1 +tracks/4/loop_wrap = true +tracks/4/keys = { +"times": PackedFloat32Array(0, 0.933333, 1.7), +"transitions": PackedFloat32Array(-2, -2, -2), +"update": 0, +"values": [Vector2(0, -28.23), Vector2(0, -28.23), Vector2(0, 0)] +} +tracks/5/type = "value" +tracks/5/imported = false +tracks/5/enabled = true +tracks/5/path = NodePath("CanvasLayer/UI/Background/Control:position") +tracks/5/interp = 1 +tracks/5/loop_wrap = true +tracks/5/keys = { +"times": PackedFloat32Array(0, 1.5, 1.53333, 1.56667, 1.6, 1.63333, 1.66667, 1.7, 1.73333, 1.76667, 1.8, 1.83333, 1.86667, 1.9, 1.93333, 1.96667, 2), +"transitions": PackedFloat32Array(-2, -2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1), +"update": 0, +"values": [Vector2(0, -28), Vector2(0, -28), Vector2(0, -28.5265), Vector2(0, -29.629), Vector2(0, -30.5916), Vector2(0, -30.6985), Vector2(0, -29.2339), Vector2(0, -25.4821), Vector2(0, -18.7272), Vector2(0, -9.27276), Vector2(0, -2.51792), Vector2(0, 1.23389), Vector2(0, 2.69845), Vector2(0, 2.59156), Vector2(0, 1.629), Vector2(0, 0.526546), Vector2(0, 0)] +} +tracks/6/type = "value" +tracks/6/imported = false +tracks/6/enabled = true +tracks/6/path = NodePath("CanvasLayer/UI/Background/Control2:position") +tracks/6/interp = 1 +tracks/6/loop_wrap = true +tracks/6/keys = { +"times": PackedFloat32Array(1.16667, 1.2, 1.23333, 1.26667, 1.3, 1.33333, 1.36667, 1.4, 1.43333, 1.46667, 1.5, 1.53333, 1.56667, 1.6, 1.63333, 1.66667), +"transitions": PackedFloat32Array(-2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1), +"update": 0, +"values": [Vector2(0, -28), Vector2(0, -28.5265), Vector2(0, -29.629), Vector2(0, -30.5916), Vector2(0, -30.6985), Vector2(0, -29.2339), Vector2(0, -25.4821), Vector2(0, -18.7272), Vector2(0, -9.27276), Vector2(0, -2.51792), Vector2(0, 1.23389), Vector2(0, 2.69845), Vector2(0, 2.59156), Vector2(0, 1.629), Vector2(0, 0.526546), Vector2(0, 0)] +} [sub_resource type="Animation" id="Animation_gcod0"] length = 0.001 @@ -121,6 +162,30 @@ tracks/3/keys = { "update": 0, "values": [Color(1, 1, 1, 1)] } +tracks/4/type = "value" +tracks/4/imported = false +tracks/4/enabled = true +tracks/4/path = NodePath("CanvasLayer/UI/Background/Control:position") +tracks/4/interp = 1 +tracks/4/loop_wrap = true +tracks/4/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector2(0, -28)] +} +tracks/5/type = "value" +tracks/5/imported = false +tracks/5/enabled = true +tracks/5/path = NodePath("CanvasLayer/UI/Background/Control2:position") +tracks/5/interp = 1 +tracks/5/loop_wrap = true +tracks/5/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector2(0, -28)] +} [sub_resource type="AnimationLibrary" id="AnimationLibrary_8mn2x"] _data = { @@ -328,12 +393,159 @@ libraries = { "": SubResource("AnimationLibrary_8mn2x") } -[node name="UI" parent="CanvasLayer" instance=ExtResource("1_ve2mn")] -visible = false +[node name="UI" type="Control" parent="CanvasLayer"] +custom_minimum_size = Vector2(640, 360) +layout_mode = 3 anchors_preset = 15 +anchor_right = 1.0 anchor_bottom = 1.0 -offset_bottom = 0.0 +grow_horizontal = 2 grow_vertical = 2 +theme = ExtResource("1_xbn5h") + +[node name="Background" type="NinePatchRect" parent="CanvasLayer/UI"] +self_modulate = Color(0.67451, 0.67451, 0.67451, 0) +custom_minimum_size = Vector2(86.39, 22.095) +layout_mode = 2 +offset_left = 7.0 +offset_top = 3.0 +offset_right = 639.0 +offset_bottom = 25.095 +size_flags_vertical = 0 +texture = ExtResource("11_psgyr") +region_rect = Rect2(-0.458088, -0.349636, 186.046, 47.2991) + +[node name="EssenceIcon" type="TextureRect" parent="CanvasLayer/UI/Background"] +visible = false +layout_mode = 0 +offset_left = 120.0 +offset_right = 144.0 +offset_bottom = 24.0 +texture = ExtResource("12_2i27n") +expand_mode = 2 + +[node name="EssenceCountLabel" type="Label" parent="CanvasLayer/UI/Background"] +visible = false +layout_mode = 2 +offset_left = 110.0 +offset_right = 165.0 +offset_bottom = 24.0 +theme_override_colors/font_color = Color(1, 1, 1, 1) +text = "000" +horizontal_alignment = 2 +vertical_alignment = 1 +script = ExtResource("13_fqswr") +key = "essence" + +[node name="Control" type="Control" parent="CanvasLayer/UI/Background"] +anchors_preset = 0 +offset_top = -28.0 +offset_right = 40.0 +offset_bottom = 12.0 + +[node name="WoodIcon" type="TextureRect" parent="CanvasLayer/UI/Background/Control"] +layout_mode = 0 +offset_left = 44.0 +offset_top = 1.0 +offset_right = 60.0 +offset_bottom = 17.0 +texture = ExtResource("14_dmibc") +expand_mode = 2 + +[node name="WoodCountLabel" type="Label" parent="CanvasLayer/UI/Background/Control"] +layout_mode = 2 +offset_left = 65.0 +offset_right = 124.0 +offset_bottom = 24.0 +theme_override_colors/font_color = Color(0.534989, 0.260301, 0.265325, 1) +theme_override_constants/outline_size = 3 +theme_override_font_sizes/font_size = 8 +text = "0 +" +vertical_alignment = 1 +script = ExtResource("13_fqswr") +key = "wood" + +[node name="Control2" type="Control" parent="CanvasLayer/UI/Background"] +anchors_preset = 0 +offset_top = -28.0 +offset_right = 40.0 +offset_bottom = 12.0 + +[node name="StoneIcon" type="TextureRect" parent="CanvasLayer/UI/Background/Control2"] +layout_mode = 0 +offset_left = 2.0 +offset_top = 2.0 +offset_right = 18.0 +offset_bottom = 18.0 +texture = ExtResource("15_scpqp") + +[node name="StoneCountLabel" type="Label" parent="CanvasLayer/UI/Background/Control2"] +layout_mode = 2 +offset_left = 23.0 +offset_right = 61.0 +offset_bottom = 24.0 +theme_override_colors/font_color = Color(0.258486, 0.352181, 0.402271, 1) +theme_override_constants/outline_size = 3 +theme_override_font_sizes/font_size = 8 +text = "0" +vertical_alignment = 1 +script = ExtResource("13_fqswr") +key = "stone" + +[node name="RightCounters" type="VBoxContainer" parent="CanvasLayer/UI"] +visible = false +layout_direction = 2 +layout_mode = 2 +offset_left = 527.0 +offset_right = 640.0 +offset_bottom = 360.0 + +[node name="RightCounters" type="MarginContainer" parent="CanvasLayer/UI/RightCounters"] +layout_mode = 2 + +[node name="Background" type="NinePatchRect" parent="CanvasLayer/UI/RightCounters/RightCounters"] +custom_minimum_size = Vector2(113, 24) +layout_mode = 2 +texture = ExtResource("11_psgyr") +region_rect = Rect2(1.19859, 0.999939, 182.287, 45.1203) + +[node name="PopulationIcon" type="TextureRect" parent="CanvasLayer/UI/RightCounters/RightCounters/Background"] +layout_mode = 0 +offset_left = 10.0 +offset_right = 34.0 +offset_bottom = 24.0 +expand_mode = 2 + +[node name="FloodLevelIcon" type="TextureRect" parent="CanvasLayer/UI/RightCounters/RightCounters/Background"] +layout_mode = 0 +offset_left = 65.0 +offset_right = 89.0 +offset_bottom = 24.0 +expand_mode = 2 + +[node name="PopulationCountLabel" type="Label" parent="CanvasLayer/UI/RightCounters/RightCounters/Background"] +layout_mode = 2 +offset_right = 55.0 +offset_bottom = 24.0 +theme_override_colors/font_color = Color(1, 1, 1, 1) +text = "000" +horizontal_alignment = 2 +vertical_alignment = 1 +script = ExtResource("13_fqswr") +key = "population" + +[node name="FloodLevelCountLabel" type="Label" parent="CanvasLayer/UI/RightCounters/RightCounters/Background"] +layout_mode = 2 +offset_left = 55.0 +offset_right = 110.0 +offset_bottom = 24.0 +theme_override_colors/font_color = Color(1, 1, 1, 1) +text = "000" +horizontal_alignment = 2 +vertical_alignment = 1 +script = ExtResource("13_fqswr") +key = "flood_level" [node name="InfoWindow" parent="CanvasLayer" instance=ExtResource("7_f4xfy")] visible = false diff --git a/parts/buildings/images/foodgathering.png b/parts/buildings/images/foodgathering.png index 4a60036..1746519 100644 Binary files a/parts/buildings/images/foodgathering.png and b/parts/buildings/images/foodgathering.png differ diff --git a/parts/buildings/images/foodprocessing.png b/parts/buildings/images/foodprocessing.png index 4a60036..569a678 100644 Binary files a/parts/buildings/images/foodprocessing.png and b/parts/buildings/images/foodprocessing.png differ diff --git a/parts/buildings/images/house.png b/parts/buildings/images/house.png index 4a60036..6a1086c 100644 Binary files a/parts/buildings/images/house.png and b/parts/buildings/images/house.png differ diff --git a/parts/buildings/images/quarter.png b/parts/buildings/images/quarter.png index 4a60036..d412c48 100644 Binary files a/parts/buildings/images/quarter.png and b/parts/buildings/images/quarter.png differ diff --git a/parts/buildings/images/tents.png b/parts/buildings/images/tents.png index 4a60036..cba11bc 100644 Binary files a/parts/buildings/images/tents.png and b/parts/buildings/images/tents.png differ diff --git a/parts/buildings/images/waterprocessor.png b/parts/buildings/images/waterprocessor.png index 4a60036..02d13dc 100644 Binary files a/parts/buildings/images/waterprocessor.png and b/parts/buildings/images/waterprocessor.png differ diff --git a/parts/buildings/images/waterpump.png b/parts/buildings/images/waterpump.png index 4a60036..41138b8 100644 Binary files a/parts/buildings/images/waterpump.png and b/parts/buildings/images/waterpump.png differ diff --git a/stone.png b/stone.png new file mode 100644 index 0000000..04dbf1f Binary files /dev/null and b/stone.png differ diff --git a/stone.png.import b/stone.png.import new file mode 100644 index 0000000..b278d1e --- /dev/null +++ b/stone.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ckbq5ipvom580" +path="res://.godot/imported/stone.png-083619ed9cb60da6213c6ca04d200509.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://stone.png" +dest_files=["res://.godot/imported/stone.png-083619ed9cb60da6213c6ca04d200509.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/tiles-v3.png b/tiles-v3.png index 8dbe439..dadf10f 100644 Binary files a/tiles-v3.png and b/tiles-v3.png differ diff --git a/tiles_foodwater.png b/tiles_foodwater.png new file mode 100644 index 0000000..c99ec75 Binary files /dev/null and b/tiles_foodwater.png differ diff --git a/tiles_foodwater.png.import b/tiles_foodwater.png.import new file mode 100644 index 0000000..3f3b680 --- /dev/null +++ b/tiles_foodwater.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bmxo8xwxghc1k" +path="res://.godot/imported/tiles_foodwater.png-ed3756163c1eca2252bbac5318eafb39.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://tiles_foodwater.png" +dest_files=["res://.godot/imported/tiles_foodwater.png-ed3756163c1eca2252bbac5318eafb39.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/tiles_houses.png b/tiles_houses.png new file mode 100644 index 0000000..91298dc Binary files /dev/null and b/tiles_houses.png differ diff --git a/tiles_houses.png.import b/tiles_houses.png.import new file mode 100644 index 0000000..84bf83f --- /dev/null +++ b/tiles_houses.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cgpbrsl2nlhlr" +path="res://.godot/imported/tiles_houses.png-a969f38ffe9f5344e3a5b4dd72eb4415.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://tiles_houses.png" +dest_files=["res://.godot/imported/tiles_houses.png-a969f38ffe9f5344e3a5b4dd72eb4415.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/ui/BuildingIcon.tscn b/ui/BuildingIcon.tscn index 1a8f1fa..d7c458f 100644 --- a/ui/BuildingIcon.tscn +++ b/ui/BuildingIcon.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=3 uid="uid://b7o2i7tgirg64"] [ext_resource type="Script" path="res://ui/building_icon.gd" id="1_6qgij"] -[ext_resource type="Texture2D" uid="uid://c3t66sxwk078m" path="res://parts/buildings/images/essencecompressor.png" id="1_62uie"] +[ext_resource type="Texture2D" uid="uid://clqov5mu3bpaw" path="res://parts/buildings/images/foodprocessing.png" id="2_3vnc8"] [ext_resource type="PackedScene" uid="uid://dykc1mgg5uopw" path="res://components/Cursor/MouseHandler.tscn" id="3_tf3sl"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_0bdxp"] @@ -20,13 +20,13 @@ anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -24.0 -offset_top = -24.0 -offset_right = 24.0 -offset_bottom = 24.0 +offset_left = -8.0 +offset_top = -8.0 +offset_right = 8.0 +offset_bottom = 8.0 grow_horizontal = 2 grow_vertical = 2 -texture = ExtResource("1_62uie") +texture = ExtResource("2_3vnc8") [node name="MouseHandler" parent="." instance=ExtResource("3_tf3sl")] position = Vector2(16, 17) diff --git a/ui/UI.tscn b/ui/UI.tscn index 3bd9e77..c9869e2 100644 --- a/ui/UI.tscn +++ b/ui/UI.tscn @@ -3,52 +3,50 @@ [ext_resource type="Theme" uid="uid://d035h7upxrw3h" path="res://theme.tres" id="1_fcqle"] [ext_resource type="Texture2D" uid="uid://cd205j7rs5ph7" path="res://ui/buildingmeny.png" id="1_xpu1e"] [ext_resource type="Script" path="res://ui/counters.gd" id="2_ei01o"] -[ext_resource type="Texture2D" uid="uid://6bpdb3npejtx" path="res://ui/stone_icon.png" id="2_vo570"] -[ext_resource type="Texture2D" uid="uid://byx0ivnwice1e" path="res://ui/wood_icon.png" id="3_ohuq3"] +[ext_resource type="Texture2D" uid="uid://ckbq5ipvom580" path="res://stone.png" id="3_dnx35"] [ext_resource type="Texture2D" uid="uid://rtrb5p3o61i4" path="res://ui/essence_icon.png" id="4_7fjj4"] +[ext_resource type="Texture2D" uid="uid://dwm8p1koiqee8" path="res://wood.png" id="4_yvmom"] -[node name="UI" type="MarginContainer"] +[node name="UI" type="Control"] custom_minimum_size = Vector2(640, 360) +layout_mode = 3 anchors_preset = 10 anchor_right = 1.0 -offset_bottom = 44.0 +offset_bottom = 360.0 grow_horizontal = 2 theme = ExtResource("1_fcqle") -[node name="HBoxContainer" type="HBoxContainer" parent="."] -layout_mode = 2 - -[node name="LeftCounters" type="HBoxContainer" parent="HBoxContainer"] -layout_mode = 2 -size_flags_horizontal = 3 - -[node name="Resources" type="MarginContainer" parent="HBoxContainer/LeftCounters"] -layout_mode = 2 - -[node name="Background" type="NinePatchRect" parent="HBoxContainer/LeftCounters/Resources"] -custom_minimum_size = Vector2(168, 24) +[node name="Background" type="NinePatchRect" parent="."] +self_modulate = Color(0.67451, 0.67451, 0.67451, 0) +custom_minimum_size = Vector2(86.39, 22.095) layout_mode = 2 +offset_left = 7.0 +offset_top = 3.0 +offset_right = 639.0 +offset_bottom = 25.095 size_flags_vertical = 0 texture = ExtResource("1_xpu1e") region_rect = Rect2(-0.458088, -0.349636, 186.046, 47.2991) -[node name="StoneIcon" type="TextureRect" parent="HBoxContainer/LeftCounters/Resources/Background"] +[node name="StoneIcon" type="TextureRect" parent="Background"] layout_mode = 0 -offset_left = 10.0 -offset_right = 34.0 -offset_bottom = 24.0 -texture = ExtResource("2_vo570") +offset_left = 2.0 +offset_top = 2.0 +offset_right = 18.0 +offset_bottom = 18.0 +texture = ExtResource("3_dnx35") + +[node name="WoodIcon" type="TextureRect" parent="Background"] +layout_mode = 0 +offset_left = 44.0 +offset_top = 1.0 +offset_right = 60.0 +offset_bottom = 17.0 +texture = ExtResource("4_yvmom") expand_mode = 2 -[node name="WoodIcon" type="TextureRect" parent="HBoxContainer/LeftCounters/Resources/Background"] -layout_mode = 0 -offset_left = 65.0 -offset_right = 89.0 -offset_bottom = 24.0 -texture = ExtResource("3_ohuq3") -expand_mode = 2 - -[node name="EssenceIcon" type="TextureRect" parent="HBoxContainer/LeftCounters/Resources/Background"] +[node name="EssenceIcon" type="TextureRect" parent="Background"] +visible = false layout_mode = 0 offset_left = 120.0 offset_right = 144.0 @@ -56,30 +54,35 @@ offset_bottom = 24.0 texture = ExtResource("4_7fjj4") expand_mode = 2 -[node name="StoneCountLabel" type="Label" parent="HBoxContainer/LeftCounters/Resources/Background"] +[node name="StoneCountLabel" type="Label" parent="Background"] layout_mode = 2 -offset_right = 55.0 +offset_left = 23.0 +offset_right = 61.0 offset_bottom = 24.0 -theme_override_colors/font_color = Color(1, 1, 1, 1) -text = "000" -horizontal_alignment = 2 +theme_override_colors/font_color = Color(0.258486, 0.352181, 0.402271, 1) +theme_override_constants/outline_size = 3 +theme_override_font_sizes/font_size = 8 +text = "0" vertical_alignment = 1 script = ExtResource("2_ei01o") key = "stone" -[node name="WoodCountLabel" type="Label" parent="HBoxContainer/LeftCounters/Resources/Background"] +[node name="WoodCountLabel" type="Label" parent="Background"] layout_mode = 2 -offset_left = 55.0 -offset_right = 110.0 +offset_left = 65.0 +offset_right = 124.0 offset_bottom = 24.0 -theme_override_colors/font_color = Color(1, 1, 1, 1) -text = "000" -horizontal_alignment = 2 +theme_override_colors/font_color = Color(0.534989, 0.260301, 0.265325, 1) +theme_override_constants/outline_size = 3 +theme_override_font_sizes/font_size = 8 +text = "0 +" vertical_alignment = 1 script = ExtResource("2_ei01o") key = "wood" -[node name="EssenceCountLabel" type="Label" parent="HBoxContainer/LeftCounters/Resources/Background"] +[node name="EssenceCountLabel" type="Label" parent="Background"] +visible = false layout_mode = 2 offset_left = 110.0 offset_right = 165.0 @@ -91,34 +94,38 @@ vertical_alignment = 1 script = ExtResource("2_ei01o") key = "essence" -[node name="RightCounters" type="VBoxContainer" parent="HBoxContainer"] +[node name="RightCounters" type="VBoxContainer" parent="."] +visible = false layout_direction = 2 layout_mode = 2 +offset_left = 527.0 +offset_right = 640.0 +offset_bottom = 360.0 -[node name="RightCounters" type="MarginContainer" parent="HBoxContainer/RightCounters"] +[node name="RightCounters" type="MarginContainer" parent="RightCounters"] layout_mode = 2 -[node name="Background" type="NinePatchRect" parent="HBoxContainer/RightCounters/RightCounters"] +[node name="Background" type="NinePatchRect" parent="RightCounters/RightCounters"] custom_minimum_size = Vector2(113, 24) layout_mode = 2 texture = ExtResource("1_xpu1e") region_rect = Rect2(1.19859, 0.999939, 182.287, 45.1203) -[node name="PopulationIcon" type="TextureRect" parent="HBoxContainer/RightCounters/RightCounters/Background"] +[node name="PopulationIcon" type="TextureRect" parent="RightCounters/RightCounters/Background"] layout_mode = 0 offset_left = 10.0 offset_right = 34.0 offset_bottom = 24.0 expand_mode = 2 -[node name="FloodLevelIcon" type="TextureRect" parent="HBoxContainer/RightCounters/RightCounters/Background"] +[node name="FloodLevelIcon" type="TextureRect" parent="RightCounters/RightCounters/Background"] layout_mode = 0 offset_left = 65.0 offset_right = 89.0 offset_bottom = 24.0 expand_mode = 2 -[node name="PopulationCountLabel" type="Label" parent="HBoxContainer/RightCounters/RightCounters/Background"] +[node name="PopulationCountLabel" type="Label" parent="RightCounters/RightCounters/Background"] layout_mode = 2 offset_right = 55.0 offset_bottom = 24.0 @@ -129,7 +136,7 @@ vertical_alignment = 1 script = ExtResource("2_ei01o") key = "population" -[node name="FloodLevelCountLabel" type="Label" parent="HBoxContainer/RightCounters/RightCounters/Background"] +[node name="FloodLevelCountLabel" type="Label" parent="RightCounters/RightCounters/Background"] layout_mode = 2 offset_left = 55.0 offset_right = 110.0 diff --git a/ui/building_menu.gd b/ui/building_menu.gd index 6a8a94b..aa40510 100644 --- a/ui/building_menu.gd +++ b/ui/building_menu.gd @@ -35,7 +35,7 @@ func swap_to_tab(index): else: tabs[i].unselect() - var filtered_buildings = buildings.filter(func(building): return building_data[building].type == tabs[index].key) + var filtered_buildings = buildings.filter(func(building): return building_data[building].type == tabs[index].key and (not building_data[building].has("disabled") or not building_data[building].disabled)) for i in range(0, icons.size()): if i < filtered_buildings.size(): diff --git a/wood.png b/wood.png new file mode 100644 index 0000000..b1f1b1a Binary files /dev/null and b/wood.png differ diff --git a/wood.png.import b/wood.png.import new file mode 100644 index 0000000..3ecdf3a --- /dev/null +++ b/wood.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dwm8p1koiqee8" +path="res://.godot/imported/wood.png-320746db63b5a5eb1bb7f02275994b36.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://wood.png" +dest_files=["res://.godot/imported/wood.png-320746db63b5a5eb1bb7f02275994b36.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1