This commit is contained in:
Paul Black 2023-03-19 15:06:11 -06:00
parent 39425fda75
commit 3c6ac9dbdd
22 changed files with 66 additions and 282 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.8 MiB

View file

@ -1,36 +0,0 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://cro0qy8p8j1nc"
path.s3tc="res://.godot/imported/Teddy-de34648a55743de65735b80db47e8535_BrownFabric.png-e262ea1b1791f537d156e62ada10e3d9.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
generator_parameters={}
[deps]
source_file="res://characters/teddy/model/Teddy-de34648a55743de65735b80db47e8535_BrownFabric.png"
dest_files=["res://.godot/imported/Teddy-de34648a55743de65735b80db47e8535_BrownFabric.png-e262ea1b1791f537d156e62ada10e3d9.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.

Before

Width:  |  Height:  |  Size: 7.8 MiB

View file

@ -1,36 +0,0 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://t4uhkvweq55l"
path.s3tc="res://.godot/imported/Teddy-de34648a55743de65735b80db47e8535_BrownFabricBelly.png-f48e4aaa79e2a0cf3814c7dbef28823a.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
generator_parameters={}
[deps]
source_file="res://characters/teddy/model/Teddy-de34648a55743de65735b80db47e8535_BrownFabricBelly.png"
dest_files=["res://.godot/imported/Teddy-de34648a55743de65735b80db47e8535_BrownFabricBelly.png-f48e4aaa79e2a0cf3814c7dbef28823a.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.

Before

Width:  |  Height:  |  Size: 7.2 MiB

View file

@ -1,36 +0,0 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://c1fr5ak803h0k"
path.s3tc="res://.godot/imported/Teddy-de34648a55743de65735b80db47e8535_FabricNose.png-12c7438645ca0861b049ecee40b0b65c.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
generator_parameters={}
[deps]
source_file="res://characters/teddy/model/Teddy-de34648a55743de65735b80db47e8535_FabricNose.png"
dest_files=["res://.godot/imported/Teddy-de34648a55743de65735b80db47e8535_FabricNose.png-12c7438645ca0861b049ecee40b0b65c.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.

Before

Width:  |  Height:  |  Size: 7 MiB

View file

@ -1,34 +0,0 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://c35o1oqul5qlr"
path="res://.godot/imported/BrownFabric.jpg-d8f82695d2eb76de4b392506455a734b.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://characters/teddy/model/Teddy.fbm/BrownFabric.jpg"
dest_files=["res://.godot/imported/BrownFabric.jpg-d8f82695d2eb76de4b392506455a734b.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.9 MiB

View file

@ -1,34 +0,0 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://ctlxadgx0cn3j"
path="res://.godot/imported/BrownFabricBelly.jpg-3fd756cbff8cbae88c9e7d8582334dfb.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://characters/teddy/model/Teddy.fbm/BrownFabricBelly.jpg"
dest_files=["res://.godot/imported/BrownFabricBelly.jpg-3fd756cbff8cbae88c9e7d8582334dfb.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 MiB

View file

@ -1,34 +0,0 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://2a8u5usfhtiq"
path="res://.godot/imported/FabricNose.jpg-2afdefd44b1999f46c6b963e27d219c0.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://characters/teddy/model/Teddy.fbm/FabricNose.jpg"
dest_files=["res://.godot/imported/FabricNose.jpg-2afdefd44b1999f46c6b963e27d219c0.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

Binary file not shown.

View file

@ -1,32 +0,0 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://dx1c1lbnl5fmh"
path="res://.godot/imported/Teddy.fbx-de34648a55743de65735b80db47e8535.scn"
[deps]
source_file="res://characters/teddy/model/Teddy.fbx"
dest_files=["res://.godot/imported/Teddy.fbx-de34648a55743de65735b80db47e8535.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

View file

@ -1,28 +0,0 @@
[gd_scene load_steps=2 format=3 uid="uid://gw6tb1oyx3vj"]
[ext_resource type="PackedScene" uid="uid://dx1c1lbnl5fmh" path="res://characters/teddy/model/Teddy.fbx" id="1_fiiw5"]
[node name="Teddy" instance=ExtResource("1_fiiw5")]
[node name="Skeleton3D" parent="RootNode" index="0"]
bones/0/position = Vector3(0.0311831, 1.77793, -0.0275337)
bones/0/rotation = Quaternion(0.00679465, 0.999708, 0.00868269, -0.0215002)
bones/1/rotation = Quaternion(0.00188424, 0.00512121, 0.00409826, 0.999977)
bones/2/rotation = Quaternion(-0.00338569, 0.00599611, -0.0044001, 0.999967)
bones/3/rotation = Quaternion(-0.0033857, 0.00599611, -0.0044001, 0.999967)
bones/4/rotation = Quaternion(-0.00361889, -0.00394132, 0.0105565, 0.99993)
bones/5/rotation = Quaternion(-0.0235006, -0.0268053, -0.0160073, 0.999236)
bones/7/rotation = Quaternion(0.521376, -0.410921, 0.672194, 0.327821)
bones/8/rotation = Quaternion(0.24328, -0.0588707, -0.0256803, 0.967827)
bones/9/rotation = Quaternion(0.0770526, 0.113304, 0.298361, 0.944566)
bones/11/rotation = Quaternion(-0.557731, -0.38403, 0.648654, -0.347427)
bones/12/rotation = Quaternion(-0.235556, 0.879681, 0.209497, -0.356069)
bones/13/rotation = Quaternion(-0.222151, -0.0881404, 0.121091, 0.96344)
bones/15/rotation = Quaternion(0.0683854, -0.125366, 0.9896, 0.0173049)
bones/16/rotation = Quaternion(0.617154, 0.00547633, -0.0283807, 0.786311)
bones/17/rotation = Quaternion(0.00667534, -0.332962, 0.942779, 0.0161204)
bones/18/rotation = Quaternion(0.018142, 0.952996, -0.302437, 0.00117584)
bones/20/rotation = Quaternion(-0.0711955, -0.075447, 0.993807, 0.039842)
bones/21/rotation = Quaternion(0.121044, -0.0730026, 0.0224523, 0.989704)
bones/22/rotation = Quaternion(0.0266432, -0.591498, 0.804726, -0.0428458)
bones/23/rotation = Quaternion(-0.126814, 0.00228145, 0.00129951, 0.991923)

View file

@ -147,9 +147,9 @@ layout_mode = 1
anchors_preset = 5 anchors_preset = 5
anchor_left = 0.5 anchor_left = 0.5
anchor_right = 0.5 anchor_right = 0.5
offset_left = -98.0 offset_left = -114.0
offset_top = 52.0 offset_top = 52.0
offset_right = 114.0 offset_right = 98.0
offset_bottom = 105.0 offset_bottom = 105.0
grow_horizontal = 2 grow_horizontal = 2
theme_override_fonts/font = ExtResource("3_x1wqt") theme_override_fonts/font = ExtResource("3_x1wqt")

View file

@ -75,6 +75,7 @@ offset_left = 726.0
offset_top = 533.0 offset_top = 533.0
offset_right = 793.062 offset_right = 793.062
offset_bottom = 564.0 offset_bottom = 564.0
text = "28000"
placeholder_text = "Port" placeholder_text = "Port"
[node name="startButton" type="Button" parent="."] [node name="startButton" type="Button" parent="."]
@ -106,6 +107,7 @@ offset_left = 725.0
offset_top = 498.0 offset_top = 498.0
offset_right = 792.062 offset_right = 792.062
offset_bottom = 529.0 offset_bottom = 529.0
text = "10"
placeholder_text = "Players" placeholder_text = "Players"
[node name="maxPlayersLabel" type="Label" parent="."] [node name="maxPlayersLabel" type="Label" parent="."]
@ -158,34 +160,34 @@ text = "Player Name: "
[node name="shortRespawn" type="CheckBox" parent="."] [node name="shortRespawn" type="CheckBox" parent="."]
layout_mode = 0 layout_mode = 0
offset_left = 594.0 offset_left = 594.0
offset_top = 448.0 offset_top = 407.0
offset_right = 664.0 offset_right = 664.0
offset_bottom = 479.0 offset_bottom = 438.0
text = "Short" text = "Short"
[node name="normalRespawn" type="CheckBox" parent="."] [node name="normalRespawn" type="CheckBox" parent="."]
layout_mode = 0 layout_mode = 0
offset_left = 673.0 offset_left = 673.0
offset_top = 447.0 offset_top = 406.0
offset_right = 760.0 offset_right = 760.0
offset_bottom = 478.0 offset_bottom = 437.0
button_pressed = true button_pressed = true
text = "Normal" text = "Normal"
[node name="longRespawn" type="CheckBox" parent="."] [node name="longRespawn" type="CheckBox" parent="."]
layout_mode = 0 layout_mode = 0
offset_left = 763.0 offset_left = 763.0
offset_top = 447.0 offset_top = 406.0
offset_right = 830.0 offset_right = 830.0
offset_bottom = 478.0 offset_bottom = 437.0
text = "Long" text = "Long"
[node name="respawnLabel" type="Label" parent="."] [node name="respawnLabel" type="Label" parent="."]
layout_mode = 0 layout_mode = 0
offset_left = 664.0 offset_left = 664.0
offset_top = 413.0 offset_top = 372.0
offset_right = 776.0 offset_right = 776.0
offset_bottom = 439.0 offset_bottom = 398.0
text = "Respawn Time" text = "Respawn Time"
horizontal_alignment = 1 horizontal_alignment = 1
@ -222,6 +224,22 @@ offset_bottom = 492.0
tooltip_text = "One player is selected at random as \"the runner.\" Everyone else it supposed to kill the runner. 5 minutes." tooltip_text = "One player is selected at random as \"the runner.\" Everyone else it supposed to kill the runner. 5 minutes."
text = "Runner" text = "Runner"
[node name="roundTimer" type="LineEdit" parent="."]
layout_mode = 0
offset_left = 724.0
offset_top = 463.0
offset_right = 792.0
offset_bottom = 494.0
text = "300"
placeholder_text = "Duration"
[node name="timeLabel" type="Label" parent="."]
offset_left = 627.0
offset_top = 467.0
offset_right = 725.0
offset_bottom = 493.0
text = "Time (secs):"
[connection signal="pressed" from="close" to="." method="_on_close_pressed"] [connection signal="pressed" from="close" to="." method="_on_close_pressed"]
[connection signal="pressed" from="playground" to="." method="_on_playground_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="islands" to="." method="_on_islands_pressed"]
@ -233,3 +251,5 @@ text = "Runner"
[connection signal="button_down" from="longRespawn" to="." method="_on_long_respawn_button_down"] [connection signal="button_down" from="longRespawn" to="." method="_on_long_respawn_button_down"]
[connection signal="button_down" from="GamemodeDeathmatch" to="." method="_on_gamemode_deathmatch_button_down"] [connection signal="button_down" from="GamemodeDeathmatch" to="." method="_on_gamemode_deathmatch_button_down"]
[connection signal="button_down" from="GamemodeRunner" to="." method="_on_gamemode_runner_button_down"] [connection signal="button_down" from="GamemodeRunner" to="." method="_on_gamemode_runner_button_down"]
[connection signal="ready" from="roundTimer" to="." method="_on_round_timer_ready"]
[connection signal="text_changed" from="roundTimer" to="." method="_on_round_timer_text_changed"]

View file

@ -70,6 +70,8 @@ offset_left = 527.0
offset_top = 283.0 offset_top = 283.0
offset_right = 599.0 offset_right = 599.0
offset_bottom = 319.0 offset_bottom = 319.0
text = "28000"
placeholder_text = "port"
[node name="portLabel" type="Label" parent="."] [node name="portLabel" type="Label" parent="."]
layout_mode = 0 layout_mode = 0

View file

@ -7,6 +7,7 @@ var seconds
var scores: Array[int] = [] var scores: Array[int] = []
var scoresInitalized = false var scoresInitalized = false
var runnerSelected = false var runnerSelected = false
var roundOver = false
func _ready(): func _ready():
await get_tree().create_timer(0.1).timeout await get_tree().create_timer(0.1).timeout
@ -55,7 +56,10 @@ func _process(delta):
seconds = fmod(roundTimer, 60) seconds = fmod(roundTimer, 60)
$timer.text = "%02d:%02d" % [minutes, seconds] $timer.text = "%02d:%02d" % [minutes, seconds]
if roundTimer <= 0.0: if roundTimer <= 0.0:
Global.HUDStartLabelText = "GAME OVER" if not roundOver:
roundOver = true
Global.HUDStartLabelText = "GAME OVER"
play_audio(load("res://sounds/buzzer.mp3"))
if Global.HUDPlayerDied: if Global.HUDPlayerDied:
Global.HUDPlayerDied = false Global.HUDPlayerDied = false
rpc("update_scores", Global.lastPersonToHitMe) rpc("update_scores", Global.lastPersonToHitMe)
@ -200,7 +204,7 @@ var up = false
var left = false var left = false
var down = false var down = false
var right = false var right = false
@onready var prev_cam_rot = get_node(str(Global.selfTeddy) + '/CollisionShape3D/Neck/Camera3D').global_rotation var prev_cam_rot
var ran_timer2 = false var ran_timer2 = false
var ran_timer3 = false var ran_timer3 = false
var stage2 = false var stage2 = false
@ -223,6 +227,7 @@ func tutorial_2():
$TutorialPanel/Arrow_down.visible = true $TutorialPanel/Arrow_down.visible = true
$TutorialPanel/Arrow_right.visible = true $TutorialPanel/Arrow_right.visible = true
play_audio(load("res://voice/tutorial/tutorial_2.mp3")) play_audio(load("res://voice/tutorial/tutorial_2.mp3"))
prev_cam_rot = get_node(str(Global.selfTeddy) + '/CollisionShape3D/Neck/Camera3D').global_rotation
if not ran_timer2: if not ran_timer2:
await get_tree().create_timer(0.5).timeout await get_tree().create_timer(0.5).timeout
ran_timer2 = true ran_timer2 = true

View file

@ -101,3 +101,11 @@ func _on_gamemode_deathmatch_button_down():
func _on_gamemode_runner_button_down(): func _on_gamemode_runner_button_down():
$GamemodeDeathmatch.button_pressed = false $GamemodeDeathmatch.button_pressed = false
Global.gamemode = "Runner" Global.gamemode = "Runner"
func _on_round_timer_text_changed(new_text):
Global.roundTimer = int(new_text)
func _on_round_timer_ready():
Global.roundTimer = 300

BIN
sounds/buzzer.mp3 Normal file

Binary file not shown.

19
sounds/buzzer.mp3.import Normal file
View file

@ -0,0 +1,19 @@
[remap]
importer="mp3"
type="AudioStreamMP3"
uid="uid://40vee8hc36at"
path="res://.godot/imported/buzzer.mp3-46588185077bbd60448689836052fd2d.mp3str"
[deps]
source_file="res://sounds/buzzer.mp3"
dest_files=["res://.godot/imported/buzzer.mp3-46588185077bbd60448689836052fd2d.mp3str"]
[params]
loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4