Fix warnings and code cleanup/fixes (#13570)

This commit is contained in:
Visne
2023-01-19 03:56:45 +01:00
committed by GitHub
parent 3ca5a0224b
commit c6d3e4f3bd
265 changed files with 499 additions and 666 deletions

View File

@@ -90,22 +90,13 @@ namespace Content.Server.Nutrition.EntitySystems
else
{
//general approximation
string remainingString;
switch ((int)_solutionContainerSystem.PercentFull(uid))
var remainingString = (int) _solutionContainerSystem.PercentFull(uid) switch
{
case int perc when perc == 100:
remainingString = "drink-component-on-examine-is-full";
break;
case int perc when perc > 66:
remainingString = "drink-component-on-examine-is-mostly-full";
break;
case int perc when perc > 33:
remainingString = HalfEmptyOrHalfFull(args);
break;
default:
remainingString = "drink-component-on-examine-is-mostly-empty";
break;
}
100 => "drink-component-on-examine-is-full",
> 66 => "drink-component-on-examine-is-mostly-full",
> 33 => HalfEmptyOrHalfFull(args),
_ => "drink-component-on-examine-is-mostly-empty",
};
args.Message.AddMarkup($" - {Loc.GetString(remainingString)}");
}
}