weyne/dcs-retribution
1
0
Fork 0
mirror of https://github.com/dcs-retribution/dcs-retribution.git synced 2025-11-10 15:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Push full front line information in the event stream.

Browse Source 
https://github.com/dcs-liberation/dcs_liberation/issues/2263
This commit is contained in:
Raffson 2022-06-25 23:13:10 +02:00 committed by GitHub
parent d578e763c0
commit da90a40bc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
client/src/api/eventstream.tsx
View File

@ -13,7 +13,6 @@ import {
updateFlightPositions,
} from "./flightsSlice";
import {
addFrontLine,
deleteFrontLine,
updateFrontLine,
} from "./frontLinesSlice";
@ -47,8 +46,7 @@ interface GameUpdateEvents {
deleted_flights: string[];
selected_flight: string | null;
deselected_flight: boolean;
new_front_lines: FrontLine[];
updated_front_lines: string[];
updated_front_lines: FrontLine[];
deleted_front_lines: string[];
updated_tgos: string[];
updated_control_points: number[];
@ -123,19 +121,12 @@ export const handleStreamedEvents = (
dispatch(selectFlight(events.selected_flight));
}
for (const front of events.new_front_lines) {
dispatch(addFrontLine(front));
if (events.updated_front_lines.length > 0) {
dispatch(updateFrontLine(events.updated_front_lines));
}
for (const id of events.updated_front_lines) {
backend.get(`/front-lines/${id}`).then((response) => {
const front = response.data as FrontLine;
dispatch(updateFrontLine(front));
});
}
for (const id of events.deleted_front_lines) {
dispatch(deleteFrontLine(id));
if (events.deleted_front_lines.length > 0) {
dispatch(deleteFrontLine(events.deleted_front_lines));
}
for (const id of events.updated_tgos) {

19
client/src/api/frontLinesSlice.ts
View File

@ -15,16 +15,15 @@ export const frontLinesSlice = createSlice({
name: "frontLines",
initialState,
reducers: {
addFrontLine: (state, action: PayloadAction<FrontLine>) => {
const front = action.payload;
state.fronts[front.id] = front;
updateFrontLine: (state, action: PayloadAction<FrontLine[]>) => {
for (const front of action.payload) {
state.fronts[front.id] = front;
}
},
updateFrontLine: (state, action: PayloadAction<FrontLine>) => {
const front = action.payload;
state.fronts[front.id] = front;
},
deleteFrontLine: (state, action: PayloadAction<string>) => {
delete state.fronts[action.payload];
deleteFrontLine: (state, action: PayloadAction<string[]>) => {
for (const uid of action.payload) {
delete state.fronts[uid];
}
},
},
extraReducers: (builder) => {
@ -43,7 +42,7 @@ export const frontLinesSlice = createSlice({
},
});
export const { addFrontLine, updateFrontLine, deleteFrontLine } =
export const { updateFrontLine, deleteFrontLine } =
frontLinesSlice.actions;
export const selectFrontLines = (state: RootState) => state.frontLines;

8
game/server/eventstream/models.py
View File

@ -29,8 +29,7 @@ class GameUpdateEventsJs(BaseModel):
deleted_flights: set[UUID]
selected_flight: UUID | None
deselected_flight: bool
new_front_lines: list[FrontLineJs]
updated_front_lines: set[UUID]
updated_front_lines: list[FrontLineJs]
deleted_front_lines: set[UUID]
updated_tgos: set[UUID]
updated_control_points: set[UUID]
@ -78,10 +77,9 @@ class GameUpdateEventsJs(BaseModel):
deleted_flights=events.deleted_flights,
selected_flight=events.selected_flight,
deselected_flight=events.deselected_flight,
new_front_lines=[
FrontLineJs.for_front_line(f) for f in events.new_front_lines
updated_front_lines=[
FrontLineJs.for_front_line(f) for f in events.updated_front_lines
],
updated_front_lines=events.updated_front_lines,
deleted_front_lines=events.deleted_front_lines,
updated_tgos=events.updated_tgos,
updated_control_points=events.updated_control_points,

9
game/sim/gameupdateevents.py
View File

@ -29,8 +29,7 @@ class GameUpdateEvents:
deleted_flights: set[UUID] = field(default_factory=set)
selected_flight: UUID | None = None
deselected_flight: bool = False
new_front_lines: set[FrontLine] = field(default_factory=set)
updated_front_lines: set[UUID] = field(default_factory=set)
updated_front_lines: set[FrontLine] = field(default_factory=set)
deleted_front_lines: set[UUID] = field(default_factory=set)
updated_tgos: set[UUID] = field(default_factory=set)
updated_control_points: set[UUID] = field(default_factory=set)
@ -106,12 +105,8 @@ class GameUpdateEvents:
self.selected_flight = None
return self
def new_front_line(self, front_line: FrontLine) -> GameUpdateEvents:
self.new_front_lines.add(front_line)
return self
def update_front_line(self, front_line: FrontLine) -> GameUpdateEvents:
self.updated_front_lines.add(front_line.id)
self.updated_front_lines.add(front_line)
return self
def delete_front_line(self, front_line: FrontLine) -> GameUpdateEvents:

2
game/theater/controlpoint.py
View File

@ -398,7 +398,7 @@ class ControlPoint(MissionTarget, SidcDescribable, ABC):
self.front_lines[connection] = front
connection.front_lines[self] = front
self.front_line_db.add(front.id, front)
events.new_front_line(front)
events.update_front_line(front)
def _remove_front_line_with(
self, connection: ControlPoint, events: GameUpdateEvents