fogwaves/revo-jailbreak
1
0
Fork 0
forked from team-sg/hero-mark-2
Code Pull requests Activity

fix most of the script errors and warnings, fixed a couple tiny bugs in the process :)

Browse source
This commit is contained in:
Haze Weathers 2024-03-08 15:11:48 -05:00
parent 9435089f21
commit 72733db609
23 changed files with 55 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

1
menus/file_select_panel.tscn
View file

@ -126,3 +126,4 @@ explosiveness = 1.0
randomness = 0.34
initial_velocity = 100.0
scale_amount = 2.0
spray_ammount = 0

2
menus/level_select_scholar.gd
View file

@ -69,7 +69,6 @@ func _process(delta: float) -> void:
if selected_level + 1 < LevelData.levels.size():
var save := Save.current_file
var level: LevelEntry = LevelData.levels[selected_level + 1]
var shards := save.get_total_shards()
if save.get_total_shards() < level.shards_required:
forward_arrow.visible = false
boss_block.visible = false
@ -144,7 +143,6 @@ func _select_level(level_id: int) -> void:
func _can_travel(index: int) -> bool:
var save := Save.current_file
var level: LevelEntry = LevelData.levels[index]
var shards := save.get_total_shards()
if save.get_total_shards() < level.shards_required:
return false
if level.boss_required != "":

3
menus/main_menu.gd
View file

@ -16,8 +16,7 @@ func _ready():
$Panel/FileSelect.grab_focus()
if Game.last_mm_button != null:
get_node(Game.last_mm_button).grab_focus()
Vector2( 0.83205, 0.5547 )
func _on_Continue_button_down():
Game.last_mm_button = "Panel/Continue"

3
menus/results.gd
View file

@ -7,7 +7,6 @@ const LevelSelect := preload("res://menus/level_select_scholar.tscn")
onready var shards: Node2D = $ShardsAndBonuses/Shards
onready var score = $Score
onready var time = $Time
onready var final_score: Label = $FinalScore
onready var animation_player = $AnimationPlayer
#Score bonuses
onready var collection_bonus_score = $ShardsAndBonuses/Bonuses/CollectionBonus/CollectionBonusScore
@ -54,7 +53,7 @@ func _physics_process(delta: float) -> void:
animation_player.set_speed_scale(4)
func final_score():
func show_final_score():
animation_player.set_speed_scale(2)
text_3d.animation_player.set_speed_scale(1)

10
menus/results.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=20 format=2]
[gd_scene load_steps=19 format=2]
[ext_resource path="res://shaders/wibble_wobble.gdshader" type="Shader" id=1]
[ext_resource path="res://shaders/ska_plane.gdshader" type="Shader" id=2]
@ -40,11 +40,6 @@ shader_param/ammount = Vector2( 9, 8 )
shader_param/offset = Vector2( 0, 0 )
shader_param/delay = Vector2( 0, 0 )
[sub_resource type="Animation" id=3]
resource_name = "New Anim"
length = 2.0
loop = true
[sub_resource type="Animation" id=10]
length = 0.001
tracks/0/type = "value"
@ -319,7 +314,7 @@ tracks/14/keys = {
"transitions": PoolRealArray( 1 ),
"values": [ {
"args": [ ],
"method": "final_score"
"method": "show_final_score"
} ]
}
@ -556,7 +551,6 @@ texture = ExtResource( 4 )
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
autoplay = "results"
playback_speed = 2.0
"anims/New Anim" = SubResource( 3 )
anims/RESET = SubResource( 10 )
anims/results = SubResource( 4 )