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

Revision: 1073

Browse source 
Author: eos
Date: Saturday, May 25, 2013 2:53:05 PM
Message:
Fixed guild roster ordering.
----
Modified : /devel/Scripts/Gumps/Guilds/New Guild System/GuildRosterGump.cs

Revision: 1072
Author: eos
Date: Thursday, May 23, 2013 8:36:04 AM
Message:
Plant labeling:
- Added OSI clilocs for cocoa trees and sugar canes.
- Plant hue no longer takes priority over plant category if the plant type is unknown.
----
Modified : /devel/Scripts/Engines/Plants/PlantItem.cs
Modified : /devel/Scripts/Engines/Plants/PlantType.cs
Modified : /devel/Scripts/Engines/Plants/Seed.cs

Revision: 1071
Author: mark
Date: Wednesday, May 22, 2013 10:38:29 AM
Message:
core wait events
----
Modified : /devel/Server/Main.cs
Modified : /devel/Server/Network/Packets.cs

Revision: 1070
Author: eos
Date: Monday, May 20, 2013 3:26:40 PM
Message:
Added support for the High Seas relative drop.
----
Modified : /devel/Scripts/Multis/Boats/BaseBoat.cs
Modified : /devel/Server/Items/BaseMulti.cs
Modified : /devel/Server/Network/PacketHandlers.cs

Revision: 1069
Author: eos
Date: Saturday, May 18, 2013 9:21:10 PM
Message:
Added another missing deserialization fix for plants.
----
Modified : /devel/Scripts/Engines/Plants/PlantSystem.cs

Revision: 1068
Author: eos
Date: Saturday, May 18, 2013 9:03:52 PM
Message:
Added missing deserialization fix for plants.
----
Modified : /devel/Scripts/Engines/Plants/PlantItem.cs
Modified : /devel/Scripts/Engines/Plants/Seed.cs

Revision: 1067
Author: eos
Date: Saturday, May 18, 2013 4:29:20 PM
Message:
T2A arena region fix.
----
Modified : /devel/Data/Regions.xml

Revision: 1066
Author: eos
Date: Saturday, May 18, 2013 2:58:35 PM
Message:
- Sync with GoogleCode repo (sans unix line endings).
- Tab woes.
----
Modified : /devel/Data/Regions.xml
Modified : /devel/Scripts/Engines/Plants/PlantType.cs

Revision: 1065
Author: eos
Date: Saturday, May 18, 2013 2:48:32 PM
Message:
- Added cocoa trees.
- Unifying PlantItem labeling for extensibility and compacter code.
- Misc plant system cleanup.
----
Modified : /devel/Scripts/Engines/Plants/PlantSystem.cs
Modified : /devel/Scripts/Engines/Plants/PlantItem.cs
Modified : /devel/Scripts/Engines/Plants/Seed.cs
Modified : /devel/Scripts/Engines/Plants/PlantType.cs
Modified : /devel/Scripts/Engines/Plants/PlantHue.cs
Modified : /devel/Scripts/Engines/Plants/PlantResources.cs
Modified : /devel/Scripts/Engines/Plants/ReproductionGump.cs
This commit is contained in:
mark@runuo.com 2013-05-28 17:44:07 +00:00
parent 9af96be241
commit fb0368e201
14 changed files with 2681 additions and 2600 deletions
Download patch file Download diff file Expand all files Collapse all files

63
Scripts/Engines/Plants/Seed.cs
View file

@ -94,44 +94,42 @@ namespace Server.Engines.Plants
private int GetLabel( out string args )
{
PlantTypeInfo typeInfo = PlantTypeInfo.GetInfo( m_PlantType );
PlantHueInfo hueInfo = PlantHueInfo.GetInfo( m_PlantHue );
int title = PlantTypeInfo.GetBonsaiTitle( m_PlantType );
if ( title == 0 ) // Not a bonsai
title = hueInfo.Name;
int title;
int label;
if ( m_ShowType || typeInfo.PlantCategory == PlantCategory.Default )
title = hueInfo.Name;
else
title = (int)typeInfo.PlantCategory;
if ( Amount == 1 )
label = m_ShowType ? 1061917 : 1060838; // ~1_COLOR~ ~2_TYPE~ seed : ~1_val~ seed
{
if ( m_ShowType )
{
args = String.Format( "#{0}\t#{1}", title, typeInfo.Name );
return typeInfo.GetSeedLabel( hueInfo );
}
else
{
args = String.Format( "#{0}", title );
return hueInfo.IsBright() ? 1060839 : 1060838; // [bright] ~1_val~ seed
}
}
else
label = m_ShowType ? 1113492 : 1113490; // ~1_amount~ ~2_color~ ~3_type~ seeds : ~1_amount~ ~2_val~ seeds
if ( hueInfo.IsBright() )
++label;
StringBuilder ab = new StringBuilder();
if ( Amount != 1 )
{
ab.Append( Amount );
ab.Append( '\t' );
if ( m_ShowType )
{
args = String.Format( "{0}\t#{1}\t#{2}", Amount, title, typeInfo.Name );
return typeInfo.GetSeedLabelPlural( hueInfo );
}
else
{
args = String.Format( "{0}\t#{1}", Amount, title );
return hueInfo.IsBright() ? 1113491 : 1113490; // ~1_amount~ [bright] ~2_val~ seeds
}
}
ab.Append( '#' );
ab.Append( title );
if ( m_ShowType )
{
PlantTypeInfo typeInfo = PlantTypeInfo.GetInfo( m_PlantType );
ab.Append( "\t#" );
ab.Append( typeInfo.Name );
}
args = ab.ToString();
return label;
}
public override void AddNameProperty( ObjectPropertyList list )
@ -225,7 +223,7 @@ namespace Server.Engines.Plants
{
base.Serialize( writer );
writer.Write( (int) 1 ); // version
writer.Write( (int) 2 ); // version
writer.Write( (int) m_PlantType );
writer.Write( (int) m_PlantHue );
@ -247,6 +245,9 @@ namespace Server.Engines.Plants
if ( version < 1 )
Stackable = Core.SA;
if ( version < 2 && PlantHueInfo.IsCrossable( m_PlantHue ) )
m_PlantHue |= PlantHue.Reproduces;
}
}
}