From e14a0ee010e2b9a0fe7c8fb532268d021d02ce63 Mon Sep 17 00:00:00 2001 From: Ategon Date: Sat, 14 Sep 2024 23:58:33 -0400 Subject: [PATCH] Add collector sprites --- BuildingLevel.gd | 10 +++--- Main.tscn | 17 +++++----- TIleSet.tres | 19 ++++++++++- parts/buildings/essencecompressor.txt | 2 +- parts/buildings/foodgathering.txt | 2 +- parts/buildings/foodprocessing.txt | 2 +- parts/buildings/house.txt | 1 + parts/buildings/images/essencecompressor.png | Bin 401 -> 304 bytes parts/buildings/images/stoneminer.png | Bin 401 -> 375 bytes parts/buildings/images/woodcutter.png | Bin 401 -> 297 bytes parts/buildings/quarter.txt | 1 + parts/buildings/stoneminer.txt | 2 +- parts/buildings/tents.txt | 3 +- stone.png | Bin 284 -> 287 bytes tile_collectors.png | Bin 0 -> 1207 bytes tile_collectors.png.import | 34 +++++++++++++++++++ 16 files changed, 74 insertions(+), 19 deletions(-) create mode 100644 tile_collectors.png create mode 100644 tile_collectors.png.import diff --git a/BuildingLevel.gd b/BuildingLevel.gd index 5b13dec..62cd412 100644 --- a/BuildingLevel.gd +++ b/BuildingLevel.gd @@ -25,16 +25,16 @@ var building_to_tile_map = { "atlas": 2 }, "essencecompressor": { - "source": 8, + "source": 9, "atlas": 2 }, "woodcutter": { - "source": 8, - "atlas": 2 + "source": 9, + "atlas": 1 }, "stoneminer": { - "source": 8, - "atlas": 2 + "source": 9, + "atlas": 0 }, "foodgathering": { "source": 7, diff --git a/Main.tscn b/Main.tscn index 65f2ba2..ad6f8c7 100644 --- a/Main.tscn +++ b/Main.tscn @@ -476,16 +476,16 @@ offset_top = 1.0 offset_right = 60.0 offset_bottom = 17.0 texture = ExtResource("14_dmibc") -expand_mode = 2 +expand_mode = 1 [node name="WoodCountLabel" type="Label" parent="CanvasLayer/UI/Background/Control"] layout_mode = 2 offset_left = 65.0 +offset_top = -2.29 offset_right = 124.0 -offset_bottom = 24.0 +offset_bottom = 21.71 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 @@ -506,16 +506,16 @@ offset_top = 1.0 offset_right = 60.0 offset_bottom = 17.0 texture = ExtResource("15_5qoov") -expand_mode = 2 +expand_mode = 1 [node name="WoodCountLabel" type="Label" parent="CanvasLayer/UI/Background/Control3"] layout_mode = 2 offset_left = 65.0 +offset_top = -2.29 offset_right = 124.0 -offset_bottom = 24.0 +offset_bottom = 21.71 theme_override_colors/font_color = Color(0.301864, 0.365251, 0.444553, 1) theme_override_constants/outline_size = 3 -theme_override_font_sizes/font_size = 8 text = "0/0 " vertical_alignment = 1 @@ -534,15 +534,16 @@ offset_top = 2.0 offset_right = 18.0 offset_bottom = 18.0 texture = ExtResource("15_scpqp") +expand_mode = 1 [node name="StoneCountLabel" type="Label" parent="CanvasLayer/UI/Background/Control2"] layout_mode = 2 offset_left = 23.0 +offset_top = -2.29 offset_right = 61.0 -offset_bottom = 24.0 +offset_bottom = 21.71 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") diff --git a/TIleSet.tres b/TIleSet.tres index 7f485ec..1b5ed1b 100644 --- a/TIleSet.tres +++ b/TIleSet.tres @@ -1,4 +1,4 @@ -[gd_resource type="TileSet" load_steps=19 format=3 uid="uid://dhy53lakrlutm"] +[gd_resource type="TileSet" load_steps=21 format=3 uid="uid://dhy53lakrlutm"] [ext_resource type="Texture2D" uid="uid://bvn5lewpp7pmd" path="res://iso_tile.png" id="1_sa4j6"] [ext_resource type="Texture2D" uid="uid://bsrh0u02bckhy" path="res://iso_building.png" id="2_bubm3"] @@ -9,6 +9,7 @@ [ext_resource type="Texture2D" uid="uid://c43udkovhiiv8" path="res://tiletrees.png" id="7_grd50"] [ext_resource type="Texture2D" uid="uid://bmxo8xwxghc1k" path="res://tiles_foodwater.png" id="8_tscyy"] [ext_resource type="Texture2D" uid="uid://cgpbrsl2nlhlr" path="res://tiles_houses.png" id="9_dx80t"] +[ext_resource type="Texture2D" uid="uid://cc7724klwih07" path="res://tile_collectors.png" id="10_ftm4e"] [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_dxrqb"] texture = ExtResource("1_sa4j6") @@ -147,6 +148,21 @@ texture = ExtResource("9_dx80t") 1:0/0 = 0 1:0/0/texture_origin = Vector2i(0, 4) +[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_0vrje"] +texture = ExtResource("10_ftm4e") +0:0/0 = 0 +0:0/0/texture_origin = Vector2i(0, 4) +0:1/0 = 0 +0:1/0/texture_origin = Vector2i(0, 4) +1:1/0 = 0 +1:1/0/texture_origin = Vector2i(0, 4) +2:1/0 = 0 +2:1/0/texture_origin = Vector2i(0, 4) +2:0/0 = 0 +2:0/0/texture_origin = Vector2i(0, 4) +1:0/0 = 0 +1:0/0/texture_origin = Vector2i(0, 4) + [resource] tile_shape = 1 tile_layout = 5 @@ -160,3 +176,4 @@ sources/5 = SubResource("TileSetAtlasSource_l16yl") sources/6 = SubResource("TileSetAtlasSource_ffqbc") sources/7 = SubResource("TileSetAtlasSource_w46yf") sources/8 = SubResource("TileSetAtlasSource_7cbry") +sources/9 = SubResource("TileSetAtlasSource_0vrje") diff --git a/parts/buildings/essencecompressor.txt b/parts/buildings/essencecompressor.txt index 0f42352..09cb936 100644 --- a/parts/buildings/essencecompressor.txt +++ b/parts/buildings/essencecompressor.txt @@ -1,4 +1,4 @@ -name: Essence Compressor +name: Conduit type: production resource: essence amount: 1 diff --git a/parts/buildings/foodgathering.txt b/parts/buildings/foodgathering.txt index d95e1a1..35e45b1 100644 --- a/parts/buildings/foodgathering.txt +++ b/parts/buildings/foodgathering.txt @@ -1,2 +1,2 @@ -name: Hunter's Post +name: Field type: utility diff --git a/parts/buildings/foodprocessing.txt b/parts/buildings/foodprocessing.txt index a3affba..e72ed63 100644 --- a/parts/buildings/foodprocessing.txt +++ b/parts/buildings/foodprocessing.txt @@ -1,2 +1,2 @@ -name: Kitchen +name: Farmhouse type: utility diff --git a/parts/buildings/house.txt b/parts/buildings/house.txt index fdf48d3..c3cfbc6 100644 --- a/parts/buildings/house.txt +++ b/parts/buildings/house.txt @@ -1,2 +1,3 @@ name: House type: housing +amount: 5 diff --git a/parts/buildings/images/essencecompressor.png b/parts/buildings/images/essencecompressor.png index 4a600362c6138a46b38cb69c210d07b0dbd78f06..ce04837badf2bc35fc0183a3be12015e4f9f17f1 100644 GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|UU|AWhFJ6_ zCrGgN>`)1DE&Z?jIe-7Yo>1L31)t>WOE`Hzz<<6?Y61|6Sd@Nl`!pwiuky>^(eFFCpR7A+|dg nI~HxIzF41f`=TkI90SAkl9-D(k1dq}`kKMh)z4*}Q$iB}Q=xX! literal 401 zcmV;C0dD?@P)Px$OG!jQRA_jK+@xCns=nT784x#IqK7DWRGpKrU>@4`w~b>>ps4XAD6)aQ{+63gIq zua#CuK-O9Ui$*+n!6x~%r?UEhhK0%m5n+WBo8;4;YC6E`AWOReo8ke>llVc11!#Hs zUQ|0!hZwPdthEGCUnfKY+;CKR1-L~_d;TK2&WJywClMoT-d0!NIHiRb`86gfPx$F-b&0R5*?8l08eqP!xurhT`JTK_UoBzz^ES#X$!_N(QkMEQJaN#Vj4A>Q9h@ zL)X?IxOB0TL%S6U*%U;O(oQYt5)d+!{)V`iOOmF#IQqbab6?K;-UIi*KfmFApKvXR z{b1y_^$5U4@ff4l2jJmqE8vR?aI^P10EhBX!0h1d4}g(9CZ)(&owhJ}6SxP)i4Yf^1yMIGlcnr+V8n(#Ay+a1 zVv;8gdjp2OfoM{-1ge$*!0A?azDd&1Cpg_o;Bm=+0nn1Gs9FN)^$CD#K0`I1VQuGB zgy%};>|ZFP6&GN4T>;?JaR4yi-Xr_tVZr0&!)9fE&M(c{nP>`W#Vv1dOl{tu^9AHb VQP9p|lU4u#002ovPDHLkV1oItqXhr} literal 401 zcmV;C0dD?@P)Px$OG!jQRA_jK+@xCns=nT784x#IqK7DWRGpKrU>@4`w~b>>ps4XAD6)aQ{+63gIq zua#CuK-O9Ui$*+n!6x~%r?UEhhK0%m5n+WBo8;4;YC6E`AWOReo8ke>llVc11!#Hs zUQ|0!hZwPdthEGCUnfKY+;CKR1-L~_d;TK2&WJywClMoT-d0!NIHiRb`86gfPx#<4Ht8R5*?8lCciKP#8v!8(VizAYH^0Sj6T9h?unT3`AlOiNtPZV`Mb7B4I}? z($y1))ivn7ZEqzcRwrqC`}h0KpEQL(-y*{+h4@ecklwY9cdf@~9|f|K6S}N;Cy5KB zaVK6r`hue`QW7Q58!I_Mc&6*FbXlQhii{xuAhPx$OG!jQRA_jK+@xCns=nT784x#IqK7DWRGpKrU>@4`w~b>>ps4XAD6)aQ{+63gIq zua#CuK-O9Ui$*+n!6x~%r?UEhhK0%m5n+WBo8;4;YC6E`AWOReo8ke>llVc11!#Hs zUQ|0!hZwPdthEGCUnfKY+;CKR1-L~_d;TK2&WJywClMoT-d0!NIHiRb`86gfuI^_saIQ<1e?3P4n0=DO2j{wkkP3ZW z@#&g*PE6l<-;Gt_Eq;GOX9YL;33|)ibbViaU zZcz(%PwlOy5Q^=7$Ig_*De${)gDMH#;bW8v?ezjP8I1P_%w*iMVH?c|=ve#)#uTRM w0RZX2LgJpVkZM)Ue-A+9F97lX;1&Em-n$=gM>V_HGXMYp07*qoM6N<$f=$kIH~;_u delta 243 zcmVK2=>0;8mXvD1#0&= zjPRl*E0spyb`u~k$}r}+4Yf_-u!W|sXdySFBy3>~?7sn6XKckvrP0(CPUj1Q&0xGU zdWh4+!JM|)jxFNgS0J3aPe=tsDxx{eL0*)2-mWl%LHGW^48|{~upL*xUrRW^n8W?y t$iY$m3DZ6SK7INgV*dgwwxA_`oxT}OV=;a?I#&Py002ovPDHLkV1gplb5#HU diff --git a/tile_collectors.png b/tile_collectors.png new file mode 100644 index 0000000000000000000000000000000000000000..abe2f68230dac4cd5bcaf9e55aac8e503dd079b1 GIT binary patch literal 1207 zcmV;o1W5adP)Px(S4l)cR9J=Wm{CYuR~*KFhB6poI2eYCEsoW=Y3uAdD~vkpg0xGil(tN<)4^g# zq01%=ItJ_Lq@&pSGHnp{P|NDp(iYPVikM-o!@1!cU7dAxnvS|A2#U;6M79Ud9&XOb zy~#~((!6c?AmrY2{{NHjJNM@1`vO^H@&87S#k|nf>5tPz+P%)aGNC`8U7R%SO|+l@ zIP1Rxz&i)(Y3{rYKyT~TREda4ofrx?0N^UPY}qS`pXvG(fN&@bKHTla;8vxJ0vSunml9$AHRW+))@v(8fyLDX& z(TlLf5D-nZUYcsX_`A9R80^2M3ZxMInCx{qZ0bF7%m*!B8OZC$lA&_*9+v<7OOXet z+P2rUcAX@!t65XLz!Hx6r)aA60`Ntk4LG41LQ~Mwu!K7hznCN*e7FX{&6DS8Y)oj{+NHw`VzBmFy3u`%}Q$clp;#F-UhEJU~ z)S2}{^ywm>HsMg1a45`;fsr`!Nx#JVN(u$QOGSkMgy!b~@clGvS|1Bfv0XjCcWf>) z%(Yybu&nECSHn|m7xIPTLnlkZ6$pga7_n-A&;re190D&Wxfkc@3f0+%eL}Zc&4CM9x zzqfU($_6H)6Oz~a|4&}HDh0^?xGR!z9*`bilGl&kKnp&}dVL)i4Bw4d0jd100)XC1KUn!kjavzj literal 0 HcmV?d00001 diff --git a/tile_collectors.png.import b/tile_collectors.png.import new file mode 100644 index 0000000..098b4a5 --- /dev/null +++ b/tile_collectors.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cc7724klwih07" +path="res://.godot/imported/tile_collectors.png-855f78f928d2e79e7aca78b46c07c579.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://tile_collectors.png" +dest_files=["res://.godot/imported/tile_collectors.png-855f78f928d2e79e7aca78b46c07c579.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