From bc4310a70ad7a836aa7077d6be2fc64f9a3dc26e Mon Sep 17 00:00:00 2001
From: Jaysyn904 <68194417+Jaysyn904@users.noreply.github.com>
Date: Tue, 20 Feb 2024 14:01:32 -0500
Subject: [PATCH] Updated Project Q 3.1 merge files

Updated Project Q 3.1 merge file.
---
 ProjectQ/3.1/BuildTLK.bat                                 | 4 ++--
 .../{prc4_pq3_merge => prc4_pq31_merge}/baseitems.2da     | 0
 .../{prc4_pq3_merge => prc4_pq31_merge}/iprp_spells.2da   | 0
 .../{prc4_pq3_merge => prc4_pq31_merge}/phenotype.2da     | 0
 .../_hak/{prc4_pq3_merge => prc4_pq31_merge}/poison.2da   | 0
 .../_hak/{prc4_pq3_merge => prc4_pq31_merge}/spells.2da   | 0
 .../_hak/{prc4_pq3_merge => prc4_pq31_merge}/traps.2da    | 0
 .../vfx_persistent.2da                                    | 0
 .../{prc4_pq3_merge => prc4_pq31_merge}/visualeffects.2da | 0
 .../{prc8_pq3_merge => prc8_pq31_merge}/baseitems.2da     | 0
 .../damagehitvisual.2da                                   | 0
 .../iprp_onhitspell.2da                                   | 0
 .../{prc8_pq3_merge => prc8_pq31_merge}/iprp_spells.2da   | 0
 .../{prc8_pq3_merge => prc8_pq31_merge}/itemprops.2da     | 0
 .../{prc8_pq3_merge => prc8_pq31_merge}/phenotype.2da     | 0
 .../_hak/{prc8_pq3_merge => prc8_pq31_merge}/poison.2da   | 0
 .../_hak/{prc8_pq3_merge => prc8_pq31_merge}/spells.2da   | 0
 .../_hak/{prc8_pq3_merge => prc8_pq31_merge}/traps.2da    | 0
 .../vfx_persistent.2da                                    | 0
 .../{prc8_pq3_merge => prc8_pq31_merge}/visualeffects.2da | 0
 .../3.1/_tlk/{prc4_pq3_merge.xml => prc4_pq31_merge.xml}  | 0
 .../3.1/_tlk/{prc8_pq3_merge.xml => prc8_pq31_merge.xml}  | 0
 ProjectQ/3.1/_tools/hakbuilder.json                       | 8 ++++----
 23 files changed, 6 insertions(+), 6 deletions(-)
 rename ProjectQ/3.1/_hak/{prc4_pq3_merge => prc4_pq31_merge}/baseitems.2da (100%)
 rename ProjectQ/3.1/_hak/{prc4_pq3_merge => prc4_pq31_merge}/iprp_spells.2da (100%)
 rename ProjectQ/3.1/_hak/{prc4_pq3_merge => prc4_pq31_merge}/phenotype.2da (100%)
 rename ProjectQ/3.1/_hak/{prc4_pq3_merge => prc4_pq31_merge}/poison.2da (100%)
 rename ProjectQ/3.1/_hak/{prc4_pq3_merge => prc4_pq31_merge}/spells.2da (100%)
 rename ProjectQ/3.1/_hak/{prc4_pq3_merge => prc4_pq31_merge}/traps.2da (100%)
 rename ProjectQ/3.1/_hak/{prc4_pq3_merge => prc4_pq31_merge}/vfx_persistent.2da (100%)
 rename ProjectQ/3.1/_hak/{prc4_pq3_merge => prc4_pq31_merge}/visualeffects.2da (100%)
 rename ProjectQ/3.1/_hak/{prc8_pq3_merge => prc8_pq31_merge}/baseitems.2da (100%)
 rename ProjectQ/3.1/_hak/{prc8_pq3_merge => prc8_pq31_merge}/damagehitvisual.2da (100%)
 rename ProjectQ/3.1/_hak/{prc8_pq3_merge => prc8_pq31_merge}/iprp_onhitspell.2da (100%)
 rename ProjectQ/3.1/_hak/{prc8_pq3_merge => prc8_pq31_merge}/iprp_spells.2da (100%)
 rename ProjectQ/3.1/_hak/{prc8_pq3_merge => prc8_pq31_merge}/itemprops.2da (100%)
 rename ProjectQ/3.1/_hak/{prc8_pq3_merge => prc8_pq31_merge}/phenotype.2da (100%)
 rename ProjectQ/3.1/_hak/{prc8_pq3_merge => prc8_pq31_merge}/poison.2da (100%)
 rename ProjectQ/3.1/_hak/{prc8_pq3_merge => prc8_pq31_merge}/spells.2da (100%)
 rename ProjectQ/3.1/_hak/{prc8_pq3_merge => prc8_pq31_merge}/traps.2da (100%)
 rename ProjectQ/3.1/_hak/{prc8_pq3_merge => prc8_pq31_merge}/vfx_persistent.2da (100%)
 rename ProjectQ/3.1/_hak/{prc8_pq3_merge => prc8_pq31_merge}/visualeffects.2da (100%)
 rename ProjectQ/3.1/_tlk/{prc4_pq3_merge.xml => prc4_pq31_merge.xml} (100%)
 rename ProjectQ/3.1/_tlk/{prc8_pq3_merge.xml => prc8_pq31_merge.xml} (100%)

