misc code cleanup
This commit is contained in:
parent
0692f76d0b
commit
9103ee4cc1
|
|
@ -1,4 +1,4 @@
|
||||||
extends Area3D
|
class_name InteractiveSprite extends Area3D
|
||||||
|
|
||||||
@onready var pass_to_actor = $UiWrapper/UiSprite/SubViewport/Collectable_ui
|
@onready var pass_to_actor = $UiWrapper/UiSprite/SubViewport/Collectable_ui
|
||||||
@onready var wrapper = $UiWrapper
|
@onready var wrapper = $UiWrapper
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
extends PanelContainer
|
class_name CardBoard extends PanelContainer
|
||||||
|
|
||||||
#var area_dict = {
|
#var area_dict = {
|
||||||
# "dropzone_content": [],
|
# "dropzone_content": [],
|
||||||
|
|
@ -123,7 +123,7 @@ func _ready():
|
||||||
# currently_active_node.is_dragged = false
|
# currently_active_node.is_dragged = false
|
||||||
|
|
||||||
# Will be used later to spawn Cards and Post-Its and remember them in the dictionary
|
# Will be used later to spawn Cards and Post-Its and remember them in the dictionary
|
||||||
func populate_board(card_names: Array):
|
func populate_board(card_names: Array[String]):
|
||||||
mementos_collected += 1
|
mementos_collected += 1
|
||||||
|
|
||||||
var all_new:Dictionary = board_of_devs.get_cards_by_name_array(card_names)
|
var all_new:Dictionary = board_of_devs.get_cards_by_name_array(card_names)
|
||||||
|
|
@ -369,9 +369,10 @@ func get_save_dict() -> Dictionary:
|
||||||
return {
|
return {
|
||||||
"cards": cards,
|
"cards": cards,
|
||||||
"stickies": stickies
|
"stickies": stickies
|
||||||
}
|
} if cards != {} and stickies != {} else {}
|
||||||
|
|
||||||
func initialise_from_save(savegame: SaveGame):
|
func initialise_from_save(savegame: SaveGame):
|
||||||
|
if savegame.board_state == {}: return
|
||||||
var cards: Dictionary = savegame.board_state["cards"]
|
var cards: Dictionary = savegame.board_state["cards"]
|
||||||
var stickies: Dictionary = savegame.board_state["stickies"]
|
var stickies: Dictionary = savegame.board_state["stickies"]
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
extends CenterContainer
|
class_name CardPicker extends CenterContainer
|
||||||
|
|
||||||
#fixme INI is probably redundant.
|
#fixme INI is probably redundant.
|
||||||
enum {
|
enum {
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,8 @@ var time_pressed: float = 0
|
||||||
var pressed: bool
|
var pressed: bool
|
||||||
|
|
||||||
func _ready():
|
func _ready():
|
||||||
owner = get_node(costum_owner)
|
if costum_owner != NodePath(""):
|
||||||
|
owner = get_node(costum_owner)
|
||||||
|
|
||||||
if owner == null:
|
if owner == null:
|
||||||
owner = get_parent().get_parent()
|
owner = get_parent().get_parent()
|
||||||
|
|
|
||||||
|
|
@ -74,8 +74,6 @@ func load_user_settings():
|
||||||
file.close()
|
file.close()
|
||||||
var parsed: Dictionary = JSON.parse_string(raw_json)
|
var parsed: Dictionary = JSON.parse_string(raw_json)
|
||||||
|
|
||||||
print(parsed)
|
|
||||||
|
|
||||||
for kategory in parsed.keys():
|
for kategory in parsed.keys():
|
||||||
for key in parsed[kategory].keys():
|
for key in parsed[kategory].keys():
|
||||||
set(key, parsed[key])
|
set(key, parsed[key])
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue