@@ -35,7 +35,7 @@ WITH_WINDOWS=1
 
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
 project_path := $(dir $(mkfile_path))
-server_tag = $(REGISTRY)/simple-game-server:0.4
+server_tag = $(REGISTRY)/simple-game-server:0.5
 ifeq ($(WITH_WINDOWS), 1)
 server_tag_linux_amd64 = $(server_tag)-linux_amd64
 else
 
@@ -1,18 +1,51 @@
 # Simple Game Server
 
-A very simple logging server, for the purposes of demoing and testing
-running UDP and/or TCP based server on Agones.
+A very simple "toy" game server created to demo and test running a UDP and/or
+TCP game server on Agones.
 
-## Server
-Starts a server on port `7654` by default. Can be overwritten by `PORT` env var or `port` flag.
+To learn how to deploy your edited version of go server to gcp, please check
+out this link: [Edit Your First Game Server (Go)](https://agones.dev/site/docs/getting-started/edit-first-gameserver-go/),
+or also look at the [`Makefile`](./Makefile).
 
-By default listens on UDP. Set `UDP=FALSE` env var or `-udp=false` flag to turn UDP off.
+## Interacting with the Server
 
-To enable TCP, set `TCP=TRUE` env var or `-tcp` flag. Must have at least TCP or UDP enabled.
+When the server receives a text packet, it will send back "ACK:<text content>"
+for UDP as an echo or "ACK TCP:<text content>" for TCP.
 
-When it receives a text packet, it will send back "ACK:<text content>" for UDP as an echo or "ACK TCP:<text content>" for TCP. 
+There are some text commands you can send the server to affect its behavior:
 
-If it receives the text "EXIT", then it will `sys.Exit(0)`
+| Command             | Behavior                                                                                 |
+| ------------------- | ---------------------------------------------------------------------------------------- |
+| "EXIT"              | Causes the game server to exit cleanly calling `os.Exit(0)`                              |
+| "UNHEATHY"          | Stopping sending health checks                                                           |
+| "GAMESERVER"        | Sends back the game server name                                                          |
+| "READY"             | Marks the server as Ready                                                                |
+| "ALLOCATE"          | Allocates the game server                                                                |
+| "RESERVE"           | Reserves the game server after the specified duration                                    |
+| "WATCH"             | Instructs the game server to log changes to the resource                                 |
+| "LABEL"             | Sets the specified label on the game server resource                                     |
+| "CRASH"             | Causes the game server to exit / crash immediately                                       |
+| "ANNOTATION"        | Sets the specified annotation on the game server resource                                |
+| "PLAYER_CAPACITY"   | With one argument, gets the player capacity; with two arguments sets the player capacity |
+| "PLAYER_CONNECT"    | Connects the specified player to the game server                                         |
+| "PLAYER_DISCONNECT" | Disconnects the specified player from the game server                                    |
+| "PLAYER_CONNECTED"  | Returns true/false depending on whether the specified player is connected                |
+| "GET_PLAYERS"       | Returns a list of the connected players                                                  |
+| "PLAYER_COUNT"      | Returns a count of the connected players                                                 |
+
+
+## Configuration
+
+The server has a few configuration options that can be set via command line
+flags. Some can also be set using environment variables.
+
+| Flag                      | Environment Variable | Default |
+| ------------------------- | -------------------- | ------- |
+| port                      | PORT                 | 7654    |
+| passthrough               | PASSTHROUGH          | false   |
+| ready                     | READY                | true    |
+| automaticShutdownDelayMin | _n/a_                | 0       |
+| readyDelaySec             | _n/a_                | 0       |
+| udp                       | UDP                  | true    |
+| tcp                       | TCP                  | false   |
 
-To learn how to deploy your edited version of go server to gcp, please check out this link: [Edit Your First Game Server (Go)](https://agones.dev/site/docs/getting-started/edit-first-gameserver-go/),
-or also look at the [`Makefile`](./Makefile).
 
@@ -31,4 +31,4 @@ spec:
     spec:
       containers:
       - name: simple-game-server
-        image: gcr.io/agones-images/simple-game-server:0.4
+        image: gcr.io/agones-images/simple-game-server:0.5
@@ -32,7 +32,7 @@ spec:
         spec:
           containers:
           - name: simple-game-server
-            image: gcr.io/agones-images/simple-game-server:0.4
+            image: gcr.io/agones-images/simple-game-server:0.5
             resources:
               requests:
                 memory: "64Mi"
 
@@ -28,7 +28,7 @@ spec:
         spec:
           containers:
           - name: simple-game-server
-            image: gcr.io/agones-images/simple-game-server:0.4
+            image: gcr.io/agones-images/simple-game-server:0.5
             env:
             # Disables the UDP listener (Enabled by default)
             - name: "UDP"
 
@@ -27,7 +27,7 @@ spec:
         spec:
           containers:
           - name: simple-game-server
-            image: gcr.io/agones-images/simple-game-server:0.4
+            image: gcr.io/agones-images/simple-game-server:0.5
             resources:
               requests:
                 memory: "64Mi"
 
@@ -24,7 +24,7 @@ spec:
     spec:
       containers:
       - name: simple-game-server
-        image: gcr.io/agones-images/simple-game-server:0.4
+        image: gcr.io/agones-images/simple-game-server:0.5
         env:
           - name: "PASSTHROUGH"
             value: "TRUE"
 
@@ -25,7 +25,7 @@ spec:
     spec:
       containers:
       - name: simple-game-server
-        image: gcr.io/agones-images/simple-game-server:0.4
+        image: gcr.io/agones-images/simple-game-server:0.5
         resources:
           requests:
             memory: "64Mi"
 
@@ -25,7 +25,7 @@ spec:
     spec:
       containers:
       - name: simple-game-server
-        image: gcr.io/agones-images/simple-game-server:0.4
+        image: gcr.io/agones-images/simple-game-server:0.5
         resources:
           requests:
             memory: "64Mi"
 
@@ -40,6 +40,7 @@ func main() {
 	passthrough := flag.Bool("passthrough", false, "Get listening port from the SDK, rather than use the 'port' value")
 	readyOnStart := flag.Bool("ready", true, "Mark this GameServer as Ready on startup")
 	shutdownDelay := flag.Int("automaticShutdownDelayMin", 0, "If greater than zero, automatically shut down the server this many minutes after the server becomes allocated")
+	readyDelaySec := flag.Int("readyDelaySec", 0, "If greater than zero and readyOnStart is true, wait this many seconds before marking the game server as ready")
 	udp := flag.Bool("udp", true, "Server will listen on UDP")
 	tcp := flag.Bool("tcp", false, "Server will listen on TCP")
 
@@ -89,7 +90,19 @@ func main() {
 		port = &p
 	}
 
+	if *tcp {
+		go tcpListener(port, s, stop)
+	}
+
+	if *udp {
+		go udpListener(port, s, stop)
+	}
+
 	if *readyOnStart {
+		if *readyDelaySec > 0 {
+			log.Printf("Waiting %d seconds before moving to ready", *readyDelaySec)
+			time.Sleep(time.Duration(*readyDelaySec) * time.Second)
+		}
 		log.Print("Marking this server as ready")
 		ready(s)
 	}
@@ -98,15 +111,7 @@ func main() {
 		shutdownAfterAllocation(s, *shutdownDelay)
 	}
 
-	if *tcp {
-		go tcpListener(port, s, stop)
-	}
-
-	if *udp {
-		go udpListener(port, s, stop)
-	}
-
-	// prevents program from quitting as the server is listening on goroutines
+	// Prevent the program from quitting as the server is listening on goroutines.
 	for {}
 }