Merge branch 'Auto-UnEquipped-casting' of https://github.com/DragonSl…

…ayer62/UOX3 into Auto-UnEquipped-casting

data/dfndata/items/containers/leather.dfn

@@ -104,6 +104,7 @@ colorlist=37
 dyeable=0
 decay=1
 good=5
+origin=lbr
 script=5058// bagofsending.js
 script=2203// charges_left_tooltip.js
 }

data/dfndata/items/gear/weapons/missile_weapons.dfn

@@ -12,6 +12,11 @@ good=23
 origin=td
 }
 
+[bola]
+{
+get=0x26AC
+}
+
 //------------------------------------------------------------------------------------------------//
 
 // SAMURAI EMPIRE

data/dfndata/items/magic/misc_magic.dfn

@@ -117,6 +117,7 @@ weight=1000
 value=2 1
 good=28
 sectionid=0x0e2d
+origin=uo
 script=5056// crystalball.js
 }
 
@@ -146,6 +147,7 @@ dir=1
 weight=1000
 value=2 1
 good=28
+origin=lbr
 script=5057// ballofpetsummoning.js
 script=2203// charges_left_tooltip.js
 }

data/dfndata/items/misc/consumables.dfn

@@ -252,6 +252,7 @@ colour=0x487
 pileable=1
 amount=1
 decay=1
+origin=sa
 script=5060
 custominttag=typeID 1
 }
@@ -297,6 +298,7 @@ weight=01
 color=0x0835
 pileable=1
 amount=1
+origin=lbr
 script=5059//powderoftranslocation.js
 }
 
@@ -308,4 +310,5 @@ id=0x26B7
 pileable=1
 amount=1
 decay=1
+origin=lbr
 }

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

@@ -787,5 +787,6 @@ movable=1
 pileable=1
 decay=1
 value=10637 5318
+origin=lbr
 script=5054
 }

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

@@ -305,6 +305,7 @@ movable=1
 pileable=1
 decay=1
 value=10637 5318
+origin=lbr
 script=5052
 }
 
@@ -318,5 +319,6 @@ movable=1
 pileable=1
 decay=1
 value=10637 5318
+origin=lbr
 script=5053
 }

data/dictionaries/dictionary.CSY

@@ -2554,6 +2554,8 @@
 2794=pro %i zlato
 2795=Z trosek vylovíš nějaké drahokamy.
 2796=* Tvé tělo se zmítá v křečích z elektrického šoku *
+2797=Toto nemůžete použít při létání!
+2798=Byli jste uzemněni.
 // [2800-2999] House script
 2800=Vlastník domu:
 2801=VLASTNÍCI DOMU
@@ -3681,6 +3683,7 @@
 8212=Neplatná syntaxe příkazu pro opakované přidávání objektů: 'radd [hexID/decimalID], 'radditem [itemSection], 'raddnpc [npcSection]
 8213=ID sekce z DFNs objekt pochází z
 8214=Dá se předmět ukrást? 0 = nelze ukrást, 1 = lze ukrást, 2 = lze ukrást vzácně
+8215=Neplatný cíl. Vyberte platnou položku nebo NPC
 // [8300-8499] Tweak menu - Character property descriptions
 8300=Číslo účtu přidružené k hráči. Řízeno serverem (pouze pro čtení)
 8301=Typ umělé inteligence NPC

data/dictionaries/dictionary.ENG

@@ -2554,6 +2554,8 @@
 2794=for %i gold
 2795=You scrounge some gems from the wreckage.
 2796=* Your body convulses from electric shock *
+2797=You can't use this while flying!
+2798=You have been grounded.
 // [2800-2999] House script
 2800=House Owner:
 2801=CO-OWNERS
@@ -3681,6 +3683,7 @@
 8212=Valid command syntax for repeating adding objects: 'radd [hexID/decimalID], 'radditem [itemSection], 'raddnpc [npcSection]
 8213=Section ID from DFNs object originated from
 8214=Is item stealable? 0 = not stealable, 1 = stealable, 2 = stealable rare
+8215=Invalid target. Please select a valid item or NPC
 // [8300-8499] Tweak menu - Character property descriptions
 8300=Account number associated with player. Controlled by server (Read-Only)
 8301=NPC AI Type

data/dictionaries/dictionary.FRE

@@ -2718,6 +2718,8 @@
 2794=pour %i d'or
 2795=Vous récupérez quelques pierres précieuses dans les décombres.
 2796=* Votre corps convulse sous l'effet du choc électrique *
