couple things, icr

This commit is contained in:
JHDev2006
2025-09-25 22:54:23 +01:00
parent 7b5399147f
commit 40c2c04fcd
12 changed files with 347 additions and 283 deletions

File diff suppressed because one or more lines are too long

View File

@@ -412,3 +412,4 @@ metadata/_custom_type_script = "uid://cmg61722ktg2m"
[connection signal="explosion_entered" from="ExplosionDetection" to="." method="die_from_object"]
[connection signal="explosion_entered" from="ExplosionDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [500]]
[connection signal="block_bounced" from="BlockBouncingDetection" to="." method="die_from_object"]
[connection signal="block_bounced" from="BlockBouncingDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [500]]

View File

@@ -1,7 +1,8 @@
[gd_scene load_steps=22 format=3 uid="uid://dinpjmg0q23rv"]
[gd_scene load_steps=23 format=3 uid="uid://dinpjmg0q23rv"]
[ext_resource type="Script" uid="uid://bds7rntb0btee" path="res://Scripts/Classes/Entities/Enemies/Spiny.gd" id="1_u8w4p"]
[ext_resource type="Texture2D" uid="uid://diemx33h3bxa2" path="res://Assets/Sprites/Enemies/Spiny.png" id="2_u8w4p"]
[ext_resource type="Script" uid="uid://caq1qiwmy0mox" path="res://Scripts/Parts/BetterAnimatedSprite.gd" id="3_m3lgl"]
[ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="3_velug"]
[ext_resource type="JSON" path="res://Assets/Sprites/Enemies/Spiny.json" id="4_a74i7"]
[ext_resource type="Script" uid="uid://chj8hu207lrh" path="res://Scripts/Classes/Components/EnemyPlayerDetection.gd" id="4_qcd6q"]
@@ -80,6 +81,8 @@ animation = &"Walk"
autoplay = "Walk"
offset = Vector2(0, 1)
flip_h = true
script = ExtResource("3_m3lgl")
metadata/_custom_type_script = "uid://caq1qiwmy0mox"
[node name="ResourceSetterNew" type="Node" parent="Sprite" node_paths=PackedStringArray("node_to_affect")]
script = ExtResource("3_velug")
@@ -118,7 +121,7 @@ position = Vector2(0, -8)
[node name="GibSpawner" type="Node" parent="." node_paths=PackedStringArray("visuals")]
script = ExtResource("5_f6841")
visuals = NodePath("../Sprite")
visuals = NodePath("")
metadata/_custom_type_script = "uid://c3gg32ivrlq8n"
[node name="ShellDetection" type="Node" parent="." node_paths=PackedStringArray("hitbox")]

View File

@@ -7,7 +7,7 @@
[ext_resource type="Texture2D" uid="uid://bbdcmhyxmc3pu" path="res://Assets/Sprites/Items/SPItems.png" id="3_a1d2e"]
[ext_resource type="Script" uid="uid://blxvov3jyx8gg" path="res://Scripts/Classes/States/Player/Normal.gd" id="3_f6bau"]
[ext_resource type="Texture2D" uid="uid://bdurtsr7cld64" path="res://Assets/Sprites/Players/Mario/ColourPalette.png" id="3_x2idl"]
[ext_resource type="SpriteFrames" uid="uid://328p7l1rmy00" path="res://Resources/SpriteFrames/Player/Toad/Big.tres" id="4_fqdtv"]
[ext_resource type="SpriteFrames" uid="uid://df4enjjl84mji" path="res://Resources/SpriteFrames/Player/Mario/Small.tres" id="4_fqdtv"]
[ext_resource type="Script" uid="uid://dvbib1gtmmvui" path="res://Scripts/Classes/States/Player/Pipe.gd" id="5_hodem"]
[ext_resource type="Script" uid="uid://c8xvkkv34fjr4" path="res://Scripts/Classes/PowerStates/PowerUpState.gd" id="5_rs3l8"]
[ext_resource type="Script" uid="uid://caq1qiwmy0mox" path="res://Scripts/Parts/BetterAnimatedSprite.gd" id="5_x2idl"]

View File

@@ -26,9 +26,9 @@ anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = -88.0
offset_left = -76.0
offset_top = -48.0
offset_right = 88.0
offset_right = 76.0
offset_bottom = 48.0
grow_horizontal = 2
grow_vertical = 2

View File

@@ -1,9 +1,8 @@
[gd_scene load_steps=6 format=3 uid="uid://d1kedqb68p7vw"]
[gd_scene load_steps=5 format=3 uid="uid://d1kedqb68p7vw"]
[ext_resource type="Script" uid="uid://bupc8brk48aqi" path="res://Scripts/UI/LevelSelect.gd" id="1_mvafj"]
[ext_resource type="StyleBox" uid="uid://comkghpj0djcl" path="res://Resources/UI/Panel.tres" id="2_k7cgt"]
[ext_resource type="Script" uid="uid://co6tjg3w6qpd8" path="res://Scripts/Parts/LabelFontChanger.gd" id="3_a7p1d"]
[ext_resource type="Resource" uid="uid://8dcuxbc3h2u2" path="res://Resources/ThemedResources/Font.tres" id="4_r15fi"]
[sub_resource type="StyleBoxLine" id="StyleBoxLine_k7cgt"]
color = Color(1, 1, 1, 1)
@@ -103,5 +102,4 @@ uppercase = true
[node name="LabelFontChanger" type="Node" parent="PanelContainer" node_paths=PackedStringArray("labels")]
script = ExtResource("3_a7p1d")
labels = [NodePath("../MarginContainer/VBoxContainer/Label"), NodePath("../MarginContainer/VBoxContainer/SlotContainer/Level1"), NodePath("../MarginContainer/VBoxContainer/SlotContainer/Level2"), NodePath("../MarginContainer/VBoxContainer/SlotContainer/Level3"), NodePath("../MarginContainer/VBoxContainer/SlotContainer/Level4"), NodePath("../MarginContainer/VBoxContainer/Control/Cursor")]
resource = ExtResource("4_r15fi")
metadata/_custom_type_script = "uid://co6tjg3w6qpd8"

View File

@@ -13,7 +13,7 @@ color = Color(1, 1, 1, 1)
layout_mode = 3
anchors_preset = 0
offset_right = 136.0
offset_bottom = 104.0
offset_bottom = 77.0
script = ExtResource("1_6lbpd")
[node name="PanelContainer" type="PanelContainer" parent="."]
@@ -55,6 +55,7 @@ grow_vertical = 0
theme_override_styles/separator = SubResource("StyleBoxLine_6lbpd")
[node name="FirstQuest" type="Label" parent="PanelContainer/MarginContainer/VBoxContainer"]
visible = false
layout_mode = 2
text = "QUEST_FIRST"
horizontal_alignment = 1

View File

@@ -85,6 +85,7 @@ func get_resource(json_file: JSON) -> Resource:
if json.get("source") is String:
source_resource_path = json_file.resource_path.replace(json_file.resource_path.get_file(), json.source)
else:
print(json)
Global.log_error("Error getting variations! " + resource_path)
return
for i in Settings.file.visuals.resource_packs:

View File

@@ -117,6 +117,10 @@ func check_for_ghost() -> void:
func get_highscore() -> void:
%HighScore.text = "TOP- " + str(Global.high_score).pad_zeros(6)
if Global.world_num == 1 and Global.level_num == 1 and Global.score <= 0:
%StoryOptions.selected_index = 0
else:
%StoryOptions.selected_index = 1
func clear_stats() -> void:
Global.clear_saved_values()
@@ -132,6 +136,7 @@ func start_game() -> void:
Global.transition_to_scene("res://Scenes/Levels/LevelTransition.tscn")
func start_full_run() -> void:
Global.second_quest = false
Global.current_game_mode = Global.GameMode.MARATHON
SpeedrunHandler.timer = 0
if SpeedrunHandler.is_warp_run:
@@ -148,6 +153,7 @@ func start_full_run() -> void:
Global.transition_to_scene("res://Scenes/Levels/LevelTransition.tscn")
func start_level_run() -> void:
Global.second_quest = false
Global.current_game_mode = Global.GameMode.MARATHON_PRACTICE
SpeedrunHandler.timer = 0
if SpeedrunHandler.is_warp_run:
@@ -166,6 +172,7 @@ func _exit_tree() -> void:
Global.in_title_screen = false
func challenge_hunt_selected() -> void:
Global.second_quest = false
Global.current_game_mode = Global.GameMode.CHALLENGE
Global.reset_values()
Global.clear_saved_values()
@@ -220,6 +227,7 @@ func quit_game() -> void:
get_tree().quit()
func new_game_selected() -> void:
Global.second_quest = false
Global.current_game_mode = Global.GameMode.CAMPAIGN
if Global.game_beaten:
%QuestSelect.open()
@@ -227,6 +235,7 @@ func new_game_selected() -> void:
$CanvasLayer/StoryMode/NewUnbeatenGame/NoBeatenCharSelect.open()
func continue_game() -> void:
SaveManager.apply_save(SaveManager.load_save(Global.current_campaign))
Global.current_game_mode = Global.GameMode.CAMPAIGN
if Global.game_beaten:
$CanvasLayer/StoryMode/ContinueBeatenGame/WorldSelect.open()

View File

@@ -184,6 +184,8 @@ func slot_selected(idx := 0) -> void:
selected_level = idx
update_pb()
update_score()
if Settings.file.audio.extra_sfx == 1:
AudioManager.play_global_sfx("menu_move")
func cleanup() -> void:
await get_tree().process_frame

View File

@@ -6,11 +6,14 @@ var active := false
var selected_index := 0
var old_quest := false
func _process(_delta: float) -> void:
if active:
handle_input()
func open() -> void:
old_quest = Global.second_quest
show()
await get_tree().process_frame
[%FirstQuest, %SecondQuest][int(Global.second_quest)].grab_focus()
@@ -21,7 +24,7 @@ func handle_input() -> void:
select()
close()
elif Input.is_action_just_pressed("ui_back"):
Global.second_quest = false
Global.second_quest = old_quest
close()
cancelled.emit()
return

View File

@@ -82,6 +82,8 @@ func handle_input() -> void:
func slot_focused(idx := 0) -> void:
selected_world = idx
if Settings.file.audio.extra_sfx == 1:
AudioManager.play_global_sfx("menu_move")
func select_world() -> void:
if owner is Level: