Introduce mikeyh lobby modifications

- Modification available from here :
  https://forums.uberent.com/threads/wip-dedicated-servers.65077/page-6#post-1124347
- The updates are introduced using patch mechanism.

Dockerfile

@@ -11,17 +11,20 @@ apt-get install -y nodejs && \
 apt-get install -y wget && \
 apt-get install -y vim && \
 apt-get install -y unzip && \
+apt-get install -y patch && \
 apt-get install -y libgl1-mesa-glx
-RUN useradd -k /etc/skel -m pa 
+RUN useradd -k /etc/skel -m pa
 COPY auth_papatcher.sh /home/pa/auth_papatcher.sh
 COPY NodePAMaster_conf.json /home/pa/NodePAMaster_conf.json
 COPY update_conf_file.sh /home/pa/update_conf_file.sh
 COPY runServer.sh /home/pa/runServer.sh
+COPY mikeyh_lobby.patch /home/pa/mikeyh_lobby.patch
 COPY *.sed /home/pa/
 RUN chown pa:pa /home/pa/auth_papatcher.sh && \
 chown pa:pa /home/pa/update_conf_file.sh && \
 chown pa:pa /home/pa/runServer.sh && \
 chown pa:pa /home/pa/NodePAMaster_conf.json && \
+chown pa:pa /home/pa/mikeyh_lobby.patch && \
 chown pa:pa /home/pa/*.sed
 USER pa
 WORKDIR /home/pa

buildImage.sh

@@ -56,7 +56,8 @@ sed -i "/listonpastats/ s/true/$serverlistonpastats/" NodePAMaster_conf.json
 
 
 if [ "$1" == "nobuild" ]; then exit 0;fi
-sudo docker build --rm=true -t "uggla/paserver" .
+if [ "$1" == "debug" ]; then REMOVE_INTERMEDIATE_IMG=false;else REMOVE_INTERMEDIATE_IMG=true;fi
+sudo docker build --rm=$REMOVE_INTERMEDIATE_IMG -t "uggla/paserver" .
 paversion=$(sudo docker run -ti --rm --entrypoint="/bin/cat" uggla/paserver:latest .local/Uber\ Entertainment/Planetary\ Annihilation/stable/version.txt | sed 's/\s//g')
 echo "Tag image with version : $paversion"
 sudo docker tag uggla/paserver:latest uggla/paserver:$paversion

update_conf_file.sh

@@ -2,5 +2,12 @@
 
 # Update configuration files
 
+# Introduce modification from mikeyh : https://forums.uberent.com/threads/wip-dedicated-servers.65077/page-6#post-1124347
+cd ./.local/Uber\ Entertainment/Planetary\ Annihilation/stable/media/server-script && patch -p1 < /home/pa/mikeyh_lobby.patch
+cd /home/pa
+# Update lobby to add beacon
 sed -i.bkp -f update_lobby.js.sed ./.local/Uber\ Entertainment/Planetary\ Annihilation/stable/media/server-script/states/lobby.js
+# Update MAX_PLAYERS and MAX_SPECTATORS parameters
+sed -i.bkp -f update_main.js.sed ./.local/Uber\ Entertainment/Planetary\ Annihilation/stable/media/server-script/main.js
+# Update MAX_PLANETS parameters
 sed -i.bkp -f update_sim_utils.js.sed ./.local/Uber\ Entertainment/Planetary\ Annihilation/stable/media/server-script/sim_utils.js

update_lobby.js.sed

@@ -5,7 +5,3 @@
 /^var getAIName/ i }
 /^var getAIName/ i }, 5000);
 /^var getAIName/ i \
-
-# Update parameters
-s/var MAX_PLAYERS = [0-9]\+/var MAX_PLAYERS = 16/
-s/var MAX_SPECTATORS = [0-9]\+/var MAX_SPECTATORS = 5/

update_main.js.sed

@@ -0,0 +1,3 @@
+# Update parameters
+s/exports\.MAX_PLAYERS = [0-9]\+/exports.MAX_PLAYERS = 16/
+s/exports\.MAX_SPECTATORS = [0-9]\+/exports.MAX_SPECTATORS = 5/