From d1d3069500a337ebbf439ec456ec5b8abc9f915c Mon Sep 17 00:00:00 2001
From: Daniel Ceregatti <Daniel.Ceregatti@PolicyMap.com>
Date: Thu, 21 Dec 2023 16:02:39 -0800
Subject: [PATCH] Add Diesel Jerry can mod.

---
 files/bin/xml.sh              | 4 ++--
 files/mods/3118784990/xml.env | 1 +
 files/mods/@DieselJerrycan    | 1 +
 files/serverDZ.cfg            | 2 +-
 server/bin/dz                 | 5 +++--
 web/bin/dz                    | 2 +-
 6 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 files/mods/3118784990/xml.env
 create mode 120000 files/mods/@DieselJerrycan

diff --git a/files/bin/xml.sh b/files/bin/xml.sh
index b7280fc..1a65394 100755
--- a/files/bin/xml.sh
+++ b/files/bin/xml.sh
@@ -15,7 +15,7 @@ fi
 source ${FILES}/mods/${ID}/xml.env
 
 # Iterate over the file names we can handle
-for i in cfgenvironment.xml cfgeventspawns.xml cfggameplay.json cfgspawnabletypes.xml cfgweather.xml events.xml init.c types.xml
+for i in cfgeventgroups.xml cfgenvironment.xml cfgeventspawns.xml cfggameplay.json cfgspawnabletypes.xml cfgweather.xml events.xml init.c types.xml
 do
 	FILE=$(echo ${i} | cut -d. -f1)
 	TYPE=$(echo ${i} | cut -d. -f2)
@@ -62,4 +62,4 @@ do
   fi
 done
 
-echo
\ No newline at end of file
+echo
diff --git a/files/mods/3118784990/xml.env b/files/mods/3118784990/xml.env
new file mode 100644
index 0000000..11d2334
--- /dev/null
+++ b/files/mods/3118784990/xml.env
@@ -0,0 +1 @@
+TYPES=./xml/dieseljerrycan_types.xml
diff --git a/files/mods/@DieselJerrycan b/files/mods/@DieselJerrycan
new file mode 120000
index 0000000..91d2e2c
--- /dev/null
+++ b/files/mods/@DieselJerrycan
@@ -0,0 +1 @@
+3118784990
\ No newline at end of file
diff --git a/files/serverDZ.cfg b/files/serverDZ.cfg
index 998f272..b803cdb 100644
--- a/files/serverDZ.cfg
+++ b/files/serverDZ.cfg
@@ -1,4 +1,4 @@
-hostname = "Something other than Server Name";   // Server name
+hostname = "Hype Train mod testing";   // Server name
 
 password = "";              // Password to connect to the server
 passwordAdmin = "";         // Password to become a server admin
diff --git a/server/bin/dz b/server/bin/dz
index c0f38e0..3e6fdab 100755
--- a/server/bin/dz
+++ b/server/bin/dz
@@ -140,6 +140,7 @@ mergexml(){
 	find /mpmissions/${MAP} \( \
 		-name "cfgeconomycore.xml" \
 		-o -name "cfgenvironment.xml" \
+		-o -name "cfgeventgroups.xml" \
 		-o -name "cfgeventspawns.xml" \
 		-o -name "cfggameplay.json" \
 		-o -name "cfgweather.xml" \
@@ -185,7 +186,7 @@ mergexml(){
 				-m /ce /economycore {} \;
 		fi
 		# These are merged directly into the upstream file
-		for i in "CFGEVENTSPAWNS:eventposdef:event" "CFGENVIRONMENT:env:territories/territory"
+		for i in "CFGEVENTGROUPS:eventgroupdef:group" "CFGEVENTSPAWNS:eventposdef:event" "CFGENVIRONMENT:env:territories/territory"
 		do
 			var=$(echo ${i} | cut -d: -f1)
 			CHECK=$(echo ${i} | cut -d: -f2)
@@ -268,7 +269,7 @@ mergexml(){
 		do
 			FOUND=0
 			C=""
-			for i in "CFGSPAWNABLETYPES:spawnabletypes:type" "EVENTS:events:event" "TYPES:types:type" "GLOBALS:globals:var"
+			for i in "CFGEVENTGROUPS:eventgroupdef:group" "CFGSPAWNABLETYPES:spawnabletypes:type" "EVENTS:events:event" "TYPES:types:type" "GLOBALS:globals:var"
 			do
 				var=$(echo ${i} | cut -d: -f1)
 				CHECK=$(echo ${i} | cut -d: -f2)
diff --git a/web/bin/dz b/web/bin/dz
index 2102711..4a39220 100755
--- a/web/bin/dz
+++ b/web/bin/dz
@@ -52,7 +52,7 @@ symlink(){
 installxml(){
   ID=${1}
   # Going to have to maintain a matrix of file names -> root node -> child node permutations
-  for i in "CFGEVENTSPAWNS:eventposdef:event" "CFGSPAWNABLETYPES:spawnabletypes:type" "EVENTS:events:event" "TYPES:types:type"
+  for i in "CFGEVENTGROUPS:eventgroupdef:group" "CFGEVENTSPAWNS:eventposdef:event" "CFGSPAWNABLETYPES:spawnabletypes:type" "EVENTS:events:event" "TYPES:types:type"
   do
     var=$(echo ${i} | cut -d: -f1)
     CHECK=$(echo ${i} | cut -d: -f2)