Browse Source

Updates to support Struct Updates

root 4 years ago
parent
commit
3f38e9c42f
5 changed files with 57 additions and 19 deletions
  1. 9 3
      !!!! ReadMe !!!!.txt
  2. 8 5
      CHANGELOG.txt
  3. 19 0
      LAUNCH EQ2EMU.bat
  4. BIN
      LAUNCH EQ2EMU.rar
  5. 21 11
      Options.bat

+ 9 - 3
!!!! ReadMe !!!!.txt

@@ -2,6 +2,7 @@ Included Software and Versions
 MariaDB(mysql) 	   -- 10.4.12 (https://downloads.mariadb.org/)
 Unrar         	   -- 5.90    (https://www.rarlab.com/)
 Wget(windows)	   -- 1.20.3  (https://eternallybored.org/misc/wget/)
+HeidiSql	   -- 11.0.0  (https://www.heidisql.com)
 Zeklabs.com EQ2emu -- Git Live (http://cutpon.com:3000/devn00b/EQ2EMu)
 
 The default password for MYSQL root user is blank (Localhost only).
@@ -10,14 +11,18 @@ The user/password for Login and Mysql is eq2emu/eq2emu.
 ** Please note that this version of the EQ2Emulator CAN NOT connect to the main EQ2EMu login server. This is due to our updated encryption method
 EQ2EMu currently uses MD5 (Weak) and we use SHA512 (Quite Strong). We are working to bring the main EQ2EMu project uptodate in this regard.**
 
+I have included HeidiSQL to the installer, you can use this to do any database edits required (such as GM powers and such).
+
 Configuration Options.
 
 	Server Update Options:
-	In file launch.bat you will find the following options (All Default 1): 
+	In file launch.bat you will find the following options (All Default 1 Except EXEUPDATE): 
 	SQLUPDATE  - Update the database (1 on 0 off). *** THIS WILL ERASE ALL CHARACTERS ***
 	EXEUPDATE  - Update the Loginserver/Worldserver to the most recent build (1 on 0 off).
         LUAUPDATE  - Update the LUA Scripts (1 on 0 off).
 	MAPUPDATE  - Update the 3d Maps/Navmesh (1 on 0 off).
+	SENDBUGS   - Sends bug reports (created in game with /bug) to zeklabs.com.
+	STRUCTCHK  - Check for updated structs. This is forced on with EXE updates enabled. (1 on 0 off)
 
 	Server Options:
 	In LoginServer.ini You can set your server name Worldname=<Your Server Name>. Default Login Server Username/Password is eq2emu/eq2emu.
@@ -34,5 +39,6 @@ Options File.
 	2) Update LUA.  (SAME AS LUAUPDATE=1
 	3) Update EXEs. (SAME AS EXEUPDATE=1)
 	4) Update MAPs. (SAME AS MAPUPDATE=1)
-	5) Update Startup Script. (This will update LAUNCH EQ2EMU.bat)
-	6) Full Rebuild (update DB/LUA/SQL/MAPS after delete. This will take a long time).
+	5) Update Structs. (SAME AS STRUCTCHK=1)
+	6) Update Startup Script. (This will update LAUNCH EQ2EMU.bat)
+	7) Full Rebuild (update DB/LUA/SQL/MAPS after delete. This will take a long time).

+ 8 - 5
CHANGELOG.txt

@@ -1,9 +1,12 @@
-V0.1 - Initial Creation. Basic functions.
+V0.1   - Initial Creation. Basic functions.
 
-V0.2 - Included more udpate options, cleaned up some unneeded code.
+V0.2   - Included more udpate options, cleaned up some unneeded code.
 
-V0.3 - Added Options.bat, permits cleaning/updating of the db.
+V0.3   - Added Options.bat, permits cleaning/updating of the db.
 
-V0.4 - Added Partial update of Database (all but guilds/character data). Made it so all windows close once done. Updated all files.
+V0.4   - Added Partial update of Database (all but guilds/character data). Made it so all windows close once done. Updated all files.
 
