From 111b39c5c3b844d3dfc5e478418c3bfb9244783b Mon Sep 17 00:00:00 2001 From: betalars Date: Wed, 19 Jul 2023 22:44:07 +0200 Subject: [PATCH] card picker is always picking void card --- src/logic-scenes/card_picker/card_picker.gd | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/logic-scenes/card_picker/card_picker.gd b/src/logic-scenes/card_picker/card_picker.gd index 00216d7..b17e170 100644 --- a/src/logic-scenes/card_picker/card_picker.gd +++ b/src/logic-scenes/card_picker/card_picker.gd @@ -125,13 +125,19 @@ func pick(id: int): options.remove_at(id) anim_players.remove_at(id) - randomize() - var winning_id = randi() % options.size() - - print("Winning ID ", id) - - if winning_id == sibling_id: - winning_id = (winning_id + 1) % options.size() + var winning_id + if options[1].text == "" and not id == 1: + randomize() + winning_id = randi() % options.size() + + print("Winning ID ", id) + + if winning_id == sibling_id: + winning_id = (winning_id + 1) % options.size() + elif options[0].text == "": + winning_id = 0 + else: + winning_id = 1 output.append(options.pop_at(winning_id)) anim_players.pop_at(winning_id).play("shuffle") @@ -176,6 +182,7 @@ func handle_mouse_button(new_selection: Node, button_event: InputEventMouseButto func scene_finished(id: int, repeat): print(name, id, repeat) if not repeat: + Input.mouse_mode = Input.MOUSE_MODE_VISIBLE fill_card_slots(id) State.transition_stage_to(self) selection_state = CARDS