fixed issue #3

This commit is contained in:
2026-02-14 18:11:00 +11:00
parent 387c91e752
commit 89d1f5b4b7
3 changed files with 10 additions and 11 deletions

View File

@@ -13,14 +13,6 @@ func _ready() -> void:
button.hover_text = tr("PROMPT_RADIO_INTERACT")
func get_faction_cards(faction: Card.Faction) -> Array[Card]:
var valid_cards: Array[Card] = []
for card: Card in Data.cards:
if card.faction == faction:
valid_cards.append(card)
return valid_cards
func generate_rarity() -> int:
var weight_total: int = 0
for rarity: String in Data.Rarity:
@@ -43,7 +35,7 @@ func randomize_cards(faction: Card.Faction) -> void:
var pos_x: float = 0.0
for x: int in cards_to_spawn:
var decided_rarity: int = generate_rarity()
var card_choices: Array[Card] = get_faction_cards(faction)
var card_choices: Array[Card] = Card.get_faction_cards(faction)
var card_array: Array = []
var cards_chosen: bool = false
while !cards_chosen:
@@ -76,7 +68,7 @@ func find_cards(faction: Card.Faction, rarity: Data.Rarity, allowed_cards: Array
decided_rarity = generate_rarity()
var card_choices: Array[Card] = allowed_cards
if !card_choices:
card_choices = get_faction_cards(faction)
card_choices = Card.get_faction_cards(faction)
var cards: Array[Card] = []
var valid_cards_found: bool = false
var testing_rarity: int = decided_rarity