Merge pull request UOX3DevTeam#176 from UOX3DevTeam/0_99_6_RC6

UOX3 0.99.6-RC6

.github/workflows/UOX3Build.yml

@@ -8,19 +8,23 @@ on:
       - '**.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.)

README.md

@@ -9,7 +9,7 @@
 
 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
 
-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-RC5"
+            VALUE "FileVersion", "0.99.6"
             VALUE "InternalName", "UOX3.exe"
             VALUE "OriginalFilename", "UOX3.exe"
             VALUE "ProductName", "Ultima Offline eXperiment 3"
-            VALUE "ProductVersion", "0.99.6-RC5"
+            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,19 @@
 0x08a2
 0x08a3
 0x08a4
+}
+
+// Bright Primary Colors
+[RANDOMCOLOR 33]
+{
+0x0003
+0x000d
+0x0013
+0x001c
+0x0021
+0x0030
+0x0037
+0x003a
+0x0044
+0x0059
 }

data/dfndata/items/ItemMenu.bulk.dfn

@@ -11915,8 +11915,12 @@ ITEMMENU=7
 [ITEMMENU 113]
 {
 misc_magic.dfn
-0x0efa=a spellbook
+0x0efa=a spellbook (empty)
 ADDITEM=0x0efa
+0x0efa=a spellbook (1 to 4)
+ADDITEM=spellbook1to4
+0x0efa=a spellbook (full)
+ADDITEM=spellbook1to8
 0x1f17=a recall rune (blank)
 ADDITEM=0x1f17
 0x22c5=a runebook

data/dfndata/items/building/camps.dfn

@@ -0,0 +1,43 @@
+[ilsh_healer_camp]
+{
+get=base_item
+name=healer camp
+id=0x13ab
+morex=0x1f4
+movable=2
+visible=2
+script=5500
+}
+
+[ilsh_orc_camp]
+{
+get=base_item
+name=orc camp
+id=0x13ab
+morex=0x1f6d
+movable=2
+visible=2
+script=5501
+}
+
+[ilsh_banker_camp]
+{
+get=base_item
+name=banker camp
+id=0x13ab
+morex=0x1f6
+movable=2
+visible=2
+script=5502
+}
+
+[ilsh_mage_camp]
+{
+get=base_item
+name=mage camp
+id=0x13ab
+morex=0x1f5
+movable=2
+visible=2
+script=5503
+}

data/dfndata/items/gear/armor/armor_sets/ranger_armor.dfn

@@ -114,4 +114,16 @@ id=0x13e2
 [rangertunic]
 {
 get=0x13db-ranger 0x13e2-ranger
+}
+
+// Bag with full ranger armor set
+[rangerarmorset]
+{
+get=0x0e76
+color=0x59c
+packitem=rangersleeves
+packitem=rangergloves
+packitem=rangergorget
+packitem=rangerleggings
+packitem=rangertunic
 }

data/dfndata/items/gear/armor/base_armor.dfn

@@ -1,6 +1,6 @@
 // Ringmail
 
-Ringmail Gloves - Base item with shared DFN tags
+// Ringmail Gloves - Base item with shared DFN tags
 [base_ring_gloves]
 {
 get=base_item

data/dfndata/items/gear/armor/gargish_armor/gargish_cloth.dfn

@@ -46,10 +46,10 @@ get=0x0403 0x405f
 
 // -----------= CHEST =----------- //
 
-// Gargish Cloth Chest
+// Gargish Cloth Chest - E/W
 [0x0406]
 {
-getlbr=0x0406_lbr - E/W
+getlbr=0x0406_lbr
 getaos=0x0406_aos
 gettol=0x0406_tol
 sectionid=0x0406

data/dfndata/items/gear/magic_items.dfn

@@ -238,6 +238,16 @@ morey=2
 script=3300
 }
 
+// Fireworks Wand
+[fireworks_wand]
+{
+get=base_item
+name=fireworks wand
+id=0x0df2
+type=118
+morex=50
+}
+
 [glacialstaff]
 {
 get=0x0df1

data/dfndata/items/itemlists/digginglist.dfn

@@ -59,6 +59,11 @@
 0x0f30
 }
 
+[digginggems]
+{
+itemlist=digginggems
+}
+
 [ITEMLIST diggingweapons]
 {
 0x13b5
@@ -83,6 +88,11 @@
 0x1407
 }
 
+[diggingweapons]
+{
+itemlist=diggingweapons
+}
+
 [ITEMLIST diggingarmor]
 {
 0x1b72
@@ -114,5 +124,10 @@
 0x140E
 }
 
+[diggingarmor]
+{
+itemlist=diggingarmor
+}
+
 EOF
 

data/dfndata/items/itemlists/itemlists.dfn

@@ -970,6 +970,22 @@ practice_gnarled_staff
 25|0x0df1
 }
 
+// Chaos Dragoon Weapons - Kryss, Broadsword, Katana
+[ITEMLIST 205]
+{
+10|kryss
+10|broadsword
+10|katana
+}
+
+// Gypsy Headgear
+[ITEMLIST 210]
+{
+jesterhat
+bandana
+skullcap
+}
+
 // Dungeon Treasures Level 1 - 4
 // Special Itemlist for Container Spawn Objects!
 [ITEMLIST dungeontreasureloot1]
@@ -1435,3 +1451,15 @@ itemlist=150
 {
 itemlist=200
 }
+
+// Chaos Dragoon Weapons - Kryss, Broadsword, Katana
+[listobject205]
+{
+itemlist=205
+}
+
+// Gypsy Headgear
+[gypsyheadgear]
+{
+itemlist=210
+}

data/dfndata/items/lootlists.dfn

@@ -787,7 +787,7 @@
 }
 
 // Lich Lord - Magic wand or staff
-[LOOTLIST lichLoot]
+[LOOTLIST lichlordLoot]
 {
 50|blank
 50|random_magic_wand_5