+2797=Vous ne pouvez pas l'utiliser en vol !
+2798=Vous avez été cloué au sol.
 // [2800-2999] House script
 2800=Propriétaire de la maison :
 2801=CO-PARENTS
@@ -3845,6 +3847,7 @@
 8212=Syntaxe de commande valide pour l'ajout répété d'objets : 'radd [hexID/decimalID], 'radditem [itemSection], 'raddnpc [npcSection].
 8213=Identification de la section dans les DFNs d'où provient l'objet.
 8214=L'objet est-il volable ? 0 = non volable, 1 = volable, 2 = volable rare
+8215=Cible invalide. Veuillez sélectionner un objet ou un PNJ valide
 // [8300-8499] Tweak menu - Character property descriptions
 8300=Numéro de compte associé au joueur. Contrôlé par le serveur (en lecture seule).
 8301=Type d'IA du PNJ

data/dictionaries/dictionary.GER

@@ -2554,6 +2554,8 @@
 2794=für %i Gold
 2795=Du schnappst dir ein paar Edelsteine aus den Trümmern.
 2796=* Dein Körper verkrampft sich durch den Stromschlag *
+2797=Sie können dies nicht während des Fliegens verwenden!
+2798=Sie haben Hausverbot.
 // [2800-2999] House script
 2800=Hauseigentümer:
 2801=HAUSBESITZER
@@ -3681,6 +3683,7 @@
 8212=Ungültige Befehlssyntax für wiederholtes Hinzufügen von Objekten: 'radd [hexID/decimalID], 'radditem [itemSection], 'raddnpc [npcSection]
 8213=Schnittstellen-ID aus DFNs, aus denen das Objekt stammt
 8214=Ist der Gegenstand stehlbar? 0 = nicht stehlbar, 1 = stehlbar, 2 = selten stehlbar
+8215=Ungültiges Ziel. Bitte wählen Sie einen gültigen Gegenstand oder NPC aus
 // [8300-8499] Tweak menu - Character property descriptions
 8300=Kontonummer, die dem Spieler zugeordnet ist. Wird vom Server gesteuert (Read-Only)
 8301=NPC-KI-Typ

data/dictionaries/dictionary.ITA

@@ -2554,6 +2554,8 @@
 2794=per %i oro
 2795=Raccolgi alcune gemme dai rottami.
 2796=* Il tuo corpo è in preda alle convulsioni a causa delle scosse elettriche.
+2797=Non puoi usarlo mentre voli!
+2798=Sei stato messo a terra.
 // [2800-2999] House Scripts
 2800=Proprietario della casa:
 2801=COOPERATORI
@@ -3681,6 +3683,7 @@
 8212=Sintassi comando non valida per ripetere l'aggiunta di oggetti: 'radd [hexID/decimalID], 'radditem [itemSection], 'raddnpc [npcSection]
 8213=Identità della sezione da cui proviene l'oggetto DFN
 8214=L'oggetto è rubabile? 0 = non rubabile, 1 = rubabile, 2 = rubabile raramente
+8215=Destinazione non valida. Seleziona un oggetto o NPC valido
 // [8300-8499] Tweak menu - Character property descriptions
 8300=Numero di account associato al giocatore. Controllato dal server (Solo lettura)
 8301=Tipo di IA del PNG

data/dictionaries/dictionary.POL

@@ -2554,6 +2554,8 @@
 2794=Za %i złota
 2795=Zgarniasz trochę klejnotów z wraku.
 2796=* Twoje ciało drży od porażenia prądem *.
+2797=Nie możesz tego używać podczas lotu!
+2798=Zostałeś uziemiony.
 // [2800-2999] Skrypt domu
 2800=Właściciel domu:
 2801=WŁAŚCICIELE
@@ -3681,6 +3683,7 @@
 8212=Nieprawidłowa składnia polecenia powtarzającego dodawanie obiektów: 'radd [hexID/decimalID], 'radditem [itemSection], 'raddnpc [npcSection]
 8213=Identyfikator sekcji z DFN, z którego pochodzi obiekt
 8214=Czy przedmiot można ukraść? 0 = nie można ukraść, 1 = można ukraść, 2 = można ukraść rzadko
+8215=Nieprawidłowy cel. Wybierz prawidłowy przedmiot lub NPC
 // [8300-8499] Menu ustawień - opisy właściwości znaków
 8300=Numer konta powiązanego z graczem. Kontrolowany przez serwer (tylko do odczytu)
 8301=Typ SI NPC

data/dictionaries/dictionary.PTG

@@ -2554,6 +2554,8 @@
 2794=para %i ouro
 2795=Vocês procuram algumas pedras preciosas nos destroços.
 2796=* Your body convulses from electric shock *
+2797=Você não pode usar isto enquanto voa!
+2798=Você foi castigado.
 // [2800-2999] House script
 2800=Possuidor da casa:
 2801=CO-PROPRIETÁRIOS
@@ -3681,6 +3683,7 @@
 8212=Sintaxe de comando válida para repetir a adição de objectos: 'radd [hexID/decimalID], 'radditem [itemSecção], 'raddnpc [npcSecção]
 8213=Secção ID do objecto do DFN originado de
 8214=O artigo pode ser roubado? 0 = não pode ser roubado, 1 = pode ser roubado, 2 = pode ser roubado raramente
+8215=Alvo inválido. Selecione um item ou NPC válido
 // [8300-8499] Tweak menu - Character property descriptions
 8300=Número de conta associado ao jogador. Controlado por servidor (Read-Only)
 8301=NPC Tipo de IA

data/dictionaries/dictionary.SPA

@@ -2554,6 +2554,8 @@
 2794=por %i oro
 2795=Buscas algunas gemas entre los escombros.
 2796=* Tu cuerpo convulsiona por la descarga eléctrica *
+2797=¡No puedes usar esto mientras vuelas!
+2798=Has sido castigado.
 // [2800-2999] Escritura de la casa
 2800=Propietario de la casa:
 2801=CO-OWNERS
@@ -3681,6 +3683,7 @@
 8212=Sintaxis de comando válida para repetir la adición de objetos: 'radd [hexID/decimalID], 'radditem [itemSection], 'raddnpc [npcSection]
 8213=Identificación de la sección de DFNs de la que procede el objeto
 8214=¿Se puede robar el objeto? 0 = no robable, 1 = robable, 2 = robable raro
+8215=Alvo inválido. Selecione um item ou NPC válido
 // [8300-8499] Menú de ajustes - Descripciones de las propiedades de los personajes
 8300=Número de cuenta asociado al jugador. Controlado por el servidor (sólo lectura)
 8301=Tipo de IA del PNJ

data/dictionaries/dictionary.ZRO

@@ -2554,6 +2554,8 @@
 2794=for %i gold
 2795=You scrounge some gems from the wreckage.
 2796=* Your body convulses from electric shock *
+2797=You can't use this while flying!
+2798=You have been grounded.
 // [2800-2999] House script
 2800=House Owner:
 2801=CO-OWNERS
@@ -3676,6 +3678,7 @@
 8212=Valid command syntax for repeating adding objects: 'radd [hexID/decimalID], 'radditem [itemSection], 'raddnpc [npcSection]
 8213=Section ID from DFNs object originated from
 8214=Is item stealable? 0 = not stealable, 1 = stealable, 2 = stealable rare
+8215=Invalid target. Please select a valid item or NPC
 // [8300-8499] Tweak menu - Character property descriptions
 8300=Account number associated with player. Controlled by server (Read-Only)
 8301=NPC AI Type

data/js/commands/targeting/dupe.js

@@ -21,6 +21,8 @@ function command_DUPE( socket, cmdString )
 
 function onCallback0( socket, ourObj )
 {
+	var targMsg = GetDictionaryEntry( 38, socket.language );
+
 	var cancelCheck = parseInt( socket.GetByte( 11 ));
 	if( cancelCheck == 255 )
 		return;
@@ -39,7 +41,7 @@ function onCallback0( socket, ourObj )
 					if( ValidateObject( newSpawner ))
 					{
 						newSpawner.spawnsection = ourObj.spawnsection;
-						if( ourObj.sectionalist )
+						if( ourObj.sectionalist ) 
 						{
 							newSpawner.sectionalist = true;
 						}
@@ -60,7 +62,7 @@ function onCallback0( socket, ourObj )
 					}
 					else
 					{
-						socket.SysMessage( GetDictionaryEntry( 8077, socket.language )); // Failed to dupe item.
+						socket.SysMessage(GetDictionaryEntry( 8077, socket.language )); // Failed to dupe item.
 						return;
 					}
 				}
@@ -69,9 +71,19 @@ function onCallback0( socket, ourObj )
 					ourObj.Dupe( socket );
 				}
 			}
+			var tempMsg = GetDictionaryEntry( 8078, socket.language ); // %i duped items have been placed in your backpack.
+			socket.SysMessage( tempMsg.replace( /%i/gi, numToDupe.toString() ));
+			socket.tempint = 0;
+		}
+		else
+		{
+			socket.SysMessage( GetDictionaryEntry( 8215, socket.language )); // Invalid target. Please select a valid item or NPC
+			socket.CustomTarget( 0, targMsg );
 		}
 	}
