This commit is contained in:
pennyrigate 2024-07-13 18:48:47 -04:00
parent 77737e009e
commit ae16a01820
5 changed files with 47 additions and 7 deletions

View file

@ -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:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Before After
Before After

View file

@ -10,15 +10,15 @@ const DeathParticles = preload("res://objects/enemy/death_particles_famira.tscn"
export var push_speed: float = 30.0
export var chase_speed: float = 65.0
export var breath_dps: float = 20.0
export var breath_dps: float = 14.25
export var breath_knockback: float = 16.0
export var punch_damage: float = 8.0
export var punch_damage: float = 5.25
export var punch_knockback: float = 40.0
export var hurting: bool = false
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 defense: float = 0.45
export var credits: bool = false
@ -140,7 +140,7 @@ func _on_Shooting_state_physics_processing(delta) -> 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()

View file

@ -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 )

View file

@ -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):