diff --git a/packages/db/src/Descriptor/RestrictionDescription.tsx b/packages/db/src/Descriptor/RestrictionDescription.tsx
index f16bb768..c4914940 100644
--- a/packages/db/src/Descriptor/RestrictionDescription.tsx
+++ b/packages/db/src/Descriptor/RestrictionDescription.tsx
@@ -7,6 +7,7 @@ import EntityReferenceDescriptor from "./EntityReferenceDescriptor";
import EventAllOutDescription from "./EventAllOutDescription";
import { MergeElementsOr, MultipleTraits } from "./MultipleDescriptors";
import ServantDescriptorId from "./ServantDescriptorId";
+import TraitDescription from "./TraitDescription";
const RestrictionDescription = ({ region, restriction }: { region: Region; restriction: Restriction.Restriction }) => {
const { targetVals, targetVals2 } = restriction,
@@ -119,9 +120,9 @@ const RestrictionDescription = ({ region, restriction }: { region: Region; restr
case Restriction.RestrictionType.MY_SVT_OR_SUPPORT:
return (
<>
- One of player's own or Support{" "}
+ One of player's own or Support with trait(s){" "}
{mergeElements(
- targetVals.map((svtId) => ),
+ targetVals.map((svtId) => ),
", "
)}{" "}
must be used at position {targetVals2[0]}
diff --git a/packages/db/src/Descriptor/TraitDescription.tsx b/packages/db/src/Descriptor/TraitDescription.tsx
index 4bd2c3fe..bfeef602 100644
--- a/packages/db/src/Descriptor/TraitDescription.tsx
+++ b/packages/db/src/Descriptor/TraitDescription.tsx
@@ -54,13 +54,11 @@ class TraitDescription extends React.Component {
.includes(this.state.id);
if (potentiallyServantId && !alreadyDescribedInOverride) {
- const servantList = await Api.servantList();
- for (const servant of servantList) {
- if (servant.id === this.state.id) {
- this.setState({ trait: { id: servant.id, name: servant.name } });
- return;
- }
- }
+ try {
+ const entity = await Api.entityBasic(this.state.id);
+ this.setState({ trait: { id: entity.id, name: entity.name } });
+ return;
+ } catch {}
}
if (this.state.trait) return;