Merge remote-tracking branch 'origin/master'

UONelderim · Sep 21, 2024 · 103be0c · 103be0c
2 parents 6c44f22 + 883d80d
commit 103be0c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/Scripts/Engines/BulkOrders/Books/BOBSmallEntry.cs b/Scripts/Engines/BulkOrders/Books/BOBSmallEntry.cs
@@ -104,7 +104,15 @@ public void Serialize( GenericWriter writer )
 
 			writer.Write( (bool) m_RequireExceptional );
 
-			writer.WriteEncodedInt( (int) m_DeedType );
+			if (World.ServUOSave && m_DeedType == BODType.Fletcher)
+			{
+				writer.WriteEncodedInt((int)BODType.ServUOFletcher);
+			}
+			else
+			{
+				writer.WriteEncodedInt((int)m_DeedType);
+			}
+
 			writer.WriteEncodedInt( (int) m_Material );
 			writer.WriteEncodedInt( (int) m_AmountCur );
 			writer.WriteEncodedInt( (int) m_AmountMax );

diff --git a/Scripts/Engines/BulkOrders/Books/BODType.cs b/Scripts/Engines/BulkOrders/Books/BODType.cs
@@ -6,6 +6,7 @@ public enum BODType
 	{
 		Smith,
 		Tailor,
-		Fletcher
+		Fletcher,
+		ServUOFletcher = 5
 	}
 }
diff --git a/Scripts/Items/Special/Solen Items/BallOfSummoning.cs b/Scripts/Items/Special/Solen Items/BallOfSummoning.cs
@@ -119,7 +119,7 @@ public override void GetContextMenuEntries( Mobile from, List<ContextMenuEntry>
 				}
 				else
 				{
-					list.Add( new BallEntry( new BallCallback( SummonPet ), 6181 ) );
+					list.Add( new BallEntry( new BallCallback( CastSummonPet ), 6181 ) );
 					list.Add( new BallEntry( new BallCallback( UpdatePetName ), 6183 ) );
 					list.Add( new BallEntry( new BallCallback( UnlinkPet ), 6182 ) );
 				}

diff --git a/Scripts/Nelderim/Engines/MacroCheck/CheckPlayer.cs b/Scripts/Nelderim/Engines/MacroCheck/CheckPlayer.cs
@@ -47,22 +47,16 @@ public void PlayerRequest( bool isTrue )
 				TimeSpan clickbutton = DateTime.Now - m_Start;
 
 				if ( isTrue )
-					m_GM.SendMessage( 0x40, "Gracz {0} poprawnie odpowiedzial na wezwanie w czasie {1} sekund.", m_Player.Name , TimeSpanFormat( clickbutton ) );
+					m_GM.SendMessage( 0x40, "Gracz {0} poprawnie odpowiedzial na wezwanie w czasie {1} sekund.", m_Player.Name , clickbutton.TotalSeconds );
 				else
-					m_GM.SendMessage( 0x20, "Gracz {0} blednie odpowiedzial na wezwanie w czasie {1} sekund.", m_Player.Name , TimeSpanFormat( clickbutton ) );
+					m_GM.SendMessage( 0x20, "Gracz {0} blednie odpowiedzial na wezwanie w czasie {1} sekund.", m_Player.Name , clickbutton.TotalSeconds );
 			}
 
 			public void PlayerRequest()
 			{
 			 	PlayerRequest( true );
 			}
-
-
-			public static string TimeSpanFormat( TimeSpan time )
-			{
-				return String.Format("{0}", time.Seconds );
-			}
-
+
 			public void TimeOut()
 			{
 				if ( m_Timer != null )