Ilia Denisov
24c68e9846
Tests · UI / test (push) Has been cancelled
Tests · Go / test (pull_request) Successful in 2m6s
Tests · Go / test (push) Successful in 2m6s
Tests · Integration / integration (pull_request) Successful in 1m51s
Tests · UI / test (pull_request) Successful in 3m53s
Issue #48 п.32 ("Stationed ship groups") shipped with a fragile race fallback: when a foreign group sat on a non-`other`-kind planet the inspector printed a generic "foreign" label, which collapsed the race dropdown to a single uninformative bucket. The engine FBS contract did not carry per-group race either, so live games hit the same gap. This patch carries race authoritatively from the engine through every layer down to the inspector. Wire format & engine - `pkg/schema/fbs/report.fbs`: add `race:string` to `OtherGroup` and `LocalGroup` (additive — old clients ignore). - `pkg/schema/fbs/report/`: regenerated Go bindings. - `ui/frontend/src/proto/galaxy/fbs/report/`: regenerated TS bindings. - `pkg/model/report.OtherGroup.Race`: new field; carried through `LocalGroup` via the embedded `OtherGroup`. - `pkg/transcoder/report.go`: encode + decode `race` on both `LocalGroup` and `OtherGroup`. - `game/internal/controller/report.go.otherGroup`: set `v.Race` from `c.g.Race[c.RaceIndex(sg.OwnerID)].Name` so every emitted group — own or foreign — carries the resolved race name. Legacy parser - `tools/local-dev/legacy-report/parser.go`: capture the `<Race> Groups` header into `pendingOtherGroup.race`, fill local group `Race` from `p.rep.Race`, propagate both into the `report.OtherGroup` rows. - Tests + smoke counts updated; regenerated `KNNTS{039,041}.json` fixtures so the synthetic loader carries the new field. UI - `ui/frontend/src/api/`: `ReportShipGroupBase.race` field; synthetic loader + FBS decoder populate it. - `ui/frontend/src/lib/inspectors/planet/ship-groups.svelte`: the stationed-groups inspector picks race directly from `group.race` (own falls back to `localRace`, both finally to the `race.unknown` placeholder). The planet-owner / "foreign" heuristic is gone. - Row label changes from "N ships mass M" to a compact `<class>` | `<N ×>` | `<mass>` three-column layout: the count cell is right-aligned tabular, the mass cell is right-aligned monospace + tabular, matching the inspector / calculator number conventions. Stale i18n keys removed (`ship_groups.row.count`, `.row.mass`, `.race.foreign`). - All affected unit tests (8 files) carry the new `race` field. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
78 lines
2.9 KiB
Go
78 lines
2.9 KiB
Go
package report
|
|
|
|
import "github.com/google/uuid"
|
|
|
|
type ShipClass struct {
|
|
Name string `json:"name"`
|
|
Drive Float `json:"drive"`
|
|
Armament uint `json:"armament"`
|
|
Weapons Float `json:"weapons"`
|
|
Shields Float `json:"shields"`
|
|
Cargo Float `json:"cargo"`
|
|
Mass Float `json:"mass"`
|
|
}
|
|
|
|
type OthersShipClass struct {
|
|
Race string `json:"race"`
|
|
ShipClass
|
|
}
|
|
|
|
type ShipProduction struct {
|
|
Planet uint `json:"planet"` // Галактический номер планеты
|
|
Class string `json:"class"` // Наименование типа строящегося корабля
|
|
Cost Float `json:"cost"` // Стоимость постройки одного такого корабля (в производственных ед.) без учета расходов на добычу сырья
|
|
ProdUsed Float `json:"prodUsed"` // Сколько производственных единиц уже было затрачено на постройку этого корабля (уже учитывая производство сырья)
|
|
Percent Float `json:"percent"` // Процент завершения активного производства
|
|
Free Float `json:"free"` // Свободный производственный потенциал
|
|
}
|
|
|
|
type IncomingGroup struct {
|
|
Origin uint `json:"origin"`
|
|
Destination uint `json:"destination"`
|
|
Distance Float `json:"distance"`
|
|
Speed Float `json:"speed"`
|
|
Mass Float `json:"mass"`
|
|
}
|
|
|
|
type LocalGroup struct {
|
|
OtherGroup
|
|
ID uuid.UUID `json:"id"`
|
|
State string `json:"state"`
|
|
Fleet *string `json:"fleet"`
|
|
}
|
|
|
|
type OtherGroup struct {
|
|
Number uint `json:"number"`
|
|
Class string `json:"class"`
|
|
Tech map[string]Float `json:"tech"`
|
|
Cargo string `json:"cargo"`
|
|
Load Float `json:"load"`
|
|
Destination uint `json:"destination"`
|
|
Origin *uint `json:"origin,omitempty"`
|
|
Range *Float `json:"range,omitempty"`
|
|
Speed Float `json:"speed"`
|
|
Mass Float `json:"mass"`
|
|
// Race is the owner's display name resolved from `sg.OwnerID`
|
|
// (or, for legacy reports, the section header that introduced
|
|
// the row). The local race fills this in for its own
|
|
// `LocalGroup` copies via the embedded `OtherGroup` field so
|
|
// every group carries an authoritative attribution rather than a
|
|
// "foreign" fallback heuristic at render time.
|
|
Race string `json:"race,omitempty"`
|
|
}
|
|
|
|
type UnidentifiedGroup struct {
|
|
X Float `json:"x"`
|
|
Y Float `json:"y"`
|
|
}
|
|
|
|
type LocalFleet struct {
|
|
Name string `json:"name"`
|
|
Groups uint `json:"groups"`
|
|
Destination uint `json:"destination"`
|
|
Origin *uint `json:"origin,omitempty"`
|
|
Range *Float `json:"range,omitempty"`
|
|
Speed Float `json:"speed"`
|
|
State string `json:"state"`
|
|
}
|