added fami to ending

audio/sounds/fami_demo.ogg.import

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

menus/marathon_results.tscn

@@ -1,13 +1,15 @@
-[gd_scene load_steps=6 format=2]
+[gd_scene load_steps=10 format=2]
 
 [ext_resource path="res://shaders/ska_plane.gdshader" type="Shader" id=1]
 [ext_resource path="res://ui/theme.tres" type="Theme" id=2]
 [ext_resource path="res://menus/marathon_results.gd" type="Script" id=3]
 [ext_resource path="res://ui/2ndpuberty_outline.tres" type="Material" id=4]
+[ext_resource path="res://audio/sounds/fami_demo.ogg" type="AudioStream" id=5]
+[ext_resource path="res://graphics/npc/fami_human.png" type="Texture" id=6]
 
 [sub_resource type="ShaderMaterial" id=1]
 shader = ExtResource( 1 )
-shader_param/color_1 = Color( 0.756863, 0.592157, 0.403922, 1 )
+shader_param/color_1 = Color( 1, 0.709804, 0.380392, 1 )
 shader_param/color_2 = Color( 0.345098, 0.945098, 0.905882, 1 )
 shader_param/checker_size = Vector2( 24, 24 )
 shader_param/pan_speed = Vector2( 8, 12 )
@@ -15,6 +17,85 @@ shader_param/cycle_speed = Vector2( 4, 4 )
 shader_param/cycle_alternation = Vector2( 4, 4 )
 shader_param/uv_transform = Transform2D( 1, 0, 1, 1, 0, 0 )
 
+[sub_resource type="Animation" id=2]
+length = 0.001
+tracks/0/type = "value"
+tracks/0/path = NodePath("Sprite:position")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 0,
+"values": [ Vector2( 232, 216 ) ]
+}
+tracks/1/type = "value"
+tracks/1/path = NodePath("FamiText:visible")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 1,
+"values": [ false ]
+}
+tracks/2/type = "value"
+tracks/2/path = NodePath("FamiVoice:playing")
+tracks/2/interp = 1
+tracks/2/loop_wrap = true
+tracks/2/imported = false
+tracks/2/enabled = true
+tracks/2/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 1,
+"values": [ false ]
+}
+
+[sub_resource type="Animation" id=3]
+resource_name = "fami"
+length = 10.0
+tracks/0/type = "value"
+tracks/0/path = NodePath("Sprite:position")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/keys = {
+"times": PoolRealArray( -0.1, 3, 4 ),
+"transitions": PoolRealArray( 1, 1, 1 ),
+"update": 0,
+"values": [ Vector2( 232, 216 ), Vector2( 232, 216 ), Vector2( 232, 168 ) ]
+}
+tracks/1/type = "value"
+tracks/1/path = NodePath("FamiText:visible")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/keys = {
+"times": PoolRealArray( -0.1, 4 ),
+"transitions": PoolRealArray( 1, 1 ),
+"update": 1,
+"values": [ false, true ]
+}
+tracks/2/type = "value"
+tracks/2/path = NodePath("FamiVoice:playing")
+tracks/2/interp = 1
+tracks/2/loop_wrap = true
+tracks/2/imported = false
+tracks/2/enabled = true
+tracks/2/keys = {
+"times": PoolRealArray( -0.1, 4 ),
+"transitions": PoolRealArray( 1, 1 ),
+"update": 1,
+"values": [ false, true ]
+}
+
 [node name="MarathonResults" type="Control"]
 anchor_right = 1.0
 anchor_bottom = 1.0
@@ -68,17 +149,19 @@ text = "got %d/25 shards"
 align = 1
 valign = 1
 
-[node name="Label" type="Label" parent="."]
+[node name="FamiText" type="Label" parent="."]
+visible = false
 material = ExtResource( 4 )
-margin_left = 64.0
+margin_left = 24.0
-margin_top = 168.0
+margin_top = 152.0
-margin_right = 192.0
+margin_right = 224.0
-margin_bottom = 178.0
+margin_bottom = 175.0
 theme = ExtResource( 2 )
-text = "the end...?"
+text = "i'll see you in the 
+full game, sg!"
 align = 1
 
-[node name="Label2" type="Label" parent="."]
+[node name="ComingSoon" type="Label" parent="."]
 material = ExtResource( 4 )
 margin_top = 16.0
 margin_right = 256.0
@@ -86,3 +169,16 @@ margin_bottom = 39.0
 text = "look forward to the full future...
 coming soon!"
 align = 1
+
+[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
+autoplay = "fami"
+anims/RESET = SubResource( 2 )
+anims/fami = SubResource( 3 )
+
+[node name="Sprite" type="Sprite" parent="."]
+position = Vector2( 232, 216 )
+scale = Vector2( -2, 2 )
+texture = ExtResource( 6 )
+
+[node name="FamiVoice" type="AudioStreamPlayer" parent="."]
+stream = ExtResource( 5 )

menus/title_screen.tscn

@@ -176,6 +176,15 @@ material = SubResource( 11 )
 position = Vector2( 128, 96 )
 texture = ExtResource( 7 )
 
+[node name="Label2" type="Label" parent="Logo"]
+material = ExtResource( 4 )
+margin_left = 48.0
+margin_top = 21.0
+margin_right = 88.0
+margin_bottom = 35.0
+theme = ExtResource( 3 )
+text = "DEMO"
+
 [node name="Label" type="Label" parent="."]
 material = ExtResource( 4 )
 margin_top = 136.0
@@ -198,13 +207,4 @@ anims/blink = SubResource( 6 )
 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
 stream = ExtResource( 14 )
 
-[node name="Label2" type="Label" parent="."]
-material = ExtResource( 4 )
-margin_left = 176.0
-margin_top = 117.0
-margin_right = 216.0
-margin_bottom = 131.0
-theme = ExtResource( 3 )
-text = "DEMO"
-
 [connection signal="finished" from="AudioStreamPlayer" to="." method="_on_AudioStreamPlayer_finished"]