From 198c669b41533a8e08f5b7d5a756decf6dac4746 Mon Sep 17 00:00:00 2001 From: pennyrigate Date: Sun, 7 Jul 2024 14:45:47 -0400 Subject: [PATCH] several changes. --- autoloads/audio.gd | 8 +- autoloads/level_data.tscn | 2 +- graphics/enemy/boss/stg_2600/head_cracked.png | Bin 1077 -> 1348 bytes maps/cave_scholar.tscn | 3 - maps/lab.tscn | 19 ++--- maps/rust.tscn | 20 ++--- menus/credits.tscn | 22 ++---- menus/title_screen.gd | 2 +- objects/enemy/2083_bullet.tscn | 1 + objects/enemy/boss/2600.gd | 1 - objects/enemy/boss/2600_small_explosion.gd | 2 +- objects/enemy/boss/sg2083.tscn | 72 +++++------------- .../falling_block/falling_block_cave.tscn | 2 +- .../falling_block_graveyard.tscn | 3 + .../falling_block/falling_block_lab.tscn | 3 + objects/lore/hills/catbat.tscn | 8 +- objects/lore/hills/speccy.tscn | 2 +- objects/lore/hills/verdant_hills.tscn | 2 +- objects/lore/station/msx.tscn | 2 +- 19 files changed, 57 insertions(+), 117 deletions(-) diff --git a/autoloads/audio.gd b/autoloads/audio.gd index 565228e..0d9c600 100644 --- a/autoloads/audio.gd +++ b/autoloads/audio.gd @@ -93,9 +93,9 @@ func play_shard_sound(): var r = 0 if Game.deaths == 0: if Game.shards == 4: - r = randi() % 100 + r = 40 else: - r = randi() % 90 + r = 40 if r <= 30: play_sound(a_good_job_penny,ac_shard) if r > 30 && r <= 60: play_sound(a_good_job_haze,ac_shard) if r > 60 && r <= 90: play_sound(a_good_job_ivy,ac_shard) @@ -117,9 +117,9 @@ func great_job(): ac_music.set_stream_paused(true) ac_pause_music.set_stream_paused(true) if Game.deaths == 0: - r = randi() % 100 + r = 40 else: - r = randi() % 90 + r = 40 if r <= 30: play_sound(a_great_job_penny,ac_shard) if r > 30 && r <= 60: play_sound(a_great_job_haze,ac_shard) if r > 60 && r <= 90: play_sound(a_great_job_ivy,ac_shard) diff --git a/autoloads/level_data.tscn b/autoloads/level_data.tscn index b209a3f..6bef229 100644 --- a/autoloads/level_data.tscn +++ b/autoloads/level_data.tscn @@ -171,7 +171,7 @@ scene = ExtResource( 9 ) resource_name = "Fami's Lab" script = ExtResource( 5 ) title = "Fami's Lab" -shard_titles = [ "Jump the Spike", "Final Obstacle Course", "5-Finger Discount", "Partners in law", "5 Rainbow Stars", "Collection Bonus", "Time Bonus", "Life Bonus" ] +shard_titles = [ "Spikes Can't Stop You", "Final Obstacle Course", "5-Finger Discount", "Good Job!", "5 Rainbow Stars", "Collection Bonus", "Time Bonus", "Life Bonus" ] save_id = "lab" shards_required = 0 shards_required_easy = 0 diff --git a/graphics/enemy/boss/stg_2600/head_cracked.png b/graphics/enemy/boss/stg_2600/head_cracked.png index ac1110390c49761d2cccd7ca0cb81549d4a93584..a81ac6283001a68326aa61bd4dbd0046ca57dbaa 100644 GIT binary patch delta 900 zcmV-~1AF|n2*e7ov;hG&leGaKfB(@!Tq-8FTQa3V9*Hv*wg10n|8YE|MF0Q*evMfZ z0000IbW%=J|NsC0|NsC0|NsC0|NsC0{{Z5@zY+id010qNS#tmY4!{5a4!{9w)`K#o-N#n#*-`Eknn_NUO>guI42Brj}GSPf9elO1(13R)~Ns!6hf zE(Rb@TIijNrY9pdA*m$=!9|pUnx5*AZ->-$)bvzE;OBbPx=_ba!&4bhKUas-bJXxu zjH@3HGvLVeln)0#lGIYyf065{0CBPgXT*`?DI4r^MjQ=*Wa65fgB+0%C;AIRG@qDM6UGOg!EJ-AJ)ARf13_l3T@CqzIDq0uq)ce=b#lihbUUd$Iuv z2w`d4kmqP!(ddJaDOxc}4rnEz*#X60k?jO3cd9O^UZem*rjE+3H$dx3`)808R9pH9 zsNQ)85Oan={6Aqp)n5q(DF>t`$o(_YlY;arCiM$YwMYum&*CdvB|_V*6vT#DY6+mq z68FhaNUM#l2XX4yf6`t8V#(xjuLktB`+*S$qTB}b?P6gfibfFzU^7z{Or6c(xk zBxMRJ7m2!jE8v3l>#-NxX2l=@fWxE!DlIVxksS)4O#>jlL^-&Y70}as=Y&_c`}8JN zAR5qs!XiRXS%*qUXT&y8u}A`9Qg9@vnvyOj`>RSCNQd24e((+|nQjGqyEO z1bqdNG|mIjsUU3(fwDz9bB!`fXReV0qP%9ge~ny_1gmoY8eNuzq#y)LJu!6|C_GeM z5oq7D?lM;(b_8q@XnSaHjSOx30000 zuvtroUb5#)@g2sXzusTcj-FQiv4@MGicoq%b`JBA;gy@hpRu=ndpI6{kp9q%6YnC_)z%mN-R9 zq)oIc&_#bM1csx-?&JCjxsS8A}`debZme;DwUXm{sLvn*hM zA)+URCizhUXPLkNU1UCtnBZI!7;so55;Z1%O8Qqc5d@;0C`?i7P<+azBDqMgn?4G> z7eo@tNJ#{(ycfieMbOYiBo+xpOAnEVL_c|4CJN?aQMpJRMP;O0 0 && r < 31: audio.stream = penny_voice if r >= 30 && r < 61: audio.stream = haze_voice if r >= 60 && r < 91: audio.stream = ivy_voice diff --git a/objects/enemy/2083_bullet.tscn b/objects/enemy/2083_bullet.tscn index 693a766..29c3750 100644 --- a/objects/enemy/2083_bullet.tscn +++ b/objects/enemy/2083_bullet.tscn @@ -37,4 +37,5 @@ shape = SubResource( 5 ) [node name="AnimatedSprite" type="AnimatedSprite" parent="."] frames = SubResource( 4 ) +frame = 2 playing = true diff --git a/objects/enemy/boss/2600.gd b/objects/enemy/boss/2600.gd index 3d3eb47..d336c4f 100644 --- a/objects/enemy/boss/2600.gd +++ b/objects/enemy/boss/2600.gd @@ -70,7 +70,6 @@ func die(): head_sprite.texture = preload("res://graphics/enemy/boss/stg_2600/head_cracked.png") 1: shot_speed = 70 - fire_rate = 0.8 $"%GlassShape".queue_free() emit_signal("entered_phase", 3) head_sprite.texture = preload("res://graphics/enemy/boss/stg_2600/head_broken.png") diff --git a/objects/enemy/boss/2600_small_explosion.gd b/objects/enemy/boss/2600_small_explosion.gd index af449c2..c79262b 100644 --- a/objects/enemy/boss/2600_small_explosion.gd +++ b/objects/enemy/boss/2600_small_explosion.gd @@ -1,7 +1,7 @@ extends Node2D func _ready() -> void: - Audio.play_sound(Audio.a_small_explosion,Audio.ac_die) + Audio.play_sound(Audio.a_explosion,Audio.ac_die) var sprite: AnimatedSprite = get_child(randi() % get_child_count()) sprite.visible = true sprite.play() diff --git a/objects/enemy/boss/sg2083.tscn b/objects/enemy/boss/sg2083.tscn index 0ebe63b..3d39c93 100644 --- a/objects/enemy/boss/sg2083.tscn +++ b/objects/enemy/boss/sg2083.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=43 format=2] +[gd_scene load_steps=40 format=2] [ext_resource path="res://shaders/color_noise.gdshader" type="Shader" id=1] [ext_resource path="res://graphics/enemy/boss/stg_2600/tailpipes.png" type="Texture" id=2] @@ -19,9 +19,6 @@ [ext_resource path="res://shaders/fade.gdshader" type="Shader" id=17] [ext_resource path="res://graphics/fade_patterns/stg_explosion.png" type="Texture" id=18] [ext_resource path="res://objects/enemy/boss/sg2083.gd" type="Script" id=19] -[ext_resource path="res://audio/sounds/mech_creak.ogg" type="AudioStream" id=20] -[ext_resource path="res://audio/sounds/mech_walk_2.ogg" type="AudioStream" id=21] -[ext_resource path="res://audio/sounds/mech_walk_1.ogg" type="AudioStream" id=22] [sub_resource type="RectangleShape2D" id=27] extents = Vector2( 44, 76 ) @@ -938,6 +935,18 @@ tracks/16/keys = { "update": 1, "values": [ false ] } +tracks/17/type = "value" +tracks/17/path = NodePath("UnDuck:playing") +tracks/17/interp = 1 +tracks/17/loop_wrap = true +tracks/17/imported = false +tracks/17/enabled = true +tracks/17/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 1, +"values": [ true ] +} [sub_resource type="Animation" id=25] resource_name = "Walk" @@ -988,7 +997,7 @@ tracks/3/keys = { "times": PoolRealArray( 0, 0.25, 0.5, 0.75, 1 ), "transitions": PoolRealArray( 1, 1, 1, 1, 1 ), "update": 0, -"values": [ 51.0254, 55.362, 37.1965, -18.9988, 51.0254 ] +"values": [ 51.0254, 60.0, 37.1965, -18.9988, 51.0254 ] } tracks/4/type = "value" tracks/4/path = NodePath("Axle/JointFront/LegFront:rotation_degrees") @@ -1012,7 +1021,7 @@ tracks/5/keys = { "times": PoolRealArray( 0, 0.25, 0.5, 0.75, 1 ), "transitions": PoolRealArray( 1, 1, 1, 1, 1 ), "update": 0, -"values": [ -25.1199, -4.6348, -6.27576, -31.2515, -25.1199 ] +"values": [ -25.1199, -4.6348, -6.27576, -43.6, -25.1199 ] } tracks/6/type = "value" tracks/6/path = NodePath("Axle/JointBack/LegBack/KneeBack/ShinBack:rotation_degrees") @@ -1024,7 +1033,7 @@ tracks/6/keys = { "times": PoolRealArray( 0, 0.25, 0.5, 0.75, 1 ), "transitions": PoolRealArray( 1, 1, 1, 1, 1 ), "update": 0, -"values": [ 51.0254, 23.4, 43.8, 55.0, 51.0254 ] +"values": [ 51.0254, 23.4, 43.8, 74.0, 51.0254 ] } tracks/7/type = "value" tracks/7/path = NodePath("Axle/JointBack/LegBack:rotation_degrees") @@ -1036,43 +1045,7 @@ tracks/7/keys = { "times": PoolRealArray( 0, 0.25, 0.5, 0.75, 1 ), "transitions": PoolRealArray( 1, 1, 1, 1, 1 ), "update": 0, -"values": [ -26.8344, -19.6257, -38.4223, -35.1608, -26.8344 ] -} -tracks/8/type = "value" -tracks/8/path = NodePath("Walk1:playing") -tracks/8/interp = 1 -tracks/8/loop_wrap = true -tracks/8/imported = false -tracks/8/enabled = true -tracks/8/keys = { -"times": PoolRealArray( 0.5 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ true ] -} -tracks/9/type = "value" -tracks/9/path = NodePath("Walk2:playing") -tracks/9/interp = 1 -tracks/9/loop_wrap = true -tracks/9/imported = false -tracks/9/enabled = true -tracks/9/keys = { -"times": PoolRealArray( 1 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ true ] -} -tracks/10/type = "value" -tracks/10/path = NodePath("Creak:playing") -tracks/10/interp = 1 -tracks/10/loop_wrap = true -tracks/10/imported = false -tracks/10/enabled = true -tracks/10/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ true ] +"values": [ -26.8344, -19.6257, -38.4223, -36.3773, -26.8344 ] } [sub_resource type="Animation" id=15] @@ -2287,15 +2260,4 @@ monitoring = false position = Vector2( 100, 92 ) shape = SubResource( 26 ) -[node name="Creak" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 20 ) - -[node name="Walk1" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 22 ) -volume_db = -6.0 - -[node name="Walk2" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 21 ) -volume_db = -6.0 - [connection signal="animation_finished" from="AnimationPlayer" to="." method="_on_animation_finished"] diff --git a/objects/environment/falling_block/falling_block_cave.tscn b/objects/environment/falling_block/falling_block_cave.tscn index 7ba053d..a30e355 100644 --- a/objects/environment/falling_block/falling_block_cave.tscn +++ b/objects/environment/falling_block/falling_block_cave.tscn @@ -115,7 +115,7 @@ shape = SubResource( 2 ) [node name="FallTimer" type="Timer" parent="."] process_mode = 0 -wait_time = 0.1 +wait_time = 0.2 one_shot = true [node name="RefreshTimer" type="Timer" parent="."] diff --git a/objects/environment/falling_block/falling_block_graveyard.tscn b/objects/environment/falling_block/falling_block_graveyard.tscn index df42c9d..15bc850 100644 --- a/objects/environment/falling_block/falling_block_graveyard.tscn +++ b/objects/environment/falling_block/falling_block_graveyard.tscn @@ -7,3 +7,6 @@ [node name="Sprite" parent="." index="0"] texture = ExtResource( 2 ) + +[node name="FallTimer" parent="." index="3"] +wait_time = 0.2 diff --git a/objects/environment/falling_block/falling_block_lab.tscn b/objects/environment/falling_block/falling_block_lab.tscn index 8d48836..0dd9e71 100644 --- a/objects/environment/falling_block/falling_block_lab.tscn +++ b/objects/environment/falling_block/falling_block_lab.tscn @@ -7,3 +7,6 @@ [node name="Sprite" parent="." index="0"] texture = ExtResource( 2 ) + +[node name="FallTimer" parent="." index="3"] +wait_time = 0.2 diff --git a/objects/lore/hills/catbat.tscn b/objects/lore/hills/catbat.tscn index 6da70bb..ae43fbd 100644 --- a/objects/lore/hills/catbat.tscn +++ b/objects/lore/hills/catbat.tscn @@ -20,11 +20,11 @@ material = SubResource( 1 ) texture = SubResource( 2 ) [node name="Control" parent="." index="1"] -margin_top = 68.0 -margin_bottom = 123.0 +margin_top = 49.0 +margin_bottom = 143.0 [node name="Label" parent="Control" index="0"] margin_top = 3.0 -margin_bottom = 52.0 +margin_bottom = 91.0 text = "CATBAT: -A Chimera created from vampire bat and panther materials given an artificial soul." +A Chimera created from vampire bat and panther materials. Fami wants everyone to believe creatures like this always existed. the propaganda isn't working." diff --git a/objects/lore/hills/speccy.tscn b/objects/lore/hills/speccy.tscn index 6b05e81..737a7f5 100644 --- a/objects/lore/hills/speccy.tscn +++ b/objects/lore/hills/speccy.tscn @@ -21,4 +21,4 @@ margin_bottom = 136.0 margin_top = 3.0 margin_bottom = 78.0 text = "Speccy: -born 04/23/2060, sg's british friend. she once had 9 shards of zircon ultima but had to split them into 45 rainbow stars to keep them from fami." +born 04/23/2060, sg's british friend. he once had 9 shards of zircon ultima but had to split them into 45 rainbow stars to keep them from fami." diff --git a/objects/lore/hills/verdant_hills.tscn b/objects/lore/hills/verdant_hills.tscn index e223a46..c2a2d2c 100644 --- a/objects/lore/hills/verdant_hills.tscn +++ b/objects/lore/hills/verdant_hills.tscn @@ -16,4 +16,4 @@ margin_bottom = 136.0 margin_top = 3.0 margin_bottom = 78.0 text = "Verdant hills: -Verdant hills was once the most peaceful place in virginia, a beatiful stretch of nature that was corrupted by fami's evil deeds." +It was once the most peaceful place in virginia, a beatiful stretch of nature that was corrupted by fami's evil deeds." diff --git a/objects/lore/station/msx.tscn b/objects/lore/station/msx.tscn index 7fb605b..6421c98 100644 --- a/objects/lore/station/msx.tscn +++ b/objects/lore/station/msx.tscn @@ -22,5 +22,5 @@ margin_bottom = 143.0 [node name="Label" parent="Control" index="0"] margin_top = 3.0 margin_bottom = 91.0 -text = "Ms. X (Sally Xevious): +text = "Ms. X: born 10/21/2062, she was locked up for such trivial crimes as shoplifting and marijuana possession. her reliance on drugs causes many issues in her life."