Skip to content

Commit

Permalink
#6 and #9 fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
guladam committed Jun 25, 2024
1 parent 8d9651a commit 9c0798f
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 3 deletions.
22 changes: 22 additions & 0 deletions custom_resources/card_pile.gd
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,28 @@ func clear() -> void:
card_pile_size_changed.emit(cards.size())


# We need this method because of a Godot issue
# reported here:
# https://github.com/godotengine/godot/issues/74918
func duplicate_cards() -> Array[Card]:
var new_array: Array[Card] = []

for card: Card in cards:
new_array.append(card.duplicate())

return new_array


# We need this method because of a Godot issue
# reported here:
# https://github.com/godotengine/godot/issues/74918
func custom_duplicate() -> CardPile:
var new_card_pile := CardPile.new()
new_card_pile.cards = duplicate_cards()

return new_card_pile


func _to_string() -> String:
var _card_strings: PackedStringArray = []
for i in range(cards.size()):
Expand Down
2 changes: 1 addition & 1 deletion scenes/battle_reward/battle_reward.gd
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func _show_card_rewards() -> void:
card_rewards.card_reward_selected.connect(_on_card_reward_taken)

var card_reward_array: Array[Card] = []
var available_cards: Array[Card] = character_stats.draftable_cards.cards.duplicate(true)
var available_cards: Array[Card] = character_stats.draftable_cards.duplicate_cards()

for i in run_stats.card_rewards:
_setup_card_chances()
Expand Down
2 changes: 1 addition & 1 deletion scenes/player/player_handler.gd
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func _ready() -> void:

func start_battle(char_stats: CharacterStats) -> void:
character = char_stats
character.draw_pile = character.deck.duplicate(true)
character.draw_pile = character.deck.custom_duplicate()
character.draw_pile.shuffle()
character.discard = CardPile.new()
relics.relics_activated.connect(_on_relics_activated)
Expand Down
2 changes: 1 addition & 1 deletion scenes/shop/shop.gd
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func _blink_timer_setup() -> void:

func _generate_shop_cards() -> void:
var shop_card_array: Array[Card] = []
var available_cards := char_stats.draftable_cards.cards.duplicate(true)
var available_cards: Array[Card] = char_stats.draftable_cards.duplicate_cards()
RNG.array_shuffle(available_cards)
shop_card_array = available_cards.slice(0, 3)

Expand Down

0 comments on commit 9c0798f

Please sign in to comment.