more fami stuff

audio/sounds/famira_die.ogg.import

@@ -0,0 +1,15 @@
+[remap]
+
+importer="ogg_vorbis"
+type="AudioStreamOGGVorbis"
+path="res://.import/famira_die.ogg-5e8656416f24ec451fe959394c386838.oggstr"
+
+[deps]
+
+source_file="res://audio/sounds/famira_die.ogg"
+dest_files=[ "res://.import/famira_die.ogg-5e8656416f24ec451fe959394c386838.oggstr" ]
+
+[params]
+
+loop=false
+loop_offset=0

autoloads/audio.gd

@@ -63,6 +63,7 @@ const a_fami_transform = preload("res://audio/sounds/fami_transform.ogg")
 const a_ominous = preload("res://audio/sounds/ominous.ogg")
 const a_bullet_casing = preload("res://audio/sounds/shell.ogg")
 const a_gun_cock = preload("res://audio/sounds/gun_cock.ogg")
+const a_famira_die = preload("res://audio/sounds/famira_die.ogg")
 
 var loop_section = null
 var has_looped = false

cutscenes/fami_cutscene.tscn

@@ -243,7 +243,7 @@ tracks/0/loop_wrap = true
 tracks/0/imported = false
 tracks/0/enabled = true
 tracks/0/keys = {
-"times": PoolRealArray( 0.25, 5.25, 13.25, 19.25, 28.75, 37.25, 46.75, 51.75, 58.25, 59.25, 78.75 ),
+"times": PoolRealArray( 0.25, 5.3, 13.2, 19.25, 28.75, 37.3, 46.8, 51.8, 58.3, 59.25, 78.75 ),
 "transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ),
 "update": 2,
 "values": [ "Aha! so you've made it this far, however your efforts are all in vain.", "You see, SG,
@@ -280,10 +280,10 @@ tracks/3/loop_wrap = true
 tracks/3/imported = false
 tracks/3/enabled = true
 tracks/3/keys = {
-"times": PoolRealArray( 59.25, 60.75 ),
-"transitions": PoolRealArray( 1, 1 ),
+"times": PoolRealArray( 0, 59.25, 60.75 ),
+"transitions": PoolRealArray( 1, 1, 1 ),
 "update": 1,
-"values": [ "walk", "gun" ]
+"values": [ "gun", "walk", "gun" ]
 }
 tracks/4/type = "value"
 tracks/4/path = NodePath("FamiHuman:animation")
@@ -513,13 +513,11 @@ cutscene_skip = 78.75
 tile_set = ExtResource( 7 )
 cell_size = Vector2( 8, 8 )
 format = 1
-tile_data = PoolIntArray( 1441792, 0, 131073, 1441793, 0, 131073, 1441794, 0, 131073, 1441795, 0, 131073, 1441796, 0, 131073, 1441797, 0, 131073, 1441798, 0, 131073, 1441799, 0, 131073, 1441800, 0, 131073, 1441801, 0, 131073, 1441802, 0, 131073, 1441803, 0, 131073, 1441804, 0, 131073, 1441805, 0, 131073, 1441806, 0, 131073, 1441807, 0, 131073, 1441808, 0, 131073, 1441809, 0, 131073, 1441810, 0, 131073, 1441811, 0, 131073, 1441812, 0, 131073, 1441813, 0, 131073, 1441814, 0, 131073, 1441815, 0, 131073, 1441816, 0, 131073, 1441817, 0, 131073, 1441818, 0, 131073, 1441819, 0, 131073, 1441820, 0, 131073, 1441821, 0, 131073, 1441822, 0, 131073, 1441823, 0, 131073 )
 
 [node name="TileMap" type="TileMap" parent="TileMap"]
 tile_set = ExtResource( 8 )
 cell_size = Vector2( 8, 8 )
 format = 1
-tile_data = PoolIntArray( 1507328, 1, 196609, 1507329, 1, 196610, 1507330, 1, 196610, 1507331, 1, 196610, 1507332, 1, 196610, 1507333, 1, 196610, 1507334, 1, 196610, 1507335, 1, 196610, 1507336, 1, 196610, 1507337, 1, 196610, 1507338, 1, 196610, 1507339, 1, 196610, 1507340, 1, 196610, 1507341, 1, 196610, 1507342, 1, 196610, 1507343, 1, 196610, 1507344, 1, 196610, 1507345, 1, 196610, 1507346, 1, 196610, 1507347, 1, 196610, 1507348, 1, 196610, 1507349, 1, 196610, 1507350, 1, 196610, 1507351, 1, 196610, 1507352, 1, 196610, 1507353, 1, 196610, 1507354, 1, 196610, 1507355, 1, 196610, 1507356, 1, 196610, 1507357, 1, 196610, 1507358, 1, 196610, 1507359, 1, 196611 )
 
 [node name="Label" type="Label" parent="."]
 material = ExtResource( 4 )
@@ -562,8 +560,7 @@ anims/cutscene = SubResource( 2 )
 material = SubResource( 8 )
 position = Vector2( -8, 169 )
 frames = SubResource( 13 )
-animation = "walk"
-frame = 3
+animation = "gun"
 playing = true
 
 [node name="ShardParticles" type="CPUParticles2D" parent="."]

maps/boss/boss3_arena.gd

@@ -79,4 +79,4 @@ func _on_death_cooldown() -> void:
 		else:
 			Game.change_map(LevelData.levels[Game.current_level].scene)
 	else:
-		Game.change_map(load("res://menus/level_select_scholar.tscn"))
+		Game.change_map(load("res://cutscenes/ending_future.tscn"))

menus/game_over.tscn

@@ -115,12 +115,13 @@ texture_focused = ExtResource( 5 )
 
 [node name="Label" type="Label" parent="."]
 material = SubResource( 12 )
-margin_top = 59.0
+margin_top = 51.0
 margin_right = 256.0
-margin_bottom = 82.0
+margin_bottom = 87.0
 theme = ExtResource( 3 )
 text = "In reality, the game is 
-only over when you give up"
+only over when 
+it ceases to be played."
 align = 1
 
 [node name="Label2" type="Label" parent="."]

objects/enemy/boss/famira.gd

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

objects/enemy/boss/famira.tscn

@@ -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"]

objects/enemy/boss/sg2083.gd

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

objects/enemy/boss/sg2083.tscn

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