Merge pull request #210 from UOX3DevTeam/misc_fixes_and_improvements_…

…1010 Misc fixes and improvements 1010
UOX3DevTeam · Oct 14, 2023 · a0bc529 · a0bc529
2 parents 890f763 + 05e5310
commit a0bc529
Show file tree

Hide file tree

Showing 172 changed files with 61,743 additions and 18,232 deletions.
diff --git a/assets/uox3.rc b/assets/uox3.rc
@@ -74,11 +74,11 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "UOX3"
-            VALUE "FileVersion", "0.99.6-RC6"
+            VALUE "FileVersion", "0.99.6"
             VALUE "InternalName", "UOX3.exe"
             VALUE "OriginalFilename", "UOX3.exe"
             VALUE "ProductName", "Ultima Offline eXperiment 3"
-            VALUE "ProductVersion", "0.99.6-RC6"
+            VALUE "ProductVersion", "0.99.6"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/data/dfndata/colors/colors.dfn b/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
 }
diff --git a/data/dfndata/items/building/camps.dfn b/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
+}
diff --git a/data/dfndata/items/gear/armor/armor_sets/ranger_armor.dfn b/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
 }
diff --git a/data/dfndata/items/gear/armor/base_armor.dfn b/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

diff --git a/data/dfndata/items/gear/armor/gargish_armor/gargish_cloth.dfn b/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

diff --git a/data/dfndata/items/itemlists/itemlists.dfn b/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
+}
diff --git a/data/dfndata/items/lootlists.dfn b/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

diff --git a/data/dfndata/items/misc/equippable-mounts.dfn b/data/dfndata/items/misc/equippable-mounts.dfn
@@ -315,6 +315,7 @@ NEWBIE
 {
 NAME=a swampdragon
 ID=0x3EBD
+COLOR=0x851
 LAYER=25
 NEWBIE
 }

diff --git a/data/dfndata/items/misc/money.dfn b/data/dfndata/items/misc/money.dfn
@@ -80,3 +80,16 @@ name=copper coin
 id=0x0eec
 amount=20
 }
+
+[bankcheck]
+{
+get=base_item
+name=a bank check
+id=0x14F0
+color=0x34
+weight=100
+pileable=0
+decay=1
+newbie=1
+script=5015
+}
diff --git a/data/dfndata/items/puzzles/puzzles.dfn b/data/dfndata/items/puzzles/puzzles.dfn
@@ -0,0 +1,45 @@
+[powergenerator]
+{
+name=power generator
+id=0x0073
+colour=0x0451
+weight=255
+movable=0
+script=5036//power generator.js
+}
+
+[powergenerator_2]
+{
+name=power generator
+id=0x0076
+colour=0x0451
+weight=255
+movable=0
+}
+
+[powergenerator_3]
+{
+name=power generator
+id=0x0075
+colour=0x0451
+weight=255
+movable=0
+}
+
+[powergenerator_4]
+{
+name=power generator
+id=0x37f4
+colour=0x0451
+weight=255
+movable=0
+}
+
+[powergenerator_ctrlpanel]
+{
+name=control panel
+id=0x0bdc
+colour=0x0835
+weight=255
+movable=0
+}
diff --git a/data/dfndata/items/skills/tools/inscription.dfn b/data/dfndata/items/skills/tools/inscription.dfn
@@ -52,7 +52,7 @@ id=0x14F0
 weight=100
 value=12 6
 restock=20
-pileable=1
+pileable=0
 amount=1
 decay=1
 good=56
-Original file line number
+Diff line change
@@ Expand Up / @@ -1605,4 +1605,19 @@ @@
 x08a2
 x08a3
 x08a4
+    }
+    // Bright Primary Colors
+    [RANDOMCOLOR 33]
+    {
+x0003
+x000d
+x0013
+x001c
+x0021
+x0030
+x0037
+x003a
+x0044
+x0059
     }