WIP preserve local changes before duckie merge

2026-06-20 07:26:19 +00:00 · 2026-04-21 11:13:32 +02:00
parent e0174e450c
commit 9b36513def
74 changed files with 4419 additions and 408 deletions
@@ -5,7 +5,14 @@ import { useWired } from '../../../../hooks';
 import { WiredSourcesSelector } from '../WiredSourcesSelector';
 import { WiredActionBaseView } from './WiredActionBaseView';

-const COUNTER_INTERACTION_TYPES = [ 'game_upcounter' ];
+const COUNTER_INTERACTION_TYPES = [
+    'game_upcounter',
+    'game_timer',
+    'wf_game_upcounter*',
+    'fball_counter',
+    'bb_counter',
+    'es_counter'
+];

 const CONTROL_OPTIONS = [
    { value: 0, label: 'wiredfurni.params.clock_control.0' },
@@ -1,30 +1,40 @@
 import { FC, useEffect, useMemo, useState } from 'react';
-import { FaChevronLeft, FaChevronRight } from 'react-icons/fa';
 import { LocalizeText, WiredFurniType } from '../../../../api';
+import sourceFurniIcon from '../../../../assets/images/wired/source_furni.png';
+import sourceUserIcon from '../../../../assets/images/wired/source_user.png';
 import { Button, Slider, Text } from '../../../../common';
 import { useWired } from '../../../../hooks';
+import { WiredFurniSelectionSourceRow } from '../WiredFurniSelectionSourceRow';
 import { sortWiredSourceOptions, useAvailableUserSources } from '../WiredSourcesSelector';
 import { WiredConditionBaseView } from './WiredConditionBaseView';

 const SOURCE_GROUP_USERS = 0;
 const SOURCE_GROUP_FURNI = 1;
+const SOURCE_TRIGGER = 0;
+const SOURCE_SELECTED = 100;
 const COMPARISON_OPTIONS = [ 0, 1, 2 ];
 const MIN_QUANTITY = 0;
 const MAX_QUANTITY = 100;
 const QUANTITY_PATTERN = /^\d*$/;

-const USER_SOURCES = [
+const USER_SOURCES = sortWiredSourceOptions([
    { value: 0, label: 'wiredfurni.params.sources.users.0' },
    { value: 200, label: 'wiredfurni.params.sources.users.200' },
    { value: 201, label: 'wiredfurni.params.sources.users.201' }
-];
+], 'users');

 const FURNI_SOURCES = sortWiredSourceOptions([
-    { value: 0, label: 'wiredfurni.params.sources.furni.0' },
+    { value: 100, label: 'wiredfurni.params.sources.furni.100' },
    { value: 200, label: 'wiredfurni.params.sources.furni.200' },
-    { value: 201, label: 'wiredfurni.params.sources.furni.201' }
+    { value: 201, label: 'wiredfurni.params.sources.furni.201' },
+    { value: 0, label: 'wiredfurni.params.sources.furni.0' }
 ], 'furni');

+const SOURCE_GROUP_BUTTONS = [
+    { key: 'user', icon: sourceUserIcon, isUserGroup: true },
+    { key: 'furni', icon: sourceFurniIcon, isUserGroup: false }
+] as const;
+
 const clampQuantity = (value: number) =>
 {
    if(isNaN(value)) return MIN_QUANTITY;
@@ -32,21 +42,22 @@ const clampQuantity = (value: number) =>
    return Math.max(MIN_QUANTITY, Math.min(MAX_QUANTITY, Math.floor(value)));
 };

-const normalizeSource = (value: number, allowed: number[]) =>
+const normalizeSourceType = (value: number, allowed: number[]) =>
 {
-    return allowed.includes(value) ? value : 0;
+    return allowed.includes(value) ? value : SOURCE_TRIGGER;
 };

 export const WiredConditionSelectionQuantityView: FC<{}> = () =>
 {
-    const { trigger = null, setIntParams = null, setStringParam = null } = useWired();
-    const availableUserSources = sortWiredSourceOptions(useAvailableUserSources(trigger, USER_SOURCES), 'users');
+    const { trigger = null, furniIds = [], setFurniIds = null, setIntParams = null, setStringParam = null } = useWired();
+    const rawAvailableUserSources = useAvailableUserSources(trigger, USER_SOURCES);
+    const availableUserSources = useMemo(() => sortWiredSourceOptions(rawAvailableUserSources, 'users'), [ rawAvailableUserSources ]);
    const [ comparison, setComparison ] = useState(1);
    const [ quantity, setQuantity ] = useState(0);
    const [ quantityInput, setQuantityInput ] = useState('0');
    const [ sourceGroup, setSourceGroup ] = useState(SOURCE_GROUP_USERS);
-    const [ userSource, setUserSource ] = useState(0);
-    const [ furniSource, setFurniSource ] = useState(0);
+    const [ userSource, setUserSource ] = useState(SOURCE_TRIGGER);
+    const [ furniSource, setFurniSource ] = useState(SOURCE_TRIGGER);

    useEffect(() =>
    {
@@ -55,19 +66,46 @@ export const WiredConditionSelectionQuantityView: FC<{}> = () =>
        const nextComparison = (trigger.intData.length > 0) ? trigger.intData[0] : 1;
        const nextQuantity = clampQuantity((trigger.intData.length > 1) ? trigger.intData[1] : 0);
        const nextSourceGroup = (trigger.intData.length > 2 && trigger.intData[2] === SOURCE_GROUP_FURNI) ? SOURCE_GROUP_FURNI : SOURCE_GROUP_USERS;
-        const nextSourceType = (trigger.intData.length > 3) ? trigger.intData[3] : 0;
+        const nextSourceType = (trigger.intData.length > 3) ? trigger.intData[3] : SOURCE_TRIGGER;

        setComparison(COMPARISON_OPTIONS.includes(nextComparison) ? nextComparison : 1);
        setQuantity(nextQuantity);
        setQuantityInput(nextQuantity.toString());
        setSourceGroup(nextSourceGroup);
-        setUserSource(nextSourceGroup === SOURCE_GROUP_USERS ? normalizeSource(nextSourceType, availableUserSources.map(source => source.value)) : 0);
-        setFurniSource(nextSourceGroup === SOURCE_GROUP_FURNI ? normalizeSource(nextSourceType, FURNI_SOURCES.map(source => source.value)) : 0);
+        setUserSource(nextSourceGroup === SOURCE_GROUP_USERS ? normalizeSourceType(nextSourceType, availableUserSources.map(source => source.value)) : SOURCE_TRIGGER);
+        setFurniSource(nextSourceGroup === SOURCE_GROUP_FURNI ? normalizeSourceType(nextSourceType, FURNI_SOURCES.map(source => source.value)) : SOURCE_TRIGGER);
    }, [ availableUserSources, trigger ]);

-    const activeSources = useMemo(() => (sourceGroup === SOURCE_GROUP_FURNI) ? FURNI_SOURCES : availableUserSources, [ availableUserSources, sourceGroup ]);
-    const activeSource = (sourceGroup === SOURCE_GROUP_FURNI) ? furniSource : userSource;
+    const isUserGroup = sourceGroup === SOURCE_GROUP_USERS;
+    const activeSources = useMemo(() => isUserGroup ? availableUserSources : FURNI_SOURCES, [ availableUserSources, isUserGroup ]);
+    const activeSource = isUserGroup ? userSource : furniSource;
    const activeSourceIndex = Math.max(0, activeSources.findIndex(source => source.value === activeSource));
+    const currentSourceType = activeSources[activeSourceIndex]?.value ?? SOURCE_TRIGGER;
+    const requiresFurni = (!isUserGroup && furniSource === SOURCE_SELECTED) ? WiredFurniType.STUFF_SELECTION_OPTION_BY_ID : WiredFurniType.STUFF_SELECTION_OPTION_NONE;
+
+    useEffect(() =>
+    {
+        if(currentSourceType === activeSource) return;
+
+        if(isUserGroup) setUserSource(currentSourceType);
+        else setFurniSource(currentSourceType);
+    }, [ activeSource, currentSourceType, isUserGroup ]);
+
+    const changeGroup = (nextIsUserGroup: boolean) =>
+    {
+        if(nextIsUserGroup === isUserGroup) return;
+
+        const nextOptions = nextIsUserGroup ? availableUserSources : FURNI_SOURCES;
+        const nextIndex = Math.min(activeSourceIndex, Math.max(0, nextOptions.length - 1));
+        const nextOption = nextOptions[nextIndex] ?? nextOptions[0];
+
+        setSourceGroup(nextIsUserGroup ? SOURCE_GROUP_USERS : SOURCE_GROUP_FURNI);
+
+        if(!nextOption) return;
+
+        if(nextIsUserGroup) setUserSource(nextOption.value);
+        else setFurniSource(nextOption.value);
+    };

    const updateQuantity = (value: number) =>
    {
@@ -92,30 +130,23 @@ export const WiredConditionSelectionQuantityView: FC<{}> = () =>
        updateQuantity(parseInt(value));
    };

-    const cycleSource = (direction: -1 | 1) =>
-    {
-        const nextIndex = (activeSourceIndex + direction + activeSources.length) % activeSources.length;
-        const nextValue = activeSources[nextIndex].value;
-
-        if(sourceGroup === SOURCE_GROUP_FURNI) setFurniSource(nextValue);
-        else setUserSource(nextValue);
-    };
-
    const save = () =>
    {
        setIntParams([
            comparison,
            clampQuantity(quantity),
            sourceGroup,
-            (sourceGroup === SOURCE_GROUP_FURNI) ? furniSource : userSource
+            isUserGroup ? userSource : furniSource
        ]);
        setStringParam('');
+
+        if(requiresFurni <= WiredFurniType.STUFF_SELECTION_OPTION_NONE) setFurniIds([]);
    };

    return (
        <WiredConditionBaseView
            hasSpecialInput={ true }
-            requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_NONE }
+            requiresFurni={ requiresFurni }
            save={ save }>
            <div className="flex flex-col gap-1">
                <Text bold>{ LocalizeText('wiredfurni.params.comparison_selection') }</Text>
@@ -147,34 +178,34 @@ export const WiredConditionSelectionQuantityView: FC<{}> = () =>
                    onChange={ event => updateQuantity(event as number) } />
                <Text small>{ quantity }</Text>
            </div>
-            <div className="flex flex-col gap-2">
-                <Text bold>{ LocalizeText('wiredfurni.params.sources.merged.title') }</Text>
-                <div className="flex gap-1">
-                    <Button
-                        fullWidth
-                        variant={ (sourceGroup === SOURCE_GROUP_USERS) ? 'primary' : 'secondary' }
-                        onClick={ () => setSourceGroup(SOURCE_GROUP_USERS) }>
-                        { LocalizeText('wiredfurni.params.sources.users.title') }
-                    </Button>
-                    <Button
-                        fullWidth
-                        variant={ (sourceGroup === SOURCE_GROUP_FURNI) ? 'primary' : 'secondary' }
-                        onClick={ () => setSourceGroup(SOURCE_GROUP_FURNI) }>
-                        { LocalizeText('wiredfurni.params.sources.furni.title') }
-                    </Button>
-                </div>
-                <div className="flex items-center gap-2">
-                    <Button variant="primary" className="px-2 py-1" onClick={ () => cycleSource(-1) }>
-                        <FaChevronLeft />
-                    </Button>
-                    <div className="flex flex-1 items-center justify-center">
-                        <Text small>{ LocalizeText(activeSources[activeSourceIndex].label) }</Text>
+            <WiredFurniSelectionSourceRow
+                title="wiredfurni.params.sources.merged.title"
+                options={ activeSources }
+                value={ activeSource }
+                selectionKind={ isUserGroup ? 'primary' : 'secondary' }
+                selectionActive={ !isUserGroup && furniSource === SOURCE_SELECTED }
+                selectionCount={ furniIds.length }
+                selectionLimit={ trigger?.maximumItemSelectionCount ?? 20 }
+                selectionEnabledValues={ [ SOURCE_SELECTED ] }
+                showSelectionToggle={ false }
+                headerContent={
+                    <div className="nitro-wired__give-var-targets">
+                        { SOURCE_GROUP_BUTTONS.map(button => (
+                            <button
+                                key={ button.key }
+                                type="button"
+                                className={ `nitro-wired__give-var-target nitro-wired__give-var-target--${ button.key } ${ isUserGroup === button.isUserGroup ? 'is-active' : '' }` }
+                                onClick={ () => changeGroup(button.isUserGroup) }>
+                                <img src={ button.icon } alt={ button.key } />
+                            </button>
+                        )) }
                    </div>
-                    <Button variant="primary" className="px-2 py-1" onClick={ () => cycleSource(1) }>
-                        <FaChevronRight />
-                    </Button>
-                </div>
-            </div>
+                }
+                onChange={ value =>
+                {
+                    if(isUserGroup) setUserSource(value);
+                    else setFurniSource(value);
+                } } />
        </WiredConditionBaseView>
    );
 };
@@ -2,6 +2,7 @@ import { FC, useEffect, useState } from 'react';
 import { LocalizeText, WiredFurniType } from '../../../../api';
 import { Text } from '../../../../common';
 import { useWired } from '../../../../hooks';
+import { WiredTextFormattingHelp } from '../common/WiredTextFormattingHelp';
 import { WiredExtraBaseView } from './WiredExtraBaseView';

 const DEFAULT_CONNECTOR_PLACEHOLDER = '0=text 1\n1=text 2\n2 = text 3';
@@ -70,6 +71,7 @@ export const WiredExtraVariableTextConnectorView: FC<{}> = () =>
                    value={ mappingsText }
                    onChange={ event => handleTextChange(event.target.value) } />
                <Text small>{ `${ lineCount }/${ MAX_CONNECTOR_LINES } righe - ${ characterCount }/${ MAX_CONNECTOR_CHARACTERS } caratteri` }</Text>
+                <WiredTextFormattingHelp />
            </div>
        </WiredExtraBaseView>
    );
@@ -15,7 +15,6 @@ const normalizeFurniSource = (value: number) => (FURNI_SOURCE_OPTIONS.some(optio
 export const WiredTriggerReceiveSignalView: FC<{}> = () =>
 {
    const [ senderCount, setSenderCount ] = useState(0);
-    const [ maxSenders, setMaxSenders ] = useState(5);
    const [ channel, setChannel ] = useState(0);
    const [ furniSource, setFurniSource ] = useState(100);

@@ -30,7 +29,6 @@ export const WiredTriggerReceiveSignalView: FC<{}> = () =>
        const p = trigger.intData;
        if(p.length >= 1) setChannel(p[0]);
        if(p.length >= 2) setSenderCount(p[1]);
-        if(p.length >= 3) setMaxSenders(p[2]);
        if(p.length >= 4) setFurniSource(normalizeFurniSource(p[3]));
        else setFurniSource(100);
    }, [ trigger ]);
@@ -43,7 +41,7 @@ export const WiredTriggerReceiveSignalView: FC<{}> = () =>
            footer={ <WiredSourcesSelector showFurni={ true } furniSource={ furniSource } furniSources={ FURNI_SOURCE_OPTIONS } onChangeFurni={ setFurniSource } /> }>
            <div className="flex items-center justify-between">
                <Text small>{ LocalizeText('wiredfurni.params.signal.senders_connected') }</Text>
-                <Text bold small>{ senderCount }/{ maxSenders }</Text>
+                <Text bold small>{ senderCount }</Text>
            </div>
        </WiredTriggerBaseView>
    );