team-sg/hero-mark-2
team-sg/hero-mark-2
5
0
Fork 1
Code Issues 12 Releases Activity

several changes.

Browse source
This commit is contained in:
pennyrigate 2024-07-07 14:45:47 -04:00
parent 72f84c88a5
commit 198c669b41
19 changed files with 57 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

8
autoloads/audio.gd
View file

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

2
autoloads/level_data.tscn
View file

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

BIN
graphics/enemy/boss/stg_2600/head_cracked.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Before After
Before After

3
maps/cave_scholar.tscn
View file

@ -186,9 +186,6 @@ position = Vector2( 192, 16 )
[node name="Stalactite7" parent="Environment" instance=ExtResource( 3 )]
position = Vector2( 176, 96 )
[node name="Stalactite8" parent="Environment" instance=ExtResource( 3 )]
position = Vector2( 208, 96 )
[node name="Stalactite11" parent="Environment" instance=ExtResource( 3 )]
position = Vector2( 320, 120 )

19
maps/lab.tscn
View file

File diff suppressed because one or more lines are too long

20
maps/rust.tscn
View file

File diff suppressed because one or more lines are too long

22
menus/credits.tscn
View file

@ -609,10 +609,9 @@ script = ExtResource( 14 )
layer = -64
[node name="ColorRect2" type="ColorRect" parent="CanvasLayer"]
margin_left = 512.0
margin_top = 8.0
margin_right = 768.0
margin_bottom = 200.0
margin_left = 4608.0
margin_right = 4864.0
margin_bottom = 192.0
color = Color( 0.0666667, 0.164706, 0.454902, 0.329412 )
[node name="Background" type="ColorRect" parent="CanvasLayer"]
@ -861,7 +860,6 @@ position = Vector2( 3584, 0 )
material = SubResource( 7 )
position = Vector2( 74, 69 )
frames = SubResource( 12 )
frame = 1
playing = true
script = ExtResource( 16 )
@ -892,7 +890,6 @@ align = 1
material = SubResource( 8 )
position = Vector2( 106, 69 )
frames = SubResource( 18 )
frame = 1
playing = true
[node name="Label" type="Label" parent="Control/RollCall1/MsX"]
@ -993,7 +990,6 @@ align = 1
[node name="TheScrump" type="AnimatedSprite" parent="Control/RollCall2"]
position = Vector2( 2992, 128 )
frames = SubResource( 27 )
frame = 1
playing = true
[node name="Label" type="Label" parent="Control/RollCall2/TheScrump"]
@ -1010,7 +1006,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"]
@ -1026,7 +1021,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"]
@ -1043,7 +1037,6 @@ align = 1
material = SubResource( 34 )
position = Vector2( 3024, 62 )
frames = SubResource( 43 )
frame = 1
playing = true
[node name="Label" type="Label" parent="Control/RollCall2/Skelarcher"]
@ -1075,6 +1068,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"]
@ -1105,7 +1099,6 @@ position = Vector2( 4096, 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"]
@ -1121,6 +1114,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"]
@ -1167,7 +1161,7 @@ align = 1
material = SubResource( 71 )
position = Vector2( 72, 152 )
frames = SubResource( 80 )
frame = 2
frame = 1
playing = true
[node name="Label" type="Label" parent="Control/RollCall3/Hellarcher"]
@ -1184,7 +1178,6 @@ align = 1
material = SubResource( 66 )
position = Vector2( 68, 104 )
frames = SubResource( 70 )
frame = 1
playing = true
[node name="Label" type="Label" parent="Control/RollCall3/Turchin"]
@ -1373,7 +1366,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"]
@ -1418,7 +1410,7 @@ align = 1
position = Vector2( 256, 0 )
[node name="Famira" parent="Control/RollCall6" instance=ExtResource( 47 )]
position = Vector2( 4512, 184 )
position = Vector2( 4502, 184 )
credits = true
[node name="MonsterousMechaMadeMoral" type="Label" parent="Control/RollCall6"]

2
menus/title_screen.gd
View file

@ -16,7 +16,7 @@ onready var revolution_2083_ivy = preload("res://audio/sounds/revolution2083_ivy
func _input(event):
if Input.is_action_just_pressed("start") && !has_started:
Audio.play_sound(Audio.a_star,Audio.ac_collectible)
var r = randi() % 101
var r = 40
if r > 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

1
objects/enemy/2083_bullet.tscn
View file

@ -37,4 +37,5 @@ shape = SubResource( 5 )
[node name="AnimatedSprite" type="AnimatedSprite" parent="."]
frames = SubResource( 4 )
frame = 2
playing = true

1
objects/enemy/boss/2600.gd
View file

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

2
objects/enemy/boss/2600_small_explosion.gd
View file

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

72
objects/enemy/boss/sg2083.tscn
View file

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

2
objects/environment/falling_block/falling_block_cave.tscn
View file

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

3
objects/environment/falling_block/falling_block_graveyard.tscn
View file

@ -7,3 +7,6 @@
[node name="Sprite" parent="." index="0"]
texture = ExtResource( 2 )
[node name="FallTimer" parent="." index="3"]
wait_time = 0.2

3
objects/environment/falling_block/falling_block_lab.tscn
View file

@ -7,3 +7,6 @@
[node name="Sprite" parent="." index="0"]
texture = ExtResource( 2 )
[node name="FallTimer" parent="." index="3"]
wait_time = 0.2

8
objects/lore/hills/catbat.tscn
View file

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

2
objects/lore/hills/speccy.tscn
View file

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

2
objects/lore/hills/verdant_hills.tscn
View file

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

2
objects/lore/station/msx.tscn
View file

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