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

fix(core): Fixes displaying some doubles (#585)

Browse source
This commit is contained in:
Kamron Batman 2021-04-25 14:04:44 -07:00 • committed by GitHub
parent a0893b68c0
commit 13717ab2d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Projects/Server/Utilities/Utility.cs
View file

@ -555,9 +555,9 @@ namespace Server
public static string FixHtml(string str) public static string FixHtml(string str)
{ {
if (str == null) if (string.IsNullOrEmpty(str))
{ {
return ""; return str;
} }
using var sb = new ValueStringBuilder(str, stackalloc char[Math.Min(40960, str.Length)]); using var sb = new ValueStringBuilder(str, stackalloc char[Math.Min(40960, str.Length)]);

2
Projects/UOContent/Engines/CannedEvil/ChampionSpawn.cs
View file

@ -886,7 +886,7 @@ namespace Server.Engines.CannedEvil
list.Add( list.Add(
1060660, // ~1_val~: ~2_val~ 1060660, // ~1_val~: ~2_val~
"Kills\t{0} of {1} ({2:F1}%)", "Kills\t{0} of {1} ({2:0.#}%)",
m_Kills, m_Kills,
MaxKills, MaxKills,
100.0 * ((double)m_Kills / MaxKills) 100.0 * ((double)m_Kills / MaxKills)

6
Projects/UOContent/Engines/ML Quests/Objectives/GainSkillObjective.cs
View file

@ -71,11 +71,7 @@ namespace Server.Engines.MLQuests.Objectives
public override void WriteToGump(Gump g, ref int y) public override void WriteToGump(Gump g, ref int y)
{ {
var skillLabel = AosSkillBonuses.GetLabel(Skill); var skillLabel = AosSkillBonuses.GetLabel(Skill);
string args; var args = $"#{skillLabel}\t{ThresholdFixed / 10.0:0.#}";
args = ThresholdFixed % 10 == 0
? $"#{skillLabel}\t{ThresholdFixed / 10}"
: $"#{skillLabel}\t{(double)ThresholdFixed / 10:0.0}";
g.AddHtmlLocalized(98, y, 312, 16, 1077485, args, 0x15F90); // Increase ~1_SKILL~ to ~2_VALUE~ g.AddHtmlLocalized(98, y, 312, 16, 1077485, args, 0x15F90); // Increase ~1_SKILL~ to ~2_VALUE~
y += 16; y += 16;

2
Projects/UOContent/Items/Addons/SHTeleporter.cs
View file

@ -201,7 +201,7 @@ namespace Server.Items
World.Broadcast( World.Broadcast(
0x35, 0x35,
true, true,
"{0} solen hives teleporters have been created. The entire process took {1:F1} seconds.", "{0} solen hives teleporters have been created. The entire process took {1:0.#} seconds.",
count, count,
(endTime - startTime).TotalSeconds (endTime - startTime).TotalSeconds
); );

12
Projects/UOContent/Items/Special/SoulStone.cs
View file

@ -130,7 +130,7 @@ namespace Server.Items
{ {
list.Add( list.Add(
1070721, 1070721,
"#{0}\t{1:0.0}", "#{0}\t{1:F1}",
AosSkillBonuses.GetLabel(Skill), AosSkillBonuses.GetLabel(Skill),
SkillValue SkillValue
); // Skill stored: ~1_skillname~ ~2_skillamount~ ); // Skill stored: ~1_skillname~ ~2_skillamount~
@ -461,10 +461,10 @@ namespace Server.Items
AddHtmlLocalized(210, 200, 390, 20, AosSkillBonuses.GetLabel(skill.SkillName), 0x7FFF); AddHtmlLocalized(210, 200, 390, 20, AosSkillBonuses.GetLabel(skill.SkillName), 0x7FFF);
AddHtmlLocalized(10, 220, 390, 20, 1062298, 0x7FFF); // Current Value: AddHtmlLocalized(10, 220, 390, 20, 1062298, 0x7FFF); // Current Value:
AddLabel(210, 220, 0x481, skill.Base.ToString("0.0")); AddLabel(210, 220, 0x481, skill.Base.ToString("F1"));
AddHtmlLocalized(10, 240, 390, 20, 1062299, 0x7FFF); // Current Cap: AddHtmlLocalized(10, 240, 390, 20, 1062299, 0x7FFF); // Current Cap:
AddLabel(210, 240, 0x481, skill.Cap.ToString("0.0")); AddLabel(210, 240, 0x481, skill.Cap.ToString("F1"));
AddHtmlLocalized(10, 260, 390, 20, 1062300, 0x7FFF); // New Value: AddHtmlLocalized(10, 260, 390, 20, 1062300, 0x7FFF); // New Value:
AddLabel(210, 260, 0x481, "0.0"); AddLabel(210, 260, 0x481, "0.0");
@ -611,13 +611,13 @@ namespace Server.Items
var fromSkill = from.Skills[stone.Skill]; var fromSkill = from.Skills[stone.Skill];
AddHtmlLocalized(10, 220, 390, 20, 1062298, 0x7FFF); // Current Value: AddHtmlLocalized(10, 220, 390, 20, 1062298, 0x7FFF); // Current Value:
AddLabel(210, 220, 0x481, fromSkill.Base.ToString("0.0")); AddLabel(210, 220, 0x481, fromSkill.Base.ToString("F1"));
AddHtmlLocalized(10, 240, 390, 20, 1062299, 0x7FFF); // Current Cap: AddHtmlLocalized(10, 240, 390, 20, 1062299, 0x7FFF); // Current Cap:
AddLabel(210, 240, 0x481, fromSkill.Cap.ToString("0.0")); AddLabel(210, 240, 0x481, fromSkill.Cap.ToString("F1"));
AddHtmlLocalized(10, 260, 390, 20, 1062300, 0x7FFF); // New Value: AddHtmlLocalized(10, 260, 390, 20, 1062300, 0x7FFF); // New Value:
AddLabel(210, 260, 0x481, stone.SkillValue.ToString("0.0")); AddLabel(210, 260, 0x481, stone.SkillValue.ToString("F1"));
AddButton(10, 360, 0xFA5, 0xFA6, 2); AddButton(10, 360, 0xFA5, 0xFA6, 2);
AddHtmlLocalized( AddHtmlLocalized(

10
Projects/UOContent/Items/Special/Special Scrolls/ScrollofTranscendence.cs
View file

@ -36,15 +36,7 @@ namespace Server.Items
public override void GetProperties(ObjectPropertyList list) public override void GetProperties(ObjectPropertyList list)
{ {
base.GetProperties(list); base.GetProperties(list);
list.Add(1076759, $"{GetName()}\t{Value:0.#} Skill Points");
if (Value == 1)
{
list.Add(1076759, "{0}\t{1}.0 Skill Points", GetName(), Value);
}
else
{
list.Add(1076759, "{0}\t{1} Skill Points", GetName(), Value);
}
} }
public override bool CanUse(Mobile from) public override bool CanUse(Mobile from)

2
Projects/UOContent/Spells/Bushido/SamuraiSpell.cs
View file

@ -45,7 +45,7 @@ namespace Server.Spells.Bushido
if (Caster.Skills[CastSkill].Value < RequiredSkill) if (Caster.Skills[CastSkill].Value < RequiredSkill)
{ {
var args = $"{RequiredSkill:F1}\t{CastSkill.ToString()}\t "; var args = $"{RequiredSkill:0.#}\t{CastSkill.ToString()}\t ";
Caster.SendLocalizedMessage( Caster.SendLocalizedMessage(
1063013, 1063013,
args args