From 7e54c5a2196a90316c997e452c72bf026a17c222 Mon Sep 17 00:00:00 2001
From: Bill <billsonnn@live.com>
Date: Tue, 29 Jun 2021 02:20:50 -0400
Subject: [PATCH] Update triggers

---
 .../wired/common/GetWiredTriggerLayout.tsx    |  2 ++
 .../WiredTriggerAvatarEnterRoomView.tsx       | 36 ++++++++++---------
 .../WiredTriggerAvatarSaysSomethingView.tsx   | 31 ++++++++--------
 .../WiredTriggerAvatarWalksOffFurniView.tsx   |  4 +--
 .../WiredTriggerAvatarWalksOnFurni.tsx        |  4 +--
 .../collision/WiredTriggerCollisionView.tsx   |  4 +--
 .../WiredTriggerExecuteOnceView.tsx           | 15 ++++----
 ...iredTriggerExecutePeriodicallyLongView.tsx | 13 ++++---
 .../WiredTriggerExecutePeriodicallyView.tsx   | 11 +++---
 .../game-ends/WiredTriggerGameEndsView.tsx    |  4 +--
 .../WiredTriggerGameStartsView.tsx            |  4 +--
 .../WiredTriggerScoreAchievedView.tsx         |  8 ++---
 .../WiredTriggerToggleFurniView.tsx           |  4 +--
 13 files changed, 65 insertions(+), 75 deletions(-)

diff --git a/src/views/wired/common/GetWiredTriggerLayout.tsx b/src/views/wired/common/GetWiredTriggerLayout.tsx
index 8fb0e6f7..41ddd9c7 100644
--- a/src/views/wired/common/GetWiredTriggerLayout.tsx
+++ b/src/views/wired/common/GetWiredTriggerLayout.tsx
@@ -47,4 +47,6 @@ export function GetWiredTriggerLayout(code: number): JSX.Element
         case WiredTriggerLayout.TOGGLE_FURNI:
             return <WiredTriggerToggleFurniView />;
     }
+
+    return null;
 }
diff --git a/src/views/wired/views/triggers/avatar-enter-room/WiredTriggerAvatarEnterRoomView.tsx b/src/views/wired/views/triggers/avatar-enter-room/WiredTriggerAvatarEnterRoomView.tsx
index 90c7e030..c2ae65c3 100644
--- a/src/views/wired/views/triggers/avatar-enter-room/WiredTriggerAvatarEnterRoomView.tsx
+++ b/src/views/wired/views/triggers/avatar-enter-room/WiredTriggerAvatarEnterRoomView.tsx
@@ -18,27 +18,31 @@ export const WiredTriggerAvatarEnterRoomView: FC<{}> = props =>
 
     const save = useCallback(() =>
     {
-        if(avatarMode === 1)
-            setStringParam(username);
-        else
-            setStringParam('');
+        if(avatarMode === 1) setStringParam(username);
+        else setStringParam('');
     }, [ username, avatarMode, setStringParam ]);
 
     return (
         <WiredTriggerBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_NONE } save={ save }>
-            <div className="form-check">
-                <input className="form-check-input" type="radio" name="avatarMode" id="avatarMode0" checked={ avatarMode === 0 } onChange={() => setAvatarMode(0)} />
-                <label className="form-check-label" htmlFor="avatarMode0">
-                    { LocalizeText('wiredfurni.params.anyavatar') }
-                </label>
+            <div className="form-group">
+                <label className="fw-bold">{ LocalizeText('wiredfurni.params.picktriggerer') }</label>
+                <div className="form-check">
+                    <input className="form-check-input" type="radio" name="avatarMode" id="avatarMode0" checked={ (avatarMode === 0) } onChange={ event => setAvatarMode(0) } />
+                    <label className="form-check-label" htmlFor="avatarMode0">
+                        { LocalizeText('wiredfurni.params.anyavatar') }
+                    </label>
+                </div>
+                <div className="form-check">
+                    <input className="form-check-input" type="radio" name="avatarMode" id="avatarMode1" checked={ (avatarMode === 1) } onChange={ event => setAvatarMode(1) } />
+                    <label className="form-check-label" htmlFor="avatarMode1">
+                        { LocalizeText('wiredfurni.params.certainavatar') }
+                    </label>
+                </div>
             </div>
