diff --git a/Models/Cyberamics/Cyberamic Chuck.glb b/Models/Cyberamics/Cyber Chuck.glb similarity index 96% rename from Models/Cyberamics/Cyberamic Chuck.glb rename to Models/Cyberamics/Cyber Chuck.glb index 17b0bd9..e33019f 100644 Binary files a/Models/Cyberamics/Cyberamic Chuck.glb and b/Models/Cyberamics/Cyber Chuck.glb differ diff --git a/Models/Cyberamics/Cyberamic Chuck.glb.import b/Models/Cyberamics/Cyber Chuck.glb.import similarity index 72% rename from Models/Cyberamics/Cyberamic Chuck.glb.import rename to Models/Cyberamics/Cyber Chuck.glb.import index faf11ce..876731f 100644 --- a/Models/Cyberamics/Cyberamic Chuck.glb.import +++ b/Models/Cyberamics/Cyber Chuck.glb.import @@ -3,13 +3,13 @@ importer="scene" importer_version=1 type="PackedScene" -uid="uid://c2j62syov3skq" -path="res://.godot/imported/Cyberamic Chuck.glb-7640bcf570eaf553eddfec5de3e96502.scn" +uid="uid://c5fgw7t45p7r6" +path="res://.godot/imported/Cyber Chuck.glb-a3753f11d9fc0490de959aaf7e0592ff.scn" [deps] -source_file="res://Models/Cyberamics/Cyberamic Chuck.glb" -dest_files=["res://.godot/imported/Cyberamic Chuck.glb-7640bcf570eaf553eddfec5de3e96502.scn"] +source_file="res://Models/Cyberamics/Cyber Chuck.glb" +dest_files=["res://.godot/imported/Cyber Chuck.glb-a3753f11d9fc0490de959aaf7e0592ff.scn"] [params] diff --git a/Models/Cyberamics/Cyberamic Chuck_avenger shorts.png b/Models/Cyberamics/Cyber Chuck_avenger shorts.png similarity index 100% rename from Models/Cyberamics/Cyberamic Chuck_avenger shorts.png rename to Models/Cyberamics/Cyber Chuck_avenger shorts.png diff --git a/Models/Cyberamics/Cyberamic Chuck_avenger shorts.png.import b/Models/Cyberamics/Cyber Chuck_avenger shorts.png.import similarity index 54% rename from Models/Cyberamics/Cyberamic Chuck_avenger shorts.png.import rename to Models/Cyberamics/Cyber Chuck_avenger shorts.png.import index 65acba5..221ca45 100644 --- a/Models/Cyberamics/Cyberamic Chuck_avenger shorts.png.import +++ b/Models/Cyberamics/Cyber Chuck_avenger shorts.png.import @@ -2,9 +2,9 @@ importer="texture" type="CompressedTexture2D" -uid="uid://brdqgcdgkmim" -path.s3tc="res://.godot/imported/Cyberamic Chuck_avenger shorts.png-648b74e7b322b778f3c10048f7a69741.s3tc.ctex" -path.etc2="res://.godot/imported/Cyberamic Chuck_avenger shorts.png-648b74e7b322b778f3c10048f7a69741.etc2.ctex" +uid="uid://dpru75dg7kthh" +path.s3tc="res://.godot/imported/Cyber Chuck_avenger shorts.png-f8c8c3c1e01bd2aaa2ce01c018e7a3b4.s3tc.ctex" +path.etc2="res://.godot/imported/Cyber Chuck_avenger shorts.png-f8c8c3c1e01bd2aaa2ce01c018e7a3b4.etc2.ctex" metadata={ "imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true @@ -15,8 +15,8 @@ generator_parameters={ [deps] -source_file="res://Models/Cyberamics/Cyberamic Chuck_avenger shorts.png" -dest_files=["res://.godot/imported/Cyberamic Chuck_avenger shorts.png-648b74e7b322b778f3c10048f7a69741.s3tc.ctex", "res://.godot/imported/Cyberamic Chuck_avenger shorts.png-648b74e7b322b778f3c10048f7a69741.etc2.ctex"] +source_file="res://Models/Cyberamics/Cyber Chuck_avenger shorts.png" +dest_files=["res://.godot/imported/Cyber Chuck_avenger shorts.png-f8c8c3c1e01bd2aaa2ce01c018e7a3b4.s3tc.ctex", "res://.godot/imported/Cyber Chuck_avenger shorts.png-f8c8c3c1e01bd2aaa2ce01c018e7a3b4.etc2.ctex"] [params] diff --git a/Models/Cyberamics/Cyberamic Chuck_avenger.png b/Models/Cyberamics/Cyber Chuck_avenger.png similarity index 100% rename from Models/Cyberamics/Cyberamic Chuck_avenger.png rename to Models/Cyberamics/Cyber Chuck_avenger.png diff --git a/Models/Cyberamics/Cyberamic Chuck_avenger.png.import b/Models/Cyberamics/Cyber Chuck_avenger.png.import similarity index 56% rename from Models/Cyberamics/Cyberamic Chuck_avenger.png.import rename to Models/Cyberamics/Cyber Chuck_avenger.png.import index 9bb132f..1f4f52f 100644 --- a/Models/Cyberamics/Cyberamic Chuck_avenger.png.import +++ b/Models/Cyberamics/Cyber Chuck_avenger.png.import @@ -2,9 +2,9 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bx805k6x66knr" -path.s3tc="res://.godot/imported/Cyberamic Chuck_avenger.png-a29b60343808b764a8d2c10ee8e97522.s3tc.ctex" -path.etc2="res://.godot/imported/Cyberamic Chuck_avenger.png-a29b60343808b764a8d2c10ee8e97522.etc2.ctex" +uid="uid://ccbyxlcuii6l4" +path.s3tc="res://.godot/imported/Cyber Chuck_avenger.png-9e5eb7675b541b5d4f9955126287e30c.s3tc.ctex" +path.etc2="res://.godot/imported/Cyber Chuck_avenger.png-9e5eb7675b541b5d4f9955126287e30c.etc2.ctex" metadata={ "imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true @@ -15,8 +15,8 @@ generator_parameters={ [deps] -source_file="res://Models/Cyberamics/Cyberamic Chuck_avenger.png" -dest_files=["res://.godot/imported/Cyberamic Chuck_avenger.png-a29b60343808b764a8d2c10ee8e97522.s3tc.ctex", "res://.godot/imported/Cyberamic Chuck_avenger.png-a29b60343808b764a8d2c10ee8e97522.etc2.ctex"] +source_file="res://Models/Cyberamics/Cyber Chuck_avenger.png" +dest_files=["res://.godot/imported/Cyber Chuck_avenger.png-9e5eb7675b541b5d4f9955126287e30c.s3tc.ctex", "res://.godot/imported/Cyber Chuck_avenger.png-9e5eb7675b541b5d4f9955126287e30c.etc2.ctex"] [params] diff --git a/Models/Cyberamics/Cyberamic Chuck_blue cool chuck hat.png b/Models/Cyberamics/Cyber Chuck_blue cool chuck hat.png similarity index 100% rename from Models/Cyberamics/Cyberamic Chuck_blue cool chuck hat.png rename to Models/Cyberamics/Cyber Chuck_blue cool chuck hat.png diff --git a/Models/Cyberamics/Cyberamic Chuck_blue cool chuck hat.png.import b/Models/Cyberamics/Cyber Chuck_blue cool chuck hat.png.import similarity index 53% rename from Models/Cyberamics/Cyberamic Chuck_blue cool chuck hat.png.import rename to Models/Cyberamics/Cyber Chuck_blue cool chuck hat.png.import index 3251aa0..d2f2fb0 100644 --- a/Models/Cyberamics/Cyberamic Chuck_blue cool chuck hat.png.import +++ b/Models/Cyberamics/Cyber Chuck_blue cool chuck hat.png.import @@ -2,9 +2,9 @@ importer="texture" type="CompressedTexture2D" -uid="uid://chkprhvwkibuv" -path.s3tc="res://.godot/imported/Cyberamic Chuck_blue cool chuck hat.png-0c9b85f4a4e172fa09afe2e705e32668.s3tc.ctex" -path.etc2="res://.godot/imported/Cyberamic Chuck_blue cool chuck hat.png-0c9b85f4a4e172fa09afe2e705e32668.etc2.ctex" +uid="uid://ch46a7ipo4jeb" +path.s3tc="res://.godot/imported/Cyber Chuck_blue cool chuck hat.png-dd68c49476ac052741b57d787f46ce92.s3tc.ctex" +path.etc2="res://.godot/imported/Cyber Chuck_blue cool chuck hat.png-dd68c49476ac052741b57d787f46ce92.etc2.ctex" metadata={ "imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true @@ -15,8 +15,8 @@ generator_parameters={ [deps] -source_file="res://Models/Cyberamics/Cyberamic Chuck_blue cool chuck hat.png" -dest_files=["res://.godot/imported/Cyberamic Chuck_blue cool chuck hat.png-0c9b85f4a4e172fa09afe2e705e32668.s3tc.ctex", "res://.godot/imported/Cyberamic Chuck_blue cool chuck hat.png-0c9b85f4a4e172fa09afe2e705e32668.etc2.ctex"] +source_file="res://Models/Cyberamics/Cyber Chuck_blue cool chuck hat.png" +dest_files=["res://.godot/imported/Cyber Chuck_blue cool chuck hat.png-dd68c49476ac052741b57d787f46ce92.s3tc.ctex", "res://.godot/imported/Cyber Chuck_blue cool chuck hat.png-dd68c49476ac052741b57d787f46ce92.etc2.ctex"] [params] diff --git a/Models/Cyberamics/Cyberamic Chuck_cool chuck hat.png b/Models/Cyberamics/Cyber Chuck_cool chuck hat.png similarity index 100% rename from Models/Cyberamics/Cyberamic Chuck_cool chuck hat.png rename to Models/Cyberamics/Cyber Chuck_cool chuck hat.png diff --git a/Models/Cyberamics/Cyberamic Chuck_cool chuck hat.png.import b/Models/Cyberamics/Cyber Chuck_cool chuck hat.png.import similarity index 54% rename from Models/Cyberamics/Cyberamic Chuck_cool chuck hat.png.import rename to Models/Cyberamics/Cyber Chuck_cool chuck hat.png.import index 3437fa1..95278ef 100644 --- a/Models/Cyberamics/Cyberamic Chuck_cool chuck hat.png.import +++ b/Models/Cyberamics/Cyber Chuck_cool chuck hat.png.import @@ -2,9 +2,9 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bgfogdr7mgqrn" -path.s3tc="res://.godot/imported/Cyberamic Chuck_cool chuck hat.png-92e57bd583b5fddebeb2b5a26a27b65f.s3tc.ctex" -path.etc2="res://.godot/imported/Cyberamic Chuck_cool chuck hat.png-92e57bd583b5fddebeb2b5a26a27b65f.etc2.ctex" +uid="uid://b0vdrxxkf40l5" +path.s3tc="res://.godot/imported/Cyber Chuck_cool chuck hat.png-a12915da1e1c773aec3160846d160686.s3tc.ctex" +path.etc2="res://.godot/imported/Cyber Chuck_cool chuck hat.png-a12915da1e1c773aec3160846d160686.etc2.ctex" metadata={ "imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true @@ -15,8 +15,8 @@ generator_parameters={ [deps] -source_file="res://Models/Cyberamics/Cyberamic Chuck_cool chuck hat.png" -dest_files=["res://.godot/imported/Cyberamic Chuck_cool chuck hat.png-92e57bd583b5fddebeb2b5a26a27b65f.s3tc.ctex", "res://.godot/imported/Cyberamic Chuck_cool chuck hat.png-92e57bd583b5fddebeb2b5a26a27b65f.etc2.ctex"] +source_file="res://Models/Cyberamics/Cyber Chuck_cool chuck hat.png" +dest_files=["res://.godot/imported/Cyber Chuck_cool chuck hat.png-a12915da1e1c773aec3160846d160686.s3tc.ctex", "res://.godot/imported/Cyber Chuck_cool chuck hat.png-a12915da1e1c773aec3160846d160686.etc2.ctex"] [params] diff --git a/Models/Cyberamics/Cyberamic Chuck_cool chuck shirt.png b/Models/Cyberamics/Cyber Chuck_cool chuck shirt.png similarity index 100% rename from Models/Cyberamics/Cyberamic Chuck_cool chuck shirt.png rename to Models/Cyberamics/Cyber Chuck_cool chuck shirt.png diff --git a/Models/Cyberamics/Cyberamic Chuck_cool chuck shirt.png.import b/Models/Cyberamics/Cyber Chuck_cool chuck shirt.png.import similarity index 53% rename from Models/Cyberamics/Cyberamic Chuck_cool chuck shirt.png.import rename to Models/Cyberamics/Cyber Chuck_cool chuck shirt.png.import index 70b496e..16398c2 100644 --- a/Models/Cyberamics/Cyberamic Chuck_cool chuck shirt.png.import +++ b/Models/Cyberamics/Cyber Chuck_cool chuck shirt.png.import @@ -2,9 +2,9 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cpyxdwmo2mitw" -path.s3tc="res://.godot/imported/Cyberamic Chuck_cool chuck shirt.png-52e5a2fe3b0c7d22e5cbd78c1c7500a9.s3tc.ctex" -path.etc2="res://.godot/imported/Cyberamic Chuck_cool chuck shirt.png-52e5a2fe3b0c7d22e5cbd78c1c7500a9.etc2.ctex" +uid="uid://dk5gptkq3jeqo" +path.s3tc="res://.godot/imported/Cyber Chuck_cool chuck shirt.png-a1017c0886c6b9b53b27465ab87e0f51.s3tc.ctex" +path.etc2="res://.godot/imported/Cyber Chuck_cool chuck shirt.png-a1017c0886c6b9b53b27465ab87e0f51.etc2.ctex" metadata={ "imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true @@ -15,8 +15,8 @@ generator_parameters={ [deps] -source_file="res://Models/Cyberamics/Cyberamic Chuck_cool chuck shirt.png" -dest_files=["res://.godot/imported/Cyberamic Chuck_cool chuck shirt.png-52e5a2fe3b0c7d22e5cbd78c1c7500a9.s3tc.ctex", "res://.godot/imported/Cyberamic Chuck_cool chuck shirt.png-52e5a2fe3b0c7d22e5cbd78c1c7500a9.etc2.ctex"] +source_file="res://Models/Cyberamics/Cyber Chuck_cool chuck shirt.png" +dest_files=["res://.godot/imported/Cyber Chuck_cool chuck shirt.png-a1017c0886c6b9b53b27465ab87e0f51.s3tc.ctex", "res://.godot/imported/Cyber Chuck_cool chuck shirt.png-a1017c0886c6b9b53b27465ab87e0f51.etc2.ctex"] [params] diff --git a/Models/Cyberamics/Cyberamic Chuck_derby.png b/Models/Cyberamics/Cyber Chuck_derby.png similarity index 100% rename from Models/Cyberamics/Cyberamic Chuck_derby.png rename to Models/Cyberamics/Cyber Chuck_derby.png diff --git a/Models/Cyberamics/Cyberamic Chuck_derby.png.import b/Models/Cyberamics/Cyber Chuck_derby.png.import similarity index 56% rename from Models/Cyberamics/Cyberamic Chuck_derby.png.import rename to Models/Cyberamics/Cyber Chuck_derby.png.import index 215a507..7d43326 100644 --- a/Models/Cyberamics/Cyberamic Chuck_derby.png.import +++ b/Models/Cyberamics/Cyber Chuck_derby.png.import @@ -2,9 +2,9 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cbweai1832bm3" -path.s3tc="res://.godot/imported/Cyberamic Chuck_derby.png-7bc146630594177e24ceda21a9c7859a.s3tc.ctex" -path.etc2="res://.godot/imported/Cyberamic Chuck_derby.png-7bc146630594177e24ceda21a9c7859a.etc2.ctex" +uid="uid://dilifuiugrheh" +path.s3tc="res://.godot/imported/Cyber Chuck_derby.png-aa4376a4e1bdf7d77a7ffa471b65b42a.s3tc.ctex" +path.etc2="res://.godot/imported/Cyber Chuck_derby.png-aa4376a4e1bdf7d77a7ffa471b65b42a.etc2.ctex" metadata={ "imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true @@ -15,8 +15,8 @@ generator_parameters={ [deps] -source_file="res://Models/Cyberamics/Cyberamic Chuck_derby.png" -dest_files=["res://.godot/imported/Cyberamic Chuck_derby.png-7bc146630594177e24ceda21a9c7859a.s3tc.ctex", "res://.godot/imported/Cyberamic Chuck_derby.png-7bc146630594177e24ceda21a9c7859a.etc2.ctex"] +source_file="res://Models/Cyberamics/Cyber Chuck_derby.png" +dest_files=["res://.godot/imported/Cyber Chuck_derby.png-aa4376a4e1bdf7d77a7ffa471b65b42a.s3tc.ctex", "res://.godot/imported/Cyber Chuck_derby.png-aa4376a4e1bdf7d77a7ffa471b65b42a.etc2.ctex"] [params] diff --git a/Models/Cyberamics/Cyberamic Chuck_eyes.png b/Models/Cyberamics/Cyber Chuck_eyes.png similarity index 100% rename from Models/Cyberamics/Cyberamic Chuck_eyes.png rename to Models/Cyberamics/Cyber Chuck_eyes.png diff --git a/Models/Cyberamics/Cyberamic Chuck_eyes.png.import b/Models/Cyberamics/Cyber Chuck_eyes.png.import similarity index 56% rename from Models/Cyberamics/Cyberamic Chuck_eyes.png.import rename to Models/Cyberamics/Cyber Chuck_eyes.png.import index df6e376..a8cac49 100644 --- a/Models/Cyberamics/Cyberamic Chuck_eyes.png.import +++ b/Models/Cyberamics/Cyber Chuck_eyes.png.import @@ -2,9 +2,9 @@ importer="texture" type="CompressedTexture2D" -uid="uid://n8fyvmnwkd5f" -path.s3tc="res://.godot/imported/Cyberamic Chuck_eyes.png-833864a46a4992a27ec42be8deaf2902.s3tc.ctex" -path.etc2="res://.godot/imported/Cyberamic Chuck_eyes.png-833864a46a4992a27ec42be8deaf2902.etc2.ctex" +uid="uid://dwafnt0audxle" +path.s3tc="res://.godot/imported/Cyber Chuck_eyes.png-a12fc29e14a8528e945e11b17dfde04e.s3tc.ctex" +path.etc2="res://.godot/imported/Cyber Chuck_eyes.png-a12fc29e14a8528e945e11b17dfde04e.etc2.ctex" metadata={ "imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true @@ -15,8 +15,8 @@ generator_parameters={ [deps] -source_file="res://Models/Cyberamics/Cyberamic Chuck_eyes.png" -dest_files=["res://.godot/imported/Cyberamic Chuck_eyes.png-833864a46a4992a27ec42be8deaf2902.s3tc.ctex", "res://.godot/imported/Cyberamic Chuck_eyes.png-833864a46a4992a27ec42be8deaf2902.etc2.ctex"] +source_file="res://Models/Cyberamics/Cyber Chuck_eyes.png" +dest_files=["res://.godot/imported/Cyber Chuck_eyes.png-a12fc29e14a8528e945e11b17dfde04e.s3tc.ctex", "res://.godot/imported/Cyber Chuck_eyes.png-a12fc29e14a8528e945e11b17dfde04e.etc2.ctex"] [params] diff --git a/Models/Cyberamics/Cyberamic Chuck_fur.png b/Models/Cyberamics/Cyber Chuck_fur.png similarity index 100% rename from Models/Cyberamics/Cyberamic Chuck_fur.png rename to Models/Cyberamics/Cyber Chuck_fur.png diff --git a/Models/Cyberamics/Cyberamic Chuck_fur.png.import b/Models/Cyberamics/Cyber Chuck_fur.png.import similarity index 56% rename from Models/Cyberamics/Cyberamic Chuck_fur.png.import rename to Models/Cyberamics/Cyber Chuck_fur.png.import index 6f4c6f6..0eb96fc 100644 --- a/Models/Cyberamics/Cyberamic Chuck_fur.png.import +++ b/Models/Cyberamics/Cyber Chuck_fur.png.import @@ -2,9 +2,9 @@ importer="texture" type="CompressedTexture2D" -uid="uid://c4tq7klloya28" -path.s3tc="res://.godot/imported/Cyberamic Chuck_fur.png-5da3fabde0b41b5765b323a829d6681a.s3tc.ctex" -path.etc2="res://.godot/imported/Cyberamic Chuck_fur.png-5da3fabde0b41b5765b323a829d6681a.etc2.ctex" +uid="uid://bsgs3o8edlk1v" +path.s3tc="res://.godot/imported/Cyber Chuck_fur.png-24693ca0f1b8d929ce2257481d41ba0e.s3tc.ctex" +path.etc2="res://.godot/imported/Cyber Chuck_fur.png-24693ca0f1b8d929ce2257481d41ba0e.etc2.ctex" metadata={ "imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true @@ -15,8 +15,8 @@ generator_parameters={ [deps] -source_file="res://Models/Cyberamics/Cyberamic Chuck_fur.png" -dest_files=["res://.godot/imported/Cyberamic Chuck_fur.png-5da3fabde0b41b5765b323a829d6681a.s3tc.ctex", "res://.godot/imported/Cyberamic Chuck_fur.png-5da3fabde0b41b5765b323a829d6681a.etc2.ctex"] +source_file="res://Models/Cyberamics/Cyber Chuck_fur.png" +dest_files=["res://.godot/imported/Cyber Chuck_fur.png-24693ca0f1b8d929ce2257481d41ba0e.s3tc.ctex", "res://.godot/imported/Cyber Chuck_fur.png-24693ca0f1b8d929ce2257481d41ba0e.etc2.ctex"] [params] diff --git a/Models/Cyberamics/Cyberamic Chuck_jaw.png b/Models/Cyberamics/Cyber Chuck_jaw.png similarity index 100% rename from Models/Cyberamics/Cyberamic Chuck_jaw.png rename to Models/Cyberamics/Cyber Chuck_jaw.png diff --git a/Models/Cyberamics/Cyberamic Chuck_jaw.png.import b/Models/Cyberamics/Cyber Chuck_jaw.png.import similarity index 56% rename from Models/Cyberamics/Cyberamic Chuck_jaw.png.import rename to Models/Cyberamics/Cyber Chuck_jaw.png.import index ac445d4..a90e600 100644 --- a/Models/Cyberamics/Cyberamic Chuck_jaw.png.import +++ b/Models/Cyberamics/Cyber Chuck_jaw.png.import @@ -2,9 +2,9 @@ importer="texture" type="CompressedTexture2D" -uid="uid://b6i5p7ssueq1c" -path.s3tc="res://.godot/imported/Cyberamic Chuck_jaw.png-77869e5cf0e223c7b7e77b4c6ef73abc.s3tc.ctex" -path.etc2="res://.godot/imported/Cyberamic Chuck_jaw.png-77869e5cf0e223c7b7e77b4c6ef73abc.etc2.ctex" +uid="uid://pm7or2yiqsnl" +path.s3tc="res://.godot/imported/Cyber Chuck_jaw.png-b72ed5871a8cb53e4437f2a131178180.s3tc.ctex" +path.etc2="res://.godot/imported/Cyber Chuck_jaw.png-b72ed5871a8cb53e4437f2a131178180.etc2.ctex" metadata={ "imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true @@ -15,8 +15,8 @@ generator_parameters={ [deps] -source_file="res://Models/Cyberamics/Cyberamic Chuck_jaw.png" -dest_files=["res://.godot/imported/Cyberamic Chuck_jaw.png-77869e5cf0e223c7b7e77b4c6ef73abc.s3tc.ctex", "res://.godot/imported/Cyberamic Chuck_jaw.png-77869e5cf0e223c7b7e77b4c6ef73abc.etc2.ctex"] +source_file="res://Models/Cyberamics/Cyber Chuck_jaw.png" +dest_files=["res://.godot/imported/Cyber Chuck_jaw.png-b72ed5871a8cb53e4437f2a131178180.s3tc.ctex", "res://.godot/imported/Cyber Chuck_jaw.png-b72ed5871a8cb53e4437f2a131178180.etc2.ctex"] [params] diff --git a/Models/Cyberamics/Cyberamic Chuck_jeans.png b/Models/Cyberamics/Cyber Chuck_jeans.png similarity index 100% rename from Models/Cyberamics/Cyberamic Chuck_jeans.png rename to Models/Cyberamics/Cyber Chuck_jeans.png diff --git a/Models/Cyberamics/Cyberamic Chuck_jeans.png.import b/Models/Cyberamics/Cyber Chuck_jeans.png.import similarity index 56% rename from Models/Cyberamics/Cyberamic Chuck_jeans.png.import rename to Models/Cyberamics/Cyber Chuck_jeans.png.import index f3217c5..74b0205 100644 --- a/Models/Cyberamics/Cyberamic Chuck_jeans.png.import +++ b/Models/Cyberamics/Cyber Chuck_jeans.png.import @@ -2,9 +2,9 @@ importer="texture" type="CompressedTexture2D" -uid="uid://ciagmfhdft63o" -path.s3tc="res://.godot/imported/Cyberamic Chuck_jeans.png-4f6e079af3f182dbc81c0672ce75e2a8.s3tc.ctex" -path.etc2="res://.godot/imported/Cyberamic Chuck_jeans.png-4f6e079af3f182dbc81c0672ce75e2a8.etc2.ctex" +uid="uid://d06rpuppgmq86" +path.s3tc="res://.godot/imported/Cyber Chuck_jeans.png-3dbc5615d5b2bce04c1c00f5221f5775.s3tc.ctex" +path.etc2="res://.godot/imported/Cyber Chuck_jeans.png-3dbc5615d5b2bce04c1c00f5221f5775.etc2.ctex" metadata={ "imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true @@ -15,8 +15,8 @@ generator_parameters={ [deps] -source_file="res://Models/Cyberamics/Cyberamic Chuck_jeans.png" -dest_files=["res://.godot/imported/Cyberamic Chuck_jeans.png-4f6e079af3f182dbc81c0672ce75e2a8.s3tc.ctex", "res://.godot/imported/Cyberamic Chuck_jeans.png-4f6e079af3f182dbc81c0672ce75e2a8.etc2.ctex"] +source_file="res://Models/Cyberamics/Cyber Chuck_jeans.png" +dest_files=["res://.godot/imported/Cyber Chuck_jeans.png-3dbc5615d5b2bce04c1c00f5221f5775.s3tc.ctex", "res://.godot/imported/Cyber Chuck_jeans.png-3dbc5615d5b2bce04c1c00f5221f5775.etc2.ctex"] [params] diff --git a/Models/Cyberamics/Cyberamic Chuck_mic.png b/Models/Cyberamics/Cyber Chuck_mic.png similarity index 100% rename from Models/Cyberamics/Cyberamic Chuck_mic.png rename to Models/Cyberamics/Cyber Chuck_mic.png diff --git a/Models/Cyberamics/Cyberamic Chuck_mic.png.import b/Models/Cyberamics/Cyber Chuck_mic.png.import similarity index 56% rename from Models/Cyberamics/Cyberamic Chuck_mic.png.import rename to Models/Cyberamics/Cyber Chuck_mic.png.import index 90d4bb4..c7d8629 100644 --- a/Models/Cyberamics/Cyberamic Chuck_mic.png.import +++ b/Models/Cyberamics/Cyber Chuck_mic.png.import @@ -2,9 +2,9 @@ importer="texture" type="CompressedTexture2D" -uid="uid://btm7ni51m76xy" -path.s3tc="res://.godot/imported/Cyberamic Chuck_mic.png-a001658a24b06e235c5f95469e65dd38.s3tc.ctex" -path.etc2="res://.godot/imported/Cyberamic Chuck_mic.png-a001658a24b06e235c5f95469e65dd38.etc2.ctex" +uid="uid://dl3cw2c26elk8" +path.s3tc="res://.godot/imported/Cyber Chuck_mic.png-81910f31a44978957e4e6f4a918a4f66.s3tc.ctex" +path.etc2="res://.godot/imported/Cyber Chuck_mic.png-81910f31a44978957e4e6f4a918a4f66.etc2.ctex" metadata={ "imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true @@ -15,8 +15,8 @@ generator_parameters={ [deps] -source_file="res://Models/Cyberamics/Cyberamic Chuck_mic.png" -dest_files=["res://.godot/imported/Cyberamic Chuck_mic.png-a001658a24b06e235c5f95469e65dd38.s3tc.ctex", "res://.godot/imported/Cyberamic Chuck_mic.png-a001658a24b06e235c5f95469e65dd38.etc2.ctex"] +source_file="res://Models/Cyberamics/Cyber Chuck_mic.png" +dest_files=["res://.godot/imported/Cyber Chuck_mic.png-81910f31a44978957e4e6f4a918a4f66.s3tc.ctex", "res://.godot/imported/Cyber Chuck_mic.png-81910f31a44978957e4e6f4a918a4f66.etc2.ctex"] [params] diff --git a/Models/Cyberamics/Cyberamic Chuck_modern jaw.png b/Models/Cyberamics/Cyber Chuck_modern jaw.png similarity index 100% rename from Models/Cyberamics/Cyberamic Chuck_modern jaw.png rename to Models/Cyberamics/Cyber Chuck_modern jaw.png diff --git a/Models/Cyberamics/Cyberamic Chuck_modern jaw.png.import b/Models/Cyberamics/Cyber Chuck_modern jaw.png.import similarity index 55% rename from Models/Cyberamics/Cyberamic Chuck_modern jaw.png.import rename to Models/Cyberamics/Cyber Chuck_modern jaw.png.import index 46cadc4..de44223 100644 --- a/Models/Cyberamics/Cyberamic Chuck_modern jaw.png.import +++ b/Models/Cyberamics/Cyber Chuck_modern jaw.png.import @@ -2,9 +2,9 @@ importer="texture" type="CompressedTexture2D" -uid="uid://b2im7s145j3ba" -path.s3tc="res://.godot/imported/Cyberamic Chuck_modern jaw.png-cbbfdab929ad63a720505602abfbed7a.s3tc.ctex" -path.etc2="res://.godot/imported/Cyberamic Chuck_modern jaw.png-cbbfdab929ad63a720505602abfbed7a.etc2.ctex" +uid="uid://dlbs1qxt8l1mh" +path.s3tc="res://.godot/imported/Cyber Chuck_modern jaw.png-41a139bc69fec7727ef17ed430ef2fd1.s3tc.ctex" +path.etc2="res://.godot/imported/Cyber Chuck_modern jaw.png-41a139bc69fec7727ef17ed430ef2fd1.etc2.ctex" metadata={ "imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true @@ -15,8 +15,8 @@ generator_parameters={ [deps] -source_file="res://Models/Cyberamics/Cyberamic Chuck_modern jaw.png" -dest_files=["res://.godot/imported/Cyberamic Chuck_modern jaw.png-cbbfdab929ad63a720505602abfbed7a.s3tc.ctex", "res://.godot/imported/Cyberamic Chuck_modern jaw.png-cbbfdab929ad63a720505602abfbed7a.etc2.ctex"] +source_file="res://Models/Cyberamics/Cyber Chuck_modern jaw.png" +dest_files=["res://.godot/imported/Cyber Chuck_modern jaw.png-41a139bc69fec7727ef17ed430ef2fd1.s3tc.ctex", "res://.godot/imported/Cyber Chuck_modern jaw.png-41a139bc69fec7727ef17ed430ef2fd1.etc2.ctex"] [params] diff --git a/Models/Cyberamics/Cyberamic Chuck_tux derby.png b/Models/Cyberamics/Cyber Chuck_tux derby.png similarity index 100% rename from Models/Cyberamics/Cyberamic Chuck_tux derby.png rename to Models/Cyberamics/Cyber Chuck_tux derby.png diff --git a/Models/Cyberamics/Cyberamic Chuck_tux derby.png.import b/Models/Cyberamics/Cyber Chuck_tux derby.png.import similarity index 55% rename from Models/Cyberamics/Cyberamic Chuck_tux derby.png.import rename to Models/Cyberamics/Cyber Chuck_tux derby.png.import index 6fff73d..08a37a6 100644 --- a/Models/Cyberamics/Cyberamic Chuck_tux derby.png.import +++ b/Models/Cyberamics/Cyber Chuck_tux derby.png.import @@ -2,9 +2,9 @@ importer="texture" type="CompressedTexture2D" -uid="uid://c5jgrbxlpiiof" -path.s3tc="res://.godot/imported/Cyberamic Chuck_tux derby.png-e1438dd2d3924df202bcd5913e8bfedb.s3tc.ctex" -path.etc2="res://.godot/imported/Cyberamic Chuck_tux derby.png-e1438dd2d3924df202bcd5913e8bfedb.etc2.ctex" +uid="uid://c2fiagj0snh55" +path.s3tc="res://.godot/imported/Cyber Chuck_tux derby.png-eac0298195710927efa3c761b15c0794.s3tc.ctex" +path.etc2="res://.godot/imported/Cyber Chuck_tux derby.png-eac0298195710927efa3c761b15c0794.etc2.ctex" metadata={ "imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true @@ -15,8 +15,8 @@ generator_parameters={ [deps] -source_file="res://Models/Cyberamics/Cyberamic Chuck_tux derby.png" -dest_files=["res://.godot/imported/Cyberamic Chuck_tux derby.png-e1438dd2d3924df202bcd5913e8bfedb.s3tc.ctex", "res://.godot/imported/Cyberamic Chuck_tux derby.png-e1438dd2d3924df202bcd5913e8bfedb.etc2.ctex"] +source_file="res://Models/Cyberamics/Cyber Chuck_tux derby.png" +dest_files=["res://.godot/imported/Cyber Chuck_tux derby.png-eac0298195710927efa3c761b15c0794.s3tc.ctex", "res://.godot/imported/Cyber Chuck_tux derby.png-eac0298195710927efa3c761b15c0794.etc2.ctex"] [params] diff --git a/Models/Cyberamics/Cyberamic Chuck_vest.png b/Models/Cyberamics/Cyber Chuck_vest.png similarity index 100% rename from Models/Cyberamics/Cyberamic Chuck_vest.png rename to Models/Cyberamics/Cyber Chuck_vest.png diff --git a/Models/Cyberamics/Cyberamic Chuck_vest.png.import b/Models/Cyberamics/Cyber Chuck_vest.png.import similarity index 56% rename from Models/Cyberamics/Cyberamic Chuck_vest.png.import rename to Models/Cyberamics/Cyber Chuck_vest.png.import index 3a6567d..4d7af38 100644 --- a/Models/Cyberamics/Cyberamic Chuck_vest.png.import +++ b/Models/Cyberamics/Cyber Chuck_vest.png.import @@ -2,9 +2,9 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cjjfoyalnst1d" -path.s3tc="res://.godot/imported/Cyberamic Chuck_vest.png-f2e092297f624fd3dd64f2cbcf170064.s3tc.ctex" -path.etc2="res://.godot/imported/Cyberamic Chuck_vest.png-f2e092297f624fd3dd64f2cbcf170064.etc2.ctex" +uid="uid://dgq6baq8yan3m" +path.s3tc="res://.godot/imported/Cyber Chuck_vest.png-70908e7162bacb10b5ae4105eed84516.s3tc.ctex" +path.etc2="res://.godot/imported/Cyber Chuck_vest.png-70908e7162bacb10b5ae4105eed84516.etc2.ctex" metadata={ "imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true @@ -15,8 +15,8 @@ generator_parameters={ [deps] -source_file="res://Models/Cyberamics/Cyberamic Chuck_vest.png" -dest_files=["res://.godot/imported/Cyberamic Chuck_vest.png-f2e092297f624fd3dd64f2cbcf170064.s3tc.ctex", "res://.godot/imported/Cyberamic Chuck_vest.png-f2e092297f624fd3dd64f2cbcf170064.etc2.ctex"] +source_file="res://Models/Cyberamics/Cyber Chuck_vest.png" +dest_files=["res://.godot/imported/Cyber Chuck_vest.png-70908e7162bacb10b5ae4105eed84516.s3tc.ctex", "res://.godot/imported/Cyber Chuck_vest.png-70908e7162bacb10b5ae4105eed84516.etc2.ctex"] [params] diff --git a/Models/Cyberamics/Cyber Pasqually.glb b/Models/Cyberamics/Cyber Pasqually.glb new file mode 100644 index 0000000..7b57b8e Binary files /dev/null and b/Models/Cyberamics/Cyber Pasqually.glb differ diff --git a/Models/Cyberamics/Cyber Pasqually.glb.import b/Models/Cyberamics/Cyber Pasqually.glb.import new file mode 100644 index 0000000..66db824 --- /dev/null +++ b/Models/Cyberamics/Cyber Pasqually.glb.import @@ -0,0 +1,37 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://bp5u5t6yu4ejy" +path="res://.godot/imported/Cyber Pasqually.glb-a9ce16f9387e81351437b30acb5efc0e.scn" + +[deps] + +source_file="res://Models/Cyberamics/Cyber Pasqually.glb" +dest_files=["res://.godot/imported/Cyber Pasqually.glb-a9ce16f9387e81351437b30acb5efc0e.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +_subresources={} +gltf/naming_version=1 +gltf/embedded_image_handling=1 diff --git a/Models/Cyberamics/Cyber Pasqually_eyes.png b/Models/Cyberamics/Cyber Pasqually_eyes.png new file mode 100644 index 0000000..6c85f79 Binary files /dev/null and b/Models/Cyberamics/Cyber Pasqually_eyes.png differ diff --git a/Models/Cyberamics/Cyber Pasqually_eyes.png.import b/Models/Cyberamics/Cyber Pasqually_eyes.png.import new file mode 100644 index 0000000..79070a6 --- /dev/null +++ b/Models/Cyberamics/Cyber Pasqually_eyes.png.import @@ -0,0 +1,39 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d3mn511jcdcoo" +path.s3tc="res://.godot/imported/Cyber Pasqually_eyes.png-011f6cf7241e851c250440f1f5f1f514.s3tc.ctex" +path.etc2="res://.godot/imported/Cyber Pasqually_eyes.png-011f6cf7241e851c250440f1f5f1f514.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} +generator_parameters={ +"md5": "d352812e727b8ffa0545e5665172abf1" +} + +[deps] + +source_file="res://Models/Cyberamics/Cyber Pasqually_eyes.png" +dest_files=["res://.godot/imported/Cyber Pasqually_eyes.png-011f6cf7241e851c250440f1f5f1f514.s3tc.ctex", "res://.godot/imported/Cyber Pasqually_eyes.png-011f6cf7241e851c250440f1f5f1f514.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +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=0 diff --git a/Models/Cyberamics/Cyber Pasqually_shirt.png b/Models/Cyberamics/Cyber Pasqually_shirt.png new file mode 100644 index 0000000..021f38d Binary files /dev/null and b/Models/Cyberamics/Cyber Pasqually_shirt.png differ diff --git a/Models/Cyberamics/Cyber Pasqually_shirt.png.import b/Models/Cyberamics/Cyber Pasqually_shirt.png.import new file mode 100644 index 0000000..d4b30db --- /dev/null +++ b/Models/Cyberamics/Cyber Pasqually_shirt.png.import @@ -0,0 +1,39 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://djtbeylmkyq48" +path.s3tc="res://.godot/imported/Cyber Pasqually_shirt.png-611d801d1bd5a849fc52ca2f452632f7.s3tc.ctex" +path.etc2="res://.godot/imported/Cyber Pasqually_shirt.png-611d801d1bd5a849fc52ca2f452632f7.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} +generator_parameters={ +"md5": "d35b95ccd00d71fe70f8a2b777a5e6dc" +} + +[deps] + +source_file="res://Models/Cyberamics/Cyber Pasqually_shirt.png" +dest_files=["res://.godot/imported/Cyber Pasqually_shirt.png-611d801d1bd5a849fc52ca2f452632f7.s3tc.ctex", "res://.godot/imported/Cyber Pasqually_shirt.png-611d801d1bd5a849fc52ca2f452632f7.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +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=0 diff --git a/Models/Cyberamics/Cyber Pasqually_shoes.png b/Models/Cyberamics/Cyber Pasqually_shoes.png new file mode 100644 index 0000000..9071d3e Binary files /dev/null and b/Models/Cyberamics/Cyber Pasqually_shoes.png differ diff --git a/Models/Cyberamics/Cyber Pasqually_shoes.png.import b/Models/Cyberamics/Cyber Pasqually_shoes.png.import new file mode 100644 index 0000000..aa69e15 --- /dev/null +++ b/Models/Cyberamics/Cyber Pasqually_shoes.png.import @@ -0,0 +1,39 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://br0mu3ccp4opc" +path.s3tc="res://.godot/imported/Cyber Pasqually_shoes.png-1617d6656315843f76193ec1f7183923.s3tc.ctex" +path.etc2="res://.godot/imported/Cyber Pasqually_shoes.png-1617d6656315843f76193ec1f7183923.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} +generator_parameters={ +"md5": "ed186a9131e5d4848c699d06d08aef2e" +} + +[deps] + +source_file="res://Models/Cyberamics/Cyber Pasqually_shoes.png" +dest_files=["res://.godot/imported/Cyber Pasqually_shoes.png-1617d6656315843f76193ec1f7183923.s3tc.ctex", "res://.godot/imported/Cyber Pasqually_shoes.png-1617d6656315843f76193ec1f7183923.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +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=0 diff --git a/Scenes/GUI/EditorScreen.tscn b/Scenes/GUI/EditorScreen.tscn index da3f622..0110564 100644 --- a/Scenes/GUI/EditorScreen.tscn +++ b/Scenes/GUI/EditorScreen.tscn @@ -103,6 +103,11 @@ cancel_button_text = "Do Not" initial_position = 2 dialog_text = "The specified file does not exist." +[node name="NoFileSpecified" type="AcceptDialog" parent="."] +auto_translate_mode = 1 +initial_position = 2 +dialog_text = "No File was specified." + [node name="EmptyStringDialog" type="AcceptDialog" parent="."] auto_translate_mode = 1 initial_position = 2 diff --git a/Scenes/Stages/Balcony.tscn b/Scenes/Stages/Balcony.tscn index a99299e..ef56d11 100644 --- a/Scenes/Stages/Balcony.tscn +++ b/Scenes/Stages/Balcony.tscn @@ -1,12 +1,13 @@ -[gd_scene load_steps=10 format=3 uid="uid://d2g6chunc572s"] +[gd_scene load_steps=11 format=3 uid="uid://d2g6chunc572s"] [ext_resource type="PackedScene" uid="uid://d34xfaignny8j" path="res://Models/Cyberamics/Cyber Helen.glb" id="1_w3m2i"] [ext_resource type="Script" uid="uid://bu68w4jnh0n2b" path="res://Scripts/AnimatronicController.gd" id="2_t4ere"] -[ext_resource type="PackedScene" uid="uid://c2j62syov3skq" path="res://Models/Cyberamics/Cyberamic Chuck.glb" id="3_45mf1"] +[ext_resource type="PackedScene" uid="uid://c5fgw7t45p7r6" path="res://Models/Cyberamics/Cyber Chuck.glb" id="4_ajb2q"] [ext_resource type="PackedScene" uid="uid://ba7i8p8olef2s" path="res://Models/Cyberamics/Cyber Jasper.glb" id="4_t4ere"] [ext_resource type="PackedScene" uid="uid://c6n4otfble154" path="res://Models/Balcony/BalconyStage.glb" id="5_45mf1"] [ext_resource type="PackedScene" uid="uid://dmh5upwts8y11" path="res://Models/Cyberamics/Warblettes.glb" id="5_ocq6y"] [ext_resource type="PackedScene" uid="uid://doxu4tb5jfoqp" path="res://Models/Cyberamics/Cyber Munch.glb" id="5_vcb31"] +[ext_resource type="PackedScene" uid="uid://bp5u5t6yu4ejy" path="res://Models/Cyberamics/Cyber Pasqually.glb" id="6_ajb2q"] [ext_resource type="Script" uid="uid://d1p4ite8ts2wi" path="res://Scripts/LightController.gd" id="6_j8jbd"] [sub_resource type="Environment" id="Environment_w3m2i"] @@ -14,11 +15,15 @@ ambient_light_source = 1 [node name="Balcony" type="Node3D"] +[node name="Munch" parent="." instance=ExtResource("5_vcb31")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.5, 3, -0.5) +script = ExtResource("2_t4ere") + [node name="Jasper" parent="." instance=ExtResource("4_t4ere")] transform = Transform3D(0.866025, 0, 0.5, 0, 1, 0, -0.5, 0, 0.866025, -2.2, 3, -0.5) script = ExtResource("2_t4ere") -[node name="Chuck" parent="." instance=ExtResource("3_45mf1")] +[node name="Chuck" parent="." instance=ExtResource("4_ajb2q")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3, -0.5) script = ExtResource("2_t4ere") @@ -26,8 +31,8 @@ script = ExtResource("2_t4ere") transform = Transform3D(0.866025, 0, -0.5, 0, 1, 0, 0.5, 0, 0.866025, 2.2, 3, -0.5) script = ExtResource("2_t4ere") -[node name="Munch" parent="." instance=ExtResource("5_vcb31")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.5, 3, -0.5) +[node name="Pasqually" parent="." instance=ExtResource("6_ajb2q")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.5, 3, -0.5) script = ExtResource("2_t4ere") [node name="Warblettes" parent="." instance=ExtResource("5_ocq6y")] diff --git a/Scenes/Stages/CStage.tscn b/Scenes/Stages/CStage.tscn index 33ccdee..04b08a7 100644 --- a/Scenes/Stages/CStage.tscn +++ b/Scenes/Stages/CStage.tscn @@ -1,10 +1,11 @@ -[gd_scene load_steps=9 format=3 uid="uid://jjd2nlorrml3"] +[gd_scene load_steps=10 format=3 uid="uid://jjd2nlorrml3"] [ext_resource type="PackedScene" uid="uid://ba7i8p8olef2s" path="res://Models/Cyberamics/Cyber Jasper.glb" id="1_nkhpr"] [ext_resource type="Script" uid="uid://bu68w4jnh0n2b" path="res://Scripts/AnimatronicController.gd" id="2_bawsr"] -[ext_resource type="PackedScene" uid="uid://c2j62syov3skq" path="res://Models/Cyberamics/Cyberamic Chuck.glb" id="3_8cbs4"] +[ext_resource type="PackedScene" uid="uid://c5fgw7t45p7r6" path="res://Models/Cyberamics/Cyber Chuck.glb" id="4_nkhpr"] [ext_resource type="PackedScene" uid="uid://d34xfaignny8j" path="res://Models/Cyberamics/Cyber Helen.glb" id="4_vmyhs"] [ext_resource type="PackedScene" uid="uid://doxu4tb5jfoqp" path="res://Models/Cyberamics/Cyber Munch.glb" id="5_byvoj"] +[ext_resource type="PackedScene" uid="uid://bp5u5t6yu4ejy" path="res://Models/Cyberamics/Cyber Pasqually.glb" id="6_nkhpr"] [ext_resource type="PackedScene" uid="uid://dfw3sbg135u2h" path="res://Models/CStage/CStage.glb" id="7_1s7sj"] [ext_resource type="Script" uid="uid://d1p4ite8ts2wi" path="res://Scripts/LightController.gd" id="7_fp2rj"] @@ -13,11 +14,15 @@ ambient_light_source = 1 [node name="CStage" type="Node3D"] +[node name="Munch" parent="." instance=ExtResource("5_byvoj")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.5, 3, 0) +script = ExtResource("2_bawsr") + [node name="Jasper" parent="." instance=ExtResource("1_nkhpr")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.25, 3, 0) script = ExtResource("2_bawsr") -[node name="Chuck" parent="." instance=ExtResource("3_8cbs4")] +[node name="Chuck" parent="." instance=ExtResource("4_nkhpr")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3, 0) script = ExtResource("2_bawsr") @@ -25,8 +30,8 @@ script = ExtResource("2_bawsr") transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.25, 3, 0) script = ExtResource("2_bawsr") -[node name="Munch" parent="." instance=ExtResource("5_byvoj")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.5, 3, 0) +[node name="Pasqually" parent="." instance=ExtResource("6_nkhpr")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.5, 3, 0) script = ExtResource("2_bawsr") [node name="Spots" type="Node3D" parent="."] @@ -289,7 +294,7 @@ transform = Transform3D(1, 0, 0, 0, 0.965926, 0.258819, 0, -0.258819, 0.965926, fov = 60.0 [node name="Angle 4" type="Camera3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 0.996195, 0.0871557, 0, -0.0871557, 0.996195, 0, 4.75, 6) +transform = Transform3D(1, 0, 0, 0, 0.984267, 0.17669, 0, -0.17669, 0.984267, 0, 4.75, 6.32348) fov = 60.0 [node name="Angle 5" type="Camera3D" parent="."] diff --git a/Scenes/Stages/ChuckEsCorner.tscn b/Scenes/Stages/ChuckEsCorner.tscn index 9f1dbf9..7255299 100644 --- a/Scenes/Stages/ChuckEsCorner.tscn +++ b/Scenes/Stages/ChuckEsCorner.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=7 format=3 uid="uid://dw3eplmapm5gc"] -[ext_resource type="PackedScene" uid="uid://c2j62syov3skq" path="res://Models/Cyberamics/Cyberamic Chuck.glb" id="1_t27ru"] +[ext_resource type="PackedScene" uid="uid://c5fgw7t45p7r6" path="res://Models/Cyberamics/Cyber Chuck.glb" id="1_t27ru"] [ext_resource type="Script" uid="uid://bu68w4jnh0n2b" path="res://Scripts/AnimatronicController.gd" id="2_8qvk7"] [ext_resource type="PackedScene" uid="uid://bv66hlbvtekho" path="res://Models/ChuckEsCorner/ChuckEsCornerStage.glb" id="3_8qvk7"] [ext_resource type="PackedScene" uid="uid://dmh5upwts8y11" path="res://Models/Cyberamics/Warblettes.glb" id="3_t27ru"] diff --git a/Scripts/EditorScreen.gd b/Scripts/EditorScreen.gd index 5959687..62cc8ef 100644 --- a/Scripts/EditorScreen.gd +++ b/Scripts/EditorScreen.gd @@ -409,6 +409,68 @@ var ptt_default_cosmetics = { "Munch/Munch/Skeleton3D/Shoes": true, }, }, + + "Pasqually Body": + { + "PTT": + { + "Pasqually/Pasqually/Skeleton3D/PTT Torso": true, + "Pasqually/Pasqually/Skeleton3D/PTT Arms": true, + "Pasqually/Pasqually/Skeleton3D/PTT Left Hand": true, + "Pasqually/Pasqually/Skeleton3D/PTT Right Hand": true, + "Pasqually/Pasqually/Skeleton3D/Modern Torso": false, + "Pasqually/Pasqually/Skeleton3D/Modern Arms": false, + "Pasqually/Pasqually/Skeleton3D/Modern Left Hand": false, + "Pasqually/Pasqually/Skeleton3D/Modern Right Hand": false, + }, + "Modern": + { + "Munch/Munch/Skeleton3D/PTT Torso": false, + "Munch/Munch/Skeleton3D/PTT Arms": false, + "Munch/Munch/Skeleton3D/PTT Left Hand": false, + "Munch/Munch/Skeleton3D/PTT Right Hand": false, + "Munch/Munch/Skeleton3D/Modern Torso": true, + "Munch/Munch/Skeleton3D/Modern Arms": true, + "Munch/Munch/Skeleton3D/Modern Left Hand": true, + "Munch/Munch/Skeleton3D/Modern Right Hand": true, + }, + }, + + "Pasqually Legs": + { + "None": + { + "Pasqually/Pasqually/Skeleton3D/Shoes": false, + }, + }, + + "Pasqually Held Item": + { + "Accordion": + { + "Pasqually/Pasqually/Skeleton3D/Spoons": false, + "Pasqually/Pasqually/Skeleton3D/Drumsticks": false, + "Pasqually/Pasqually/Skeleton3D/Accordion": true, + }, + "None": + { + "Pasqually/Pasqually/Skeleton3D/Spoons": false, + "Pasqually/Pasqually/Skeleton3D/Drumsticks": false, + "Pasqually/Pasqually/Skeleton3D/Accordion": false, + }, + "Spoons": + { + "Pasqually/Pasqually/Skeleton3D/Spoons": true, + "Pasqually/Pasqually/Skeleton3D/Drumsticks": false, + "Pasqually/Pasqually/Skeleton3D/Accordion": false, + }, + "Drumsticks": + { + "Pasqually/Pasqually/Skeleton3D/Spoons": false, + "Pasqually/Pasqually/Skeleton3D/Drumsticks": true, + "Pasqually/Pasqually/Skeleton3D/Accordion": false, + }, + }, } var stages_info = { @@ -792,6 +854,14 @@ var stages_info = { 30: { "bot": "Jasper", "movement": "Eyes Right", "flow_in": 4.0, "flow_out": 3.0 }, 31: { "bot": "Jasper", "movement": "Eyelids", "flow_in": 7.5, "flow_out": 5.0 }, 32: { "bot": "Jasper", "movement": "Strum", "flow_in": 2.0, "flow_out": 1.0 }, + 33: { "bot": "Pasqually", "movement": "Mouth", "flow_in": 7.5, "flow_out": 6.0 }, + 34: { "bot": "Pasqually", "movement": "Head Left", "flow_in": 1.0, "flow_out": 1.0 }, + 35: { "bot": "Pasqually", "movement": "Head Right", "flow_in": 1.0, "flow_out": 1.0 }, + 36: { "bot": "Pasqually", "movement": "Eyes Left", "flow_in": 4.0, "flow_out": 3.0 }, + 37: { "bot": "Pasqually", "movement": "Eyes Right", "flow_in": 4.0, "flow_out": 3.0 }, + 38: { "bot": "Pasqually", "movement": "Eyelids", "flow_in": 7.5, "flow_out": 5.0 }, + 39: { "bot": "Pasqually", "movement": "Right Arm", "flow_in": 2.0, "flow_out": 1.0 }, + 40: { "bot": "Pasqually", "movement": "Left Arm", "flow_in": 2.0, "flow_out": 1.0 }, 41: { "bot": "Warblettes", "movement": "Mouth", "flow_in": 4.0, "flow_out": 3.0 }, 44: { "bot": "Warblettes", "movement": "Body Rock", "flow_in": 1.0, "flow_out": 1.0 }, 50: { "bot": "Spots", "movement": "Chuck", "flow_in": "None", "flow_out": "None" }, @@ -868,6 +938,14 @@ var stages_info = { 30: { "bot": "Jasper", "movement": "Eyes Right", "flow_in": 4.0, "flow_out": 3.0 }, 31: { "bot": "Jasper", "movement": "Eyelids", "flow_in": 7.5, "flow_out": 5.0 }, 32: { "bot": "Jasper", "movement": "Strum", "flow_in": 2.0, "flow_out": 1.0 }, + 33: { "bot": "Pasqually", "movement": "Mouth", "flow_in": 7.5, "flow_out": 6.0 }, + 34: { "bot": "Pasqually", "movement": "Head Left", "flow_in": 1.0, "flow_out": 1.0 }, + 35: { "bot": "Pasqually", "movement": "Head Right", "flow_in": 1.0, "flow_out": 1.0 }, + 36: { "bot": "Pasqually", "movement": "Eyes Left", "flow_in": 4.0, "flow_out": 3.0 }, + 37: { "bot": "Pasqually", "movement": "Eyes Right", "flow_in": 4.0, "flow_out": 3.0 }, + 38: { "bot": "Pasqually", "movement": "Eyelids", "flow_in": 7.5, "flow_out": 5.0 }, + 39: { "bot": "Pasqually", "movement": "Right Arm", "flow_in": 2.0, "flow_out": 1.0 }, + 40: { "bot": "Pasqually", "movement": "Left Arm", "flow_in": 2.0, "flow_out": 1.0 }, 50: { "bot": "Spots", "movement": "Chuck", "flow_in": "None", "flow_out": "None" }, 51: { "bot": "Spots", "movement": "Helen", "flow_in": "None", "flow_out": "None" }, 52: { "bot": "Spots", "movement": "Munch", "flow_in": "None", "flow_out": "None" }, @@ -1120,6 +1198,9 @@ func _on_showtape_save_out_browse_button_pressed() -> void: $SaveShowtapeFileDialog.show() func _on_showtape_save_create_button_pressed() -> void: + if ($ShowtapeSaveScreen/DialogPanel/OutFilePath.text == ""): + $NoFileSpecified.show() + return var header = "UST,2,"+show_name.replace(",", "_").replace(";", "_")+","+stages_info[current_stage]["ust_type"]+";" var data_out_string = save_data() var file = FileAccess.open($ShowtapeSaveScreen/DialogPanel/OutFilePath.text, FileAccess.WRITE)