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

fixes missing merge conflict

Browse Source
This commit is contained in:
Nathan Singer 2025-04-29 07:04:15 -04:00
parent bd5b734d79
commit c125d1b70a
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scenes/tooltip/card_text.gd
View File

@ -19,25 +19,9 @@ func _set_tip_text(card_info: Dictionary, _card_image: Image) -> void:
text = "[b]" + card_info["name"] + "[/b]\t" text = "[b]" + card_info["name"] + "[/b]\t"
text += _convert_text_to_symbol(card_info["cost"]) + "\n" text += _convert_text_to_symbol(card_info["cost"]) + "\n"
text += "[i]" + card_info["type"] + "[/i]\n" text += "[i]" + card_info["type"] + "[/i]\n"
<<<<<<< HEAD
text += _convert_text_to_symbol(card_info["desc"]) text += _convert_text_to_symbol(card_info["desc"])
=======
var oracle_text = card_info["desc"]
var last_idx = 0
for symbol in mana_symbols:
last_idx = 0
while oracle_text.find(symbol, last_idx) != -1:
oracle_text = oracle_text.replace(
symbol, '[img width="16" height="16"]' + mana_symbols[symbol] + "[/img]"
)
last_idx = oracle_text.find(symbol, last_idx) + symbol.length()
text += oracle_text
>>>>>>> 76a23aab5c62c7ff138d393c5f5fedd6cd6c7a46
func _clear_tip_text() -> void: func _clear_tip_text() -> void:
text = "" text = ""