Compare commits
16 Commits
a40ccab3c8
...
card-rewor
Author | SHA1 | Date | |
---|---|---|---|
3c02ae63f9 | |||
ce0bc104ff | |||
7cddb502b4 | |||
d1ef1d6f4f | |||
fc3a31d144 | |||
1d9c3fc473 | |||
5937b4db69 | |||
9217834726 | |||
c463bf0adc | |||
98357b5dec | |||
1beb89ea84 | |||
dd73e1b477 | |||
9bb3308487 | |||
90912c062f | |||
b82f5e4c19 | |||
fe38fc49bf |
237
caching.gd
237
caching.gd
@ -1,129 +1,206 @@
|
|||||||
extends Node
|
extends Node
|
||||||
|
|
||||||
var _card_id
|
var _req_headers: PackedStringArray
|
||||||
var _img_path
|
|
||||||
|
|
||||||
var _req_headers
|
var _bulk_data: Array
|
||||||
|
|
||||||
signal cache_done
|
signal fetch_done
|
||||||
|
var _emitted_done = 0
|
||||||
|
signal fetch_start
|
||||||
|
var _emitted_start = 0
|
||||||
|
|
||||||
var _consts = preload("res://data/consts.gd")
|
var _consts = preload("res://data/consts.gd")
|
||||||
|
|
||||||
|
|
||||||
|
func _all_downloads_done() -> bool:
|
||||||
|
return _emitted_done == _emitted_start
|
||||||
|
|
||||||
|
|
||||||
|
func _setup_cache_in_mem():
|
||||||
|
var file = FileAccess.open("user://bulk.json", FileAccess.READ)
|
||||||
|
_bulk_data = JSON.parse_string(file.get_as_text())
|
||||||
|
file.close()
|
||||||
|
|
||||||
|
|
||||||
|
func setup() -> Error:
|
||||||
|
if !FileAccess.file_exists("user://bulk.json"):
|
||||||
|
get_bulk_data(false)
|
||||||
|
push_error("Bulk Data was not downloaded! Downloading now!")
|
||||||
|
return FAILED
|
||||||
|
|
||||||
|
if !_all_downloads_done():
|
||||||
|
push_error("Not done downloading Bulk Data.")
|
||||||
|
return FAILED
|
||||||
|
|
||||||
|
_setup_cache_in_mem()
|
||||||
|
return OK
|
||||||
|
|
||||||
|
|
||||||
func _init() -> void:
|
func _init() -> void:
|
||||||
_req_headers = PackedStringArray(["User-Agent: " + _consts.APP_NAME + "/" + _consts.APP_VERSION, "Accept: */*"])
|
_req_headers = PackedStringArray(
|
||||||
|
["User-Agent: " + _consts.APP_NAME + "/" + _consts.APP_VERSION, "Accept: */*"]
|
||||||
|
)
|
||||||
|
|
||||||
|
fetch_done.connect(_on_end_emit)
|
||||||
|
fetch_start.connect(_on_start_emit)
|
||||||
|
|
||||||
|
|
||||||
|
func _on_start_emit() -> void:
|
||||||
|
_emitted_start += 1
|
||||||
|
|
||||||
|
|
||||||
|
func _on_end_emit() -> void:
|
||||||
|
_emitted_done += 1
|
||||||
|
|
||||||
|
|
||||||
|
func has_emitted_all() -> bool:
|
||||||
|
return _emitted_start == _emitted_done
|
||||||
|
|
||||||
|
|
||||||
func _cache_error(err: String) -> String:
|
func _cache_error(err: String) -> String:
|
||||||
return "CACHE::ERROR::" + err + "\n"
|
return "CACHE::ERROR::" + err + "\n"
|
||||||
|
|
||||||
|
|
||||||
func _check_cache(id: String) -> bool:
|
func _get_dict_from_file(filepath: String) -> Dictionary:
|
||||||
if !FileAccess.file_exists("user://card_cache/" + id + "/card.json"):
|
var file = FileAccess.open(filepath, FileAccess.READ)
|
||||||
return false
|
var data = JSON.parse_string(file.get_as_text())
|
||||||
if !FileAccess.file_exists("user://card_cache/" + id + "/card.png"):
|
|
||||||
return false
|
return data
|
||||||
return true
|
|
||||||
|
|
||||||
|
|
||||||
func custom_query_fetch(query: String) -> String:
|
## get_card_data_from_name
|
||||||
var error = await _do_custom_http_request_card(query)
|
##
|
||||||
if error != OK:
|
## _name: String [br]
|
||||||
return "NONE"
|
## A wrapper for searching for a card by name. Use **get_card_data_from_id** where possible, as it avoids an expensive search for the new card, if the card has been cached already.
|
||||||
OS.delay_msec(100)
|
func get_card_data_from_name(_name: String) -> Dictionary:
|
||||||
await _do_http_request_imgs(_card_id)
|
return _get_card_data_from_bulk("name", _name)
|
||||||
OS.delay_msec(100)
|
|
||||||
cache_done.emit()
|
|
||||||
return _card_id
|
|
||||||
|
|
||||||
|
|
||||||
func _do_custom_http_request_card(query: String) -> Error:
|
## get_card_data_from_id
|
||||||
|
##
|
||||||
|
## id: String [br]
|
||||||
|
## This is the preferred wrapper to use when fetching card data, it checks the cache for preexisting data and uses that if it's available. Otherwise, it will search the bulk json for the data.
|
||||||
|
func get_card_data_from_id(id: String) -> Dictionary:
|
||||||
|
if FileAccess.file_exists("user://card_cache/" + id + "/card.json"):
|
||||||
|
return _get_dict_from_file("user://card_cache/" + id + "/card.json")
|
||||||
|
return _get_card_data_from_bulk("id", id)
|
||||||
|
|
||||||
|
|
||||||
|
func _get_card_data_from_bulk(field: String, search_query: String) -> Dictionary:
|
||||||
|
var selected_entry = null
|
||||||
|
for entry in _bulk_data:
|
||||||
|
if entry[field] == search_query:
|
||||||
|
selected_entry = entry
|
||||||
|
break
|
||||||
|
continue
|
||||||
|
|
||||||
|
if selected_entry == null:
|
||||||
|
return {}
|
||||||
|
|
||||||
|
if selected_entry["image_status"] != "missing":
|
||||||
|
_fetch_card_img(selected_entry)
|
||||||
|
|
||||||
|
var dir = DirAccess.open("user://")
|
||||||
|
dir.make_dir_recursive("user://card_cache/" + selected_entry["id"] + "/")
|
||||||
|
dir = null
|
||||||
|
|
||||||
|
var file = FileAccess.open(
|
||||||
|
"user://card_cache/" + selected_entry["id"] + "/card.json", FileAccess.WRITE
|
||||||
|
)
|
||||||
|
file.store_line(JSON.stringify(selected_entry, "\t"))
|
||||||
|
file.close()
|
||||||
|
|
||||||
|
print("Card: " + selected_entry["name"] + "(" + selected_entry["id"] + ") found, and cached.")
|
||||||
|
|
||||||
|
return selected_entry
|
||||||
|
|
||||||
|
|
||||||
|
func _fetch_card_img(data: Dictionary) -> Error:
|
||||||
|
fetch_start.emit()
|
||||||
|
if FileAccess.file_exists("user://card_cache/" + data["id"] + "card.png"):
|
||||||
|
return OK
|
||||||
|
|
||||||
var httpr = HTTPRequest.new()
|
var httpr = HTTPRequest.new()
|
||||||
add_child(httpr)
|
add_child(httpr)
|
||||||
var error = httpr.request(query, _req_headers)
|
|
||||||
if error != OK:
|
|
||||||
push_error(_cache_error("GET_REQUEST") + "An error occurred in the Scryfall request.")
|
|
||||||
|
|
||||||
var response = await httpr.request_completed
|
var err = httpr.request((data["image_uris"])["png"], _req_headers)
|
||||||
|
if err != OK:
|
||||||
if response[0] != HTTPRequest.RESULT_SUCCESS:
|
push_error(_cache_error("GET_REQUEST") + "An error occured in the Scryfall request.")
|
||||||
push_error(_cache_error("GET_REQUEST") + "Failed to fetch card data from Scryfall")
|
|
||||||
return FAILED
|
return FAILED
|
||||||
|
var resp = await httpr.request_completed
|
||||||
|
|
||||||
var unprocessed_body = response[3].get_string_from_utf8()
|
var img = Image.new()
|
||||||
var card_content = JSON.parse_string(unprocessed_body)
|
err = img.load_png_from_buffer(resp[3])
|
||||||
if card_content == null:
|
if err != OK:
|
||||||
push_error(_cache_error("PARSING") + "Failed to parse the Scryfall card results.")
|
push_error(_cache_error("IMG_LOADING") + "Couldn't load the image.")
|
||||||
|
|
||||||
_card_id = card_content["id"]
|
|
||||||
if _check_cache(_card_id):
|
|
||||||
return FAILED
|
return FAILED
|
||||||
|
|
||||||
var dir = DirAccess.open("user://")
|
var dir = DirAccess.open("user://")
|
||||||
dir.make_dir_recursive("user://card_cache/" + _card_id + "/") # lets ensure the path is there
|
dir.make_dir_recursive("user://card_cache/" + data["id"] + "/")
|
||||||
dir = null
|
dir = null
|
||||||
|
|
||||||
var card_cache = FileAccess.open("user://card_cache/" + _card_id + "/card.json", FileAccess.WRITE)
|
img.save_png("user://card_cache/" + data["id"] + "/card.png")
|
||||||
card_cache.store_string(unprocessed_body) # cache the json response
|
img = null
|
||||||
card_cache = null # closes the file
|
|
||||||
|
fetch_done.emit()
|
||||||
|
|
||||||
var image_uris = card_content["image_uris"]
|
|
||||||
_img_path = image_uris["png"]
|
|
||||||
return OK
|
return OK
|
||||||
|
|
||||||
|
|
||||||
func fetch_card(id: String) -> void:
|
func get_bulk_data(force: bool) -> Error:
|
||||||
if _check_cache(id):
|
if FileAccess.file_exists("user://bulk.json"):
|
||||||
return
|
if force:
|
||||||
|
DirAccess.remove_absolute("user://bulk.json")
|
||||||
|
else:
|
||||||
|
return OK
|
||||||
|
|
||||||
await _do_http_id_request_card(id)
|
|
||||||
OS.delay_msec(100)
|
|
||||||
await _do_http_request_imgs(id)
|
|
||||||
OS.delay_msec(100)
|
|
||||||
cache_done.emit()
|
|
||||||
|
|
||||||
|
|
||||||
func _do_http_request_imgs(id: String) -> void:
|
|
||||||
var httpr = HTTPRequest.new()
|
var httpr = HTTPRequest.new()
|
||||||
add_child(httpr)
|
add_child(httpr)
|
||||||
|
|
||||||
var error = httpr.request(_img_path, _req_headers)
|
var error = httpr.request("https://api.scryfall.com/bulk-data/unique-artwork", _req_headers)
|
||||||
if error != OK:
|
|
||||||
push_error(_cache_error("GET_REQUEST") + "An error occurred in the Scryfall request.")
|
|
||||||
var response = await httpr.request_completed
|
|
||||||
|
|
||||||
var img = Image.new()
|
|
||||||
error = img.load_png_from_buffer(response[3])
|
|
||||||
if error != OK:
|
|
||||||
push_error(_cache_error("IMG_LOADING") + "Couldn't load the image.")
|
|
||||||
|
|
||||||
img.save_png("user://card_cache/" + id + "/card.png")
|
|
||||||
img = null
|
|
||||||
|
|
||||||
|
|
||||||
func _do_http_id_request_card(id: String) -> void:
|
|
||||||
var httpr = HTTPRequest.new()
|
|
||||||
add_child(httpr)
|
|
||||||
var error = httpr.request("https://api.scryfall.com/cards/" + id, _req_headers)
|
|
||||||
if error != OK:
|
if error != OK:
|
||||||
push_error(_cache_error("GET_REQUEST") + "An error occurred in the Scryfall request.")
|
push_error(_cache_error("GET_REQUEST") + "An error occurred in the Scryfall request.")
|
||||||
|
return FAILED
|
||||||
|
|
||||||
var response = await httpr.request_completed
|
var response = await httpr.request_completed
|
||||||
|
|
||||||
if response[0] != HTTPRequest.RESULT_SUCCESS:
|
if response[0] != HTTPRequest.RESULT_SUCCESS:
|
||||||
push_error(_cache_error("GET_REQUEST") + "Failed to fetch card data from Scryfall")
|
push_error(_cache_error("GET_REQUEST") + "Failed to fetch card data from Scryfall")
|
||||||
return
|
return FAILED
|
||||||
|
|
||||||
var unprocessed_body = response[3].get_string_from_utf8()
|
var unprocessed_body = response[3].get_string_from_utf8()
|
||||||
var card_content = JSON.parse_string(unprocessed_body)
|
var card_content = JSON.parse_string(unprocessed_body)
|
||||||
if card_content == null:
|
if card_content == null:
|
||||||
push_error(_cache_error("PARSING") + "Failed to parse the Scryfall card results.")
|
push_error(_cache_error("PARSING") + "Failed to parse the Scryfall card results.")
|
||||||
|
return FAILED
|
||||||
|
|
||||||
var dir = DirAccess.open("user://")
|
error = httpr.request(card_content["download_uri"], _req_headers)
|
||||||
dir.make_dir_recursive("user://card_cache/" + id + "/") # lets ensure the path is there
|
if error != OK:
|
||||||
dir = null
|
push_error(_cache_error("GET_REQUEST") + "An error occurred in the Scryfall request.")
|
||||||
|
return FAILED
|
||||||
|
|
||||||
var card_cache = FileAccess.open("user://card_cache/" + id + "/card.json", FileAccess.WRITE)
|
response = await httpr.request_completed
|
||||||
card_cache.store_string(unprocessed_body) # cache the json response
|
if response[0] != HTTPRequest.RESULT_SUCCESS:
|
||||||
card_cache = null # closes the file
|
push_error(_cache_error("GET_REQUEST") + "Failed to fetch card data from Scryfall")
|
||||||
|
return FAILED
|
||||||
|
|
||||||
var image_uris = card_content["image_uris"]
|
unprocessed_body = response[3].get_string_from_utf8()
|
||||||
_img_path = image_uris["png"]
|
card_content = JSON.parse_string(unprocessed_body)
|
||||||
|
if card_content == null:
|
||||||
|
push_error(_cache_error("PARSING") + "Failed to parse the Scryfall card results.")
|
||||||
|
return FAILED
|
||||||
|
|
||||||
|
var data_cache = FileAccess.open("user://bulk.json", FileAccess.WRITE)
|
||||||
|
data_cache.store_string(unprocessed_body)
|
||||||
|
data_cache.close()
|
||||||
|
|
||||||
|
fetch_done.emit()
|
||||||
|
|
||||||
|
return OK
|
||||||
|
|
||||||
|
|
||||||
|
func _notification(what):
|
||||||
|
if what == NOTIFICATION_PREDELETE:
|
||||||
|
if !_all_downloads_done():
|
||||||
|
push_error(
|
||||||
|
"ERR::MEM::CACHE\nCache being deleted before all threads have finished processing!"
|
||||||
|
)
|
||||||
|
11
card.tscn
11
card.tscn
@ -1,11 +0,0 @@
|
|||||||
[gd_scene load_steps=2 format=3 uid="uid://cah3mvdnom1xg"]
|
|
||||||
|
|
||||||
[ext_resource type="Script" uid="uid://b3yqd1qu7dyq" path="res://card.gd" id="1_kikvd"]
|
|
||||||
|
|
||||||
[node name="Card" type="TextureRect"]
|
|
||||||
offset_left = 794.0
|
|
||||||
offset_top = 79.0
|
|
||||||
offset_right = 919.0
|
|
||||||
offset_bottom = 254.0
|
|
||||||
mouse_default_cursor_shape = 2
|
|
||||||
script = ExtResource("1_kikvd")
|
|
112
deck_input.gd
112
deck_input.gd
@ -4,105 +4,49 @@ var _caching = preload("res://caching.gd")
|
|||||||
|
|
||||||
var _decklist
|
var _decklist
|
||||||
|
|
||||||
var cards = "1 All That Glitters\n1 Ancestral Mask\n1 Angelic Destiny\n1 Arcane Signet\n1 Archon of Sun's Grace\n1 Austere Command\n1 Banishing Light\n1 Bear Umbra\n1 Blossoming Sands\n1 Canopy Vista\n1 Celestial Mantle\n1 Collective Resistance\n1 Command Tower\n1 Danitha Capashen, Paragon\n1 Danitha, New Benalia's Light\n1 Darksteel Mutation
|
var cards: String
|
||||||
1 Daybreak Coronet
|
|
||||||
1 Destiny Spinner
|
|
||||||
1 Eidolon of Blossoms
|
|
||||||
1 Eidolon of Countless Battles
|
|
||||||
1 Ellivere of the Wild Court
|
|
||||||
1 Enchantress's Presence
|
|
||||||
1 Envoy of the Ancestors
|
|
||||||
1 Ethereal Armor
|
|
||||||
1 Fertile Ground
|
|
||||||
13 Forest
|
|
||||||
1 Frantic Strength
|
|
||||||
1 Generous Gift
|
|
||||||
1 Gilded Lotus
|
|
||||||
1 Glittering Frost
|
|
||||||
1 Grasp of Fate
|
|
||||||
1 Gylwain, Casting Director
|
|
||||||
1 Hall of Heliod's Generosity
|
|
||||||
1 Heliod's Pilgrim
|
|
||||||
1 Hidden Grotto
|
|
||||||
1 Horrid Vigor
|
|
||||||
1 Idyllic Tutor
|
|
||||||
1 Jukai Naturalist
|
|
||||||
1 Kenrith's Transformation
|
|
||||||
1 Kor Spiritdancer
|
|
||||||
1 Krosan Verge
|
|
||||||
1 Light-Paws, Emperor's Voice
|
|
||||||
1 Luminous Broodmoth
|
|
||||||
1 Mantle of the Ancients
|
|
||||||
1 Overgrowth
|
|
||||||
1 Overprotect
|
|
||||||
1 Pacifism
|
|
||||||
14 Plains
|
|
||||||
1 Rancor
|
|
||||||
1 Retether
|
|
||||||
1 Rogue's Passage
|
|
||||||
1 Sage's Reverie
|
|
||||||
1 Sanctum Weaver
|
|
||||||
1 Selesnya Guildgate
|
|
||||||
1 Setessan Champion
|
|
||||||
1 Shalai, Voice of Plenty
|
|
||||||
1 Snake Umbra
|
|
||||||
1 Sol Ring
|
|
||||||
1 Solemnity
|
|
||||||
1 Songbirds' Blessing
|
|
||||||
1 Starfield Mystic
|
|
||||||
1 Swords to Plowshares
|
|
||||||
1 Tanglespan Lookout
|
|
||||||
1 Timber Paladin
|
|
||||||
1 Timely Ward
|
|
||||||
1 Tithe Taker
|
|
||||||
1 Transcendent Envoy
|
|
||||||
1 Twinblade Blessing
|
|
||||||
1 Umbra Mystic
|
|
||||||
1 Unfinished Business
|
|
||||||
1 Utopia Sprawl
|
|
||||||
1 Wild Growth
|
|
||||||
1 Winds of Rath
|
|
||||||
1 Yenna, Redtooth Regent
|
|
||||||
|
|
||||||
1 Sythis, Harvest's Hand"
|
|
||||||
|
|
||||||
signal done_fetching
|
func _init(_cards: String) -> void:
|
||||||
|
cards = _cards
|
||||||
func _init() -> void:
|
|
||||||
_decklist = Dictionary()
|
_decklist = Dictionary()
|
||||||
|
|
||||||
func convert_mtgo_to_http(decklist: String) -> Dictionary:
|
|
||||||
var links = {}
|
func _convert_mtgo_to_cache_lookup(decklist: String) -> Dictionary:
|
||||||
|
var _cards = {}
|
||||||
var lines = decklist.split("\n")
|
var lines = decklist.split("\n")
|
||||||
for line in lines:
|
for line in lines:
|
||||||
var words = line.split(" ", false, 1)
|
var words = line.split(" ", false, 1)
|
||||||
if words.size() != 2:
|
if words.size() != 2:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
words[1] = words[1].replace(" ", "+")
|
_cards[words[1]] = words[0]
|
||||||
links["https://api.scryfall.com/cards/named?exact=" + words[1]] = words[0]
|
return _cards
|
||||||
return links
|
|
||||||
|
|
||||||
func _do_decklist_grab(queries: Dictionary) -> void:
|
|
||||||
|
func _do_free(cache) -> void:
|
||||||
|
if !cache.has_emitted_all():
|
||||||
|
return
|
||||||
|
cache.queue_free()
|
||||||
|
|
||||||
|
|
||||||
|
func do_decklist_grab(decklist: String) -> void:
|
||||||
var cache = _caching.new()
|
var cache = _caching.new()
|
||||||
add_child(cache)
|
add_child(cache)
|
||||||
print("test")
|
|
||||||
for query in queries:
|
|
||||||
print("Test2")
|
|
||||||
var id = await cache.custom_query_fetch(query)
|
|
||||||
if id == "NONE":
|
|
||||||
continue
|
|
||||||
_decklist[id] = queries[query]
|
|
||||||
print("test3")
|
|
||||||
done_fetching.emit()
|
|
||||||
_show_decklist()
|
|
||||||
|
|
||||||
func _show_decklist():
|
var queries = _convert_mtgo_to_cache_lookup(decklist)
|
||||||
|
for query in queries:
|
||||||
|
var entry = cache.get_card_data_from_name(query)
|
||||||
|
_decklist[entry["id"]] = queries[query]
|
||||||
|
|
||||||
|
cache.fetch_done.connect(_do_free.bind(cache))
|
||||||
|
|
||||||
|
|
||||||
|
func _show_decklist() -> void:
|
||||||
for card in _decklist:
|
for card in _decklist:
|
||||||
print(card + " : " + _decklist[card])
|
print(card + " : " + _decklist[card])
|
||||||
|
|
||||||
|
|
||||||
func _ready() -> void:
|
func _ready() -> void:
|
||||||
var queries = convert_mtgo_to_http(cards)
|
do_decklist_grab(cards)
|
||||||
_do_decklist_grab(queries)
|
_show_decklist()
|
||||||
|
|
||||||
|
|
||||||
|
6
field.gd
6
field.gd
@ -3,7 +3,7 @@ extends TextureRect
|
|||||||
var _screen_size: Vector2
|
var _screen_size: Vector2
|
||||||
var _colors: Array[Color]
|
var _colors: Array[Color]
|
||||||
|
|
||||||
var _card_scene = preload("res://card.tscn")
|
var _card_class = preload("res://scenes/card/card.tscn")
|
||||||
|
|
||||||
|
|
||||||
# Called when the node enters the scene tree for the first time.
|
# Called when the node enters the scene tree for the first time.
|
||||||
@ -11,11 +11,11 @@ func _ready() -> void:
|
|||||||
# TODO: Calculate this field's scale and position based on which no# field this is.
|
# TODO: Calculate this field's scale and position based on which no# field this is.
|
||||||
_screen_size = get_viewport_rect().size
|
_screen_size = get_viewport_rect().size
|
||||||
|
|
||||||
var card = _card_scene.instantiate()
|
var card = _card_class.instantiate()
|
||||||
|
|
||||||
# TODO: Currently working with an already-cached card with a known ID to load this.
|
# TODO: Currently working with an already-cached card with a known ID to load this.
|
||||||
# Later on, the cards should be pulling the IDs directly from the library's list of IDs.
|
# Later on, the cards should be pulling the IDs directly from the library's list of IDs.
|
||||||
card.init("d3f10f07-7cfe-4a6f-8de6-373e367a731b")
|
card.init("d3f10f07-7cfe-4a6f-8de6-373e367a731b", _screen_size)
|
||||||
|
|
||||||
add_child(card)
|
add_child(card)
|
||||||
|
|
||||||
|
15
hand.gd
Normal file
15
hand.gd
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
extends StaticBody2D
|
||||||
|
|
||||||
|
var cards: Array[Node] = []
|
||||||
|
|
||||||
|
var _card_class = preload("res://scenes/card/card.tscn")
|
||||||
|
|
||||||
|
|
||||||
|
# Called when the node enters the scene tree for the first time.
|
||||||
|
func _ready() -> void:
|
||||||
|
pass # Replace with function body.
|
||||||
|
|
||||||
|
|
||||||
|
# Called every frame. 'delta' is the elapsed time since the previous frame.
|
||||||
|
func _process(delta: float) -> void:
|
||||||
|
pass
|
1
hand.gd.uid
Normal file
1
hand.gd.uid
Normal file
@ -0,0 +1 @@
|
|||||||
|
uid://dvu4gdhqjejeo
|
20
library.gd
20
library.gd
@ -3,7 +3,7 @@ extends Node2D
|
|||||||
var _card_class = preload("res://card.gd")
|
var _card_class = preload("res://card.gd")
|
||||||
|
|
||||||
# Library cards are represented as an array of card IDs.
|
# Library cards are represented as an array of card IDs.
|
||||||
var lib_cards: Array[String] = []
|
var lib_cards: Array[String]
|
||||||
var num_cards: int = 0
|
var num_cards: int = 0
|
||||||
|
|
||||||
|
|
||||||
@ -11,19 +11,13 @@ func _load_card_callback(card) -> void:
|
|||||||
card.load_card()
|
card.load_card()
|
||||||
|
|
||||||
|
|
||||||
func _init(card_ids: Array) -> void:
|
func _init(_decklist: Dictionary) -> void:
|
||||||
lib_cards = Array()
|
lib_cards = Array()
|
||||||
var temp_card
|
for card in _decklist:
|
||||||
for id in card_ids:
|
var _num = _decklist[card]
|
||||||
temp_card = _card_class.new()
|
num_cards += _num
|
||||||
temp_card.cache_done.connect(_load_card_callback.bind(temp_card))
|
for i in _num:
|
||||||
lib_cards.push_back(temp_card)
|
lib_cards.push_back(card)
|
||||||
num_cards += 1
|
|
||||||
|
|
||||||
|
|
||||||
func init(card_ids: Array[String]) -> void:
|
|
||||||
for id in card_ids:
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
func add_cards(cards: Array, top: bool) -> void:
|
func add_cards(cards: Array, top: bool) -> void:
|
||||||
|
30
player.gd
30
player.gd
@ -1,19 +1,39 @@
|
|||||||
extends Node2D
|
extends Node2D
|
||||||
|
|
||||||
# var _card_class = preload("res://card.gd")
|
var _card_class = preload("res://scenes/card/card.tscn")
|
||||||
|
|
||||||
var field_scene = preload("res://field.tscn")
|
var field_scene = preload("res://field.tscn")
|
||||||
var fields: Array[Node] = []
|
var fields: Array[Node] = []
|
||||||
|
|
||||||
|
var decks: Array[Dictionary]
|
||||||
|
|
||||||
|
|
||||||
|
func _load_decks():
|
||||||
|
if !FileAccess.file_exists("user://decks.json"):
|
||||||
|
return # no loaded decks
|
||||||
|
|
||||||
|
var file = FileAccess.open("user://decks.json", FileAccess.READ)
|
||||||
|
decks = JSON.parse_string(file.get_as_text())
|
||||||
|
file.close()
|
||||||
|
|
||||||
|
|
||||||
# Called when the node enters the scene tree for the first time.
|
# Called when the node enters the scene tree for the first time.
|
||||||
func _ready() -> void:
|
func _ready() -> void:
|
||||||
# The first field in the array will be the player's own field.
|
# The first field in the array will be the player's own field.
|
||||||
# Might be a better idea to have that in a seperate variable? idk
|
# Might be a better idea to have that in a seperate variable? idk
|
||||||
fields.append(field_scene.instantiate())
|
|
||||||
var colors: Array[Color] = [Color(1, 0, 1)]
|
var card = _card_class.instantiate()
|
||||||
fields[0].set_colors(colors)
|
|
||||||
add_child(fields[0])
|
# TODO: Currently working with an already-cached card with a known ID to load this.
|
||||||
|
# Later on, the cards should be pulling the IDs directly from the library's list of IDs.
|
||||||
|
card.init("d3f10f07-7cfe-4a6f-8de6-373e367a731b")
|
||||||
|
|
||||||
|
add_child(card)
|
||||||
|
|
||||||
|
#fields.append(field_scene.instantiate())
|
||||||
|
#var colors: Array[Color] = [Color(1, 0, 1)]
|
||||||
|
#fields[0].set_colors(colors)
|
||||||
|
#add_child(fields[0])
|
||||||
|
|
||||||
|
|
||||||
# Called every frame. 'delta' is the elapsed time since the previous frame.
|
# Called every frame. 'delta' is the elapsed time since the previous frame.
|
||||||
|
13
player.tscn
13
player.tscn
@ -1,12 +1,21 @@
|
|||||||
[gd_scene load_steps=3 format=3 uid="uid://cx0vga81xwckh"]
|
[gd_scene load_steps=5 format=3 uid="uid://cx0vga81xwckh"]
|
||||||
|
|
||||||
[ext_resource type="Script" uid="uid://w2rqm1u7p7im" path="res://player.gd" id="1_4flbx"]
|
[ext_resource type="Script" uid="uid://w2rqm1u7p7im" path="res://player.gd" id="1_4flbx"]
|
||||||
|
[ext_resource type="Script" uid="uid://dvu4gdhqjejeo" path="res://hand.gd" id="2_i3pqv"]
|
||||||
[ext_resource type="Script" uid="uid://bc51go8t8uvts" path="res://library.gd" id="2_onrkg"]
|
[ext_resource type="Script" uid="uid://bc51go8t8uvts" path="res://library.gd" id="2_onrkg"]
|
||||||
|
|
||||||
|
[sub_resource type="RectangleShape2D" id="RectangleShape2D_onrkg"]
|
||||||
|
size = Vector2(1920, 200)
|
||||||
|
|
||||||
[node name="Player" type="Node2D"]
|
[node name="Player" type="Node2D"]
|
||||||
script = ExtResource("1_4flbx")
|
script = ExtResource("1_4flbx")
|
||||||
|
|
||||||
[node name="Hand" type="Node2D" parent="."]
|
[node name="Hand" type="StaticBody2D" parent="."]
|
||||||
|
script = ExtResource("2_i3pqv")
|
||||||
|
|
||||||
|
[node name="CollisionArea" type="CollisionShape2D" parent="Hand"]
|
||||||
|
position = Vector2(960, 980)
|
||||||
|
shape = SubResource("RectangleShape2D_onrkg")
|
||||||
|
|
||||||
[node name="Library" type="Node2D" parent="."]
|
[node name="Library" type="Node2D" parent="."]
|
||||||
script = ExtResource("2_onrkg")
|
script = ExtResource("2_onrkg")
|
||||||
|
@ -24,3 +24,11 @@ window/size/mode=3
|
|||||||
[editor_plugins]
|
[editor_plugins]
|
||||||
|
|
||||||
enabled=PackedStringArray()
|
enabled=PackedStringArray()
|
||||||
|
|
||||||
|
[input]
|
||||||
|
|
||||||
|
MAIN={
|
||||||
|
"deadzone": 0.2,
|
||||||
|
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"key_label":0,"unicode":32,"location":0,"echo":false,"script":null)
|
||||||
|
]
|
||||||
|
}
|
||||||
|
@ -1,17 +1,75 @@
|
|||||||
extends TextureRect
|
extends Node2D
|
||||||
## The card class
|
## The card class
|
||||||
##
|
##
|
||||||
## Represents an instance of a card to be displayed on the tabletop.
|
## Represents an instance of a card to be displayed on the tabletop.
|
||||||
## Contains helper text for the text, the cards ID, and the image path.
|
## Contains helper text for the text, the cards ID, and the image path.
|
||||||
|
|
||||||
# TODO: Implement card utilities such as mana cost, land value, etc using api data.
|
# Card information.
|
||||||
const ManaCosts = preload("res://data/mana.gd")
|
|
||||||
|
|
||||||
var card_id: String
|
var card_id: String
|
||||||
var card_name: String
|
var card_name: String
|
||||||
var card_type: String
|
var card_type: String
|
||||||
var oracle_text: String
|
var oracle_text: String
|
||||||
|
|
||||||
|
# Card properties.
|
||||||
|
var tapped: bool
|
||||||
|
|
||||||
|
# Card input state.
|
||||||
|
var is_focused: bool # Is the card a focus?
|
||||||
|
var is_dragging: bool # Is the card currently being dragged?
|
||||||
|
|
||||||
|
var mouse_offset: Vector2
|
||||||
|
|
||||||
|
|
||||||
|
func _physics_process(delta: float) -> void:
|
||||||
|
if is_focused:
|
||||||
|
# TODO: Export handling keypresses to its own area.
|
||||||
|
if Input.is_action_just_pressed("MAIN"):
|
||||||
|
tapped = not tapped
|
||||||
|
$TweenController.tap(tapped, delta)
|
||||||
|
|
||||||
|
if is_dragging:
|
||||||
|
$TweenController.move_to(get_global_mouse_position() - mouse_offset, delta)
|
||||||
|
|
||||||
|
|
||||||
|
func _on_input_event(viewport: Node, event: InputEvent, shape_idx: int) -> void:
|
||||||
|
if event is not InputEventMouseButton:
|
||||||
|
return
|
||||||
|
|
||||||
|
match event.button_index:
|
||||||
|
# MOUSE BUTTONS
|
||||||
|
MOUSE_BUTTON_LEFT:
|
||||||
|
if event.pressed:
|
||||||
|
Input.set_default_cursor_shape(Input.CURSOR_DRAG)
|
||||||
|
mouse_offset = get_global_mouse_position() - global_position
|
||||||
|
is_dragging = true
|
||||||
|
else:
|
||||||
|
Input.set_default_cursor_shape(Input.CURSOR_POINTING_HAND)
|
||||||
|
is_dragging = false
|
||||||
|
MOUSE_BUTTON_RIGHT:
|
||||||
|
# TODO: Tooltip menu for right-button clicking on cards.
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
func _on_mouse_entered() -> void:
|
||||||
|
# Do not care about mouse entering if we're dragging the card.
|
||||||
|
if is_dragging:
|
||||||
|
return
|
||||||
|
|
||||||
|
Input.set_default_cursor_shape(Input.CURSOR_POINTING_HAND)
|
||||||
|
$TweenController.scale(1.05)
|
||||||
|
is_focused = true
|
||||||
|
|
||||||
|
|
||||||
|
func _on_mouse_exited() -> void:
|
||||||
|
# Do not care about mouse exiting if we're dragging the card.
|
||||||
|
if is_dragging:
|
||||||
|
return
|
||||||
|
|
||||||
|
Input.set_default_cursor_shape(Input.CURSOR_ARROW)
|
||||||
|
$TweenController.scale(1.0)
|
||||||
|
|
||||||
|
is_focused = false
|
||||||
|
|
||||||
|
|
||||||
func _card_error(error_type: String) -> String:
|
func _card_error(error_type: String) -> String:
|
||||||
return "ERROR::CARD::%s::%s::%s::\n" % [card_id, card_name, error_type]
|
return "ERROR::CARD::%s::%s::%s::\n" % [card_id, card_name, error_type]
|
||||||
@ -75,12 +133,12 @@ func _load_image() -> Error:
|
|||||||
push_error("%sCard on-board image failed to load correctly" % _card_error("IMAGE"))
|
push_error("%sCard on-board image failed to load correctly" % _card_error("IMAGE"))
|
||||||
return FAILED
|
return FAILED
|
||||||
|
|
||||||
# TODO: Get the size from the node or some constant variable.
|
var size = $Area2D/CollisionShape2D.shape.size
|
||||||
image.resize(int(size.x), int(size.y), Image.INTERPOLATE_LANCZOS)
|
image.resize(int(size.x), int(size.y), Image.INTERPOLATE_LANCZOS)
|
||||||
|
|
||||||
var image_texture = ImageTexture.new()
|
var image_texture = ImageTexture.new()
|
||||||
image_texture.set_image(image)
|
image_texture.set_image(image)
|
||||||
|
|
||||||
texture = image_texture
|
$Sprite2D.texture = image_texture
|
||||||
|
|
||||||
return OK
|
return OK
|
24
scenes/card/card.tscn
Normal file
24
scenes/card/card.tscn
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
[gd_scene load_steps=4 format=3 uid="uid://cah3mvdnom1xg"]
|
||||||
|
|
||||||
|
[ext_resource type="Script" uid="uid://b3yqd1qu7dyq" path="res://scenes/card/card.gd" id="1_kikvd"]
|
||||||
|
[ext_resource type="Script" uid="uid://bkk0pyypi1id7" path="res://scenes/card/tween.gd" id="2_imta7"]
|
||||||
|
|
||||||
|
[sub_resource type="RectangleShape2D" id="RectangleShape2D_kikvd"]
|
||||||
|
size = Vector2(125, 175)
|
||||||
|
|
||||||
|
[node name="Card" type="Node2D"]
|
||||||
|
script = ExtResource("1_kikvd")
|
||||||
|
|
||||||
|
[node name="Sprite2D" type="Sprite2D" parent="."]
|
||||||
|
|
||||||
|
[node name="Area2D" type="Area2D" parent="."]
|
||||||
|
|
||||||
|
[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"]
|
||||||
|
shape = SubResource("RectangleShape2D_kikvd")
|
||||||
|
|
||||||
|
[node name="TweenController" type="Node2D" parent="."]
|
||||||
|
script = ExtResource("2_imta7")
|
||||||
|
|
||||||
|
[connection signal="input_event" from="Area2D" to="." method="_on_input_event"]
|
||||||
|
[connection signal="mouse_entered" from="Area2D" to="." method="_on_mouse_entered"]
|
||||||
|
[connection signal="mouse_exited" from="Area2D" to="." method="_on_mouse_exited"]
|
0
scenes/card/input.gd
Normal file
0
scenes/card/input.gd
Normal file
1
scenes/card/input.gd.uid
Normal file
1
scenes/card/input.gd.uid
Normal file
@ -0,0 +1 @@
|
|||||||
|
uid://dhgk6fhw8oua0
|
22
scenes/card/tween.gd
Normal file
22
scenes/card/tween.gd
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
extends Node
|
||||||
|
|
||||||
|
@export var move_speed = 1.0
|
||||||
|
@export var tap_speed = 5.0
|
||||||
|
@export var scale_speed = 0.1
|
||||||
|
|
||||||
|
|
||||||
|
func move_to(location: Vector2, delta: float) -> void:
|
||||||
|
var tween = create_tween()
|
||||||
|
tween.tween_property(get_parent(), "position", location, delta * move_speed)
|
||||||
|
|
||||||
|
|
||||||
|
func tap(tapped: bool, delta: float) -> void:
|
||||||
|
var tween = create_tween()
|
||||||
|
var rotation = 90 if tapped else 0
|
||||||
|
tween.tween_property(get_parent(), "rotation_degrees", rotation, delta * tap_speed)
|
||||||
|
|
||||||
|
|
||||||
|
func scale(scalar: float) -> void:
|
||||||
|
var tween = create_tween()
|
||||||
|
var new_scale = Vector2.ONE * scalar
|
||||||
|
tween.tween_property(get_parent(), "scale", new_scale, scale_speed)
|
1
scenes/card/tween.gd.uid
Normal file
1
scenes/card/tween.gd.uid
Normal file
@ -0,0 +1 @@
|
|||||||
|
uid://bkk0pyypi1id7
|
17
tabletop.gd
17
tabletop.gd
@ -2,19 +2,32 @@ extends Node2D
|
|||||||
|
|
||||||
var player_class = preload("res://player.gd")
|
var player_class = preload("res://player.gd")
|
||||||
var deck_input = preload("res://deck_input.gd")
|
var deck_input = preload("res://deck_input.gd")
|
||||||
|
var _caching = preload("res://caching.gd")
|
||||||
|
|
||||||
|
var cards = "1 All That Glitters\n1 Ancestral Mask\n1 Angelic Destiny\n1 Arcane Signet\n1 Archon of Sun's Grace\n1 Austere Command\n1 Banishing Light\n1 Bear Umbra\n1 Blossoming Sands\n1 Canopy Vista\n1 Celestial Mantle\n1 Collective Resistance\n1 Command Tower\n1 Danitha Capashen, Paragon\n1 Danitha, New Benalia's Light\n1 Darksteel Mutation\n1 Daybreak Coronet\n1 Destiny Spinner\n1 Eidolon of Blossoms\n1 Eidolon of Countless Battles\n1 Ellivere of the Wild Court\n1 Enchantress's Presence\n1 Envoy of the Ancestors\n1 Ethereal Armor\n1 Fertile Ground\n13 Forest\n1 Frantic Strength\n1 Generous Gift\n1 Gilded Lotus\n1 Glittering Frost\n1 Grasp of Fate\n1 Gylwain, Casting Director\n1 Hall of Heliod's Generosity\n1 Heliod's Pilgrim\n1 Hidden Grotto\n1 Horrid Vigor\n1 Idyllic Tutor\n1 Jukai Naturalist\n1 Kenrith's Transformation\n1 Kor Spiritdancer\n1 Krosan Verge\n1 Light-Paws, Emperor's Voice\n1 Luminous Broodmoth\n1 Mantle of the Ancients\n1 Overgrowth\n1 Overprotect\n1 Pacifism\n14 Plains\n1 Rancor\n1 Retether\n1 Rogue's Passage\n1 Sage's Reverie\n1 Sanctum Weaver\n1 Selesnya Guildgate\n1 Setessan Champion\n1 Shalai, Voice of Plenty\n1 Snake Umbra\n1 Sol Ring\n1 Solemnity\n1 Songbirds' Blessing\n1 Starfield Mystic\n1 Swords to Plowshares\n1 Tanglespan Lookout\n1 Timber Paladin\n1 Timely Ward\n1 Tithe Takern1 Transcendent Envoy\n1 Twinblade Blessing\n1 Umbra Mystic\n1 Unfinished Business\n1 Utopia Sprawl\n1 Wild Growth\n1 Winds of Rath\n1 Yenna, Redtooth Regent\n1 Sythis, Harvest's Hand"
|
||||||
|
|
||||||
|
|
||||||
|
func _bulk_callback(cache) -> void:
|
||||||
|
cache.setup()
|
||||||
|
|
||||||
|
|
||||||
# Called when the node enters the scene tree for the first time.
|
# Called when the node enters the scene tree for the first time.
|
||||||
func _ready() -> void:
|
func _ready() -> void:
|
||||||
|
var cache = _caching.new()
|
||||||
|
add_child(cache)
|
||||||
|
|
||||||
|
if cache.setup() != OK:
|
||||||
|
cache.fetch_done.connect(_bulk_callback.bind(cache))
|
||||||
# TODO: Create 2-4 player instances as children of this tabletop node.
|
# TODO: Create 2-4 player instances as children of this tabletop node.
|
||||||
|
|
||||||
var player = player_class.new()
|
var player = player_class.new()
|
||||||
add_child(player)
|
add_child(player)
|
||||||
move_child(player, 0)
|
move_child(player, 0)
|
||||||
|
|
||||||
var deck = deck_input.new()
|
cache.get_card_data_from_name("1996 World Champion")
|
||||||
add_child(deck)
|
|
||||||
|
|
||||||
|
# var deck = deck_input.new(cards)
|
||||||
|
# add_child(deck)
|
||||||
|
|
||||||
pass # Replace with function body.
|
pass # Replace with function body.
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user