diff --git a/scenes/game/country.gd b/scenes/game/country.gd index 09472d8..a229de5 100644 --- a/scenes/game/country.gd +++ b/scenes/game/country.gd @@ -11,7 +11,7 @@ var stock_price = 1 var total_stocks = 0 var player_stocks = [0,0,0] var player_acceptance = [false, false, false] -var proposal = 0 +var proposal = 0 setget _set_proposal var tile_positions var armies = [] var boats = [] @@ -68,3 +68,7 @@ func process_proposal(): func _set_money(value): money = value emit_signal("state_changed") + +func _set_proposal(value): + proposal = value + emit_signal("state_changed") diff --git a/scenes/game/game.gd b/scenes/game/game.gd index 3db0c13..5f281ea 100644 --- a/scenes/game/game.gd +++ b/scenes/game/game.gd @@ -24,13 +24,11 @@ var mouse_click_mode = null var stocks_ui = [] -func _init(): +func _ready(): randomize() _setup_players() _setup_countries() _setup_turns() - -func _ready(): _setup_stock_ui() @@ -221,6 +219,9 @@ func _on_EndTurnButton_pressed(): $CanvasLayer/Control/ControllerLabel.visible = turn.layer == "country" $CanvasLayer/Control/VBoxContainer/TurnLabel.text = turn.object.name + "'s turn." + if turn.layer == "country": + if turn.object.get_controller_id() == -1: + _on_EndTurnButton_pressed() func _on_BuyFactory_pressed(): diff --git a/scenes/game/game_info_ui.gd b/scenes/game/game_info_ui.gd index e8ef7d4..d356828 100644 --- a/scenes/game/game_info_ui.gd +++ b/scenes/game/game_info_ui.gd @@ -3,6 +3,7 @@ extends GridContainer onready var game = owner as Game func _ready(): + yield(get_tree(),"idle_frame") for country in game.countries: country.connect("state_changed", self, "refresh") for player in game.players: