mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-07-01 04:33:30 +00:00
7c151e76ad
## What
Renders the `transportShipTrail` cosmetic effect in-game. Transport
ships already left a trail, but it was always drawn in the player's
**territory color** — this wires the selected effect through to the
renderer so the trail shows the player's chosen **gradient**.
## How
- **Per-player effect texture** (`RGBA32F`, mirrors the palette texture)
keyed by `smallID`, sampled by the trail fragment shader. Each row holds
a gradient color; spare alpha channels carry the color count,
`colorSize`, and `movementSpeed`.
- **Shader**
([trail.frag.glsl](src/client/render/gl/shaders/map-overlay/trail.frag.glsl))
cycles a flowing gradient through the color list: 1 color → flat, 2+ →
animated bands scrolling along the trail. No effect (count 0) falls back
to the territory color; alt-view keeps affiliation colors.
- **WebGLFrameBuilder** resolves each player's catalog attributes (the
in-game cosmetic is only `{ name, effectType }`; the style/colors live
in the catalog) and encodes them. Resolution is decoupled from the
first-seen palette path so it retries until the catalog loads, and
unparseable colors are dropped so bad catalog data degrades to the
territory color rather than rendering black.
## Schema
Collapses the trail attributes to a single gradient shape:
```ts
{ type: "gradient", colors: string[], colorSize: number, movementSpeed: number }
```
- `colors` — solid = one color, rainbow = the spectrum, gradient = two
or more.
- `colorSize` — band width (tiles per color band; `1` is the default, ~4
tiles).
- `movementSpeed` — scroll rate along the trail (tiles/sec; `0` =
static).
## Notes
- Animation is render-only (local time), no simulation/determinism
impact.
- The catalog (`cosmetics.json`, served by the closed-source API) must
ship effects in this `{ type: "gradient", colors, colorSize,
movementSpeed }` shape.
- Band thickness (`4.0` base in the shader) and the gradient frequency
are visual constants picked without in-game verification — easy to tune.
## Testing
- `tsc --noEmit`, ESLint, Prettier, `build-prod` all clean.
- Schema + Privilege test suites updated for the gradient shape (92
tests pass).
- Not yet visually verified in a running game (effect selection is
flare-gated).
🤖 Generated with [Claude Code](https://claude.com/claude-code)
---------
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
320 lines
9.1 KiB
TypeScript
320 lines
9.1 KiB
TypeScript
import {
|
|
Cosmetics,
|
|
CosmeticsSchema,
|
|
EffectSchema,
|
|
findEffect,
|
|
TransportShipTrailAttributesSchema,
|
|
} from "../src/core/CosmeticSchemas";
|
|
import { PlayerEffectSchema } from "../src/core/Schemas";
|
|
|
|
describe("Effect cosmetic schemas", () => {
|
|
const base = {
|
|
name: "spectrum",
|
|
effectType: "transportShipTrail",
|
|
product: null,
|
|
rarity: "common",
|
|
};
|
|
|
|
describe("TransportShipTrailAttributesSchema", () => {
|
|
it("parses a gradient with a color list, colorSize, and movementSpeed", () => {
|
|
const parsed = TransportShipTrailAttributesSchema.parse({
|
|
type: "gradient",
|
|
colors: ["#f00", "#00f"],
|
|
colorSize: 16,
|
|
movementSpeed: 0.15,
|
|
});
|
|
expect(parsed).toEqual({
|
|
type: "gradient",
|
|
colors: ["#f00", "#00f"],
|
|
colorSize: 16,
|
|
movementSpeed: 0.15,
|
|
});
|
|
});
|
|
|
|
it("accepts a single-color list (solid) and an empty list", () => {
|
|
expect(
|
|
TransportShipTrailAttributesSchema.safeParse({
|
|
type: "gradient",
|
|
colors: ["#f00"],
|
|
colorSize: 16,
|
|
movementSpeed: 0.15,
|
|
}).success,
|
|
).toBe(true);
|
|
expect(
|
|
TransportShipTrailAttributesSchema.safeParse({
|
|
type: "gradient",
|
|
colors: [],
|
|
colorSize: 16,
|
|
movementSpeed: 0.15,
|
|
}).success,
|
|
).toBe(true);
|
|
});
|
|
|
|
it("requires the gradient type, colors, colorSize, and movementSpeed", () => {
|
|
// The old solid/rainbow/pulse styles are gone — only gradient remains.
|
|
expect(
|
|
TransportShipTrailAttributesSchema.safeParse({ type: "solid" }).success,
|
|
).toBe(false);
|
|
// colors, colorSize, and movementSpeed are all required.
|
|
expect(
|
|
TransportShipTrailAttributesSchema.safeParse({
|
|
type: "gradient",
|
|
colors: ["#f00"],
|
|
}).success,
|
|
).toBe(false);
|
|
expect(TransportShipTrailAttributesSchema.safeParse({}).success).toBe(
|
|
false,
|
|
);
|
|
});
|
|
});
|
|
|
|
describe("EffectSchema", () => {
|
|
it("parses an effect (discriminated on effectType)", () => {
|
|
expect(
|
|
EffectSchema.safeParse({
|
|
...base,
|
|
attributes: {
|
|
type: "gradient",
|
|
colors: ["#f00", "#0f0", "#00f"],
|
|
colorSize: 16,
|
|
movementSpeed: 0.15,
|
|
},
|
|
}).success,
|
|
).toBe(true);
|
|
});
|
|
|
|
it("rejects an effect with no attributes", () => {
|
|
expect(EffectSchema.safeParse({ ...base }).success).toBe(false);
|
|
});
|
|
|
|
it("rejects an effect with an unknown effectType (no union member)", () => {
|
|
expect(
|
|
EffectSchema.safeParse({
|
|
...base,
|
|
effectType: "glow",
|
|
attributes: {
|
|
type: "gradient",
|
|
colors: ["#f00"],
|
|
colorSize: 16,
|
|
movementSpeed: 0.15,
|
|
},
|
|
}).success,
|
|
).toBe(false);
|
|
});
|
|
|
|
it("rejects an effect with a non-gradient attribute type", () => {
|
|
expect(
|
|
EffectSchema.safeParse({
|
|
...base,
|
|
attributes: { type: "sparkle" },
|
|
}).success,
|
|
).toBe(false);
|
|
});
|
|
});
|
|
|
|
// Exact shape served by the production cosmetics.json: nested
|
|
// effects[effectType][effectName], each effect carrying its effectType, and
|
|
// extras (e.g. product.priceInCents) stripped.
|
|
it("parses the real nested cosmetics.json effects", () => {
|
|
const result = CosmeticsSchema.safeParse({
|
|
patterns: {},
|
|
flags: {},
|
|
effects: {
|
|
transportShipTrail: {
|
|
rainbow_ship: {
|
|
name: "rainbow_ship",
|
|
effectType: "transportShipTrail",
|
|
attributes: {
|
|
type: "gradient",
|
|
colors: ["#ff0000", "#ffe600", "#00a8ff", "#7d5fff"],
|
|
colorSize: 24,
|
|
movementSpeed: 0.2,
|
|
},
|
|
affiliateCode: null,
|
|
product: null,
|
|
priceHard: 123,
|
|
rarity: "common",
|
|
},
|
|
gradient: {
|
|
name: "gradient",
|
|
effectType: "transportShipTrail",
|
|
attributes: {
|
|
type: "gradient",
|
|
colors: ["#aea2a2", "#a80000"],
|
|
colorSize: 16,
|
|
movementSpeed: 0.15,
|
|
},
|
|
affiliateCode: null,
|
|
product: {
|
|
price: "$0.99",
|
|
priceInCents: 99,
|
|
productId: "prod_x",
|
|
priceId: "price_x",
|
|
},
|
|
rarity: "common",
|
|
},
|
|
},
|
|
},
|
|
});
|
|
expect(result.success).toBe(true);
|
|
if (result.success) {
|
|
expect(
|
|
result.data.effects?.transportShipTrail?.rainbow_ship?.attributes
|
|
?.colors,
|
|
).toEqual(["#ff0000", "#ffe600", "#00a8ff", "#7d5fff"]);
|
|
}
|
|
});
|
|
|
|
it("tolerates an unknown effectType (outer key) without failing the parse", () => {
|
|
const result = CosmeticsSchema.safeParse({
|
|
patterns: {},
|
|
flags: {},
|
|
effects: {
|
|
transportShipTrail: {
|
|
ship: {
|
|
name: "ship",
|
|
effectType: "transportShipTrail",
|
|
attributes: {
|
|
type: "gradient",
|
|
colors: ["#fff"],
|
|
colorSize: 16,
|
|
movementSpeed: 0.15,
|
|
},
|
|
product: null,
|
|
rarity: "common",
|
|
},
|
|
},
|
|
someFutureEffect: {
|
|
thing: {
|
|
name: "thing",
|
|
attributes: { type: "whatever" },
|
|
product: null,
|
|
rarity: "common",
|
|
},
|
|
},
|
|
},
|
|
});
|
|
expect(result.success).toBe(true);
|
|
});
|
|
|
|
it("drops a newer-shaped effect within a known effectType without failing the catalog", () => {
|
|
const result = CosmeticsSchema.safeParse({
|
|
patterns: {},
|
|
flags: {},
|
|
effects: {
|
|
transportShipTrail: {
|
|
good: {
|
|
name: "good",
|
|
effectType: "transportShipTrail",
|
|
attributes: {
|
|
type: "gradient",
|
|
colors: ["#fff"],
|
|
colorSize: 16,
|
|
movementSpeed: 0.15,
|
|
},
|
|
product: null,
|
|
rarity: "common",
|
|
},
|
|
// A newer effect shape this client doesn't understand yet — must be
|
|
// dropped, not fail the whole catalog parse.
|
|
future: {
|
|
name: "future",
|
|
effectType: "transportShipTrail",
|
|
attributes: { type: "hologram", intensity: 3 },
|
|
product: null,
|
|
rarity: "common",
|
|
},
|
|
},
|
|
},
|
|
});
|
|
expect(result.success).toBe(true);
|
|
if (result.success) {
|
|
const trails = result.data.effects?.transportShipTrail;
|
|
// The good effect survives...
|
|
expect(trails?.good?.name).toBe("good");
|
|
// ...and only the unparseable newer one is dropped.
|
|
expect(trails?.future).toBeUndefined();
|
|
}
|
|
});
|
|
});
|
|
|
|
describe("findEffect", () => {
|
|
const effect = (name: string) => ({
|
|
name,
|
|
attributes: {
|
|
type: "gradient",
|
|
colors: ["#fff"],
|
|
colorSize: 16,
|
|
movementSpeed: 0.15,
|
|
} as const,
|
|
product: null,
|
|
rarity: "common" as const,
|
|
});
|
|
|
|
it("resolves by the catalog object key (the common key === name case)", () => {
|
|
const cosmetics = {
|
|
effects: { transportShipTrail: { spectrum: effect("spectrum") } },
|
|
} as unknown as Cosmetics;
|
|
expect(findEffect(cosmetics, "transportShipTrail", "spectrum")?.name).toBe(
|
|
"spectrum",
|
|
);
|
|
});
|
|
|
|
it("falls back to the name field when the object key differs", () => {
|
|
// Catalog key "trail_01" but the effect's name is "spectrum"; selection and
|
|
// flares are name-based, so the name must still resolve the effect.
|
|
const cosmetics = {
|
|
effects: { transportShipTrail: { trail_01: effect("spectrum") } },
|
|
} as unknown as Cosmetics;
|
|
expect(findEffect(cosmetics, "transportShipTrail", "spectrum")?.name).toBe(
|
|
"spectrum",
|
|
);
|
|
});
|
|
|
|
it("returns undefined for an unknown effect name", () => {
|
|
const cosmetics = {
|
|
effects: { transportShipTrail: { spectrum: effect("spectrum") } },
|
|
} as unknown as Cosmetics;
|
|
expect(
|
|
findEffect(cosmetics, "transportShipTrail", "ghost"),
|
|
).toBeUndefined();
|
|
});
|
|
|
|
it("returns undefined for an unknown effectType or missing catalog", () => {
|
|
const cosmetics = {
|
|
effects: { transportShipTrail: { spectrum: effect("spectrum") } },
|
|
} as unknown as Cosmetics;
|
|
expect(findEffect(cosmetics, "wrongType", "spectrum")).toBeUndefined();
|
|
expect(findEffect(null, "transportShipTrail", "spectrum")).toBeUndefined();
|
|
expect(
|
|
findEffect({} as Cosmetics, "transportShipTrail", "x"),
|
|
).toBeUndefined();
|
|
});
|
|
});
|
|
|
|
describe("PlayerEffectSchema (identity: name + effectType)", () => {
|
|
it("parses a name + effectType (attributes live in the catalog)", () => {
|
|
expect(
|
|
PlayerEffectSchema.safeParse({
|
|
name: "spectrum",
|
|
effectType: "transportShipTrail",
|
|
}).success,
|
|
).toBe(true);
|
|
});
|
|
|
|
it("rejects an unknown effectType (not in EFFECT_TYPES)", () => {
|
|
expect(
|
|
PlayerEffectSchema.safeParse({
|
|
name: "spectrum",
|
|
effectType: "glow",
|
|
}).success,
|
|
).toBe(false);
|
|
});
|
|
|
|
it("requires an effectType", () => {
|
|
expect(PlayerEffectSchema.safeParse({ name: "spectrum" }).success).toBe(
|
|
false,
|
|
);
|
|
});
|
|
});
|