diff --git a/.gitattributes b/.gitattributes index 430478a..d87dcff 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,8 +1,9 @@ # Normalize EOL for all files that Git considers text files. * text=auto eol=lf + # Track files for Git LFS assets/**/*.wav filter=lfs diff=lfs merge=lfs -text -assets/**/*.ogg filter=lfs diff=lfs merge=lfs -text assets/**/*.psd filter=lfs diff=lfs merge=lfs -text +assets/**/*.png filter=lfs diff=lfs merge=lfs -text assets/**/*.otf filter=lfs diff=lfs merge=lfs -text assets/**/*.ttf filter=lfs diff=lfs merge=lfs -text diff --git a/assets/sounds/music/death_by_waveshaper.wav b/assets/sounds/music/death_by_waveshaper.wav deleted file mode 100644 index 27fe10d..0000000 --- a/assets/sounds/music/death_by_waveshaper.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c2ca2978ecbdd78206fbadbb42840140bb8ce5571da1010b2b73205572ec5d32 -size 27648182 diff --git a/assets/sounds/music/death_by_waveshaper.wav.import b/assets/sounds/music/death_by_waveshaper.wav.import deleted file mode 100644 index 63b9e36..0000000 --- a/assets/sounds/music/death_by_waveshaper.wav.import +++ /dev/null @@ -1,24 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamWAV" -uid="uid://dh5jxxwim7ra8" -path="res://.godot/imported/death_by_waveshaper.wav-567c957cfc006d82d2a62bba8a331108.sample" - -[deps] - -source_file="res://assets/sounds/music/death_by_waveshaper.wav" -dest_files=["res://.godot/imported/death_by_waveshaper.wav-567c957cfc006d82d2a62bba8a331108.sample"] - -[params] - -force/8_bit=false -force/mono=false -force/max_rate=false -force/max_rate_hz=44100 -edit/trim=false -edit/normalize=false -edit/loop_mode=2 -edit/loop_begin=0 -edit/loop_end=-1 -compress/mode=0 diff --git a/assets/sounds/sfx/damage.wav b/assets/sounds/sfx/damage.wav deleted file mode 100644 index 632a773..0000000 --- a/assets/sounds/sfx/damage.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3ff3a8d723fbfb1f55647f11699550b2e231a5d0d019363af080ef7d4761c60c -size 6531664 diff --git a/assets/sounds/sfx/damage.wav.import b/assets/sounds/sfx/damage.wav.import deleted file mode 100644 index 7174bf2..0000000 --- a/assets/sounds/sfx/damage.wav.import +++ /dev/null @@ -1,24 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamWAV" -uid="uid://c7laud048l1is" -path="res://.godot/imported/damage.wav-8c4919c614aee00fc00121daa2bc247e.sample" - -[deps] - -source_file="res://assets/sounds/sfx/damage.wav" -dest_files=["res://.godot/imported/damage.wav-8c4919c614aee00fc00121daa2bc247e.sample"] - -[params] - -force/8_bit=false -force/mono=false -force/max_rate=false -force/max_rate_hz=44100 -edit/trim=false -edit/normalize=false -edit/loop_mode=0 -edit/loop_begin=0 -edit/loop_end=-1 -compress/mode=0 diff --git a/assets/sounds/sfx/death_sound.wav b/assets/sounds/sfx/death_sound.wav deleted file mode 100644 index 35b7fb3..0000000 --- a/assets/sounds/sfx/death_sound.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3b917e1df02f73c7e23e4e062cfec4182ada3ad1c82dfaf69f4ac8ccf458d956 -size 9315610 diff --git a/assets/sounds/sfx/death_sound.wav.import b/assets/sounds/sfx/death_sound.wav.import deleted file mode 100644 index 1a483c3..0000000 --- a/assets/sounds/sfx/death_sound.wav.import +++ /dev/null @@ -1,24 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamWAV" -uid="uid://c6dy6nea6vaa4" -path="res://.godot/imported/death_sound.wav-74c3ac4e551e080446bef315f79faff8.sample" - -[deps] - -source_file="res://assets/sounds/sfx/death_sound.wav" -dest_files=["res://.godot/imported/death_sound.wav-74c3ac4e551e080446bef315f79faff8.sample"] - -[params] - -force/8_bit=false -force/mono=false -force/max_rate=false -force/max_rate_hz=44100 -edit/trim=false -edit/normalize=false -edit/loop_mode=1 -edit/loop_begin=0 -edit/loop_end=-1 -compress/mode=0 diff --git a/assets/sounds/sfx/engine_loop.wav b/assets/sounds/sfx/engine_loop.wav deleted file mode 100644 index 7b543ca..0000000 --- a/assets/sounds/sfx/engine_loop.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e29c9250034f511f5fd460b7587b2c374876923a33ecb46ef6a0eb674c0f2613 -size 6144236 diff --git a/assets/sounds/sfx/engine_loop.wav.import b/assets/sounds/sfx/engine_loop.wav.import deleted file mode 100644 index 282d9e5..0000000 --- a/assets/sounds/sfx/engine_loop.wav.import +++ /dev/null @@ -1,24 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamWAV" -uid="uid://cc4ffx6b0xjvk" -path="res://.godot/imported/engine_loop.wav-259955cdefdf44f318b80661126b8c7f.sample" - -[deps] - -source_file="res://assets/sounds/sfx/engine_loop.wav" -dest_files=["res://.godot/imported/engine_loop.wav-259955cdefdf44f318b80661126b8c7f.sample"] - -[params] - -force/8_bit=false -force/mono=false -force/max_rate=false -force/max_rate_hz=44100 -edit/trim=false -edit/normalize=false -edit/loop_mode=0 -edit/loop_begin=0 -edit/loop_end=-1 -compress/mode=0 diff --git a/assets/v_light.png b/assets/v_light.png deleted file mode 100644 index c488a9b..0000000 Binary files a/assets/v_light.png and /dev/null differ diff --git a/assets/v_light.png.import b/assets/v_light.png.import deleted file mode 100644 index d253da4..0000000 --- a/assets/v_light.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bva8vs42tx03s" -path="res://.godot/imported/v_light.png-7acf5f641671ba7235dbbd4787595e37.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/v_light.png" -dest_files=["res://.godot/imported/v_light.png-7acf5f641671ba7235dbbd4787595e37.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 diff --git a/assets/v_light2.png b/assets/v_light2.png deleted file mode 100644 index 5940e46..0000000 Binary files a/assets/v_light2.png and /dev/null differ diff --git a/assets/v_light2.png.import b/assets/v_light2.png.import deleted file mode 100644 index 4fd9138..0000000 --- a/assets/v_light2.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://c2ldu662bhlhh" -path="res://.godot/imported/v_light2.png-ab361c7de69a8dec4185215e9529c3e8.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/v_light2.png" -dest_files=["res://.godot/imported/v_light2.png-ab361c7de69a8dec4185215e9529c3e8.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 diff --git a/assets/vehicle.png b/assets/vehicle.png deleted file mode 100644 index b4842e2..0000000 Binary files a/assets/vehicle.png and /dev/null differ diff --git a/assets/vehicle.png.import b/assets/vehicle.png.import deleted file mode 100644 index fc3c673..0000000 --- a/assets/vehicle.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bnyyk81dhy3h2" -path="res://.godot/imported/vehicle.png-a41cb91fcab998de7698162333ee5bc9.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/vehicle.png" -dest_files=["res://.godot/imported/vehicle.png-a41cb91fcab998de7698162333ee5bc9.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 diff --git a/assets/vehicle2.png b/assets/vehicle2.png deleted file mode 100644 index aca965d..0000000 Binary files a/assets/vehicle2.png and /dev/null differ diff --git a/assets/vehicle2.png.import b/assets/vehicle2.png.import deleted file mode 100644 index c952995..0000000 --- a/assets/vehicle2.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bx4nammvn7hea" -path="res://.godot/imported/vehicle2.png-bb7df5e942f0854be95e87da75ff4526.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/vehicle2.png" -dest_files=["res://.godot/imported/vehicle2.png-bb7df5e942f0854be95e87da75ff4526.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 diff --git a/assets/vehicle3.png b/assets/vehicle3.png deleted file mode 100644 index fb9ff74..0000000 Binary files a/assets/vehicle3.png and /dev/null differ diff --git a/assets/vehicle3.png.import b/assets/vehicle3.png.import deleted file mode 100644 index 046f87e..0000000 --- a/assets/vehicle3.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://c5lucllx2m3il" -path="res://.godot/imported/vehicle3.png-78502c74c095c869a85b7e51e89120ab.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/vehicle3.png" -dest_files=["res://.godot/imported/vehicle3.png-78502c74c095c869a85b7e51e89120ab.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 diff --git a/icon.svg.import b/icon.svg.import index c0e29db..f2b876d 100644 --- a/icon.svg.import +++ b/icon.svg.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.cte [params] compress/mode=0 -compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 +compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/src/game/level.gd b/src/game/level.gd index fc8bdad..420caeb 100644 --- a/src/game/level.gd +++ b/src/game/level.gd @@ -96,10 +96,5 @@ func get_total_distance(): return lap_distance + last_offset func game_over(): - running = false - player.dead = true - $player/death_sound.play() print_debug("final score: ", get_total_distance()) - await get_tree().create_timer(3).timeout - get_tree().reload_current_scene() #temp diff --git a/src/game/level1.tscn b/src/game/level1.tscn index 20ed01d..2dabe48 100644 --- a/src/game/level1.tscn +++ b/src/game/level1.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=10 format=3 uid="uid://c77xk0mywwt5f"] +[gd_scene load_steps=9 format=3 uid="uid://c77xk0mywwt5f"] [ext_resource type="Script" path="res://src/game/level.gd" id="1_hv75i"] [ext_resource type="PackedScene" uid="uid://ckau5s2tsb3oc" path="res://src/game/player.tscn" id="2_5nf51"] @@ -7,7 +7,6 @@ [ext_resource type="Texture2D" uid="uid://ds0un04pocx6i" path="res://assets/track90.png" id="3_jtw40"] [ext_resource type="Texture2D" uid="uid://dmcrms0qu0mtt" path="res://assets/finish2.png" id="4_rxurh"] [ext_resource type="Texture2D" uid="uid://bq151lkkfdlf4" path="res://assets/sign.png" id="7_g24mp"] -[ext_resource type="AudioStream" uid="uid://dh5jxxwim7ra8" path="res://assets/sounds/music/death_by_waveshaper.wav" id="8_ppkte"] [sub_resource type="Curve2D" id="Curve2D_ll8bj"] _data = { @@ -38,13 +37,14 @@ stretch_mode = 1 curve = SubResource("Curve2D_ll8bj") [node name="TrackLine" type="Line2D" parent="."] -self_modulate = Color(0.164706, 0.658824, 0.858824, 1) +self_modulate = Color(0.827451, 0.521569, 0.313726, 1) texture_repeat = 2 texture = ExtResource("3_jtw40") texture_mode = 2 begin_cap_mode = 2 [node name="FinishLine" type="Line2D" parent="."] +self_modulate = Color(0.827451, 0.521569, 0.313726, 1) texture_repeat = 2 width = 40.0 texture = ExtResource("4_rxurh") @@ -77,10 +77,5 @@ color = Color(1, 0.0627451, 0.694118, 1) energy = 20.0 texture = ExtResource("7_g24mp") -[node name="level_music" type="AudioStreamPlayer" parent="."] -stream = ExtResource("8_ppkte") -volume_db = -29.953 -autoplay = true - [connection signal="distance_changed" from="." to="CanvasLayer/hud" method="_on_level_distance_changed"] [connection signal="speed_changed" from="player" to="CanvasLayer/hud" method="_on_player_speed_changed"] diff --git a/src/game/player.tscn b/src/game/player.tscn index 5586ba2..a13bdb4 100644 --- a/src/game/player.tscn +++ b/src/game/player.tscn @@ -1,16 +1,8 @@ -<<<<<<< HEAD -[gd_scene load_steps=6 format=3 uid="uid://ckau5s2tsb3oc"] -======= -[gd_scene load_steps=8 format=3 uid="uid://ckau5s2tsb3oc"] ->>>>>>> 687604fc054965ceb81bf5299befc599e0bb90ed +[gd_scene load_steps=5 format=3 uid="uid://ckau5s2tsb3oc"] [ext_resource type="Script" path="res://src/game/player_controller.gd" id="1_g4ij8"] -[ext_resource type="Texture2D" uid="uid://bx4nammvn7hea" path="res://assets/vehicle2.png" id="2_ifw0w"] -[ext_resource type="Texture2D" uid="uid://c2ldu662bhlhh" path="res://assets/v_light2.png" id="2_velje"] +[ext_resource type="Texture2D" uid="uid://d1t1g7hyil82v" path="res://assets/spracer.png" id="2_xal47"] [ext_resource type="Texture2D" uid="uid://ceqcsof04vhqs" path="res://assets/light.png" id="3_qosw5"] -[ext_resource type="AudioStream" uid="uid://cc4ffx6b0xjvk" path="res://assets/sounds/sfx/engine_loop.wav" id="4_4ajo8"] -[ext_resource type="AudioStream" uid="uid://c7laud048l1is" path="res://assets/sounds/sfx/damage.wav" id="5_rvolc"] -[ext_resource type="AudioStream" uid="uid://c6dy6nea6vaa4" path="res://assets/sounds/sfx/death_sound.wav" id="6_i0vg5"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_w2nj7"] size = Vector2(36, 20) @@ -23,24 +15,14 @@ drift_factor = 1.2 camera_offset = 200.0 camera = NodePath("Camera2D") -[node name="player_light" type="PointLight2D" parent="."] +[node name="Sprite2D" type="Sprite2D" parent="."] position = Vector2(0, 3.09944e-05) rotation = 1.5708 -scale = Vector2(0.1, 0.1) -energy = 5.0 -range_item_cull_mask = 3 -texture = ExtResource("2_velje") +scale = Vector2(0.0489796, 0.0489796) +texture = ExtResource("2_xal47") -[node name="Playermodel" type="Sprite2D" parent="."] -light_mask = 4 -position = Vector2(0, 3.09944e-05) +[node name="PointLight2D" type="PointLight2D" parent="."] rotation = 1.5708 -scale = Vector2(0.1, 0.1) -texture = ExtResource("2_ifw0w") - -[node name="vignette_light" type="PointLight2D" parent="."] -rotation = 1.5708 -range_item_cull_mask = 7 texture = ExtResource("3_qosw5") texture_scale = 3.5 @@ -56,16 +38,3 @@ rotation = 1.5708 ignore_rotation = false rotation_smoothing_enabled = true rotation_smoothing_speed = 10.0 - -[node name="engine_sounds" type="AudioStreamPlayer" parent="."] -stream = ExtResource("4_4ajo8") -volume_db = -40.467 -autoplay = true - -[node name="damage_sounds" type="AudioStreamPlayer" parent="."] -stream = ExtResource("5_rvolc") -volume_db = -25.297 - -[node name="death_sound" type="AudioStreamPlayer" parent="."] -stream = ExtResource("6_i0vg5") -volume_db = -25.297 diff --git a/src/game/player_controller.gd b/src/game/player_controller.gd index a362dbb..430953a 100644 --- a/src/game/player_controller.gd +++ b/src/game/player_controller.gd @@ -25,7 +25,6 @@ extends StaticBody2D # variables var momentum: Vector2 #var direction = 0 # 1 for forward, 0 for standing still, -1 for reverse -var dead = false signal speed_changed(new_speed) @@ -36,52 +35,45 @@ func _ready(): # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta): + var acc_d = acc * delta var dec_d = dec * delta + var rev_d = rev * delta + var turn_d = turn_speed * delta + var brake_d = brake_strength * delta + var turn_factor = 1 + if momentum.length() > dec_d: momentum -= momentum.normalized()*dec_d else: momentum = Vector2(0,0) - if !dead: - var acc_d = acc * delta - var rev_d = rev * delta - var turn_d = turn_speed * delta - var brake_d = brake_strength * delta - var turn_factor = 1 + if Input.is_action_pressed("accelerate"): + momentum += acc_d * Vector2(1,0).rotated(rotation) + +# if Input.is_action_pressed("reverse"): +# print_debug("reverse vector: ", rev_d * Vector2(-1,0).rotated(rotation)) +# momentum += rev_d * Vector2(-1,0).rotated(rotation) +# print_debug("momentum vector = ", momentum) + + if Input.is_action_pressed("brake"): + turn_factor = drift_factor + if momentum.length() > brake_d: + momentum -= momentum.normalized() * brake_d + else: + momentum = Vector2(0,0) + + if Input.is_action_pressed("left"): + rotate(turn_d*turn_factor*-1) + if Input.is_action_pressed("right"): + rotate(turn_d*turn_factor) - if Input.is_action_pressed("accelerate"): - momentum += acc_d * Vector2(1,0).rotated(rotation) - - # if Input.is_action_pressed("reverse"): - # print_debug("reverse vector: ", rev_d * Vector2(-1,0).rotated(rotation)) - # momentum += rev_d * Vector2(-1,0).rotated(rotation) - # print_debug("momentum vector = ", momentum) - - if Input.is_action_pressed("brake"): - turn_factor = drift_factor - if momentum.length() > brake_d: - momentum -= momentum.normalized() * brake_d - else: - momentum = Vector2(0,0) - - if Input.is_action_pressed("left"): - rotate(turn_d*turn_factor*-1) - if Input.is_action_pressed("right"): - rotate(turn_d*turn_factor) - - if !Input.is_action_pressed("brake"): - momentum = Vector2(1,0).rotated(rotation) * momentum.length() - - camera.position = Vector2(get_speed_proportion() * camera_offset, 0) - camera.rotation_degrees = momentum.angle() + 90 - - $engine_sounds.pitch_scale = get_speed_proportion() + .2 - else: - rotate(PI*delta * get_speed_proportion()) + if !Input.is_action_pressed("brake"): + momentum = Vector2(1,0).rotated(rotation) * momentum.length() + + camera.position = Vector2((momentum.length() / max_speed) * camera_offset, 0) + camera.rotation_degrees = momentum.angle() + 90 + if momentum.length() > max_speed: momentum = momentum.normalized() * max_speed speed_changed.emit(momentum.length()) move_and_collide(momentum * delta) - -func get_speed_proportion(): - return (momentum.length() / max_speed)