diff --git a/audio/music/rev83-wondering-now-short.ogg b/audio/music/rev83-wondering-now-short.ogg new file mode 100644 index 0000000..72c4f2f Binary files /dev/null and b/audio/music/rev83-wondering-now-short.ogg differ diff --git a/audio/music/rev83-wondering-now-short.ogg.import b/audio/music/rev83-wondering-now-short.ogg.import new file mode 100644 index 0000000..f469318 --- /dev/null +++ b/audio/music/rev83-wondering-now-short.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/rev83-wondering-now-short.ogg-6a06f237d6afb85ca00721c00a48a0ef.oggstr" + +[deps] + +source_file="res://audio/music/rev83-wondering-now-short.ogg" +dest_files=[ "res://.import/rev83-wondering-now-short.ogg-6a06f237d6afb85ca00721c00a48a0ef.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/graphics/hud/team_sg_logo.png b/graphics/hud/team_sg_logo.png new file mode 100644 index 0000000..0382e03 Binary files /dev/null and b/graphics/hud/team_sg_logo.png differ diff --git a/graphics/hud/team_sg_logo.png.import b/graphics/hud/team_sg_logo.png.import new file mode 100644 index 0000000..937e35d --- /dev/null +++ b/graphics/hud/team_sg_logo.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/team_sg_logo.png-417aa1cf589d0b9ccf8914bde098b763.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://graphics/hud/team_sg_logo.png" +dest_files=[ "res://.import/team_sg_logo.png-417aa1cf589d0b9ccf8914bde098b763.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/graphics/hud/team_sg_splash.png b/graphics/hud/team_sg_splash.png index d19b782..f248d79 100644 Binary files a/graphics/hud/team_sg_splash.png and b/graphics/hud/team_sg_splash.png differ diff --git a/menus/credits.gd b/menus/credits.gd index f4efaca..7a26f46 100644 --- a/menus/credits.gd +++ b/menus/credits.gd @@ -7,3 +7,6 @@ func _notification(what: int) -> void: $AnimationPlayer.playback_active = false NOTIFICATION_WM_FOCUS_IN: $AnimationPlayer.playback_active = true + +func _ready(): + Audio.play_music(load("res://audio/music/rev83-wondering-now-short.ogg")) diff --git a/menus/credits.tscn b/menus/credits.tscn index 1f5d848..e334668 100644 --- a/menus/credits.tscn +++ b/menus/credits.tscn @@ -46,7 +46,8 @@ [ext_resource path="res://graphics/npc/penny.png" type="Texture" id=44] [ext_resource path="res://graphics/npc/haze.png" type="Texture" id=45] [ext_resource path="res://graphics/hud/thankyou.png" type="Texture" id=46] -[ext_resource path="res://graphics/enemy/boss/famira-wip.png" type="Texture" id=47] +[ext_resource path="res://objects/enemy/boss/famira.tscn" type="PackedScene" id=47] +[ext_resource path="res://graphics/hud/team_sg_logo.png" type="Texture" id=48] [sub_resource type="ShaderMaterial" id=1] shader = ExtResource( 2 ) @@ -150,11 +151,6 @@ tracks/1/keys = { "values": [ Color( 0.4, 1, 0.443137, 1 ), Color( 0.4, 0.52549, 1, 1 ), Color( 0.992157, 0.4, 1, 1 ), Color( 1, 0.423529, 0.4, 1 ), Color( 1, 0.894118, 0.4, 1 ), Color( 0.4, 1, 0.443137, 1 ) ] } -[sub_resource type="ShaderMaterial" id=2] -shader = ExtResource( 1 ) -shader_param/border_color = Color( 0, 0, 0, 1 ) -shader_param/border_corners = false - [sub_resource type="ShaderMaterial" id=5] shader = ExtResource( 1 ) shader_param/border_color = Color( 0, 0, 0, 1 ) @@ -591,7 +587,7 @@ tracks/0/keys = { [sub_resource type="Animation" id=90] resource_name = "credits" -length = 90.0 +length = 98.0 step = 1.0 tracks/0/type = "value" tracks/0/path = NodePath("Control:rect_position") @@ -600,10 +596,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, 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 ), +"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, 90, 91, 95 ), +"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, 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 ), Vector2( -4096, 0 ), Vector2( -4352, 0 ), Vector2( -4352, 0 ), Vector2( -4608, 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 ), Vector2( -4608, 0 ), Vector2( -4864, 0 ), Vector2( -4864, 0 ) ] } [node name="Credits" type="Node" groups=["map"]] @@ -613,9 +609,9 @@ script = ExtResource( 14 ) layer = -64 [node name="ColorRect2" type="ColorRect" parent="CanvasLayer"] -margin_left = 4352.0 +margin_left = 512.0 margin_top = 8.0 -margin_right = 4608.0 +margin_right = 768.0 margin_bottom = 200.0 color = Color( 0.0666667, 0.164706, 0.454902, 0.329412 ) @@ -635,7 +631,6 @@ margin_right = 40.0 margin_bottom = 40.0 [node name="Title" type="Sprite" parent="Control"] -material = SubResource( 2 ) position = Vector2( 128, 96 ) texture = ExtResource( 3 ) @@ -644,10 +639,92 @@ material = SubResource( 5 ) position = Vector2( 384, 88 ) texture = ExtResource( 10 ) +[node name="TeamSG" type="Node2D" parent="Control"] +position = Vector2( 640, 96 ) + +[node name="TeamSgSplash" type="Sprite" parent="Control/TeamSG"] +position = Vector2( 0, -8 ) +texture = ExtResource( 48 ) + +[node name="TeamSG" type="Label" parent="Control/TeamSG"] +material = ExtResource( 4 ) +margin_left = -128.0 +margin_top = -184.0 +margin_right = 128.0 +margin_bottom = 8.0 +theme = ExtResource( 6 ) +text = "Game created by Team SG" +align = 1 +valign = 1 + +[node name="TeamSG2" type="Label" parent="Control/TeamSG"] +material = ExtResource( 4 ) +margin_left = -128.0 +margin_top = 56.0 +margin_right = 128.0 +margin_bottom = 105.0 +theme = ExtResource( 6 ) +text = "Team SG is: Penny rigate, +Haze Weathers, Ivy snyder + and Dog Jelly. + " +align = 1 +valign = 1 + +[node name="TeamSG4" type="Label" parent="Control/TeamSG"] +material = ExtResource( 4 ) +margin_top = -88.0 +margin_right = 182.0 +theme = ExtResource( 6 ) +text = "We decide +the +outcome" +align = 1 +valign = 1 + +[node name="TeamSG5" type="Label" parent="Control/TeamSG"] +material = ExtResource( 4 ) +margin_left = -120.0 +margin_top = 8.0 +margin_right = -64.0 +margin_bottom = 44.0 +theme = ExtResource( 6 ) +text = "Similar +people +create" +align = 1 +valign = 1 + +[node name="TeamSG6" type="Label" parent="Control/TeamSG"] +material = ExtResource( 4 ) +margin_left = 60.0 +margin_top = 8.0 +margin_right = 116.0 +margin_bottom = 44.0 +theme = ExtResource( 6 ) +text = "Games +for +fun" +align = 1 +valign = 1 + +[node name="TeamSG7" type="Label" parent="Control/TeamSG"] +material = ExtResource( 4 ) +margin_left = -120.0 +margin_top = -64.0 +margin_right = -64.0 +margin_bottom = -28.0 +theme = ExtResource( 6 ) +text = "We +love +games" +align = 1 +valign = 1 + [node name="Penny" type="Label" parent="Control"] material = ExtResource( 4 ) -margin_left = 512.0 -margin_right = 768.0 +margin_left = 768.0 +margin_right = 1024.0 margin_bottom = 192.0 theme = ExtResource( 6 ) text = "-Penny \"SG\" Rigate- @@ -663,8 +740,8 @@ valign = 1 [node name="Haze" type="Label" parent="Control"] material = ExtResource( 4 ) -margin_left = 768.0 -margin_right = 1024.0 +margin_left = 1024.0 +margin_right = 1280.0 margin_bottom = 192.0 theme = ExtResource( 6 ) text = "-Haze \"Rolling fiend\" Weathers- @@ -679,8 +756,8 @@ valign = 1 [node name="Ivy" type="Label" parent="Control"] material = ExtResource( 4 ) -margin_left = 1024.0 -margin_right = 1280.0 +margin_left = 1280.0 +margin_right = 1536.0 margin_bottom = 192.0 theme = ExtResource( 6 ) text = "-Ivy \"Shedge\" Snyder- @@ -692,20 +769,22 @@ valign = 1 [node name="Dog" type="Label" parent="Control"] material = ExtResource( 4 ) -margin_left = 1280.0 -margin_right = 1536.0 +margin_left = 1536.0 +margin_right = 1792.0 margin_bottom = 192.0 theme = ExtResource( 6 ) text = "-Dog \"the scrump\" jelly- designer of \"the scrump\" -Story Help" +Story Help +Concept artist +Character design help" align = 1 valign = 1 [node name="GasStationCoffee" type="Label" parent="Control"] material = ExtResource( 4 ) -margin_left = 1536.0 -margin_right = 1792.0 +margin_left = 1792.0 +margin_right = 2048.0 margin_bottom = 192.0 theme = ExtResource( 6 ) text = "-Amber \"fami\" coffee- @@ -715,8 +794,8 @@ valign = 1 [node name="Wolfboy" type="Label" parent="Control"] material = ExtResource( 4 ) -margin_left = 1792.0 -margin_right = 2048.0 +margin_left = 2048.0 +margin_right = 2304.0 margin_bottom = 192.0 theme = ExtResource( 6 ) text = "-WolfBoy \"SG-2083\"- @@ -726,8 +805,8 @@ valign = 1 [node name="Bodhi" type="Label" parent="Control"] material = ExtResource( 4 ) -margin_left = 2048.0 -margin_right = 2304.0 +margin_left = 2304.0 +margin_right = 2560.0 margin_bottom = 192.0 theme = ExtResource( 6 ) text = "-Bodhi \"eviscerator\" darner- @@ -737,8 +816,8 @@ valign = 1 [node name="Playtesters" type="Label" parent="Control"] material = ExtResource( 4 ) -margin_left = 2304.0 -margin_right = 2560.0 +margin_left = 2560.0 +margin_right = 2816.0 margin_bottom = 192.0 theme = ExtResource( 6 ) text = "-Our playtesters- @@ -755,8 +834,8 @@ valign = 1 [node name="WonderingNow" type="Label" parent="Control"] material = ExtResource( 4 ) -margin_left = 2560.0 -margin_right = 2816.0 +margin_left = 2816.0 +margin_right = 3072.0 margin_bottom = 192.0 theme = ExtResource( 6 ) text = "-You're wondering now- @@ -769,8 +848,8 @@ valign = 1 [node name="SpecialThanks" type="Label" parent="Control"] material = ExtResource( 4 ) -margin_left = 2816.0 -margin_right = 3072.0 +margin_left = 3072.0 +margin_right = 3328.0 margin_bottom = 192.0 theme = ExtResource( 6 ) text = "-Special thanks- @@ -781,11 +860,11 @@ valign = 1 [node name="RollCall" type="Sprite" parent="Control"] material = SubResource( 6 ) -position = Vector2( 3200, 88 ) +position = Vector2( 3456, 88 ) texture = ExtResource( 11 ) [node name="RollCall1" type="Node2D" parent="Control"] -position = Vector2( 3328, 0 ) +position = Vector2( 3584, 0 ) [node name="SG" type="AnimatedSprite" parent="Control/RollCall1"] material = SubResource( 7 ) @@ -821,6 +900,7 @@ align = 1 material = SubResource( 8 ) position = Vector2( 106, 69 ) frames = SubResource( 18 ) +frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall1/MsX"] @@ -884,13 +964,12 @@ text = "Vile Villians" align = 1 [node name="RollCall2" type="Node2D" parent="Control"] -position = Vector2( 768, 0 ) +position = Vector2( 1024, 0 ) [node name="Eviscerator" type="AnimatedSprite" parent="Control/RollCall2"] material = SubResource( 13 ) position = Vector2( 2880, 24 ) frames = SubResource( 21 ) -frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall2/Eviscerator"] @@ -923,6 +1002,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"] @@ -970,7 +1050,7 @@ align = 1 material = SubResource( 34 ) position = Vector2( 3024, 62 ) frames = SubResource( 43 ) -frame = 4 +frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall2/Skelarcher"] @@ -986,7 +1066,6 @@ 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"] @@ -1029,7 +1108,7 @@ Poachers" align = 1 [node name="RollCall3" type="Node2D" parent="Control"] -position = Vector2( 3840, 0 ) +position = Vector2( 4096, 0 ) [node name="Shedge" type="AnimatedSprite" parent="Control/RollCall3"] position = Vector2( 60, 25 ) @@ -1079,6 +1158,7 @@ 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"] @@ -1095,7 +1175,7 @@ align = 1 material = SubResource( 71 ) position = Vector2( 72, 152 ) frames = SubResource( 80 ) -frame = 5 +frame = 2 playing = true [node name="Label" type="Label" parent="Control/RollCall3/Hellarcher"] @@ -1112,7 +1192,6 @@ align = 1 material = SubResource( 66 ) position = Vector2( 68, 104 ) frames = SubResource( 70 ) -frame = 2 playing = true [node name="Label" type="Label" parent="Control/RollCall3/Turchin"] @@ -1241,7 +1320,7 @@ experiments" align = 1 [node name="RollCall4" type="Node2D" parent="Control"] -position = Vector2( 768, 0 ) +position = Vector2( 1024, 0 ) [node name="2600" parent="Control/RollCall4" instance=ExtResource( 37 )] position = Vector2( 3464, -8 ) @@ -1299,6 +1378,7 @@ 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"] @@ -1339,8 +1419,37 @@ theme = ExtResource( 6 ) text = "Tin" align = 1 +[node name="RollCall6" type="Node2D" parent="Control"] +position = Vector2( 256, 0 ) + +[node name="Famira" parent="Control/RollCall6" instance=ExtResource( 47 )] +position = Vector2( 4512, 184 ) +credits = true + +[node name="MonsterousMechaMadeMoral" type="Label" parent="Control/RollCall6"] +modulate = Color( 0.980392, 0.878431, 0.0392157, 1 ) +material = SubResource( 51 ) +margin_left = 4361.0 +margin_top = 112.0 +margin_right = 4473.0 +margin_bottom = 135.0 +theme = ExtResource( 6 ) +text = "Totalitarian +terror" +align = 1 + +[node name="Label2" type="Label" parent="Control/RollCall6"] +material = ExtResource( 4 ) +margin_left = 4352.0 +margin_top = 148.0 +margin_right = 4485.0 +margin_bottom = 162.0 +theme = ExtResource( 6 ) +text = "Super Famira" +align = 1 + [node name="RollCall5" type="Node2D" parent="Control"] -position = Vector2( 4608, 0 ) +position = Vector2( 4864, 0 ) [node name="Haze" type="Sprite" parent="Control/RollCall5"] position = Vector2( 80, 136 ) @@ -1366,36 +1475,9 @@ texture = ExtResource( 42 ) position = Vector2( 184, 80 ) texture = ExtResource( 46 ) -[node name="RollCall6" type="Node2D" parent="."] - -[node name="Famira-wip" type="Sprite" parent="RollCall6"] -position = Vector2( 4438, 104 ) -texture = ExtResource( 47 ) - -[node name="MonsterousMechaMadeMoral" type="Label" parent="RollCall6"] -modulate = Color( 0.980392, 0.878431, 0.0392157, 1 ) -material = SubResource( 51 ) -margin_left = 4488.0 -margin_top = 115.0 -margin_right = 4600.0 -margin_bottom = 138.0 -theme = ExtResource( 6 ) -text = "Totalitarian -terror" -align = 1 - -[node name="Label2" type="Label" parent="RollCall6"] -material = ExtResource( 4 ) -margin_left = 4479.0 -margin_top = 151.0 -margin_right = 4612.0 -margin_bottom = 165.0 -theme = ExtResource( 6 ) -text = "Super Famira" -align = 1 - [node name="AnimationPlayer" type="AnimationPlayer" parent="."] autoplay = "credits" +playback_speed = 0.85 anims/RESET = SubResource( 89 ) anims/credits = SubResource( 90 ) diff --git a/objects/enemy/boss/famira.gd b/objects/enemy/boss/famira.gd index bc4367b..87d9bfc 100644 --- a/objects/enemy/boss/famira.gd +++ b/objects/enemy/boss/famira.gd @@ -16,6 +16,7 @@ export var hp: float = 100.0 export var sg2083_beam_dps: float = 10.0 export var sg2083_path: NodePath export var defense: float = 0.6 +export var credits: bool = false onready var animation_player: AnimationPlayer = $"%AnimationPlayer" @@ -25,6 +26,9 @@ onready var out_range_cast: RayCast2D = $OutRangeCast onready var shoot_range_cast: RayCast2D = $ShootRangeCast onready var grumble = $Grumble +func _ready(): + if credits: animation_player.play("roar") + func _physics_process(delta: float) -> void: var sg2083 := get_node(sg2083_path) if sg2083 and sg2083.state == 0: @@ -72,7 +76,8 @@ func _on_Roar_state_entered() -> void: func _roar() -> void: - Audio.play_sound(Audio.a_famira, Audio.ac_boss) + if credits == false: + Audio.play_sound(Audio.a_famira, Audio.ac_boss) func _on_Chasing_state_entered() -> void: diff --git a/objects/enemy/boss/famira.tscn b/objects/enemy/boss/famira.tscn index b0b36b3..5d1498e 100644 --- a/objects/enemy/boss/famira.tscn +++ b/objects/enemy/boss/famira.tscn @@ -4240,25 +4240,25 @@ collision_mask = 128 monitorable = false [node name="Body" type="CollisionShape2D" parent="Hitbox"] -position = Vector2( 0.00461769, -23.9291 ) -rotation = -0.0114693 +position = Vector2( 0.00459766, -23.9291 ) +rotation = -0.0114701 shape = SubResource( 13 ) [node name="Brain" type="CollisionShape2D" parent="Hitbox"] -position = Vector2( 11.5072, -96.7914 ) +position = Vector2( 11.5069, -96.7914 ) rotation = 2.48158 z_index = 100 shape = SubResource( 14 ) [node name="LowerJaw" type="CollisionShape2D" parent="Hitbox"] -position = Vector2( -21.3082, -76.1166 ) -rotation = 1.66396 +position = Vector2( -21.3083, -76.1164 ) +rotation = 1.66395 z_index = 100 shape = SubResource( 15 ) [node name="UpperJaw" type="CollisionShape2D" parent="Hitbox"] -position = Vector2( -21.8181, -103.259 ) -rotation = -1.66238 +position = Vector2( -21.8184, -103.259 ) +rotation = -1.66239 z_index = 100 shape = SubResource( 16 )