diff --git a/Mario Kart Race Start - Sound Effect (HD).mp3 b/Mario Kart Race Start - Sound Effect (HD).mp3 new file mode 100644 index 0000000..731aa7e Binary files /dev/null and b/Mario Kart Race Start - Sound Effect (HD).mp3 differ diff --git a/Mario Kart Race Start - Sound Effect (HD).mp3.import b/Mario Kart Race Start - Sound Effect (HD).mp3.import new file mode 100644 index 0000000..6c09129 --- /dev/null +++ b/Mario Kart Race Start - Sound Effect (HD).mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://c27abe2dhhok1" +path="res://.godot/imported/Mario Kart Race Start - Sound Effect (HD).mp3-d1ec96e7e84451715534300088c258b8.mp3str" + +[deps] + +source_file="res://Mario Kart Race Start - Sound Effect (HD).mp3" +dest_files=["res://.godot/imported/Mario Kart Race Start - Sound Effect (HD).mp3-d1ec96e7e84451715534300088c258b8.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/game.tscn b/game.tscn index 7db2a4b..fdb4cce 100644 --- a/game.tscn +++ b/game.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=18 format=3 uid="uid://jo1lu66y1gx6"] +[gd_scene load_steps=19 format=3 uid="uid://jo1lu66y1gx6"] [ext_resource type="Texture2D" uid="uid://i348o6hqw2dn" path="res://sprites/44389.png" id="1_e2o6t"] [ext_resource type="Script" uid="uid://5qnvkmmtxsw2" path="res://gameManager.gd" id="1_feb5d"] [ext_resource type="AudioStream" uid="uid://ck06glyqpqy3n" path="res://Battle Mode - Mario Kart DS OST Extended.mp3" id="3_feb5d"] [ext_resource type="AudioStream" uid="uid://igps611ecoc" path="res://0014.wav" id="4_fc0e3"] +[ext_resource type="AudioStream" uid="uid://xnhjht3k7qvd" path="res://music/intro.mp3" id="5_7jktm"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_feb5d"] size = Vector2(16, 254) @@ -44,10 +45,9 @@ font_color = Color(0.481789, 0.481789, 0.481789, 1) [sub_resource type="CircleShape2D" id="CircleShape2D_7jktm"] radius = 3.0 -[node name="Game" type="Node2D" node_paths=PackedStringArray("player_spawns_nodes", "starting_shine_nodes", "shine_nodes", "scorecard_container", "elim_timer_label", "game_timer_label", "chime_player")] +[node name="Game" type="Node2D" node_paths=PackedStringArray("player_spawns_nodes", "starting_shine_nodes", "shine_nodes", "scorecard_container", "elim_timer_label", "game_timer_label", "chime_player", "music_player")] script = ExtResource("1_feb5d") -shyguy_mode = true -max_shinies = 16 +max_shinies = 100 player_spawns_nodes = NodePath("PlayerSpawns") starting_shine_nodes = NodePath("StartingShineLocations") shine_nodes = NodePath("ShineLocations") @@ -55,6 +55,7 @@ scorecard_container = NodePath("GameUI/Scoreboard/VBoxContainer/scorecard_contai elim_timer_label = NodePath("GameUI/ElimTimer") game_timer_label = NodePath("GameUI/GameTimer") chime_player = NodePath("Chimer") +music_player = NodePath("MusicPlayer") [node name="Sprite2D" type="Sprite2D" parent="."] texture_filter = 1 @@ -438,11 +439,17 @@ position = Vector2(-67, 0) shape = SubResource("CircleShape2D_7jktm") debug_color = Color(0.623589, 0.532808, 0, 0.42) -[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] +[node name="MusicPlayer" type="AudioStreamPlayer" parent="."] stream = ExtResource("3_feb5d") volume_db = -20.0 -autoplay = true parameters/looping = true [node name="Chimer" type="AudioStreamPlayer" parent="."] stream = ExtResource("4_fc0e3") + +[node name="IntroPlayer" type="AudioStreamPlayer" parent="."] +stream = ExtResource("5_7jktm") +volume_db = -18.128 +autoplay = true + +[connection signal="finished" from="IntroPlayer" to="." method="_on_intro_player_finished"] diff --git a/gameManager.gd b/gameManager.gd index d1ff694..ce9589e 100644 --- a/gameManager.gd +++ b/gameManager.gd @@ -1,6 +1,12 @@ extends Node2D class_name GM +enum State { + prep, + game, + end +} + @export var shyguy_mode : bool @export var max_shinies : int = 9 var player_spawns : Array[Node] @@ -16,7 +22,9 @@ var players : Array[Player] @export var elim_timer_label : Label @export var game_timer_label : Label @export var chime_player : AudioStreamPlayer +@export var music_player : AudioStreamPlayer +var state : State = State.prep var game_timer : float = 0 var elim_timer : float = 60 var shiny_spawn_timer : float = 5 @@ -68,13 +76,14 @@ func spawn_new_shiny(): func _process(delta: float) -> void: - elim_timer -= delta - game_timer += delta - shiny_spawn_timer -= delta - if(shiny_spawn_timer<=0 and shiny_count < max_shinies): - spawn_new_shiny() - if(elim_timer <= 0): - elim_players() + if(state == State.game): + elim_timer -= delta + game_timer += delta + shiny_spawn_timer -= delta + if(shiny_spawn_timer<=0 and shiny_count < max_shinies): + spawn_new_shiny() + if(elim_timer <= 0): + elim_players() update_ui() if elim_timer < play_next_chime: @@ -114,3 +123,11 @@ func format_time(time : float, include_minutes : bool) -> String: return str(minutes).pad_zeros(2) +":"+ str(seconds).pad_zeros(2)+"."+str(millis_2dp).pad_zeros(2) else: return str(seconds).pad_zeros(2)+"."+str(millis_2dp).pad_zeros(2) + + +func _on_intro_player_finished() -> void: + state = State.game + music_player.play() + #for player in players: + #player.start_engine() + diff --git a/music/09. Racetrack Flyover.mp3 b/music/09. Racetrack Flyover.mp3 new file mode 100644 index 0000000..ee8320b Binary files /dev/null and b/music/09. Racetrack Flyover.mp3 differ diff --git a/music/09. Racetrack Flyover.mp3.import b/music/09. Racetrack Flyover.mp3.import new file mode 100644 index 0000000..58f95aa --- /dev/null +++ b/music/09. Racetrack Flyover.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://curcqcc4tw4tf" +path="res://.godot/imported/09. Racetrack Flyover.mp3-0e481b7b57002bda20154a496195d7c0.mp3str" + +[deps] + +source_file="res://music/09. Racetrack Flyover.mp3" +dest_files=["res://.godot/imported/09. Racetrack Flyover.mp3-0e481b7b57002bda20154a496195d7c0.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/music/10. Start Your Engines.mp3 b/music/10. Start Your Engines.mp3 new file mode 100644 index 0000000..ea3e0c1 Binary files /dev/null and b/music/10. Start Your Engines.mp3 differ diff --git a/music/10. Start Your Engines.mp3.import b/music/10. Start Your Engines.mp3.import new file mode 100644 index 0000000..9be6840 --- /dev/null +++ b/music/10. Start Your Engines.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://hvjq6opt51gt" +path="res://.godot/imported/10. Start Your Engines.mp3-331c564b06545f572b14605ea005397f.mp3str" + +[deps] + +source_file="res://music/10. Start Your Engines.mp3" +dest_files=["res://.godot/imported/10. Start Your Engines.mp3-331c564b06545f572b14605ea005397f.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/music/85. Battle Flyover.mp3 b/music/85. Battle Flyover.mp3 new file mode 100644 index 0000000..12cb729 Binary files /dev/null and b/music/85. Battle Flyover.mp3 differ diff --git a/music/85. Battle Flyover.mp3.import b/music/85. Battle Flyover.mp3.import new file mode 100644 index 0000000..9e0e321 --- /dev/null +++ b/music/85. Battle Flyover.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://b7v7bcgp3iu8u" +path="res://.godot/imported/85. Battle Flyover.mp3-bb667e09090601cdb56220faae5dfb66.mp3str" + +[deps] + +source_file="res://music/85. Battle Flyover.mp3" +dest_files=["res://.godot/imported/85. Battle Flyover.mp3-bb667e09090601cdb56220faae5dfb66.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/music/90. Multiplayer Results - Win.mp3 b/music/90. Multiplayer Results - Win.mp3 new file mode 100644 index 0000000..c48e8ec Binary files /dev/null and b/music/90. Multiplayer Results - Win.mp3 differ diff --git a/music/90. Multiplayer Results - Win.mp3.import b/music/90. Multiplayer Results - Win.mp3.import new file mode 100644 index 0000000..f87fd92 --- /dev/null +++ b/music/90. Multiplayer Results - Win.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://cyyivtye4ngmt" +path="res://.godot/imported/90. Multiplayer Results - Win.mp3-fe3d2b8eee1a769a8f5cd010cd6363e2.mp3str" + +[deps] + +source_file="res://music/90. Multiplayer Results - Win.mp3" +dest_files=["res://.godot/imported/90. Multiplayer Results - Win.mp3-fe3d2b8eee1a769a8f5cd010cd6363e2.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/music/93. Mission Start.mp3 b/music/93. Mission Start.mp3 new file mode 100644 index 0000000..2ce94cc Binary files /dev/null and b/music/93. Mission Start.mp3 differ diff --git a/music/93. Mission Start.mp3.import b/music/93. Mission Start.mp3.import new file mode 100644 index 0000000..fa030dd --- /dev/null +++ b/music/93. Mission Start.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://dgi8xrknrojq6" +path="res://.godot/imported/93. Mission Start.mp3-750589cdbe6dc699e2fe912369f852a5.mp3str" + +[deps] + +source_file="res://music/93. Mission Start.mp3" +dest_files=["res://.godot/imported/93. Mission Start.mp3-750589cdbe6dc699e2fe912369f852a5.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/music/intro.mp3 b/music/intro.mp3 new file mode 100644 index 0000000..42aee3a Binary files /dev/null and b/music/intro.mp3 differ diff --git a/music/intro.mp3.import b/music/intro.mp3.import new file mode 100644 index 0000000..87493a7 --- /dev/null +++ b/music/intro.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://xnhjht3k7qvd" +path="res://.godot/imported/intro.mp3-5bb1dd416ee77276d3d4bd4add6cabd1.mp3str" + +[deps] + +source_file="res://music/intro.mp3" +dest_files=["res://.godot/imported/intro.mp3-5bb1dd416ee77276d3d4bd4add6cabd1.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/player.gd b/player.gd index 64cfedc..7414ce4 100644 --- a/player.gd +++ b/player.gd @@ -14,8 +14,11 @@ func _ready() -> void: var direction : Vector2 = Vector2 (randf_range(-1,1), randf_range(-1,1)) apply_force( direction.normalized() * start_speed) + #animated_sprite.frame = frame + + func setup(): animated_sprite.frame = id @@ -43,5 +46,6 @@ func _on_body_entered(body: Node) -> void: if body.is_in_group("player") : print("playersHit") if(score > 0): - score -= 1 - respawn_shiny() + #score -= 1 + #respawn_shiny() + pass diff --git a/sprites/44384.png b/sprites/44384.png new file mode 100644 index 0000000..68619e6 Binary files /dev/null and b/sprites/44384.png differ diff --git a/sprites/44384.png.import b/sprites/44384.png.import new file mode 100644 index 0000000..e271daf --- /dev/null +++ b/sprites/44384.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://btxliju3s0v0y" +path="res://.godot/imported/44384.png-9045b062d0681642717e9e7e546689fe.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/44384.png" +dest_files=["res://.godot/imported/44384.png-9045b062d0681642717e9e7e546689fe.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/sprites/44385.png b/sprites/44385.png new file mode 100644 index 0000000..7827b42 Binary files /dev/null and b/sprites/44385.png differ diff --git a/sprites/44385.png.import b/sprites/44385.png.import new file mode 100644 index 0000000..d8b5c4d --- /dev/null +++ b/sprites/44385.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://vvsohyyesqbb" +path="res://.godot/imported/44385.png-9ec09b33fb4a1616f50419c291b4d581.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/44385.png" +dest_files=["res://.godot/imported/44385.png-9ec09b33fb4a1616f50419c291b4d581.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