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

Formatting FIxes (#58)

Browse source
This commit is contained in:
Kamron Batman 2019-10-04 23:08:13 -07:00 • committed by GitHub
parent 57fb9fb525
commit 096d39609e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1318 changed files with 11633 additions and 22129 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Projects/Scripts/Misc/TextDefinition.cs
View file

@ -25,16 +25,11 @@ namespace Server
public override string ToString() => Number > 0 ? $"#{Number}" : String ?? "";
public string Format(bool propsGump)
{
return Number > 0 ? $"{Number} (0x{Number:X})" :
String != null ? $"\"{String}\"" : propsGump ? "-empty-" : "empty";
}
public string Format(bool propsGump) =>
Number > 0 ? $"{Number} (0x{Number:X})" :
String != null ? $"\"{String}\"" : propsGump ? "-empty-" : "empty";
public string GetValue()
{
return Number > 0 ? Number.ToString() : String ?? "";
}
public string GetValue() => Number > 0 ? Number.ToString() : String ?? "";
public static void Serialize(GenericWriter writer, TextDefinition def)
{
@ -83,25 +78,13 @@ namespace Server
list.Add(def.String);
}
public static implicit operator TextDefinition(int v)
{
return new TextDefinition(v);
}
public static implicit operator TextDefinition(int v) => new TextDefinition(v);
public static implicit operator TextDefinition(string s)
{
return new TextDefinition(s);
}
public static implicit operator TextDefinition(string s) => new TextDefinition(s);
public static implicit operator int(TextDefinition m)
{
return m?.Number ?? 0;
}
public static implicit operator int(TextDefinition m) => m?.Number ?? 0;
public static implicit operator string(TextDefinition m)
{
return m?.String;
}
public static implicit operator string(TextDefinition m) => m?.String;
public static void AddHtmlText(Gump g, int x, int y, int width, int height, TextDefinition def, bool back,
bool scroll, int numberColor, int stringColor)
@ -180,9 +163,6 @@ namespace Server
return isInteger ? new TextDefinition(i) : new TextDefinition(value);
}
public static bool IsNullOrEmpty(TextDefinition def)
{
return def == null || def.IsEmpty;
}
public static bool IsNullOrEmpty(TextDefinition def) => def == null || def.IsEmpty;
}
}