A team game with an emphasis on movement (with no shooting), inspired by Overwatch and Zineth
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

99 lines
3.0 KiB

[WIP] Split up lobby -> menu, lobby, custom_game lobby.gd had gotten big, bloated, ugly, and hard to read. It needed a refactor. The first thing I did is split up the *GUI* into the logical steps it should be. So the new flow is: - Start the game - Click "Quick Play" - Matchmaking begins on my dedicated server - Start the game - Click "Custom Game" - *Only now* am I presented with server / client options - Start the game - Click "Singleplayer" - Singleplayer NOW, and only now, and NO MATTER WHAT PATH I TAKE, I am taken to the *lobby*, which now is where I: - Choose my name - Choose hero - See list of players - Get my team assigned - Anything else that I might like to put in The point here is that this has *nothing* to do with handshaking / matchmaking / etc! This is just part of the game! At this point I have *already been connected* to the server. I've already been aquainted with my other players. The game has begun. I put the things that don't belong in any of these flows in networking.gd, a sort of model-view sorta thing. All of these flows use some sort of networking thing like `init_server` that tbh should be *completely* abstracted from the UI. It's totally a WIP!!! Above is the IDEA, but below is what I've actually *done*: - Made the scenes, made a passable UI for each one that at least indicates ~what they'll do - Made the corresponding scripts, and split up the lobby script into ABOUT where I think it'll end up, but no promises It still errors all over the place, and it's nowhere near properly organized. PLUS, I'd also like to rewrite a lot of the code / rename things as part of the initial refactor goal of making me able to actually think about networking.
7 years ago
  1. extends Control
  2. var port = null # Defined by command-line argument with default
  3. onready var hero_select = get_node("HeroSelect/Hero")
  4. onready var level_select = get_node("LevelSelect")
  5. onready var start_game_button = get_node("StartGame")
  6. onready var ready_button = get_node("Ready")
  7. func _ready():
  8. get_node("Username").connect("text_changed", self, "_send_name")
  9. var spectating = util.args.get_value("-silent")
  10. get_node("Spectating").pressed = spectating
  11. get_node("Spectating").connect("toggled", self, "_set_info_callback", ["spectating"])
  12. ready_button.connect("toggled", self, "_set_info_callback", ["ready"])
  13. start_game_button.connect("pressed", networking, "start_game")
  14. # Shown, maybe, in _check_begun
  15. start_game_button.hide()
  16. if get_tree().is_network_server():
  17. start_game_button.show()
  18. if get_tree().is_network_server():
  19. # We put level in our players dict because it's automatically broadcast to other players
  20. var level = util.args.get_value("-level")
  21. if level == "r":
  22. level = randi() % level_select.get_item_count()
  23. level = int(level)
  24. _set_level(level)
  25. level_select.show()
  26. level_select.select(level)
  27. level_select.connect("item_selected", self, "_set_level")
  28. else:
  29. level_select.hide()
  30. networking.connect("info_updated", self, "render_player_list")
  31. get_tree().connect("connected_to_server", self, "_connected")
  32. if get_tree().is_network_server():
  33. _connected()
  34. func _connected():
  35. _send_name()
  36. if util.args.get_value("-hero") == "r":
  37. hero_select.random_hero()
  38. else:
  39. print(util.args.get_value("-hero"))
  40. hero_select.set_hero(int(util.args.get_value("-hero")))
  41. if util.args.get_value("-start-game"):
  42. networking.start_game()
  43. func _set_level(level):
  44. networking.level = level
  45. # Because of the annoying way callbacks work (automatic parameter, optional parameter)
  46. # We need a utility function for making these kinds of callbacks for set_info
  47. func _set_info_callback(value, key):
  48. networking.set_info(key, value)
  49. sync func set_hero(peer, hero):
  50. networking.players[peer].hero = hero
  51. render_player_list()
  52. func _send_name():
  53. var name = get_node("Username").text
  54. networking.set_info("username", name)
  55. func _check_begun():
  56. var game_started = networking.players[1].begun
  57. if game_started:
  58. start_game_button.show()
  59. # The "Ready" toggle doesn't really make sense on a started game
  60. ready_button.hide()
  61. func render_player_list():
  62. _check_begun()
  63. var list = ""
  64. var hero_names = hero_select.hero_names
  65. for p in networking.players:
  66. var player = networking.players[p]
  67. # A spectating server is just a dedicated server, ignore it
  68. if not (player.spectating and p == 1):
  69. list += "%-15s " % player.username
  70. list += "%-10s " % hero_names[player.hero]
  71. var team_format = "%-11s"
  72. if player.is_right_team:
  73. list += team_format % "Right Team"
  74. else:
  75. list += team_format % "Left Team"
  76. var ready_text = "Ready" if player.ready else ""
  77. list += "%-6s" % ready_text
  78. if player.spectating:
  79. list += "Spectating"
  80. list += "\n"
  81. get_node("PlayerList").set_text(list)