diff --git a/external/Test Portrait/Farmer_F/body.png.import b/external/Test Portrait/Farmer_F/body.png.import index 8e18bae..b385871 100644 --- a/external/Test Portrait/Farmer_F/body.png.import +++ b/external/Test Portrait/Farmer_F/body.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://crrd8mpcuync2" -path="res://.godot/imported/body.png-efd5e53b6f03adc4a57de5ce8dc4d3cd.ctex" +path="res://.godot/imported/body.png-5a897720f599ec630383f1f3dd8e9e9e.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://external/test portrait/farmer_f/body.png" -dest_files=["res://.godot/imported/body.png-efd5e53b6f03adc4a57de5ce8dc4d3cd.ctex"] +source_file="res://external/Test Portrait/Farmer_F/body.png" +dest_files=["res://.godot/imported/body.png-5a897720f599ec630383f1f3dd8e9e9e.ctex"] [params] diff --git a/external/Test Portrait/Farmer_F/brow_shadow-1.png.import b/external/Test Portrait/Farmer_F/brow_shadow-1.png.import index b6487ec..04efe38 100644 --- a/external/Test Portrait/Farmer_F/brow_shadow-1.png.import +++ b/external/Test Portrait/Farmer_F/brow_shadow-1.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://pp5ssn5m2n3i" -path="res://.godot/imported/brow_shadow-1.png-8dff8c187d59ecaaefbb84e877b32e20.ctex" +path="res://.godot/imported/brow_shadow-1.png-94d923d93f9bc0db18f7b963da1021dd.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://external/test portrait/farmer_f/brow_shadow-1.png" -dest_files=["res://.godot/imported/brow_shadow-1.png-8dff8c187d59ecaaefbb84e877b32e20.ctex"] +source_file="res://external/Test Portrait/Farmer_F/brow_shadow-1.png" +dest_files=["res://.godot/imported/brow_shadow-1.png-94d923d93f9bc0db18f7b963da1021dd.ctex"] [params] diff --git a/external/Test Portrait/Farmer_F/brow_shadow-2.png.import b/external/Test Portrait/Farmer_F/brow_shadow-2.png.import index 6f63278..a89758a 100644 --- a/external/Test Portrait/Farmer_F/brow_shadow-2.png.import +++ b/external/Test Portrait/Farmer_F/brow_shadow-2.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://x4e86o28672u" -path="res://.godot/imported/brow_shadow-2.png-b5d8d416acf1ddb95fd785200da8d3ce.ctex" +path="res://.godot/imported/brow_shadow-2.png-85a8d07465b9b109e67ad99a37d690d1.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://external/test portrait/farmer_f/brow_shadow-2.png" -dest_files=["res://.godot/imported/brow_shadow-2.png-b5d8d416acf1ddb95fd785200da8d3ce.ctex"] +source_file="res://external/Test Portrait/Farmer_F/brow_shadow-2.png" +dest_files=["res://.godot/imported/brow_shadow-2.png-85a8d07465b9b109e67ad99a37d690d1.ctex"] [params] diff --git a/external/Test Portrait/Farmer_F/brow_shadow.png.import b/external/Test Portrait/Farmer_F/brow_shadow.png.import index e584536..3183cba 100644 --- a/external/Test Portrait/Farmer_F/brow_shadow.png.import +++ b/external/Test Portrait/Farmer_F/brow_shadow.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://sv7bxo8a12i6" -path="res://.godot/imported/brow_shadow.png-f653be07b461bc5d7a18192996ffb73a.ctex" +path="res://.godot/imported/brow_shadow.png-e4497bbbff21d0b56dc81b07de4f06bc.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://external/test portrait/farmer_f/brow_shadow.png" -dest_files=["res://.godot/imported/brow_shadow.png-f653be07b461bc5d7a18192996ffb73a.ctex"] +source_file="res://external/Test Portrait/Farmer_F/brow_shadow.png" +dest_files=["res://.godot/imported/brow_shadow.png-e4497bbbff21d0b56dc81b07de4f06bc.ctex"] [params] diff --git a/external/Test Portrait/Farmer_F/brows-1.png.import b/external/Test Portrait/Farmer_F/brows-1.png.import index c3e6ee8..9fdac8e 100644 --- a/external/Test Portrait/Farmer_F/brows-1.png.import +++ b/external/Test Portrait/Farmer_F/brows-1.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://tpg08bgn2on7" -path="res://.godot/imported/brows-1.png-86a51529282fffa26d497e35e4cc9367.ctex" +path="res://.godot/imported/brows-1.png-70092c4bb56529f3cdeb7b51925eb071.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://external/test portrait/farmer_f/brows-1.png" -dest_files=["res://.godot/imported/brows-1.png-86a51529282fffa26d497e35e4cc9367.ctex"] +source_file="res://external/Test Portrait/Farmer_F/brows-1.png" +dest_files=["res://.godot/imported/brows-1.png-70092c4bb56529f3cdeb7b51925eb071.ctex"] [params] diff --git a/external/Test Portrait/Farmer_F/brows-2.png.import b/external/Test Portrait/Farmer_F/brows-2.png.import index b6faa7b..bf44252 100644 --- a/external/Test Portrait/Farmer_F/brows-2.png.import +++ b/external/Test Portrait/Farmer_F/brows-2.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://brmta1rtiau4a" -path="res://.godot/imported/brows-2.png-01beea1c4e9cadf04c529dc849682c8a.ctex" +path="res://.godot/imported/brows-2.png-227c9708d0b7fde57b1ef42021508fcf.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://external/test portrait/farmer_f/brows-2.png" -dest_files=["res://.godot/imported/brows-2.png-01beea1c4e9cadf04c529dc849682c8a.ctex"] +source_file="res://external/Test Portrait/Farmer_F/brows-2.png" +dest_files=["res://.godot/imported/brows-2.png-227c9708d0b7fde57b1ef42021508fcf.ctex"] [params] diff --git a/external/Test Portrait/Farmer_F/composite.png.import b/external/Test Portrait/Farmer_F/composite.png.import index e799e0f..f32ac68 100644 --- a/external/Test Portrait/Farmer_F/composite.png.import +++ b/external/Test Portrait/Farmer_F/composite.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://c3wwe6r000gpq" -path="res://.godot/imported/composite.png-a68e5c4a777094ce447b89a2ab45b35b.ctex" +path="res://.godot/imported/composite.png-b2c2e474fe243b72bd3471af031774d6.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://external/test portrait/farmer_f/composite.png" -dest_files=["res://.godot/imported/composite.png-a68e5c4a777094ce447b89a2ab45b35b.ctex"] +source_file="res://external/Test Portrait/Farmer_F/composite.png" +dest_files=["res://.godot/imported/composite.png-b2c2e474fe243b72bd3471af031774d6.ctex"] [params] diff --git a/external/Test Portrait/Farmer_F/ear.png.import b/external/Test Portrait/Farmer_F/ear.png.import index e495de0..c287ccf 100644 --- a/external/Test Portrait/Farmer_F/ear.png.import +++ b/external/Test Portrait/Farmer_F/ear.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://caow8dqiog7j4" -path="res://.godot/imported/ear.png-74df11e092bb05fcc54c7e7478ed4d95.ctex" +path="res://.godot/imported/ear.png-a1b457892f7236464123f2229af36695.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://external/test portrait/farmer_f/ear.png" -dest_files=["res://.godot/imported/ear.png-74df11e092bb05fcc54c7e7478ed4d95.ctex"] +source_file="res://external/Test Portrait/Farmer_F/ear.png" +dest_files=["res://.godot/imported/ear.png-a1b457892f7236464123f2229af36695.ctex"] [params] diff --git a/external/Test Portrait/Farmer_F/eye-white-1.png.import b/external/Test Portrait/Farmer_F/eye-white-1.png.import index 74019a2..cc08b8e 100644 --- a/external/Test Portrait/Farmer_F/eye-white-1.png.import +++ b/external/Test Portrait/Farmer_F/eye-white-1.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://csp7xbtu0tpn7" -path="res://.godot/imported/eye-white-1.png-a31a2b044ab6206c129b0739fd4c0c80.ctex" +path="res://.godot/imported/eye-white-1.png-fb75b817d294c00ebeee3e6996a2c02e.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://external/test portrait/farmer_f/eye-white-1.png" -dest_files=["res://.godot/imported/eye-white-1.png-a31a2b044ab6206c129b0739fd4c0c80.ctex"] +source_file="res://external/Test Portrait/Farmer_F/eye-white-1.png" +dest_files=["res://.godot/imported/eye-white-1.png-fb75b817d294c00ebeee3e6996a2c02e.ctex"] [params] diff --git a/external/Test Portrait/Farmer_F/eyes-iris-1.png.import b/external/Test Portrait/Farmer_F/eyes-iris-1.png.import index e279de5..1901ca1 100644 --- a/external/Test Portrait/Farmer_F/eyes-iris-1.png.import +++ b/external/Test Portrait/Farmer_F/eyes-iris-1.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://mygmunn3voie" -path="res://.godot/imported/eyes-iris-1.png-d2077e2e658acf3840075cfe98f86f4e.ctex" +path="res://.godot/imported/eyes-iris-1.png-3c96067ab402ea99f8e1b1b7db594f4c.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://external/test portrait/farmer_f/eyes-iris-1.png" -dest_files=["res://.godot/imported/eyes-iris-1.png-d2077e2e658acf3840075cfe98f86f4e.ctex"] +source_file="res://external/Test Portrait/Farmer_F/eyes-iris-1.png" +dest_files=["res://.godot/imported/eyes-iris-1.png-3c96067ab402ea99f8e1b1b7db594f4c.ctex"] [params] diff --git a/external/Test Portrait/Farmer_F/eyes-lashes-1.png.import b/external/Test Portrait/Farmer_F/eyes-lashes-1.png.import index fa0ee94..6121c9e 100644 --- a/external/Test Portrait/Farmer_F/eyes-lashes-1.png.import +++ b/external/Test Portrait/Farmer_F/eyes-lashes-1.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://wnkr20dtf734" -path="res://.godot/imported/eyes-lashes-1.png-1460ddc60d7a087da2d517ce8f1a5faa.ctex" +path="res://.godot/imported/eyes-lashes-1.png-8a4535f7647af11ff99b165ee021e8cc.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://external/test portrait/farmer_f/eyes-lashes-1.png" -dest_files=["res://.godot/imported/eyes-lashes-1.png-1460ddc60d7a087da2d517ce8f1a5faa.ctex"] +source_file="res://external/Test Portrait/Farmer_F/eyes-lashes-1.png" +dest_files=["res://.godot/imported/eyes-lashes-1.png-8a4535f7647af11ff99b165ee021e8cc.ctex"] [params] diff --git a/external/Test Portrait/Farmer_F/eyes.png.import b/external/Test Portrait/Farmer_F/eyes.png.import index 0977200..12b4ae4 100644 --- a/external/Test Portrait/Farmer_F/eyes.png.import +++ b/external/Test Portrait/Farmer_F/eyes.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://dd063tm4qo5nc" -path="res://.godot/imported/eyes.png-da6eb5fdf7f113844fe8e5414a1f2331.ctex" +path="res://.godot/imported/eyes.png-1384a95ac331738bfe48af30a8953f10.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://external/test portrait/farmer_f/eyes.png" -dest_files=["res://.godot/imported/eyes.png-da6eb5fdf7f113844fe8e5414a1f2331.ctex"] +source_file="res://external/Test Portrait/Farmer_F/eyes.png" +dest_files=["res://.godot/imported/eyes.png-1384a95ac331738bfe48af30a8953f10.ctex"] [params] diff --git a/external/Test Portrait/Farmer_F/eyes_shadow.png.import b/external/Test Portrait/Farmer_F/eyes_shadow.png.import index ac345e4..1f02358 100644 --- a/external/Test Portrait/Farmer_F/eyes_shadow.png.import +++ b/external/Test Portrait/Farmer_F/eyes_shadow.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://li44lgsa0ky" -path="res://.godot/imported/eyes_shadow.png-c0450e5470a67b3e212b544dfeadc885.ctex" +path="res://.godot/imported/eyes_shadow.png-639516c9b7d6a71a22fcd4597236a89e.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://external/test portrait/farmer_f/eyes_shadow.png" -dest_files=["res://.godot/imported/eyes_shadow.png-c0450e5470a67b3e212b544dfeadc885.ctex"] +source_file="res://external/Test Portrait/Farmer_F/eyes_shadow.png" +dest_files=["res://.godot/imported/eyes_shadow.png-639516c9b7d6a71a22fcd4597236a89e.ctex"] [params] diff --git a/external/Test Portrait/Farmer_F/hair_bg.png.import b/external/Test Portrait/Farmer_F/hair_bg.png.import index d83bb4b..0810aed 100644 --- a/external/Test Portrait/Farmer_F/hair_bg.png.import +++ b/external/Test Portrait/Farmer_F/hair_bg.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://can8npg0ufr3f" -path="res://.godot/imported/hair_bg.png-71bd584ff51ea6c704ba2eb2b8124703.ctex" +path="res://.godot/imported/hair_bg.png-07f942d8008a0d2581909922002bbbe2.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://external/test portrait/farmer_f/hair_bg.png" -dest_files=["res://.godot/imported/hair_bg.png-71bd584ff51ea6c704ba2eb2b8124703.ctex"] +source_file="res://external/Test Portrait/Farmer_F/hair_bg.png" +dest_files=["res://.godot/imported/hair_bg.png-07f942d8008a0d2581909922002bbbe2.ctex"] [params] diff --git a/external/Test Portrait/Farmer_F/hair_fg.png.import b/external/Test Portrait/Farmer_F/hair_fg.png.import index 5170c99..60f342e 100644 --- a/external/Test Portrait/Farmer_F/hair_fg.png.import +++ b/external/Test Portrait/Farmer_F/hair_fg.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://vt17lekvchdg" -path="res://.godot/imported/hair_fg.png-9dfae38fbf9812dad9b45d15a1cbd791.ctex" +path="res://.godot/imported/hair_fg.png-9f5c6bb27fb0349d9ddfba99f87aa5c6.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://external/test portrait/farmer_f/hair_fg.png" -dest_files=["res://.godot/imported/hair_fg.png-9dfae38fbf9812dad9b45d15a1cbd791.ctex"] +source_file="res://external/Test Portrait/Farmer_F/hair_fg.png" +dest_files=["res://.godot/imported/hair_fg.png-9f5c6bb27fb0349d9ddfba99f87aa5c6.ctex"] [params] diff --git a/external/Test Portrait/Farmer_F/hair_fg_shadow.png.import b/external/Test Portrait/Farmer_F/hair_fg_shadow.png.import index 7dbf97c..13e85b8 100644 --- a/external/Test Portrait/Farmer_F/hair_fg_shadow.png.import +++ b/external/Test Portrait/Farmer_F/hair_fg_shadow.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://cru775pghpate" -path="res://.godot/imported/hair_fg_shadow.png-609d7f961008e48f548f0e05277dafb4.ctex" +path="res://.godot/imported/hair_fg_shadow.png-41de10e26ae2147aace92ba197b28075.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://external/test portrait/farmer_f/hair_fg_shadow.png" -dest_files=["res://.godot/imported/hair_fg_shadow.png-609d7f961008e48f548f0e05277dafb4.ctex"] +source_file="res://external/Test Portrait/Farmer_F/hair_fg_shadow.png" +dest_files=["res://.godot/imported/hair_fg_shadow.png-41de10e26ae2147aace92ba197b28075.ctex"] [params] diff --git a/external/Test Portrait/Farmer_F/hat-bg.png.import b/external/Test Portrait/Farmer_F/hat-bg.png.import index 107e0a5..41b5407 100644 --- a/external/Test Portrait/Farmer_F/hat-bg.png.import +++ b/external/Test Portrait/Farmer_F/hat-bg.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://dj6fagfp2sbrx" -path="res://.godot/imported/hat-bg.png-972a86d8449c11d1a72a4f21b15efd0a.ctex" +path="res://.godot/imported/hat-bg.png-00e20fcd79ddb550d12459624be7d9b1.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://external/test portrait/farmer_f/hat-bg.png" -dest_files=["res://.godot/imported/hat-bg.png-972a86d8449c11d1a72a4f21b15efd0a.ctex"] +source_file="res://external/Test Portrait/Farmer_F/hat-bg.png" +dest_files=["res://.godot/imported/hat-bg.png-00e20fcd79ddb550d12459624be7d9b1.ctex"] [params] diff --git a/external/Test Portrait/Farmer_F/hat.png.import b/external/Test Portrait/Farmer_F/hat.png.import index db6f143..ad9b8b0 100644 --- a/external/Test Portrait/Farmer_F/hat.png.import +++ b/external/Test Portrait/Farmer_F/hat.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://b303qa76o5r1m" -path="res://.godot/imported/hat.png-21e48868d0218210b390afa680a1202d.ctex" +path="res://.godot/imported/hat.png-9bb6fa9d1f7f7503ee26b1749cdf7c0a.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://external/test portrait/farmer_f/hat.png" -dest_files=["res://.godot/imported/hat.png-21e48868d0218210b390afa680a1202d.ctex"] +source_file="res://external/Test Portrait/Farmer_F/hat.png" +dest_files=["res://.godot/imported/hat.png-9bb6fa9d1f7f7503ee26b1749cdf7c0a.ctex"] [params] diff --git a/external/Test Portrait/Farmer_F/hat_fg.png.import b/external/Test Portrait/Farmer_F/hat_fg.png.import index b24f1f6..c8bdc32 100644 --- a/external/Test Portrait/Farmer_F/hat_fg.png.import +++ b/external/Test Portrait/Farmer_F/hat_fg.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://dyeu4kwwnxjn5" -path="res://.godot/imported/hat_fg.png-2dddd61ae84da22b32d123d3533338c5.ctex" +path="res://.godot/imported/hat_fg.png-e2cae14f649780ea2aba38b34358b587.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://external/test portrait/farmer_f/hat_fg.png" -dest_files=["res://.godot/imported/hat_fg.png-2dddd61ae84da22b32d123d3533338c5.ctex"] +source_file="res://external/Test Portrait/Farmer_F/hat_fg.png" +dest_files=["res://.godot/imported/hat_fg.png-e2cae14f649780ea2aba38b34358b587.ctex"] [params] diff --git a/external/Test Portrait/Farmer_F/head.png.import b/external/Test Portrait/Farmer_F/head.png.import index 3d2f1a0..df71f44 100644 --- a/external/Test Portrait/Farmer_F/head.png.import +++ b/external/Test Portrait/Farmer_F/head.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://dbdjaye6srxhx" -path="res://.godot/imported/head.png-47039f8abc285b87bb176b5b43ee9a5f.ctex" +path="res://.godot/imported/head.png-df46fa0b8e2741bbf0fad9b3a03fedea.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://external/test portrait/farmer_f/head.png" -dest_files=["res://.godot/imported/head.png-47039f8abc285b87bb176b5b43ee9a5f.ctex"] +source_file="res://external/Test Portrait/Farmer_F/head.png" +dest_files=["res://.godot/imported/head.png-df46fa0b8e2741bbf0fad9b3a03fedea.ctex"] [params] diff --git a/external/test-qsvchar.png b/external/test-qsvchar.png index 372fbb2..cc528c8 100644 Binary files a/external/test-qsvchar.png and b/external/test-qsvchar.png differ diff --git a/graphics/profile-popup.png b/graphics/profile-popup.png deleted file mode 100644 index 6f89ec7..0000000 Binary files a/graphics/profile-popup.png and /dev/null differ diff --git a/graphics/profile-popup.png.import b/graphics/profile-popup.png.import deleted file mode 100644 index c3502f1..0000000 --- a/graphics/profile-popup.png.import +++ /dev/null @@ -1,40 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bgw38ld52wu05" -path="res://.godot/imported/profile-popup.png-ac2c647ffb9a3ddb191e025f4c871f30.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://graphics/profile-popup.png" -dest_files=["res://.godot/imported/profile-popup.png-ac2c647ffb9a3ddb191e025f4c871f30.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/uastc_level=0 -compress/rdo_quality_loss=0.0 -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/channel_remap/red=0 -process/channel_remap/green=1 -process/channel_remap/blue=2 -process/channel_remap/alpha=3 -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/graphics/questview/goo.png b/graphics/questview/goo.png index d76f182..583d283 100644 Binary files a/graphics/questview/goo.png and b/graphics/questview/goo.png differ diff --git a/graphics/testchar.png b/graphics/testchar.png index a7e3056..863e7f8 100644 Binary files a/graphics/testchar.png and b/graphics/testchar.png differ diff --git a/scenes/active_scene.tscn b/scenes/active_scene.tscn index dad6736..1144f04 100644 --- a/scenes/active_scene.tscn +++ b/scenes/active_scene.tscn @@ -97,7 +97,7 @@ libraries = { position = Vector2(421, 289) [node name="VisitorSpawner" type="Node2D" parent="Guildhall"] -position = Vector2(505, 870) +position = Vector2(453, 533) script = ExtResource("3_oi1nh") total_visitors = 1 diff --git a/scripts/color_variant.gd b/scripts/color_variant.gd index ad7300a..f8a5565 100644 --- a/scripts/color_variant.gd +++ b/scripts/color_variant.gd @@ -89,8 +89,8 @@ static var skin_colors = { }, "brown":{ "weight": 100, - "color": preload("res://external/test portrait/gradients/eyes/(c)blue.tres"), - "luminosity": preload("res://external/test portrait/gradients/eyes/(c)blue.tres"), + "color": preload("res://external/Test Portrait/gradients/skin/(c)brown.tres"), + "luminosity": preload("res://external/Test Portrait/gradients/skin/(l)dark.tres"), }, "dark":{ "weight": 100, diff --git a/scripts/void_ripple.gd b/scripts/void_ripple.gd index 4e70528..8f2f3ec 100644 --- a/scripts/void_ripple.gd +++ b/scripts/void_ripple.gd @@ -14,7 +14,6 @@ func _ready(): func _process(delta: float) -> void: queue_redraw() - print("test") func recalc_lnorms(): var polypoints : PackedVector2Array diff --git a/shaders/void_composite.gdshader b/shaders/void_composite.gdshader index 4580f73..93d645f 100644 --- a/shaders/void_composite.gdshader +++ b/shaders/void_composite.gdshader @@ -1,52 +1,23 @@ shader_type canvas_item; render_mode unshaded; -const vec2 OFFSETS[8] = { - vec2(-0.71, -0.71), - vec2(-1, 0), - vec2(-0.71, 0.71), - vec2(0, -1), - vec2(0, 1), - vec2(0.71, -0.71), - vec2(1, 0), - vec2(0.71, 0.71) -}; - -uniform bool ripple = false; uniform float line_thickness : hint_range(0.0, 100.0); uniform vec4 line_color : source_color = vec4(1.0); uniform sampler2D screen_texture : hint_screen_texture, repeat_disable, filter_nearest; + + void fragment() { - // Get the size of the pixels on screen, and create a variable for out outline - vec2 size = line_thickness * SCREEN_PIXEL_SIZE; - float outline = 0.0; - - // Project in each direction, and add up the alpha of each projection. - // This is similar to picking a point, hit testing in 8 directions, and - // returning true if the hit test works - for (int i = 0; i < OFFSETS.length(); i++) { - vec2 coordinate_offset = SCREEN_UV + size * OFFSETS[i]; - outline += texture(screen_texture, coordinate_offset).a; - } - - // Force outline to 1 or 0 - //outline = sign(outline); - outline = .4 * (outline / 8.0) + .6 * sign(outline); - // Get the texture from the screen - vec4 c = texture(screen_texture, SCREEN_UV); - - - if(ripple){ - c.rgb = line_color.rgb; - COLOR = c; - }else{ - // If the alpha exists at least a little bit, amplify the colors. - // This ensures alpha and colors remain precise even when reading from screen. - if (c.a > 0.0001) { - c.rgb /= c.a; + vec2 size = SCREEN_PIXEL_SIZE * float(line_thickness*2.0); + float line_alpha = 0.0; + for (float i = -size.x; i <= size.x; i += SCREEN_PIXEL_SIZE.x) { + for (float j = -size.y; j <= size.y; j += SCREEN_PIXEL_SIZE.y) { + line_alpha += texture(screen_texture, SCREEN_UV + vec2(i, j)).a; } - COLOR = mix(c, line_color, outline - c.a); } - + float div = size.x*2.0/SCREEN_PIXEL_SIZE.x + size.y*2.0/SCREEN_PIXEL_SIZE.y; + line_alpha = .2 * (line_alpha / div) + 0.0 * sign(line_alpha); + vec4 colour = texture(screen_texture, SCREEN_UV); + vec4 outline = vec4(line_color.rgb, min(line_alpha, 1.0)); + COLOR *= mix(outline, colour, colour.a); } \ No newline at end of file diff --git a/styles/profile_panel.tres b/styles/profile_panel.tres index e6883ed..1182027 100644 --- a/styles/profile_panel.tres +++ b/styles/profile_panel.tres @@ -1,6 +1,6 @@ [gd_resource type="StyleBoxTexture" load_steps=2 format=3 uid="uid://cra63if6tmpgy"] -[ext_resource type="Texture2D" uid="uid://bgw38ld52wu05" path="res://graphics/profile-popup.png" id="1_8ck5k"] +[ext_resource type="Texture2D" uid="uid://bgw38ld52wu05" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_Glossary/profile-popup.png" id="1_8ck5k"] [resource] texture = ExtResource("1_8ck5k") diff --git a/templates/guildhall.tscn b/templates/guildhall.tscn index 7317245..62092cf 100644 --- a/templates/guildhall.tscn +++ b/templates/guildhall.tscn @@ -19,12 +19,6 @@ [ext_resource type="Texture2D" uid="uid://bhupleoa6pkkb" path="res://external/test_star.png" id="15_b2pr6"] [ext_resource type="Texture2D" uid="uid://ct7y401wpmcdf" path="res://external/test_star2.png" id="16_b2pr6"] -[sub_resource type="ShaderMaterial" id="ShaderMaterial_nfvtf"] -shader = ExtResource("2_ggqxp") -shader_parameter/ripple = false -shader_parameter/line_thickness = 3.8570001832075 -shader_parameter/line_color = Color(0.7666664, 0, 1, 1) - [sub_resource type="ViewportTexture" id="ViewportTexture_0ydii"] viewport_path = NodePath("SubViewport") @@ -37,6 +31,11 @@ shader_parameter/void_view = SubResource("ViewportTexture_0ydii") _data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0] point_count = 2 +[sub_resource type="ShaderMaterial" id="ShaderMaterial_nfvtf"] +shader = ExtResource("2_ggqxp") +shader_parameter/line_thickness = 3.8570001832075 +shader_parameter/line_color = Color(0.7666664, 0, 1, 1) + [sub_resource type="Gradient" id="Gradient_ggqxp"] offsets = PackedFloat32Array(0, 0.27842227, 0.7447796, 0.9976798, 1) colors = PackedColorArray(1, 0, 1, 1, 0.6414714, 0, 1, 1, 0.3529412, 0, 1, 1, 0.13464576, 8.6924134e-05, 0.43542284, 1, 0.3529412, 0, 1, 1) @@ -107,6 +106,27 @@ grow_vertical = 2 mouse_filter = 2 color = Color(0.018666686, 0, 0.08, 1) +[node name="CPUParticles2D2" type="CPUParticles2D" parent="."] +visible = false +material = SubResource("ShaderMaterial_28dkg") +position = Vector2(-800, 176) +scale = Vector2(4.9999995, 4.9999995) +amount = 1000 +texture = ExtResource("13_0xaku") +preprocess = 5.0 +speed_scale = 0.13 +emission_shape = 2 +emission_sphere_radius = 30.0 +spread = 180.0 +gravity = Vector2(0, 0) +initial_velocity_min = 100.0 +initial_velocity_max = 120.0 +linear_accel_min = -300.0 +linear_accel_max = -150.0 +scale_amount_min = 1.1 +scale_amount_max = 4.2 +scale_amount_curve = SubResource("Curve_0aygh") + [node name="CanvasGroup" type="CanvasGroup" parent="."] material = SubResource("ShaderMaterial_nfvtf") position = Vector2(509, 176) @@ -134,7 +154,7 @@ scale_amount_curve = SubResource("Curve_0aygh") [node name="VoidRipple" type="Node2D" parent="."] z_index = 1 script = ExtResource("5_nfvtf") -speed = 0.010000000009313226 +speed = 0.01000000000931322 ripple_width = 4.5 gradient = SubResource("Gradient_ggqxp") diff --git a/templates/portrait.tscn b/templates/portrait.tscn index a12f231..05b7bde 100644 --- a/templates/portrait.tscn +++ b/templates/portrait.tscn @@ -1,33 +1,37 @@ -[gd_scene load_steps=32 format=3 uid="uid://d4f8grsq0umdo"] +[gd_scene load_steps=34 format=3 uid="uid://d4f8grsq0umdo"] [ext_resource type="Script" uid="uid://m86jmtwv1a22" path="res://scripts/adventurer_portrait.gd" id="1_0hknt"] -[ext_resource type="Script" uid="uid://cntcpe7ofdvyx" path="res://external/test portrait/test.gd" id="1_fcl1b"] -[ext_resource type="Texture2D" uid="uid://dj6fagfp2sbrx" path="res://external/test portrait/farmer_f/hat-bg.png" id="2_pek02"] -[ext_resource type="Shader" uid="uid://cru1otvka0qn5" path="res://external/test portrait/variant_color.gdshader" id="3_b42dv"] -[ext_resource type="Texture2D" uid="uid://can8npg0ufr3f" path="res://external/test portrait/farmer_f/hair_bg.png" id="4_snu43"] +[ext_resource type="Script" uid="uid://cntcpe7ofdvyx" path="res://external/Test Portrait/test.gd" id="1_fcl1b"] +[ext_resource type="Texture2D" uid="uid://dj6fagfp2sbrx" path="res://external/Test Portrait/Farmer_F/hat-bg.png" id="2_pek02"] +[ext_resource type="Shader" uid="uid://cru1otvka0qn5" path="res://external/Test Portrait/variant_color.gdshader" id="3_b42dv"] +[ext_resource type="Texture2D" uid="uid://can8npg0ufr3f" path="res://external/Test Portrait/Farmer_F/hair_bg.png" id="4_snu43"] [ext_resource type="Script" uid="uid://cdi0oxcug1hup" path="res://scripts/color_variant.gd" id="5_6ofx4"] -[ext_resource type="Texture2D" uid="uid://crrd8mpcuync2" path="res://external/test portrait/farmer_f/body.png" id="6_4lhir"] -[ext_resource type="Material" uid="uid://btx1o4kx78cbx" path="res://external/test portrait/tri-skin.tres" id="7_ufq70"] -[ext_resource type="Texture2D" uid="uid://dbdjaye6srxhx" path="res://external/test portrait/farmer_f/head.png" id="8_n24t2"] -[ext_resource type="Texture2D" uid="uid://li44lgsa0ky" path="res://external/test portrait/farmer_f/eyes_shadow.png" id="9_d4dbv"] -[ext_resource type="Texture2D" uid="uid://x4e86o28672u" path="res://external/test portrait/farmer_f/brow_shadow-2.png" id="10_8lmmt"] -[ext_resource type="Texture2D" uid="uid://cru775pghpate" path="res://external/test portrait/farmer_f/hair_fg_shadow.png" id="11_mrkia"] -[ext_resource type="Texture2D" uid="uid://csp7xbtu0tpn7" path="res://external/test portrait/farmer_f/eye-white-1.png" id="12_fa2yd"] -[ext_resource type="Texture2D" uid="uid://mygmunn3voie" path="res://external/test portrait/farmer_f/eyes-iris-1.png" id="14_36lkf"] -[ext_resource type="Texture2D" uid="uid://wnkr20dtf734" path="res://external/test portrait/farmer_f/eyes-lashes-1.png" id="15_n8rvo"] -[ext_resource type="Texture2D" uid="uid://caow8dqiog7j4" path="res://external/test portrait/farmer_f/ear.png" id="16_c5fh3"] +[ext_resource type="Texture2D" uid="uid://crrd8mpcuync2" path="res://external/Test Portrait/Farmer_F/body.png" id="6_4lhir"] +[ext_resource type="Material" uid="uid://btx1o4kx78cbx" path="res://external/Test Portrait/tri-skin.tres" id="7_ufq70"] +[ext_resource type="Texture2D" uid="uid://dbdjaye6srxhx" path="res://external/Test Portrait/Farmer_F/head.png" id="8_n24t2"] +[ext_resource type="Texture2D" uid="uid://cjs6gcaqkblxv" path="res://external/Test Portrait/gradients/skin/(c)brown.tres" id="8_x7qt0"] +[ext_resource type="Texture2D" uid="uid://bq1mcdggw8ksg" path="res://external/Test Portrait/gradients/skin/(l)dark.tres" id="9_0hknt"] +[ext_resource type="Texture2D" uid="uid://li44lgsa0ky" path="res://external/Test Portrait/Farmer_F/eyes_shadow.png" id="9_d4dbv"] +[ext_resource type="Texture2D" uid="uid://x4e86o28672u" path="res://external/Test Portrait/Farmer_F/brow_shadow-2.png" id="10_8lmmt"] +[ext_resource type="Texture2D" uid="uid://cru775pghpate" path="res://external/Test Portrait/Farmer_F/hair_fg_shadow.png" id="11_mrkia"] +[ext_resource type="Texture2D" uid="uid://csp7xbtu0tpn7" path="res://external/Test Portrait/Farmer_F/eye-white-1.png" id="12_fa2yd"] +[ext_resource type="Texture2D" uid="uid://mygmunn3voie" path="res://external/Test Portrait/Farmer_F/eyes-iris-1.png" id="14_36lkf"] +[ext_resource type="Texture2D" uid="uid://wnkr20dtf734" path="res://external/Test Portrait/Farmer_F/eyes-lashes-1.png" id="15_n8rvo"] +[ext_resource type="Texture2D" uid="uid://caow8dqiog7j4" path="res://external/Test Portrait/Farmer_F/ear.png" id="16_c5fh3"] [ext_resource type="Texture2D" uid="uid://0dwdi7m62trg" path="res://external/test portrait/gradients/hair/(c)red.tres" id="17_ds2dq"] -[ext_resource type="Texture2D" uid="uid://vt17lekvchdg" path="res://external/test portrait/farmer_f/hair_fg.png" id="17_vd0s3"] -[ext_resource type="Texture2D" uid="uid://dyeu4kwwnxjn5" path="res://external/test portrait/farmer_f/hat_fg.png" id="18_ad0yo"] +[ext_resource type="Texture2D" uid="uid://vt17lekvchdg" path="res://external/Test Portrait/Farmer_F/hair_fg.png" id="17_vd0s3"] +[ext_resource type="Texture2D" uid="uid://dyeu4kwwnxjn5" path="res://external/Test Portrait/Farmer_F/hat_fg.png" id="18_ad0yo"] [ext_resource type="Texture2D" uid="uid://bqmnbsxgbrcpw" path="res://external/test portrait/gradients/hair/(l)red.tres" id="18_yxc1x"] -[ext_resource type="Texture2D" uid="uid://brmta1rtiau4a" path="res://external/test portrait/farmer_f/brows-2.png" id="19_oxjqg"] -[ext_resource type="Texture2D" uid="uid://c3wwe6r000gpq" path="res://external/test portrait/farmer_f/composite.png" id="25_e6f65"] +[ext_resource type="Texture2D" uid="uid://brmta1rtiau4a" path="res://external/Test Portrait/Farmer_F/brows-2.png" id="19_oxjqg"] +[ext_resource type="Texture2D" uid="uid://c3wwe6r000gpq" path="res://external/Test Portrait/Farmer_F/composite.png" id="25_e6f65"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_6ofx4"] shader = ExtResource("3_b42dv") [sub_resource type="ShaderMaterial" id="ShaderMaterial_4lhir"] shader = ExtResource("3_b42dv") +shader_parameter/color_gradient = ExtResource("8_x7qt0") +shader_parameter/luminosity_gradient = ExtResource("9_0hknt") [sub_resource type="ShaderMaterial" id="ShaderMaterial_ufq70"] shader = ExtResource("3_b42dv") @@ -60,6 +64,7 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 +scale = Vector2(3, 3) script = ExtResource("1_fcl1b") [node name="Portrait" type="Control" parent="."]