Magery skill gain npcs

.github/workflows/UOX3Build.yml

@@ -34,7 +34,7 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-13]
+        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 }}

data/dfndata/colors/colors.dfn

@@ -1620,4 +1620,47 @@
 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
 }

data/dfndata/create/cartography.dfn

@@ -33,48 +33,96 @@ ITEM=2000
 ITEM=2001
 ITEM=2002
 ITEM=2003
+ITEM=2004
+ITEM=2005
+ITEM=2006
+ITEM=2007
 }
 
 [ITEM 2000]
 {
-NAME=local map n/a
+NAME=local map
 ID=0x14eb
-RESOURCE=0x14eb 1
+RESOURCE=MAPS 1
 SKILL=12 0 50
-ADDITEM=0x14ec
+ADDITEM=craftedlocalmap
 MINRANK=1
 MAXRANK=10
 SOUND=0x0249
 }
 [ITEM 2001]
 {
-NAME=city map n/a
+NAME=city map
 ID=0x14eb
-RESOURCE=0x14eb 1
+RESOURCE=MAPS 1
 SKILL=12 40 90
-ADDITEM=0x14ec
+ADDITEM=craftedcitymap
 MINRANK=1
 MAXRANK=10
 SOUND=0x0249
 }
 [ITEM 2002]
 {
-NAME=sea chart n/a
+NAME=sea chart
 ID=0x14eb
-RESOURCE=0x14eb 1
+RESOURCE=MAPS 1
 SKILL=12 700 1200
-ADDITEM=0x14ec
+ADDITEM=craftedseachart
 MINRANK=1
 MAXRANK=10
 SOUND=0x0249
 }
 [ITEM 2003]
 {
-NAME=world map n/a
+NAME=world map
 ID=0x14eb
-RESOURCE=0x14eb 1
+RESOURCE=MAPS 1
 SKILL=12 980 1500
-ADDITEM=0x14ec
+ADDITEM=largeworldmap
+MINRANK=1
+MAXRANK=10
+SOUND=0x0249
+}
+[ITEM 2004]
+{
+NAME=world map
+ID=0x14eb
+RESOURCE=MAPS 1
+SKILL=12 980 1500
+ADDITEM=Ilshenar
+MINRANK=1
+MAXRANK=10
+SOUND=0x0249
+}
+[ITEM 2005]
+{
+NAME=world map
+ID=0x14eb
+RESOURCE=MAPS 1
+SKILL=12 980 1500
+ADDITEM=Malas
+MINRANK=1
+MAXRANK=10
+SOUND=0x0249
+}
+[ITEM 2006]
+{
+NAME=world map
+ID=0x14eb
+RESOURCE=MAPS 1
+SKILL=12 980 1500
+ADDITEM=Tokuno
+MINRANK=1
+MAXRANK=10
+SOUND=0x0249
+}
+[ITEM 2007]
+{
+NAME=world map
+ID=0x14eb
+RESOURCE=MAPS 1
+SKILL=12 980 1500
+ADDITEM=TerMur
 MINRANK=1
 MAXRANK=10
 SOUND=0x0249

data/dfndata/create/glassblowing.dfn

@@ -0,0 +1,143 @@
+[ITEM 3000]
+{
+NAME=Empty Bottle
+ID=0x0f0e
+RESOURCE=SAND 1
+SKILL=0 1000 1150
+ADDITEM=emptybottle
+MINRANK=1
+MAXRANK=10
+SOUND=0x0242
+}
+
+[ITEM 3001]
+{
+NAME=flask (small)
+ID=0x182e
+RESOURCE=SAND 2
+SKILL=0 1000 1150
+ADDITEM=0x182e
+MINRANK=1
+MAXRANK=10
+SOUND=0x0242
+}
+
+[ITEM 3002]
+{
+NAME=flask (medium)
+ID=0x182a
+RESOURCE=SAND 3
+SKILL=0 1000 1150
+ADDITEM=0x182a
+MINRANK=1
+MAXRANK=10
+SOUND=0x0242
+}
+
+[ITEM 3003]
+{
+NAME=flask (curved)
+ID=0x1832
+RESOURCE=SAND 3
+SKILL=0 1000 1150
+ADDITEM=0x1832
+MINRANK=1
+MAXRANK=10
+SOUND=0x0242
+}
+
+[ITEM 3004]
+{
+NAME=flask (large #1)
+ID=0x1838
+RESOURCE=SAND 4
+SKILL=0 1000 1150
+ADDITEM=0x1838
+MINRANK=1
+MAXRANK=10
+SOUND=0x0242
+}
+
+[ITEM 3005]
+{
+NAME=flask (large #2)
+ID=0x183b
+RESOURCE=SAND 5
+SKILL=0 1000 1150
+ADDITEM=0x183b
+MINRANK=1
+MAXRANK=10
+SOUND=0x0242
+}
+
+[ITEM 3006]
+{
+NAME=flask (bubbling blue)
+ID=0x1844
+RESOURCE=SAND 5
+SKILL=0 1000 1150
+ADDITEM=bubblingblueflask
+MINRANK=1
+MAXRANK=10
+SOUND=0x0242
+}
+
+[ITEM 3007]
+{
+NAME=flask (bubbling purple)
+ID=0x1841
+RESOURCE=SAND 5
+SKILL=0 1000 1150
+ADDITEM=bubblingpurpleflask
+MINRANK=1
+MAXRANK=10
+SOUND=0x0242
+}
+
+[ITEM 3008]
+{
+NAME=flask (bubbling red)
+ID=0x183e
+RESOURCE=SAND 7
+SKILL=0 1000 1150
+ADDITEM=bubblingredflask
+MINRANK=1
+MAXRANK=10
+SOUND=0x0242
+}
+
+[ITEM 3009]
+{
+NAME=empty vials
+ID=0x185b
+RESOURCE=SAND 8
+SKILL=0 1000 1150
+ADDITEM=emptyvials
+MINRANK=1
+MAXRANK=10
+SOUND=0x0242
+}
+
+[ITEM 3010]
+{
+NAME=full vials
+ID=0x185d
+RESOURCE=SAND 8
+SKILL=0 1000 1150
+ADDITEM=fullvials
+MINRANK=1
+MAXRANK=10
+SOUND=0x0242
+}
+
+[ITEM 3011]
+{
+NAME=spinning hourglass
+ID=0x1810
+RESOURCE=SAND 10
+SKILL=0 1000 1150
+ADDITEM=0x1810
+MINRANK=1
+MAXRANK=10
+SOUND=0x0242
+}

data/dfndata/create/resources.dfn

@@ -152,4 +152,15 @@ ID=0x0c6c
 {
 ID=0x09b9
 ID=0x09ba
+}
+
+[RESOURCE SAND]
+{
+ID=0x423A
+}
+
+[RESOURCE MAPS]
+{
+ID=0x14eb
+ID=0x0E34
 }