Merge branch 'develop' into restrict-travel

data/dfndata/items/itemlists/itemlists.dfn

@@ -1211,6 +1211,24 @@ itemlist=randomlowlevelweapons,7
 itemlist=randommidlevelweapons,7
 }
 
+[randomgranite]
+{
+itemlist=randomgranite
+}
+
+[ITEMLIST randomgranite]
+{
+irongranite
+dullcoppergranite
+shadowirongranite
+coppergranite
+bronzegranite
+goldgranite
+agapitegranite
+veritegranite
+valoritegranite
+}
+
 //**************************
 //* LISTOBJECTS START HERE *
 //**************************

data/dfndata/items/skills/resources/mining.dfn

@@ -59,3 +59,81 @@ pileable=1
 decay=1
 good=46
 }
+
+[sand]
+{
+get=base_item
+name=sand
+id=0x423A
+weight=10
+movable=1
+pileable=1
+decay=1
+good=46
+colour=2413
+}
+
+[base_granite]
+{
+get=base_item
+name=high quality granite
+id=0x1779
+weight=100
+movable=1
+pileable=1
+decay=1
+good=46
+}
+
+[irongranite]
+{
+get=base_granite
+}
+
+[dullcoppergranite]
+{
+get=base_granite
+colour=0x973
+}
+
+[shadowirongranite]
+{
+get=base_granite
+colour=0x966
+}
+
+[coppergranite]
+{
+get=base_granite
+colour=0x96D
+}
+
+[bronzegranite]
+{
+get=base_granite
+colour=0x972
+}
+
+[goldgranite]
+{
+get=base_granite
+colour=0x8A5
+}
+
+[agapitegranite]
+{
+get=base_granite
+colour=0x979
+}
+
+[veritegranite]
+{
+get=base_granite
+colour=0x89F
+}
+
+[valoritegranite]
+{
+get=base_granite
+colour=0x8AB
+}

data/dfndata/items/skills/tools/mining.dfn

@@ -294,3 +294,29 @@ id=0x19a9
 weight=10000
 movable=2
 }
+
+[sandminingbook]
+{
+get=base_item
+name=Find Glass-Quality Sand
+id=0xFF4
+weight=200
+movable=1
+pileable=1
+decay=1
+value=10637 5318
+script=5052
+}
+
+[stoneminingbook]
+{
+get=base_item
+name=Mining For Quality Stone
+id=0xFBE
+weight=200
+movable=1
+pileable=1
+decay=1
+value=10637 5318
+script=5053
+}

data/dictionaries/dictionary.CSY

@@ -4288,6 +4288,14 @@
 9402=[Neidentifikováno]
 9403=Zbývající použití: %i
 9404= s %d náloží
+9405=Chvíli kopete, ale nenajdete nic v dostatečné kvalitě pro foukání skla.
+9406=Opatrně vytěžíte z rudné žíly nějaký zpracovatelný kámen!
+9407=Opatrně vykopáváte písek dostatečné kvality pro foukání skla.
+9408=Z této knihy se může učit pouze velmistr horník.
+9409=Tyto informace jste se již dozvěděli.
+9410=Naučili jste se těžit jemný písek. Při těžbě se zaměřte na pískové oblasti a hledejte jemný písek.
+9411=Naučil jste se těžit kameny. Zaměřte se na hory při těžbě, abyste našli kameny.
+9412=Není zde žádný písek k těžbě.
 // [9900 - 10000] Příkazy pro dveře a značky
 9916=Strana
 9917=Další

data/dictionaries/dictionary.ENG

@@ -4288,6 +4288,14 @@
 9402=[Unidentified]
 9403=uses remaining: %i
 9404= with %d charges
+9405=You dig for a while but fail to find any of sufficient quality for glassblowing.
+9406=You carefully extract some workable stone from the ore vein!
+9407=You carefully dig up sand of sufficient quality for glassblowing.
+9408=Only a Grandmaster Miner can learn from this book.
+9409=You have already learned this information.
+9410=You have learned how to mine fine sand. Target sand areas when mining to look for fine sand.
+9411=You have learned to mine for stones. Target mountains when mining to find stones.
+9412=There is no sand here to mine.
 // [9900 - 10000] Door and Sign Commands
 9916=Page
 9917=Next

data/dictionaries/dictionary.FRE

@@ -4444,6 +4444,14 @@
 9402=[Non identifié]
 9403=Utilisations restantes : %i
 9404= avec %d charges
+9405=Vous creusez pendant un moment mais vous ne parvenez pas à en trouver de qualité suffisante pour le soufflage du verre.
+9406=Vous extrayez soigneusement de la pierre exploitable de la veine de minerai !
+9407=Vous déterrez soigneusement du sable de qualité suffisante pour le soufflage du verre.
+9408=Seul un grand maître mineur peut apprendre de ce livre.
+9409=Vous avez déjà appris cette information.
+9410=Vous avez appris à extraire du sable fin. Ciblez les zones de sable lors de l’exploitation minière pour rechercher du sable fin.
+9411=Vous avez appris à extraire des pierres. Ciblez les montagnes lors de l’exploitation minière pour trouver des pierres.
+9412=Il n'y a pas de sable ici à exploiter.
 // [9900 - 10000] Commandes pour les portes et les enseignes
 9916=Page
 9917=Suivant

