fixses

DragonSlayer62 · Dec 11, 2023 · eccb535 · eccb535
1 parent 0564428
commit eccb535
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 13 deletions.
diff --git a/data/dictionaries/dictionary.ENG b/data/dictionaries/dictionary.ENG
@@ -4287,7 +4287,7 @@
 9401=This magic item is out of charges.
 9402=[Unidentified]
 9403=uses remaining: %i
-9404=with %d charges
+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.

diff --git a/data/dictionaries/dictionary.ZRO b/data/dictionaries/dictionary.ZRO
@@ -4243,7 +4243,7 @@
 9401=This magic item is out of charges.
 9402=[Unidentified]
 9403=uses remaining: %i
-9404=with %d charges
+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.

diff --git a/data/js/item/sandminingbook.js b/data/js/item/sandminingbook.js
@@ -8,22 +8,18 @@ function onUseChecked( pUser, iUsed )
 		if( itemOwner == null || itemOwner.serial != pUser.serial )
 		{
 			socket.SysMessage( GetDictionaryEntry( 1763, pSock.language )); // That item must be in your backpack before it can be used.
-			return false;
 		}
 		else if( pUser.skills[45] < 1000 )
 		{
 			socket.SysMessage( GetDictionaryEntry( 9408, pSock.language )); // Only a Grandmaster Miner can learn from this book.
-			return false;
 		}
 		else if( pUser.GetTag( "GatheringSand" ) == 1 )
 		{
 			socket.SysMessage( GetDictionaryEntry( 9409, pSock.language )); // You have already learned this information.
-			return false;
 		}
 		else if( iUsed.movable == 2 || iUsed.movable == 3 )
 		{
 			socket.SysMessage( GetDictionaryEntry( 774, socket.Language )); //That is locked down and you cannot use it
-			return false;
 		}
 		else 
 		{

diff --git a/data/js/item/stoneminingbook.js b/data/js/item/stoneminingbook.js
@@ -8,22 +8,18 @@ function onUseChecked( pUser, iUsed )
 		if( itemOwner == null || itemOwner.serial != pUser.serial )
 		{
 			socket.SysMessage( GetDictionaryEntry( 1763, pSock.language )); // That item must be in your backpack before it can be used.
-			return false;
 		}
 		else if( pUser.skills[45] < 1000 )
 		{
 			socket.SysMessage( GetDictionaryEntry( 9408, pSock.language )); // Only a Grandmaster Miner can learn from this book.
-			return false;
 		}
 		else if( pUser.GetTag( "GatheringStone" ) == 1 )
 		{
 			socket.SysMessage( GetDictionaryEntry( 9409, pSock.language )); // You have already learned this information.
-			return false;
 		}
 		else if( iUsed.movable == 2 || iUsed.movable == 3 )
 		{
 			socket.SysMessage( GetDictionaryEntry( 774, socket.Language )); //That is locked down and you cannot use it
-			return false;
 		}
 		else 
 		{

diff --git a/data/js/skill/mining.js b/data/js/skill/mining.js
@@ -442,7 +442,7 @@ function onTimer( mChar, timerID )
 						// Remove some ore from the ore resource
 						mResource.oreAmount = mResource.oreAmount - 1;
 
-						if( mChar.GetTag( "GatheringStone" ) == 1 && chance > Math.random() * 100 ) 
+						if( mChar.GetTag( "GatheringStone" ) == 1 ) 
 						{
 							var mItem;
 							var totalChance = 0;
@@ -465,8 +465,12 @@ function onTimer( mChar, timerID )
 							totalChance += 15;
 
 							var chance = totalChance || 15;
-							// Create granite in player's backpack
-							MakeGranite( socket, mChar );
+
+							if( chance > Math.random() * 100 )
+							{
+								// Create granite in player's backpack
+								MakeGranite( socket, mChar );
+							}
 						}
 
 						// Create ore in player's backpack