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

#W# Exhuation system implimented. And Food has been tweaked.

Browse source
This commit is contained in:
WarrentyExpired 2026-07-24 21:01:31 -04:00
parent 6cb014d51c
commit 15bb9dccb8
9 changed files with 211 additions and 181 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Scripts/Items/Food/Beverage.cs
View file

@ -33,7 +33,7 @@ namespace Server.Items
public class BeverageBottle : BaseBeverage
{
public override int BaseLabelNumber { get { return 1042959; } } // a bottle of Ale
public override int MaxQuantity { get { return 5; } }
public override int MaxQuantity { get { return 20; } }
public override bool Fillable { get { return false; } }
public override int ComputeItemID()
@ -112,7 +112,7 @@ namespace Server.Items
public class Jug : BaseBeverage
{
public override int BaseLabelNumber { get { return 1042965; } } // a jug of Ale
public override int MaxQuantity { get { return 10; } }
public override int MaxQuantity { get { return 25; } }
public override bool Fillable { get { return false; } }
public override int ComputeItemID()
@ -153,7 +153,7 @@ namespace Server.Items
public class CeramicMug : BaseBeverage
{
public override int BaseLabelNumber { get { return 1042982; } } // a ceramic mug of Ale
public override int MaxQuantity { get { return 1; } }
public override int MaxQuantity { get { return 5; } }
public override int ComputeItemID()
{
@ -201,7 +201,7 @@ namespace Server.Items
public class PewterMug : BaseBeverage
{
public override int BaseLabelNumber { get { return 1042994; } } // a pewter mug with Ale
public override int MaxQuantity { get { return 1; } }
public override int MaxQuantity { get { return 5; } }
public override int ComputeItemID()
{
@ -247,7 +247,7 @@ namespace Server.Items
public class Goblet : BaseBeverage
{
public override int BaseLabelNumber { get { return 1043000; } } // a goblet of Ale
public override int MaxQuantity { get { return 1; } }
public override int MaxQuantity { get { return 5; } }
public override int ComputeItemID()
{
@ -398,7 +398,7 @@ namespace Server.Items
public class Pitcher : BaseBeverage
{
public override int BaseLabelNumber { get { return 1048128; } } // a Pitcher of Ale
public override int MaxQuantity { get { return 5; } }
public override int MaxQuantity { get { return 25; } }
public override int ComputeItemID()
{
@ -978,24 +978,24 @@ namespace Server.Items
from.PlaySound( 0x4E );
}
}
else if ( from == targ && from.Thirst >= 20 )
else if ( from == targ && from.Thirst >= 100 )
{
from.SendMessage( "You are too quenched to drink more." );
}
else if ( from == targ )
{
int thirst = 1;
int thirst = 10;
switch( Content )
{
case BeverageType.Ale: thirst = 3; break;
case BeverageType.Cider: thirst = 2; break;
case BeverageType.Liquor: thirst = 1; break;
case BeverageType.Milk: thirst = 1; break;
case BeverageType.Wine: thirst = 2; break;
case BeverageType.Ale: thirst = 15; break;
case BeverageType.Cider: thirst = 10; break;
case BeverageType.Liquor: thirst = 5; break;
case BeverageType.Milk: thirst = 20; break;
case BeverageType.Wine: thirst = 10; break;
}
if( from.Thirst < 20 )
if( from.Thirst < 100 )
from.Thirst += thirst;
if( ContainsAlchohol )

24
Scripts/Items/Food/Bowls.cs
View file

@ -63,7 +63,7 @@ namespace Server.Items
{
Stackable = false;
Weight = 1.0;
FillFactor = 2;
FillFactor = 10;
}
public override bool Eat( Mobile from )
@ -101,7 +101,7 @@ namespace Server.Items
{
Stackable = false;
Weight = 1.0;
FillFactor = 2;
FillFactor = 10;
}
public override bool Eat( Mobile from )
@ -139,7 +139,7 @@ namespace Server.Items
{
Stackable = false;
Weight = 1.0;
FillFactor = 2;
FillFactor = 8;
}
public override bool Eat( Mobile from )
@ -177,7 +177,7 @@ namespace Server.Items
{
Stackable = false;
Weight = 1.0;
FillFactor = 2;
FillFactor = 8;
}
public override bool Eat( Mobile from )
@ -215,7 +215,7 @@ namespace Server.Items
{
Stackable = false;
Weight = 1.0;
FillFactor = 2;
FillFactor = 10;
}
public override bool Eat( Mobile from )
@ -253,7 +253,7 @@ namespace Server.Items
{
Stackable = false;
Weight = 1.0;
FillFactor = 2;
FillFactor = 10;
}
public override bool Eat( Mobile from )
@ -291,7 +291,7 @@ namespace Server.Items
{
Stackable = false;
Weight = 1.0;
FillFactor = 2;
FillFactor = 8;
}
public override bool Eat( Mobile from )
@ -329,7 +329,7 @@ namespace Server.Items
{
Stackable = false;
Weight = 1.0;
FillFactor = 2;
FillFactor = 8;
}
public override bool Eat( Mobile from )
@ -367,7 +367,7 @@ namespace Server.Items
{
Stackable = false;
Weight = 1.0;
FillFactor = 2;
FillFactor = 10;
}
public override bool Eat( Mobile from )
@ -461,7 +461,7 @@ namespace Server.Items
{
Stackable = false;
Weight = 2.0;
FillFactor = 2;
FillFactor = 15;
}
public override bool Eat( Mobile from )
@ -499,7 +499,7 @@ namespace Server.Items
{
Stackable = false;
Weight = 2.0;
FillFactor = 2;
FillFactor = 15;
}
public override bool Eat( Mobile from )
@ -529,4 +529,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

82
Scripts/Items/Food/Food.cs
View file

@ -41,7 +41,7 @@ namespace Server.Items
{
Stackable = true;
Amount = amount;
m_FillFactor = 1;
m_FillFactor = 5;
}
public Food( Serial serial ) : base( serial )
@ -91,7 +91,7 @@ namespace Server.Items
static public bool FillHunger( Mobile from, int fillFactor )
{
if ( from.Hunger >= 20 )
if ( from.Hunger >= 100 )
{
from.SendLocalizedMessage( 500867 ); // You are simply too full to eat any more!
return false;
@ -100,20 +100,20 @@ namespace Server.Items
int iHunger = from.Hunger + fillFactor;
if ( from.Stam < from.StamMax )
from.Stam += Utility.Random( 6, 3 ) + fillFactor/5;//restore some stamina
if ( iHunger >= 20 )
if ( iHunger >= 100 )
{
from.Hunger = 20;
from.Hunger = 100;
from.SendLocalizedMessage( 500872 ); // You manage to eat the food, but you are stuffed!
}
else
{
from.Hunger = iHunger;
if ( iHunger < 5 )
if ( iHunger < 30 )
from.SendLocalizedMessage( 500868 ); // You eat the food, but are still extremely hungry.
else if ( iHunger < 10 )
else if ( iHunger < 50 )
from.SendLocalizedMessage( 500869 ); // You eat the food, and begin to feel more satiated.
else if ( iHunger < 15 )
else if ( iHunger < 75 )
from.SendLocalizedMessage( 500870 ); // After eating the food, you feel much less hungry.
else
from.SendLocalizedMessage( 500871 ); // You feel quite full after consuming the food.
@ -186,7 +186,7 @@ namespace Server.Items
public BreadLoaf( int amount ) : base( amount, 0x103B )
{
this.Weight = 1.0;
this.FillFactor = 3;
this.FillFactor = 15;
}
public BreadLoaf( Serial serial ) : base( serial )
@ -219,7 +219,7 @@ namespace Server.Items
public Bacon( int amount ) : base( amount, 0x979 )
{
this.Weight = 1.0;
this.FillFactor = 1;
this.FillFactor = 10;
}
public Bacon( Serial serial ) : base( serial )
@ -252,7 +252,7 @@ namespace Server.Items
public SlabOfBacon( int amount ) : base( amount, 0x976 )
{
this.Weight = 1.0;
this.FillFactor = 3;
this.FillFactor = 20;
}
public SlabOfBacon( Serial serial ) : base( serial )
@ -289,7 +289,7 @@ namespace Server.Items
[Constructable]
public FishSteak( int amount ) : base( amount, 0x97B )
{
this.FillFactor = 3;
this.FillFactor = 15;
}
public FishSteak( Serial serial ) : base( serial )
@ -326,7 +326,7 @@ namespace Server.Items
[Constructable]
public CheeseWheel( int amount ) : base( amount, 0x97E )
{
this.FillFactor = 3;
this.FillFactor = 15;
}
public CheeseWheel( Serial serial ) : base( serial )
@ -363,7 +363,7 @@ namespace Server.Items
[Constructable]
public CheeseWedge( int amount ) : base( amount, 0x97D )
{
this.FillFactor = 3;
this.FillFactor = 10;
}
public CheeseWedge( Serial serial ) : base( serial )
@ -400,7 +400,7 @@ namespace Server.Items
[Constructable]
public CheeseSlice( int amount ) : base( amount, 0x97C )
{
this.FillFactor = 1;
this.FillFactor = 5;
}
public CheeseSlice( Serial serial ) : base( serial )
@ -433,7 +433,7 @@ namespace Server.Items
public FrenchBread( int amount ) : base( amount, 0x98C )
{
this.Weight = 2.0;
this.FillFactor = 3;
this.FillFactor = 15;
}
public FrenchBread( Serial serial ) : base( serial )
@ -467,7 +467,7 @@ namespace Server.Items
public FriedEggs( int amount ) : base( amount, 0x9B6 )
{
this.Weight = 1.0;
this.FillFactor = 4;
this.FillFactor = 15;
}
public FriedEggs( Serial serial ) : base( serial )
@ -500,7 +500,7 @@ namespace Server.Items
public CookedBird( int amount ) : base( amount, 0x9B7 )
{
this.Weight = 1.0;
this.FillFactor = 5;
this.FillFactor = 20;
}
public CookedBird( Serial serial ) : base( serial )
@ -533,7 +533,7 @@ namespace Server.Items
public RoastPig( int amount ) : base( amount, 0x9BB )
{
this.Weight = 45.0;
this.FillFactor = 20;
this.FillFactor = 50;
}
public RoastPig( Serial serial ) : base( serial )
@ -566,7 +566,7 @@ namespace Server.Items
public Sausage( int amount ) : base( amount, 0x9C0 )
{
this.Weight = 1.0;
this.FillFactor = 4;
this.FillFactor = 15;
}
public Sausage( Serial serial ) : base( serial )
@ -599,7 +599,7 @@ namespace Server.Items
public Ham( int amount ) : base( amount, 0x9C9 )
{
this.Weight = 1.0;
this.FillFactor = 5;
this.FillFactor = 20;
}
public Ham( Serial serial ) : base( serial )
@ -628,7 +628,7 @@ namespace Server.Items
{
Stackable = false;
this.Weight = 1.0;
this.FillFactor = 10;
this.FillFactor = 20;
}
public Cake( Serial serial ) : base( serial )
@ -661,7 +661,7 @@ namespace Server.Items
public Ribs( int amount ) : base( amount, 0x9F2 )
{
this.Weight = 1.0;
this.FillFactor = 5;
this.FillFactor = 20;
}
public Ribs( Serial serial ) : base( serial )
@ -690,7 +690,7 @@ namespace Server.Items
{
Stackable = false;
this.Weight = 1.0;
this.FillFactor = 4;
this.FillFactor = 15;
}
public Cookies( Serial serial ) : base( serial )
@ -719,7 +719,7 @@ namespace Server.Items
{
Stackable = false;
this.Weight = 1.0;
this.FillFactor = 4;
this.FillFactor = 15;
}
public Muffins( Serial serial ) : base( serial )
@ -751,7 +751,7 @@ namespace Server.Items
{
Stackable = false;
this.Weight = 1.0;
this.FillFactor = 6;
this.FillFactor = 25;
}
public CheesePizza( Serial serial ) : base( serial )
@ -782,7 +782,7 @@ namespace Server.Items
{
Stackable = false;
this.Weight = 1.0;
this.FillFactor = 6;
this.FillFactor = 25;
}
public SausagePizza( Serial serial ) : base( serial )
@ -812,7 +812,7 @@ namespace Server.Items
{
Stackable = false;
this.Weight = 1.0;
this.FillFactor = 6;
this.FillFactor = 20;
}
public Pizza( Serial serial ) : base( serial )
@ -844,7 +844,7 @@ namespace Server.Items
{
Stackable = false;
this.Weight = 1.0;
this.FillFactor = 5;
this.FillFactor = 15;
}
public FruitPie( Serial serial ) : base( serial )
@ -875,7 +875,7 @@ namespace Server.Items
{
Stackable = false;
this.Weight = 1.0;
this.FillFactor = 5;
this.FillFactor = 20;
}
public MeatPie( Serial serial ) : base( serial )
@ -906,7 +906,7 @@ namespace Server.Items
{
Stackable = false;
this.Weight = 1.0;
this.FillFactor = 5;
this.FillFactor = 25;
}
public PumpkinPie( Serial serial ) : base( serial )
@ -937,7 +937,7 @@ namespace Server.Items
{
Stackable = false;
this.Weight = 1.0;
this.FillFactor = 5;
this.FillFactor = 20;
}
public ApplePie( Serial serial ) : base( serial )
@ -968,7 +968,7 @@ namespace Server.Items
{
Stackable = false;
this.Weight = 1.0;
this.FillFactor = 5;
this.FillFactor = 25;
}
public PeachCobbler( Serial serial ) : base( serial )
@ -999,7 +999,7 @@ namespace Server.Items
{
Stackable = false;
this.Weight = 1.0;
this.FillFactor = 5;
this.FillFactor = 15;
}
public Quiche( Serial serial ) : base( serial )
@ -1032,7 +1032,7 @@ namespace Server.Items
public LambLeg( int amount ) : base( amount, 0x160a )
{
this.Weight = 2.0;
this.FillFactor = 5;
this.FillFactor = 20;
}
public LambLeg( Serial serial ) : base( serial )
@ -1065,7 +1065,7 @@ namespace Server.Items
public ChickenLeg( int amount ) : base( amount, 0x1608 )
{
this.Weight = 1.0;
this.FillFactor = 4;
this.FillFactor = 20;
Name = "bird leg";
}
@ -1100,7 +1100,7 @@ namespace Server.Items
public HoneydewMelon( int amount ) : base( amount, 0xC74 )
{
this.Weight = 1.0;
this.FillFactor = 1;
this.FillFactor = 5;
}
public HoneydewMelon( Serial serial ) : base( serial )
@ -1134,7 +1134,7 @@ namespace Server.Items
public YellowGourd( int amount ) : base( amount, 0xC64 )
{
this.Weight = 1.0;
this.FillFactor = 1;
this.FillFactor = 5;
}
public YellowGourd( Serial serial ) : base( serial )
@ -1168,7 +1168,7 @@ namespace Server.Items
public GreenGourd( int amount ) : base( amount, 0xC66 )
{
this.Weight = 1.0;
this.FillFactor = 1;
this.FillFactor = 5;
}
public GreenGourd( Serial serial ) : base( serial )
@ -1202,7 +1202,7 @@ namespace Server.Items
public EarOfCorn( int amount ) : base( amount, 0xC81 )
{
this.Weight = 1.0;
this.FillFactor = 1;
this.FillFactor = 5;
}
public EarOfCorn( Serial serial ) : base( serial )
@ -1235,7 +1235,7 @@ namespace Server.Items
public Turnip( int amount ) : base( amount, 0xD3A )
{
this.Weight = 1.0;
this.FillFactor = 1;
this.FillFactor = 5;
}
public Turnip( Serial serial ) : base( serial )
@ -1283,4 +1283,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

34
Scripts/Items/Food/Fruits.cs
View file

@ -53,7 +53,7 @@ namespace Server.Items
public Banana( int amount ) : base( amount, 0x171f )
{
this.Weight = 1.0;
this.FillFactor = 1;
this.FillFactor = 5;
}
public Banana( Serial serial ) : base( serial )
@ -86,7 +86,7 @@ namespace Server.Items
public Bananas( int amount ) : base( amount, 0x1721 )
{
this.Weight = 1.0;
this.FillFactor = 1;
this.FillFactor = 5;
}
public Bananas( Serial serial ) : base( serial )
@ -118,7 +118,7 @@ namespace Server.Items
public SplitCoconut( int amount ) : base( amount, 0x1725 )
{
this.Weight = 1.0;
this.FillFactor = 1;
this.FillFactor = 5;
}
public SplitCoconut( Serial serial ) : base( serial )
@ -150,7 +150,7 @@ namespace Server.Items
public Lemon( int amount ) : base( amount, 0x1728 )
{
this.Weight = 1.0;
this.FillFactor = 1;
this.FillFactor = 5;
}
public Lemon( Serial serial ) : base( serial )
@ -182,7 +182,7 @@ namespace Server.Items
public Lemons( int amount ) : base( amount, 0x1729 )
{
this.Weight = 1.0;
this.FillFactor = 1;
this.FillFactor = 5;
}
public Lemons( Serial serial ) : base( serial )
@ -214,7 +214,7 @@ namespace Server.Items
public Lime( int amount ) : base( amount, 0x172a )
{
this.Weight = 1.0;
this.FillFactor = 1;
this.FillFactor = 5;
}
public Lime( Serial serial ) : base( serial )
@ -246,7 +246,7 @@ namespace Server.Items
public Limes( int amount ) : base( amount, 0x172B )
{
this.Weight = 1.0;
this.FillFactor = 1;
this.FillFactor = 5;
}
public Limes( Serial serial ) : base( serial )
@ -278,7 +278,7 @@ namespace Server.Items
public Coconut( int amount ) : base( amount, 0x1726 )
{
this.Weight = 1.0;
this.FillFactor = 1;
this.FillFactor = 5;
}
public Coconut( Serial serial ) : base( serial )
@ -310,7 +310,7 @@ namespace Server.Items
public OpenCoconut( int amount ) : base( amount, 0x1723 )
{
this.Weight = 1.0;
this.FillFactor = 1;
this.FillFactor = 5;
}
public OpenCoconut( Serial serial ) : base( serial )
@ -342,7 +342,7 @@ namespace Server.Items
public Dates( int amount ) : base( amount, 0x1727 )
{
this.Weight = 1.0;
this.FillFactor = 1;
this.FillFactor = 5;
}
public Dates( Serial serial ) : base( serial )
@ -374,7 +374,7 @@ namespace Server.Items
public Grapes( int amount ) : base( amount, 0x9D1 )
{
this.Weight = 1.0;
this.FillFactor = 1;
this.FillFactor = 5;
}
public Grapes( Serial serial ) : base( serial )
@ -406,7 +406,7 @@ namespace Server.Items
public Peach( int amount ) : base( amount, 0x9D2 )
{
this.Weight = 1.0;
this.FillFactor = 1;
this.FillFactor = 5;
}
public Peach( Serial serial ) : base( serial )
@ -438,7 +438,7 @@ namespace Server.Items
public Pear( int amount ) : base( amount, 0x994 )
{
this.Weight = 1.0;
this.FillFactor = 1;
this.FillFactor = 5;
}
public Pear( Serial serial ) : base( serial )
@ -470,7 +470,7 @@ namespace Server.Items
public Apple( int amount ) : base( amount, 0x9D0 )
{
this.Weight = 1.0;
this.FillFactor = 1;
this.FillFactor = 5;
}
public Apple( Serial serial ) : base( serial )
@ -576,7 +576,7 @@ namespace Server.Items
public Squash( int amount ) : base( amount, 0xc72 )
{
this.Weight = 1.0;
this.FillFactor = 1;
this.FillFactor = 5;
}
public Squash( Serial serial ) : base( serial )
@ -609,7 +609,7 @@ namespace Server.Items
public Cantaloupe( int amount ) : base( amount, 0xc79 )
{
this.Weight = 1.0;
this.FillFactor = 1;
this.FillFactor = 5;
}
public Cantaloupe( Serial serial ) : base( serial )
@ -629,4 +629,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

18
Scripts/Items/Food/MagicDrink.cs
View file

@ -30,16 +30,16 @@ namespace Server.Items
else
{
// increase characters thirst value based on type of drink
if ( from.Thirst < 20 )
if ( from.Thirst < 100 )
{
from.Thirst += 2;
from.Thirst += 5;
// Send message to character about their current thirst value
int iThirst = from.Thirst;
if ( iThirst < 5 )
if ( iThirst < 50 )
from.SendMessage( "You drink the ale but are still extremely thirsty" );
else if ( iThirst < 10 )
else if ( iThirst < 75 )
from.SendMessage( "You drink the ale and feel less thirsty" );
else if ( iThirst < 15 )
else if ( iThirst < 100 )
from.SendMessage( "You drink the ale and feel much less thirsty" );
else
from.SendMessage( "You drink the ale and are no longer thirsty" );
@ -101,11 +101,11 @@ namespace Server.Items
from.Thirst += 2;
// Send message to character about their current thirst value
int iThirst = from.Thirst;
if ( iThirst < 5 )
if ( iThirst < 50 )
from.SendMessage( "You drink the wine but are still extremely thirsty" );
else if ( iThirst < 10 )
else if ( iThirst < 75 )
from.SendMessage( "You drink the wine and feel less thirsty" );
else if ( iThirst < 15 )
else if ( iThirst < 100 )
from.SendMessage( "You drink the wine and feel much less thirsty" );
else
from.SendMessage( "You drink the wine and are no longer thirsty" );
@ -137,4 +137,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

14
Scripts/Items/Food/Vegetables.cs
View file

@ -15,7 +15,7 @@ namespace Server.Items
public Carrot( int amount ) : base( amount, 0xc78 )
{
this.Weight = 1.0;
this.FillFactor = 1;
this.FillFactor = 5;
}
public Carrot( Serial serial ) : base( serial )
@ -48,7 +48,7 @@ namespace Server.Items
public Cabbage( int amount ) : base( amount, 0xc7b )
{
this.Weight = 1.0;
this.FillFactor = 1;
this.FillFactor = 5;
}
public Cabbage( Serial serial ) : base( serial )
@ -81,7 +81,7 @@ namespace Server.Items
public Onion( int amount ) : base( amount, 0xc6d )
{
this.Weight = 1.0;
this.FillFactor = 1;
this.FillFactor = 5;
}
public Onion( Serial serial ) : base( serial )
@ -114,7 +114,7 @@ namespace Server.Items
public Lettuce( int amount ) : base( amount, 0xc70 )
{
this.Weight = 1.0;
this.FillFactor = 1;
this.FillFactor = 5;
}
public Lettuce( Serial serial ) : base( serial )
@ -147,7 +147,7 @@ namespace Server.Items
{
Name = "tomato";
this.Weight = 1.0;
this.FillFactor = 1;
this.FillFactor = 5;
}
public Tomato( Serial serial ) : base( serial )
@ -179,7 +179,7 @@ namespace Server.Items
public Pumpkin( int amount ) : base( amount, 0xC6A )
{
this.Weight = 1.0;
this.FillFactor = 8;
this.FillFactor = 18;
}
public Pumpkin( Serial serial ) : base( serial )
@ -240,4 +240,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}