data/dictionaries/dictionary.GER

@@ -4288,6 +4288,14 @@
 9402=[Unbekannt]
 9403=Verbleibende Verwendungen: %i
 9404= mit %d Gebühren
+9405=Sie stöbern eine Weile, finden aber nichts von ausreichender Qualität zum Glasblasen.
+9406=Du baust vorsichtig etwas bearbeitbares Gestein aus der Erzader!
+9407=Sie graben sorgfältig Sand von ausreichender Qualität zum Glasblasen aus.
+9408=Nur ein Großmeister-Bergmann kann aus diesem Buch lernen.
+9409=Sie haben diese Informationen bereits erfahren.
+9410=Du hast gelernt, wie man feinen Sand abbaut. Zielen Sie beim Abbau auf Sandflächen ab, um nach Feinsand zu suchen.
+9411=Du hast gelernt, Steine abzubauen. Zielen Sie beim Bergbau auf Berge, um Steine zu finden.
+9412=Hier gibt es keinen Sand zum Abbauen.
 // [9900 - 10000] Befehle für Türen und Schilder
 9916=Seite
 9917=Weiter

data/dictionaries/dictionary.ITA

@@ -4288,6 +4288,14 @@
 9402=[Non identificato]
 9403=Uso rimanente: %i
 9404= con %d cariche
+9405=Scavi per un po' ma non riesci a trovare nulla di qualità sufficiente per la soffiatura del vetro.
+9406=Estrai con attenzione qualche pietra lavorabile dalla vena mineraria!
+9407=Scavi con attenzione sabbia di qualità sufficiente per la soffiatura del vetro.
+9408=Solo un Gran Maestro Minatore può imparare da questo libro.
+9409=Hai già appreso questa informazione.
+9410=Hai imparato come estrarre la sabbia fine. Punta alle aree sabbiose durante l'estrazione per cercare sabbia fine.
+9411=Hai imparato a estrarre le pietre. Prendi di mira le montagne quando estrai per trovare pietre.
+9412=Qui non c'è sabbia da estrarre.
 // [9900 - 10000] Comandi per porte e insegne
 9916=Pagina
 9917=Prossimo

data/dictionaries/dictionary.POL

@@ -4288,6 +4288,14 @@
 9402=[Niezidentyfikowany]
 9403=pozostały czas użycia: %i
 9404= z %d ładunkami
+9405=Kopiesz przez chwilę, ale nie udaje ci się znaleźć nic odpowiedniej jakości do dmuchania szkła.
+9406=Ostrożnie wydobądź trochę nadającego się do obróbki kamienia z żyły rudy!
+9407=Ostrożnie wykopujesz piasek odpowiedniej jakości do dmuchania szkła.
+9408=Tylko arcymistrz górnictwa może uczyć się z tej książki.
+9409=Te informacje już znasz.
+9410=Nauczyłeś się wydobywać drobny piasek. Podczas wydobywania celuj w obszary piaszczyste w poszukiwaniu drobnego piasku.
+9411=Nauczyłeś się wydobywać kamienie. Podczas wydobywania celuj w góry, aby znaleźć kamienie.
+9412=Nie ma tu piasku do wydobycia.
 // [9900 - 10000] Polecenia dotyczące drzwi i znaków
 9916=Strona
 9917=Następny

data/dictionaries/dictionary.PTG

@@ -4288,6 +4288,14 @@
 9402=[Não identificado]
 9403=utilizações restantes: %i
 9404= com taxas %d
+9405=Você escava por um tempo, mas não consegue encontrar nada de qualidade suficiente para soprar vidro.
+9406=Você extrai cuidadosamente algumas pedras utilizáveis do veio de minério!
+9407=Você escava cuidadosamente areia de qualidade suficiente para soprar vidro.
+9408=Apenas um Grande Mestre Mineiro pode aprender com este livro.
+9409=Você já aprendeu esta informação.
+9410=Você aprendeu como extrair areia fina. Procure áreas de areia durante a mineração para procurar areia fina.
+9411=Você aprendeu a minerar pedras. Mire nas montanhas ao minerar para encontrar pedras.
+9412=Não há areia aqui para minerar.
 // [9900 - 10000] Comandos de Porta e de Sinal
 9916=Página
 9917=Próximo

data/dictionaries/dictionary.SPA

@@ -4288,6 +4288,14 @@
 9402=[Sin identificar]
 9403=Cargas restantes: %i
 9404= con %d cargas
