Fixes brace style (#248)

This commit is contained in:
Kamron Batman 2020-09-13 21:49:46 -07:00 • committed by GitHub
parent a236617ad9
commit 8149620b0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1503 changed files with 28575 additions and 1717 deletions

View file

@ -45,18 +45,26 @@ namespace Server.Items
public override void OnDoubleClick(Mobile from)
{
if (!from.Player)
{
return;
}
if (from.InRange(GetWorldLocation(), 1))
CheckGate(from, 1);
{
CheckGate(@from, 1);
}
else
from.SendLocalizedMessage(500446); // That is too far away.
{
@from.SendLocalizedMessage(500446); // That is too far away.
}
}
public override bool OnMoveOver(Mobile m)
{
if (m.Player)
{
CheckGate(m, 0);
}
return true;
}
@ -64,7 +72,9 @@ namespace Server.Items
public virtual void CheckGate(Mobile m, int range)
{
if (m.Hidden && m.AccessLevel == AccessLevel.Player && Core.ML)
{
m.RevealingAction();
}
new DelayTimer(m, this, range).Start();
}
@ -103,7 +113,9 @@ namespace Server.Items
m.MoveToWorld(Target, TargetMap);
if (m.AccessLevel == AccessLevel.Player || !m.Hidden)
{
m.PlaySound(0x1FE);
}
OnGateUsed(m);
}
@ -136,18 +148,24 @@ namespace Server.Items
TargetMap = reader.ReadMap();
if (version >= 1)
{
Dispellable = reader.ReadBool();
}
}
public virtual bool ValidateUse(Mobile from, bool message)
{
if (from.Deleted || Deleted)
{
return false;
}
if (from.Map != Map || !from.InRange(this, 1))
{
if (message)
from.SendLocalizedMessage(500446); // That is too far away.
{
@from.SendLocalizedMessage(500446); // That is too far away.
}
return false;
}
@ -161,7 +179,10 @@ namespace Server.Items
from.Map != Map.Felucca && TargetMap == Map.Felucca && ShowFeluccaWarning)
{
if (from.AccessLevel == AccessLevel.Player || !from.Hidden)
from.Send(new PlaySound(0x20E, from.Location));
{
@from.Send(new PlaySound(0x20E, @from.Location));
}
from.CloseGump<MoongateConfirmGump>();
from.SendGump(new MoongateConfirmGump(from, this));
}
@ -174,7 +195,9 @@ namespace Server.Items
public virtual void EndConfirmation(Mobile from)
{
if (!ValidateUse(from, true))
{
return;
}
UseGate(from);
}
@ -182,12 +205,18 @@ namespace Server.Items
public virtual void DelayCallback(Mobile from, int range)
{
if (!ValidateUse(from, false) || !from.InRange(this, range))
{
return;
}
if (TargetMap != null)
BeginConfirmation(from);
{
BeginConfirmation(@from);
}
else
from.SendMessage("This moongate does not seem to go anywhere.");
{
@from.SendMessage("This moongate does not seem to go anywhere.");
}
}
public static bool IsInTown(Point3D p, Map map) =>
@ -253,7 +282,9 @@ namespace Server.Items
public virtual void Warning_Callback(Mobile from, bool okay)
{
if (okay)
EndConfirmation(from);
{
EndConfirmation(@from);
}
}
public override void BeginConfirmation(Mobile from)
@ -351,6 +382,7 @@ namespace Server.Items
AddAlphaRegion(10, 40, 400, 200);
if (from.Map != Map.Felucca && gate.TargetMap == Map.Felucca && gate.ShowFeluccaWarning)
{
AddHtmlLocalized(
10,
40,
@ -361,7 +393,9 @@ namespace Server.Items
false,
true
); // This Gate goes to Felucca... Continue to enter the gate, Cancel to stay here
}
else
{
AddHtmlLocalized(
10,
40,
@ -372,6 +406,7 @@ namespace Server.Items
false,
true
); // Dost thou wish to step into the moongate? Continue to enter the gate, Cancel to stay here
}
AddImageTiled(10, 250, 400, 20, 2624);
AddAlphaRegion(10, 250, 400, 20);
@ -408,7 +443,9 @@ namespace Server.Items
public override void OnResponse(NetState state, RelayInfo info)
{
if (info.ButtonID == 1)
{
m_Gate.EndConfirmation(m_From);
}
}
}
}

View file

@ -49,7 +49,9 @@ namespace Server.Items
get
{
if (m_Held > 0 && (int)m_Type >= (int)PotionEffect.Conflagration)
{
return 1072658 + (int)m_Type - (int)PotionEffect.Conflagration;
}
return m_Held > 0 ? 1041620 + (int)m_Type : 1041641;
}
@ -91,7 +93,9 @@ namespace Server.Items
}
if (version < 1)
{
Timer.DelayCall(UpdateWeight);
}
}
public override void GetProperties(ObjectPropertyList list)
@ -101,29 +105,53 @@ namespace Server.Items
int number;
if (m_Held <= 0)
{
number = 502246; // The keg is empty.
}
else if (m_Held < 5)
{
number = 502248; // The keg is nearly empty.
}
else if (m_Held < 20)
{
number = 502249; // The keg is not very full.
}
else if (m_Held < 30)
{
number = 502250; // The keg is about one quarter full.
}
else if (m_Held < 40)
{
number = 502251; // The keg is about one third full.
}
else if (m_Held < 47)
{
number = 502252; // The keg is almost half full.
}
else if (m_Held < 54)
{
number = 502254; // The keg is approximately half full.
}
else if (m_Held < 70)
{
number = 502253; // The keg is more than half full.
}
else if (m_Held < 80)
{
number = 502255; // The keg is about three quarters full.
}
else if (m_Held < 96)
{
number = 502256; // The keg is very full.
}
else if (m_Held < 100)
{
number = 502257; // The liquid is almost to the top of the keg.
}
else
{
number = 502258; // The keg is completely full.
}
list.Add(number);
}
@ -135,29 +163,53 @@ namespace Server.Items
int number;
if (m_Held <= 0)
{
number = 502246; // The keg is empty.
}
else if (m_Held < 5)
{
number = 502248; // The keg is nearly empty.
}
else if (m_Held < 20)
{
number = 502249; // The keg is not very full.
}
else if (m_Held < 30)
{
number = 502250; // The keg is about one quarter full.
}
else if (m_Held < 40)
{
number = 502251; // The keg is about one third full.
}
else if (m_Held < 47)
{
number = 502252; // The keg is almost half full.
}
else if (m_Held < 54)
{
number = 502254; // The keg is approximately half full.
}
else if (m_Held < 70)
{
number = 502253; // The keg is more than half full.
}
else if (m_Held < 80)
{
number = 502255; // The keg is about three quarters full.
}
else if (m_Held < 96)
{
number = 502256; // The keg is very full.
}
else if (m_Held < 100)
{
number = 502257; // The liquid is almost to the top of the keg.
}
else
{
number = 502258; // The keg is completely full.
}
LabelTo(from, number);
}
@ -182,7 +234,9 @@ namespace Server.Items
from.PlaySound(0x240);
if (--Held == 0)
from.SendLocalizedMessage(502245); // The keg is now empty.
{
@from.SendLocalizedMessage(502245); // The keg is now empty.
}
}
else
{
@ -238,7 +292,9 @@ namespace Server.Items
pot.Consume(toHold);
if (!pot.Deleted)
pot.Bounce(from);
{
pot.Bounce(@from);
}
return true;
}
@ -266,7 +322,9 @@ namespace Server.Items
pot.Consume(toHold);
if (!pot.Deleted)
pot.Bounce(from);
{
pot.Bounce(@from);
}
return true;
}

View file

@ -30,7 +30,9 @@ namespace Server.Items
get
{
if (m_House?.Deleted == true)
{
House = null;
}
return m_House;
}
@ -137,17 +139,29 @@ namespace Server.Items
private void CalculateHue()
{
if (!m_Marked)
{
Hue = 0;
}
else if (m_TargetMap == Map.Trammel)
{
Hue = House != null ? 0x47F : 50;
}
else if (m_TargetMap == Map.Felucca)
{
Hue = House != null ? 0x66D : 0;
}
else if (m_TargetMap == Map.Ilshenar)
{
Hue = House != null ? 0x55F : 1102;
}
else if (m_TargetMap == Map.Malas)
{
Hue = House != null ? 0x55F : 1102;
}
else if (m_TargetMap == Map.Tokuno)
{
Hue = House != null ? 0x47F : 1154;
}
}
public void Mark(Mobile m)
@ -179,7 +193,9 @@ namespace Server.Items
var map = m_House.Map;
if (map?.CanFit(x, y, z, 16, false, false) == false)
{
z = map.GetAverageZ(x, y);
}
Target = new Point3D(x, y, z);
m_TargetMap = map;
@ -193,7 +209,9 @@ namespace Server.Items
}
if (!setDesc)
{
m_Description = BaseRegion.GetRuneNameFor(Region.Find(Target, m_TargetMap));
}
CalculateHue();
InvalidateProperties();
@ -208,18 +226,30 @@ namespace Server.Items
string desc;
if ((desc = m_Description) == null || (desc = desc.Trim()).Length == 0)
{
desc = "an unknown location";
}
if (m_TargetMap == Map.Tokuno)
{
list.Add(House != null ? 1063260 : 1063259, RuneFormat, desc); // ~1_val~ (Tokuno Islands)[(House)]
}
else if (m_TargetMap == Map.Malas)
{
list.Add(House != null ? 1062454 : 1060804, RuneFormat, desc); // ~1_val~ (Malas)[(House)]
}
else if (m_TargetMap == Map.Felucca)
{
list.Add(House != null ? 1062452 : 1060805, RuneFormat, desc); // ~1_val~ (Felucca)[(House)]
}
else if (m_TargetMap == Map.Trammel)
{
list.Add(House != null ? 1062453 : 1060806, RuneFormat, desc); // ~1_val~ (Trammel)[(House)]
}
else
{
list.Add(House != null ? "{0} ({1})(House)" : "{0} ({1})", string.Format(RuneFormat, desc), m_TargetMap);
}
}
}
@ -230,36 +260,46 @@ namespace Server.Items
var desc = m_Description?.Trim().IsNullOrDefault("an unknown location");
if (m_TargetMap == Map.Tokuno)
{
LabelTo(
from,
@from,
House != null ? 1063260 : 1063259,
string.Format(RuneFormat, desc)
); // ~1_val~ (Tokuno Islands)[(House)]
}
else if (m_TargetMap == Map.Malas)
{
LabelTo(
from,
@from,
House != null ? 1062454 : 1060804,
string.Format(RuneFormat, desc)
); // ~1_val~ (Malas)[(House)]
}
else if (m_TargetMap == Map.Felucca)
{
LabelTo(
from,
@from,
House != null ? 1062452 : 1060805,
string.Format(RuneFormat, desc)
); // ~1_val~ (Felucca)[(House)]
}
else if (m_TargetMap == Map.Trammel)
{
LabelTo(
from,
@from,
House != null ? 1062453 : 1060806,
string.Format(RuneFormat, desc)
); // ~1_val~ (Trammel)[(House)]
}
else
{
LabelTo(
from,
@from,
House != null ? "{0} ({1})(House)" : "{0} ({1})",
string.Format(RuneFormat, desc),
m_TargetMap
);
}
}
else
{