Skip to content

Commit

Permalink
arena music
Browse files Browse the repository at this point in the history
  • Loading branch information
@DanielElisenberg
DanielElisenberg committed Apr 15, 2024
1 parent 1f1f312 commit fefc997
Show file tree
Hide file tree
Showing 14 changed files with 71 additions and 21 deletions.
2 changes: 1 addition & 1 deletion scenes/arena.tscn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
[ext_resource type="AudioStream" uid="uid://r2x0xl547ogc" path="res://sounds/sfx/round_one.mp3" id="13_x5p41"]
[ext_resource type="AudioStream" uid="uid://dfux6ifjmwjxp" path="res://sounds/sfx/round_two.mp3" id="14_2xykl"]
[ext_resource type="AudioStream" uid="uid://cj2thne38xtrf" path="res://sounds/sfx/final_round.mp3" id="15_p2c5a"]
[ext_resource type="PackedScene" path="res://scenes/versus.tscn" id="16_t2jnb"]
[ext_resource type="PackedScene" uid="uid://tijbokynigwu" path="res://scenes/versus.tscn" id="16_t2jnb"]

[sub_resource type="RectangleShape2D" id="RectangleShape2D_mq1db"]
size = Vector2(39.5, 872.5)
Expand Down
2 changes: 1 addition & 1 deletion scenes/arena_ceo.tscn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
[ext_resource type="AudioStream" uid="uid://r2x0xl547ogc" path="res://sounds/sfx/round_one.mp3" id="13_rw1l0"]
[ext_resource type="AudioStream" uid="uid://dfux6ifjmwjxp" path="res://sounds/sfx/round_two.mp3" id="14_l4h36"]
[ext_resource type="AudioStream" uid="uid://cj2thne38xtrf" path="res://sounds/sfx/final_round.mp3" id="15_qm0yf"]
[ext_resource type="PackedScene" path="res://scenes/versus.tscn" id="16_lv3og"]
[ext_resource type="PackedScene" uid="uid://tijbokynigwu" path="res://scenes/versus.tscn" id="16_lv3og"]

[sub_resource type="RectangleShape2D" id="RectangleShape2D_mq1db"]
size = Vector2(39.5, 872.5)
Expand Down
2 changes: 1 addition & 1 deletion scenes/arena_devon.tscn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[ext_resource type="Script" path="res://scripts/arena.gd" id="1_msr1w"]
[ext_resource type="Texture2D" uid="uid://slnivve5revd" path="res://sprites/backgrounds/fight_bg.png" id="2_8160l"]
[ext_resource type="PackedScene" path="res://scenes/versus.tscn" id="2_nhcav"]
[ext_resource type="PackedScene" uid="uid://tijbokynigwu" path="res://scenes/versus.tscn" id="2_nhcav"]
[ext_resource type="PackedScene" uid="uid://dpgss5cyimvpn" path="res://scenes/player_character.tscn" id="3_uyqvy"]
[ext_resource type="PackedScene" uid="uid://r5peab67hacc" path="res://scenes/health_bar.tscn" id="4_a4rr8"]
[ext_resource type="FontFile" uid="uid://cldenxc5p1221" path="res://fonts/Pixelify_Sans/static/PixelifySans-Medium.ttf" id="5_pqqgj"]
Expand Down
8 changes: 4 additions & 4 deletions scenes/courtroom_ceo.tscn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

[ext_resource type="Script" path="res://scripts/courtroom_ceo.gd" id="1_ajp4y"]
[ext_resource type="Texture2D" uid="uid://ba6fhck0lsywo" path="res://sprites/backgrounds/courtroom.png" id="2_xr87f"]
[ext_resource type="PackedScene" path="res://scenes/warlock.tscn" id="3_ekk7o"]
[ext_resource type="PackedScene" path="res://scenes/summoning_ring.tscn" id="4_s1u30"]
[ext_resource type="PackedScene" path="res://scenes/text_box.tscn" id="5_saxum"]
[ext_resource type="PackedScene" uid="uid://cnbl6ra6bh6mc" path="res://scenes/warlock.tscn" id="3_ekk7o"]
[ext_resource type="PackedScene" uid="uid://okqnfgow3d3a" path="res://scenes/summoning_ring.tscn" id="4_s1u30"]
[ext_resource type="PackedScene" uid="uid://byshmomdcx3dv" path="res://scenes/text_box.tscn" id="5_saxum"]
[ext_resource type="AudioStream" uid="uid://bgnd3ptkli7ew" path="res://sounds/a_courtroom_somewhere.mp3" id="6_6tynu"]
[ext_resource type="PackedScene" path="res://scenes/versus.tscn" id="7_sq88j"]
[ext_resource type="PackedScene" uid="uid://tijbokynigwu" path="res://scenes/versus.tscn" id="7_sq88j"]

[node name="courtroom_ceo" type="Node2D"]
position = Vector2(750, 2.08165e-12)
Expand Down
8 changes: 4 additions & 4 deletions scenes/courtroom_devin.tscn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

[ext_resource type="Texture2D" uid="uid://ba6fhck0lsywo" path="res://sprites/backgrounds/courtroom.png" id="1_j6pui"]
[ext_resource type="Script" path="res://scripts/courtroom_devin.gd" id="1_j78rv"]
[ext_resource type="PackedScene" path="res://scenes/warlock.tscn" id="2_53ydx"]
[ext_resource type="PackedScene" path="res://scenes/summoning_ring.tscn" id="3_x87h7"]
[ext_resource type="PackedScene" path="res://scenes/text_box.tscn" id="4_noygb"]
[ext_resource type="PackedScene" uid="uid://cnbl6ra6bh6mc" path="res://scenes/warlock.tscn" id="2_53ydx"]
[ext_resource type="PackedScene" uid="uid://okqnfgow3d3a" path="res://scenes/summoning_ring.tscn" id="3_x87h7"]
[ext_resource type="PackedScene" uid="uid://byshmomdcx3dv" path="res://scenes/text_box.tscn" id="4_noygb"]
[ext_resource type="AudioStream" uid="uid://bgnd3ptkli7ew" path="res://sounds/a_courtroom_somewhere.mp3" id="6_0krxw"]
[ext_resource type="PackedScene" path="res://scenes/versus.tscn" id="6_qcd74"]
[ext_resource type="PackedScene" uid="uid://tijbokynigwu" path="res://scenes/versus.tscn" id="6_qcd74"]

[node name="courtroom_devin" type="Node2D"]
position = Vector2(750, 2.08165e-12)
Expand Down
5 changes: 2 additions & 3 deletions scenes/courtroom_satan.gd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ extends Node2D
@onready var text_box = $TextBox
@onready var timer = $Timer
@onready var versus = $Versus
@onready var bgm = $bgm

var can_interact = false

Expand Down Expand Up @@ -71,11 +72,9 @@ func initiate_scene():
text_box.display("Judge Roundhouse", "PREPARE FOR JUSTICE! TRIAL BY COMBAT!")
can_interact = true
await advance

bgm.stop()
versus.enter_screen()
await versus.finished
timer.start(1.5)
await timer.timeout

get_tree().change_scene_to_file("res://scenes/arena.tscn")

10 changes: 9 additions & 1 deletion scenes/versus.tscn
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_scene load_steps=15 format=3 uid="uid://tijbokynigwu"]
[gd_scene load_steps=17 format=3 uid="uid://tijbokynigwu"]

[ext_resource type="Texture2D" uid="uid://bl7qhbtw68uoy" path="res://sprites/backgrounds/versus_bg_c.png" id="1_go7cd"]
[ext_resource type="Script" path="res://scripts/versus.gd" id="1_t5wme"]
Expand All @@ -8,6 +8,8 @@
[ext_resource type="Texture2D" uid="uid://dxmplasi56eus" path="res://sprites/fighters/judgesheet.png" id="6_8qtsj"]
[ext_resource type="Texture2D" uid="uid://dnrqoxfc4v173" path="res://sprites/backgrounds/bg_versus_l.png" id="6_aabg4"]
[ext_resource type="FontFile" uid="uid://bh4o4pc5pwotn" path="res://fonts/Pixelify_Sans/static/PixelifySans-Bold.ttf" id="7_m7rbl"]
[ext_resource type="AudioStream" uid="uid://d075011w27hkw" path="res://sounds/versus_jingle_start.mp3" id="9_7upw4"]
[ext_resource type="AudioStream" uid="uid://c8y4i441c8hax" path="res://sounds/versus_jingle_end.mp3" id="10_yiash"]

[sub_resource type="AtlasTexture" id="AtlasTexture_rk4gm"]
atlas = ExtResource("3_2utvo")
Expand Down Expand Up @@ -125,3 +127,9 @@ theme_override_fonts/font = ExtResource("7_m7rbl")
theme_override_font_sizes/font_size = 150
text = "VS"
horizontal_alignment = 1

[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
stream = ExtResource("9_7upw4")

[node name="AudioStreamPlayer2" type="AudioStreamPlayer" parent="."]
stream = ExtResource("10_yiash")
3 changes: 2 additions & 1 deletion scripts/courtroom_ceo.gd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ extends Node2D
@onready var text_box = $TextBox
@onready var timer = $Timer
@onready var versus = $Versus
@onready var bgm = $bgm

var can_interact = false

Expand Down Expand Up @@ -69,9 +70,9 @@ func initiate_scene():
text_box.display("Judge Roundhouse", "I have heard enough! TRIAL BY COMBAT!")
can_interact = true
await advance
bgm.stop()
versus.enter_screen()
await versus.finished
timer.start(1.5)
await timer.timeout
get_tree().change_scene_to_file("res://scenes/arena_ceo.tscn")

4 changes: 2 additions & 2 deletions scripts/courtroom_devin.gd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ extends Node2D
@onready var text_box = $TextBox
@onready var timer = $Timer
@onready var versus = $Versus
@onready var bgm = $bgm

var can_interact = false

Expand Down Expand Up @@ -78,9 +79,8 @@ func initiate_scene():
text_box.display("Judge Roundhouse", "TRIAL BY COMBAT!")
can_interact = true
await advance
bgm.stop()
versus.enter_screen()
await versus.finished
timer.start(1.5)
await timer.timeout
get_tree().change_scene_to_file("res://scenes/arena_devon.tscn")

10 changes: 7 additions & 3 deletions scripts/versus.gd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,19 @@ extends Node2D
@onready var cslide = $CSlide
@onready var rslide = $RSlide
@onready var rslide_character = $RSlide/character
@onready var rslide_label = $RSlide/Label
@onready var lslide = $LSlide
@onready var label = $Label

@onready var audio = $AudioStreamPlayer
@onready var audio2 = $AudioStreamPlayer2

@export var start_off_screen: bool = true
@export var enemy: String = "Devin"

signal finished

func _ready():
label.text = enemy
rslide_label.text = enemy
rslide_character.play(enemy)
if start_off_screen:
label.visible = false
Expand All @@ -23,6 +25,7 @@ func _ready():


func enter_screen():
audio.play()
var tween = create_tween()
tween.tween_property(lslide, "position", Vector2(0,0), 0.5)
await tween.finished
Expand All @@ -32,11 +35,12 @@ func enter_screen():
tween = create_tween()
tween.tween_property(cslide, "position", Vector2(0,0), 0.2)
await tween.finished

await audio.finished
label.visible = true
emit_signal("finished")

func exit_screen():
audio2.play()
label.visible = false
var tween = create_tween()
tween.tween_property(cslide, "position", Vector2(0,-1080), 0.2)
Expand Down
Binary file added sounds/versus_jingle_end.mp3
View file
Binary file not shown.
19 changes: 19 additions & 0 deletions sounds/versus_jingle_end.mp3.import
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[remap]

importer="mp3"
type="AudioStreamMP3"
uid="uid://c8y4i441c8hax"
path="res://.godot/imported/versus_jingle_end.mp3-5f85978acd9dbc53bc49934079b789b9.mp3str"

[deps]

source_file="res://sounds/versus_jingle_end.mp3"
dest_files=["res://.godot/imported/versus_jingle_end.mp3-5f85978acd9dbc53bc49934079b789b9.mp3str"]

[params]

loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4
Binary file added sounds/versus_jingle_start.mp3
View file
Binary file not shown.
19 changes: 19 additions & 0 deletions sounds/versus_jingle_start.mp3.import
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[remap]

importer="mp3"
type="AudioStreamMP3"
uid="uid://d075011w27hkw"
path="res://.godot/imported/versus_jingle_start.mp3-4efdbe1a9b2df571f6a575d9173ca7bf.mp3str"

[deps]

source_file="res://sounds/versus_jingle_start.mp3"
dest_files=["res://.godot/imported/versus_jingle_start.mp3-4efdbe1a9b2df571f6a575d9173ca7bf.mp3str"]

[params]

loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4

0 comments on commit fefc997

Please sign in to comment.