-V0.5 - Added option to send BUG reports from player server to me. Corrected HTTPS certificate issue (no longer checks if cert is valid).
+V0.5   - Added option to send BUG reports from player server to me. Corrected HTTPS certificate issue (no longer checks if cert is valid).
+
+V0.5.1 - Made EXE updates default to off. Since EXEs are hit and miss with stability sticking with stable EXEs unless you want the newest bells whistles, and possibly crashes.
+         Added option to update structs. Forced on with EXE check. Added option to options.bat to check/update struct files.

+ 19 - 0
LAUNCH EQ2EMU.bat

@@ -7,6 +7,7 @@ rem EXEUPDATE Will update, EXE files. 1 for on, anything else for off.
 rem LUAUPDATE Will update, LUA files. 1 for on, anything else for off.
 rem MAPUPDATE Will update, MAP files. 1 for on, anything else for off.
 rem SENDBUGS  Will send your bug reports to an offsite server to be reviewed by staff. 1 for on, anything else is off.
+rem STRUCTCHK Will check for new Structs. 1 for on 0 for off. If you have EXE updates enabled this will run automatically.
 
 SET NAME=Zeklabs.com
 TITLE %NAME%
@@ -15,6 +16,7 @@ SET EXEUPDATE=1
 SET LUAUPDATE=1
 SET MAPUPDATE=1
 SET SENDBUGS=1
+SET STRUCTCHK=1
 
 if /I "%SQLUPDATE%" EQU "1" powershell write-host -fore Red ******** SETTING SQLUPDATE = 1 WILL ERASE ALL DATA IN THE DATABASE use 2 TO SAVE CHARACTERS/GUILDS ************
 if /I "%SQLUPDATE%" EQU "1" echo [Checking for SQL Full Update and Downloading]
@@ -31,9 +33,26 @@ if /I "%EXEUPDATE%" EQU "1" echo [Checking for EXE Updates]
 if /I "%EXEUPDATE%" EQU "1" cd server
 if /I "%EXEUPDATE%" EQU "1" wget -q -nc http://cutpon.com:3000/devn00b/EQ2EMu/raw/master/server/EQ2Login__Debug64.exe
 if /I "%EXEUPDATE%" EQU "1" wget -q -nc http://cutpon.com:3000/devn00b/EQ2EMu/raw/master/server/EQ2World__Debug_x64.exe
+if /I "%EXEUPDATE%" EQU "1" echo [New EXE Could Mean NEW Structs. Checking...]
+if /I "%EXEUPDATE%" EQU "1" wget -q -nc http://cutpon.com:3000/devn00b/EQ2EMu/raw/master/server/SpawnStructs.xml
+if /I "%EXEUPDATE%" EQU "1" wget -q -nc http://cutpon.com:3000/devn00b/EQ2EMu/raw/master/server/WorldStructs.xml
+if /I "%EXEUPDATE%" EQU "1" wget -q -nc http://cutpon.com:3000/devn00b/EQ2EMu/raw/master/server/EQ2_Structs.xml
+if /I "%EXEUPDATE%" EQU "1" wget -q -nc http://cutpon.com:3000/devn00b/EQ2EMu/raw/master/server/ItemStructs.xml
+if /I "%EXEUPDATE%" EQU "1" wget -q -nc http://cutpon.com:3000/devn00b/EQ2EMu/raw/master/server/LoginStructs.xml
+if /I "%EXEUPDATE%" EQU "1" echo [Completed Struct Updates]
 if /I "%EXEUPDATE%" EQU "1" echo [Completed EXE Updates]
 if /I "%EXEUPDATE%" EQU "1" cd ..
 
+if /I "%STRUCTCHK%" EQU "1" echo [Checking for Struct Updates]
+if /I "%STRUCTCHK%" EQU "1" cd server
+if /I "%STRUCTCHK%" EQU "1" wget -q -nc http://cutpon.com:3000/devn00b/EQ2EMu/raw/master/server/SpawnStructs.xml
+if /I "%STRUCTCHK%" EQU "1" wget -q -nc http://cutpon.com:3000/devn00b/EQ2EMu/raw/master/server/WorldStructs.xml
+if /I "%STRUCTCHK%" EQU "1" wget -q -nc http://cutpon.com:3000/devn00b/EQ2EMu/raw/master/server/EQ2_Structs.xml
+if /I "%STRUCTCHK%" EQU "1" wget -q -nc http://cutpon.com:3000/devn00b/EQ2EMu/raw/master/server/ItemStructs.xml
+if /I "%STRUCTCHK%" EQU "1" wget -q -nc http://cutpon.com:3000/devn00b/EQ2EMu/raw/master/server/LoginStructs.xml
+if /I "%STRUCTCHK%" EQU "1" cd ..
+if /I "%STRUCTCHK%" EQU "1" echo [Competed Struct Updates]
+
 if /I "%LUAUPDATE%" EQU "1" echo [Checking for LUA Updates]
 if /I "%LUAUPDATE%" EQU "1" echo [This will take a moment due to number of files]
 if /I "%LUAUPDATE%" EQU "1" cd server

BIN
LAUNCH EQ2EMU.rar


+ 21 - 11
Options.bat

@@ -12,8 +12,9 @@ echo 1) Update SQL.
 echo 2) Update LUA.
 echo 3) Update EXEs.
 echo 4) Update MAPs.
-echo 5) Update Startup Script.
-echo 6) Full Rebuild (update DB/LUA/SQL/MAPS after delete. This will take a long time).
+echo 5) Update Structs.
+echo 6) Update Startup Script.
+echo 7) Full Rebuild (update DB/LUA/SQL/MAPS after delete. This will take a long time).
 
 echo x) Exit.
 
@@ -51,16 +52,25 @@ if /I "%OPTION%" EQU "4" del eq2emumaps.rar
 if /I "%OPTION%" EQU "4" echo [Completed MAP Updates]
 if /I "%OPTION%" EQU "4" cd ..\
 
-if /I "%OPTION%" EQU "5" echo [Updating Startup Script]
-if /I "%OPTION%" EQU "5" del /f /q "LAUNCH EQ2EMU.bat"
-if /I "%OPTION%" EQU "5" wget -q --no-check-certificate "https://zeklabs.com/dl/LAUNCH EQ2EMU.rar"
-if /I "%OPTION%" EQU "5" unrar x -y -inul"LAUNCH EQ2EMU.rar"
-if /I "%OPTION%" EQU "5" del /f /q "LAUNCH EQ2EMU.rar"
-if /I "%OPTION%" EQU "5" echo [Updated Startup Script]
+if /I "%OPTION%" EQU "5" echo [Checking for Struct Updates]
+if /I "%OPTION%" EQU "5" cd server
+if /I "%OPTION%" EQU "5" wget -q -nc http://cutpon.com:3000/devn00b/EQ2EMu/raw/master/server/SpawnStructs.xml
+if /I "%OPTION%" EQU "5" wget -q -nc http://cutpon.com:3000/devn00b/EQ2EMu/raw/master/server/WorldStructs.xml
+if /I "%OPTION%" EQU "5" wget -q -nc http://cutpon.com:3000/devn00b/EQ2EMu/raw/master/server/EQ2_Structs.xml
+if /I "%OPTION%" EQU "5" wget -q -nc http://cutpon.com:3000/devn00b/EQ2EMu/raw/master/server/ItemStructs.xml
+if /I "%OPTION%" EQU "5" wget -q -nc http://cutpon.com:3000/devn00b/EQ2EMu/raw/master/server/LoginStructs.xml
+if /I "%OPTION%" EQU "5" cd ..
 
-if /I "%OPTION%" EQU "6" echo [Starting the reset script]
-if /I "%OPTION%" EQU "6" cd options
-if /I "%OPTION%" EQU "6" start reset.bat
+if /I "%OPTION%" EQU "6" echo [Updating Startup Script]
+if /I "%OPTION%" EQU "6" del /f /q "LAUNCH EQ2EMU.bat"
+if /I "%OPTION%" EQU "6" wget -q --no-check-certificate "https://zeklabs.com/dl/LAUNCH EQ2EMU.rar"
+if /I "%OPTION%" EQU "6" unrar x -y -inul"LAUNCH EQ2EMU.rar"
+if /I "%OPTION%" EQU "6" del /f /q "LAUNCH EQ2EMU.rar"
+if /I "%OPTION%" EQU "6" echo [Updated Startup Script]
+
+if /I "%OPTION%" EQU "7" echo [Starting the reset script]
+if /I "%OPTION%" EQU "7" cd options
+if /I "%OPTION%" EQU "7" start reset.bat
 
 
 rem exit script