Update triggers

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;
 }

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)
+        if(avatarMode === 1) setStringParam(username);
-            setStringParam(username);
+        else setStringParam('');
-        else
-            setStringParam('');
     }, [ username, avatarMode, setStringParam ]);
 
     return (
         <WiredTriggerBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_NONE } save={ save }>
+            <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={() => setAvatarMode(0)} />
+                    <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={() => setAvatarMode(1)} />
+                    <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>
-            { avatarMode === 1 && <input type="text" className="form-control form-control-sm" value={ username } onChange={ event => setUsername(event.target.value) } /> }
+            </div>
+            { (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>
     );
 }

src/views/wired/views/triggers/avatar-says-something/WiredTriggerAvatarSaysSomethingView.tsx

@@ -25,12 +25,12 @@ export const WiredTriggerAvatarSaysSomethingView: FC<{}> = props =>
     
     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="form-group">
-            <div className="fw-bold">{ LocalizeText('wiredfurni.params.picktriggerer') }</div>
+                <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">
@@ -43,6 +43,7 @@ export const WiredTriggerAvatarSaysSomethingView: FC<{}> = props =>
                         { GetSessionDataManager().userName }
                     </label>
                 </div>
+            </div>
         </WiredTriggerBaseView>
     );
 }

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 (
+    return <WiredTriggerBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_BY_ID_OR_BY_TYPE } save={ null } />;
-        <WiredTriggerBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_BY_ID_OR_BY_TYPE } save={ null }></WiredTriggerBaseView>
-    );
 }

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 (
+    return <WiredTriggerBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_BY_ID_OR_BY_TYPE } save={ null } />;
-        <WiredTriggerBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_BY_ID_OR_BY_TYPE } save={ null }></WiredTriggerBaseView>
-    );
 }

src/views/wired/views/triggers/collision/WiredTriggerCollisionView.tsx

@@ -4,7 +4,5 @@ import { WiredTriggerBaseView } from '../base/WiredTriggerBaseView';
 
 export const WiredTriggerCollisionView: FC<{}> = props =>
 {
-    return (
+    return <WiredTriggerBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_NONE } save={ null } />;
-        <WiredTriggerBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_NONE } save={ null }></WiredTriggerBaseView>
-    );
 }

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';
@@ -22,14 +23,12 @@ export const WiredTriggeExecuteOnceView: FC<{}> = props =>
 
     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 }
+                value={ time }
-                dots={ true }
                 min={ 1 }
-                max={ 60 }
+                max={ 1200 }
-                onChange={ event => setTime(event) }
+                onChange={ event => setTime(event) } />
-                />
         </WiredTriggerBaseView>
     );
 }

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';
@@ -22,14 +23,12 @@ export const WiredTriggeExecutePeriodicallyLongView: FC<{}> = props =>
 
     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 }
+                value={ time }
-                dots={ true }
                 min={ 1 }
-                max={ 600 }
+                max={ 120 }
-                onChange={ event => setTime(event) }
+                onChange={ event => setTime(event) } />
-                />
         </WiredTriggerBaseView>
     );
 }

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';
@@ -22,14 +23,12 @@ export const WiredTriggeExecutePeriodicallyView: FC<{}> = props =>
 
     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 }
+                value={ time }
-                dots={ true }
                 min={ 1 }
                 max={ 60 }
-                onChange={ event => setTime(event) }
+                onChange={ event => setTime(event) }/>
-                />
         </WiredTriggerBaseView>
     );
 }

src/views/wired/views/triggers/game-ends/WiredTriggerGameEndsView.tsx

@@ -4,7 +4,5 @@ import { WiredTriggerBaseView } from '../base/WiredTriggerBaseView';
 
 export const WiredTriggerGameEndsView: FC<{}> = props =>
 {
-    return (
+    return <WiredTriggerBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_NONE } save={ null } />;
-        <WiredTriggerBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_NONE } save={ null }></WiredTriggerBaseView>
-    );
 }

src/views/wired/views/triggers/game-starts/WiredTriggerGameStartsView.tsx

@@ -4,7 +4,5 @@ import { WiredTriggerBaseView } from '../base/WiredTriggerBaseView';
 
 export const WiredTriggerGameStartsView: FC<{}> = props =>
 {
-    return (
+    return <WiredTriggerBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_NONE } save={ null } />;
-        <WiredTriggerBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_NONE } save={ null }></WiredTriggerBaseView>
-    );
 }

src/views/wired/views/triggers/score-achieved/WiredTriggerScoreAchievedView.tsx

@@ -24,13 +24,11 @@ export const WiredTriggeScoreAchievedView: FC<{}> = props =>
         <WiredTriggerBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_NONE } save={ save }>
             <div className="fw-bold">{ LocalizeText('wiredfurni.params.setscore', [ 'points' ], [ points.toString() ]) }</div>
             <Slider 
-                defaultValue={ points }
+                value={ points }
-                dots={ true }
                 min={ 1 }
                 max={ 1000 }
                 step={ 1 }
-                onChange={ event => setPoints(event) }
+                onChange={ event => setPoints(event) } />
-                />
         </WiredTriggerBaseView>
     );
 }

src/views/wired/views/triggers/toggle-furni/WiredTriggerToggleFurniView.tsx

@@ -4,7 +4,5 @@ import { WiredTriggerBaseView } from '../base/WiredTriggerBaseView';
 
 export const WiredTriggerToggleFurniView: FC<{}> = props =>
 {
-    return (
+    return <WiredTriggerBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_BY_ID_OR_BY_TYPE } save={ null } />;
-        <WiredTriggerBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_BY_ID_OR_BY_TYPE } save={ null }></WiredTriggerBaseView>
-    );
 }