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

14
Scripts/Engines/Plants/PlantHue.cs
View file

@ -7,11 +7,11 @@ namespace Server.Engines.Plants
[Flags]
public enum PlantHue
{
Plain = 0x1 | Crossable,
Plain = 0x1 | Crossable | Reproduces,
Red = 0x2 | Crossable,
Blue = 0x4 | Crossable,
Yellow = 0x8 | Crossable,
Red = 0x2 | Crossable | Reproduces,
Blue = 0x4 | Crossable | Reproduces,
Yellow = 0x8 | Crossable | Reproduces,
BrightRed = Red | Bright,
BrightBlue = Blue | Bright,
@ -33,6 +33,7 @@ namespace Server.Engines.Plants
FireRed = 0x200,
None = 0,
Reproduces = 0x2000000,
Crossable = 0x4000000,
Bright = 0x8000000
}
@ -87,6 +88,11 @@ namespace Server.Engines.Plants
}
}
public static bool CanReproduce( PlantHue plantHue )
{
return (plantHue & PlantHue.Reproduces) != PlantHue.None;
}
public static bool IsCrossable( PlantHue plantHue )
{
return (plantHue & PlantHue.Crossable) != PlantHue.None;