From cd58141b3b45ebc8a51682576af69b90f311df04 Mon Sep 17 00:00:00 2001 From: Drulikar Date: Mon, 1 Jan 2024 02:07:26 -0800 Subject: [PATCH 1/2] Fix simulators demolition button. --- tgui/packages/tgui/interfaces/CasSim.tsx | 2 +- tgui/packages/tgui/interfaces/DemoSim.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tgui/packages/tgui/interfaces/CasSim.tsx b/tgui/packages/tgui/interfaces/CasSim.tsx index ba5990bd81ce..06420d159f75 100644 --- a/tgui/packages/tgui/interfaces/CasSim.tsx +++ b/tgui/packages/tgui/interfaces/CasSim.tsx @@ -21,7 +21,7 @@ export const CasSim = (_props, context) => { const timeLeft = data.nextdetonationtime - data.worldtime; const timeLeftPct = timeLeft / data.detonation_cooldown; - const canDetonate = timeLeft < 0 && data.configuration && data.looking; + const canDetonate = timeLeft < 0 && data.configuration && simulationView; return ( diff --git a/tgui/packages/tgui/interfaces/DemoSim.jsx b/tgui/packages/tgui/interfaces/DemoSim.jsx index b1a6b3349afe..d83b63c21c27 100644 --- a/tgui/packages/tgui/interfaces/DemoSim.jsx +++ b/tgui/packages/tgui/interfaces/DemoSim.jsx @@ -13,7 +13,7 @@ export const DemoSim = (_props, context) => { const timeLeft = data.nextdetonationtime - data.worldtime; const timeLeftPct = timeLeft / data.detonation_cooldown; - const canDetonate = timeLeft < 0 && data.configuration && data.looking; + const canDetonate = timeLeft < 0 && data.configuration && simulationView; return ( From a870fee6a9951e0c74c62143f98e58f44c9e893f Mon Sep 17 00:00:00 2001 From: Drulikar Date: Tue, 2 Jan 2024 09:18:17 -0800 Subject: [PATCH 2/2] Updated DemoSim to use an interface Remove unused var in CasSim --- tgui/packages/tgui/interfaces/CasSim.tsx | 1 - .../tgui/interfaces/{DemoSim.jsx => DemoSim.tsx} | 10 +++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) rename tgui/packages/tgui/interfaces/{DemoSim.jsx => DemoSim.tsx} (94%) diff --git a/tgui/packages/tgui/interfaces/CasSim.tsx b/tgui/packages/tgui/interfaces/CasSim.tsx index 06420d159f75..cac23cde1833 100644 --- a/tgui/packages/tgui/interfaces/CasSim.tsx +++ b/tgui/packages/tgui/interfaces/CasSim.tsx @@ -3,7 +3,6 @@ import { Box, Button, Section, ProgressBar, NoticeBox, Stack } from '../componen interface CasSimData { configuration: any; - looking: 0 | 1; dummy_mode: string; worldtime: number; nextdetonationtime: number; diff --git a/tgui/packages/tgui/interfaces/DemoSim.jsx b/tgui/packages/tgui/interfaces/DemoSim.tsx similarity index 94% rename from tgui/packages/tgui/interfaces/DemoSim.jsx rename to tgui/packages/tgui/interfaces/DemoSim.tsx index d83b63c21c27..87dfa81236be 100644 --- a/tgui/packages/tgui/interfaces/DemoSim.jsx +++ b/tgui/packages/tgui/interfaces/DemoSim.tsx @@ -2,8 +2,16 @@ import { useBackend, useLocalState } from '../backend'; import { Button, Section, ProgressBar, NoticeBox, Box, Stack } from '../components'; import { Window } from '../layouts'; +interface DemoSimData { + configuration: any; + dummy_mode: string; + worldtime: number; + nextdetonationtime: number; + detonation_cooldown: number; +} + export const DemoSim = (_props, context) => { - const { act, data } = useBackend(context); + const { act, data } = useBackend(context); const [simulationView, setSimulationView] = useLocalState( context, 'simulation_view',