From f33f0a26d3e44306678f32f0dfca498ae2408ae1 Mon Sep 17 00:00:00 2001 From: Techwizz Date: Thu, 16 Mar 2023 21:42:32 -0600 Subject: [PATCH] Fixed #27 for real this time (I hope) --- characters/teddy/Teddy.gd | 6 ++++-- ...743de65735b80db47e8535_BrownFabric.png.import | 6 +++--- ...65735b80db47e8535_BrownFabricBelly.png.import | 6 +++--- ...5743de65735b80db47e8535_FabricNose.png.import | 6 +++--- .../teddy/model_glb/teddy_BrownFabric.png.import | 6 +++--- .../model_glb/teddy_BrownFabricBelly.png.import | 6 +++--- .../teddy/model_glb/teddy_FabricNose.png.import | 6 +++--- objects/toyland/toyland_BlockBlue.png.import | 6 +++--- objects/toyland/toyland_BlockGreen.png.import | 6 +++--- objects/toyland/toyland_BlockOrange.png.import | 6 +++--- objects/toyland/toyland_BlockPurple.png.import | 6 +++--- objects/toyland/toyland_BlockRed.png.import | 6 +++--- objects/toyland/toyland_BlockRed_18.png.import | 6 +++--- objects/toyland/toyland_BlockTan.png.import | 6 +++--- objects/toyland/toyland_BlockYellow.png.import | 6 +++--- objects/toyland/toyland_BookTEMP.png.import | 6 +++--- .../toyland_Carpet012_4K_Color.png.import | 6 +++--- .../toyland_Fabric001_2K_Color.png.import | 6 +++--- .../toyland_Fabric056_2K_Color.png.import | 6 +++--- objects/toyland/toyland_Metal.png.import | 6 +++--- .../toyland/toyland_Toy Blocks Box.png.import | 6 +++--- .../toyland/toyland_Wood067_2K_Color.png.import | 6 +++--- objects/toyland/toyland_newplaster.png.import | 6 +++--- objects/toyland/toyland_outlet.png.import | 6 +++--- objects/toyland/toyland_white door.png.import | 6 +++--- .../toyland_windows_xp_bliss-wide.png.import | 6 +++--- objects/toyland/toyland_woodfloor4k.png.import | 6 +++--- scenes/HUD.tscn | 1 + scenes/hostmenu.tscn | 4 ++-- scenes/mainmenu-background.tscn | 2 +- scripts/HUD.gd | 16 ++++++++-------- scripts/global.gd | 3 ++- 32 files changed, 96 insertions(+), 92 deletions(-) diff --git a/characters/teddy/Teddy.gd b/characters/teddy/Teddy.gd index 075c0cb..f66a54b 100644 --- a/characters/teddy/Teddy.gd +++ b/characters/teddy/Teddy.gd @@ -34,7 +34,8 @@ func _ready(): teddyName = str(self.get_path()) + '/nameLabel' $nameLabel.set_text("") teddyParent = get_node(selfTeddy).get_parent() - Global.teddyAuthorityID = teddyAuthority + if Global.teddyAuthorityID == null: + Global.teddyAuthorityID = teddyAuthority if is_multiplayer_authority(): $CollisionShape3D/Neck/Teddy.visible = false @@ -171,7 +172,8 @@ func _physics_process(delta): Global.consoleOpen = false # We remove the scene in console.gd if Global.roundInSession == false: if teddyAuthority == 1: - Global.HUDStartLabelText = "PRESS ENTER/RETURN TO START THE ROUND" + if Global.HUDStartLabelText == "": + Global.HUDStartLabelText = "PRESS ENTER/RETURN TO START THE ROUND" if Input.is_action_just_pressed("start_game"): if teddyAuthority == 1: Global.roundInSession = true diff --git a/characters/teddy/model/Teddy-de34648a55743de65735b80db47e8535_BrownFabric.png.import b/characters/teddy/model/Teddy-de34648a55743de65735b80db47e8535_BrownFabric.png.import index 1384fc5..fc91657 100644 --- a/characters/teddy/model/Teddy-de34648a55743de65735b80db47e8535_BrownFabric.png.import +++ b/characters/teddy/model/Teddy-de34648a55743de65735b80db47e8535_BrownFabric.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://cro0qy8p8j1nc" -path.etc2="res://.godot/imported/Teddy-de34648a55743de65735b80db47e8535_BrownFabric.png-e262ea1b1791f537d156e62ada10e3d9.etc2.ctex" +path.s3tc="res://.godot/imported/Teddy-de34648a55743de65735b80db47e8535_BrownFabric.png-e262ea1b1791f537d156e62ada10e3d9.s3tc.ctex" metadata={ -"imported_formats": ["etc2_astc"], +"imported_formats": ["s3tc_bptc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://characters/teddy/model/Teddy-de34648a55743de65735b80db47e8535_BrownFabric.png" -dest_files=["res://.godot/imported/Teddy-de34648a55743de65735b80db47e8535_BrownFabric.png-e262ea1b1791f537d156e62ada10e3d9.etc2.ctex"] +dest_files=["res://.godot/imported/Teddy-de34648a55743de65735b80db47e8535_BrownFabric.png-e262ea1b1791f537d156e62ada10e3d9.s3tc.ctex"] [params] diff --git a/characters/teddy/model/Teddy-de34648a55743de65735b80db47e8535_BrownFabricBelly.png.import b/characters/teddy/model/Teddy-de34648a55743de65735b80db47e8535_BrownFabricBelly.png.import index adc6a62..3fac468 100644 --- a/characters/teddy/model/Teddy-de34648a55743de65735b80db47e8535_BrownFabricBelly.png.import +++ b/characters/teddy/model/Teddy-de34648a55743de65735b80db47e8535_BrownFabricBelly.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://t4uhkvweq55l" -path.etc2="res://.godot/imported/Teddy-de34648a55743de65735b80db47e8535_BrownFabricBelly.png-f48e4aaa79e2a0cf3814c7dbef28823a.etc2.ctex" +path.s3tc="res://.godot/imported/Teddy-de34648a55743de65735b80db47e8535_BrownFabricBelly.png-f48e4aaa79e2a0cf3814c7dbef28823a.s3tc.ctex" metadata={ -"imported_formats": ["etc2_astc"], +"imported_formats": ["s3tc_bptc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://characters/teddy/model/Teddy-de34648a55743de65735b80db47e8535_BrownFabricBelly.png" -dest_files=["res://.godot/imported/Teddy-de34648a55743de65735b80db47e8535_BrownFabricBelly.png-f48e4aaa79e2a0cf3814c7dbef28823a.etc2.ctex"] +dest_files=["res://.godot/imported/Teddy-de34648a55743de65735b80db47e8535_BrownFabricBelly.png-f48e4aaa79e2a0cf3814c7dbef28823a.s3tc.ctex"] [params] diff --git a/characters/teddy/model/Teddy-de34648a55743de65735b80db47e8535_FabricNose.png.import b/characters/teddy/model/Teddy-de34648a55743de65735b80db47e8535_FabricNose.png.import index 82c55fb..2b6b749 100644 --- a/characters/teddy/model/Teddy-de34648a55743de65735b80db47e8535_FabricNose.png.import +++ b/characters/teddy/model/Teddy-de34648a55743de65735b80db47e8535_FabricNose.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://c1fr5ak803h0k" -path.etc2="res://.godot/imported/Teddy-de34648a55743de65735b80db47e8535_FabricNose.png-12c7438645ca0861b049ecee40b0b65c.etc2.ctex" +path.s3tc="res://.godot/imported/Teddy-de34648a55743de65735b80db47e8535_FabricNose.png-12c7438645ca0861b049ecee40b0b65c.s3tc.ctex" metadata={ -"imported_formats": ["etc2_astc"], +"imported_formats": ["s3tc_bptc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://characters/teddy/model/Teddy-de34648a55743de65735b80db47e8535_FabricNose.png" -dest_files=["res://.godot/imported/Teddy-de34648a55743de65735b80db47e8535_FabricNose.png-12c7438645ca0861b049ecee40b0b65c.etc2.ctex"] +dest_files=["res://.godot/imported/Teddy-de34648a55743de65735b80db47e8535_FabricNose.png-12c7438645ca0861b049ecee40b0b65c.s3tc.ctex"] [params] diff --git a/characters/teddy/model_glb/teddy_BrownFabric.png.import b/characters/teddy/model_glb/teddy_BrownFabric.png.import index 7256841..fad6ae5 100644 --- a/characters/teddy/model_glb/teddy_BrownFabric.png.import +++ b/characters/teddy/model_glb/teddy_BrownFabric.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://bcx8hi3wfgmjm" -path.etc2="res://.godot/imported/teddy_BrownFabric.png-a0848c50880febd342859d548681f9c4.etc2.ctex" +path.s3tc="res://.godot/imported/teddy_BrownFabric.png-a0848c50880febd342859d548681f9c4.s3tc.ctex" metadata={ -"imported_formats": ["etc2_astc"], +"imported_formats": ["s3tc_bptc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://characters/teddy/model_glb/teddy_BrownFabric.png" -dest_files=["res://.godot/imported/teddy_BrownFabric.png-a0848c50880febd342859d548681f9c4.etc2.ctex"] +dest_files=["res://.godot/imported/teddy_BrownFabric.png-a0848c50880febd342859d548681f9c4.s3tc.ctex"] [params] diff --git a/characters/teddy/model_glb/teddy_BrownFabricBelly.png.import b/characters/teddy/model_glb/teddy_BrownFabricBelly.png.import index b2e1542..6b7cc08 100644 --- a/characters/teddy/model_glb/teddy_BrownFabricBelly.png.import +++ b/characters/teddy/model_glb/teddy_BrownFabricBelly.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://b25on3sg58fj0" -path.etc2="res://.godot/imported/teddy_BrownFabricBelly.png-1bd897be98ecc156ecc97dbffeccc079.etc2.ctex" +path.s3tc="res://.godot/imported/teddy_BrownFabricBelly.png-1bd897be98ecc156ecc97dbffeccc079.s3tc.ctex" metadata={ -"imported_formats": ["etc2_astc"], +"imported_formats": ["s3tc_bptc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://characters/teddy/model_glb/teddy_BrownFabricBelly.png" -dest_files=["res://.godot/imported/teddy_BrownFabricBelly.png-1bd897be98ecc156ecc97dbffeccc079.etc2.ctex"] +dest_files=["res://.godot/imported/teddy_BrownFabricBelly.png-1bd897be98ecc156ecc97dbffeccc079.s3tc.ctex"] [params] diff --git a/characters/teddy/model_glb/teddy_FabricNose.png.import b/characters/teddy/model_glb/teddy_FabricNose.png.import index d8bb62d..06f583b 100644 --- a/characters/teddy/model_glb/teddy_FabricNose.png.import +++ b/characters/teddy/model_glb/teddy_FabricNose.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://r61f275fmhx0" -path.etc2="res://.godot/imported/teddy_FabricNose.png-d56f6fc7c66beaf71d8f62ebfefbaa3e.etc2.ctex" +path.s3tc="res://.godot/imported/teddy_FabricNose.png-d56f6fc7c66beaf71d8f62ebfefbaa3e.s3tc.ctex" metadata={ -"imported_formats": ["etc2_astc"], +"imported_formats": ["s3tc_bptc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://characters/teddy/model_glb/teddy_FabricNose.png" -dest_files=["res://.godot/imported/teddy_FabricNose.png-d56f6fc7c66beaf71d8f62ebfefbaa3e.etc2.ctex"] +dest_files=["res://.godot/imported/teddy_FabricNose.png-d56f6fc7c66beaf71d8f62ebfefbaa3e.s3tc.ctex"] [params] diff --git a/objects/toyland/toyland_BlockBlue.png.import b/objects/toyland/toyland_BlockBlue.png.import index a598e8e..9ee8002 100644 --- a/objects/toyland/toyland_BlockBlue.png.import +++ b/objects/toyland/toyland_BlockBlue.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://bo7jvntxkhppu" -path.etc2="res://.godot/imported/toyland_BlockBlue.png-a52adfdc8686bc65ad5f9a5780e179d8.etc2.ctex" +path.s3tc="res://.godot/imported/toyland_BlockBlue.png-a52adfdc8686bc65ad5f9a5780e179d8.s3tc.ctex" metadata={ -"imported_formats": ["etc2_astc"], +"imported_formats": ["s3tc_bptc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_BlockBlue.png" -dest_files=["res://.godot/imported/toyland_BlockBlue.png-a52adfdc8686bc65ad5f9a5780e179d8.etc2.ctex"] +dest_files=["res://.godot/imported/toyland_BlockBlue.png-a52adfdc8686bc65ad5f9a5780e179d8.s3tc.ctex"] [params] diff --git a/objects/toyland/toyland_BlockGreen.png.import b/objects/toyland/toyland_BlockGreen.png.import index ee21d42..c065940 100644 --- a/objects/toyland/toyland_BlockGreen.png.import +++ b/objects/toyland/toyland_BlockGreen.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://vwuoaxh1iwdu" -path.etc2="res://.godot/imported/toyland_BlockGreen.png-5814475d1a0c89ec7c608da4846b49c5.etc2.ctex" +path.s3tc="res://.godot/imported/toyland_BlockGreen.png-5814475d1a0c89ec7c608da4846b49c5.s3tc.ctex" metadata={ -"imported_formats": ["etc2_astc"], +"imported_formats": ["s3tc_bptc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_BlockGreen.png" -dest_files=["res://.godot/imported/toyland_BlockGreen.png-5814475d1a0c89ec7c608da4846b49c5.etc2.ctex"] +dest_files=["res://.godot/imported/toyland_BlockGreen.png-5814475d1a0c89ec7c608da4846b49c5.s3tc.ctex"] [params] diff --git a/objects/toyland/toyland_BlockOrange.png.import b/objects/toyland/toyland_BlockOrange.png.import index 3eb7ba9..60741ee 100644 --- a/objects/toyland/toyland_BlockOrange.png.import +++ b/objects/toyland/toyland_BlockOrange.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://56wkrfm5ikxn" -path.etc2="res://.godot/imported/toyland_BlockOrange.png-31f8be914355966bedab55ef5995366e.etc2.ctex" +path.s3tc="res://.godot/imported/toyland_BlockOrange.png-31f8be914355966bedab55ef5995366e.s3tc.ctex" metadata={ -"imported_formats": ["etc2_astc"], +"imported_formats": ["s3tc_bptc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_BlockOrange.png" -dest_files=["res://.godot/imported/toyland_BlockOrange.png-31f8be914355966bedab55ef5995366e.etc2.ctex"] +dest_files=["res://.godot/imported/toyland_BlockOrange.png-31f8be914355966bedab55ef5995366e.s3tc.ctex"] [params] diff --git a/objects/toyland/toyland_BlockPurple.png.import b/objects/toyland/toyland_BlockPurple.png.import index 8d0c9c3..3df59fe 100644 --- a/objects/toyland/toyland_BlockPurple.png.import +++ b/objects/toyland/toyland_BlockPurple.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://d4j8vsjlnhhhv" -path.etc2="res://.godot/imported/toyland_BlockPurple.png-9983b4ce99c2af8139af423f8e3afc17.etc2.ctex" +path.s3tc="res://.godot/imported/toyland_BlockPurple.png-9983b4ce99c2af8139af423f8e3afc17.s3tc.ctex" metadata={ -"imported_formats": ["etc2_astc"], +"imported_formats": ["s3tc_bptc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_BlockPurple.png" -dest_files=["res://.godot/imported/toyland_BlockPurple.png-9983b4ce99c2af8139af423f8e3afc17.etc2.ctex"] +dest_files=["res://.godot/imported/toyland_BlockPurple.png-9983b4ce99c2af8139af423f8e3afc17.s3tc.ctex"] [params] diff --git a/objects/toyland/toyland_BlockRed.png.import b/objects/toyland/toyland_BlockRed.png.import index acce9af..b26e6d8 100644 --- a/objects/toyland/toyland_BlockRed.png.import +++ b/objects/toyland/toyland_BlockRed.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://bkp5ureoqykyg" -path.etc2="res://.godot/imported/toyland_BlockRed.png-cdd24aaa97dc9516a0656c73d5e3f0b5.etc2.ctex" +path.s3tc="res://.godot/imported/toyland_BlockRed.png-cdd24aaa97dc9516a0656c73d5e3f0b5.s3tc.ctex" metadata={ -"imported_formats": ["etc2_astc"], +"imported_formats": ["s3tc_bptc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_BlockRed.png" -dest_files=["res://.godot/imported/toyland_BlockRed.png-cdd24aaa97dc9516a0656c73d5e3f0b5.etc2.ctex"] +dest_files=["res://.godot/imported/toyland_BlockRed.png-cdd24aaa97dc9516a0656c73d5e3f0b5.s3tc.ctex"] [params] diff --git a/objects/toyland/toyland_BlockRed_18.png.import b/objects/toyland/toyland_BlockRed_18.png.import index 2e99be5..8bc8d65 100644 --- a/objects/toyland/toyland_BlockRed_18.png.import +++ b/objects/toyland/toyland_BlockRed_18.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://3xwvv7w5ktrw" -path.etc2="res://.godot/imported/toyland_BlockRed_18.png-400bcbd8ef6ab3c84f7e4b25ea5eb629.etc2.ctex" +path.s3tc="res://.godot/imported/toyland_BlockRed_18.png-400bcbd8ef6ab3c84f7e4b25ea5eb629.s3tc.ctex" metadata={ -"imported_formats": ["etc2_astc"], +"imported_formats": ["s3tc_bptc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_BlockRed_18.png" -dest_files=["res://.godot/imported/toyland_BlockRed_18.png-400bcbd8ef6ab3c84f7e4b25ea5eb629.etc2.ctex"] +dest_files=["res://.godot/imported/toyland_BlockRed_18.png-400bcbd8ef6ab3c84f7e4b25ea5eb629.s3tc.ctex"] [params] diff --git a/objects/toyland/toyland_BlockTan.png.import b/objects/toyland/toyland_BlockTan.png.import index c8f3a51..b967973 100644 --- a/objects/toyland/toyland_BlockTan.png.import +++ b/objects/toyland/toyland_BlockTan.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://yjj7ejf6mkxt" -path.etc2="res://.godot/imported/toyland_BlockTan.png-a782891763a3230847d4a3dcd0880a12.etc2.ctex" +path.s3tc="res://.godot/imported/toyland_BlockTan.png-a782891763a3230847d4a3dcd0880a12.s3tc.ctex" metadata={ -"imported_formats": ["etc2_astc"], +"imported_formats": ["s3tc_bptc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_BlockTan.png" -dest_files=["res://.godot/imported/toyland_BlockTan.png-a782891763a3230847d4a3dcd0880a12.etc2.ctex"] +dest_files=["res://.godot/imported/toyland_BlockTan.png-a782891763a3230847d4a3dcd0880a12.s3tc.ctex"] [params] diff --git a/objects/toyland/toyland_BlockYellow.png.import b/objects/toyland/toyland_BlockYellow.png.import index dd6baab..600df44 100644 --- a/objects/toyland/toyland_BlockYellow.png.import +++ b/objects/toyland/toyland_BlockYellow.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://e458sexc3r07" -path.etc2="res://.godot/imported/toyland_BlockYellow.png-2ceec08f7b413fed128f0e0020357d0f.etc2.ctex" +path.s3tc="res://.godot/imported/toyland_BlockYellow.png-2ceec08f7b413fed128f0e0020357d0f.s3tc.ctex" metadata={ -"imported_formats": ["etc2_astc"], +"imported_formats": ["s3tc_bptc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_BlockYellow.png" -dest_files=["res://.godot/imported/toyland_BlockYellow.png-2ceec08f7b413fed128f0e0020357d0f.etc2.ctex"] +dest_files=["res://.godot/imported/toyland_BlockYellow.png-2ceec08f7b413fed128f0e0020357d0f.s3tc.ctex"] [params] diff --git a/objects/toyland/toyland_BookTEMP.png.import b/objects/toyland/toyland_BookTEMP.png.import index cbd98df..177c345 100644 --- a/objects/toyland/toyland_BookTEMP.png.import +++ b/objects/toyland/toyland_BookTEMP.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://ce0qey274v0xt" -path.etc2="res://.godot/imported/toyland_BookTEMP.png-68be4988e0a6c940ad9863dbe326d246.etc2.ctex" +path.s3tc="res://.godot/imported/toyland_BookTEMP.png-68be4988e0a6c940ad9863dbe326d246.s3tc.ctex" metadata={ -"imported_formats": ["etc2_astc"], +"imported_formats": ["s3tc_bptc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_BookTEMP.png" -dest_files=["res://.godot/imported/toyland_BookTEMP.png-68be4988e0a6c940ad9863dbe326d246.etc2.ctex"] +dest_files=["res://.godot/imported/toyland_BookTEMP.png-68be4988e0a6c940ad9863dbe326d246.s3tc.ctex"] [params] diff --git a/objects/toyland/toyland_Carpet012_4K_Color.png.import b/objects/toyland/toyland_Carpet012_4K_Color.png.import index ca2a56b..e669505 100644 --- a/objects/toyland/toyland_Carpet012_4K_Color.png.import +++ b/objects/toyland/toyland_Carpet012_4K_Color.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://brjtbiny72xas" -path.etc2="res://.godot/imported/toyland_Carpet012_4K_Color.png-150aed057e3b394b36294bd2766cb931.etc2.ctex" +path.s3tc="res://.godot/imported/toyland_Carpet012_4K_Color.png-150aed057e3b394b36294bd2766cb931.s3tc.ctex" metadata={ -"imported_formats": ["etc2_astc"], +"imported_formats": ["s3tc_bptc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_Carpet012_4K_Color.png" -dest_files=["res://.godot/imported/toyland_Carpet012_4K_Color.png-150aed057e3b394b36294bd2766cb931.etc2.ctex"] +dest_files=["res://.godot/imported/toyland_Carpet012_4K_Color.png-150aed057e3b394b36294bd2766cb931.s3tc.ctex"] [params] diff --git a/objects/toyland/toyland_Fabric001_2K_Color.png.import b/objects/toyland/toyland_Fabric001_2K_Color.png.import index f5cdf58..53369d1 100644 --- a/objects/toyland/toyland_Fabric001_2K_Color.png.import +++ b/objects/toyland/toyland_Fabric001_2K_Color.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://dvpx4klulv3r5" -path.etc2="res://.godot/imported/toyland_Fabric001_2K_Color.png-e2cb42c432b43221fc167225f08b3de1.etc2.ctex" +path.s3tc="res://.godot/imported/toyland_Fabric001_2K_Color.png-e2cb42c432b43221fc167225f08b3de1.s3tc.ctex" metadata={ -"imported_formats": ["etc2_astc"], +"imported_formats": ["s3tc_bptc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_Fabric001_2K_Color.png" -dest_files=["res://.godot/imported/toyland_Fabric001_2K_Color.png-e2cb42c432b43221fc167225f08b3de1.etc2.ctex"] +dest_files=["res://.godot/imported/toyland_Fabric001_2K_Color.png-e2cb42c432b43221fc167225f08b3de1.s3tc.ctex"] [params] diff --git a/objects/toyland/toyland_Fabric056_2K_Color.png.import b/objects/toyland/toyland_Fabric056_2K_Color.png.import index 9409df9..e4aa165 100644 --- a/objects/toyland/toyland_Fabric056_2K_Color.png.import +++ b/objects/toyland/toyland_Fabric056_2K_Color.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://dyfe0td3jm5m2" -path.etc2="res://.godot/imported/toyland_Fabric056_2K_Color.png-d2cc9e7a6e2ff1021c46721ca2a5f483.etc2.ctex" +path.s3tc="res://.godot/imported/toyland_Fabric056_2K_Color.png-d2cc9e7a6e2ff1021c46721ca2a5f483.s3tc.ctex" metadata={ -"imported_formats": ["etc2_astc"], +"imported_formats": ["s3tc_bptc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_Fabric056_2K_Color.png" -dest_files=["res://.godot/imported/toyland_Fabric056_2K_Color.png-d2cc9e7a6e2ff1021c46721ca2a5f483.etc2.ctex"] +dest_files=["res://.godot/imported/toyland_Fabric056_2K_Color.png-d2cc9e7a6e2ff1021c46721ca2a5f483.s3tc.ctex"] [params] diff --git a/objects/toyland/toyland_Metal.png.import b/objects/toyland/toyland_Metal.png.import index 26095f4..2d81f58 100644 --- a/objects/toyland/toyland_Metal.png.import +++ b/objects/toyland/toyland_Metal.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://dxi7lik787q0u" -path.etc2="res://.godot/imported/toyland_Metal.png-fb2306928aae15d8c05cd3f7d428f8b2.etc2.ctex" +path.s3tc="res://.godot/imported/toyland_Metal.png-fb2306928aae15d8c05cd3f7d428f8b2.s3tc.ctex" metadata={ -"imported_formats": ["etc2_astc"], +"imported_formats": ["s3tc_bptc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_Metal.png" -dest_files=["res://.godot/imported/toyland_Metal.png-fb2306928aae15d8c05cd3f7d428f8b2.etc2.ctex"] +dest_files=["res://.godot/imported/toyland_Metal.png-fb2306928aae15d8c05cd3f7d428f8b2.s3tc.ctex"] [params] diff --git a/objects/toyland/toyland_Toy Blocks Box.png.import b/objects/toyland/toyland_Toy Blocks Box.png.import index bd654ad..e6c88d5 100644 --- a/objects/toyland/toyland_Toy Blocks Box.png.import +++ b/objects/toyland/toyland_Toy Blocks Box.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://cq7us15jsbxwa" -path.etc2="res://.godot/imported/toyland_Toy Blocks Box.png-77c23bf266ede7360aee6c2a8af551d3.etc2.ctex" +path.s3tc="res://.godot/imported/toyland_Toy Blocks Box.png-77c23bf266ede7360aee6c2a8af551d3.s3tc.ctex" metadata={ -"imported_formats": ["etc2_astc"], +"imported_formats": ["s3tc_bptc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_Toy Blocks Box.png" -dest_files=["res://.godot/imported/toyland_Toy Blocks Box.png-77c23bf266ede7360aee6c2a8af551d3.etc2.ctex"] +dest_files=["res://.godot/imported/toyland_Toy Blocks Box.png-77c23bf266ede7360aee6c2a8af551d3.s3tc.ctex"] [params] diff --git a/objects/toyland/toyland_Wood067_2K_Color.png.import b/objects/toyland/toyland_Wood067_2K_Color.png.import index 06ba0cc..05895ba 100644 --- a/objects/toyland/toyland_Wood067_2K_Color.png.import +++ b/objects/toyland/toyland_Wood067_2K_Color.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://c84wp1eeof83o" -path.etc2="res://.godot/imported/toyland_Wood067_2K_Color.png-88d58072b673ae25da1f3e4fb3df5aab.etc2.ctex" +path.s3tc="res://.godot/imported/toyland_Wood067_2K_Color.png-88d58072b673ae25da1f3e4fb3df5aab.s3tc.ctex" metadata={ -"imported_formats": ["etc2_astc"], +"imported_formats": ["s3tc_bptc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_Wood067_2K_Color.png" -dest_files=["res://.godot/imported/toyland_Wood067_2K_Color.png-88d58072b673ae25da1f3e4fb3df5aab.etc2.ctex"] +dest_files=["res://.godot/imported/toyland_Wood067_2K_Color.png-88d58072b673ae25da1f3e4fb3df5aab.s3tc.ctex"] [params] diff --git a/objects/toyland/toyland_newplaster.png.import b/objects/toyland/toyland_newplaster.png.import index 1f4a449..9f71759 100644 --- a/objects/toyland/toyland_newplaster.png.import +++ b/objects/toyland/toyland_newplaster.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://cw686scwg66bl" -path.etc2="res://.godot/imported/toyland_newplaster.png-2e56bf44283ffffe4d8bac4c57043582.etc2.ctex" +path.s3tc="res://.godot/imported/toyland_newplaster.png-2e56bf44283ffffe4d8bac4c57043582.s3tc.ctex" metadata={ -"imported_formats": ["etc2_astc"], +"imported_formats": ["s3tc_bptc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_newplaster.png" -dest_files=["res://.godot/imported/toyland_newplaster.png-2e56bf44283ffffe4d8bac4c57043582.etc2.ctex"] +dest_files=["res://.godot/imported/toyland_newplaster.png-2e56bf44283ffffe4d8bac4c57043582.s3tc.ctex"] [params] diff --git a/objects/toyland/toyland_outlet.png.import b/objects/toyland/toyland_outlet.png.import index 69a1fc7..8fef017 100644 --- a/objects/toyland/toyland_outlet.png.import +++ b/objects/toyland/toyland_outlet.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://wh7nb85cisoc" -path.etc2="res://.godot/imported/toyland_outlet.png-152b0cb79ecd73aaf3419f7619f48c80.etc2.ctex" +path.s3tc="res://.godot/imported/toyland_outlet.png-152b0cb79ecd73aaf3419f7619f48c80.s3tc.ctex" metadata={ -"imported_formats": ["etc2_astc"], +"imported_formats": ["s3tc_bptc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_outlet.png" -dest_files=["res://.godot/imported/toyland_outlet.png-152b0cb79ecd73aaf3419f7619f48c80.etc2.ctex"] +dest_files=["res://.godot/imported/toyland_outlet.png-152b0cb79ecd73aaf3419f7619f48c80.s3tc.ctex"] [params] diff --git a/objects/toyland/toyland_white door.png.import b/objects/toyland/toyland_white door.png.import index 627fb52..4d1d78a 100644 --- a/objects/toyland/toyland_white door.png.import +++ b/objects/toyland/toyland_white door.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://d3bc7otex1q4o" -path.etc2="res://.godot/imported/toyland_white door.png-a69689bb62057806552eccfcc82952b1.etc2.ctex" +path.s3tc="res://.godot/imported/toyland_white door.png-a69689bb62057806552eccfcc82952b1.s3tc.ctex" metadata={ -"imported_formats": ["etc2_astc"], +"imported_formats": ["s3tc_bptc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_white door.png" -dest_files=["res://.godot/imported/toyland_white door.png-a69689bb62057806552eccfcc82952b1.etc2.ctex"] +dest_files=["res://.godot/imported/toyland_white door.png-a69689bb62057806552eccfcc82952b1.s3tc.ctex"] [params] diff --git a/objects/toyland/toyland_windows_xp_bliss-wide.png.import b/objects/toyland/toyland_windows_xp_bliss-wide.png.import index fc6ff84..df8baba 100644 --- a/objects/toyland/toyland_windows_xp_bliss-wide.png.import +++ b/objects/toyland/toyland_windows_xp_bliss-wide.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://cx6lua0t37lxi" -path.etc2="res://.godot/imported/toyland_windows_xp_bliss-wide.png-4deec299561dadd05f6a7830bf14662c.etc2.ctex" +path.s3tc="res://.godot/imported/toyland_windows_xp_bliss-wide.png-4deec299561dadd05f6a7830bf14662c.s3tc.ctex" metadata={ -"imported_formats": ["etc2_astc"], +"imported_formats": ["s3tc_bptc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_windows_xp_bliss-wide.png" -dest_files=["res://.godot/imported/toyland_windows_xp_bliss-wide.png-4deec299561dadd05f6a7830bf14662c.etc2.ctex"] +dest_files=["res://.godot/imported/toyland_windows_xp_bliss-wide.png-4deec299561dadd05f6a7830bf14662c.s3tc.ctex"] [params] diff --git a/objects/toyland/toyland_woodfloor4k.png.import b/objects/toyland/toyland_woodfloor4k.png.import index 449ece5..2fa9af0 100644 --- a/objects/toyland/toyland_woodfloor4k.png.import +++ b/objects/toyland/toyland_woodfloor4k.png.import @@ -3,9 +3,9 @@ importer="texture" type="CompressedTexture2D" uid="uid://bbwn5v87prkhy" -path.etc2="res://.godot/imported/toyland_woodfloor4k.png-4a943154d5a37396f9a7cf5a106c2a78.etc2.ctex" +path.s3tc="res://.godot/imported/toyland_woodfloor4k.png-4a943154d5a37396f9a7cf5a106c2a78.s3tc.ctex" metadata={ -"imported_formats": ["etc2_astc"], +"imported_formats": ["s3tc_bptc"], "vram_texture": true } generator_parameters={} @@ -13,7 +13,7 @@ generator_parameters={} [deps] source_file="res://objects/toyland/toyland_woodfloor4k.png" -dest_files=["res://.godot/imported/toyland_woodfloor4k.png-4a943154d5a37396f9a7cf5a106c2a78.etc2.ctex"] +dest_files=["res://.godot/imported/toyland_woodfloor4k.png-4a943154d5a37396f9a7cf5a106c2a78.s3tc.ctex"] [params] diff --git a/scenes/HUD.tscn b/scenes/HUD.tscn index 74d67d0..72952cf 100644 --- a/scenes/HUD.tscn +++ b/scenes/HUD.tscn @@ -190,6 +190,7 @@ offset_bottom = 82.0 [node name="Health" type="ProgressBar" parent="RunnerPanel"] modulate = Color(0.890196, 0.137255, 0.0156863, 1) +layout_mode = 0 offset_left = 5.0 offset_top = 35.0 offset_right = 210.0 diff --git a/scenes/hostmenu.tscn b/scenes/hostmenu.tscn index 6ba84af..9495624 100644 --- a/scenes/hostmenu.tscn +++ b/scenes/hostmenu.tscn @@ -182,8 +182,7 @@ text = "Respawn Time" horizontal_alignment = 1 [node name="Toyland" type="Sprite2D" parent="."] -visible = false -position = Vector2(407.556, 329) +position = Vector2(406, 287) scale = Vector2(0.653595, 0.653595) texture = ExtResource("3_rgmyq") @@ -206,6 +205,7 @@ button_pressed = true text = "Deathmatch" [node name="GamemodeRunner" type="CheckBox" parent="."] +layout_mode = 0 offset_left = 407.0 offset_top = 461.0 offset_right = 492.0 diff --git a/scenes/mainmenu-background.tscn b/scenes/mainmenu-background.tscn index 4309e5c..a22966f 100644 --- a/scenes/mainmenu-background.tscn +++ b/scenes/mainmenu-background.tscn @@ -3,7 +3,7 @@ [ext_resource type="PackedScene" uid="uid://csxkrtwsgmebb" path="res://objects/toyland/toyland.glb" id="1_bb18u"] [ext_resource type="Script" path="res://scripts/mainmenu-background.gd" id="1_nn4qs"] [ext_resource type="PackedScene" uid="uid://b3l10agcjfgdx" path="res://characters/teddy/model_glb/teddy.glb" id="2_mie3v"] -[ext_resource type="PackedScene" uid="uid://dtvtu8w6b5es0" path="res://scenes/mainmenu.tscn" id="3_bj3gc"] +[ext_resource type="PackedScene" uid="uid://cyiyctp6y3n3x" path="res://scenes/mainmenu.tscn" id="3_bj3gc"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_vpngx"] sky_horizon_color = Color(0.64625, 0.65575, 0.67075, 1) diff --git a/scripts/HUD.gd b/scripts/HUD.gd index 675c084..6aa63b1 100644 --- a/scripts/HUD.gd +++ b/scripts/HUD.gd @@ -33,9 +33,10 @@ func _process(delta): scoresInitalized = true fill_scores_with_zeros(Global.connectedPlayers.size()) if Global.gamemode == "Runner": - if runnerSelected == false: - runnerSelected = true - rpc("select_runner", Global.connectedPlayers, Global.connectedPlayersByPeerID) + if Global.teddyAuthorityID == 1: + if runnerSelected == false: + runnerSelected = true + select_runner(Global.connectedPlayers, Global.connectedPlayersByPeerID) if Global.runnerDead == true: print("RUNNER IS DEAD") rpc("runner_dead", Global.chosenRunner) @@ -74,18 +75,15 @@ func fill_scores_with_zeros(num_of_players): for i in num_of_players: scores[i] = 0 -@rpc("authority", "reliable", "call_local") func select_runner(players, playersID): var numOfPlayers = players.size() var getIndexSize = numOfPlayers - 1 var playerChosen = RandomNumberGenerator.new().randi_range(0, getIndexSize) var runner = players[playerChosen] Global.chosenRunner = runner - rpc("not_runner", Global.chosenRunner) rpc("selected_runner", runner) selected_runner(runner) - var index = players.find(runner) - var runnerID = playersID[index] + var runnerID = playersID[playerChosen] if runnerID == 1: runner_stats() else: @@ -94,9 +92,11 @@ func select_runner(players, playersID): @rpc("any_peer", "reliable") func selected_runner(player): + print(Global.connectedPlayersByPeerID) Global.chosenRunner = player + if Global.playerName != player: + not_runner(player) -@rpc("any_peer", "reliable") func not_runner(player): $RunnerPanel.visible = true Global.HUDStartLabelText = str(player + " is the runner!") diff --git a/scripts/global.gd b/scripts/global.gd index b612695..c59a636 100644 --- a/scripts/global.gd +++ b/scripts/global.gd @@ -33,7 +33,8 @@ var menuLightSwitch = false # No description provided var gamemode = "Deathmatch" # This is changed in host.gd var chosenRunner # Changed in HUD.gd var iAmRunner = false # Defines whether you're the runner or not. Used in HUD.gd -var runnerDead = false +var runnerDead = false # When the runner is dead, this goes true +var roundTimer = 300.0 # How long each rounds goes func _process(delta): if godMode: