From cdfeeb9ff80b72f6045125488fc752ecee189316 Mon Sep 17 00:00:00 2001 From: dank074 Date: Tue, 22 Mar 2022 20:23:15 -0500 Subject: [PATCH] add specialInput prop to wired views --- src/components/wired/WiredMessageHandler.tsx | 2 + src/components/wired/WiredView.tsx | 4 +- src/components/wired/views/WiredBaseView.tsx | 40 +++++++++++-------- .../views/actions/WiredActionBaseView.tsx | 5 ++- .../WiredActionBotChangeFigureView.tsx | 2 +- .../WiredActionBotFollowAvatarView.tsx | 2 +- .../WiredActionBotGiveHandItemView.tsx | 2 +- .../views/actions/WiredActionBotMoveView.tsx | 2 +- .../WiredActionBotTalkToAvatarView.tsx | 2 +- .../views/actions/WiredActionBotTalkView.tsx | 2 +- .../actions/WiredActionBotTeleportView.tsx | 2 +- .../WiredActionCallAnotherStackView.tsx | 2 +- .../views/actions/WiredActionChaseView.tsx | 2 +- .../views/actions/WiredActionChatView.tsx | 2 +- .../views/actions/WiredActionFleeView.tsx | 2 +- .../actions/WiredActionGiveRewardView.tsx | 2 +- ...redActionGiveScoreToPredefinedTeamView.tsx | 2 +- .../actions/WiredActionGiveScoreView.tsx | 2 +- .../views/actions/WiredActionJoinTeamView.tsx | 2 +- .../actions/WiredActionKickFromRoomView.tsx | 2 +- .../actions/WiredActionLeaveTeamView.tsx | 2 +- .../WiredActionMoveAndRotateFurniView.tsx | 2 +- .../actions/WiredActionMoveFurniToView.tsx | 2 +- .../actions/WiredActionMoveFurniView.tsx | 2 +- .../views/actions/WiredActionMuteUserView.tsx | 2 +- .../views/actions/WiredActionResetView.tsx | 2 +- .../WiredActionSetFurniStateToView.tsx | 2 +- .../views/actions/WiredActionTeleportView.tsx | 2 +- .../WiredActionToggleFurniStateView.tsx | 2 +- .../WiredConditionActorHasHandItem.tsx | 2 +- .../WiredConditionActorIsGroupMemberView.tsx | 2 +- .../WiredConditionActorIsOnFurniView.tsx | 2 +- .../WiredConditionActorIsTeamMemberView.tsx | 2 +- .../WiredConditionActorIsWearingBadgeView.tsx | 2 +- ...WiredConditionActorIsWearingEffectView.tsx | 2 +- .../conditions/WiredConditionBaseView.tsx | 5 ++- .../WiredConditionDateRangeView.tsx | 2 +- .../WiredConditionFurniHasAvatarOnView.tsx | 2 +- .../WiredConditionFurniHasFurniOnView.tsx | 2 +- .../WiredConditionFurniHasNotFurniOnView.tsx | 2 +- .../WiredConditionFurniIsOfTypeView.tsx | 2 +- ...WiredConditionFurniMatchesSnapshotView.tsx | 2 +- .../WiredConditionTimeElapsedLessView.tsx | 2 +- .../WiredConditionTimeElapsedMoreView.tsx | 2 +- .../WiredConditionUserCountInRoomView.tsx | 2 +- .../WiredTriggerAvatarEnterRoomView.tsx | 2 +- .../WiredTriggerAvatarSaysSomethingView.tsx | 2 +- .../WiredTriggerAvatarWalksOffFurniView.tsx | 2 +- .../WiredTriggerAvatarWalksOnFurni.tsx | 2 +- .../views/triggers/WiredTriggerBaseView.tsx | 5 ++- .../WiredTriggerBotReachedAvatarView.tsx | 2 +- .../WiredTriggerBotReachedStuffView.tsx | 2 +- .../triggers/WiredTriggerCollisionView.tsx | 2 +- .../triggers/WiredTriggerExecuteOnceView.tsx | 2 +- ...iredTriggerExecutePeriodicallyLongView.tsx | 2 +- .../WiredTriggerExecutePeriodicallyView.tsx | 2 +- .../triggers/WiredTriggerGameEndsView.tsx | 2 +- .../triggers/WiredTriggerGameStartsView.tsx | 2 +- .../WiredTriggerScoreAchievedView.tsx | 2 +- .../triggers/WiredTriggerToggleFurniView.tsx | 2 +- 60 files changed, 91 insertions(+), 78 deletions(-) diff --git a/src/components/wired/WiredMessageHandler.tsx b/src/components/wired/WiredMessageHandler.tsx index 0819f9b1..daa4c10f 100644 --- a/src/components/wired/WiredMessageHandler.tsx +++ b/src/components/wired/WiredMessageHandler.tsx @@ -1,5 +1,6 @@ import { WiredFurniActionEvent, WiredFurniConditionEvent, WiredFurniTriggerEvent, WiredOpenEvent, WiredRewardResultMessageEvent, WiredSaveSuccessEvent, WiredValidationErrorEvent } from '@nitrots/nitro-renderer'; import { FC, useCallback } from 'react'; +import { LocalizeText, NotificationAlertType, NotificationUtilities } from '../../api'; import { UseMessageEventHook } from '../../hooks/messages'; import { useWiredContext } from './context/WiredContext'; @@ -51,6 +52,7 @@ export const WiredMessageHandler: FC<{}> = props => { const parser = event.getParser(); + NotificationUtilities.simpleAlert(parser.info, NotificationAlertType.DEFAULT, null, null, LocalizeText('error.title')); console.log(parser); }, []); diff --git a/src/components/wired/WiredView.tsx b/src/components/wired/WiredView.tsx index 97bc67c6..c81a7643 100644 --- a/src/components/wired/WiredView.tsx +++ b/src/components/wired/WiredView.tsx @@ -10,8 +10,8 @@ import { WiredMessageHandler } from './WiredMessageHandler'; export const WiredView: FC<{}> = props => { const [ trigger, setTrigger ] = useState(null); - const [ intParams, setIntParams ] = useState(null); - const [ stringParam, setStringParam ] = useState(null); + const [ intParams, setIntParams ] = useState([]); + const [ stringParam, setStringParam ] = useState(''); const [ furniIds, setFurniIds ] = useState([]); const [ actionDelay, setActionDelay ] = useState(null); diff --git a/src/components/wired/views/WiredBaseView.tsx b/src/components/wired/views/WiredBaseView.tsx index 5bec7477..a40efe38 100644 --- a/src/components/wired/views/WiredBaseView.tsx +++ b/src/components/wired/views/WiredBaseView.tsx @@ -12,13 +12,14 @@ export interface WiredBaseViewProps { wiredType: string; requiresFurni: number; + hasSpecialInput: boolean; save: () => void; validate?: () => boolean; } export const WiredBaseView: FC = props => { - const { wiredType = '', requiresFurni = WiredFurniType.STUFF_SELECTION_OPTION_NONE, save = null, validate = null, children = null } = props; + const { wiredType = '', requiresFurni = WiredFurniType.STUFF_SELECTION_OPTION_NONE, save = null, validate = null, children = null, hasSpecialInput = false } = props; const [ wiredName, setWiredName ] = useState(null); const [ wiredDescription, setWiredDescription ] = useState(null); const { trigger = null, setTrigger = null, setIntParams = null, setStringParam = null, setFurniIds = null } = useWiredContext(); @@ -57,23 +58,30 @@ export const WiredBaseView: FC = props => setWiredDescription(furniData.description); } - setIntParams(trigger.intData); - setStringParam(trigger.stringData); - setFurniIds(prevValue => - { - if(prevValue && prevValue.length) WiredSelectionVisualizer.clearSelectionShaderFromFurni(prevValue); - - if(trigger.selectedItems && trigger.selectedItems.length) + if(hasSpecialInput) + { + setIntParams(trigger.intData); + setStringParam(trigger.stringData); + } + + if(requiresFurni > WiredFurniType.STUFF_SELECTION_OPTION_NONE) + { + setFurniIds(prevValue => { - WiredSelectionVisualizer.applySelectionShaderToFurni(trigger.selectedItems); - - return trigger.selectedItems; - } - - return []; - }); + if(prevValue && prevValue.length) WiredSelectionVisualizer.clearSelectionShaderFromFurni(prevValue); + + if(trigger.selectedItems && trigger.selectedItems.length) + { + WiredSelectionVisualizer.applySelectionShaderToFurni(trigger.selectedItems); + + return trigger.selectedItems; + } + + return []; + }); + } }); - }, [ trigger, setIntParams, setStringParam, setFurniIds ]); + }, [trigger, setIntParams, setStringParam, setFurniIds, hasSpecialInput, requiresFurni]); return ( diff --git a/src/components/wired/views/actions/WiredActionBaseView.tsx b/src/components/wired/views/actions/WiredActionBaseView.tsx index 0d3a6076..f3904428 100644 --- a/src/components/wired/views/actions/WiredActionBaseView.tsx +++ b/src/components/wired/views/actions/WiredActionBaseView.tsx @@ -11,13 +11,14 @@ import { WiredBaseView } from '../WiredBaseView'; export interface WiredActionBaseViewProps { + hasSpecialInput: boolean; requiresFurni: number; save: () => void; } export const WiredActionBaseView: FC = props => { - const { requiresFurni = WiredFurniType.STUFF_SELECTION_OPTION_NONE, save = null, children = null } = props; + const { requiresFurni = WiredFurniType.STUFF_SELECTION_OPTION_NONE, save = null, hasSpecialInput = false, children = null } = props; const [ delay, setDelay ] = useState(-1); const { trigger = null, setActionDelay = null } = useWiredContext(); @@ -34,7 +35,7 @@ export const WiredActionBaseView: FC = props => }, [ delay, save, setActionDelay ]); return ( - + { children } { !!children &&
} diff --git a/src/components/wired/views/actions/WiredActionBotChangeFigureView.tsx b/src/components/wired/views/actions/WiredActionBotChangeFigureView.tsx index 06ada2ef..22c4f489 100644 --- a/src/components/wired/views/actions/WiredActionBotChangeFigureView.tsx +++ b/src/components/wired/views/actions/WiredActionBotChangeFigureView.tsx @@ -37,7 +37,7 @@ export const WiredActionBotChangeFigureView: FC<{}> = props => }, [ trigger ]); return ( - + { LocalizeText('wiredfurni.params.bot.name') } setBotName(event.target.value) } /> diff --git a/src/components/wired/views/actions/WiredActionBotFollowAvatarView.tsx b/src/components/wired/views/actions/WiredActionBotFollowAvatarView.tsx index db19a24f..169be528 100644 --- a/src/components/wired/views/actions/WiredActionBotFollowAvatarView.tsx +++ b/src/components/wired/views/actions/WiredActionBotFollowAvatarView.tsx @@ -33,7 +33,7 @@ export const WiredActionBotFollowAvatarView: FC<{}> = props => }, [ trigger ]); return ( - + setBotName(event.target.value) } /> diff --git a/src/components/wired/views/actions/WiredActionBotGiveHandItemView.tsx b/src/components/wired/views/actions/WiredActionBotGiveHandItemView.tsx index 3a36ae75..82f942a1 100644 --- a/src/components/wired/views/actions/WiredActionBotGiveHandItemView.tsx +++ b/src/components/wired/views/actions/WiredActionBotGiveHandItemView.tsx @@ -34,7 +34,7 @@ export const WiredActionBotGiveHandItemView: FC<{}> = props => }, [ trigger ]); return ( - + { LocalizeText('wiredfurni.params.bot.name') } setBotName(event.target.value) } /> diff --git a/src/components/wired/views/actions/WiredActionBotMoveView.tsx b/src/components/wired/views/actions/WiredActionBotMoveView.tsx index d03b42ea..6c4ec9e4 100644 --- a/src/components/wired/views/actions/WiredActionBotMoveView.tsx +++ b/src/components/wired/views/actions/WiredActionBotMoveView.tsx @@ -22,7 +22,7 @@ export const WiredActionBotMoveView: FC<{}> = props => }, [ trigger ]); return ( - + { LocalizeText('wiredfurni.params.bot.name') } setBotName(event.target.value) } /> diff --git a/src/components/wired/views/actions/WiredActionBotTalkToAvatarView.tsx b/src/components/wired/views/actions/WiredActionBotTalkToAvatarView.tsx index 55cb3d31..69182854 100644 --- a/src/components/wired/views/actions/WiredActionBotTalkToAvatarView.tsx +++ b/src/components/wired/views/actions/WiredActionBotTalkToAvatarView.tsx @@ -39,7 +39,7 @@ export const WiredActionBotTalkToAvatarView: FC<{}> = props => }, [ trigger ]); return ( - + { LocalizeText('wiredfurni.params.bot.name') } setBotName(event.target.value) } /> diff --git a/src/components/wired/views/actions/WiredActionBotTalkView.tsx b/src/components/wired/views/actions/WiredActionBotTalkView.tsx index 86c83fb9..b83a0bdc 100644 --- a/src/components/wired/views/actions/WiredActionBotTalkView.tsx +++ b/src/components/wired/views/actions/WiredActionBotTalkView.tsx @@ -39,7 +39,7 @@ export const WiredActionBotTalkView: FC<{}> = props => }, [ trigger ]); return ( - + { LocalizeText('wiredfurni.params.bot.name') } setBotName(event.target.value) } /> diff --git a/src/components/wired/views/actions/WiredActionBotTeleportView.tsx b/src/components/wired/views/actions/WiredActionBotTeleportView.tsx index bf929e98..3db5a25e 100644 --- a/src/components/wired/views/actions/WiredActionBotTeleportView.tsx +++ b/src/components/wired/views/actions/WiredActionBotTeleportView.tsx @@ -22,7 +22,7 @@ export const WiredActionBotTeleportView: FC<{}> = props => }, [ trigger ]); return ( - + { LocalizeText('wiredfurni.params.bot.name') } setBotName(event.target.value) } /> diff --git a/src/components/wired/views/actions/WiredActionCallAnotherStackView.tsx b/src/components/wired/views/actions/WiredActionCallAnotherStackView.tsx index c3d310e2..e254e6c9 100644 --- a/src/components/wired/views/actions/WiredActionCallAnotherStackView.tsx +++ b/src/components/wired/views/actions/WiredActionCallAnotherStackView.tsx @@ -4,5 +4,5 @@ import { WiredActionBaseView } from './WiredActionBaseView'; export const WiredActionCallAnotherStackView: FC<{}> = props => { - return ; + return ; } diff --git a/src/components/wired/views/actions/WiredActionChaseView.tsx b/src/components/wired/views/actions/WiredActionChaseView.tsx index 5f5dbaac..943a35b6 100644 --- a/src/components/wired/views/actions/WiredActionChaseView.tsx +++ b/src/components/wired/views/actions/WiredActionChaseView.tsx @@ -4,5 +4,5 @@ import { WiredActionBaseView } from './WiredActionBaseView'; export const WiredActionChaseView: FC<{}> = props => { - return ; + return ; } diff --git a/src/components/wired/views/actions/WiredActionChatView.tsx b/src/components/wired/views/actions/WiredActionChatView.tsx index a67ec482..296b8328 100644 --- a/src/components/wired/views/actions/WiredActionChatView.tsx +++ b/src/components/wired/views/actions/WiredActionChatView.tsx @@ -22,7 +22,7 @@ export const WiredActionChatView: FC<{}> = props => }, [ trigger ]); return ( - + { LocalizeText('wiredfurni.params.message') } setMessage(event.target.value) } maxLength={ 100 } /> diff --git a/src/components/wired/views/actions/WiredActionFleeView.tsx b/src/components/wired/views/actions/WiredActionFleeView.tsx index fcc76360..478771b6 100644 --- a/src/components/wired/views/actions/WiredActionFleeView.tsx +++ b/src/components/wired/views/actions/WiredActionFleeView.tsx @@ -4,5 +4,5 @@ import { WiredActionBaseView } from './WiredActionBaseView'; export const WiredActionFleeView: FC<{}> = props => { - return ; + return ; } diff --git a/src/components/wired/views/actions/WiredActionGiveRewardView.tsx b/src/components/wired/views/actions/WiredActionGiveRewardView.tsx index 5da167d7..075312d1 100644 --- a/src/components/wired/views/actions/WiredActionGiveRewardView.tsx +++ b/src/components/wired/views/actions/WiredActionGiveRewardView.tsx @@ -106,7 +106,7 @@ export const WiredActionGiveRewardView: FC<{}> = props => }, [ trigger ]); return ( - + setLimitEnabled(event.target.checked)} /> { LocalizeText('wiredfurni.params.prizelimit', ['amount'], [limitEnabled ? rewardsLimit.toString() : '']) } diff --git a/src/components/wired/views/actions/WiredActionGiveScoreToPredefinedTeamView.tsx b/src/components/wired/views/actions/WiredActionGiveScoreToPredefinedTeamView.tsx index 1e5c2d38..8e99a8f2 100644 --- a/src/components/wired/views/actions/WiredActionGiveScoreToPredefinedTeamView.tsx +++ b/src/components/wired/views/actions/WiredActionGiveScoreToPredefinedTeamView.tsx @@ -41,7 +41,7 @@ export const WiredActionGiveScoreToPredefinedTeamView: FC<{}> = props => }, [ trigger ]); return ( - + { LocalizeText('wiredfurni.params.setpoints', [ 'points' ], [ points.toString() ]) } = props => }, [ trigger ]); return ( - + { LocalizeText('wiredfurni.params.setpoints', [ 'points' ], [ points.toString() ]) } = props => }, [ trigger ]); return ( - + { LocalizeText('wiredfurni.params.team') } { [1, 2, 3, 4].map(team => diff --git a/src/components/wired/views/actions/WiredActionKickFromRoomView.tsx b/src/components/wired/views/actions/WiredActionKickFromRoomView.tsx index 25dc5b82..0c35e45b 100644 --- a/src/components/wired/views/actions/WiredActionKickFromRoomView.tsx +++ b/src/components/wired/views/actions/WiredActionKickFromRoomView.tsx @@ -22,7 +22,7 @@ export const WiredActionKickFromRoomView: FC<{}> = props => }, [ trigger ]); return ( - + { LocalizeText('wiredfurni.params.message') } setMessage(event.target.value) } maxLength={ 100 } /> diff --git a/src/components/wired/views/actions/WiredActionLeaveTeamView.tsx b/src/components/wired/views/actions/WiredActionLeaveTeamView.tsx index 45e9be5f..f9c094c8 100644 --- a/src/components/wired/views/actions/WiredActionLeaveTeamView.tsx +++ b/src/components/wired/views/actions/WiredActionLeaveTeamView.tsx @@ -4,5 +4,5 @@ import { WiredActionBaseView } from './WiredActionBaseView'; export const WiredActionLeaveTeamView: FC<{}> = props => { - return ; + return ; } diff --git a/src/components/wired/views/actions/WiredActionMoveAndRotateFurniView.tsx b/src/components/wired/views/actions/WiredActionMoveAndRotateFurniView.tsx index 4b322d03..e9002466 100644 --- a/src/components/wired/views/actions/WiredActionMoveAndRotateFurniView.tsx +++ b/src/components/wired/views/actions/WiredActionMoveAndRotateFurniView.tsx @@ -58,7 +58,7 @@ export const WiredActionMoveAndRotateFurniView: FC<{}> = props => }, [ trigger ]); return ( - + { LocalizeText('wiredfurni.params.startdir') } diff --git a/src/components/wired/views/actions/WiredActionMoveFurniToView.tsx b/src/components/wired/views/actions/WiredActionMoveFurniToView.tsx index bea80976..5d9d413c 100644 --- a/src/components/wired/views/actions/WiredActionMoveFurniToView.tsx +++ b/src/components/wired/views/actions/WiredActionMoveFurniToView.tsx @@ -57,7 +57,7 @@ export const WiredActionMoveFurniToView: FC<{}> = props => }, [ trigger ]); return ( - + { LocalizeText('wiredfurni.params.emptytiles', [ 'tiles' ], [ spacing.toString() ]) } = props => }, [ trigger ]); return ( - + { LocalizeText('wiredfurni.params.movefurni') } diff --git a/src/components/wired/views/actions/WiredActionMuteUserView.tsx b/src/components/wired/views/actions/WiredActionMuteUserView.tsx index ed087d7d..c01db914 100644 --- a/src/components/wired/views/actions/WiredActionMuteUserView.tsx +++ b/src/components/wired/views/actions/WiredActionMuteUserView.tsx @@ -33,7 +33,7 @@ export const WiredActionMuteUserView: FC<{}> = props => }, [ trigger ]); return ( - + { LocalizeText('wiredfurni.params.length.minutes', ['minutes'], [ time.toString() ]) } = props => { - return ; + return ; } diff --git a/src/components/wired/views/actions/WiredActionSetFurniStateToView.tsx b/src/components/wired/views/actions/WiredActionSetFurniStateToView.tsx index 3b334784..d161a04c 100644 --- a/src/components/wired/views/actions/WiredActionSetFurniStateToView.tsx +++ b/src/components/wired/views/actions/WiredActionSetFurniStateToView.tsx @@ -31,7 +31,7 @@ export const WiredActionSetFurniStateToView: FC<{}> = props => }, [ trigger ]); return ( - + { LocalizeText('wiredfurni.params.conditions') } diff --git a/src/components/wired/views/actions/WiredActionTeleportView.tsx b/src/components/wired/views/actions/WiredActionTeleportView.tsx index 3ab7b330..0cd24c6f 100644 --- a/src/components/wired/views/actions/WiredActionTeleportView.tsx +++ b/src/components/wired/views/actions/WiredActionTeleportView.tsx @@ -4,5 +4,5 @@ import { WiredActionBaseView } from './WiredActionBaseView'; export const WiredActionTeleportView: FC<{}> = props => { - return ; + return ; } diff --git a/src/components/wired/views/actions/WiredActionToggleFurniStateView.tsx b/src/components/wired/views/actions/WiredActionToggleFurniStateView.tsx index 93a26197..4bf8abd9 100644 --- a/src/components/wired/views/actions/WiredActionToggleFurniStateView.tsx +++ b/src/components/wired/views/actions/WiredActionToggleFurniStateView.tsx @@ -4,5 +4,5 @@ import { WiredActionBaseView } from './WiredActionBaseView'; export const WiredActionToggleFurniStateView: FC<{}> = props => { - return ; + return ; } diff --git a/src/components/wired/views/conditions/WiredConditionActorHasHandItem.tsx b/src/components/wired/views/conditions/WiredConditionActorHasHandItem.tsx index 57574db0..d0d00858 100644 --- a/src/components/wired/views/conditions/WiredConditionActorHasHandItem.tsx +++ b/src/components/wired/views/conditions/WiredConditionActorHasHandItem.tsx @@ -24,7 +24,7 @@ export const WiredConditionActorHasHandItemView: FC<{}> = props => }, [ trigger ]); return ( - + { LocalizeText('wiredfurni.params.handitem') } setBadge(event.target.value) } /> diff --git a/src/components/wired/views/conditions/WiredConditionActorIsWearingEffectView.tsx b/src/components/wired/views/conditions/WiredConditionActorIsWearingEffectView.tsx index c3b48361..71c91893 100644 --- a/src/components/wired/views/conditions/WiredConditionActorIsWearingEffectView.tsx +++ b/src/components/wired/views/conditions/WiredConditionActorIsWearingEffectView.tsx @@ -22,7 +22,7 @@ export const WiredConditionActorIsWearingEffectView: FC<{}> = props => }, [ trigger ]); return ( - + { LocalizeText('wiredfurni.params.effectid') } setEffect(parseInt(event.target.value)) } /> diff --git a/src/components/wired/views/conditions/WiredConditionBaseView.tsx b/src/components/wired/views/conditions/WiredConditionBaseView.tsx index f2c6edfa..ff984026 100644 --- a/src/components/wired/views/conditions/WiredConditionBaseView.tsx +++ b/src/components/wired/views/conditions/WiredConditionBaseView.tsx @@ -4,13 +4,14 @@ import { WiredBaseView } from '../WiredBaseView'; export interface WiredConditionBaseViewProps { + hasSpecialInput: boolean; requiresFurni: number; save: () => void; } export const WiredConditionBaseView: FC = props => { - const { requiresFurni = WiredFurniType.STUFF_SELECTION_OPTION_NONE, save = null, children = null } = props; + const { requiresFurni = WiredFurniType.STUFF_SELECTION_OPTION_NONE, save = null, hasSpecialInput = false, children = null } = props; const onSave = useCallback(() => { @@ -18,7 +19,7 @@ export const WiredConditionBaseView: FC = props => }, [ save ]); return ( - + { children } ); diff --git a/src/components/wired/views/conditions/WiredConditionDateRangeView.tsx b/src/components/wired/views/conditions/WiredConditionDateRangeView.tsx index 4d613d7a..c1f843f1 100644 --- a/src/components/wired/views/conditions/WiredConditionDateRangeView.tsx +++ b/src/components/wired/views/conditions/WiredConditionDateRangeView.tsx @@ -55,7 +55,7 @@ export const WiredConditionDateRangeView: FC<{}> = props => }, [ trigger, dateToString ]); return ( - + { LocalizeText('wiredfurni.params.startdate') } setStartDate(e.target.value) } /> diff --git a/src/components/wired/views/conditions/WiredConditionFurniHasAvatarOnView.tsx b/src/components/wired/views/conditions/WiredConditionFurniHasAvatarOnView.tsx index 4a79952a..01912ec9 100644 --- a/src/components/wired/views/conditions/WiredConditionFurniHasAvatarOnView.tsx +++ b/src/components/wired/views/conditions/WiredConditionFurniHasAvatarOnView.tsx @@ -4,5 +4,5 @@ import { WiredConditionBaseView } from './WiredConditionBaseView'; export const WiredConditionFurniHasAvatarOnView: FC<{}> = props => { - return ; + return ; } diff --git a/src/components/wired/views/conditions/WiredConditionFurniHasFurniOnView.tsx b/src/components/wired/views/conditions/WiredConditionFurniHasFurniOnView.tsx index 5fab235a..c498cc00 100644 --- a/src/components/wired/views/conditions/WiredConditionFurniHasFurniOnView.tsx +++ b/src/components/wired/views/conditions/WiredConditionFurniHasFurniOnView.tsx @@ -23,7 +23,7 @@ export const WiredConditionFurniHasFurniOnView: FC<{}> = props => }, [ trigger ]); return ( - + { LocalizeText('wiredfurni.params.requireall') } { [0, 1].map(value => diff --git a/src/components/wired/views/conditions/WiredConditionFurniHasNotFurniOnView.tsx b/src/components/wired/views/conditions/WiredConditionFurniHasNotFurniOnView.tsx index 1e9d8efe..b15be97c 100644 --- a/src/components/wired/views/conditions/WiredConditionFurniHasNotFurniOnView.tsx +++ b/src/components/wired/views/conditions/WiredConditionFurniHasNotFurniOnView.tsx @@ -23,7 +23,7 @@ export const WiredConditionFurniHasNotFurniOnView: FC<{}> = props => }, [ trigger ]); return ( - + { LocalizeText('wiredfurni.params.not_requireall') } { [0, 1].map(value => diff --git a/src/components/wired/views/conditions/WiredConditionFurniIsOfTypeView.tsx b/src/components/wired/views/conditions/WiredConditionFurniIsOfTypeView.tsx index 47d97cca..b8f8e3a5 100644 --- a/src/components/wired/views/conditions/WiredConditionFurniIsOfTypeView.tsx +++ b/src/components/wired/views/conditions/WiredConditionFurniIsOfTypeView.tsx @@ -4,5 +4,5 @@ import { WiredConditionBaseView } from './WiredConditionBaseView'; export const WiredConditionFurniIsOfTypeView: FC<{}> = props => { - return ; + return ; } diff --git a/src/components/wired/views/conditions/WiredConditionFurniMatchesSnapshotView.tsx b/src/components/wired/views/conditions/WiredConditionFurniMatchesSnapshotView.tsx index 2924cc60..14ed53a3 100644 --- a/src/components/wired/views/conditions/WiredConditionFurniMatchesSnapshotView.tsx +++ b/src/components/wired/views/conditions/WiredConditionFurniMatchesSnapshotView.tsx @@ -31,7 +31,7 @@ export const WiredConditionFurniMatchesSnapshotView: FC<{}> = props => }, [ trigger ]); return ( - + { LocalizeText('wiredfurni.params.conditions') } diff --git a/src/components/wired/views/conditions/WiredConditionTimeElapsedLessView.tsx b/src/components/wired/views/conditions/WiredConditionTimeElapsedLessView.tsx index bbe084b1..085666b4 100644 --- a/src/components/wired/views/conditions/WiredConditionTimeElapsedLessView.tsx +++ b/src/components/wired/views/conditions/WiredConditionTimeElapsedLessView.tsx @@ -24,7 +24,7 @@ export const WiredConditionTimeElapsedLessView: FC<{}> = props => }, [ trigger ]); return ( - + { LocalizeText('wiredfurni.params.allowbefore', [ 'seconds' ], [ GetWiredTimeLocale(time) ]) } = props => }, [ trigger ]); return ( - + { LocalizeText('wiredfurni.params.allowafter', [ 'seconds' ], [ GetWiredTimeLocale(time) ]) } = props => }, [ trigger ]); return ( - + { LocalizeText('wiredfurni.params.usercountmin', [ 'value' ], [ min.toString() ]) } = props => }, [ trigger ]); return ( - + { LocalizeText('wiredfurni.params.picktriggerer') } diff --git a/src/components/wired/views/triggers/WiredTriggerAvatarSaysSomethingView.tsx b/src/components/wired/views/triggers/WiredTriggerAvatarSaysSomethingView.tsx index edc55a50..97da5be9 100644 --- a/src/components/wired/views/triggers/WiredTriggerAvatarSaysSomethingView.tsx +++ b/src/components/wired/views/triggers/WiredTriggerAvatarSaysSomethingView.tsx @@ -33,7 +33,7 @@ export const WiredTriggerAvatarSaysSomethingView: FC<{}> = props => }, [ trigger ]); return ( - + { LocalizeText('wiredfurni.params.whatissaid') } setMessage(event.target.value) } /> diff --git a/src/components/wired/views/triggers/WiredTriggerAvatarWalksOffFurniView.tsx b/src/components/wired/views/triggers/WiredTriggerAvatarWalksOffFurniView.tsx index a436cee7..db16a694 100644 --- a/src/components/wired/views/triggers/WiredTriggerAvatarWalksOffFurniView.tsx +++ b/src/components/wired/views/triggers/WiredTriggerAvatarWalksOffFurniView.tsx @@ -4,5 +4,5 @@ import { WiredTriggerBaseView } from './WiredTriggerBaseView'; export const WiredTriggerAvatarWalksOffFurniView: FC<{}> = props => { - return ; + return ; } diff --git a/src/components/wired/views/triggers/WiredTriggerAvatarWalksOnFurni.tsx b/src/components/wired/views/triggers/WiredTriggerAvatarWalksOnFurni.tsx index 4644babf..2299c8a2 100644 --- a/src/components/wired/views/triggers/WiredTriggerAvatarWalksOnFurni.tsx +++ b/src/components/wired/views/triggers/WiredTriggerAvatarWalksOnFurni.tsx @@ -4,5 +4,5 @@ import { WiredTriggerBaseView } from './WiredTriggerBaseView'; export const WiredTriggerAvatarWalksOnFurniView: FC<{}> = props => { - return ; + return ; } diff --git a/src/components/wired/views/triggers/WiredTriggerBaseView.tsx b/src/components/wired/views/triggers/WiredTriggerBaseView.tsx index 47b5f669..30b9ee25 100644 --- a/src/components/wired/views/triggers/WiredTriggerBaseView.tsx +++ b/src/components/wired/views/triggers/WiredTriggerBaseView.tsx @@ -4,13 +4,14 @@ import { WiredBaseView } from '../WiredBaseView'; export interface WiredTriggerBaseViewProps { + hasSpecialInput: boolean; requiresFurni: number; save: () => void; } export const WiredTriggerBaseView: FC = props => { - const { requiresFurni = WiredFurniType.STUFF_SELECTION_OPTION_NONE, save = null, children = null } = props; + const { requiresFurni = WiredFurniType.STUFF_SELECTION_OPTION_NONE, save = null, hasSpecialInput = false, children = null } = props; const onSave = useCallback(() => { @@ -18,7 +19,7 @@ export const WiredTriggerBaseView: FC = props => }, [ save ]); return ( - + { children } ); diff --git a/src/components/wired/views/triggers/WiredTriggerBotReachedAvatarView.tsx b/src/components/wired/views/triggers/WiredTriggerBotReachedAvatarView.tsx index 9ff1a0e5..2a93f65e 100644 --- a/src/components/wired/views/triggers/WiredTriggerBotReachedAvatarView.tsx +++ b/src/components/wired/views/triggers/WiredTriggerBotReachedAvatarView.tsx @@ -22,7 +22,7 @@ export const WiredTriggerBotReachedAvatarView: FC<{}> = props => }, [ trigger ]); return ( - + { LocalizeText('wiredfurni.params.bot.name') } setBotName(event.target.value) } /> diff --git a/src/components/wired/views/triggers/WiredTriggerBotReachedStuffView.tsx b/src/components/wired/views/triggers/WiredTriggerBotReachedStuffView.tsx index 909afe6f..bf4a1710 100644 --- a/src/components/wired/views/triggers/WiredTriggerBotReachedStuffView.tsx +++ b/src/components/wired/views/triggers/WiredTriggerBotReachedStuffView.tsx @@ -22,7 +22,7 @@ export const WiredTriggerBotReachedStuffView: FC<{}> = props => }, [ trigger ]); return ( - + { LocalizeText('wiredfurni.params.bot.name') } setBotName(event.target.value) } /> diff --git a/src/components/wired/views/triggers/WiredTriggerCollisionView.tsx b/src/components/wired/views/triggers/WiredTriggerCollisionView.tsx index 2f7cb067..868e212f 100644 --- a/src/components/wired/views/triggers/WiredTriggerCollisionView.tsx +++ b/src/components/wired/views/triggers/WiredTriggerCollisionView.tsx @@ -4,5 +4,5 @@ import { WiredTriggerBaseView } from './WiredTriggerBaseView'; export const WiredTriggerCollisionView: FC<{}> = props => { - return ; + return ; } diff --git a/src/components/wired/views/triggers/WiredTriggerExecuteOnceView.tsx b/src/components/wired/views/triggers/WiredTriggerExecuteOnceView.tsx index 22b6ae22..032fcb77 100644 --- a/src/components/wired/views/triggers/WiredTriggerExecuteOnceView.tsx +++ b/src/components/wired/views/triggers/WiredTriggerExecuteOnceView.tsx @@ -24,7 +24,7 @@ export const WiredTriggeExecuteOnceView: FC<{}> = props => }, [ trigger ]); return ( - + { LocalizeText('wiredfurni.params.settime', [ 'seconds' ], [ GetWiredTimeLocale(time) ]) } = props => }, [ trigger ]); return ( - + { LocalizeText('wiredfurni.params.setlongtime', [ 'time' ], [ FriendlyTime.format(time * 5).toString() ]) } = props => }, [ trigger ]); return ( - + { LocalizeText('wiredfurni.params.settime', [ 'seconds' ], [ GetWiredTimeLocale(time) ]) } = props => { - return ; + return ; } diff --git a/src/components/wired/views/triggers/WiredTriggerGameStartsView.tsx b/src/components/wired/views/triggers/WiredTriggerGameStartsView.tsx index 57650fa8..a55e3c30 100644 --- a/src/components/wired/views/triggers/WiredTriggerGameStartsView.tsx +++ b/src/components/wired/views/triggers/WiredTriggerGameStartsView.tsx @@ -4,5 +4,5 @@ import { WiredTriggerBaseView } from './WiredTriggerBaseView'; export const WiredTriggerGameStartsView: FC<{}> = props => { - return ; + return ; } diff --git a/src/components/wired/views/triggers/WiredTriggerScoreAchievedView.tsx b/src/components/wired/views/triggers/WiredTriggerScoreAchievedView.tsx index f4043937..a4011248 100644 --- a/src/components/wired/views/triggers/WiredTriggerScoreAchievedView.tsx +++ b/src/components/wired/views/triggers/WiredTriggerScoreAchievedView.tsx @@ -23,7 +23,7 @@ export const WiredTriggeScoreAchievedView: FC<{}> = props => }, [ trigger ]); return ( - + { LocalizeText('wiredfurni.params.setscore', [ 'points' ], [ points.toString() ]) } = props => { - return ; + return ; }