SuperNovaa41/untap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes merge conflicts

Browse Source
This commit is contained in:
Nathan Singer
2025-04-29 07:03:03 -04:00
parent 31175b4ecd 76a23aab5c
commit bd5b734d79
6 changed files with 49 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scenes/card/card.gd
View File

@ -68,5 +68,5 @@ func _on_mouse_exited() -> void:
Input.set_default_cursor_shape(Input.CURSOR_ARROW)
$TweenController.scale(1.0)
EventBus.emit_signal("card_on_unhover")

11
scenes/card/load.gd
View File

@ -37,7 +37,7 @@ func _load_data() -> Error:
if card_json == null:
push_error("%s\nCard json data is could not be parsed as valid json" % card.error("DATA"))
return FAILED
card.card_info["name"] = card_json["name"]
card.card_info["type"] = card_json["type_line"]
card.card_info["desc"] = card_json["oracle_text"]
@ -47,7 +47,9 @@ func _load_data() -> Error:
func _load_image() -> Error:
var cached_img = FileAccess.get_file_as_bytes("user://card_cache/" + card.card_info["id"] + "/card.png")
var cached_img = FileAccess.get_file_as_bytes(
"user://card_cache/" + card.card_info["id"] + "/card.png"
)
if cached_img.is_empty():
push_error("%sCard on-board image was not found in cache" % card.error("CACHE"))
@ -59,9 +61,9 @@ func _load_image() -> Error:
if image_status != OK:
push_error("%sCard on-board image failed to load correctly" % card.error("IMAGE"))
return FAILED
card.cached_image = cache_image
var image = Image.new()
image_status = image.load_png_from_buffer(cached_img)
@ -78,5 +80,4 @@ func _load_image() -> Error:
var card_sprite = card.get_node("Sprite2D")
card_sprite.texture = image_texture
return OK