team-sg/hero-mark-2
team-sg/hero-mark-2
5
0
Fork 1
Code Issues 12 Releases Activity

Merge branch 'main' into demo

Browse source
This commit is contained in:
Haze Weathers 2023-12-29 03:05:28 -05:00
commit fc538a2d2a
36 changed files with 958 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

31
menus/credits.tscn
View file

@ -589,7 +589,8 @@ tracks/0/keys = {
[sub_resource type="Animation" id=90]
resource_name = "credits"
length = 81.0
length = 90.0
step = 1.0
tracks/0/type = "value"
tracks/0/path = NodePath("Control:rect_position")
tracks/0/interp = 1
@ -597,10 +598,10 @@ tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0, 2, 3, 5, 6, 10, 11, 15, 16, 20, 21, 25, 26, 30, 31, 35, 36, 40, 41, 45, 46, 50, 51, 55, 56, 60, 61, 65, 66, 70, 71, 75, 76 ),
"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ),
"times": PoolRealArray( 0, 2, 3, 5, 6, 10, 11, 15, 16, 20, 21, 25, 26, 30, 31, 35, 36, 40, 41, 45, 46, 50, 51, 55, 56, 60, 61, 65, 66, 70, 71, 75, 76, 80, 81, 85, 86 ),
"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ),
"update": 0,
"values": [ Vector2( 0, 0 ), Vector2( 0, 0 ), Vector2( -256, 0 ), Vector2( -256, 0 ), Vector2( -512, 0 ), Vector2( -512, 0 ), Vector2( -768, 0 ), Vector2( -768, 0 ), Vector2( -1024, 0 ), Vector2( -1024, 0 ), Vector2( -1280, 0 ), Vector2( -1280, 0 ), Vector2( -1536, 0 ), Vector2( -1536, 0 ), Vector2( -1792, 0 ), Vector2( -1792, 0 ), Vector2( -2048, 0 ), Vector2( -2048, 0 ), Vector2( -2304, 0 ), Vector2( -2304, 0 ), Vector2( -2560, 0 ), Vector2( -2560, 0 ), Vector2( -2816, 0 ), Vector2( -2816, 0 ), Vector2( -3072, 0 ), Vector2( -3072, 0 ), Vector2( -3328, 0 ), Vector2( -3328, 0 ), Vector2( -3584, 0 ), Vector2( -3584, 0 ), Vector2( -3840, 0 ), Vector2( -3840, 0 ), Vector2( -4096, 0 ) ]
"values": [ Vector2( 0, 0 ), Vector2( 0, 0 ), Vector2( -256, 0 ), Vector2( -256, 0 ), Vector2( -512, 0 ), Vector2( -512, 0 ), Vector2( -768, 0 ), Vector2( -768, 0 ), Vector2( -1024, 0 ), Vector2( -1024, 0 ), Vector2( -1280, 0 ), Vector2( -1280, 0 ), Vector2( -1536, 0 ), Vector2( -1536, 0 ), Vector2( -1792, 0 ), Vector2( -1792, 0 ), Vector2( -2048, 0 ), Vector2( -2048, 0 ), Vector2( -2304, 0 ), Vector2( -2304, 0 ), Vector2( -2560, 0 ), Vector2( -2560, 0 ), Vector2( -2816, 0 ), Vector2( -2816, 0 ), Vector2( -3072, 0 ), Vector2( -3072, 0 ), Vector2( -3328, 0 ), Vector2( -3328, 0 ), Vector2( -3584, 0 ), Vector2( -3584, 0 ), Vector2( -3840, 0 ), Vector2( -3840, 0 ), Vector2( -4096, 0 ), Vector2( -4096, 0 ), Vector2( -4352, 0 ), Vector2( -4352, 0 ), Vector2( -4608, 0 ) ]
}
[node name="Credits" type="Node" groups=["map"]]
@ -737,7 +738,7 @@ theme = ExtResource( 6 )
text = "-Our playtesters-
Penny rigate
Haze Weathers
Ivy scarlet
Ivy snyder
DogJelly
Wolfboy
Rhidianruckus
@ -832,7 +833,7 @@ align = 1
material = SubResource( 8 )
position = Vector2( 106, 69 )
frames = SubResource( 18 )
frame = 2
frame = 3
playing = true
[node name="Label" type="Label" parent="Control/RollCall1/MsX"]
@ -902,6 +903,7 @@ position = Vector2( 1024, 0 )
material = SubResource( 13 )
position = Vector2( 2880, 24 )
frames = SubResource( 21 )
frame = 1
playing = true
[node name="Label" type="Label" parent="Control/RollCall2/Eviscerator"]
@ -918,6 +920,7 @@ align = 1
material = SubResource( 13 )
position = Vector2( 2952, 24 )
frames = SubResource( 24 )
frame = 1
playing = true
[node name="Label" type="Label" parent="Control/RollCall2/Catbat"]
@ -933,6 +936,7 @@ align = 1
[node name="TheScrump" type="AnimatedSprite" parent="Control/RollCall2"]
position = Vector2( 2992, 128 )
frames = SubResource( 27 )
frame = 1
playing = true
[node name="Label" type="Label" parent="Control/RollCall2/TheScrump"]
@ -980,7 +984,7 @@ align = 1
material = SubResource( 34 )
position = Vector2( 3024, 62 )
frames = SubResource( 43 )
frame = 6
frame = 3
playing = true
[node name="Label" type="Label" parent="Control/RollCall2/Skelarcher"]
@ -996,6 +1000,7 @@ align = 1
[node name="SabreSpighter" type="AnimatedSprite" parent="Control/RollCall2"]
position = Vector2( 2880, 62 )
frames = SubResource( 46 )
frame = 1
playing = true
[node name="Label" type="Label" parent="Control/RollCall2/SabreSpighter"]
@ -1088,7 +1093,6 @@ align = 1
[node name="Squig" type="AnimatedSprite" parent="Control/RollCall3"]
position = Vector2( 200, 64 )
frames = SubResource( 65 )
frame = 1
playing = true
[node name="Label" type="Label" parent="Control/RollCall3/Squig"]
@ -1105,7 +1109,7 @@ align = 1
material = SubResource( 71 )
position = Vector2( 72, 152 )
frames = SubResource( 80 )
frame = 7
frame = 4
playing = true
[node name="Label" type="Label" parent="Control/RollCall3/Hellarcher"]
@ -1122,7 +1126,7 @@ align = 1
material = SubResource( 66 )
position = Vector2( 68, 104 )
frames = SubResource( 70 )
frame = 1
frame = 2
playing = true
[node name="Label" type="Label" parent="Control/RollCall3/Turchin"]
@ -1152,7 +1156,6 @@ position = Vector2( 4, 0 )
z_index = 1
frames = SubResource( 61 )
animation = "chomp"
frame = 1
playing = true
[node name="Border" type="AnimatedSprite" parent="Control/RollCall3/Beel/Head/Sprite"]
@ -1160,7 +1163,6 @@ material = SubResource( 62 )
z_index = -1
frames = SubResource( 61 )
animation = "chomp"
frame = 1
playing = true
[node name="ShapeTransform" type="RemoteTransform2D" parent="Control/RollCall3/Beel/Head"]
@ -1262,11 +1264,11 @@ position = Vector2( 3464, -8 )
autostart = false
[node name="FootShapeFront" parent="Control/RollCall4/2600/Hitbox" index="1"]
position = Vector2( 63.7334, 154.923 )
position = Vector2( 63.7333, 154.923 )
scale = Vector2( 1, 1 )
[node name="FootShapeBack" parent="Control/RollCall4/2600/Hitbox" index="2"]
position = Vector2( 42.7334, 154.923 )
position = Vector2( 42.7333, 154.923 )
scale = Vector2( 1, 1 )
[node name="ExplosionRect" parent="Control/RollCall4/2600/BigExplosion" index="0"]
@ -1311,7 +1313,6 @@ align = 1
material = SubResource( 82 )
position = Vector2( 3362, 122.5 )
frames = SubResource( 87 )
frame = 2
playing = true
[node name="Label" type="Label" parent="Control/RollCall4/Famicop"]

