diff --git a/graphics/hud/team_sg_logo.png b/graphics/hud/team_sg_logo.png index 0382e03..59f8ca9 100644 Binary files a/graphics/hud/team_sg_logo.png and b/graphics/hud/team_sg_logo.png differ diff --git a/graphics/hud/team_sg_splash.png b/graphics/hud/team_sg_splash.png index f248d79..85b5037 100644 Binary files a/graphics/hud/team_sg_splash.png and b/graphics/hud/team_sg_splash.png differ diff --git a/graphics/npc/penny.png b/graphics/npc/penny.png index 165f2ec..d709c73 100644 Binary files a/graphics/npc/penny.png and b/graphics/npc/penny.png differ diff --git a/menus/credits.tscn b/menus/credits.tscn index e334668..496084b 100644 --- a/menus/credits.tscn +++ b/menus/credits.tscn @@ -643,20 +643,9 @@ texture = ExtResource( 10 ) position = Vector2( 640, 96 ) [node name="TeamSgSplash" type="Sprite" parent="Control/TeamSG"] -position = Vector2( 0, -8 ) +position = Vector2( 0, -23 ) 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 @@ -673,8 +662,10 @@ valign = 1 [node name="TeamSG4" type="Label" parent="Control/TeamSG"] material = ExtResource( 4 ) -margin_top = -88.0 -margin_right = 182.0 +margin_left = 56.0 +margin_top = -72.0 +margin_right = 126.0 +margin_bottom = -36.0 theme = ExtResource( 6 ) text = "We decide the @@ -684,9 +675,9 @@ valign = 1 [node name="TeamSG5" type="Label" parent="Control/TeamSG"] material = ExtResource( 4 ) -margin_left = -120.0 +margin_left = -112.0 margin_top = 8.0 -margin_right = -64.0 +margin_right = -56.0 margin_bottom = 44.0 theme = ExtResource( 6 ) text = "Similar @@ -697,9 +688,9 @@ valign = 1 [node name="TeamSG6" type="Label" parent="Control/TeamSG"] material = ExtResource( 4 ) -margin_left = 60.0 +margin_left = 72.0 margin_top = 8.0 -margin_right = 116.0 +margin_right = 107.0 margin_bottom = 44.0 theme = ExtResource( 6 ) text = "Games @@ -710,10 +701,10 @@ 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 +margin_left = -112.0 +margin_top = -72.0 +margin_right = -56.0 +margin_bottom = -36.0 theme = ExtResource( 6 ) text = "We love @@ -900,7 +891,7 @@ align = 1 material = SubResource( 8 ) position = Vector2( 106, 69 ) frames = SubResource( 18 ) -frame = 1 +frame = 2 playing = true [node name="Label" type="Label" parent="Control/RollCall1/MsX"] @@ -970,6 +961,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"] @@ -1002,7 +994,6 @@ 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"] @@ -1050,7 +1041,7 @@ align = 1 material = SubResource( 34 ) position = Vector2( 3024, 62 ) frames = SubResource( 43 ) -frame = 1 +frame = 6 playing = true [node name="Label" type="Label" parent="Control/RollCall2/Skelarcher"] @@ -1066,6 +1057,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"] @@ -1158,7 +1150,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"] @@ -1175,7 +1166,7 @@ align = 1 material = SubResource( 71 ) position = Vector2( 72, 152 ) frames = SubResource( 80 ) -frame = 2 +frame = 7 playing = true [node name="Label" type="Label" parent="Control/RollCall3/Hellarcher"] @@ -1192,6 +1183,7 @@ align = 1 material = SubResource( 66 ) position = Vector2( 68, 104 ) frames = SubResource( 70 ) +frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall3/Turchin"] @@ -1378,7 +1370,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"] @@ -1457,7 +1448,7 @@ scale = Vector2( 2, 2 ) texture = ExtResource( 45 ) [node name="Penny" type="Sprite" parent="Control/RollCall5"] -position = Vector2( 104, 136 ) +position = Vector2( 104, 134 ) scale = Vector2( 2, 2 ) texture = ExtResource( 44 ) diff --git a/objects/enemy/boss/famira.gd b/objects/enemy/boss/famira.gd index 87d9bfc..fa5320d 100644 --- a/objects/enemy/boss/famira.gd +++ b/objects/enemy/boss/famira.gd @@ -30,18 +30,19 @@ 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: - state_chart.set_guard_property("player_dead", true) - state_chart.send_event("player_dead") - else: - state_chart.set_guard_property("player_dead", false) - if not out_range_cast.is_colliding(): - state_chart.send_event("out_of_range") - elif in_range_cast.is_colliding(): - state_chart.send_event("in_range") - if fmod(Game.time, 15.0) == 0.0: - Audio.play_sound(Audio.a_grumble,Audio.ac_boss) + if !credits: + var sg2083 := get_node(sg2083_path) + if sg2083 and sg2083.state == 0: + state_chart.set_guard_property("player_dead", true) + state_chart.send_event("player_dead") + else: + state_chart.set_guard_property("player_dead", false) + if not out_range_cast.is_colliding(): + state_chart.send_event("out_of_range") + elif in_range_cast.is_colliding(): + state_chart.send_event("in_range") + if fmod(Game.time, 15.0) == 0.0: + Audio.play_sound(Audio.a_grumble,Audio.ac_boss) func start_push() -> void: