warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Various House Raffle fixes - http://jira.runuo.com/browse/RUNUO-94

Browse source 
Pet friends should have access to pack animals' backpacks - http://jira.runuo.com/browse/RUNUO-95
Animal Lore wrong GM skill perk - http://jira.runuo.com/browse/RUNUO-92
This commit is contained in:
athena 2011-11-20 04:46:44 +00:00
parent 216824a9b4
commit 44a4693fda
8 changed files with 193 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

131
Scripts/Items/Special/House Raffle/HouseRaffleDeed.cs
View file

@ -1,15 +1,24 @@
using System;
using Server;
using Server.Gumps;
using Server.Misc;
namespace Server.Items
{
public class HouseRaffleDeed : Item
{
private HouseRaffleStone m_Stone;
private Point3D m_PlotLocation;
private Map m_Facet;
private Mobile m_AwardedTo;
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Seer )]
public HouseRaffleStone Stone
{
get { return m_Stone; }
set { m_Stone = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Seer )]
public Point3D PlotLocation
{
@ -31,6 +40,12 @@ namespace Server.Items
set { m_AwardedTo = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Seer )]
public bool IsExpired
{
get { return ( m_Stone == null || m_Stone.Deleted || m_Stone.IsExpired ); }
}
public override string DefaultName
{
get { return "a writ of lease"; }
@ -43,14 +58,20 @@ namespace Server.Items
[Constructable]
public HouseRaffleDeed()
: this ( Point3D.Zero, null, null )
: this ( null, null )
{
}
public HouseRaffleDeed( Point3D loc, Map facet, Mobile m ) : base( 0x2830 )
public HouseRaffleDeed( HouseRaffleStone stone, Mobile m ) : base( 0x2830 )
{
m_PlotLocation = loc;
m_Facet = facet;
m_Stone = stone;
if ( stone != null )
{
m_PlotLocation = stone.GetPlotCenter();
m_Facet = stone.PlotFacet;
}
m_AwardedTo = m;
LootType = LootType.Blessed;
@ -75,17 +96,38 @@ namespace Server.Items
{
list.Add( 1060658, "location\t{0}", HouseRaffleStone.FormatLocation( m_PlotLocation, m_Facet, false ) ); // ~1_val~: ~2_val~
list.Add( 1060659, "facet\t{0}", m_Facet ); // ~1_val~: ~2_val~
list.Add( 1150486 ); // [Marked Item]
}
if ( IsExpired )
list.Add( 1150487 ); // [Expired]
//list.Add( 1060660, "shard\t{0}", ServerList.ServerName ); // ~1_val~: ~2_val~
}
public override void OnDoubleClick( Mobile from )
{
if ( !ValidLocation() )
return;
if ( IsChildOf( from.Backpack ) )
{
from.CloseGump( typeof( WritOfLeaseGump ) );
from.SendGump( new WritOfLeaseGump( this ) );
}
else
{
from.SendLocalizedMessage( 1042001 ); // That must be in your pack for you to use it.
}
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int) 0 ); // version
writer.Write( (int) 1 ); // version
writer.Write( m_Stone );
writer.Write( m_PlotLocation );
writer.Write( m_Facet );
writer.Write( m_AwardedTo );
@ -99,6 +141,12 @@ namespace Server.Items
switch ( version )
{
case 1:
{
m_Stone = reader.ReadItem<HouseRaffleStone>();
goto case 0;
}
case 0:
{
m_PlotLocation = reader.ReadPoint3D();
@ -109,5 +157,78 @@ namespace Server.Items
}
}
}
private class WritOfLeaseGump : Gump
{
public WritOfLeaseGump( HouseRaffleDeed deed ) : base( 150, 50 )
{
AddPage( 0 );
AddImage( 0, 0, 9380 );
AddImage( 114, 0, 9381 );
AddImage( 171, 0, 9382 );
AddImage( 0, 140, 9383 );
AddImage( 114, 140, 9384 );
AddImage( 171, 140, 9385 );
AddImage( 0, 182, 9383 );
AddImage( 114, 182, 9384 );
AddImage( 171, 182, 9385 );
AddImage( 0, 224, 9383 );
AddImage( 114, 224, 9384 );
AddImage( 171, 224, 9385 );
AddImage( 0, 266, 9386 );
AddImage( 114, 266, 9387 );
AddImage( 171, 266, 9388 );
AddHtmlLocalized( 30, 48, 229, 20, 1150484, 200, false, false ); // WRIT OF LEASE
AddHtml( 28, 75, 231, 280, FormatDescription( deed ), false, true );
}
private static string FormatDescription( HouseRaffleDeed deed )
{
if ( deed == null )
return String.Empty;
if ( deed.IsExpired )
{
return String.Format(
"<bodytextblack>" +
"This deed once entitled the bearer to build a house on the plot of land " +
"located at {0} on the {1} facet.<br><br>" +
"The deed has expired, and now the indicated plot of land " +
"is subject to normal house construction rules.<br><br>" +
"This deed functions as a recall rune marked for the location of the plot it represents." +
"</bodytextblack>",
HouseRaffleStone.FormatLocation( deed.PlotLocation, deed.PlotFacet, false ),
deed.PlotFacet
);
}
else
{
int daysLeft = (int)Math.Ceiling( ( deed.Stone.Started + deed.Stone.Duration + HouseRaffleStone.ExpirationTime - DateTime.Now ).TotalDays );
return String.Format(
"<bodytextblack>" +
"This deed entitles the bearer to build a house on the plot of land " +
"located at {0} on the {1} facet.<br><br>" +
"The deed will expire after {2} more day{3} have passed, and at that time the right to place " +
"a house reverts to normal house construction rules.<br><br>" +
"This deed functions as a recall rune marked for the location of the plot it represents.<br><br>" +
"To place a house on the deeded plot, you must simply have this deed in your backpack " +
"or bank box when using a House Placement Tool there." +
"</bodytextblack>",
HouseRaffleStone.FormatLocation( deed.PlotLocation, deed.PlotFacet, false ),
deed.PlotFacet,
daysLeft,
( daysLeft == 1 ) ? "" : "s"
);
}
}
}
}
}

34
Scripts/Items/Special/House Raffle/HouseRaffleRegion.cs
View file

@ -20,20 +20,36 @@ namespace Server.Regions
public override bool AllowHousing( Mobile from, Point3D p )
{
if ( m_Stone == null || m_Stone.Deed == null )
if ( m_Stone == null )
return false;
if ( m_Stone.IsExpired )
return true;
if ( m_Stone.Deed == null )
return false;
Container pack = from.Backpack;
if ( pack != null )
{
List<HouseRaffleDeed> deeds = pack.FindItemsByType<HouseRaffleDeed>();
if ( pack != null && ContainsDeed( pack ) )
return true;
for ( int i = 0; i < deeds.Count; i++ )
{
if ( deeds[i] == m_Stone.Deed )
return true;
}
BankBox bank = from.FindBankNoCreate();
if ( bank != null && ContainsDeed( bank ) )
return true;
return false;
}
private bool ContainsDeed( Container cont )
{
List<HouseRaffleDeed> deeds = cont.FindItemsByType<HouseRaffleDeed>();
for ( int i = 0; i < deeds.Count; ++i )
{
if ( deeds[i] == m_Stone.Deed )
return true;
}
return false;

18
Scripts/Items/Special/House Raffle/HouseRaffleStone.cs
View file

@ -83,7 +83,7 @@ namespace Server.Items
private const int DefaultTicketPrice = 5000;
private const int MessageHue = 1153;
private static readonly TimeSpan ExpirationTime = TimeSpan.FromDays( 30.0 );
public static readonly TimeSpan ExpirationTime = TimeSpan.FromDays( 30.0 );
private HouseRaffleRegion m_Region;
private Rectangle2D m_Bounds;
@ -355,7 +355,7 @@ namespace Server.Items
return result.ToString();
}
private Point3D GetPlotCenter()
public Point3D GetPlotCenter()
{
int x = m_Bounds.X + m_Bounds.Width / 2;
int y = m_Bounds.Y + m_Bounds.Height / 2;
@ -394,10 +394,20 @@ namespace Server.Items
}
else if ( m_Winner != null )
{
list.Add( 1060658, "won by\t{0}", m_Winner.Name ); // ~1_val~: ~2_val~
list.Add( 1060658, "winner\t{0}", m_Winner.Name ); // ~1_val~: ~2_val~
}
}
public override void OnSingleClick( Mobile from )
{
base.OnSingleClick( from );
if ( m_Active )
LabelTo( from, 1060658, String.Format( "Ends\t{0}", m_Started + m_Duration ) ); // ~1_val~: ~2_val~
else if ( m_Winner != null )
LabelTo( from, 1060658, String.Format( "Winner\t{0}", m_Winner.Name ) ); // ~1_val~: ~2_val~
}
public override void GetContextMenuEntries( Mobile from, List<ContextMenuEntry> list )
{
base.GetContextMenuEntries( from, list );
@ -484,7 +494,7 @@ namespace Server.Items
if ( m_Winner != null )
{
m_Deed = new HouseRaffleDeed( GetPlotCenter(), m_Facet, m_Winner );
m_Deed = new HouseRaffleDeed( this, m_Winner );
m_Winner.SendMessage( MessageHue, "Congratulations, {0}! You have won the raffle for the plot located at {1}.", m_Entries[winner].From.Name, FormatLocation() );

2
Scripts/Mobiles/Animals/Misc/PackHorse.cs
View file

@ -176,7 +176,7 @@ namespace Server.Mobiles
if ( from == animal || from.AccessLevel >= AccessLevel.GameMaster )
return true;
if ( from.Alive && animal.Controlled && !animal.IsDeadPet && (from == animal.ControlMaster || from == animal.SummonMaster) )
if ( from.Alive && animal.Controlled && !animal.IsDeadPet && ( from == animal.ControlMaster || from == animal.SummonMaster || animal.IsPetFriend( from ) ) )
return true;
return false;

8
Scripts/Multis/Deeds.cs
View file

@ -4,6 +4,7 @@ using System.Collections;
using Server.Multis;
using Server.Targeting;
using Server.Items;
using Server.Regions;
namespace Server.Multis.Deeds
{
@ -33,6 +34,8 @@ namespace Server.Multis.Deeds
m_Deed.OnPlacement( from, p );
else if ( reg.IsPartOf( typeof( TreasureRegion ) ) )
from.SendLocalizedMessage( 1043287 ); // The house could not be created here. Either something is blocking the house, or the house would not be on valid terrain.
else if ( reg.IsPartOf( typeof( HouseRaffleRegion ) ) )
from.SendLocalizedMessage( 1150493 ); // You must have a deed for this plot of land in order to build here.
else
from.SendLocalizedMessage( 501265 ); // Housing can not be created in this area.
}
@ -205,6 +208,11 @@ namespace Server.Multis.Deeds
from.SendLocalizedMessage( 501270 ); //Lord British has decreed a 'no build' period, thus you cannot build this house at this time.
break;
}
case HousePlacementResult.BadRegionRaffle:
{
from.SendLocalizedMessage( 1150493 ); // You must have a deed for this plot of land in order to build here.
break;
}
}
}
}

4
Scripts/Multis/HousePlacement.cs
View file

@ -21,6 +21,7 @@ namespace Server.Multis
BadRegionHidden,
BadRegionTemp,
InvalidCastleKeep,
BadRegionRaffle
}
public class HousePlacement
@ -114,6 +115,9 @@ namespace Server.Multis
if ( reg.IsPartOf( typeof( TreasureRegion ) ) )
return HousePlacementResult.BadRegionHidden;
if ( reg.IsPartOf( typeof( HouseRaffleRegion ) ) )
return HousePlacementResult.BadRegionRaffle;
return HousePlacementResult.BadRegion;
}

13
Scripts/Multis/HousePlacementTool.cs
View file

@ -4,6 +4,7 @@ using Server;
using Server.Gumps;
using Server.Multis;
using Server.Mobiles;
using Server.Regions;
using Server.Targeting;
namespace Server.Items
@ -249,6 +250,8 @@ namespace Server.Items
m_Placed = m_Entry.OnPlacement( from, p );
else if ( reg.IsPartOf( typeof( TreasureRegion ) ) )
from.SendLocalizedMessage( 1043287 ); // The house could not be created here. Either something is blocking the house, or the house would not be on valid terrain.
else if ( reg.IsPartOf( typeof( HouseRaffleRegion ) ) )
from.SendLocalizedMessage( 1150493 ); // You must have a deed for this plot of land in order to build here.
else
from.SendLocalizedMessage( 501265 ); // Housing can not be created in this area.
}
@ -428,6 +431,11 @@ namespace Server.Items
from.SendLocalizedMessage( 501270 ); // Lord British has decreed a 'no build' period, thus you cannot build this house at this time.
break;
}
case HousePlacementResult.BadRegionRaffle:
{
from.SendLocalizedMessage( 1150493 ); // You must have a deed for this plot of land in order to build here.
break;
}
case HousePlacementResult.InvalidCastleKeep:
{
from.SendLocalizedMessage( 1061122 ); // Castles and keeps cannot be created here.
@ -526,6 +534,11 @@ namespace Server.Items
from.SendLocalizedMessage( 501270 ); //Lord British has decreed a 'no build' period, thus you cannot build this house at this time.
break;
}
case HousePlacementResult.BadRegionRaffle:
{
from.SendLocalizedMessage( 1150493 ); // You must have a deed for this plot of land in order to build here.
break;
}
case HousePlacementResult.InvalidCastleKeep:
{
from.SendLocalizedMessage( 1061122 ); // Castles and keeps cannot be created here.

4
Scripts/Skills/AnimalLore.cs
View file

@ -42,11 +42,11 @@ namespace Server.SkillHandlers
{
if ( c.Body.IsAnimal || c.Body.IsMonster || c.Body.IsSea )
{
if ( (!c.Controlled || !c.Tamable) && from.Skills[SkillName.AnimalLore].Value < 100.0 )
if ( !c.Controlled && from.Skills[SkillName.AnimalLore].Value < 100.0 )
{
from.SendLocalizedMessage( 1049674 ); // At your skill level, you can only lore tamed creatures.
}
else if ( !c.Tamable && from.Skills[SkillName.AnimalLore].Value < 110.0 )
else if ( !c.Controlled && !c.Tamable && from.Skills[SkillName.AnimalLore].Value < 110.0 )
{
from.SendLocalizedMessage( 1049675 ); // At your skill level, you can only lore tamed or tameable creatures.
}