Merge remote-tracking branch 'upstream/develop' into onEvent-Fixes

.github/workflows/UOX3Build.yml

@@ -0,0 +1,53 @@
+name: UOX3 Build
+
+on:
+  push:
+
+    paths-ignore:
+      - '**.js'
+      - '**.dfn'
+      - '**.scp'
+      - '**.txt'
+      - '**.md'
+      - '**.html'
+      - '**.sln'
+      - '**.vcxproj'
+      - '**.xcodeproj'
+
+  pull_request:
+    paths-ignore:
+      - '**.js'
+      - '**.dfn'
+      - '**.scp'
+      - '**.txt'
+      - '**.md'
+      - '**.html'
+      - '**.sln'
+      - '**.vcxproj'
+      - '**.xcodeproj'
+
+env:
+  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
+  BUILD_TYPE: Release
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+    # You can convert this to a matrix build if you need cross-platform coverage.
+    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Configure CMake
+      # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
+      # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
+      run: cmake make/cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} 
+
+    - name: Build
+      # Build your program with the given configuration
+      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+
+

README.md

@@ -7,9 +7,9 @@
 
 **Ultima Offline eXperiment 3** - the original open source Ultima Online server emulator, allowing people to run their own, custom UO shards since 1997. Comes with cross-platform 64-bit support for **Windows**, **Linux**, **macOS**, and **FreeBSD**. News, releases, forums, additional documentation and more can be found at https://www.uox3.org
 
-Supported UO Client versions: **~4.0.0p** to at least **~7.0.97.25** (with encryption removed by [ClassicUO](https://www.classicuo.eu), [Razor](https://github.com/msturgill/razor/releases) or similar tools). For additional details on UO client compatibility, check https://www.uox3.org/forums/viewtopic.php?f=1&t=2289
+Supported UO Client versions: **~4.0.0p** to at least **~7.0.98.1** (with encryption removed by [ClassicUO](https://www.classicuo.eu), [Razor](https://github.com/msturgill/razor/releases) or similar tools). For additional details on UO client compatibility, check https://www.uox3.org/forums/viewtopic.php?f=1&t=2289
 
-UOX3 relies on **SpiderMonkey v1.7.0** for its JS-based scripting engine, and on **zlib-1.2.11** for data compression matters, and comes bundled with specific, compatible versions of these.
+UOX3 relies on **SpiderMonkey v1.8.0-RC1** for its JS-based scripting engine, and on **zlib-1.2.11** for data compression matters, and comes bundled with specific, compatible versions of these.
 
 Join the [UOX3 Discord](https://discord.gg/uBAXxhF) for support and/or a quick chat!
 
@@ -40,7 +40,7 @@ Join the [UOX3 Discord](https://discord.gg/uBAXxhF) for support and/or a quick c
 ---
 
 ## Step 2: Clone the UOX3 Git Repository
-*Next up, clone the UOX3 git repository, which also includes the latest verified compatible version of SpiderMonkey (v1.7.0) and a minimal set of files required to compile zlib-1.2.11.*
+*Next up, clone the UOX3 git repository, which also includes the latest verified compatible version of SpiderMonkey (v1.8.0-RC1) and a minimal set of files required to compile zlib-1.2.11.*
 <details>
   <summary>Using <strong>GitHub Desktop</strong> (Windows/macOS)</summary>
 
@@ -82,14 +82,10 @@ Join the [UOX3 Discord](https://discord.gg/uBAXxhF) for support and/or a quick c
 
   > If you don't wish to rely on the automake.sh script, but want control over the process yourself, follow these steps (same as what automake.sh does) in a Terminal. This also works on Windows/macOS as an alternative to compiling with IDEs:
   > - Navigate to root of cloned UOX3 git repository, and execute these commands:\
-  > `cd make/cmake`\
-  > `mkdir build`\
-  > `cd build`\
-  > `cmake .. -DCMAKE_BUILD_TYPE=Release` (Windows/Linux/FreeBSD)\
-  > `cmake .. -DCMAKE_BUILD_TYPE=Release -G"Unix Makefiles"` (macOS)\
-  > `cmake --build . --config Release`\
-
-  > Replace "Release" with "Debug" in the above instructions to create a debug-build; delete **make/cmake/build** directory to do clean builds.
+  > `cmake make/cmake -B ./build -DCMAKE_BUILD_TYPE=Release`\
+  > `cmake --build ./build --config Release`
+
+  > Replace "Release" with "Debug" in the above instructions to create a debug-build; delete **build** directory to do clean builds.
 </details>
 
 <details>

assets/uox3.rc

@@ -74,11 +74,11 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "UOX3"
-            VALUE "FileVersion", "0.99.6-RC2"
+            VALUE "FileVersion", "0.99.6"
             VALUE "InternalName", "UOX3.exe"
             VALUE "OriginalFilename", "UOX3.exe"
             VALUE "ProductName", "Ultima Offline eXperiment 3"
-            VALUE "ProductVersion", "0.99.6-RC2"
+            VALUE "ProductVersion", "0.99.6"
         END
     END
     BLOCK "VarFileInfo"

data/accounts/accounts.adm

@@ -1,4 +1,4 @@
-//AV3.0-UV0.99-BD5-DS1641842780-ED0
+//AV3.0-UV0.99-BD6-RC6-DS1688212789-ED0
 //------------------------------------------------------------------------------
 //accounts.adm[TEXT] : UOX3 uses this file for shared accounts access between servers
 //
@@ -11,6 +11,7 @@
 //         PATH c:/uox3/Accounts/path2userdata/
 //         TIMEBAN 0
 //         FIRSTLOGIN 0
+//         TOTALPLAYTIME 0
 //         LASTIP 127.0.0.1
 //         CONTACT NONE
 //         CHARACTER-1 0xffffffff
@@ -25,7 +26,7 @@
 //   FLAGS: 
 //      Bit:  0x0001) Banned           0x0002) Suspended        0x0004) Public           0x0008) Currently Logged In
 //            0x0010) Char-1 Blocked   0x0020) Char-2 Blocked   0x0040) Char-3 Blocked   0x0080) Char-4 Blocked
-//            0x0100) Char-5 Blocked   0x0200) Char-6 Blocked   0x0400) Char-7 Blocked   0x0800) Unused
+//            0x0100) Char-5 Blocked   0x0200) Char-6 Blocked   0x0400) Char-7 Blocked   0x0800) Young
 //            0x1000) Unused           0x2000) Seer             0x4000) Counselor        0x8000) GM Account
 //
 //   TIMEBAN: 
@@ -34,6 +35,9 @@
 //   FIRSTLOGIN: 
 //      This would be timestamp of the account's first login.
 //
+//   TOTALPLAYTIME: 
+//      This would be total playtime on account in minutes across all characters, since first login.
+//
 //   CONTACT: 
 //      Usually this is the email address, but can be used as a comment or ICQ
 //
@@ -48,6 +52,7 @@ FLAGS 0x8000
 PATH ./accounts/admin/
 TIMEBAN 0x0
 FIRSTLOGIN 0x0
+TOTALPLAYTIME 0x0
 LASTIP 127.0.0.1
 CONTACT unknown
 CHARACTER-1 0xffffffff [UNKNOWN]
@@ -67,6 +72,7 @@ FLAGS 0x0
 PATH ./accounts/guest1/
 TIMEBAN 0x0
 FIRSTLOGIN 0x0
+TOTALPLAYTIME 0x0
 LASTIP 0.0.0.0
 CONTACT unknown
 CHARACTER-1 0xffffffff [UNKNOWN]

data/accounts/admin/admin.uad

@@ -1,4 +1,4 @@
-//AI3.0-UV0.99-BD5-DS1641842780-ED0
+//AI3.0-UV0.99-BD6-RC6-DS1688212789-ED0
 //------------------------------------------------------------------------------
 // UAD Path: ./accounts/admin/
 //------------------------------------------------------------------------------
@@ -9,6 +9,7 @@ NAME admin
 PASS admin
 BANTIME 0x0
 FIRSTLOGIN 0x0
+TOTALPLAYTIME 0x0
 LASTIP 127.0.0.1
 CONTACT unknown
 //------------------------------------------------------------------------------

data/accounts/guest1/guest1.uad

@@ -1,4 +1,4 @@
-//AI3.0-UV0.99-BD5-DS1641842780-ED0
+//AI3.0-UV0.99-BD6-RC6-DS1688212789-ED0
 //------------------------------------------------------------------------------
 // UAD Path: ./accounts/guest1/
 //------------------------------------------------------------------------------
@@ -9,6 +9,7 @@ NAME guest1
 PASS guest1
 BANTIME 0x0
 FIRSTLOGIN 0x0
+TOTALPLAYTIME 0x0
 LASTIP 0.0.0.0
 CONTACT unknown
 //------------------------------------------------------------------------------

data/accounts/newaccounts.adm

@@ -1,4 +1,4 @@
-//AIMP3.0-UV0.99-BD5-DS1641842780-ED0
+//AIMP3.0-UV0.99-BD6-RC6-DS1688212789-ED0
 //------------------------------------------------------------------------------
 // UOX3 uses this file to store new accounts that are to be imported on the next
 // time the server does a world save, or world load.

data/dfndata/colors/colors.dfn

@@ -1605,4 +1605,62 @@
 0x08a2
 0x08a3
 0x08a4
+}
+
+// Bright Primary Colors
+[RANDOMCOLOR 33]
+{
+0x0003
+0x000d
+0x0013
+0x001c
+0x0021
+0x0030
+0x0037
+0x003a
+0x0044
+0x0059
+}
+
+// Brightly Colored Rock Candy
+[RANDOMCOLOR 34]
+{
+0x113
+0x19
+0x13
+0x63
+0x68
+0x58
+0x89
+0x98
+0x3
+0x28
+0x33
+0x55
+0x48
+}
+
+// Small Web Halloween Colo
+[RANDOMCOLOR 35]
+{
+0x0
+0x455
+0x4E9
+}
+
+// TwilightLantern and Ghoul Statue Colors
+[RANDOMCOLOR 36]
+{
+0x0
+0x03b3
+0x08e
+}
+
+// Bag of Sending
+[RANDOMCOLOR 37]
+{
+0x8A5  // yellow
+0x8AD  // blue
+0x89B  // red
+0x08A0 // green
 }