only show flavor above 0.1u (#17169)

Co-authored-by: deltanedas <@deltanedas:kde.org>
This commit is contained in:
deltanedas
2023-06-07 04:29:23 +00:00
committed by GitHub
parent b57c0a2118
commit f5d2b0e284
5 changed files with 20 additions and 3 deletions

View File

@@ -25,13 +25,12 @@ public sealed class FlavorProfileSystem : EntitySystem
public string GetLocalizedFlavorsMessage(EntityUid uid, EntityUid user, Solution solution,
FlavorProfileComponent? flavorProfile = null)
{
var flavors = new HashSet<string>();
if (!Resolve(uid, ref flavorProfile, false))
{
return Loc.GetString(BackupFlavorMessage);
}
flavors.UnionWith(flavorProfile.Flavors);
var flavors = new HashSet<string>(flavorProfile.Flavors);
flavors.UnionWith(GetFlavorsFromReagents(solution, FlavorLimit - flavors.Count, flavorProfile.IgnoreReagents));
var ev = new FlavorProfileModificationEvent(user, flavors);
@@ -96,7 +95,14 @@ public sealed class FlavorProfileSystem : EntitySystem
break;
}
var flavor = _prototypeManager.Index<ReagentPrototype>(reagent.ReagentId).Flavor;
var proto = _prototypeManager.Index<ReagentPrototype>(reagent.ReagentId);
// don't care if the quantity is negligible
if (reagent.Quantity < proto.FlavorMinimum)
{
continue;
}
var flavor = proto.Flavor;
flavors.Add(flavor);
}

View File

@@ -63,6 +63,12 @@ namespace Content.Shared.Chemistry.Reagent
[DataField("flavor")]
public string Flavor { get; } = default!;
/// <summary>
/// There must be at least this much quantity in a solution to be tasted.
/// </summary>
[DataField("flavorMinimum")]
public FixedPoint2 FlavorMinimum = FixedPoint2.New(0.1f);
[DataField("color")]
public Color SubstanceColor { get; } = Color.White;

View File

@@ -139,6 +139,7 @@
desc: reagent-desc-oil-olive
physicalDesc: reagent-physical-desc-oily
flavor: oily
flavorMinimum: 0.05
color: olive
recognizable: true
metabolisms:
@@ -155,6 +156,7 @@
desc: reagent-desc-oil
physicalDesc: reagent-physical-desc-oily
flavor: oily
flavorMinimum: 0.05
recognizable: true
color: "#b67823"
boilingPoint: 300.0
@@ -169,6 +171,7 @@
desc: reagent-desc-capsaicin-oil
physicalDesc: reagent-physical-desc-oily
flavor: spicy
flavorMinimum: 0.05
color: "#FF0000"
recognizable: true
meltingPoint: 146

View File

@@ -283,6 +283,7 @@
desc: reagent-desc-thc-oil
physicalDesc: reagent-physical-desc-skunky
flavor: bitter
flavorMinimum: 0.05
color: "#DAA520"
metabolisms:
Narcotic:

View File

@@ -144,6 +144,7 @@
physicalDesc: reagent-physical-desc-oily
slippery: true
flavor: bitter
flavorMinimum: 0.01
color: "#a76b1c"
recognizable: true
boilingPoint: -84.7 # Acetylene. Close enough.