Puppyfruit-Games/Decked-Out-Defense
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fixed issue #3

Browse Source
This commit is contained in:
Lexi Quinn
2026-02-14 18:11:00 +11:00
parent 387c91e752
commit 89d1f5b4b7
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Scenes/CardPrinter/card_printer.gd
View File

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

7
Scripts/Resources/card.gd
View File

@@ -7,6 +7,13 @@ enum Faction {
MAGE = 2, MAGE = 2,
} }
static 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
@export var cost: int @export var cost: int
@export var rarity: Data.Rarity @export var rarity: Data.Rarity
@export var faction: Faction @export var faction: Faction

2
UI/Menus/MainMenu/main_menu.gd
View File

@@ -157,7 +157,7 @@ func level_selected(level: LevelConfig, side: int) -> void:
gamemode.rng_seed = generate_seed() if gamemode.endless else level.game_seed gamemode.rng_seed = generate_seed() if gamemode.endless else level.game_seed
gamemode.daily = false gamemode.daily = false
if gamemode.endless: if gamemode.endless:
level.allowed_cards = level.hero_class.deck level.allowed_cards = Card.get_faction_cards(level.hero_class.faction)
level.waves = [] level.waves = []
game.level_config = level game.level_config = level
if !gamemode.multiplayer: if !gamemode.multiplayer: