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

Marisa Rigate's Big Commit: Disaster Averted!

Browse source
This commit is contained in:
Haze Weathers 2023-12-25 01:01:59 -05:00
parent 1215099f4d
commit 263d6219cc
19 changed files with 314 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

14
menus/credits.tscn
View file

@ -743,7 +743,7 @@ Wolfboy
Rhidianruckus
Wily Beast
Maddy
"
Sylvan"
align = 1
valign = 1
@ -832,7 +832,7 @@ align = 1
material = SubResource( 8 )
position = Vector2( 106, 69 )
frames = SubResource( 18 )
frame = 1
frame = 2
playing = true
[node name="Label" type="Label" parent="Control/RollCall1/MsX"]
@ -918,7 +918,6 @@ 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"]
@ -934,7 +933,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"]
@ -982,7 +980,7 @@ align = 1
material = SubResource( 34 )
position = Vector2( 3024, 62 )
frames = SubResource( 43 )
frame = 1
frame = 6
playing = true
[node name="Label" type="Label" parent="Control/RollCall2/Skelarcher"]
@ -1107,7 +1105,7 @@ align = 1
material = SubResource( 71 )
position = Vector2( 72, 152 )
frames = SubResource( 80 )
frame = 2
frame = 7
playing = true
[node name="Label" type="Label" parent="Control/RollCall3/Hellarcher"]
@ -1124,6 +1122,7 @@ 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"]
@ -1153,6 +1152,7 @@ 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"]
@ -1160,6 +1160,7 @@ 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"]
@ -1310,6 +1311,7 @@ align = 1
material = SubResource( 82 )
position = Vector2( 3362, 122.5 )
frames = SubResource( 87 )
frame = 2
playing = true
[node name="Label" type="Label" parent="Control/RollCall4/Famicop"]

22
menus/level_select_scholar.gd
View file

@ -24,8 +24,6 @@ onready var filled_shards: Node2D = $"%FilledShards"
onready var shard_title: Label = $"%ShardTitle"
onready var shard_arrow: Sprite = $"%ShardArrow"
onready var animation_player: AnimationPlayer = $AnimationPlayer
onready var forward_status: TabContainer = $"%ForwardStatus"
onready var shards_required: Label = $"%ShardsRequired"
func _ready() -> void:
Fade.fade_in(0.4)
@ -91,15 +89,7 @@ func _input(event: InputEvent) -> void:
shard_arrow.position.x = filled_shards.get_child(selected_shard).position.x
func _select_level(level_id: int) -> void:
var level: LevelEntry = LevelData.levels[level_id]
# fail if required boss is not beaten
if not level.boss_required.empty():
var boss_save = Save.current_file.levels[level.boss_required]
if not boss_save.completed:
return
# fail if not enough shards
if Save.current_file.get_total_shards() < level.shards_required:
return
var level = LevelData.levels[level_id]
selected_level = level_id
# hide arrows at edges of leve set
if level_id == 0:
@ -107,19 +97,9 @@ func _select_level(level_id: int) -> void:
else:
back_arrow.modulate.a = 1.0
if level_id == LevelData.levels.size() - 1:
forward_status.current_tab = 0
forward_arrow.modulate.a = 0.0
else:
forward_status.current_tab = 0
forward_arrow.modulate.a = 1.0
var next_level = LevelData.levels[level_id + 1]
if Save.current_file.get_total_shards() < next_level.shards_required:
forward_status.current_tab = 1
shards_required.text = str(next_level.shards_required)
if not next_level.boss_required.empty():
var boss_save = Save.current_file.levels[next_level.boss_required]
if not boss_save.completed:
forward_status.current_tab = 2
# set text
level_title.text = level.title
# initiate animation

55
menus/level_select_scholar.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=22 format=2]
[gd_scene load_steps=19 format=2]
[ext_resource path="res://menus/level_select_scholar.gd" type="Script" id=1]
[ext_resource path="res://graphics/level_select/world_map.png" type="Texture" id=2]
@ -7,11 +7,9 @@
[ext_resource path="res://graphics/hud/pause_arrow.png" type="Texture" id=5]
[ext_resource path="res://ui/2ndpuberty_outline.tres" type="Material" id=6]
[ext_resource path="res://shaders/wibble_wobble.gdshader" type="Shader" id=7]
[ext_resource path="res://ui/2ndpuberty_scholar_outline.fnt" type="BitmapFont" id=8]
[ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=9]
[ext_resource path="res://graphics/collectibles/shard.png" type="Texture" id=10]
[ext_resource path="res://objects/collectibles/shard.tscn" type="PackedScene" id=11]
[ext_resource path="res://graphics/falling_block/woeful_soul.png" type="Texture" id=12]
[ext_resource path="res://graphics/hud/levelselect_arrow.png" type="Texture" id=14]
[sub_resource type="Curve2D" id=1]
@ -33,10 +31,6 @@ shader_param/ammount = Vector2( 2, 0 )
shader_param/offset = Vector2( 0, 0 )
shader_param/delay = Vector2( 4, 0 )
[sub_resource type="AtlasTexture" id=9]
atlas = ExtResource( 12 )
region = Rect2( 8, 0, 8, 8 )
[sub_resource type="ShaderMaterial" id=5]
shader = ExtResource( 9 )
shader_param/border_color = Color( 0, 0, 0, 1 )
@ -209,7 +203,6 @@ offset = 300.0
[node name="CurrentLevel" type="HBoxContainer" parent="."]
anchor_right = 1.0
margin_bottom = 16.0
theme = ExtResource( 4 )
alignment = 1
[node name="BackArrow" type="TextureRect" parent="CurrentLevel"]
@ -235,51 +228,15 @@ text = "Verdant Hills"
align = 1
valign = 1
[node name="ForwardStatus" type="TabContainer" parent="CurrentLevel"]
unique_name_in_owner = true
margin_left = 177.0
margin_right = 183.0
margin_bottom = 16.0
tabs_visible = false
[node name="ForwardArrow" type="TextureRect" parent="CurrentLevel/ForwardStatus"]
[node name="ForwardArrow" type="TextureRect" parent="CurrentLevel"]
unique_name_in_owner = true
material = SubResource( 3 )
anchor_right = 1.0
anchor_bottom = 1.0
margin_left = 177.0
margin_top = 4.0
margin_right = 183.0
margin_bottom = 12.0
size_flags_vertical = 4
texture = ExtResource( 5 )
stretch_mode = 4
[node name="NotEnoughShards" type="HBoxContainer" parent="CurrentLevel/ForwardStatus"]
visible = false
anchor_right = 1.0
anchor_bottom = 1.0
[node name="Shard" type="TextureRect" parent="CurrentLevel/ForwardStatus/NotEnoughShards"]
material = ExtResource( 6 )
margin_top = 2.0
margin_right = 11.0
margin_bottom = 13.0
size_flags_vertical = 4
texture = ExtResource( 10 )
[node name="ShardsRequired" type="Label" parent="CurrentLevel/ForwardStatus/NotEnoughShards"]
unique_name_in_owner = true
margin_left = 15.0
margin_top = 3.0
margin_right = 29.0
margin_bottom = 13.0
custom_colors/font_color = Color( 0.960784, 0.2, 0.258824, 1 )
custom_fonts/font = ExtResource( 8 )
text = "20"
[node name="BossNotBeaten" type="TextureRect" parent="CurrentLevel/ForwardStatus"]
visible = false
anchor_right = 1.0
anchor_bottom = 1.0
texture = SubResource( 9 )
stretch_mode = 4
[node name="LevelStats" type="Panel" parent="."]
visible = false