Mirrors/godot_tiny_crate
1
0
Fork 0
mirror of https://github.com/HarmonyHoney/tiny_crate.git synced 2026-01-23 02:34:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

clean up scene_dict and select

Browse source
This commit is contained in:
Harmony Honey Monroe 2025-02-25 04:15:29 -05:00
parent f75b735580
commit 364f8a4062
4 changed files with 2 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/autoload/Shared.gd
View file

@ -35,7 +35,6 @@ var save_path := "user://save/"
var save_filename := "box.save"
var keys_path := "keys.tres"
var options_path := "options.tres"
var scene_dict := {}
var replays := [{}, {}, {}, {}, {}, {}, {}]
var is_save := false
var last_menu := "main"
@ -114,7 +113,6 @@ func _ready():
# get all maps
for i in dir_list(map_dir):
scene_dict[map_dir + i] = load(map_dir + i)
maps.append(i.split(".")[0])
@ -197,9 +195,7 @@ func change_map():
if is_win:
save_replays()
if !scene_dict.has(scene_path):
scene_dict[scene_path] = load(scene_path)
get_tree().change_scene_to(scene_dict[scene_path])
get_tree().change_scene_to(load(scene_path))
is_win = false
is_save = false

44
src/menu/select.gd
View file

@ -10,9 +10,7 @@ onready var screens_node : Control = $Control/Screens
onready var screen : Control = $Control/Screen
export var screen_dist = Vector2(5, 5)
export var screen_size = Vector2(136, 96)
export var columns = 8
var screen_pos := []
var screen_static := []
var screen_max := 1
var overlays := []
@ -32,17 +30,10 @@ onready var score_clock := $Control/Scores/HBoxContainer/Clock
onready var score_map := $Control/Scores/HBoxContainer/Map
onready var score_row := $Control/Scores/Row
var load_list := []
var loader : ResourceInteractiveLoader
var port_count = 0
var is_load := false
var is_screening := false
var map_limit := 0
var screen_list := []
export var timeout_mod := 1.0
var screen_time := 0.0
var loading_time := 0.0
export var color_gem := Color("ffec27")
export var color_new := Color("83769c")
@ -69,8 +60,6 @@ var lockdict= {0:["1-1", "1-2", "1-3", "1-4", "1-5", "1-6", "1-7", "1-8"],
24: ['5-1', '5-2', '5-3', '5-4'],
30: ['win']}
var stage_size := Vector2(136, 96)
func _ready():
#Leaderboard.connect("new_score", self, "new_score")
#SilentWolf.Scores.connect("sw_scores_received", self, "new_score")
@ -135,7 +124,6 @@ func _input(event):
if open_map():
Audio.play("menu_pick", 0.9, 1.1)
is_input = false
is_load = false
else:
Audio.play("menu_random", 0.8, 1.2)
elif event.is_action_pressed("ui_pause"):
@ -180,30 +168,8 @@ func _physics_process(delta):
make_screen(screen_list.pop_front())
else:
is_screening = false
is_load = true
print(screen_time, " screeening time")
break
# load stages
elif is_load:
loading_time += delta
while OS.get_ticks_msec() < ticks + (delta * timeout_mod):
if load_list.size() > 0:
var pop = load_list.pop_front()
if Shared.scene_dict.has(pop[1]):
var inst = Shared.scene_dict[pop[1]].instance()
var cb = inst.get_node("CamBounds")
pop[2].add_child(inst)
if is_instance_valid(cb):
inst.position -= cb.position
screen_static[pop[0]].visible = false
else:
is_load = false
print(loading_time, " loading time")
break
func make_screen(i := 0):
var new = screen.duplicate()
@ -250,16 +216,6 @@ func make_screen(i := 0):
screens_node.add_child(new)
overlays[i] = new.get_node("Vis/Overlay")
screen_static.append(new.get_node("Vis/Static"))
#view_scene(new.get_node("Vis/Node2D"), Shared.map_dir + map_list[i] + ".tscn", i)
# view a scene inside the viewport by path
func view_scene(port, path, arg):
for i in port.get_children():
i.queue_free()
load_list.append([port_count, path, port])
port_count += 1
func scroll(arg := cursor):
if overlays[cursor]: overlays[cursor].visible = true

27
src/menu/select.tscn
View file

@ -1,10 +1,9 @@
[gd_scene load_steps=23 format=2]
[gd_scene load_steps=21 format=2]
[ext_resource path="res://media/image/corner.png" type="Texture" id=1]
[ext_resource path="res://media/font/QuinqueFive.ttf" type="DynamicFontData" id=2]
[ext_resource path="res://media/image/note.png" type="Texture" id=3]
[ext_resource path="res://src/menu/Vis.gd" type="Script" id=4]
[ext_resource path="res://src/shader/tv_static.gdshader" type="Shader" id=5]
[ext_resource path="res://src/shader/outline2D_outer.shader" type="Shader" id=6]
[ext_resource path="res://src/menu/select.gd" type="Script" id=7]
[ext_resource path="res://media/image/diamond16.png" type="Texture" id=8]
@ -15,11 +14,6 @@
[ext_resource path="res://src/menu/cursor_anim.gd" type="Script" id=13]
[ext_resource path="res://src/stage/sheet.png" type="Texture" id=14]
[sub_resource type="ShaderMaterial" id=8]
shader = ExtResource( 5 )
shader_param/mouse_pos = Vector2( 0.01, 0.005 )
shader_param/vsync_issues = 0.7
[sub_resource type="ShaderMaterial" id=10]
shader = ExtResource( 6 )
shader_param/line_color = Color( 0, 0, 0, 1 )
@ -99,25 +93,6 @@ rect_min_size = Vector2( 136, 96 )
rect = Rect2( 0, 0, 136, 96 )
script = ExtResource( 4 )
[node name="BG" type="Node2D" parent="Control/Screen/Vis"]
z_index = -500
[node name="ColorRect" type="ColorRect" parent="Control/Screen/Vis/BG"]
margin_right = 136.0
margin_bottom = 96.0
rect_min_size = Vector2( 136, 96 )
color = Color( 0, 0, 0, 1 )
[node name="Node2D" type="Node2D" parent="Control/Screen/Vis"]
position = Vector2( 68, 48 )
z_index = -400
[node name="Static" type="ColorRect" parent="Control/Screen/Vis"]
modulate = Color( 0.14, 0.14, 0.14, 1 )
material = SubResource( 8 )
margin_right = 136.0
margin_bottom = 96.0
[node name="Sprite" type="Sprite" parent="Control/Screen/Vis"]
texture = ExtResource( 14 )
centered = false

1
src/menu/splash.tscn
View file

@ -6,7 +6,6 @@
[node name="Splash" type="Node2D"]
script = ExtResource( 3 )
is_build_sheet = true
[node name="CanvasLayer" type="CanvasLayer" parent="."]
layer = 9