Added support for loading whatever map the host is using

This commit is contained in:
Paul Black 2023-03-18 01:11:03 -06:00
parent c9fc172fc1
commit 81a2c8cf40
56 changed files with 1204 additions and 685 deletions

BIN
objects/gun/Gun.glb Normal file

Binary file not shown.

View file

@ -0,0 +1,32 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://dabv0m7iiccid"
path="res://.godot/imported/Gun.glb-bc2b35b9eba755e48c2f9e10b51bab31.scn"
[deps]
source_file="res://objects/gun/Gun.glb"
dest_files=["res://.godot/imported/Gun.glb-bc2b35b9eba755e48c2f9e10b51bab31.scn"]
[params]
nodes/root_type="Node3D"
nodes/root_name="Scene Root"
nodes/apply_root_scale=true
nodes/root_scale=1.0
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/embedded_image_handling=1

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 MiB

View file

@ -0,0 +1,36 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://dgka4ydbssadl"
path.s3tc="res://.godot/imported/Gun_Plastic008_2K_Color.png-bac889a853997f0060f4f61a5a6c9b9d.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
generator_parameters={}
[deps]
source_file="res://objects/gun/Gun_Plastic008_2K_Color.png"
dest_files=["res://.godot/imported/Gun_Plastic008_2K_Color.png-bac889a853997f0060f4f61a5a6c9b9d.s3tc.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

BIN
objects/islands/islands.glb Normal file

Binary file not shown.

View file

@ -0,0 +1,32 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://crywaktj6ioxd"
path="res://.godot/imported/islands.glb-1f687ccc37b271635501657513a00935.scn"
[deps]
source_file="res://objects/islands/islands.glb"
dest_files=["res://.godot/imported/islands.glb-1f687ccc37b271635501657513a00935.scn"]
[params]
nodes/root_type="Node3D"
nodes/root_name="Scene Root"
nodes/apply_root_scale=true
nodes/root_scale=1.0
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/embedded_image_handling=1

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.5 MiB

View file

@ -0,0 +1,36 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://cdk6chiam3anc"
path.s3tc="res://.godot/imported/islands_Grass.png-db6f4072658f0438a023a0bf18662123.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
generator_parameters={}
[deps]
source_file="res://objects/islands/islands_Grass.png"
dest_files=["res://.godot/imported/islands_Grass.png-db6f4072658f0438a023a0bf18662123.s3tc.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

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.6 MiB

View file

@ -0,0 +1,36 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://dv7q31i30hxan"
path.s3tc="res://.godot/imported/islands_PavingStones070_2K_Color.png-ad49b61aeded0d139e67a956816543d3.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
generator_parameters={}
[deps]
source_file="res://objects/islands/islands_PavingStones070_2K_Color.png"
dest_files=["res://.godot/imported/islands_PavingStones070_2K_Color.png-ad49b61aeded0d139e67a956816543d3.s3tc.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

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 MiB

View file

@ -0,0 +1,36 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://ewpl8ki53v7m"
path.s3tc="res://.godot/imported/islands_Planks.png-32f78ff052ecc8bbb0a32748f8f39661.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
generator_parameters={}
[deps]
source_file="res://objects/islands/islands_Planks.png"
dest_files=["res://.godot/imported/islands_Planks.png-32f78ff052ecc8bbb0a32748f8f39661.s3tc.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

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 MiB

View file

@ -0,0 +1,36 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://d4ltk0q7135vv"
path.s3tc="res://.godot/imported/islands_PlanksDark.png-4bbcc494d8ff043314b8491d94b9cf28.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
generator_parameters={}
[deps]
source_file="res://objects/islands/islands_PlanksDark.png"
dest_files=["res://.godot/imported/islands_PlanksDark.png-4bbcc494d8ff043314b8491d94b9cf28.s3tc.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

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.9 MiB

View file

@ -0,0 +1,36 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://baxt6ri4c4s8m"
path.s3tc="res://.godot/imported/islands_Rock.png-66e20c088cc9e46970c83974bb366335.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
generator_parameters={}
[deps]
source_file="res://objects/islands/islands_Rock.png"
dest_files=["res://.godot/imported/islands_Rock.png-66e20c088cc9e46970c83974bb366335.s3tc.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

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 MiB

View file

@ -0,0 +1,36 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://cb6hib2ju24bg"
path.s3tc="res://.godot/imported/islands_Shingles.png-7d1af920a1239661ac5ef5f756e6716f.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
generator_parameters={}
[deps]
source_file="res://objects/islands/islands_Shingles.png"
dest_files=["res://.godot/imported/islands_Shingles.png-7d1af920a1239661ac5ef5f756e6716f.s3tc.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

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 MiB

View file

@ -0,0 +1,36 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://lo01vpm4ublg"
path.s3tc="res://.godot/imported/islands_water.png-5e446ee74a7aa3f7815f2f0e2299f0c1.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
generator_parameters={}
[deps]
source_file="res://objects/islands/islands_water.png"
dest_files=["res://.godot/imported/islands_water.png-5e446ee74a7aa3f7815f2f0e2299f0c1.s3tc.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

Binary file not shown.

View file

@ -3,7 +3,7 @@
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://csxkrtwsgmebb"
uid="uid://cur4hou577ht2"
path="res://.godot/imported/toyland.glb-d62b67a5ed8b9fccc46ab8eada75f0eb.scn"
[deps]

View file

@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://bo7jvntxkhppu"
uid="uid://dkqoijeo10tux"
path.s3tc="res://.godot/imported/toyland_BlockBlue.png-a52adfdc8686bc65ad5f9a5780e179d8.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],

View file

@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://vwuoaxh1iwdu"
uid="uid://dw6p7eei1sfo0"
path.s3tc="res://.godot/imported/toyland_BlockGreen.png-5814475d1a0c89ec7c608da4846b49c5.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],

View file

@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://56wkrfm5ikxn"
uid="uid://cv87hmivqj8lb"
path.s3tc="res://.godot/imported/toyland_BlockOrange.png-31f8be914355966bedab55ef5995366e.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],

View file

@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://d4j8vsjlnhhhv"
uid="uid://bghd624myuydg"
path.s3tc="res://.godot/imported/toyland_BlockPurple.png-9983b4ce99c2af8139af423f8e3afc17.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],

View file

@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://bkp5ureoqykyg"
uid="uid://dt6jxmiv5ip6"
path.s3tc="res://.godot/imported/toyland_BlockRed.png-cdd24aaa97dc9516a0656c73d5e3f0b5.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],

View file

@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://3xwvv7w5ktrw"
uid="uid://c4u5qjxkujrek"
path.s3tc="res://.godot/imported/toyland_BlockRed_18.png-400bcbd8ef6ab3c84f7e4b25ea5eb629.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],

View file

@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://yjj7ejf6mkxt"
uid="uid://ddrsmcusndkm0"
path.s3tc="res://.godot/imported/toyland_BlockTan.png-a782891763a3230847d4a3dcd0880a12.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],

View file

@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://e458sexc3r07"
uid="uid://cnxhkpv2lacp5"
path.s3tc="res://.godot/imported/toyland_BlockYellow.png-2ceec08f7b413fed128f0e0020357d0f.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],

View file

@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://ce0qey274v0xt"
uid="uid://rlfqf8gplxj8"
path.s3tc="res://.godot/imported/toyland_BookTEMP.png-68be4988e0a6c940ad9863dbe326d246.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],

View file

@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://brjtbiny72xas"
uid="uid://ncqq3yy6e3n8"
path.s3tc="res://.godot/imported/toyland_Carpet012_4K_Color.png-150aed057e3b394b36294bd2766cb931.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],

View file

@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://dvpx4klulv3r5"
uid="uid://bfixfprjiax48"
path.s3tc="res://.godot/imported/toyland_Fabric001_2K_Color.png-e2cb42c432b43221fc167225f08b3de1.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],

View file

@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://dyfe0td3jm5m2"
uid="uid://de42xsa41plh3"
path.s3tc="res://.godot/imported/toyland_Fabric056_2K_Color.png-d2cc9e7a6e2ff1021c46721ca2a5f483.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],

View file

@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://dxi7lik787q0u"
uid="uid://dxa8jtk4kyjaa"
path.s3tc="res://.godot/imported/toyland_Metal.png-fb2306928aae15d8c05cd3f7d428f8b2.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],

View file

@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://cq7us15jsbxwa"
uid="uid://up3fknjlqc6u"
path.s3tc="res://.godot/imported/toyland_Toy Blocks Box.png-77c23bf266ede7360aee6c2a8af551d3.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],

View file

@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://c84wp1eeof83o"
uid="uid://dntcxe4ruoo7f"
path.s3tc="res://.godot/imported/toyland_Wood067_2K_Color.png-88d58072b673ae25da1f3e4fb3df5aab.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],

View file

@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://cw686scwg66bl"
uid="uid://bg104um3mu3wl"
path.s3tc="res://.godot/imported/toyland_newplaster.png-2e56bf44283ffffe4d8bac4c57043582.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],

View file

@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://wh7nb85cisoc"
uid="uid://c2q3ly4tn11tl"
path.s3tc="res://.godot/imported/toyland_outlet.png-152b0cb79ecd73aaf3419f7619f48c80.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],

View file

@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://d3bc7otex1q4o"
uid="uid://4gr8ak7xkbg"
path.s3tc="res://.godot/imported/toyland_white door.png-a69689bb62057806552eccfcc82952b1.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],

View file

@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://cx6lua0t37lxi"
uid="uid://b7f2eoxabtom3"
path.s3tc="res://.godot/imported/toyland_windows_xp_bliss-wide.png-4deec299561dadd05f6a7830bf14662c.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],

View file

@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://bbwn5v87prkhy"
uid="uid://cd5soqj1rr2jc"
path.s3tc="res://.godot/imported/toyland_woodfloor4k.png-4a943154d5a37396f9a7cf5a106c2a78.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],

View file

@ -190,7 +190,6 @@ offset_right = 1131.0
offset_bottom = 82.0
[node name="Health" type="ProgressBar" parent="RunnerPanel"]
visible = false
modulate = Color(0.890196, 0.137255, 0.0156863, 1)
layout_mode = 0
offset_left = 5.0

View file

@ -10,7 +10,7 @@ size = Vector3(1, 1.99126, 1)
[sub_resource type="CapsuleMesh" id="CapsuleMesh_qq44a"]
[node name="Teddy" type="CharacterBody3D" groups=["human"]]
safe_margin = 0.1
safe_margin = 0.01
script = ExtResource("1_ywxo5")
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]

View file

@ -61,6 +61,13 @@ offset_right = 797.0
offset_bottom = 241.0
text = "Toyland"
[node name="islands" type="Button" parent="."]
offset_left = 646.0
offset_top = 249.0
offset_right = 797.0
offset_bottom = 284.0
text = "Islands"
[node name="portBox" type="LineEdit" parent="."]
layout_mode = 0
offset_left = 726.0
@ -216,6 +223,7 @@ text = "Runner"
[connection signal="pressed" from="close" to="." method="_on_close_pressed"]
[connection signal="pressed" from="playground" to="." method="_on_playground_pressed"]
[connection signal="pressed" from="islands" to="." method="_on_islands_pressed"]
[connection signal="pressed" from="startButton" to="." method="_on_start_button_pressed"]
[connection signal="pressed" from="joinButton" to="." method="_on_join_button_pressed"]
[connection signal="text_changed" from="playerNameBox" to="." method="_on_player_name_box_text_changed"]

93
scenes/islands-map.tscn Normal file
View file

@ -0,0 +1,93 @@
[gd_scene load_steps=12 format=3 uid="uid://bpbjgeak3xxxt"]
[ext_resource type="PackedScene" uid="uid://crywaktj6ioxd" path="res://objects/islands/islands.glb" id="1_hpvnu"]
[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_2xpb6"]
points = PackedVector3Array(-14.3509, 1.26682, -3.03728, 13.7866, -2.43619, 1.10647, 13.7492, -3.36912, 1.1053, -8.83332, -1.48466, 15.4617, -5.30405, -19.9845, 0.173873, 8.77846, 1.31593, -11.8738, 3.97776, -19.6433, 4.23864, 5.04102, -0.11476, 14.5078, -9.75907, 3.14548, -13.7014, 3.99476, -18.3306, -4.7547, -7.88591, 2.64831, 12.186, -14.7342, -0.621345, 9.83085, -9.22758, -0.160234, -14.0433, 11.9204, -2.90645, -10.8554, 10.9005, 1.61401, -5.73392, 8.53028, -6.16559, 11.4941, -15.1233, -2.02983, 0.198044, -2.27627, -17.6783, -5.96258, 1.31409, -2.9609, -13.471, 1.30522, -18.8546, 6.0918, 13.2553, -5.21674, -6.68676, 4.52099, -4.31399, 14.3552, -9.15305, -3.62688, 14.6054, -11.4718, 0.256839, -12.1449, -14.3528, 1.72914, 9.88319, -11.159, 3.62074, -10.9303, -3.24455, 2.54078, 10.7005, 12.8149, 0.758565, -1.64331, 9.16042, 2.15946, -9.47327, 13.9487, -0.505669, -7.73623, 10.3725, -5.25125, 10.169, -8.80911, 1.26495, 15.4174)
[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_gfu2l"]
points = PackedVector3Array(-14.3509, 1.26682, -3.03728, 13.7866, -2.43619, 1.10647, 13.7492, -3.36912, 1.1053, -8.83332, -1.48466, 15.4617, -5.30405, -19.9845, 0.173873, 8.77846, 1.31593, -11.8738, 3.97776, -19.6433, 4.23864, 5.04102, -0.11476, 14.5078, -9.75907, 3.14548, -13.7014, 3.99476, -18.3306, -4.7547, -7.88591, 2.64831, 12.186, -14.7342, -0.621345, 9.83085, -9.22758, -0.160234, -14.0433, 11.9204, -2.90645, -10.8554, 10.9005, 1.61401, -5.73392, 8.53028, -6.16559, 11.4941, -15.1233, -2.02983, 0.198044, -2.27627, -17.6783, -5.96258, 1.31409, -2.9609, -13.471, 1.30522, -18.8546, 6.0918, 13.2553, -5.21674, -6.68676, 4.52099, -4.31399, 14.3552, -9.15305, -3.62688, 14.6054, -11.4718, 0.256839, -12.1449, -14.3528, 1.72914, 9.88319, -11.159, 3.62074, -10.9303, -3.24455, 2.54078, 10.7005, 12.8149, 0.758565, -1.64331, 9.16042, 2.15946, -9.47327, 13.9487, -0.505669, -7.73623, 10.3725, -5.25125, 10.169, -8.80911, 1.26495, 15.4174)
[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_pc4of"]
points = PackedVector3Array(-14.3509, 1.26682, -3.03728, 13.7866, -2.43619, 1.10647, 13.7492, -3.36912, 1.1053, -8.83332, -1.48466, 15.4617, -5.30405, -19.9845, 0.173873, 8.77846, 1.31593, -11.8738, 3.97776, -19.6433, 4.23864, 5.04102, -0.11476, 14.5078, -9.75907, 3.14548, -13.7014, 3.99476, -18.3306, -4.7547, -7.88591, 2.64831, 12.186, -14.7342, -0.621345, 9.83085, -9.22758, -0.160234, -14.0433, 11.9204, -2.90645, -10.8554, 10.9005, 1.61401, -5.73392, 8.53028, -6.16559, 11.4941, -15.1233, -2.02983, 0.198044, -2.27627, -17.6783, -5.96258, 1.31409, -2.9609, -13.471, 1.30522, -18.8546, 6.0918, 13.2553, -5.21674, -6.68676, 4.52099, -4.31399, 14.3552, -9.15305, -3.62688, 14.6054, -11.4718, 0.256839, -12.1449, -14.3528, 1.72914, 9.88319, -11.159, 3.62074, -10.9303, -3.24455, 2.54078, 10.7005, 12.8149, 0.758565, -1.64331, 9.16042, 2.15946, -9.47327, 13.9487, -0.505669, -7.73623, 10.3725, -5.25125, 10.169, -8.80911, 1.26495, 15.4174)
[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_tr8oi"]
points = PackedVector3Array(-14.3509, 1.26682, -3.03728, 13.7866, -2.43619, 1.10647, 13.7492, -3.36912, 1.1053, -8.83332, -1.48466, 15.4617, -5.30405, -19.9845, 0.173873, 8.77846, 1.31593, -11.8738, 3.97776, -19.6433, 4.23864, 5.04102, -0.11476, 14.5078, -9.75907, 3.14548, -13.7014, 3.99476, -18.3306, -4.7547, -7.88591, 2.64831, 12.186, -14.7342, -0.621345, 9.83085, -9.22758, -0.160234, -14.0433, 11.9204, -2.90645, -10.8554, 10.9005, 1.61401, -5.73392, 8.53028, -6.16559, 11.4941, -15.1233, -2.02983, 0.198044, -2.27627, -17.6783, -5.96258, 1.31409, -2.9609, -13.471, 1.30522, -18.8546, 6.0918, 13.2553, -5.21674, -6.68676, 4.52099, -4.31399, 14.3552, -9.15305, -3.62688, 14.6054, -11.4718, 0.256839, -12.1449, -14.3528, 1.72914, 9.88319, -11.159, 3.62074, -10.9303, -3.24455, 2.54078, 10.7005, 12.8149, 0.758565, -1.64331, 9.16042, 2.15946, -9.47327, 13.9487, -0.505669, -7.73623, 10.3725, -5.25125, 10.169, -8.80911, 1.26495, 15.4174)
[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_dx1su"]
points = PackedVector3Array(-0.302316, -0.965041, -0.948281, 1.01588, 1.01708, 0.000516027, 0.999626, -0.999626, -0.00380077, -0.953403, 1.01708, 0.477076, 0.181424, 0.971143, -0.982146, -0.953403, -1.01588, 0.477076, -0.87924, 0.970369, -0.466269, 0.63338, -0.96579, -0.767633, -0.9115, -0.971179, -0.405902, 0.846971, 0.969361, -0.52665, -0.452304, 0.964387, -0.886702, -0.984063, 0.984063, -0.161945, 0.181424, -0.969943, -0.982146, -0.63406, -0.964708, -0.767075, 0.911342, -0.972291, -0.406198, 0.510428, 0.962756, -0.855641, -0.984063, -0.982863, -0.161945, -0.18241, 0.971011, -0.982049, -0.985874, -0.984674, 0.423135, -0.756307, 0.968056, -0.647174, 0.392103, -0.966113, -0.918875, -0.985874, 0.985874, 0.423135, 0.981029, 0.982229, -0.19277, -0.18241, -0.969811, -0.982049, -0.756307, -0.966856, -0.647174, 0.981029, -0.981029, -0.19277, 0.755958, 0.969145, -0.647599, 0.755958, -0.967945, -0.647599, -0.63406, 0.965908, -0.767075, -0.393074, -0.965547, -0.918356, 0.392103, 0.967313, -0.918875, 0.911342, 0.973491, -0.406198)
[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_wdmp2"]
points = PackedVector3Array(-0.302316, -0.965041, -0.948281, 1.01588, 1.01708, 0.000516027, 0.999626, -0.999626, -0.00380077, -0.953403, 1.01708, 0.477076, 0.181424, 0.971143, -0.982146, -0.953403, -1.01588, 0.477076, -0.87924, 0.970369, -0.466269, 0.63338, -0.96579, -0.767633, -0.9115, -0.971179, -0.405902, 0.846971, 0.969361, -0.52665, -0.452304, 0.964387, -0.886702, -0.984063, 0.984063, -0.161945, 0.181424, -0.969943, -0.982146, -0.63406, -0.964708, -0.767075, 0.911342, -0.972291, -0.406198, 0.510428, 0.962756, -0.855641, -0.984063, -0.982863, -0.161945, -0.18241, 0.971011, -0.982049, -0.985874, -0.984674, 0.423135, -0.756307, 0.968056, -0.647174, 0.392103, -0.966113, -0.918875, -0.985874, 0.985874, 0.423135, 0.981029, 0.982229, -0.19277, -0.18241, -0.969811, -0.982049, -0.756307, -0.966856, -0.647174, 0.981029, -0.981029, -0.19277, 0.755958, 0.969145, -0.647599, 0.755958, -0.967945, -0.647599, -0.63406, 0.965908, -0.767075, -0.393074, -0.965547, -0.918356, 0.392103, 0.967313, -0.918875, 0.911342, 0.973491, -0.406198)
[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_yq2p8"]
points = PackedVector3Array(-14.3509, 1.26682, -3.03728, 13.7866, -2.43619, 1.10647, 13.7492, -3.36912, 1.1053, -8.83332, -1.48466, 15.4617, -5.30405, -19.9845, 0.173873, 8.77846, 1.31593, -11.8738, 3.97776, -19.6433, 4.23864, 5.04102, -0.11476, 14.5078, -9.75907, 3.14548, -13.7014, 3.99476, -18.3306, -4.7547, -7.88591, 2.64831, 12.186, -14.7342, -0.621345, 9.83085, -9.22758, -0.160234, -14.0433, 11.9204, -2.90645, -10.8554, 10.9005, 1.61401, -5.73392, 8.53028, -6.16559, 11.4941, -15.1233, -2.02983, 0.198044, -2.27627, -17.6783, -5.96258, 1.31409, -2.9609, -13.471, 1.30522, -18.8546, 6.0918, 13.2553, -5.21674, -6.68676, 4.52099, -4.31399, 14.3552, -9.15305, -3.62688, 14.6054, -11.4718, 0.256839, -12.1449, -14.3528, 1.72914, 9.88319, -11.159, 3.62074, -10.9303, -3.24455, 2.54078, 10.7005, 12.8149, 0.758565, -1.64331, 9.16042, 2.15946, -9.47327, 13.9487, -0.505669, -7.73623, 10.3725, -5.25125, 10.169, -8.80911, 1.26495, 15.4174)
[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_e5xi1"]
points = PackedVector3Array(-14.3509, 1.26682, -3.03728, 13.7866, -2.43619, 1.10647, 13.7492, -3.36912, 1.1053, -8.83332, -1.48466, 15.4617, -5.30405, -19.9845, 0.173873, 8.77846, 1.31593, -11.8738, 3.97776, -19.6433, 4.23864, 5.04102, -0.11476, 14.5078, -9.75907, 3.14548, -13.7014, 3.99476, -18.3306, -4.7547, -7.88591, 2.64831, 12.186, -14.7342, -0.621345, 9.83085, -9.22758, -0.160234, -14.0433, 11.9204, -2.90645, -10.8554, 10.9005, 1.61401, -5.73392, 8.53028, -6.16559, 11.4941, -15.1233, -2.02983, 0.198044, -2.27627, -17.6783, -5.96258, 1.31409, -2.9609, -13.471, 1.30522, -18.8546, 6.0918, 13.2553, -5.21674, -6.68676, 4.52099, -4.31399, 14.3552, -9.15305, -3.62688, 14.6054, -11.4718, 0.256839, -12.1449, -14.3528, 1.72914, 9.88319, -11.159, 3.62074, -10.9303, -3.24455, 2.54078, 10.7005, 12.8149, 0.758565, -1.64331, 9.16042, 2.15946, -9.47327, 13.9487, -0.505669, -7.73623, 10.3725, -5.25125, 10.169, -8.80911, 1.26495, 15.4174)
[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_k4b72"]
points = PackedVector3Array(-14.3509, 1.26682, -3.03728, 13.7866, -2.43619, 1.10647, 13.7492, -3.36912, 1.1053, -8.83332, -1.48466, 15.4617, -5.30405, -19.9845, 0.173873, 8.77846, 1.31593, -11.8738, 3.97776, -19.6433, 4.23864, 5.04102, -0.11476, 14.5078, -9.75907, 3.14548, -13.7014, 3.99476, -18.3306, -4.7547, -7.88591, 2.64831, 12.186, -14.7342, -0.621345, 9.83085, -9.22758, -0.160234, -14.0433, 11.9204, -2.90645, -10.8554, 10.9005, 1.61401, -5.73392, 8.53028, -6.16559, 11.4941, -15.1233, -2.02983, 0.198044, -2.27627, -17.6783, -5.96258, 1.31409, -2.9609, -13.471, 1.30522, -18.8546, 6.0918, 13.2553, -5.21674, -6.68676, 4.52099, -4.31399, 14.3552, -9.15305, -3.62688, 14.6054, -11.4718, 0.256839, -12.1449, -14.3528, 1.72914, 9.88319, -11.159, 3.62074, -10.9303, -3.24455, 2.54078, 10.7005, 12.8149, 0.758565, -1.64331, 9.16042, 2.15946, -9.47327, 13.9487, -0.505669, -7.73623, 10.3725, -5.25125, 10.169, -8.80911, 1.26495, 15.4174)
[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_oui73"]
points = PackedVector3Array(-14.3509, 1.26682, -3.03728, 13.7866, -2.43619, 1.10647, 13.7492, -3.36912, 1.1053, -8.83332, -1.48466, 15.4617, -5.30405, -19.9845, 0.173873, 8.77846, 1.31593, -11.8738, 3.97776, -19.6433, 4.23864, 5.04102, -0.11476, 14.5078, -9.75907, 3.14548, -13.7014, 3.99476, -18.3306, -4.7547, -7.88591, 2.64831, 12.186, -14.7342, -0.621345, 9.83085, -9.22758, -0.160234, -14.0433, 11.9204, -2.90645, -10.8554, 10.9005, 1.61401, -5.73392, 8.53028, -6.16559, 11.4941, -15.1233, -2.02983, 0.198044, -2.27627, -17.6783, -5.96258, 1.31409, -2.9609, -13.471, 1.30522, -18.8546, 6.0918, 13.2553, -5.21674, -6.68676, 4.52099, -4.31399, 14.3552, -9.15305, -3.62688, 14.6054, -11.4718, 0.256839, -12.1449, -14.3528, 1.72914, 9.88319, -11.159, 3.62074, -10.9303, -3.24455, 2.54078, 10.7005, 12.8149, 0.758565, -1.64331, 9.16042, 2.15946, -9.47327, 13.9487, -0.505669, -7.73623, 10.3725, -5.25125, 10.169, -8.80911, 1.26495, 15.4174)
[node name="islands" instance=ExtResource("1_hpvnu")]
[node name="StaticBody3D" type="StaticBody3D" parent="Plane" index="0"]
[node name="CollisionShape3D" type="CollisionShape3D" parent="Plane/StaticBody3D" index="0"]
shape = SubResource("ConvexPolygonShape3D_2xpb6")
[node name="StaticBody3D" type="StaticBody3D" parent="Plane001" index="0"]
[node name="CollisionShape3D" type="CollisionShape3D" parent="Plane001/StaticBody3D" index="0"]
shape = SubResource("ConvexPolygonShape3D_gfu2l")
[node name="StaticBody3D" type="StaticBody3D" parent="Plane002" index="0"]
[node name="CollisionShape3D" type="CollisionShape3D" parent="Plane002/StaticBody3D" index="0"]
transform = Transform3D(1, -3.62398e-09, 0, -1.78666e-09, 1, 1.30597e-08, 0, -2.45525e-09, 1, 0, 0, 0)
shape = SubResource("ConvexPolygonShape3D_pc4of")
[node name="StaticBody3D" type="StaticBody3D" parent="Plane003" index="0"]
[node name="CollisionShape3D" type="CollisionShape3D" parent="Plane003/StaticBody3D" index="0"]
transform = Transform3D(1, -6.29501e-09, -2.98023e-08, 8.65264e-09, 1, 3.07752e-09, 0, -4.22945e-09, 1, 0, 0, 0)
shape = SubResource("ConvexPolygonShape3D_tr8oi")
[node name="StaticBody3D" type="StaticBody3D" parent="Cylinder" index="0"]
[node name="CollisionShape3D" type="CollisionShape3D" parent="Cylinder/StaticBody3D" index="0"]
transform = Transform3D(1, 0, 6.98492e-10, 0, 1, 0, 4.28408e-08, -7.45058e-09, 1, 0, 0, 0)
shape = SubResource("ConvexPolygonShape3D_dx1su")
[node name="StaticBody3D" type="StaticBody3D" parent="Cylinder001" index="0"]
[node name="CollisionShape3D" type="CollisionShape3D" parent="Cylinder001/StaticBody3D" index="0"]
transform = Transform3D(1, -7.45058e-09, 0, -2.38419e-07, 1, 3.72529e-09, 0, 1.86265e-09, 1, 0, 0, 0)
shape = SubResource("ConvexPolygonShape3D_wdmp2")
[node name="StaticBody3D" type="StaticBody3D" parent="Plane004" index="0"]
[node name="CollisionShape3D" type="CollisionShape3D" parent="Plane004/StaticBody3D" index="0"]
transform = Transform3D(1, -1.49012e-08, 2.98023e-08, 0, 1, 3.72529e-09, 1.49012e-08, -1.86265e-09, 1, 0, 0, 0)
shape = SubResource("ConvexPolygonShape3D_yq2p8")
[node name="StaticBody3D" type="StaticBody3D" parent="Plane005" index="0"]
[node name="CollisionShape3D" type="CollisionShape3D" parent="Plane005/StaticBody3D" index="0"]
transform = Transform3D(1, -2.1173e-09, -2.98023e-08, -1.15178e-08, 1, 1.5425e-09, 0, 1.89175e-10, 1, 0, 0, 0)
shape = SubResource("ConvexPolygonShape3D_e5xi1")
[node name="StaticBody3D" type="StaticBody3D" parent="Plane006" index="0"]
[node name="CollisionShape3D" type="CollisionShape3D" parent="Plane006/StaticBody3D" index="0"]
transform = Transform3D(1, 0, -2.98023e-08, 1.49012e-08, 1, 0, 0, 0, 1, 0, 0, 0)
shape = SubResource("ConvexPolygonShape3D_k4b72")
[node name="StaticBody3D" type="StaticBody3D" parent="Plane007" index="0"]
[node name="CollisionShape3D" type="CollisionShape3D" parent="Plane007/StaticBody3D" index="0"]
transform = Transform3D(1, 4.5402e-09, 9.31323e-10, 0, 1, -1.49012e-08, 9.31323e-09, 0, 1, 0, 0, 0)
shape = SubResource("ConvexPolygonShape3D_oui73")

34
scenes/islands.tscn Normal file
View file

@ -0,0 +1,34 @@
[gd_scene load_steps=7 format=3 uid="uid://bartuuv8bwyjg"]
[ext_resource type="Script" path="res://scripts/maps/islands.gd" id="1_3oilq"]
[ext_resource type="PackedScene" uid="uid://ytbacsuahxie" path="res://scenes/HUD.tscn" id="2_2mo4q"]
[ext_resource type="PackedScene" uid="uid://bpbjgeak3xxxt" path="res://scenes/islands-map.tscn" id="3_neuu1"]
[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_c4rcj"]
sky_top_color = Color(1, 1, 1, 1)
sky_horizon_color = Color(0.8, 0.79225, 0.78325, 1)
ground_horizon_color = Color(0.8, 0.79225, 0.78325, 1)
[sub_resource type="Sky" id="Sky_trjyj"]
sky_material = SubResource("ProceduralSkyMaterial_c4rcj")
[sub_resource type="Environment" id="Environment_85j63"]
background_mode = 2
sky = SubResource("Sky_trjyj")
tonemap_mode = 2
glow_enabled = true
[node name="islands" type="Node3D"]
script = ExtResource("1_3oilq")
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
environment = SubResource("Environment_85j63")
[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
transform = Transform3D(-0.866025, -0.433013, 0.25, 0, 0.5, 0.866025, -0.5, 0.75, -0.433013, 0, 0, 0)
shadow_enabled = true
[node name="HUD" parent="." instance=ExtResource("2_2mo4q")]
[node name="islands" parent="." instance=ExtResource("3_neuu1")]
transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0)

View file

@ -1,6 +1,6 @@
[gd_scene load_steps=8 format=3 uid="uid://8lhdy8kiejvt"]
[ext_resource type="PackedScene" uid="uid://csxkrtwsgmebb" path="res://objects/toyland/toyland.glb" id="1_bb18u"]
[ext_resource type="PackedScene" uid="uid://cur4hou577ht2" 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://cyiyctp6y3n3x" path="res://scenes/mainmenu.tscn" id="3_bj3gc"]

File diff suppressed because one or more lines are too long

View file

@ -2,7 +2,7 @@
[ext_resource type="Script" path="res://scripts/maps/toyland.gd" id="1_vq5un"]
[ext_resource type="PackedScene" uid="uid://ytbacsuahxie" path="res://scenes/HUD.tscn" id="1_w2y7j"]
[ext_resource type="PackedScene" uid="uid://bmlmb4adocuee" path="res://scenes/toyland-map.tscn" id="3_uudje"]
[ext_resource type="PackedScene" uid="uid://cc0y8u4kohch" path="res://scenes/toyland-map.tscn" id="3_uudje"]
[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_7x31f"]
sky_horizon_color = Color(0.64625, 0.65575, 0.67075, 1)

View file

@ -11,12 +11,12 @@ sky_top_color = Color(1, 1, 1, 1)
sky_horizon_color = Color(0.8, 0.79225, 0.78325, 1)
ground_horizon_color = Color(0.8, 0.79225, 0.78325, 1)
[sub_resource type="Sky" id="Sky_trjyj"]
[sub_resource type="Sky" id="Sky_74emm"]
sky_material = SubResource("ProceduralSkyMaterial_i5hsu")
[sub_resource type="Environment" id="Environment_jlsfy"]
background_mode = 2
sky = SubResource("Sky_trjyj")
sky = SubResource("Sky_74emm")
tonemap_mode = 2
glow_enabled = true

View file

@ -17,6 +17,7 @@ var godMode = false # Defined by console.gd
var selfTeddy # Defined as soon as the player script is initalized
var multiplayerCurrent = false # Whether the player is using multiplayer
var currentMapNode # Defined in map scripts
var currentMapPath # Defined in map scripts
var teddyAuthorityID # Defined from teddy.gd after object is initalized
var miniMenuResume = false # Set to true by mainmenu.gd
var roundInSession = false # Goes true once the round is started in Teddy.gd
@ -137,3 +138,10 @@ func spawn_locations():
spawnCoords_x[0] = -17.65
spawnCoords_y[0] = 2.85
spawnCoords_z[0] = 11.41
elif mapName == "Islands":
spawnCoords_x.resize(1)
spawnCoords_y.resize(1)
spawnCoords_z.resize(1)
spawnCoords_x[0] = -1.32
spawnCoords_y[0] = 20
spawnCoords_z[0] = 2.92

View file

@ -20,6 +20,10 @@ func _on_playground_pressed():
SCENE = "res://scenes/toyland.tscn"
$Toyland.visible = true
func _on_islands_pressed():
$mapSelected.text = "Islands"
Global.mapName = "Islands"
SCENE = "res://scenes/islands.tscn"
func _on_start_button_pressed():
var PORT = $portBox.text

15
scripts/maps/islands.gd Normal file
View file

@ -0,0 +1,15 @@
extends Node3D
@onready var mapNode = get_node("/root/islands")
var mapPath = "res://scenes/islands.tscn"
func _ready():
Global.currentMapNode = mapNode
Global.currentMapPath = mapPath
Global.playerHealth = 100
Global.fatigue = 100
Global.playerYDeath = -100
func _process(delta):
pass

View file

@ -1,10 +1,12 @@
extends Node
@onready var mapNode = get_node("/root/toyland")
var mapPath = "res://scenes/islands.tscn"
var audio_stream_player = AudioStreamPlayer.new()
func _ready():
Global.currentMapNode = mapNode
Global.currentMapPath = mapPath
Global.playerHealth = 100
Global.fatigue = 100
Global.playerYDeath = -100

View file

@ -1,7 +1,6 @@
extends Node
var peer = ENetMultiplayerPeer.new()
var SCENE = "res://scenes/toyland.tscn"
var connected_peers = []
func create_server(port, maxPlayers):
@ -25,6 +24,7 @@ func create_server(port, maxPlayers):
return
else:
print("NEW CONNECTION FROM ", new_peer_id)
rpc_id(new_peer_id, "sync_mapPath", Global.currentMapPath)
rpc_id(new_peer_id, "sync_names", Global.connectedPlayers)
rpc_id(new_peer_id, "sync_respawn_speed", Global.respawnTimeModifier)
rpc_id(new_peer_id, "sync_gamemode", Global.gamemode)
@ -49,7 +49,7 @@ func load_map(map):
func add_newly_connected_player_character(new_peer_id):
print("Connected to server!")
if Global.teddyAuthorityID == null:
load_map(SCENE)
load_map(Global.currentMapPath)
Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
add_player_node(new_peer_id)
@ -97,6 +97,10 @@ func sync_gamemode(gamemode):
func sync_mapName(map):
Global.mapName = map
@rpc("any_peer", "reliable")
func sync_mapPath(path):
Global.currentMapPath = path
@rpc("any_peer", "reliable")
func check_name(name): # Returns true if it finds a matching name
for i in range(Global.connectedPlayers.size()):