-            <div className="form-check">
-                <input className="form-check-input" type="radio" name="avatarMode" id="avatarMode1" checked={ avatarMode === 1 } onChange={() => setAvatarMode(1)} />
-                <label className="form-check-label" htmlFor="avatarMode1">
-                    { LocalizeText('wiredfurni.params.certainavatar') }
-                </label>
-            </div>
-            { avatarMode === 1 && <input type="text" className="form-control form-control-sm" value={ username } onChange={ event => setUsername(event.target.value) } /> }
+            { (avatarMode === 1) &&
+                <div className="form-group">
+                    <input type="text" className="form-control form-control-sm" value={ username } onChange={ event => setUsername(event.target.value) } />
+                </div> }
         </WiredTriggerBaseView>
     );
 }
diff --git a/src/views/wired/views/triggers/avatar-says-something/WiredTriggerAvatarSaysSomethingView.tsx b/src/views/wired/views/triggers/avatar-says-something/WiredTriggerAvatarSaysSomethingView.tsx
index 36ed88fb..761006f2 100644
--- a/src/views/wired/views/triggers/avatar-says-something/WiredTriggerAvatarSaysSomethingView.tsx
+++ b/src/views/wired/views/triggers/avatar-says-something/WiredTriggerAvatarSaysSomethingView.tsx
@@ -20,28 +20,29 @@ export const WiredTriggerAvatarSaysSomethingView: FC<{}> = props =>
     const save = useCallback(() =>
     {
         setStringParam(message);
-        setIntParams([triggererAvatar]);
+        setIntParams([ triggererAvatar ]);
     }, [ message, triggererAvatar, setStringParam, setIntParams ]);
     
     return (
         <WiredTriggerBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_NONE } save={ save }>
-            <div className="form-group">
+            <div className="form-group mb-2">
                 <label className="fw-bold">{ LocalizeText('wiredfurni.params.whatissaid') }</label>
                 <input type="text" className="form-control form-control-sm" value={ message } onChange={ event => setMessage(event.target.value) } />
             </div>
-            <hr className="my-1 mb-2 bg-dark" />
-            <div className="fw-bold">{ LocalizeText('wiredfurni.params.picktriggerer') }</div>
-            <div className="form-check">
-                <input className="form-check-input" type="radio" name="triggererAvatar" id="triggererAvatar0" checked={ triggererAvatar === 0 } onChange={() => setTriggererAvatar(0)} />
-                <label className="form-check-label" htmlFor="triggererAvatar0">
-                    { LocalizeText('wiredfurni.params.anyavatar') }
-                </label>
-            </div>
-            <div className="form-check">
-                <input className="form-check-input" type="radio" name="triggererAvatar" id="triggererAvatar1" checked={ triggererAvatar === 1 } onChange={() => setTriggererAvatar(1)} />
-                <label className="form-check-label" htmlFor="triggererAvatar1">
-                    { GetSessionDataManager().userName }
-                </label>
+            <div className="form-group">
+                <label className="fw-bold">{ LocalizeText('wiredfurni.params.picktriggerer') }</label>
+                <div className="form-check">
+                    <input className="form-check-input" type="radio" name="triggererAvatar" id="triggererAvatar0" checked={ triggererAvatar === 0 } onChange={() => setTriggererAvatar(0)} />
+                    <label className="form-check-label" htmlFor="triggererAvatar0">
+                        { LocalizeText('wiredfurni.params.anyavatar') }
+                    </label>
+                </div>
+                <div className="form-check">
+                    <input className="form-check-input" type="radio" name="triggererAvatar" id="triggererAvatar1" checked={ triggererAvatar === 1 } onChange={() => setTriggererAvatar(1)} />
+                    <label className="form-check-label" htmlFor="triggererAvatar1">
+                        { GetSessionDataManager().userName }
+                    </label>
+                </div>
             </div>
         </WiredTriggerBaseView>
     );