diff --git a/ProjectQ/3.1/BuildTLK.bat b/ProjectQ/3.1/BuildTLK.bat
index 82a0a09..af79f50 100644
--- a/ProjectQ/3.1/BuildTLK.bat
+++ b/ProjectQ/3.1/BuildTLK.bat
@@ -1,4 +1,4 @@
 pushd _tools\
-if exist ..\_tlk\prc4_pq3_merge.xml xml2tlk.exe ..\_tlk\prc4_pq3_merge.xml ..\output\prc4_pq3_merge.tlk
-if exist ..\_tlk\prc8_pq3_merge.xml xml2tlk.exe ..\_tlk\prc8_pq3_merge.xml ..\output\prc8_pq3_merge.tlk
+if exist ..\_tlk\prc4_pq31_merge.xml xml2tlk.exe ..\_tlk\prc4_pq31_merge.xml ..\output\prc4_pq31_merge.tlk
+if exist ..\_tlk\prc8_pq31_merge.xml xml2tlk.exe ..\_tlk\prc8_pq31_merge.xml ..\output\prc8_pq31_merge.tlk
 pause
diff --git a/ProjectQ/3.1/_hak/prc4_pq3_merge/baseitems.2da b/ProjectQ/3.1/_hak/prc4_pq31_merge/baseitems.2da
similarity index 100%
rename from ProjectQ/3.1/_hak/prc4_pq3_merge/baseitems.2da
rename to ProjectQ/3.1/_hak/prc4_pq31_merge/baseitems.2da
diff --git a/ProjectQ/3.1/_hak/prc4_pq3_merge/iprp_spells.2da b/ProjectQ/3.1/_hak/prc4_pq31_merge/iprp_spells.2da
similarity index 100%
rename from ProjectQ/3.1/_hak/prc4_pq3_merge/iprp_spells.2da
rename to ProjectQ/3.1/_hak/prc4_pq31_merge/iprp_spells.2da
diff --git a/ProjectQ/3.1/_hak/prc4_pq3_merge/phenotype.2da b/ProjectQ/3.1/_hak/prc4_pq31_merge/phenotype.2da
similarity index 100%
rename from ProjectQ/3.1/_hak/prc4_pq3_merge/phenotype.2da
rename to ProjectQ/3.1/_hak/prc4_pq31_merge/phenotype.2da
diff --git a/ProjectQ/3.1/_hak/prc4_pq3_merge/poison.2da b/ProjectQ/3.1/_hak/prc4_pq31_merge/poison.2da
similarity index 100%
rename from ProjectQ/3.1/_hak/prc4_pq3_merge/poison.2da
rename to ProjectQ/3.1/_hak/prc4_pq31_merge/poison.2da
diff --git a/ProjectQ/3.1/_hak/prc4_pq3_merge/spells.2da b/ProjectQ/3.1/_hak/prc4_pq31_merge/spells.2da
similarity index 100%
rename from ProjectQ/3.1/_hak/prc4_pq3_merge/spells.2da
rename to ProjectQ/3.1/_hak/prc4_pq31_merge/spells.2da
diff --git a/ProjectQ/3.1/_hak/prc4_pq3_merge/traps.2da b/ProjectQ/3.1/_hak/prc4_pq31_merge/traps.2da
similarity index 100%
rename from ProjectQ/3.1/_hak/prc4_pq3_merge/traps.2da
rename to ProjectQ/3.1/_hak/prc4_pq31_merge/traps.2da
diff --git a/ProjectQ/3.1/_hak/prc4_pq3_merge/vfx_persistent.2da b/ProjectQ/3.1/_hak/prc4_pq31_merge/vfx_persistent.2da
similarity index 100%
rename from ProjectQ/3.1/_hak/prc4_pq3_merge/vfx_persistent.2da
rename to ProjectQ/3.1/_hak/prc4_pq31_merge/vfx_persistent.2da
diff --git a/ProjectQ/3.1/_hak/prc4_pq3_merge/visualeffects.2da b/ProjectQ/3.1/_hak/prc4_pq31_merge/visualeffects.2da
similarity index 100%
rename from ProjectQ/3.1/_hak/prc4_pq3_merge/visualeffects.2da
rename to ProjectQ/3.1/_hak/prc4_pq31_merge/visualeffects.2da
diff --git a/ProjectQ/3.1/_hak/prc8_pq3_merge/baseitems.2da b/ProjectQ/3.1/_hak/prc8_pq31_merge/baseitems.2da
similarity index 100%
rename from ProjectQ/3.1/_hak/prc8_pq3_merge/baseitems.2da
rename to ProjectQ/3.1/_hak/prc8_pq31_merge/baseitems.2da
diff --git a/ProjectQ/3.1/_hak/prc8_pq3_merge/damagehitvisual.2da b/ProjectQ/3.1/_hak/prc8_pq31_merge/damagehitvisual.2da
similarity index 100%
rename from ProjectQ/3.1/_hak/prc8_pq3_merge/damagehitvisual.2da
rename to ProjectQ/3.1/_hak/prc8_pq31_merge/damagehitvisual.2da
diff --git a/ProjectQ/3.1/_hak/prc8_pq3_merge/iprp_onhitspell.2da b/ProjectQ/3.1/_hak/prc8_pq31_merge/iprp_onhitspell.2da
similarity index 100%
rename from ProjectQ/3.1/_hak/prc8_pq3_merge/iprp_onhitspell.2da
rename to ProjectQ/3.1/_hak/prc8_pq31_merge/iprp_onhitspell.2da
diff --git a/ProjectQ/3.1/_hak/prc8_pq3_merge/iprp_spells.2da b/ProjectQ/3.1/_hak/prc8_pq31_merge/iprp_spells.2da
similarity index 100%
rename from ProjectQ/3.1/_hak/prc8_pq3_merge/iprp_spells.2da
rename to ProjectQ/3.1/_hak/prc8_pq31_merge/iprp_spells.2da
diff --git a/ProjectQ/3.1/_hak/prc8_pq3_merge/itemprops.2da b/ProjectQ/3.1/_hak/prc8_pq31_merge/itemprops.2da
similarity index 100%
rename from ProjectQ/3.1/_hak/prc8_pq3_merge/itemprops.2da
rename to ProjectQ/3.1/_hak/prc8_pq31_merge/itemprops.2da
diff --git a/ProjectQ/3.1/_hak/prc8_pq3_merge/phenotype.2da b/ProjectQ/3.1/_hak/prc8_pq31_merge/phenotype.2da
similarity index 100%
rename from ProjectQ/3.1/_hak/prc8_pq3_merge/phenotype.2da
rename to ProjectQ/3.1/_hak/prc8_pq31_merge/phenotype.2da
diff --git a/ProjectQ/3.1/_hak/prc8_pq3_merge/poison.2da b/ProjectQ/3.1/_hak/prc8_pq31_merge/poison.2da
similarity index 100%
rename from ProjectQ/3.1/_hak/prc8_pq3_merge/poison.2da
rename to ProjectQ/3.1/_hak/prc8_pq31_merge/poison.2da
diff --git a/ProjectQ/3.1/_hak/prc8_pq3_merge/spells.2da b/ProjectQ/3.1/_hak/prc8_pq31_merge/spells.2da
similarity index 100%
rename from ProjectQ/3.1/_hak/prc8_pq3_merge/spells.2da
rename to ProjectQ/3.1/_hak/prc8_pq31_merge/spells.2da
diff --git a/ProjectQ/3.1/_hak/prc8_pq3_merge/traps.2da b/ProjectQ/3.1/_hak/prc8_pq31_merge/traps.2da
similarity index 100%
rename from ProjectQ/3.1/_hak/prc8_pq3_merge/traps.2da
rename to ProjectQ/3.1/_hak/prc8_pq31_merge/traps.2da
diff --git a/ProjectQ/3.1/_hak/prc8_pq3_merge/vfx_persistent.2da b/ProjectQ/3.1/_hak/prc8_pq31_merge/vfx_persistent.2da
similarity index 100%
rename from ProjectQ/3.1/_hak/prc8_pq3_merge/vfx_persistent.2da
rename to ProjectQ/3.1/_hak/prc8_pq31_merge/vfx_persistent.2da
diff --git a/ProjectQ/3.1/_hak/prc8_pq3_merge/visualeffects.2da b/ProjectQ/3.1/_hak/prc8_pq31_merge/visualeffects.2da
similarity index 100%
rename from ProjectQ/3.1/_hak/prc8_pq3_merge/visualeffects.2da
rename to ProjectQ/3.1/_hak/prc8_pq31_merge/visualeffects.2da
diff --git a/ProjectQ/3.1/_tlk/prc4_pq3_merge.xml b/ProjectQ/3.1/_tlk/prc4_pq31_merge.xml
similarity index 100%
rename from ProjectQ/3.1/_tlk/prc4_pq3_merge.xml
rename to ProjectQ/3.1/_tlk/prc4_pq31_merge.xml
diff --git a/ProjectQ/3.1/_tlk/prc8_pq3_merge.xml b/ProjectQ/3.1/_tlk/prc8_pq31_merge.xml
similarity index 100%
rename from ProjectQ/3.1/_tlk/prc8_pq3_merge.xml
rename to ProjectQ/3.1/_tlk/prc8_pq31_merge.xml
diff --git a/ProjectQ/3.1/_tools/hakbuilder.json b/ProjectQ/3.1/_tools/hakbuilder.json
index bb98836..3031fd7 100644
--- a/ProjectQ/3.1/_tools/hakbuilder.json
+++ b/ProjectQ/3.1/_tools/hakbuilder.json
@@ -2,13 +2,13 @@
   "OutputPath": "../output/",
   "HakList": [
     {
-      "Name":  "prc4_pq3_merge",
-      "Path": "../_hak/prc4_pq3_merge/",
+      "Name":  "prc4_pq31_merge",
+      "Path": "../_hak/prc4_pq31_merge/",
       "CompileModels": false
     },
     {
-      "Name":  "prc8_pq3_merge",
-      "Path": "../_hak/prc8_pq3_merge/",
+      "Name":  "prc8_pq31_merge",
+      "Path": "../_hak/prc8_pq31_merge/",
       "CompileModels": false
     },	
    ]