Fixes code according to modern code style. Fixes a few expression bugs.
This commit is contained in:
parent
89eea25e5f
commit
970fd563b2
3324 changed files with 441118 additions and 433755 deletions
|
|
@ -1,58 +1,58 @@
|
|||
namespace Server.Items
|
||||
{
|
||||
public class RandomTalisman : BaseTalisman
|
||||
{
|
||||
[Constructible]
|
||||
public RandomTalisman() : base( GetRandomItemID() )
|
||||
{
|
||||
Summoner = GetRandomSummoner();
|
||||
public class RandomTalisman : BaseTalisman
|
||||
{
|
||||
[Constructible]
|
||||
public RandomTalisman() : base(GetRandomItemID())
|
||||
{
|
||||
Summoner = GetRandomSummoner();
|
||||
|
||||
if ( Summoner.IsEmpty )
|
||||
{
|
||||
Removal = GetRandomRemoval();
|
||||
if (Summoner.IsEmpty)
|
||||
{
|
||||
Removal = GetRandomRemoval();
|
||||
|
||||
if ( Removal != TalismanRemoval.None )
|
||||
{
|
||||
MaxCharges = GetRandomCharges();
|
||||
MaxChargeTime = 1200;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
MaxCharges = Utility.RandomMinMax( 10, 50 );
|
||||
if (Removal != TalismanRemoval.None)
|
||||
{
|
||||
MaxCharges = GetRandomCharges();
|
||||
MaxChargeTime = 1200;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
MaxCharges = Utility.RandomMinMax(10, 50);
|
||||
|
||||
if ( Summoner.IsItem )
|
||||
MaxChargeTime = 60;
|
||||
else
|
||||
MaxChargeTime = 1800;
|
||||
}
|
||||
if (Summoner.IsItem)
|
||||
MaxChargeTime = 60;
|
||||
else
|
||||
MaxChargeTime = 1800;
|
||||
}
|
||||
|
||||
Blessed = GetRandomBlessed();
|
||||
Slayer = GetRandomSlayer();
|
||||
Protection = GetRandomProtection();
|
||||
Killer = GetRandomKiller();
|
||||
Skill = GetRandomSkill();
|
||||
ExceptionalBonus = GetRandomExceptional();
|
||||
SuccessBonus = GetRandomSuccessful();
|
||||
Charges = MaxCharges;
|
||||
}
|
||||
Blessed = GetRandomBlessed();
|
||||
Slayer = GetRandomSlayer();
|
||||
Protection = GetRandomProtection();
|
||||
Killer = GetRandomKiller();
|
||||
Skill = GetRandomSkill();
|
||||
ExceptionalBonus = GetRandomExceptional();
|
||||
SuccessBonus = GetRandomSuccessful();
|
||||
Charges = MaxCharges;
|
||||
}
|
||||
|
||||
public RandomTalisman( Serial serial ) : base( serial )
|
||||
{
|
||||
}
|
||||
public RandomTalisman(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write( (int) 0 ); // version
|
||||
}
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize( GenericReader reader )
|
||||
{
|
||||
base.Deserialize( reader );
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue