Merge branch 'develop' into GlassBlowing

DragonSlayer62 · Dec 10, 2023 · 3c092dd · 3c092dd
2 parents 5467b6a + 89bf0e1
commit 3c092dd
Show file tree

Hide file tree

Showing 55 changed files with 1,502 additions and 414 deletions.
diff --git a/data/dfndata/create/cartography.dfn b/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

diff --git a/data/dfndata/create/resources.dfn b/data/dfndata/create/resources.dfn
@@ -157,4 +157,10 @@ ID=0x09ba
 [RESOURCE SAND]
 {
 ID=0x423A
+}
+
+[RESOURCE MAPS]
+{
+ID=0x14eb
+ID=0x0E34
 }
diff --git a/data/dfndata/items/ItemMenu.bulk.dfn b/data/dfndata/items/ItemMenu.bulk.dfn
@@ -9295,8 +9295,10 @@ ITEMMENU=4
 provisions.dfn
 0x0a58=a bedroll
 ADDITEM=0x0a58
-0x14EB=world map
-ADDITEM=0x14EB
+0x14EC=small world map
+ADDITEM=smallworldmap
+0x14EC=large world map
+ADDITEM=largeworldmap
 0x175d=oil cloth
 ADDITEM=oilcloth
 <=Previous Menu
@@ -12992,8 +12994,8 @@ ITEMMENU=125
 [ITEMMENU 131]
 {
 misc_resources.dfn
-0x14ec=blank map
-ADDITEM=0x14ec
+0x14eb=blank map
+ADDITEM=0x14eb
 0x1876=iron wire
 ADDITEM=0x1876
 0x1877=silver wire
@@ -14242,3 +14244,12 @@ ADDITEM=krampusminiontalons
 <=Previous Menu
 ITEMMENU=251
 }
+
+[ITEMMENU 259]
+{
+cartography.dfn
+0x0fc0=Mapmakers Pen
+ADDITEM=mapmakerspen
+<=Previous Menu
+ITEMMENU=127
+}
diff --git a/data/dfndata/items/ItemMenu.dfn b/data/dfndata/items/ItemMenu.dfn
@@ -585,6 +585,8 @@ ITEMMENU=143
 ITEMMENU=233
 <=Blacksmithy
 ITEMMENU=140
+<=Cartography
+ITEMMENU=259
 <=Carpenty
 ITEMMENU=144
 <=Cooking

diff --git a/data/dfndata/items/misc/bod_rewards.dfn → ...ata/items/misc/bod_rewards_blacksmith.dfn b/data/dfndata/items/misc/bod_rewards.dfn → ...ata/items/misc/bod_rewards_blacksmith.dfn
diff --git a/data/dfndata/items/misc/bod_rewards_tailor.dfn b/data/dfndata/items/misc/bod_rewards_tailor.dfn
@@ -0,0 +1,46 @@
+// Clothing Bless Deed
+// Blesses a single item of clothing
+[clothing_bless_deed]
+{
+get=base_item
+id=0x14F0
+name=a clothing bless deed
+script=5051
+}
+
+// -- TAILOR TOOLS --
+[base_runic_sewing_kit]
+{
+get=sewing_kit
+origin=uor
+}
+
+// Spined Runic Sewing Kit - Adds Durable/Defense properties to crafted clothing/armor (not implemented).
+[spined_runic_sewing_kit]
+{
+get=base_runic_sewing_kit
+name=spined runic sewing kit
+maxuses=45
+usesleft=45
+colour=0x283
+}
+
+// Horned Runic Sewing Kit - Adds Substantial/Guarding properties to crafted clothing/armor (not implemented).
+[horned_runic_sewing_kit]
+{
+get=base_runic_sewing_kit
+name=horned runic sewing kit
+maxuses=30
+usesleft=30
+colour=0x227
+}
+
+// Barbed RUnic Sewing Kit - Adds Massive/Hardening properties to crafted clothing/armor (not implemented).
+[barbed_runic_sewing_kit]
+{
+get=base_runic_sewing_kit
+name=barbed runic sewing kit
+maxuses=15
+usesleft=15
+colour=0x1C1
+}
diff --git a/data/dfndata/items/gear/provisions.dfn → data/dfndata/items/misc/provisions.dfn b/data/dfndata/items/gear/provisions.dfn → data/dfndata/items/misc/provisions.dfn
@@ -14,20 +14,8 @@ script=5021
 [0x14EB]
 {
 get=base_item
-name=world map
-id=0x14EB
-weight=100
-value=75 37
-type=10
-restock=20
-decay=1
-}
-
-[0x14ec]
-{
-get=base_item
 name=blank map
-id=0x14ec
+id=0x14EB
 weight=100
 value=75 37
 restock=20

diff --git a/data/dfndata/items/misc/treasuremaps.dfn b/data/dfndata/items/misc/treasuremaps.dfn
@@ -51,18 +51,13 @@ get=base_treasure_map
 custominttag=Level 6
 }
 
-[dirt]
+[treasuredirt]
 {
 get=base_item
 name=dirt
 id=0x913
-}
-
-[dirt2]
-{
-get=base_item
-name=dirt
-id=0x914
+MORE=0x04 0x0 0x0 0x0
+SCRIPT=5405
 }
 
 [base_treasure_chest]

