Merge 02f21db6d0 into 9da0bd1fbd

README.md

@@ -21,7 +21,7 @@ Wanna build your own level? Great! Here's how to do it:
 1. Run the game – the easiest way to do so is to run `godot scenes/main.tscn` from the project directory.
 1. Get a bit familiar with the levels which are currently there.
 1. Take a look into the `levels` directory. It's split into chapters, and each level is a file.
-1. Make a copy of an existing level or start writing your own. See the documention of the format below.
+1. Make a copy of an existing level or start writing your own. See the documentation of the format below.
 1. Write and test your level. If you're happy with it, feel free to send it to us in a pull request! <3
 
 ### Level format

levels/index/add

@@ -35,4 +35,4 @@ test "$(git show main^:c)" != "c"
 
 [congrats]
 
-Well done! Try tavelling between the commits using `git checkout`, so you can look at their contents again!
+Well done! Try travelling between the commits using `git checkout`, so you can look at their contents again!

levels/stash/stash-merge

@@ -39,7 +39,7 @@ git add recipe
 
 [win]
 
-# Did you resolve the confict and commit?
+# Did you resolve the conflict and commit?
 { git show HEAD | grep "Flour"; } && { git show HEAD | grep "Salt"; }
 
 # Did you clear stash stack?

scenes/game.gd

@@ -74,7 +74,7 @@ func shell_received(text):
 
 func _notification(what):
 	if what == MainLoop.NOTIFICATION_WM_QUIT_REQUEST:
-		#get_tree().quit() # default behavio
+		#get_tree().quit() # default behavior
 		get_tree().change_scene("res://scenes/survey.tscn")
 		
 

scenes/main.gd

@@ -20,7 +20,8 @@ var _hint_client_connection
 
 func _ready():
 	_hint_server = TCP_Server.new()
-	_hint_server.listen(1235)
+	_hint_server.listen(1235, "127.0.0.1")
+	OS.set_environment("HINT_TCP_PORT", "1235")
 	
 	var args = helpers.parse_args()
 	

scenes/shell.gd

@@ -109,7 +109,7 @@ func _shell_binary():
 #func run_async_thread(command):
 #	var port = 1000 + (randi() % 1000)
 #	var s = TCP_Server.new()
-#	s.listen(port)
+#	s.listen(port, "127.0.0.1")
 #	var _pid = OS.execute("ncat", ["127.0.0.1", str(port), "-c", command], false, [], true)
 #	while not s.is_connection_available():
 #		pass

scenes/tcp_server.gd

@@ -13,7 +13,7 @@ func _ready():
 	start()
 
 func start():
-	_s.listen(port)
+	_s.listen(port, "127.0.0.1")
 		
 func _process(_delta):
 	if _s.is_connection_available():

scenes/tcp_server_shell.gd

@@ -13,7 +13,7 @@ func _ready():
 	start()
 
 func start():
-	_s.listen(port)
+	_s.listen(port, "127.0.0.1")
 		
 func _process(_delta):
 	if _s.is_connection_available():

scenes/text_editor.gd

@@ -10,7 +10,7 @@ var _client_connection
 func _ready():
 	# Initialize TCP server for fake editor.
 	_server = TCP_Server.new()
-	_server.listen(1234)
+	_server.listen(1234, "127.0.0.1")
 	
 func _process(_delta):
 	if _server.is_connection_available():

scripts/hint

@@ -3,7 +3,7 @@
 use IO::Socket;
 
 $socket = IO::Socket::INET->new(PeerAddr => "127.0.0.1",
-                                PeerPort => 1235,
+                                PeerPort => $ENV{HINT_TCP_PORT},
                                 Proto    => "tcp",
                                 Type     => SOCK_STREAM);