diff --git a/src/views/wired/views/triggers/avatar-walks-off-furni/WiredTriggerAvatarWalksOffFurniView.tsx b/src/views/wired/views/triggers/avatar-walks-off-furni/WiredTriggerAvatarWalksOffFurniView.tsx
index 7c8c47b9..4a9176ca 100644
--- a/src/views/wired/views/triggers/avatar-walks-off-furni/WiredTriggerAvatarWalksOffFurniView.tsx
+++ b/src/views/wired/views/triggers/avatar-walks-off-furni/WiredTriggerAvatarWalksOffFurniView.tsx
@@ -4,7 +4,5 @@ import { WiredTriggerBaseView } from '../base/WiredTriggerBaseView';
 
 export const WiredTriggerAvatarWalksOffFurniView: FC<{}> = props =>
 {
-    return (
-        <WiredTriggerBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_BY_ID_OR_BY_TYPE } save={ null }></WiredTriggerBaseView>
-    );
+    return <WiredTriggerBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_BY_ID_OR_BY_TYPE } save={ null } />;
 }
diff --git a/src/views/wired/views/triggers/avatar-walks-on-furni/WiredTriggerAvatarWalksOnFurni.tsx b/src/views/wired/views/triggers/avatar-walks-on-furni/WiredTriggerAvatarWalksOnFurni.tsx
index 2204b3b0..1584600d 100644
--- a/src/views/wired/views/triggers/avatar-walks-on-furni/WiredTriggerAvatarWalksOnFurni.tsx
+++ b/src/views/wired/views/triggers/avatar-walks-on-furni/WiredTriggerAvatarWalksOnFurni.tsx
@@ -4,7 +4,5 @@ import { WiredTriggerBaseView } from '../base/WiredTriggerBaseView';
 
 export const WiredTriggerAvatarWalksOnFurniView: FC<{}> = props =>
 {
-    return (
-        <WiredTriggerBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_BY_ID_OR_BY_TYPE } save={ null }></WiredTriggerBaseView>
-    );
+    return <WiredTriggerBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_BY_ID_OR_BY_TYPE } save={ null } />;
 }
diff --git a/src/views/wired/views/triggers/collision/WiredTriggerCollisionView.tsx b/src/views/wired/views/triggers/collision/WiredTriggerCollisionView.tsx
index feeffed3..2e76dbfe 100644
--- a/src/views/wired/views/triggers/collision/WiredTriggerCollisionView.tsx
+++ b/src/views/wired/views/triggers/collision/WiredTriggerCollisionView.tsx
@@ -4,7 +4,5 @@ import { WiredTriggerBaseView } from '../base/WiredTriggerBaseView';
 
 export const WiredTriggerCollisionView: FC<{}> = props =>
 {
-    return (
-        <WiredTriggerBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_NONE } save={ null }></WiredTriggerBaseView>
-    );
+    return <WiredTriggerBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_NONE } save={ null } />;
 }
diff --git a/src/views/wired/views/triggers/execute-once/WiredTriggerExecuteOnceView.tsx b/src/views/wired/views/triggers/execute-once/WiredTriggerExecuteOnceView.tsx
index 50035d0e..91b96998 100644
--- a/src/views/wired/views/triggers/execute-once/WiredTriggerExecuteOnceView.tsx
+++ b/src/views/wired/views/triggers/execute-once/WiredTriggerExecuteOnceView.tsx
@@ -1,6 +1,7 @@
 import Slider from 'rc-slider/lib/Slider';
 import { FC, useCallback, useEffect, useState } from 'react';
 import { LocalizeText } from '../../../../../utils/LocalizeText';
+import { GetWiredTimeLocale } from '../../../common/GetWiredTimeLocale';
 import { useWiredContext } from '../../../context/WiredContext';
 import { WiredFurniType } from '../../../WiredView.types';
 import { WiredTriggerBaseView } from '../base/WiredTriggerBaseView';
@@ -17,19 +18,17 @@ export const WiredTriggeExecuteOnceView: FC<{}> = props =>
 
     const save = useCallback(() =>
     {
-        setIntParams([time]);
-    }, [ time,  setIntParams ]);
+        setIntParams([ time ]);
+    }, [ time, setIntParams ]);
 
     return (
         <WiredTriggerBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_NONE } save={ save }>