+9405=Excavas por un tiempo pero no encuentras nada de calidad suficiente para soplado de vidrio.
+9406=¡Extraes con cuidado alguna piedra trabajable de la veta de mineral!
+9407=Excavas con cuidado arena de calidad suficiente para soplar vidrio.
+9408=Sólo un Gran Maestro Minero puede aprender de este libro.
+9409=Ya has aprendido esta información.
+9410=Has aprendido a extraer arena fina. Apunte a las áreas de arena cuando extraiga para buscar arena fina.
+9411=Has aprendido a extraer piedras. Apunte a las montañas cuando extraiga piedras.
+9412=Aquí no hay arena para extraer.
 // [9900 - 10000] Comandos de puertas y señales
 9916=Página
 9917=Siguiente

data/dictionaries/dictionary.ZRO

@@ -3252,6 +3252,45 @@
 5150=a speckled scorpion
 5151=a chaos dragoon
 5152=a chaos dragoon elite
+5153=the Gypsy Maiden
+5154=the Gypsy Animal Trainer
+5155=the Gypsy Banker
+5156=the Gypsy Fortune Teller
+5157=the Vagabond
+5158=the Iron Worker
+// [5500-5600] Holiday Msgs
+5500=Where would you like to place this decoration?
+5501=The decoration must be placed next to a wall.
+5502=That location is not in your house.
+5503=The extreme pain in your teeth subsides.
+5504=You feel as if you could eat as much as you wanted!
+5506=Do you wish to re - deed this decoration ?
+5507=Error Report to GM
+5508=You have just been hit by a snowball!
+5509=You throw the snowball and hit the target!
+5510=You can only throw a snowball at something that can throw one back.
+5511=The snow is not ready to be packed yet.  Keep trying.
+5512=You carefully pack the snow into a ball...
+// [5700-5750] Treasure Map and Map Msgs
+5700=It appears to be blank.
+5701=This treasure hunt has already been completed.
+5702=The treasure is marked by the red pin. Grab a shovel and go dig it up!
+5703=You decoded the map!
+5704=tattered treasure map
+5705=You cannot decode this map yet!
+5706=You are already digging treasure.
+5707=Where do you wish to dig?
+5708=You stop digging because something is directly on top of the treasure chest
+5709=You did not decode this map and have no clue where to look for the treasure.
+5710=The treasure for this map has already been found.
+5711=You dig and dig, but do not find any treasure
+5712=You dig and dig, but no treasure seems to be here
+5713=The chest refuses to be filled with any more treasure.
+5714=plainly drawn treasure map
+5715=expertly drawn treasure map
+5716=adeptly drawn treasure map
+5717=cleverly drawn treasure map
+5718=deviously drawn treasure map
 // [6000-6499] Misc Skill Msgs
 6000=That person looks %s and %t.
 6001=You can't make anything useful from that.
@@ -4244,6 +4283,14 @@
 9402=[Unidentified]
 9403=uses remaining: %i
 9404= with %d charges
+9405=You dig for a while but fail to find any of sufficient quality for glassblowing.
+9406=You carefully extract some workable stone from the ore vein!
+9407=You carefully dig up sand of sufficient quality for glassblowing.
+9408=Only a Grandmaster Miner can learn from this book.
+9409=You have already learned this information.
+9410=You have learned how to mine fine sand. Target sand areas when mining to look for fine sand.
+9411=You have learned to mine for stones. Target mountains when mining to find stones.
+9412=Aquí no hay arena para extraer.
 // [9900 - 10000] Door and Sign Commands
 9916=Page
 9917=Next

data/js/item/sandminingbook.js

@@ -0,0 +1,32 @@
+function onUseChecked( pUser, iUsed )
+{
+	var socket = pUser.socket;
+	var itemOwner = GetPackOwner( iUsed, 0 );
+
+	if( socket && iUsed && iUsed.isItem )
+	{
+		if( itemOwner == null || itemOwner.serial != pUser.serial )
+		{
+			socket.SysMessage( GetDictionaryEntry( 1763, socket.language )); // That item must be in your backpack before it can be used.
+		}
+		else if( pUser.skills[45] < 1000 )
+		{
+			socket.SysMessage( GetDictionaryEntry( 9408, socket.language )); // Only a Grandmaster Miner can learn from this book.
+		}
+		else if( pUser.GetTag( "GatheringSand" ) == 1 )
+		{
+			socket.SysMessage( GetDictionaryEntry( 9409, socket.language )); // You have already learned this information.
+		}
+		else if( iUsed.movable == 2 || iUsed.movable == 3 )
+		{
+			socket.SysMessage( GetDictionaryEntry( 774, socket.Language )); //That is locked down and you cannot use it
+		}
+		else 
+		{
+			pUser.SetTag( "GatheringSand", 1 );
+			socket.SysMessage( GetDictionaryEntry( 9410, socket.language )); // You have learned how to mine fine sand.  Target sand areas when mining to look for fine sand.
+			iUsed.Delete();
+		}
+	}
+	return false;
+}