diff --git a/data/dfndata/items/skills/tools/cartography.dfn b/data/dfndata/items/skills/tools/cartography.dfn
@@ -0,0 +1,15 @@
+[mapmakerspen]
+{
+Get=base_item
+name=Mapmakers Pen
+id=0x0fc0
+weight=100
+value=6 3
+restock=20
+decay=1
+good=56
+maxuses=75
+usesleft=25
+script=4031
+script=2200// uses left tooltip
+}
diff --git a/data/dfndata/items/skills/tools/inscription.dfn b/data/dfndata/items/skills/tools/inscription.dfn
@@ -26,22 +26,18 @@ decay=1
 good=56
 maxuses=75
 usesleft=25
+script=815
 script=2200// uses left tooltip
 }
 
 [0x0fbf]
 {
-Get=base_item
-name=pen and ink
-id=0x0fbf
-weight=100
-value=6 3
-restock=20
-decay=1
-good=56
-maxuses=75
-usesleft=25
-script=2200// uses left tooltip
+Get=0x0fc0
+}
+
+[penandink]
+{
+Get=0x0fc0 0x0fbf
 }
 
 [0x14F0]

diff --git a/data/dfndata/spawn/felucca/spawn_felucca_world_graveyards.dfn b/data/dfndata/spawn/felucca/spawn_felucca_world_graveyards.dfn
@@ -85,6 +85,7 @@ X1=1338
 Y1=1445
 X2=1374
 Y2=1509
+EXCLUDEAREA=1342,1447,1353,1487
 WORLD=0
 MINTIME=58
 MAXTIME=60
@@ -104,6 +105,4 @@ WORLD=0
 MINTIME=58
 MAXTIME=60
 CALL=5
-}
-
-EOF
+}
diff --git a/data/dfndata/spawn/spawn.dfn b/data/dfndata/spawn/spawn.dfn
@@ -17,6 +17,7 @@
 // Y1=1				// This is the upper left Y of the box
 // X2=5000			// This is the lower right X of the box
 // Y2=5000                      // This is the lower right Y of the box
+// EXCLUDEAREA=x1,y1,x2,y2   // Area within defined boundary will be excluded as valid spawn area
 // PREFZ=18			// This is the maximum Z influence a dynamic or static item can have on spawning.
 // WORLD=#		        // This is the World which to Spawn WORLD=0 (for Brit) WORLD=2 (for Ilsh)
 // MINTIME=0			// This is the minimum time for the item or npc to spawn

diff --git a/data/dfndata/spawn/trammel/spawn_trammel_world_graveyards.dfn b/data/dfndata/spawn/trammel/spawn_trammel_world_graveyards.dfn
@@ -85,6 +85,7 @@ X1=1338
 Y1=1445
 X2=1374
 Y2=1509
+EXCLUDEAREA=1342,1447,1353,1487
 WORLD=1
 MINTIME=58
 MAXTIME=60
@@ -104,6 +105,4 @@ WORLD=1
 MINTIME=58
 MAXTIME=60
 CALL=5
-}
-
-EOF
+}
diff --git a/data/dictionaries/dictionary.CSY b/data/dictionaries/dictionary.CSY
@@ -3291,6 +3291,11 @@
 5716=skvěle nakreslená mapa pokladu
 5717=chytře nakreslená mapa pokladu
 5718=Šikovně nakreslená mapa pokladu
+5719=Při vykopávání pokladu se nemůžete pohybovat. Budete muset začít kopat znovu.
+5720=Zkuste hledat truhlu s pokladem více
+5721=Tam nemůžete kopat poklad!
+5722=souřadnice %s
+5723=Dokončeno
 // [6000-6499] Misc Skill Msgs
 6000=Tato osoba vypadá jako %s a %t.
 6001=Nemůžeš z toho udělat nic užitečného.
@@ -4807,6 +4812,16 @@
 12007=To není zdroj drahokamů!
 12008=Vyberte materiál, který chcete použít:
 12009=Přidal jsi do nádoby zámek a klíč!
+// 13000 - 13500 Dovednost Kartografie
+13000=Nabídka kartografie
+13001=Mapy
+13002=PRÁZDNÝ SVITEK
+13003=MAPA
+13004=Prázdné svitky nebo mapy
+13100=Lokßlnφ mapa
+13101=Mapa města
+13102=Mořská mapa
+13103=Mapa světa
 // 13501 - 14000 Dovednost foukání skla
 13501=Nabídka foukání skla
 13502=Různé
@@ -5212,5 +5227,10 @@
 18771=Plná sada rangerské zbroje.
 // [18800-19000] Vlastnosti AOS
 18800=%i% Bonus za hojení obvazů
+// Clothing Bless Deed
+19001=Vyberte oděv, který chcete požehnat.
+19002=Položka byla požehnána.
+19003=Tímto úkonem můžete žehnat pouze oblečení!
+19004=Předměty musí být vybaveny nebo musí být v batohu, abyste je mohli požehnat.
 }
 EOF