-            <div className="fw-bold">{ LocalizeText('wiredfurni.params.settime', [ 'seconds' ], [ time.toString() ]) }</div>
+            <div className="fw-bold">{ LocalizeText('wiredfurni.params.settime', [ 'seconds' ], [ GetWiredTimeLocale(time) ]) }</div>
             <Slider 
-                defaultValue={ time }
-                dots={ true }
+                value={ time }
                 min={ 1 }
-                max={ 60 }
-                onChange={ event => setTime(event) }
-                />
+                max={ 1200 }
+                onChange={ event => setTime(event) } />
         </WiredTriggerBaseView>
     );
 }
diff --git a/src/views/wired/views/triggers/execute-periodically-long/WiredTriggerExecutePeriodicallyLongView.tsx b/src/views/wired/views/triggers/execute-periodically-long/WiredTriggerExecutePeriodicallyLongView.tsx
index 9c431d2e..5ee31f14 100644
--- a/src/views/wired/views/triggers/execute-periodically-long/WiredTriggerExecutePeriodicallyLongView.tsx
+++ b/src/views/wired/views/triggers/execute-periodically-long/WiredTriggerExecutePeriodicallyLongView.tsx
@@ -1,3 +1,4 @@
+import { FriendlyTime } from 'nitro-renderer';
 import Slider from 'rc-slider/lib/Slider';
 import { FC, useCallback, useEffect, useState } from 'react';
 import { LocalizeText } from '../../../../../utils/LocalizeText';
@@ -17,19 +18,17 @@ export const WiredTriggeExecutePeriodicallyLongView: FC<{}> = props =>
 
     const save = useCallback(() =>
     {
-        setIntParams([time]);
+        setIntParams([ time ]);
     }, [ time,  setIntParams ]);
 
     return (
         <WiredTriggerBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_NONE } save={ save }>
-            <div className="fw-bold">{ LocalizeText('wiredfurni.params.setlongtime', [ 'time' ], [ time.toString() ]) }</div>
+            <div className="fw-bold">{ LocalizeText('wiredfurni.params.setlongtime', [ 'time' ], [ FriendlyTime.format(time * 5).toString() ]) }</div>
             <Slider 
-                defaultValue={ time }
-                dots={ true }
+                value={ time }
                 min={ 1 }
-                max={ 600 }
-                onChange={ event => setTime(event) }
-                />
+                max={ 120 }
+                onChange={ event => setTime(event) } />
         </WiredTriggerBaseView>
     );
 }
diff --git a/src/views/wired/views/triggers/execute-periodically/WiredTriggerExecutePeriodicallyView.tsx b/src/views/wired/views/triggers/execute-periodically/WiredTriggerExecutePeriodicallyView.tsx
index 5fb0fe62..62ba254a 100644
--- a/src/views/wired/views/triggers/execute-periodically/WiredTriggerExecutePeriodicallyView.tsx
+++ b/src/views/wired/views/triggers/execute-periodically/WiredTriggerExecutePeriodicallyView.tsx
@@ -1,6 +1,7 @@
 import Slider from 'rc-slider/lib/Slider';
 import { FC, useCallback, useEffect, useState } from 'react';
 import { LocalizeText } from '../../../../../utils/LocalizeText';
+import { GetWiredTimeLocale } from '../../../common/GetWiredTimeLocale';
 import { useWiredContext } from '../../../context/WiredContext';
 import { WiredFurniType } from '../../../WiredView.types';
 import { WiredTriggerBaseView } from '../base/WiredTriggerBaseView';
@@ -17,19 +18,17 @@ export const WiredTriggeExecutePeriodicallyView: FC<{}> = props =>
 
     const save = useCallback(() =>
     {
-        setIntParams([time]);
+        setIntParams([ time ]);
     }, [ time,  setIntParams ]);
 
     return (
         <WiredTriggerBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_NONE } save={ save }>
-            <div className="fw-bold">{ LocalizeText('wiredfurni.params.settime', [ 'seconds' ], [ time.toString() ]) }</div>
+            <div className="fw-bold">{ LocalizeText('wiredfurni.params.settime', [ 'seconds' ], [ GetWiredTimeLocale(time) ]) }</div>
             <Slider 
