From ae16a01820cf982166380dcbaf2d6a1eb66bb5ed Mon Sep 17 00:00:00 2001 From: pennyrigate Date: Sat, 13 Jul 2024 18:48:47 -0400 Subject: [PATCH] The End? --- cutscenes/intro_story.gd | 3 ++- graphics/hud/title_credits.png | Bin 1371 -> 1380 bytes objects/enemy/boss/famira.gd | 9 ++++---- objects/enemy/boss/famira.tscn | 41 ++++++++++++++++++++++++++++++++- objects/enemy/boss/sg2083.gd | 1 - 5 files changed, 47 insertions(+), 7 deletions(-) diff --git a/cutscenes/intro_story.gd b/cutscenes/intro_story.gd index 78d32eb..c9b9c8c 100644 --- a/cutscenes/intro_story.gd +++ b/cutscenes/intro_story.gd @@ -3,8 +3,9 @@ extends Node2D export var is_intro = true func _ready(): - Audio.ac_music.set_volume_db(-13.5) Fade.fade_in(Options.transition_speed_secs) + yield(Fade, "fade_finished") + Audio.ac_music.set_volume_db(-13.5) if is_intro: Audio.play_music(load("res://audio/music/intro.ogg")) else: diff --git a/graphics/hud/title_credits.png b/graphics/hud/title_credits.png index 40a9ab68b9e5cafe12c1c8731e7432e567546b19..89e099d897a211550e3c1fa0e2a2fbc181ebb294 100644 GIT binary patch delta 1033 zcmV+k1or#e3gilqMt?XqLEGEg0002M-7^6I000AYQchF<{{Yv@4M6|^010qNS#tmY z4!{5a4!{9w)`9+fB^;G zis2H0hiWklpwu!-_#4(t?d*R67*HRpZdJohW}H>rM+qY4aERDCZ^x?s14ao}FjA|oiq&{3V8C0T;}xK) zx;i-8Gzll;>;u!?fRph7g_Bs|j8;Z4U-7X%@JgE68oZf3@V@e-E5)ro zKu!4i`u_eNa}hD9;YfbKt<4OizAawsMI~=D5PLTiq1D+j`(-y@W|#V=Be3vy2Gr~^ zUq`|p6jsIyp)=NMOSD#gsjv5%QJJd@;##`=%oxCrdp^Cp&M~j`d$a+#cYiskhh~zo z{K^!!XVx()zOE?+L-LxtYTb?1RyQ9MDn8FpKgxe^KyC66m;cyOeU&TL0T5>$M_>nE zM$|E0YmUhIW9F=YlU7~5o?YSD%cVRAVORR;0)HGp}w!F z7kcNbSL;JVgveND8&7MqbAQf|zOD5kFk#FGIGAaV(7?8>dF$TlC0#J<$o6q7TAxG2 zg>5^aJNs?Sab4#ld_Lnp0}PORzrw|LLFtBFtdTO(i~gRW$k8p}miYDXH?-pXg&`J= zFpjpyT;h2?DxG6SXY6DwW&MgVLlHA>!nWle`RJem*o8TaaG;m|_t3_*=^pv= z*ema&&+))EA6MyXw5nX$L*yT_73T`KK!>YW-(p4`UgIJjv5wyTIBMspA;Zcjcdm@9 z%*f&3J}L z9<>kLS=Vv#x-4}}Sek@!UuZR^QVbhvyYnCeaA1C|89Ny@B0>AFd0N4ixdV5^C-^P+wH zm?H*=ZBYh1J^~#d@u61gp;W8f7BJvhU=%5$gG0nw9oMSrp?|rkWR#Fet5t3b7*OD? z7!DD5sTRWkN-d*=|FC9i_x=Q6K)tNGRSi3taaM63C5V`h%T_k~>c=kt2B`6_paFPK zeZ`d!Z>oje014dy1NQ93paFb$8!4iLL&Vm3J681tj1sJ1q*h%OtMRUY0Uv>mcYvzu z>fmV8B-|PIJ_6kZlkow9lUxC=e;^bX2j<{qv@(MEim&y7chc0>;KS^J&y|y|6u0^U zHR17iKA&SQA_g@a$q%@-nSs=|#bdpwbVUG9Cz>u~u86wemxKJ;#j7TxAf~(&cBy0Dj%`^z1svyw>m02H@W1f1rLelZ@q8 zrnvoP9i!sono=+%ueqz%-B@jP^M^vk^9=Q){C5Ltlb5*s$Cm1=T(J&-IO{k9JNPi7 zj`3P^M9v@2rqxr#fC_&F*4JuN*S@HJ2^_pu=%p30<`|)ZEnxs6#B~79U>zFj`wE>w(Bxm?u&tnU!!FiH8R<=b&rsy(5^zg=Jp6=KoF5os(Fo&cYs@9i z^HJ#>Gdg1@V=3z+#tcQwxCq;pd*ri6J~()f`;as5F1|^PQ8@1bf1u0(XH*jVa@6L?b-?4?{fub~w}cGfYT90I?~4e*OX25oviSk-8!P0000 void: if sg2083.has_method("hurt"): var distance := shoot_range_cast.to_local(shoot_range_cast.get_collision_point()).x var weight := inverse_lerp(shoot_range_cast.cast_to.x, 0.0, distance) - if !Audio.ac_climb.is_playing(): + if !Audio.ac_climb.is_playing() && sg2083.state != sg2083.State.DUCK: Audio.play_sound(Audio.a_critical_heat,Audio.ac_climb) sg2083.hurt(breath_dps * weight * delta, true) sg2083.knock_back(breath_knockback * weight * delta, true) @@ -148,4 +148,5 @@ func _on_Shooting_state_physics_processing(delta) -> void: func _on_Hitbox_area_entered(area: Area2D) -> void: if area.is_in_group("hurt_famira"): + hurt(area.damage) area.queue_free() diff --git a/objects/enemy/boss/famira.tscn b/objects/enemy/boss/famira.tscn index 7f79deb..2a97a65 100644 --- a/objects/enemy/boss/famira.tscn +++ b/objects/enemy/boss/famira.tscn @@ -2722,6 +2722,42 @@ tracks/24/keys = { "update": 0, "values": [ 23.868 ] } +tracks/25/type = "value" +tracks/25/path = NodePath("Hip/Body/BodySprite/BodyGlow:visible") +tracks/25/interp = 1 +tracks/25/loop_wrap = true +tracks/25/imported = false +tracks/25/enabled = true +tracks/25/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 1, +"values": [ false ] +} +tracks/26/type = "value" +tracks/26/path = NodePath("Hip/Body/Neck/NeckSprite/NeckGlow:visible") +tracks/26/interp = 1 +tracks/26/loop_wrap = true +tracks/26/imported = false +tracks/26/enabled = true +tracks/26/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 1, +"values": [ false ] +} +tracks/27/type = "value" +tracks/27/path = NodePath("Hip/Body/Neck/Headupper/HeadUpperSprite/HeadGlow:visible") +tracks/27/interp = 1 +tracks/27/loop_wrap = true +tracks/27/imported = false +tracks/27/enabled = true +tracks/27/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 1, +"values": [ false ] +} [sub_resource type="Animation" id=23] resource_name = "grow" @@ -4324,7 +4360,7 @@ texture = ExtResource( 29 ) [node name="FootBack" type="Node2D" parent="Graphics/Hip/LegBack/LegBackLower"] use_parent_material = true position = Vector2( 1.51298, 29.934 ) -rotation = 0.0720012 +rotation = 0.0720013 [node name="Sprite" type="Sprite" parent="Graphics/Hip/LegBack/LegBackLower/FootBack"] light_mask = 33 @@ -4350,6 +4386,7 @@ texture = ExtResource( 22 ) offset = Vector2( 32, 0 ) [node name="BodyGlow" type="Sprite" parent="Graphics/Hip/Body/BodySprite"] +visible = false modulate = Color( 1, 1, 1, 0 ) material = SubResource( 28 ) texture = ExtResource( 35 ) @@ -4444,6 +4481,7 @@ z_index = -2 texture = ExtResource( 23 ) [node name="NeckGlow" type="Sprite" parent="Graphics/Hip/Body/Neck/NeckSprite"] +visible = false modulate = Color( 1, 1, 1, 0 ) material = SubResource( 28 ) texture = ExtResource( 36 ) @@ -4539,6 +4577,7 @@ centered = false offset = Vector2( -45, -72 ) [node name="HeadGlow" type="Sprite" parent="Graphics/Hip/Body/Neck/Headupper/HeadUpperSprite"] +visible = false modulate = Color( 1, 1, 1, 0 ) material = SubResource( 28 ) texture = ExtResource( 34 ) diff --git a/objects/enemy/boss/sg2083.gd b/objects/enemy/boss/sg2083.gd index 7cbfb85..d76304e 100644 --- a/objects/enemy/boss/sg2083.gd +++ b/objects/enemy/boss/sg2083.gd @@ -127,7 +127,6 @@ func knock_back(amount: float, can_duck: bool = false) -> void: if can_duck and state == State.DUCK: return knockback += amount - print("YOWCH") func _play_laser_sound(play: bool):