From 49ea66a75f17cb7a553f21938d4577e415be6083 Mon Sep 17 00:00:00 2001 From: duckietm Date: Fri, 6 Mar 2026 13:04:14 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=98=20=20alllow/disallow=20PETS/BOTS?= =?UTF-8?q?=20Selector=20Users=20Area?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../selectors/WiredActionFurniAreaView.tsx | 5 ++++ .../selectors/WiredSelectorUsersAreaView.tsx | 26 +++++++++++++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/src/components/wired/views/selectors/WiredActionFurniAreaView.tsx b/src/components/wired/views/selectors/WiredActionFurniAreaView.tsx index 9bc431b..3b8d759 100644 --- a/src/components/wired/views/selectors/WiredActionFurniAreaView.tsx +++ b/src/components/wired/views/selectors/WiredActionFurniAreaView.tsx @@ -106,6 +106,11 @@ export const WiredActionFurniAreaView: FC<{}> = props => { LocalizeText('wiredfurni.params.area_selection') } { LocalizeText('wiredfurni.params.area_selection.info') } + { hasArea && + + { LocalizeText('wiredfurni.params.area_selection.selected', [ 'x', 'y', 'w', 'h' ], [ rootX.toString(), rootY.toString(), areaWidth.toString(), areaHeight.toString() ]) } + } + { hasArea && { LocalizeText('wiredfurni.pickfurnis.caption', [ 'count', 'limit' ], [ pickedCount.toString(), pickedLimit.toString() ]) } diff --git a/src/components/wired/views/selectors/WiredSelectorUsersAreaView.tsx b/src/components/wired/views/selectors/WiredSelectorUsersAreaView.tsx index d507972..d07af98 100644 --- a/src/components/wired/views/selectors/WiredSelectorUsersAreaView.tsx +++ b/src/components/wired/views/selectors/WiredSelectorUsersAreaView.tsx @@ -13,12 +13,14 @@ export const WiredSelectorUsersAreaView: FC<{}> = props => const [ areaHeight, setAreaHeight ] = useState(0); const [ filterExisting, setFilterExisting ] = useState(false); const [ invert, setInvert ] = useState(false); + const [ excludeBots, setExcludeBots ] = useState(false); + const [ excludePets, setExcludePets ] = useState(false); const { trigger = null, setIntParams } = useWired(); const save = useCallback(() => { - setIntParams([ rootX, rootY, areaWidth, areaHeight, filterExisting ? 1 : 0, invert ? 1 : 0 ]); - }, [ rootX, rootY, areaWidth, areaHeight, filterExisting, invert, setIntParams ]); + setIntParams([ rootX, rootY, areaWidth, areaHeight, filterExisting ? 1 : 0, invert ? 1 : 0, excludeBots ? 1 : 0, excludePets ? 1 : 0 ]); + }, [ rootX, rootY, areaWidth, areaHeight, filterExisting, invert, excludeBots, excludePets, setIntParams ]); useEffect(() => { @@ -74,6 +76,8 @@ export const WiredSelectorUsersAreaView: FC<{}> = props => setFilterExisting(trigger.intData.length >= 5 && trigger.intData[4] === 1); setInvert(trigger.intData.length >= 6 && trigger.intData[5] === 1); + setExcludeBots(trigger.intData.length >= 7 && trigger.intData[6] === 1); + setExcludePets(trigger.intData.length >= 8 && trigger.intData[7] === 1); }, [ trigger ]); useEffect(() => @@ -130,6 +134,24 @@ export const WiredSelectorUsersAreaView: FC<{}> = props => onChange={ e => setInvert(e.target.checked) } /> { LocalizeText('wiredfurni.params.selector_option.1') } + + + + );