6
menus/sound_select.gd
View file

@ -8,11 +8,11 @@ onready var body = $SoundLabel/Label
func _gui_input(event):
if Input.is_action_just_pressed("ui_left"):
current_selection -= 1
if Input.is_action_just_pressed("ui_right"):
elif Input.is_action_just_pressed("ui_right"):
current_selection += 1
if Input.is_action_just_pressed("ui_accept"):
elif Input.is_action_just_pressed("ui_accept"):
Audio.play_sound(sounds[current_selection],Audio.ac_collectible)
if Input.is_action_just_pressed("ui_cancel"):
elif Input.is_action_just_pressed("ui_cancel"):
Audio.ac_music.stop()
current_selection = posmod(current_selection,sounds.size())
body.text = titles[current_selection]

10
menus/sound_test.tscn
View file

@ -48,9 +48,9 @@ shader_param/color_1 = Color( 0.501961, 1, 0.929412, 1 )
shader_param/color_2 = Color( 0, 0.713726, 0.631373, 1 )
shader_param/checker_size = Vector2( 32, 32 )
shader_param/pan_speed = Vector2( 12, 0 )
shader_param/cycle_speed = Vector2( 8, 0 )
shader_param/cycle_alternation = Vector2( 2, 0 )
shader_param/uv_transform = Transform2D( 0, 3, 2, 1, 0, 0 )
shader_param/cycle_speed = Vector2( 9, 0 )
shader_param/cycle_alternation = Vector2( 2, 1 )
shader_param/uv_transform = Transform2D( 0, 3, 3, 1, 0, 0 )
[sub_resource type="ShaderMaterial" id=12]
shader = ExtResource( 2 )
@ -107,7 +107,6 @@ material = SubResource( 12 )
position = Vector2( 72, 152 )
scale = Vector2( 2, 2 )
frames = SubResource( 15 )
frame = 1
playing = true
[node name="AnimatedSprite3" type="AnimatedSprite" parent="."]
@ -115,7 +114,6 @@ material = SubResource( 12 )
position = Vector2( 112, 152 )
scale = Vector2( 2, 2 )
frames = SubResource( 15 )
frame = 1
playing = true
[node name="AnimatedSprite4" type="AnimatedSprite" parent="."]
@ -123,7 +121,6 @@ material = SubResource( 12 )
position = Vector2( 152, 152 )
scale = Vector2( 2, 2 )
frames = SubResource( 15 )
frame = 1
playing = true
[node name="AnimatedSprite5" type="AnimatedSprite" parent="."]
@ -131,7 +128,6 @@ material = SubResource( 12 )
position = Vector2( 192, 152 )
scale = Vector2( 2, 2 )
frames = SubResource( 15 )
frame = 1
playing = true
[node name="Music" type="TextureButton" parent="."]