Skip to content

Commit

Permalink
Update FoodSystem.cs
Browse files Browse the repository at this point in the history
  • Loading branch information
dvir001 committed May 3, 2024
1 parent a41995a commit fe792f7
Showing 1 changed file with 16 additions and 17 deletions.
33 changes: 16 additions & 17 deletions Content.Server/Nutrition/EntitySystems/FoodSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -273,35 +273,34 @@ private void OnDoAfter(Entity<FoodComponent> entity, ref ConsumeDoAfterEvent arg

/// Frontier - Food quality system
var foodQuality = entity.Comp.Quality;
var foodFinalQuality = entity.Comp.FinalQuality;

foreach (var quality in foodQuality)
{
if (quality == null)
continue;
else if (quality == "High")
foodFinalQuality = "High";
entity.Comp.FinalQuality = "High";
else if (quality == "Normal")
foodFinalQuality = "Normal";
entity.Comp.FinalQuality = "Normal";
else if (quality == "Junk")
foodFinalQuality = "Junk";
entity.Comp.FinalQuality = "Junk";
else if (quality == "Nasty")
foodFinalQuality = "Nasty";
entity.Comp.FinalQuality = "Nasty";
else if (quality == "Toxin")
foodFinalQuality = "Toxin";
entity.Comp.FinalQuality = "Toxin";
else if (quality == "Trash")
foodFinalQuality = "Trash";
entity.Comp.FinalQuality = "Trash";

if (reverseFoodQuality)
{
if (quality == "High")
foodFinalQuality = "Toxin";
entity.Comp.FinalQuality = "Toxin";
else if (quality == "Normal")
foodFinalQuality = "Nasty";
entity.Comp.FinalQuality = "Nasty";
else if (quality == "Nasty")
foodFinalQuality = "Normal";
entity.Comp.FinalQuality = "Normal";
else if (quality == "Toxin")
foodFinalQuality = "High";
entity.Comp.FinalQuality = "High";
}

// TODO: Add detection for fried food on nasty to update it to toxin for goblins.
Expand All @@ -314,7 +313,7 @@ private void OnDoAfter(Entity<FoodComponent> entity, ref ConsumeDoAfterEvent arg

TryComp<BloodstreamComponent>(args.Target.Value, out var bloodStream);

if (foodFinalQuality == "High")
if (entity.Comp.FinalQuality == "High")
{
if (reverseFoodQuality)
{
Expand All @@ -328,7 +327,7 @@ private void OnDoAfter(Entity<FoodComponent> entity, ref ConsumeDoAfterEvent arg
_solutionContainer.TryAddReagent(bloodStream.ChemicalSolution.Value, speedRegent, FixedPoint2.New((int) transferAmount / 3), out _); // Add to blood
}
}
else if (foodFinalQuality == "Normal")
else if (entity.Comp.FinalQuality == "Normal")
{
if (reverseFoodQuality)
{
Expand All @@ -342,7 +341,7 @@ private void OnDoAfter(Entity<FoodComponent> entity, ref ConsumeDoAfterEvent arg
_solutionContainer.TryAddReagent(bloodStream.ChemicalSolution.Value, speedRegent, FixedPoint2.New((int) transferAmount / 5), out _); // Add to blood
}
}
else if (foodFinalQuality == "Junk")
else if (entity.Comp.FinalQuality == "Junk")
{
if (reverseFoodQuality)
{
Expand All @@ -356,7 +355,7 @@ private void OnDoAfter(Entity<FoodComponent> entity, ref ConsumeDoAfterEvent arg
_solutionContainer.TryAddReagent(bloodStream.ChemicalSolution.Value, speedRegent, FixedPoint2.New((int) transferAmount / 7), out _); // Add to blood
}
}
else if (foodFinalQuality == "Nasty")
else if (entity.Comp.FinalQuality == "Nasty")
{
if (reverseFoodQuality)
{
Expand All @@ -368,7 +367,7 @@ private void OnDoAfter(Entity<FoodComponent> entity, ref ConsumeDoAfterEvent arg
_jittering.DoJitter(args.Target.Value, TimeSpan.FromSeconds(5), true, 40f, 4f, true, null);
}
}
else if (foodFinalQuality == "Toxin")
else if (entity.Comp.FinalQuality == "Toxin")
{
if (reverseFoodQuality)
{
Expand All @@ -384,7 +383,7 @@ private void OnDoAfter(Entity<FoodComponent> entity, ref ConsumeDoAfterEvent arg
_vomit.Vomit(args.Target.Value);
}
}
else if (foodFinalQuality == "Trash")
else if (entity.Comp.FinalQuality == "Trash")
{
if (reverseFoodQuality)
{
Expand Down

0 comments on commit fe792f7

Please sign in to comment.