diff --git a/audio/music/the_dirt_under_the_meadow.ogg b/audio/music/the_dirt_under_the_meadow.ogg new file mode 100644 index 0000000..54f5589 Binary files /dev/null and b/audio/music/the_dirt_under_the_meadow.ogg differ diff --git a/audio/music/the_dirt_under_the_meadow.ogg.import b/audio/music/the_dirt_under_the_meadow.ogg.import new file mode 100644 index 0000000..ec30542 --- /dev/null +++ b/audio/music/the_dirt_under_the_meadow.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/the_dirt_under_the_meadow.ogg-ec40b1fe83041819a74174d557b9a8a2.oggstr" + +[deps] + +source_file="res://audio/music/the_dirt_under_the_meadow.ogg" +dest_files=[ "res://.import/the_dirt_under_the_meadow.ogg-ec40b1fe83041819a74174d557b9a8a2.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/audio/sounds/fami_voice.ogg b/audio/sounds/fami_voice.ogg new file mode 100644 index 0000000..1744803 Binary files /dev/null and b/audio/sounds/fami_voice.ogg differ diff --git a/audio/sounds/fami_voice.ogg.import b/audio/sounds/fami_voice.ogg.import new file mode 100644 index 0000000..d955920 --- /dev/null +++ b/audio/sounds/fami_voice.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/fami_voice.ogg-db460be518287a913514bed855116c82.oggstr" + +[deps] + +source_file="res://audio/sounds/fami_voice.ogg" +dest_files=[ "res://.import/fami_voice.ogg-db460be518287a913514bed855116c82.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/audio/sounds/famira.ogg b/audio/sounds/famira.ogg new file mode 100644 index 0000000..14cf6fa Binary files /dev/null and b/audio/sounds/famira.ogg differ diff --git a/audio/sounds/famira.ogg.import b/audio/sounds/famira.ogg.import new file mode 100644 index 0000000..094f6ee --- /dev/null +++ b/audio/sounds/famira.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/famira.ogg-a36a49df38f219f1404994bb084b014e.oggstr" + +[deps] + +source_file="res://audio/sounds/famira.ogg" +dest_files=[ "res://.import/famira.ogg-a36a49df38f219f1404994bb084b014e.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/maps/future.tscn b/cutscenes/ending_future.tscn similarity index 91% rename from maps/future.tscn rename to cutscenes/ending_future.tscn index d44f7b2..9483c77 100644 --- a/maps/future.tscn +++ b/cutscenes/ending_future.tscn @@ -1,34 +1,34 @@ [gd_scene load_steps=15 format=2] -[ext_resource path="res://graphics/backgrounds/hills.png" type="Texture" id=1] +[ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=1] [ext_resource path="res://tilesets/t_grass.tres" type="TileSet" id=2] -[ext_resource path="res://graphics/npc/msx_future.png" type="Texture" id=3] -[ext_resource path="res://graphics/npc/speccy_future.png" type="Texture" id=4] -[ext_resource path="res://maps/boss/boss2_arena.gd" type="Script" id=5] -[ext_resource path="res://graphics/npc/sg_future.png" type="Texture" id=6] -[ext_resource path="res://audio/music/klystron_vip.ogg" type="AudioStream" id=7] -[ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=8] -[ext_resource path="res://graphics/pong/pong.png" type="Texture" id=9] +[ext_resource path="res://graphics/pong/pong.png" type="Texture" id=3] +[ext_resource path="res://maps/boss/boss2_arena.gd" type="Script" id=4] +[ext_resource path="res://graphics/backgrounds/hills.png" type="Texture" id=5] +[ext_resource path="res://graphics/npc/msx_future.png" type="Texture" id=6] +[ext_resource path="res://graphics/npc/speccy_future.png" type="Texture" id=7] +[ext_resource path="res://graphics/npc/sg_future.png" type="Texture" id=8] +[ext_resource path="res://graphics/ending/picnic_table.png" type="Texture" id=9] [ext_resource path="res://graphics/npc/sms.png" type="Texture" id=10] -[ext_resource path="res://objects/lore/boss/dr_intelli.tscn" type="PackedScene" id=11] -[ext_resource path="res://graphics/ending/picnic_table.png" type="Texture" id=12] -[ext_resource path="res://objects/lore/boss/2600.tscn" type="PackedScene" id=17] +[ext_resource path="res://objects/lore/boss/2600.tscn" type="PackedScene" id=11] +[ext_resource path="res://objects/lore/boss/dr_intelli.tscn" type="PackedScene" id=12] +[ext_resource path="res://audio/music/klystron_vip.ogg" type="AudioStream" id=13] [sub_resource type="ShaderMaterial" id=1] -shader = ExtResource( 8 ) +shader = ExtResource( 1 ) shader_param/border_color = Color( 0, 0, 0, 1 ) shader_param/border_corners = true [node name="Map" type="Node2D" groups=["map"]] pause_mode = 1 -script = ExtResource( 5 ) -music = ExtResource( 7 ) -lore_entries = [ ExtResource( 17 ), ExtResource( 11 ) ] +script = ExtResource( 4 ) +music = ExtResource( 13 ) +lore_entries = [ ExtResource( 11 ), ExtResource( 12 ) ] [node name="Sprite" type="Sprite" parent="."] position = Vector2( 128, 96 ) z_index = -2 -texture = ExtResource( 1 ) +texture = ExtResource( 5 ) __meta__ = { "_edit_lock_": true } @@ -41,17 +41,17 @@ tile_data = PoolIntArray( 1507327, 3, 1, 1441792, 3, 2, 1441793, 3, 2, 1441794, [node name="SgFuture" type="Sprite" parent="."] position = Vector2( 96, 166 ) -texture = ExtResource( 6 ) +texture = ExtResource( 8 ) [node name="MsxFuture" type="Sprite" parent="."] position = Vector2( 161, 166 ) scale = Vector2( -1, 1 ) -texture = ExtResource( 3 ) +texture = ExtResource( 6 ) [node name="SpeccyFuture" type="Sprite" parent="."] position = Vector2( 176, 164 ) scale = Vector2( -1, 1 ) -texture = ExtResource( 4 ) +texture = ExtResource( 7 ) [node name="Sms" type="Sprite" parent="."] position = Vector2( 80, 164 ) @@ -61,8 +61,8 @@ texture = ExtResource( 10 ) material = SubResource( 1 ) position = Vector2( 64, 170 ) scale = Vector2( -1, 1 ) -texture = ExtResource( 9 ) +texture = ExtResource( 3 ) [node name="PicnicTable" type="Sprite" parent="."] position = Vector2( 128, 167 ) -texture = ExtResource( 12 ) +texture = ExtResource( 9 ) diff --git a/cutscenes/fami_cutscene.tscn b/cutscenes/fami_cutscene.tscn new file mode 100644 index 0000000..7842ef5 --- /dev/null +++ b/cutscenes/fami_cutscene.tscn @@ -0,0 +1,331 @@ +[gd_scene load_steps=34 format=2] + +[ext_resource path="res://shaders/recolor_border.shader" type="Shader" id=1] +[ext_resource path="res://graphics/player/palettes/default.png" type="Texture" id=2] +[ext_resource path="res://ui/theme.tres" type="Theme" id=3] +[ext_resource path="res://ui/2ndpuberty_outline.tres" type="Material" id=4] +[ext_resource path="res://scripts/sg_palette.gd" type="Script" id=5] +[ext_resource path="res://graphics/player/sg_idle.png" type="Texture" id=6] +[ext_resource path="res://tilesets/t_station.tres" type="TileSet" id=7] +[ext_resource path="res://tilesets/t_laboratory.tres" type="TileSet" id=8] +[ext_resource path="res://graphics/npc/fami_human.png" type="Texture" id=9] +[ext_resource path="res://graphics/backgrounds/fami_rooftop.png" type="Texture" id=10] +[ext_resource path="res://audio/sounds/fami_voice.ogg" type="AudioStream" id=11] +[ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=12] +[ext_resource path="res://graphics/collectibles/shard.png" type="Texture" id=13] +[ext_resource path="res://graphics/enemy/cop/cop_walk.png" type="Texture" id=14] +[ext_resource path="res://graphics/enemy/cop/cop_shoot.png" type="Texture" id=15] +[ext_resource path="res://graphics/npc/fami_human_walk.png" type="Texture" id=16] +[ext_resource path="res://graphics/npc/fami_human_punch.png" type="Texture" id=17] + +[sub_resource type="ShaderMaterial" id=1] +shader = ExtResource( 1 ) +shader_param/border_color = Color( 0, 0, 0, 1 ) +shader_param/border_corners = true +shader_param/palette = ExtResource( 2 ) + +[sub_resource type="AtlasTexture" id=3] +atlas = ExtResource( 16 ) +region = Rect2( 0, 0, 14, 24 ) + +[sub_resource type="AtlasTexture" id=4] +atlas = ExtResource( 16 ) +region = Rect2( 14, 0, 14, 24 ) + +[sub_resource type="AtlasTexture" id=5] +atlas = ExtResource( 16 ) +region = Rect2( 28, 0, 14, 24 ) + +[sub_resource type="AtlasTexture" id=6] +atlas = ExtResource( 16 ) +region = Rect2( 42, 0, 14, 24 ) + +[sub_resource type="SpriteFrames" id=7] +animations = [ { +"frames": [ ExtResource( 9 ) ], +"loop": true, +"name": "idle", +"speed": 5.0 +}, { +"frames": [ ExtResource( 17 ) ], +"loop": true, +"name": "punch", +"speed": 5.0 +}, { +"frames": [ SubResource( 3 ), SubResource( 4 ), SubResource( 5 ), SubResource( 6 ) ], +"loop": true, +"name": "walk", +"speed": 5.0 +} ] + +[sub_resource type="Animation" id=16] +length = 0.001 +tracks/0/type = "value" +tracks/0/path = NodePath("ShardRain:emitting") +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": [ false ] +} +tracks/1/type = "value" +tracks/1/path = NodePath("ShardParticles:emitting") +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=2] +resource_name = "cutscene" +length = 100.0 +step = 1.0 +tracks/0/type = "value" +tracks/0/path = NodePath("Label:text") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0.1, 4.95088, 14.1874, 20.9397, 30.797, 40.2982, 49.7601, 59.7868, 64.7672, 71.5391, 72.2 ), +"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ), +"update": 1, +"values": [ "Aha so you've made it this far, however your efforts are all in vain. +", "You see, SG, +I plan to use the shards to power my spaceship, its exhaust will be so powerful, you peasants will all be vaporized. ", "Me and all of the wonderful billionaires of the world will head to planet X, the newly discovered planet beyond pluto.", "I've heard you want to start a revolution. Well, I'll have you know I kicked off my own revolution in 2068, and to be honest I don't quite see why you want my revolution to end.", "You know what they say, the freer the market, the freer the people, and ever since then I've never felt so free! I think your revolution is a foolish pipe dream! ", "Adam Smith once said \"Nobody but a beggar chooses to depend chiefly upon the benevolence of his fellow citizens\", your commie society could never work!", "I will defend my status quo as fiercly as possible! It was not by my hand that our society was erected, but it will be by mine that it is upheld!", "Oh? How will i reconstruct the Zircon Ultima? You're just the perfect tool for that. ", "While you've been on your gay little adventure collecting shards I've been waiting for this very moment to take them all from you!", "Have at you!", "" ] +} +tracks/1/type = "value" +tracks/1/path = NodePath("FamiVoice:playing") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"times": PoolRealArray( 0, 0.01 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 1, +"values": [ false, true ] +} +tracks/2/type = "value" +tracks/2/path = NodePath("Cop:position") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/keys = { +"times": PoolRealArray( 72.3, 74 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 0, +"values": [ Vector2( -8, 169 ), Vector2( 72, 169 ) ] +} +tracks/3/type = "value" +tracks/3/path = NodePath("Cop:animation") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/imported = false +tracks/3/enabled = true +tracks/3/keys = { +"times": PoolRealArray( 72.3, 74 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 1, +"values": [ "walk", "gun" ] +} +tracks/4/type = "value" +tracks/4/path = NodePath("FamiHuman:animation") +tracks/4/interp = 1 +tracks/4/loop_wrap = true +tracks/4/imported = false +tracks/4/enabled = true +tracks/4/keys = { +"times": PoolRealArray( 0, 75, 77, 77.4, 83, 85 ), +"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1 ), +"update": 1, +"values": [ "idle", "walk", "idle", "punch", "walk", "idle" ] +} +tracks/5/type = "value" +tracks/5/path = NodePath("FamiHuman:position") +tracks/5/interp = 1 +tracks/5/loop_wrap = true +tracks/5/imported = false +tracks/5/enabled = true +tracks/5/keys = { +"times": PoolRealArray( 75, 77, 83, 85 ), +"transitions": PoolRealArray( 1, 1, 1, 1 ), +"update": 0, +"values": [ Vector2( 160, 167 ), Vector2( 105, 167 ), Vector2( 105, 167 ), Vector2( 160, 167 ) ] +} +tracks/6/type = "value" +tracks/6/path = NodePath("ShardParticles:emitting") +tracks/6/interp = 1 +tracks/6/loop_wrap = true +tracks/6/imported = false +tracks/6/enabled = true +tracks/6/keys = { +"times": PoolRealArray( 0.1, 78, 83 ), +"transitions": PoolRealArray( 1, 1, 1 ), +"update": 1, +"values": [ false, true, false ] +} +tracks/7/type = "value" +tracks/7/path = NodePath("ShardRain:emitting") +tracks/7/interp = 1 +tracks/7/loop_wrap = true +tracks/7/imported = false +tracks/7/enabled = true +tracks/7/keys = { +"times": PoolRealArray( 0, 86, 89 ), +"transitions": PoolRealArray( 1, 1, 1 ), +"update": 1, +"values": [ false, true, false ] +} + +[sub_resource type="ShaderMaterial" id=8] +shader = ExtResource( 12 ) +shader_param/border_color = Color( 0, 0, 0, 1 ) +shader_param/border_corners = true + +[sub_resource type="AtlasTexture" id=9] +atlas = ExtResource( 14 ) +region = Rect2( 0, 0, 20, 21 ) + +[sub_resource type="AtlasTexture" id=10] +atlas = ExtResource( 14 ) +region = Rect2( 20, 0, 20, 21 ) + +[sub_resource type="AtlasTexture" id=11] +atlas = ExtResource( 14 ) +region = Rect2( 40, 0, 20, 21 ) + +[sub_resource type="AtlasTexture" id=12] +atlas = ExtResource( 14 ) +region = Rect2( 60, 0, 20, 21 ) + +[sub_resource type="SpriteFrames" id=13] +animations = [ { +"frames": [ ExtResource( 15 ) ], +"loop": true, +"name": "gun", +"speed": 5.0 +}, { +"frames": [ SubResource( 9 ), SubResource( 10 ), SubResource( 11 ), SubResource( 12 ) ], +"loop": true, +"name": "walk", +"speed": 10.0 +} ] + +[sub_resource type="ShaderMaterial" id=14] +shader = ExtResource( 12 ) +shader_param/border_color = Color( 0, 0, 0, 1 ) +shader_param/border_corners = false + +[sub_resource type="ShaderMaterial" id=15] +shader = ExtResource( 12 ) +shader_param/border_color = Color( 0, 0, 0, 1 ) +shader_param/border_corners = false + +[node name="FamiCutscene" type="Node2D"] + +[node name="Sprite" type="Sprite" parent="."] +position = Vector2( 0, 96 ) +texture = ExtResource( 10 ) +__meta__ = { +"_edit_lock_": true +} + +[node name="TileMap" type="TileMap" parent="."] +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 ) +margin_left = 16.0 +margin_top = 48.0 +margin_right = 240.0 +margin_bottom = 136.0 +theme = ExtResource( 3 ) +text = "Aha so you've made it this far, however your efforts are all in vain. +" +align = 1 +valign = 1 +autowrap = true + +[node name="SgIdle" type="Sprite" parent="."] +material = SubResource( 1 ) +position = Vector2( 96, 169 ) +texture = ExtResource( 6 ) +script = ExtResource( 5 ) + +[node name="FamiHuman" type="AnimatedSprite" parent="."] +position = Vector2( 160, 167 ) +scale = Vector2( -1, 1 ) +frames = SubResource( 7 ) +animation = "idle" +playing = true + +[node name="FamiVoice" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 11 ) + +[node name="AnimationPlayer" type="AnimationPlayer" parent="."] +autoplay = "cutscene" +anims/RESET = SubResource( 16 ) +anims/cutscene = SubResource( 2 ) + +[node name="Cop" type="AnimatedSprite" parent="."] +material = SubResource( 8 ) +position = Vector2( 72, 169 ) +frames = SubResource( 13 ) +animation = "gun" +playing = true + +[node name="ShardParticles" type="CPUParticles2D" parent="."] +material = SubResource( 14 ) +position = Vector2( 97, 160 ) +emitting = false +amount = 72 +lifetime = 2.5 +texture = ExtResource( 13 ) +direction = Vector2( 0, -2 ) +gravity = Vector2( 0, 42 ) +initial_velocity = 250.0 +initial_velocity_random = 0.35 +linear_accel = -30.19 + +[node name="ShardRain" type="CPUParticles2D" parent="."] +material = SubResource( 15 ) +position = Vector2( 163, -4 ) +emitting = false +amount = 72 +lifetime = 2.0 +texture = ExtResource( 13 ) +direction = Vector2( 0, 1 ) +initial_velocity = 18.0 +angular_velocity = 2.5 diff --git a/menus/intro_story.gd b/cutscenes/intro_story.gd similarity index 100% rename from menus/intro_story.gd rename to cutscenes/intro_story.gd diff --git a/menus/intro_story.tscn b/cutscenes/intro_story.tscn similarity index 91% rename from menus/intro_story.tscn rename to cutscenes/intro_story.tscn index f388f98..6918b85 100644 --- a/menus/intro_story.tscn +++ b/cutscenes/intro_story.tscn @@ -1,13 +1,13 @@ [gd_scene load_steps=9 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://ui/2ndpuberty_outline.tres" type="Material" id=3] -[ext_resource path="res://menus/intro_story.gd" type="Script" id=4] -[ext_resource path="res://audio/sounds/intro_voiceover.ogg" type="AudioStream" id=5] +[ext_resource path="res://ui/theme.tres" type="Theme" id=1] +[ext_resource path="res://ui/2ndpuberty_outline.tres" type="Material" id=2] +[ext_resource path="res://shaders/ska_plane.gdshader" type="Shader" id=3] +[ext_resource path="res://audio/sounds/intro_voiceover.ogg" type="AudioStream" id=4] +[ext_resource path="res://cutscenes/intro_story.gd" type="Script" id=5] [sub_resource type="ShaderMaterial" id=1] -shader = ExtResource( 1 ) +shader = ExtResource( 3 ) shader_param/color_1 = Color( 0, 0, 0, 1 ) shader_param/color_2 = Color( 0.1188, 0.1188, 0.22, 1 ) shader_param/checker_size = Vector2( 16, 16 ) @@ -48,7 +48,7 @@ tracks/0/keys = { } [node name="IntroStory" type="Node2D"] -script = ExtResource( 4 ) +script = ExtResource( 5 ) [node name="ColorRect" type="ColorRect" parent="."] material = SubResource( 1 ) @@ -56,12 +56,12 @@ margin_right = 256.0 margin_bottom = 192.0 [node name="Label" type="Label" parent="."] -material = ExtResource( 3 ) +material = ExtResource( 2 ) margin_left = 8.0 margin_top = 192.0 margin_right = 248.0 margin_bottom = 722.0 -theme = ExtResource( 2 ) +theme = ExtResource( 1 ) text = "The year is 2083. Capitalism has devastated the earth, and all hope seems lost. @@ -81,6 +81,6 @@ anims/RESET = SubResource( 2 ) anims/scroll = SubResource( 3 ) [node name="VoiceOver" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 5 ) +stream = ExtResource( 4 ) [connection signal="animation_finished" from="AnimationPlayer" to="." method="_on_AnimationPlayer_animation_finished"] diff --git a/graphics/ending/picnic_table.png b/graphics/ending/picnic_table.png index d561bae..8acb474 100644 Binary files a/graphics/ending/picnic_table.png and b/graphics/ending/picnic_table.png differ diff --git a/graphics/npc/fami_human_punch.png b/graphics/npc/fami_human_punch.png new file mode 100644 index 0000000..1b8d9e7 Binary files /dev/null and b/graphics/npc/fami_human_punch.png differ diff --git a/graphics/npc/fami_human_punch.png.import b/graphics/npc/fami_human_punch.png.import new file mode 100644 index 0000000..47a158e --- /dev/null +++ b/graphics/npc/fami_human_punch.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/fami_human_punch.png-3abbf294e7d6a39085ec2aeb01159189.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://graphics/npc/fami_human_punch.png" +dest_files=[ "res://.import/fami_human_punch.png-3abbf294e7d6a39085ec2aeb01159189.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/graphics/npc/fami_human_walk.png b/graphics/npc/fami_human_walk.png new file mode 100644 index 0000000..90d8031 Binary files /dev/null and b/graphics/npc/fami_human_walk.png differ diff --git a/graphics/npc/fami_human_walk.png.import b/graphics/npc/fami_human_walk.png.import new file mode 100644 index 0000000..cc05663 --- /dev/null +++ b/graphics/npc/fami_human_walk.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/fami_human_walk.png-0bdff16bec74475af4c98568148c5f60.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://graphics/npc/fami_human_walk.png" +dest_files=[ "res://.import/fami_human_walk.png-0bdff16bec74475af4c98568148c5f60.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/menus/credits.tscn b/menus/credits.tscn index 0e197d3..be5d765 100644 --- a/menus/credits.tscn +++ b/menus/credits.tscn @@ -779,7 +779,6 @@ position = Vector2( 3072, 0 ) material = SubResource( 7 ) position = Vector2( 58, 61 ) frames = SubResource( 12 ) -frame = 1 playing = true script = ExtResource( 16 ) @@ -825,7 +824,7 @@ align = 1 material = SubResource( 8 ) position = Vector2( 90, 61 ) frames = SubResource( 18 ) -frame = 1 +frame = 3 playing = true [node name="Label" type="Label" parent="Control/RollCall1/MsX"] @@ -895,7 +894,6 @@ position = Vector2( 512, 0 ) material = SubResource( 13 ) position = Vector2( 2880, 24 ) frames = SubResource( 21 ) -frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall2/Eviscerator"] @@ -945,7 +943,6 @@ align = 1 material = SubResource( 13 ) position = Vector2( 2880, 102 ) frames = SubResource( 30 ) -frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall2/RollingFiend"] @@ -961,7 +958,6 @@ align = 1 [node name="ChipIt" type="AnimatedSprite" parent="Control/RollCall2"] position = Vector2( 2960, 62 ) frames = SubResource( 33 ) -frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall2/ChipIt"] @@ -978,7 +974,7 @@ align = 1 material = SubResource( 34 ) position = Vector2( 3024, 62 ) frames = SubResource( 43 ) -frame = 5 +frame = 7 playing = true [node name="Label" type="Label" parent="Control/RollCall2/Skelarcher"] @@ -994,7 +990,6 @@ align = 1 [node name="SabreSpighter" type="AnimatedSprite" parent="Control/RollCall2"] position = Vector2( 2880, 62 ) frames = SubResource( 46 ) -frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall2/SabreSpighter"] @@ -1011,6 +1006,7 @@ align = 1 material = SubResource( 47 ) position = Vector2( 3016, 24 ) frames = SubResource( 50 ) +frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall2/BioSlime"] @@ -1041,7 +1037,6 @@ position = Vector2( 3584, 0 ) [node name="Shedge" type="AnimatedSprite" parent="Control/RollCall3"] position = Vector2( 60, 25 ) frames = SubResource( 54 ) -frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall3/Shedge"] @@ -1057,6 +1052,7 @@ align = 1 [node name="TheScrumpsTongue" type="AnimatedSprite" parent="Control/RollCall3"] position = Vector2( 156, 20 ) frames = SubResource( 57 ) +frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall3/TheScrumpsTongue"] @@ -1086,6 +1082,7 @@ align = 1 [node name="Squig" type="AnimatedSprite" parent="Control/RollCall3"] position = Vector2( 200, 64 ) frames = SubResource( 65 ) +frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall3/Squig"] @@ -1102,7 +1099,6 @@ align = 1 material = SubResource( 71 ) position = Vector2( 72, 152 ) frames = SubResource( 80 ) -frame = 6 playing = true [node name="Label" type="Label" parent="Control/RollCall3/Hellarcher"] @@ -1119,7 +1115,6 @@ align = 1 material = SubResource( 66 ) position = Vector2( 68, 104 ) frames = SubResource( 70 ) -frame = 2 playing = true [node name="Label" type="Label" parent="Control/RollCall3/Turchin"] @@ -1180,7 +1175,7 @@ texture = ExtResource( 29 ) [node name="Segment" type="PathFollow2D" parent="Control/RollCall3/Beel"] position = Vector2( 26.0015, 0.222285 ) -rotation = 0.0123443 +rotation = 0.0123294 offset = 18.0 cubic_interp = false lookahead = 0.001 @@ -1257,11 +1252,11 @@ position = Vector2( 3464, -8 ) autostart = false [node name="FootShapeFront" parent="Control/RollCall4/2600/Hitbox" index="1"] -position = Vector2( 63.7333, 154.923 ) +position = Vector2( 63.7334, 154.923 ) scale = Vector2( 1, 1 ) [node name="FootShapeBack" parent="Control/RollCall4/2600/Hitbox" index="2"] -position = Vector2( 42.7333, 154.923 ) +position = Vector2( 42.7334, 154.923 ) scale = Vector2( 1, 1 ) [node name="ExplosionRect" parent="Control/RollCall4/2600/BigExplosion" index="0"] @@ -1306,7 +1301,6 @@ align = 1 material = SubResource( 82 ) position = Vector2( 3362, 122.5 ) frames = SubResource( 87 ) -frame = 3 playing = true [node name="Label" type="Label" parent="Control/RollCall4/Famicop"]