diff --git a/audio/sounds/ominous.ogg b/audio/sounds/ominous.ogg new file mode 100644 index 0000000..bdad3d2 Binary files /dev/null and b/audio/sounds/ominous.ogg differ diff --git a/audio/sounds/ominous.ogg.import b/audio/sounds/ominous.ogg.import new file mode 100644 index 0000000..98dea53 --- /dev/null +++ b/audio/sounds/ominous.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/ominous.ogg-2cb3fd446cacd9e83817a015cfcd0bdc.oggstr" + +[deps] + +source_file="res://audio/sounds/ominous.ogg" +dest_files=[ "res://.import/ominous.ogg-2cb3fd446cacd9e83817a015cfcd0bdc.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/autoloads/audio.gd b/autoloads/audio.gd index 35ea5db..df1a0e1 100644 --- a/autoloads/audio.gd +++ b/autoloads/audio.gd @@ -60,6 +60,7 @@ const a_laser_ready = preload("res://audio/sounds/laser_ready.ogg") const a_copsquash = preload("res://audio/sounds/copsquash.ogg") const a_copsquash2 = preload("res://audio/sounds/cop_splat.ogg") const a_fami_transform = preload("res://audio/sounds/fami_transform.ogg") +const a_ominous = preload("res://audio/sounds/ominous.ogg") var loop_section = null var has_looped = false diff --git a/autoloads/game.gd b/autoloads/game.gd index bec25bb..624bf6f 100644 --- a/autoloads/game.gd +++ b/autoloads/game.gd @@ -61,9 +61,6 @@ var marathon_deaths: int = 0 func _ready(): pause_mode = Node.PAUSE_MODE_PROCESS -func _process(delta): - print(can_restart) - func _get_stars() -> int: return stars_collected.count(true) diff --git a/cutscenes/fami_cutscene.tscn b/cutscenes/fami_cutscene.tscn index bff3dfd..079d012 100644 --- a/cutscenes/fami_cutscene.tscn +++ b/cutscenes/fami_cutscene.tscn @@ -387,7 +387,6 @@ 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 diff --git a/maps/boss/boss3_arena.gd b/maps/boss/boss3_arena.gd index 3ddf53e..edd7c09 100644 --- a/maps/boss/boss3_arena.gd +++ b/maps/boss/boss3_arena.gd @@ -13,6 +13,8 @@ func _ready() -> void: sg_energy.max_value = sg2083.max_energy sg2083.state = sg2083.State.INACTIVE famira.animation_player.play("grow", -1.0, 0.0) + Audio.play_sound(Audio.a_ominous,Audio.ac_collectible) + Audio.play_music(load("res://audio/music/the_dirt_under_the_meadow.ogg")) func _on_2083_health_changed(amount) -> void: @@ -39,6 +41,7 @@ func fade() -> void: yield(Fade, "fade_finished") sg2083.anims.play("force idle") Fade.fade_in(0.4) + $"%GUI".visible = true yield(Fade, "fade_finished") sg2083.state = sg2083.State.STAND famira.state_chart.send_event("transformed") diff --git a/maps/boss/boss3_arena.tscn b/maps/boss/boss3_arena.tscn index 98cb95a..9b5b101 100644 --- a/maps/boss/boss3_arena.tscn +++ b/maps/boss/boss3_arena.tscn @@ -167,13 +167,25 @@ tracks/3/keys = { "method": "land" } ] } -tracks/4/type = "method" -tracks/4/path = NodePath(".") +tracks/4/type = "value" +tracks/4/path = NodePath("FamiCutscene:visible") tracks/4/interp = 1 tracks/4/loop_wrap = true tracks/4/imported = false tracks/4/enabled = true tracks/4/keys = { +"times": PoolRealArray( 3, 4.4 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 0, +"values": [ true, false ] +} +tracks/5/type = "method" +tracks/5/path = NodePath(".") +tracks/5/interp = 1 +tracks/5/loop_wrap = true +tracks/5/imported = false +tracks/5/enabled = true +tracks/5/keys = { "times": PoolRealArray( 4 ), "transitions": PoolRealArray( 1 ), "values": [ { @@ -181,18 +193,6 @@ tracks/4/keys = { "method": "fade" } ] } -tracks/5/type = "value" -tracks/5/path = NodePath("FamiCutscene:visible") -tracks/5/interp = 1 -tracks/5/loop_wrap = true -tracks/5/imported = false -tracks/5/enabled = true -tracks/5/keys = { -"times": PoolRealArray( 3, 4.4 ), -"transitions": PoolRealArray( 1, 1 ), -"update": 1, -"values": [ true, false ] -} [node name="Map" type="Node2D" groups=["map"]] pause_mode = 1 @@ -220,6 +220,8 @@ margin_bottom = 192.0 color = Color( 1, 0, 0, 0.333333 ) [node name="GUI" type="CanvasLayer" parent="."] +unique_name_in_owner = true +visible = false [node name="Control" type="Control" parent="GUI"] anchor_right = 1.0 diff --git a/menus/credits.tscn b/menus/credits.tscn index b218237..1f5d848 100644 --- a/menus/credits.tscn +++ b/menus/credits.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=135 format=2] +[gd_scene load_steps=136 format=2] [ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=1] [ext_resource path="res://shaders/ska_plane.gdshader" type="Shader" id=2] @@ -46,6 +46,7 @@ [ext_resource path="res://graphics/npc/penny.png" type="Texture" id=44] [ext_resource path="res://graphics/npc/haze.png" type="Texture" id=45] [ext_resource path="res://graphics/hud/thankyou.png" type="Texture" id=46] +[ext_resource path="res://graphics/enemy/boss/famira-wip.png" type="Texture" id=47] [sub_resource type="ShaderMaterial" id=1] shader = ExtResource( 2 ) @@ -612,9 +613,10 @@ script = ExtResource( 14 ) layer = -64 [node name="ColorRect2" type="ColorRect" parent="CanvasLayer"] -margin_left = 1792.0 -margin_right = 2048.0 -margin_bottom = 192.0 +margin_left = 4352.0 +margin_top = 8.0 +margin_right = 4608.0 +margin_bottom = 200.0 color = Color( 0.0666667, 0.164706, 0.454902, 0.329412 ) [node name="Background" type="ColorRect" parent="CanvasLayer"] @@ -655,7 +657,7 @@ Level design Code graphics sound effects -Story" +Scenario" align = 1 valign = 1 @@ -670,7 +672,8 @@ Lead Programmer graphics sound effects voice of \"narrator\" -Story" +Story +Additional Enemy design" align = 1 valign = 1 @@ -694,7 +697,8 @@ margin_right = 1536.0 margin_bottom = 192.0 theme = ExtResource( 6 ) text = "-Dog \"the scrump\" jelly- -designer of \"the scrump\"" +designer of \"the scrump\" +Story Help" align = 1 valign = 1 @@ -745,8 +749,7 @@ DogJelly Wolfboy Rhidianruckus Wily Beast -Maddy -Sylvan" +Maddy" align = 1 valign = 1 @@ -776,36 +779,18 @@ wily beast" align = 1 valign = 1 -[node name="WonderingNow3" type="Label" parent="Control"] -material = ExtResource( 4 ) -margin_left = 3072.0 -margin_right = 3328.0 -margin_bottom = 192.0 -theme = ExtResource( 6 ) -text = "-people who inspired us- -Yuji Naka -Hideo kojima -Shigesato itoi -Shigeru miyamoto -Akira Toriyama -Davio -Quazi" -align = 1 -valign = 1 - [node name="RollCall" type="Sprite" parent="Control"] material = SubResource( 6 ) -position = Vector2( 3456, 88 ) +position = Vector2( 3200, 88 ) texture = ExtResource( 11 ) [node name="RollCall1" type="Node2D" parent="Control"] -position = Vector2( 3584, 0 ) +position = Vector2( 3328, 0 ) [node name="SG" type="AnimatedSprite" parent="Control/RollCall1"] material = SubResource( 7 ) position = Vector2( 74, 69 ) frames = SubResource( 12 ) -frame = 1 playing = true script = ExtResource( 16 ) @@ -836,7 +821,6 @@ align = 1 material = SubResource( 8 ) position = Vector2( 106, 69 ) frames = SubResource( 18 ) -frame = 2 playing = true [node name="Label" type="Label" parent="Control/RollCall1/MsX"] @@ -900,7 +884,7 @@ text = "Vile Villians" align = 1 [node name="RollCall2" type="Node2D" parent="Control"] -position = Vector2( 1024, 0 ) +position = Vector2( 768, 0 ) [node name="Eviscerator" type="AnimatedSprite" parent="Control/RollCall2"] material = SubResource( 13 ) @@ -923,6 +907,7 @@ align = 1 material = SubResource( 13 ) position = Vector2( 2952, 24 ) frames = SubResource( 24 ) +frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall2/Catbat"] @@ -954,7 +939,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"] @@ -970,7 +954,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"] @@ -987,7 +970,7 @@ align = 1 material = SubResource( 34 ) position = Vector2( 3024, 62 ) frames = SubResource( 43 ) -frame = 6 +frame = 4 playing = true [node name="Label" type="Label" parent="Control/RollCall2/Skelarcher"] @@ -1020,6 +1003,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"] @@ -1045,12 +1029,11 @@ Poachers" align = 1 [node name="RollCall3" type="Node2D" parent="Control"] -position = Vector2( 4096, 0 ) +position = Vector2( 3840, 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"] @@ -1066,6 +1049,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"] @@ -1111,7 +1095,7 @@ align = 1 material = SubResource( 71 ) position = Vector2( 72, 152 ) frames = SubResource( 80 ) -frame = 7 +frame = 5 playing = true [node name="Label" type="Label" parent="Control/RollCall3/Hellarcher"] @@ -1128,6 +1112,7 @@ 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"] @@ -1157,7 +1142,6 @@ position = Vector2( 4, 0 ) z_index = 1 frames = SubResource( 61 ) animation = "chomp" -frame = 1 playing = true [node name="Border" type="AnimatedSprite" parent="Control/RollCall3/Beel/Head/Sprite"] @@ -1165,7 +1149,6 @@ material = SubResource( 62 ) z_index = -1 frames = SubResource( 61 ) animation = "chomp" -frame = 1 playing = true [node name="ShapeTransform" type="RemoteTransform2D" parent="Control/RollCall3/Beel/Head"] @@ -1253,12 +1236,12 @@ margin_top = 152.0 margin_right = 232.0 margin_bottom = 175.0 theme = ExtResource( 6 ) -text = "Enervating +text = "Eldritch experiments" align = 1 [node name="RollCall4" type="Node2D" parent="Control"] -position = Vector2( 1024, 0 ) +position = Vector2( 768, 0 ) [node name="2600" parent="Control/RollCall4" instance=ExtResource( 37 )] position = Vector2( 3464, -8 ) @@ -1316,7 +1299,6 @@ align = 1 material = SubResource( 82 ) position = Vector2( 3362, 122.5 ) frames = SubResource( 87 ) -frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall4/Famicop"] @@ -1384,6 +1366,34 @@ texture = ExtResource( 42 ) position = Vector2( 184, 80 ) texture = ExtResource( 46 ) +[node name="RollCall6" type="Node2D" parent="."] + +[node name="Famira-wip" type="Sprite" parent="RollCall6"] +position = Vector2( 4438, 104 ) +texture = ExtResource( 47 ) + +[node name="MonsterousMechaMadeMoral" type="Label" parent="RollCall6"] +modulate = Color( 0.980392, 0.878431, 0.0392157, 1 ) +material = SubResource( 51 ) +margin_left = 4488.0 +margin_top = 115.0 +margin_right = 4600.0 +margin_bottom = 138.0 +theme = ExtResource( 6 ) +text = "Totalitarian +terror" +align = 1 + +[node name="Label2" type="Label" parent="RollCall6"] +material = ExtResource( 4 ) +margin_left = 4479.0 +margin_top = 151.0 +margin_right = 4612.0 +margin_bottom = 165.0 +theme = ExtResource( 6 ) +text = "Super Famira" +align = 1 + [node name="AnimationPlayer" type="AnimationPlayer" parent="."] autoplay = "credits" anims/RESET = SubResource( 89 ) diff --git a/menus/level_select_scholar.gd b/menus/level_select_scholar.gd index 8d636fa..7832205 100644 --- a/menus/level_select_scholar.gd +++ b/menus/level_select_scholar.gd @@ -27,6 +27,7 @@ onready var animation_player: AnimationPlayer = $AnimationPlayer onready var boss_block: TextureRect = $"%BossBlock" onready var shards_block: HBoxContainer = $"%ShardsBlock" onready var shards_needed: Label = $"%ShardsNeeded" +onready var world_title: Label = $"%WorldTitle" func _ready() -> void: var palette = load("res://graphics/player/palettes/%s.tex" % Game.current_palette) @@ -137,6 +138,14 @@ func _select_level(level_id: int) -> void: forward_arrow.modulate.a = 1.0 # set text level_title.text = level.title + #set world name + print(selected_level) + if selected_level < 2: world_title.text = "Garden of love:\nremnants of nature's beauty" + if selected_level == 3: world_title.text = "Artificial life:\namalgam, stranger to the gods" + if selected_level > 3 && selected_level < 7: world_title.text = "Harsh Reality:\nHappiness through Hardship" + if selected_level == 7: world_title.text = "Dr.Intelli the Vengeful monster:\nfriend to no one, cold metal prison" + if selected_level > 7 && selected_level < 11: world_title.text = "Artificial world:\nend man-made suffering" + if selected_level == 11: world_title.text = "This is it SG...\nchange the future, we believe in you" # initiate animation _travel_to_level(level.save_id) diff --git a/menus/level_select_scholar.tscn b/menus/level_select_scholar.tscn index 91b9bb0..82ec5ce 100644 --- a/menus/level_select_scholar.tscn +++ b/menus/level_select_scholar.tscn @@ -489,6 +489,19 @@ position = Vector2( 63.9913, 132.768 ) rotation = -2.19436 offset = 505.0 +[node name="WorldTitle" type="Label" parent="."] +unique_name_in_owner = true +material = ExtResource( 6 ) +margin_left = -26.0 +margin_top = 164.0 +margin_right = 282.0 +margin_bottom = 187.0 +theme = ExtResource( 4 ) +text = "This is it sg. +change the future, we believe in you" +align = 1 +valign = 1 + [node name="CurrentLevel" type="HBoxContainer" parent="."] anchor_right = 1.0 margin_bottom = 16.0