more fami stuff

This commit is contained in:
pennyrigate 2024-07-01 21:59:32 -04:00
parent fbac189239
commit 77f38526bc
11 changed files with 54 additions and 35 deletions

View file

@ -103,7 +103,7 @@ func _on_PushedBack_state_entered() -> void:
func _on_Dying_state_entered() -> void:
animation_player.play("die", 0.25)
_roar()
Audio.play_sound(Audio.a_famira_die, Audio.ac_boss)
func _on_Chasing_state_physics_processing(delta) -> void:

View file

@ -1,4 +1,4 @@
[gd_scene load_steps=58 format=2]
[gd_scene load_steps=57 format=2]
[ext_resource path="res://objects/enemy/boss/famira.gd" type="Script" id=1]
[ext_resource path="res://shaders/scale3x.gdshader" type="Shader" id=2]
@ -26,7 +26,6 @@
[ext_resource path="res://graphics/enemy/boss/fami_parts/head_lower.png" type="Texture" id=24]
[ext_resource path="res://graphics/enemy/boss/fami_parts/head_upper.png" type="Texture" id=25]
[ext_resource path="res://graphics/enemy/boss/fami_parts/mouth_tendril.png" type="Texture" id=26]
[ext_resource path="res://audio/sounds/fami_grumble.ogg" type="AudioStream" id=27]
[ext_resource path="res://graphics/enemy/boss/famira_fire.png" type="Texture" id=28]
[ext_resource path="res://graphics/enemy/boss/fami_parts/leg_lower.png" type="Texture" id=29]
[ext_resource path="res://graphics/enemy/boss/fami_parts/hand.png" type="Texture" id=30]
@ -533,7 +532,7 @@ tracks/12/keys = {
[sub_resource type="Animation" id=12]
resource_name = "die"
length = 8.0
length = 11.0
tracks/0/type = "value"
tracks/0/path = NodePath("Hip/Body:rotation_degrees")
tracks/0/interp = 1
@ -4240,25 +4239,25 @@ collision_mask = 128
monitorable = false
[node name="Body" type="CollisionShape2D" parent="Hitbox"]
position = Vector2( 0.00459766, -23.9291 )
rotation = -0.0114701
position = Vector2( -3.99538, -23.9291 )
rotation = -0.0114693
shape = SubResource( 13 )
[node name="Brain" type="CollisionShape2D" parent="Hitbox"]
position = Vector2( 11.5069, -96.7914 )
rotation = 2.48158
position = Vector2( 28.8937, -94.5452 )
rotation = 2.97362
z_index = 100
shape = SubResource( 14 )
[node name="LowerJaw" type="CollisionShape2D" parent="Hitbox"]
position = Vector2( -21.3083, -76.1164 )
rotation = 1.66395
position = Vector2( -8.729, -72.6809 )
rotation = 1.68893
z_index = 100
shape = SubResource( 15 )
[node name="UpperJaw" type="CollisionShape2D" parent="Hitbox"]
position = Vector2( -21.8184, -103.259 )
rotation = -1.66239
position = Vector2( 2.60798, -115.968 )
rotation = -1.16805
z_index = 100
shape = SubResource( 16 )
@ -4374,7 +4373,6 @@ collide_with_areas = true
collide_with_bodies = false
[node name="Grumble" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 27 )
[connection signal="area_entered" from="Hitbox" to="." method="_on_Hitbox_area_entered"]
[connection signal="body_entered" from="Hitbox" to="." method="_on_Hitbox_body_entered"]

View file

@ -38,6 +38,7 @@ onready var head_sprite = $"%Head"
func _physics_process(delta: float) -> void:
print(global_position)
match state:
State.DEAD:
return
@ -171,4 +172,6 @@ func _on_animation_finished(anim_name: String) -> void:
"Beam":
state = State.STAND
"die":
pass
var map = Game.get_map()
var gover = load("res://menus/game_over.tscn").instance()
map.add_child(gover)

View file

@ -2203,7 +2203,7 @@ update_scale = false
[node name="KneeBack" type="Sprite" parent="Axle"]
modulate = Color( 0.74902, 0.74902, 0.74902, 1 )
position = Vector2( 6.25088, 28.1233 )
position = Vector2( 6.25089, 28.1233 )
scale = Vector2( 1, -1 )
z_index = -1
texture = ExtResource( 8 )