From c125d1b70a7aaadbb1071f3ed379f2392791ac3a Mon Sep 17 00:00:00 2001 From: Nathan Singer Date: Tue, 29 Apr 2025 07:04:15 -0400 Subject: [PATCH] fixes missing merge conflict --- scenes/tooltip/card_text.gd | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/scenes/tooltip/card_text.gd b/scenes/tooltip/card_text.gd index ae397fd..99fd6e4 100644 --- a/scenes/tooltip/card_text.gd +++ b/scenes/tooltip/card_text.gd @@ -19,25 +19,9 @@ func _set_tip_text(card_info: Dictionary, _card_image: Image) -> void: text = "[b]" + card_info["name"] + "[/b]\t" text += _convert_text_to_symbol(card_info["cost"]) + "\n" text += "[i]" + card_info["type"] + "[/i]\n" -<<<<<<< HEAD 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: text = ""