-                defaultValue={ time }
-                dots={ true }
+                value={ time }
                 min={ 1 }
                 max={ 60 }
-                onChange={ event => setTime(event) }
-                />
+                onChange={ event => setTime(event) }/>
         </WiredTriggerBaseView>
     );
 }
diff --git a/src/views/wired/views/triggers/game-ends/WiredTriggerGameEndsView.tsx b/src/views/wired/views/triggers/game-ends/WiredTriggerGameEndsView.tsx
index 4d1df673..9f219b97 100644
--- a/src/views/wired/views/triggers/game-ends/WiredTriggerGameEndsView.tsx
+++ b/src/views/wired/views/triggers/game-ends/WiredTriggerGameEndsView.tsx
@@ -4,7 +4,5 @@ import { WiredTriggerBaseView } from '../base/WiredTriggerBaseView';
 
 export const WiredTriggerGameEndsView: FC<{}> = props =>
 {
-    return (
-        <WiredTriggerBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_NONE } save={ null }></WiredTriggerBaseView>
-    );
+    return <WiredTriggerBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_NONE } save={ null } />;
 }
diff --git a/src/views/wired/views/triggers/game-starts/WiredTriggerGameStartsView.tsx b/src/views/wired/views/triggers/game-starts/WiredTriggerGameStartsView.tsx
index 7726e2b3..cee76c33 100644
--- a/src/views/wired/views/triggers/game-starts/WiredTriggerGameStartsView.tsx
+++ b/src/views/wired/views/triggers/game-starts/WiredTriggerGameStartsView.tsx
@@ -4,7 +4,5 @@ import { WiredTriggerBaseView } from '../base/WiredTriggerBaseView';
 
 export const WiredTriggerGameStartsView: FC<{}> = props =>
 {
-    return (
-        <WiredTriggerBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_NONE } save={ null }></WiredTriggerBaseView>
-    );
+    return <WiredTriggerBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_NONE } save={ null } />;
 }
diff --git a/src/views/wired/views/triggers/score-achieved/WiredTriggerScoreAchievedView.tsx b/src/views/wired/views/triggers/score-achieved/WiredTriggerScoreAchievedView.tsx
index 54151e5e..aaa2047f 100644
--- a/src/views/wired/views/triggers/score-achieved/WiredTriggerScoreAchievedView.tsx
+++ b/src/views/wired/views/triggers/score-achieved/WiredTriggerScoreAchievedView.tsx
@@ -17,20 +17,18 @@ export const WiredTriggeScoreAchievedView: FC<{}> = props =>
 
     const save = useCallback(() =>
     {
-        setIntParams([points]);
+        setIntParams([ points ]);
     }, [ points,  setIntParams ]);
 
     return (
         <WiredTriggerBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_NONE } save={ save }>
             <div className="fw-bold">{ LocalizeText('wiredfurni.params.setscore', [ 'points' ], [ points.toString() ]) }</div>
             <Slider 
-                defaultValue={ points }
-                dots={ true }
+                value={ points }
                 min={ 1 }
                 max={ 1000 }
                 step={ 1 }
-                onChange={ event => setPoints(event) }
-                />
+                onChange={ event => setPoints(event) } />
         </WiredTriggerBaseView>
     );
 }
diff --git a/src/views/wired/views/triggers/toggle-furni/WiredTriggerToggleFurniView.tsx b/src/views/wired/views/triggers/toggle-furni/WiredTriggerToggleFurniView.tsx
index e7182fd0..28ae43c8 100644
--- a/src/views/wired/views/triggers/toggle-furni/WiredTriggerToggleFurniView.tsx
+++ b/src/views/wired/views/triggers/toggle-furni/WiredTriggerToggleFurniView.tsx
@@ -4,7 +4,5 @@ import { WiredTriggerBaseView } from '../base/WiredTriggerBaseView';
 
 export const WiredTriggerToggleFurniView: FC<{}> = props =>
 {
-    return (
-        <WiredTriggerBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_BY_ID_OR_BY_TYPE } save={ null }></WiredTriggerBaseView>
-    );
+    return <WiredTriggerBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_BY_ID_OR_BY_TYPE } save={ null } />;
 }