-	var tempMsg = GetDictionaryEntry( 8078, socket.language ); // %i duped items have been placed in your backpack.
-	socket.SysMessage( tempMsg.replace( /%i/gi, numToDupe.toString() ));
-	socket.tempint = 0;
+	else 
+	{
+		socket.SysMessage( GetDictionaryEntry( 8215, socket.language )); // Invalid target. Please select a valid item or NPC
+		socket.CustomTarget( 0, targMsg );
+	}
 }

data/js/item/ballofpetsummoning.js

@@ -115,6 +115,7 @@ function onCallback0( socket, myTarget)
 		socket.SysMessage( GetDictionaryEntry( 19054, socket.language )); // Only pets can be linked to this Crystal Ball of Pet Summoning.
 		return false;
 	}
+	iUsed.Refresh();
 	return false;
 }
 
@@ -128,6 +129,10 @@ function SummonPet( pUser, iUsed )
 	var reCharges = parseInt( myCharges[1] );
 	var maxCharges = parseInt( myCharges[2] );
 
+	var iTime = GetCurrentClock();
+	var NextUse = iUsed.GetTempTag( "delay" );
+	var Delay = 15000;
+
 	if( charges == 0)
 	{
 		pUser.SysMessage( GetDictionaryEntry( 19055, socket.language )); // The Crystal Ball darkens. It must be charged before it can be used again.
@@ -148,7 +153,7 @@ function SummonPet( pUser, iUsed )
 		socket.SysMessage( GetDictionaryEntry( 19058, socket.language )); // The Crystal Ball fills with a grey mist. You are not the owner of the pet you are attempting to summon.
 		return false;
 	}
-	else if( iUsed.GetTempTag( "delay" ) == 1)
+	else if( ( iTime - NextUse ) < Delay ) 
 	{
 		socket.SysMessage( GetDictionaryEntry( 19059, socket.language )); // You must wait a few seconds before you can summon your pet.
 		return false;
@@ -180,8 +185,7 @@ function SummonPet( pUser, iUsed )
 			}
 
 			iUsed.SetTag( "charges", charges - requiredCharges + "|" + reCharges + "|" + maxCharges );
-			iUsed.SetTempTag( "delay", 1 );
-			iUsed.StartTimer( 15000, 0, true );
+			iUsed.SetTempTag( "delay", iTime.toString() );
 			socket.SysMessage( GetDictionaryEntry( 19060, socket.language )); // The Crystal Ball fills with a green mist. Your pet has been summoned.
 		}
 	}
@@ -208,14 +212,6 @@ function ReleasePet( petObj, petNum, pUser )
 	petObj.Follow( pUser );
 }
 
-function onTimer( iUsed, timerID )
-{
-	if( timerID == 0 )
-	{
-		iUsed.SetTempTag( "delay", null );
-	}
-}
-
 function onContextMenuRequest( socket, targObj )
 {
 	var Pet = CalcCharFromSer(parseInt( targObj.GetTag( "petSerial" )));
@@ -304,6 +300,7 @@ function onContextMenuSelect( socket, targObj, popupEntry )
 			socket.SysMessage( GetDictionaryEntry( 19062, socket.language )); // This crystal ball is no longer linked to a pet.
 			targObj.SetTag( "petSerial", null );
 			targObj.SetTag( "linked", null );
+			targObj.Refresh();
 			break;
 	}
 	return false;
@@ -312,6 +309,7 @@ function onContextMenuSelect( socket, targObj, popupEntry )
 function onSpeechInput( pUser, targObj, pSpeech, pSpeechID )
 {
 	var pSocket = pUser.socket;
+	var iUsed = pSocket.tempObj;
 	if( pSpeech == null || pSpeech == " " )
 	{
 		pSocket.SysMessage( GetDictionaryEntry( 9270, pSocket.language )); // That name is too short, or no name was entered.
@@ -330,8 +328,9 @@ function onSpeechInput( pUser, targObj, pSpeech, pSpeechID )
 			if( ValidateObject( targObj ))
 			{
 				targObj.name = pSpeech;
-				var tempMsg = GetDictionaryEntry( 19063, socket.language ); // The new name of the Pet is: %s
+				var tempMsg = GetDictionaryEntry( 19063, pSocket.language ); // The new name of the Pet is: %s
 				pSocket.SysMessage( tempMsg.replace( /%s/gi, targObj.name ));
+				iUsed.Refresh();
 			}
 			else
 			{