Skip to content
This repository was archived by the owner on Dec 13, 2024. It is now read-only.

Commit 1b5596b

Browse files
committed
Remove Rivet code
1 parent 72b0939 commit 1b5596b

File tree

3 files changed

+5
-75
lines changed

3 files changed

+5
-75
lines changed

Diff for: godot/bomber/Dockerfile

-16
This file was deleted.

Diff for: godot/bomber/rivet.yaml

-24
This file was deleted.

Diff for: godot/bomber/scripts/gamestate.gd

+5-35
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ signal game_error(what)
2626

2727

2828
func _ready():
29-
RivetHelper.start_server.connect(start_server)
30-
RivetHelper.setup_multiplayer()
31-
3229
multiplayer.peer_connected.connect(self._player_connected)
3330
multiplayer.peer_disconnected.connect(self._player_disconnected)
3431
multiplayer.connected_to_server.connect(self._connected_ok)
@@ -40,19 +37,10 @@ func start_server():
4037
print("Starting server on %s" % DEFAULT_PORT)
4138

4239
peer = ENetMultiplayerPeer.new()
43-
var error = peer.create_server(DEFAULT_PORT, MAX_PEERS)
44-
RivetHelper._assert(!error, "Could not start server")
40+
peer.create_server(DEFAULT_PORT, MAX_PEERS)
4541

4642
multiplayer.set_multiplayer_peer(peer)
4743

48-
var response = await Rivet.matchmaker.lobby.ready({})
49-
50-
if response.result == OK:
51-
RivetHelper.rivet_print("Lobby ready")
52-
else:
53-
RivetHelper.rivet_print("Lobby ready failed")
54-
OS.crash("Lobby ready failed")
55-
5644

5745
# Callback from SceneTree.
5846
func _player_connected(id):
@@ -125,25 +113,10 @@ func load_world():
125113
func join_game(new_player_name):
126114
print("Joining game as %s" % new_player_name)
127115
player_name = new_player_name
128-
129-
var response = await Rivet.matchmaker.lobby.find({
130-
"game_modes": ["default"]
131-
})
132-
133-
if response.result == OK:
134-
RivetHelper.set_player_token(response.body.player.token)
135-
136-
var port = response.body.ports.default
137-
print("Connecting to ", port.host)
138-
139-
peer = ENetMultiplayerPeer.new()
140-
var error = peer.create_client(port.hostname, port.port)
141-
RivetHelper._assert(!error, "Could not start server")
142-
143-
multiplayer.set_multiplayer_peer(peer)
144-
else:
145-
print("Lobby find failed: ", response)
146-
game_error.emit(response.body)
116+
117+
peer.create_client("127.0.0.1", DEFAULT_PORT)
118+
119+
multiplayer.set_multiplayer_peer(peer)
147120

148121

149122
func get_player_list():
@@ -160,9 +133,6 @@ func begin_game():
160133
if !multiplayer.is_server():
161134
return
162135

163-
# Tell Rivet that this lobby is closed
164-
await Rivet.matchmaker.lobby.setClosed({})
165-
166136
load_world.rpc()
167137

168138
var world = get_tree().get_root().get_node("World")

0 commit comments

Comments
 (0)