Merge remote-tracking branch 'upstream/stable' into ed-27-05-2025-upstream-sync
# Conflicts: # .github/CODEOWNERS # Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs # Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs # Content.Server/Procedural/DungeonJob/DungeonJob.OreDunGen.cs # Resources/Prototypes/Entities/Effects/chemistry_effects.yml # Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml # Resources/Prototypes/GameRules/meteorswarms.yml # Resources/Prototypes/Procedural/dungeon_configs.yml
This commit is contained in:
@@ -178,17 +178,32 @@ public sealed class ObjectivesSystem : SharedObjectivesSystem
|
||||
agentSummary.AppendLine(Loc.GetString(
|
||||
"objectives-objective-success",
|
||||
("objective", objectiveTitle),
|
||||
("markupColor", "green")
|
||||
("progress", progress)
|
||||
));
|
||||
completedObjectives++;
|
||||
}
|
||||
else if (progress <= 0.99f && progress >= 0.5f)
|
||||
{
|
||||
agentSummary.AppendLine(Loc.GetString(
|
||||
"objectives-objective-partial-success",
|
||||
("objective", objectiveTitle),
|
||||
("progress", progress)
|
||||
));
|
||||
}
|
||||
else if (progress < 0.5f && progress > 0f)
|
||||
{
|
||||
agentSummary.AppendLine(Loc.GetString(
|
||||
"objectives-objective-partial-failure",
|
||||
("objective", objectiveTitle),
|
||||
("progress", progress)
|
||||
));
|
||||
}
|
||||
else
|
||||
{
|
||||
agentSummary.AppendLine(Loc.GetString(
|
||||
"objectives-objective-fail",
|
||||
("objective", objectiveTitle),
|
||||
("progress", (int) (progress * 100)),
|
||||
("markupColor", "red")
|
||||
("progress", progress)
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,8 +30,9 @@ public sealed class EscapeShuttleConditionSystem : EntitySystem
|
||||
return 0f;
|
||||
|
||||
// You're not escaping if you're restrained!
|
||||
// Granting 50% as to allow for partial completion of the objective.
|
||||
if (TryComp<CuffableComponent>(mind.OwnedEntity, out var cuffed) && cuffed.CuffedHandCount > 0)
|
||||
return 0f;
|
||||
return _emergencyShuttle.IsTargetEscaping(mind.OwnedEntity.Value) ? 0.5f : 0f;
|
||||
|
||||
// Any emergency shuttle counts for this objective, but not pods.
|
||||
return _emergencyShuttle.IsTargetEscaping(mind.OwnedEntity.Value) ? 1f : 0f;
|
||||
|
||||
@@ -53,6 +53,6 @@ public sealed class HelpProgressConditionSystem : EntitySystem
|
||||
|
||||
// require 50% completion for this one to be complete
|
||||
var completion = total / max;
|
||||
return completion >= 0.5f ? 1f : completion / 0.5f;
|
||||
return completion;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user