mirror of
https://github.com/duckietm/Nitro-V3.git
synced 2026-06-20 15:36:18 +00:00
feat(wired-ui): add upcounter clock controls and checks
This commit is contained in:
@@ -39,4 +39,6 @@ export class WiredActionLayoutCode
|
|||||||
public static FURNI_TO_FURNI: number = 38;
|
public static FURNI_TO_FURNI: number = 38;
|
||||||
public static SET_ALTITUDE: number = 39;
|
public static SET_ALTITUDE: number = 39;
|
||||||
public static RELATIVE_MOVE: number = 40;
|
public static RELATIVE_MOVE: number = 40;
|
||||||
|
public static CONTROL_CLOCK: number = 41;
|
||||||
|
public static ADJUST_CLOCK: number = 42;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,4 +26,5 @@ export class WiredConditionlayout
|
|||||||
public static NOT_ACTOR_WEARING_EFFECT: number = 23;
|
public static NOT_ACTOR_WEARING_EFFECT: number = 23;
|
||||||
public static DATE_RANGE_ACTIVE: number = 24;
|
public static DATE_RANGE_ACTIVE: number = 24;
|
||||||
public static ACTOR_HAS_HANDITEM: number = 25;
|
public static ACTOR_HAS_HANDITEM: number = 25;
|
||||||
|
public static COUNTER_TIME_MATCHES: number = 27;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,4 +21,5 @@ export class WiredTriggerLayout
|
|||||||
public static CLICK_TILE: number = 19;
|
public static CLICK_TILE: number = 19;
|
||||||
public static CLICK_USER: number = 20;
|
public static CLICK_USER: number = 20;
|
||||||
public static USER_PERFORMS_ACTION: number = 21;
|
public static USER_PERFORMS_ACTION: number = 21;
|
||||||
|
public static CLOCK_COUNTER: number = 22;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,123 @@
|
|||||||
|
import { FC, useEffect, useMemo, useState } from 'react';
|
||||||
|
import { LocalizeText, WiredFurniType } from '../../../../api';
|
||||||
|
import { Slider, Text } from '../../../../common';
|
||||||
|
import { useWired } from '../../../../hooks';
|
||||||
|
import { WiredSourcesSelector } from '../WiredSourcesSelector';
|
||||||
|
import { WiredActionBaseView } from './WiredActionBaseView';
|
||||||
|
|
||||||
|
const COUNTER_INTERACTION_TYPES = [ 'game_upcounter' ];
|
||||||
|
const MINUTES_MIN = 0;
|
||||||
|
const MINUTES_MAX = 99;
|
||||||
|
const HALF_SECONDS_MIN = 0;
|
||||||
|
const HALF_SECONDS_MAX = 119;
|
||||||
|
|
||||||
|
const OPERATOR_OPTIONS = [
|
||||||
|
{ value: 0, label: 'wiredfurni.params.operator.0' },
|
||||||
|
{ value: 1, label: 'wiredfurni.params.operator.1' },
|
||||||
|
{ value: 2, label: 'wiredfurni.params.operator.2' }
|
||||||
|
];
|
||||||
|
|
||||||
|
const normalizeOperator = (value: number) =>
|
||||||
|
{
|
||||||
|
if(value < 0 || value > 2) return 2;
|
||||||
|
|
||||||
|
return value;
|
||||||
|
};
|
||||||
|
|
||||||
|
const normalizeMinutes = (value: number) => Math.max(MINUTES_MIN, Math.min(MINUTES_MAX, value));
|
||||||
|
const normalizeHalfSeconds = (value: number) => Math.max(HALF_SECONDS_MIN, Math.min(HALF_SECONDS_MAX, value));
|
||||||
|
|
||||||
|
const formatSeconds = (halfSeconds: number) =>
|
||||||
|
{
|
||||||
|
const value = normalizeHalfSeconds(halfSeconds) / 2;
|
||||||
|
const text = value.toFixed(1);
|
||||||
|
|
||||||
|
return text.endsWith('.0') ? text.slice(0, -2) : text;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const WiredActionAdjustClockView: FC<{}> = () =>
|
||||||
|
{
|
||||||
|
const { trigger = null, setIntParams = null, setAllowedInteractionTypes = null, setAllowedInteractionErrorKey = null } = useWired();
|
||||||
|
const [ operator, setOperator ] = useState(2);
|
||||||
|
const [ furniSource, setFurniSource ] = useState<number>(() =>
|
||||||
|
{
|
||||||
|
if(trigger?.intData?.length > 1) return trigger.intData[1];
|
||||||
|
return (trigger?.selectedItems?.length ?? 0) > 0 ? 100 : 0;
|
||||||
|
});
|
||||||
|
const [ minutes, setMinutes ] = useState(0);
|
||||||
|
const [ halfSeconds, setHalfSeconds ] = useState(0);
|
||||||
|
|
||||||
|
const secondsLabel = useMemo(() => formatSeconds(halfSeconds), [ halfSeconds ]);
|
||||||
|
|
||||||
|
useEffect(() =>
|
||||||
|
{
|
||||||
|
if(!trigger) return;
|
||||||
|
|
||||||
|
setOperator((trigger.intData.length > 0) ? normalizeOperator(trigger.intData[0]) : 2);
|
||||||
|
setFurniSource((trigger.intData.length > 1) ? trigger.intData[1] : ((trigger.selectedItems?.length ?? 0) > 0 ? 100 : 0));
|
||||||
|
setMinutes((trigger.intData.length > 2) ? normalizeMinutes(trigger.intData[2]) : 0);
|
||||||
|
setHalfSeconds((trigger.intData.length > 3) ? normalizeHalfSeconds(trigger.intData[3]) : 0);
|
||||||
|
}, [ trigger ]);
|
||||||
|
|
||||||
|
useEffect(() =>
|
||||||
|
{
|
||||||
|
setAllowedInteractionTypes(COUNTER_INTERACTION_TYPES);
|
||||||
|
setAllowedInteractionErrorKey('wiredfurni.error.require_counter_furni');
|
||||||
|
|
||||||
|
return () =>
|
||||||
|
{
|
||||||
|
setAllowedInteractionTypes(null);
|
||||||
|
setAllowedInteractionErrorKey(null);
|
||||||
|
};
|
||||||
|
}, [ setAllowedInteractionErrorKey, setAllowedInteractionTypes ]);
|
||||||
|
|
||||||
|
const save = () =>
|
||||||
|
{
|
||||||
|
setIntParams([
|
||||||
|
operator,
|
||||||
|
furniSource,
|
||||||
|
normalizeMinutes(minutes),
|
||||||
|
normalizeHalfSeconds(halfSeconds)
|
||||||
|
]);
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<WiredActionBaseView
|
||||||
|
hasSpecialInput={ true }
|
||||||
|
requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_BY_ID_BY_TYPE_OR_FROM_CONTEXT }
|
||||||
|
save={ save }
|
||||||
|
footer={ <WiredSourcesSelector showFurni={ true } furniSource={ furniSource } onChangeFurni={ setFurniSource } /> }>
|
||||||
|
<div className="flex flex-col gap-2">
|
||||||
|
{ OPERATOR_OPTIONS.map(option =>
|
||||||
|
{
|
||||||
|
return (
|
||||||
|
<div key={ option.value } className="flex items-center gap-1">
|
||||||
|
<input checked={ (operator === option.value) } className="form-check-input" id={ `adjustClockOperator${ option.value }` } name="adjustClockOperator" type="radio" onChange={ () => setOperator(option.value) } />
|
||||||
|
<Text>{ LocalizeText(option.label) }</Text>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}) }
|
||||||
|
</div>
|
||||||
|
<div className="flex flex-col gap-1">
|
||||||
|
<Text bold>{ LocalizeText('wiredfurni.params.time.minute_selection') }</Text>
|
||||||
|
<Slider
|
||||||
|
max={ MINUTES_MAX }
|
||||||
|
min={ MINUTES_MIN }
|
||||||
|
step={ 1 }
|
||||||
|
value={ minutes }
|
||||||
|
onChange={ event => setMinutes(normalizeMinutes(event as number)) } />
|
||||||
|
<Text small>{ minutes }</Text>
|
||||||
|
</div>
|
||||||
|
<div className="flex flex-col gap-1">
|
||||||
|
<Text bold>{ LocalizeText('wiredfurni.params.time.second_selection') }</Text>
|
||||||
|
<Slider
|
||||||
|
max={ HALF_SECONDS_MAX }
|
||||||
|
min={ HALF_SECONDS_MIN }
|
||||||
|
step={ 1 }
|
||||||
|
value={ halfSeconds }
|
||||||
|
onChange={ event => setHalfSeconds(normalizeHalfSeconds(event as number)) } />
|
||||||
|
<Text small>{ secondsLabel }</Text>
|
||||||
|
</div>
|
||||||
|
</WiredActionBaseView>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -0,0 +1,82 @@
|
|||||||
|
import { FC, useEffect, useState } from 'react';
|
||||||
|
import { LocalizeText, WiredFurniType } from '../../../../api';
|
||||||
|
import { Text } from '../../../../common';
|
||||||
|
import { useWired } from '../../../../hooks';
|
||||||
|
import { WiredSourcesSelector } from '../WiredSourcesSelector';
|
||||||
|
import { WiredActionBaseView } from './WiredActionBaseView';
|
||||||
|
|
||||||
|
const COUNTER_INTERACTION_TYPES = [ 'game_upcounter' ];
|
||||||
|
|
||||||
|
const CONTROL_OPTIONS = [
|
||||||
|
{ value: 0, label: 'wiredfurni.params.clock_control.0' },
|
||||||
|
{ value: 1, label: 'wiredfurni.params.clock_control.1' },
|
||||||
|
{ value: 2, label: 'wiredfurni.params.clock_control.2' },
|
||||||
|
{ value: 3, label: 'wiredfurni.params.clock_control.3' },
|
||||||
|
{ value: 4, label: 'wiredfurni.params.clock_control.4' }
|
||||||
|
];
|
||||||
|
|
||||||
|
const normalizeControl = (value: number) =>
|
||||||
|
{
|
||||||
|
if(value < 0 || value > 4) return 0;
|
||||||
|
|
||||||
|
return value;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const WiredActionControlClockView: FC<{}> = () =>
|
||||||
|
{
|
||||||
|
const { trigger = null, setIntParams = null, setAllowedInteractionTypes = null, setAllowedInteractionErrorKey = null } = useWired();
|
||||||
|
const [ control, setControl ] = useState(0);
|
||||||
|
const [ furniSource, setFurniSource ] = useState<number>(() =>
|
||||||
|
{
|
||||||
|
if(trigger?.intData?.length > 1) return trigger.intData[1];
|
||||||
|
return (trigger?.selectedItems?.length ?? 0) > 0 ? 100 : 0;
|
||||||
|
});
|
||||||
|
|
||||||
|
const save = () =>
|
||||||
|
{
|
||||||
|
setIntParams([
|
||||||
|
control,
|
||||||
|
furniSource
|
||||||
|
]);
|
||||||
|
};
|
||||||
|
|
||||||
|
useEffect(() =>
|
||||||
|
{
|
||||||
|
if(!trigger) return;
|
||||||
|
|
||||||
|
setControl((trigger.intData.length > 0) ? normalizeControl(trigger.intData[0]) : 0);
|
||||||
|
setFurniSource((trigger.intData.length > 1) ? trigger.intData[1] : ((trigger.selectedItems?.length ?? 0) > 0 ? 100 : 0));
|
||||||
|
}, [ trigger ]);
|
||||||
|
|
||||||
|
useEffect(() =>
|
||||||
|
{
|
||||||
|
setAllowedInteractionTypes(COUNTER_INTERACTION_TYPES);
|
||||||
|
setAllowedInteractionErrorKey('wiredfurni.error.require_counter_furni');
|
||||||
|
|
||||||
|
return () =>
|
||||||
|
{
|
||||||
|
setAllowedInteractionTypes(null);
|
||||||
|
setAllowedInteractionErrorKey(null);
|
||||||
|
};
|
||||||
|
}, [ setAllowedInteractionErrorKey, setAllowedInteractionTypes ]);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<WiredActionBaseView
|
||||||
|
hasSpecialInput={ true }
|
||||||
|
requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_BY_ID_BY_TYPE_OR_FROM_CONTEXT }
|
||||||
|
save={ save }
|
||||||
|
footer={ <WiredSourcesSelector showFurni={ true } furniSource={ furniSource } onChangeFurni={ setFurniSource } /> }>
|
||||||
|
<div className="flex flex-col gap-2">
|
||||||
|
{ CONTROL_OPTIONS.map(option =>
|
||||||
|
{
|
||||||
|
return (
|
||||||
|
<div key={ option.value } className="flex items-center gap-1">
|
||||||
|
<input checked={ (control === option.value) } className="form-check-input" id={ `controlClock${ option.value }` } name="controlClock" type="radio" onChange={ () => setControl(option.value) } />
|
||||||
|
<Text>{ LocalizeText(option.label) }</Text>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}) }
|
||||||
|
</div>
|
||||||
|
</WiredActionBaseView>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
import { WiredActionLayoutCode } from '../../../../api';
|
import { WiredActionLayoutCode } from '../../../../api';
|
||||||
import { WiredActionBotChangeFigureView } from './WiredActionBotChangeFigureView';
|
import { WiredActionBotChangeFigureView } from './WiredActionBotChangeFigureView';
|
||||||
|
import { WiredActionAdjustClockView } from './WiredActionAdjustClockView';
|
||||||
import { WiredActionFreezeView } from './WiredActionFreezeView';
|
import { WiredActionFreezeView } from './WiredActionFreezeView';
|
||||||
|
import { WiredActionControlClockView } from './WiredActionControlClockView';
|
||||||
import { WiredActionFurniToFurniView } from './WiredActionFurniToFurniView';
|
import { WiredActionFurniToFurniView } from './WiredActionFurniToFurniView';
|
||||||
import { WiredActionSetAltitudeView } from './WiredActionSetAltitudeView';
|
import { WiredActionSetAltitudeView } from './WiredActionSetAltitudeView';
|
||||||
import { WiredActionSendSignalView } from './WiredActionSendSignalView';
|
import { WiredActionSendSignalView } from './WiredActionSendSignalView';
|
||||||
@@ -42,6 +44,8 @@ export const WiredActionLayoutView = (code: number) =>
|
|||||||
{
|
{
|
||||||
case WiredActionLayoutCode.BOT_CHANGE_FIGURE:
|
case WiredActionLayoutCode.BOT_CHANGE_FIGURE:
|
||||||
return <WiredActionBotChangeFigureView />;
|
return <WiredActionBotChangeFigureView />;
|
||||||
|
case WiredActionLayoutCode.ADJUST_CLOCK:
|
||||||
|
return <WiredActionAdjustClockView />;
|
||||||
case WiredActionLayoutCode.BOT_FOLLOW_AVATAR:
|
case WiredActionLayoutCode.BOT_FOLLOW_AVATAR:
|
||||||
return <WiredActionBotFollowAvatarView />;
|
return <WiredActionBotFollowAvatarView />;
|
||||||
case WiredActionLayoutCode.BOT_GIVE_HAND_ITEM:
|
case WiredActionLayoutCode.BOT_GIVE_HAND_ITEM:
|
||||||
@@ -64,6 +68,8 @@ export const WiredActionLayoutView = (code: number) =>
|
|||||||
return <WiredActionFleeView />;
|
return <WiredActionFleeView />;
|
||||||
case WiredActionLayoutCode.FREEZE:
|
case WiredActionLayoutCode.FREEZE:
|
||||||
return <WiredActionFreezeView />;
|
return <WiredActionFreezeView />;
|
||||||
|
case WiredActionLayoutCode.CONTROL_CLOCK:
|
||||||
|
return <WiredActionControlClockView />;
|
||||||
case WiredActionLayoutCode.FURNI_TO_USER:
|
case WiredActionLayoutCode.FURNI_TO_USER:
|
||||||
return <WiredActionTeleportView />;
|
return <WiredActionTeleportView />;
|
||||||
case WiredActionLayoutCode.FURNI_TO_FURNI:
|
case WiredActionLayoutCode.FURNI_TO_FURNI:
|
||||||
|
|||||||
@@ -0,0 +1,123 @@
|
|||||||
|
import { FC, useEffect, useMemo, useState } from 'react';
|
||||||
|
import { LocalizeText, WiredFurniType } from '../../../../api';
|
||||||
|
import { Slider, Text } from '../../../../common';
|
||||||
|
import { useWired } from '../../../../hooks';
|
||||||
|
import { WiredSourcesSelector } from '../WiredSourcesSelector';
|
||||||
|
import { WiredConditionBaseView } from './WiredConditionBaseView';
|
||||||
|
|
||||||
|
const COUNTER_INTERACTION_TYPES = [ 'game_upcounter' ];
|
||||||
|
const MINUTES_MIN = 0;
|
||||||
|
const MINUTES_MAX = 99;
|
||||||
|
const HALF_SECONDS_MIN = 0;
|
||||||
|
const HALF_SECONDS_MAX = 119;
|
||||||
|
|
||||||
|
const COMPARISON_OPTIONS = [
|
||||||
|
{ value: 0, label: 'wiredfurni.params.comparison.0' },
|
||||||
|
{ value: 1, label: 'wiredfurni.params.comparison.1' },
|
||||||
|
{ value: 2, label: 'wiredfurni.params.comparison.2' }
|
||||||
|
];
|
||||||
|
|
||||||
|
const normalizeComparison = (value: number) =>
|
||||||
|
{
|
||||||
|
if(value < 0 || value > 2) return 1;
|
||||||
|
|
||||||
|
return value;
|
||||||
|
};
|
||||||
|
|
||||||
|
const normalizeMinutes = (value: number) => Math.max(MINUTES_MIN, Math.min(MINUTES_MAX, value));
|
||||||
|
const normalizeHalfSeconds = (value: number) => Math.max(HALF_SECONDS_MIN, Math.min(HALF_SECONDS_MAX, value));
|
||||||
|
|
||||||
|
const formatSeconds = (halfSeconds: number) =>
|
||||||
|
{
|
||||||
|
const value = normalizeHalfSeconds(halfSeconds) / 2;
|
||||||
|
const text = value.toFixed(1);
|
||||||
|
|
||||||
|
return text.endsWith('.0') ? text.slice(0, -2) : text;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const WiredConditionCounterTimeMatchesView: FC<{}> = () =>
|
||||||
|
{
|
||||||
|
const { trigger = null, setIntParams = null, setAllowedInteractionTypes = null, setAllowedInteractionErrorKey = null } = useWired();
|
||||||
|
const [ comparison, setComparison ] = useState(1);
|
||||||
|
const [ furniSource, setFurniSource ] = useState<number>(() =>
|
||||||
|
{
|
||||||
|
if(trigger?.intData?.length > 3) return trigger.intData[3];
|
||||||
|
return (trigger?.selectedItems?.length ?? 0) > 0 ? 100 : 0;
|
||||||
|
});
|
||||||
|
const [ minutes, setMinutes ] = useState(0);
|
||||||
|
const [ halfSeconds, setHalfSeconds ] = useState(0);
|
||||||
|
|
||||||
|
const secondsLabel = useMemo(() => formatSeconds(halfSeconds), [ halfSeconds ]);
|
||||||
|
|
||||||
|
const save = () =>
|
||||||
|
{
|
||||||
|
setIntParams([
|
||||||
|
normalizeComparison(comparison),
|
||||||
|
normalizeMinutes(minutes),
|
||||||
|
normalizeHalfSeconds(halfSeconds),
|
||||||
|
furniSource
|
||||||
|
]);
|
||||||
|
};
|
||||||
|
|
||||||
|
useEffect(() =>
|
||||||
|
{
|
||||||
|
if(!trigger) return;
|
||||||
|
|
||||||
|
setComparison((trigger.intData.length > 0) ? normalizeComparison(trigger.intData[0]) : 1);
|
||||||
|
setMinutes((trigger.intData.length > 1) ? normalizeMinutes(trigger.intData[1]) : 0);
|
||||||
|
setHalfSeconds((trigger.intData.length > 2) ? normalizeHalfSeconds(trigger.intData[2]) : 0);
|
||||||
|
setFurniSource((trigger.intData.length > 3) ? trigger.intData[3] : ((trigger.selectedItems?.length ?? 0) > 0 ? 100 : 0));
|
||||||
|
}, [ trigger ]);
|
||||||
|
|
||||||
|
useEffect(() =>
|
||||||
|
{
|
||||||
|
setAllowedInteractionTypes(COUNTER_INTERACTION_TYPES);
|
||||||
|
setAllowedInteractionErrorKey('wiredfurni.error.require_counter_furni');
|
||||||
|
|
||||||
|
return () =>
|
||||||
|
{
|
||||||
|
setAllowedInteractionTypes(null);
|
||||||
|
setAllowedInteractionErrorKey(null);
|
||||||
|
};
|
||||||
|
}, [ setAllowedInteractionErrorKey, setAllowedInteractionTypes ]);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<WiredConditionBaseView
|
||||||
|
hasSpecialInput={ true }
|
||||||
|
requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_BY_ID_BY_TYPE_OR_FROM_CONTEXT }
|
||||||
|
save={ save }
|
||||||
|
footer={ <WiredSourcesSelector showFurni={ true } furniSource={ furniSource } onChangeFurni={ setFurniSource } /> }>
|
||||||
|
<div className="flex flex-col gap-2">
|
||||||
|
{ COMPARISON_OPTIONS.map(option =>
|
||||||
|
{
|
||||||
|
return (
|
||||||
|
<div key={ option.value } className="flex items-center gap-1">
|
||||||
|
<input checked={ (comparison === option.value) } className="form-check-input" id={ `counterComparison${ option.value }` } name="counterComparison" type="radio" onChange={ () => setComparison(option.value) } />
|
||||||
|
<Text>{ LocalizeText(option.label) }</Text>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}) }
|
||||||
|
</div>
|
||||||
|
<div className="flex flex-col gap-1">
|
||||||
|
<Text bold>{ LocalizeText('wiredfurni.params.clock_minutes_elapsed', [ 'minutes' ], [ minutes.toString() ]) }</Text>
|
||||||
|
<Slider
|
||||||
|
max={ MINUTES_MAX }
|
||||||
|
min={ MINUTES_MIN }
|
||||||
|
step={ 1 }
|
||||||
|
value={ minutes }
|
||||||
|
onChange={ event => setMinutes(normalizeMinutes(event as number)) } />
|
||||||
|
<Text small>{ minutes }</Text>
|
||||||
|
</div>
|
||||||
|
<div className="flex flex-col gap-1">
|
||||||
|
<Text bold>{ LocalizeText('wiredfurni.params.clock_seconds_elapsed', [ 'seconds' ], [ secondsLabel ]) }</Text>
|
||||||
|
<Slider
|
||||||
|
max={ HALF_SECONDS_MAX }
|
||||||
|
min={ HALF_SECONDS_MIN }
|
||||||
|
step={ 1 }
|
||||||
|
value={ halfSeconds }
|
||||||
|
onChange={ event => setHalfSeconds(normalizeHalfSeconds(event as number)) } />
|
||||||
|
<Text small>{ secondsLabel }</Text>
|
||||||
|
</div>
|
||||||
|
</WiredConditionBaseView>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -5,6 +5,7 @@ import { WiredConditionActorIsOnFurniView } from './WiredConditionActorIsOnFurni
|
|||||||
import { WiredConditionActorIsTeamMemberView } from './WiredConditionActorIsTeamMemberView';
|
import { WiredConditionActorIsTeamMemberView } from './WiredConditionActorIsTeamMemberView';
|
||||||
import { WiredConditionActorIsWearingBadgeView } from './WiredConditionActorIsWearingBadgeView';
|
import { WiredConditionActorIsWearingBadgeView } from './WiredConditionActorIsWearingBadgeView';
|
||||||
import { WiredConditionActorIsWearingEffectView } from './WiredConditionActorIsWearingEffectView';
|
import { WiredConditionActorIsWearingEffectView } from './WiredConditionActorIsWearingEffectView';
|
||||||
|
import { WiredConditionCounterTimeMatchesView } from './WiredConditionCounterTimeMatchesView';
|
||||||
import { WiredConditionDateRangeView } from './WiredConditionDateRangeView';
|
import { WiredConditionDateRangeView } from './WiredConditionDateRangeView';
|
||||||
import { WiredConditionFurniHasAvatarOnView } from './WiredConditionFurniHasAvatarOnView';
|
import { WiredConditionFurniHasAvatarOnView } from './WiredConditionFurniHasAvatarOnView';
|
||||||
import { WiredConditionFurniHasFurniOnView } from './WiredConditionFurniHasFurniOnView';
|
import { WiredConditionFurniHasFurniOnView } from './WiredConditionFurniHasFurniOnView';
|
||||||
@@ -58,6 +59,8 @@ export const WiredConditionLayoutView = (code: number) =>
|
|||||||
case WiredConditionlayout.USER_COUNT_IN:
|
case WiredConditionlayout.USER_COUNT_IN:
|
||||||
case WiredConditionlayout.NOT_USER_COUNT_IN:
|
case WiredConditionlayout.NOT_USER_COUNT_IN:
|
||||||
return <WiredConditionUserCountInRoomView />;
|
return <WiredConditionUserCountInRoomView />;
|
||||||
|
case WiredConditionlayout.COUNTER_TIME_MATCHES:
|
||||||
|
return <WiredConditionCounterTimeMatchesView />;
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { FC, PropsWithChildren } from 'react';
|
import { FC, PropsWithChildren, ReactNode } from 'react';
|
||||||
import { WiredFurniType } from '../../../../api';
|
import { WiredFurniType } from '../../../../api';
|
||||||
import { WiredBaseView } from '../WiredBaseView';
|
import { WiredBaseView } from '../WiredBaseView';
|
||||||
|
|
||||||
@@ -7,16 +7,17 @@ export interface WiredTriggerBaseViewProps
|
|||||||
hasSpecialInput: boolean;
|
hasSpecialInput: boolean;
|
||||||
requiresFurni: number;
|
requiresFurni: number;
|
||||||
save: () => void;
|
save: () => void;
|
||||||
|
footer?: ReactNode;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const WiredTriggerBaseView: FC<PropsWithChildren<WiredTriggerBaseViewProps>> = props =>
|
export const WiredTriggerBaseView: FC<PropsWithChildren<WiredTriggerBaseViewProps>> = props =>
|
||||||
{
|
{
|
||||||
const { requiresFurni = WiredFurniType.STUFF_SELECTION_OPTION_NONE, save = null, hasSpecialInput = false, children = null } = props;
|
const { requiresFurni = WiredFurniType.STUFF_SELECTION_OPTION_NONE, save = null, hasSpecialInput = false, children = null, footer = null } = props;
|
||||||
|
|
||||||
const onSave = () => (save && save());
|
const onSave = () => (save && save());
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<WiredBaseView hasSpecialInput={ hasSpecialInput } requiresFurni={ requiresFurni } save={ onSave } wiredType="trigger">
|
<WiredBaseView hasSpecialInput={ hasSpecialInput } requiresFurni={ requiresFurni } save={ onSave } wiredType="trigger" footer={ footer }>
|
||||||
{ children }
|
{ children }
|
||||||
</WiredBaseView>
|
</WiredBaseView>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -0,0 +1,101 @@
|
|||||||
|
import { FC, useEffect, useMemo, useState } from 'react';
|
||||||
|
import { LocalizeText, WiredFurniType } from '../../../../api';
|
||||||
|
import { Slider, Text } from '../../../../common';
|
||||||
|
import { useWired } from '../../../../hooks';
|
||||||
|
import { WiredSourcesSelector, WiredSourceOption } from '../WiredSourcesSelector';
|
||||||
|
import { WiredTriggerBaseView } from './WiredTriggerBaseView';
|
||||||
|
|
||||||
|
const COUNTER_INTERACTION_TYPES = [ 'game_upcounter' ];
|
||||||
|
const MINUTES_MIN = 0;
|
||||||
|
const MINUTES_MAX = 99;
|
||||||
|
const HALF_SECONDS_MIN = 0;
|
||||||
|
const HALF_SECONDS_MAX = 119;
|
||||||
|
const TRIGGER_FURNI_SOURCES: WiredSourceOption[] = [
|
||||||
|
{ value: 0, label: 'wiredfurni.params.sources.furni.0' },
|
||||||
|
{ value: 100, label: 'wiredfurni.params.sources.furni.100' }
|
||||||
|
];
|
||||||
|
|
||||||
|
const normalizeMinutes = (value: number) => Math.max(MINUTES_MIN, Math.min(MINUTES_MAX, value));
|
||||||
|
const normalizeHalfSeconds = (value: number) => Math.max(HALF_SECONDS_MIN, Math.min(HALF_SECONDS_MAX, value));
|
||||||
|
const normalizeFurniSource = (value: number) => (value === 100 ? 100 : 0);
|
||||||
|
|
||||||
|
const formatSeconds = (halfSeconds: number) =>
|
||||||
|
{
|
||||||
|
const value = normalizeHalfSeconds(halfSeconds) / 2;
|
||||||
|
const text = value.toFixed(1);
|
||||||
|
|
||||||
|
return text.endsWith('.0') ? text.slice(0, -2) : text;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const WiredTriggerClockCounterView: FC<{}> = () =>
|
||||||
|
{
|
||||||
|
const { trigger = null, setIntParams = null, setAllowedInteractionTypes = null, setAllowedInteractionErrorKey = null } = useWired();
|
||||||
|
const [ furniSource, setFurniSource ] = useState<number>(() =>
|
||||||
|
{
|
||||||
|
if(trigger?.intData?.length > 2) return normalizeFurniSource(trigger.intData[2]);
|
||||||
|
return (trigger?.selectedItems?.length ?? 0) > 0 ? 100 : 0;
|
||||||
|
});
|
||||||
|
const [ minutes, setMinutes ] = useState(0);
|
||||||
|
const [ halfSeconds, setHalfSeconds ] = useState(0);
|
||||||
|
|
||||||
|
const secondsLabel = useMemo(() => formatSeconds(halfSeconds), [ halfSeconds ]);
|
||||||
|
|
||||||
|
const save = () =>
|
||||||
|
{
|
||||||
|
setIntParams([
|
||||||
|
normalizeMinutes(minutes),
|
||||||
|
normalizeHalfSeconds(halfSeconds),
|
||||||
|
normalizeFurniSource(furniSource)
|
||||||
|
]);
|
||||||
|
};
|
||||||
|
|
||||||
|
useEffect(() =>
|
||||||
|
{
|
||||||
|
if(!trigger) return;
|
||||||
|
|
||||||
|
setMinutes((trigger.intData.length > 0) ? normalizeMinutes(trigger.intData[0]) : 0);
|
||||||
|
setHalfSeconds((trigger.intData.length > 1) ? normalizeHalfSeconds(trigger.intData[1]) : 0);
|
||||||
|
setFurniSource((trigger.intData.length > 2) ? normalizeFurniSource(trigger.intData[2]) : ((trigger.selectedItems?.length ?? 0) > 0 ? 100 : 0));
|
||||||
|
}, [ trigger ]);
|
||||||
|
|
||||||
|
useEffect(() =>
|
||||||
|
{
|
||||||
|
setAllowedInteractionTypes(COUNTER_INTERACTION_TYPES);
|
||||||
|
setAllowedInteractionErrorKey('wiredfurni.error.require_counter_furni');
|
||||||
|
|
||||||
|
return () =>
|
||||||
|
{
|
||||||
|
setAllowedInteractionTypes(null);
|
||||||
|
setAllowedInteractionErrorKey(null);
|
||||||
|
};
|
||||||
|
}, [ setAllowedInteractionErrorKey, setAllowedInteractionTypes ]);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<WiredTriggerBaseView
|
||||||
|
hasSpecialInput={ true }
|
||||||
|
requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_BY_ID_BY_TYPE_OR_FROM_CONTEXT }
|
||||||
|
save={ save }
|
||||||
|
footer={ <WiredSourcesSelector showFurni={ true } furniSource={ furniSource } furniSources={ TRIGGER_FURNI_SOURCES } onChangeFurni={ setFurniSource } /> }>
|
||||||
|
<div className="flex flex-col gap-1">
|
||||||
|
<Text bold>{ LocalizeText('wiredfurni.params.clock_minutes_elapsed', [ 'minutes' ], [ minutes.toString() ]) }</Text>
|
||||||
|
<Slider
|
||||||
|
max={ MINUTES_MAX }
|
||||||
|
min={ MINUTES_MIN }
|
||||||
|
step={ 1 }
|
||||||
|
value={ minutes }
|
||||||
|
onChange={ event => setMinutes(normalizeMinutes(event as number)) } />
|
||||||
|
<Text small>{ minutes }</Text>
|
||||||
|
</div>
|
||||||
|
<div className="flex flex-col gap-1">
|
||||||
|
<Text bold>{ LocalizeText('wiredfurni.params.clock_seconds_elapsed', [ 'seconds' ], [ secondsLabel ]) }</Text>
|
||||||
|
<Slider
|
||||||
|
max={ HALF_SECONDS_MAX }
|
||||||
|
min={ HALF_SECONDS_MIN }
|
||||||
|
step={ 1 }
|
||||||
|
value={ halfSeconds }
|
||||||
|
onChange={ event => setHalfSeconds(normalizeHalfSeconds(event as number)) } />
|
||||||
|
<Text small>{ secondsLabel }</Text>
|
||||||
|
</div>
|
||||||
|
</WiredTriggerBaseView>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -9,6 +9,7 @@ import { WiredTriggerBotReachedStuffView } from './WiredTriggerBotReachedStuffVi
|
|||||||
import { WiredTriggerClickFurniView } from './WiredTriggerClickFurniView';
|
import { WiredTriggerClickFurniView } from './WiredTriggerClickFurniView';
|
||||||
import { WiredTriggerClickTileView } from './WiredTriggerClickTileView';
|
import { WiredTriggerClickTileView } from './WiredTriggerClickTileView';
|
||||||
import { WiredTriggerClickUserView } from './WiredTriggerClickUserView';
|
import { WiredTriggerClickUserView } from './WiredTriggerClickUserView';
|
||||||
|
import { WiredTriggerClockCounterView } from './WiredTriggerClockCounterView';
|
||||||
import { WiredTriggerCollisionView } from './WiredTriggerCollisionView';
|
import { WiredTriggerCollisionView } from './WiredTriggerCollisionView';
|
||||||
import { WiredTriggerUserPerformsActionView } from './WiredTriggerUserPerformsActionView';
|
import { WiredTriggerUserPerformsActionView } from './WiredTriggerUserPerformsActionView';
|
||||||
import { WiredTriggeExecuteOnceView } from './WiredTriggerExecuteOnceView';
|
import { WiredTriggeExecuteOnceView } from './WiredTriggerExecuteOnceView';
|
||||||
@@ -45,6 +46,8 @@ export const WiredTriggerLayoutView = (code: number) =>
|
|||||||
return <WiredTriggerClickTileView />;
|
return <WiredTriggerClickTileView />;
|
||||||
case WiredTriggerLayout.CLICK_USER:
|
case WiredTriggerLayout.CLICK_USER:
|
||||||
return <WiredTriggerClickUserView />;
|
return <WiredTriggerClickUserView />;
|
||||||
|
case WiredTriggerLayout.CLOCK_COUNTER:
|
||||||
|
return <WiredTriggerClockCounterView />;
|
||||||
case WiredTriggerLayout.USER_PERFORMS_ACTION:
|
case WiredTriggerLayout.USER_PERFORMS_ACTION:
|
||||||
return <WiredTriggerUserPerformsActionView />;
|
return <WiredTriggerUserPerformsActionView />;
|
||||||
case WiredTriggerLayout.COLLISION:
|
case WiredTriggerLayout.COLLISION:
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ const useWiredState = () =>
|
|||||||
const [ neighborhoodTiles, setNeighborhoodTiles ] = useState<{ x: number; y: number }[] | null>(null);
|
const [ neighborhoodTiles, setNeighborhoodTiles ] = useState<{ x: number; y: number }[] | null>(null);
|
||||||
const [ neighborhoodInvert, setNeighborhoodInvert ] = useState<boolean>(false);
|
const [ neighborhoodInvert, setNeighborhoodInvert ] = useState<boolean>(false);
|
||||||
const [ allowedInteractionTypes, setAllowedInteractionTypes ] = useState<string[] | null>(null);
|
const [ allowedInteractionTypes, setAllowedInteractionTypes ] = useState<string[] | null>(null);
|
||||||
|
const [ allowedInteractionErrorKey, setAllowedInteractionErrorKey ] = useState<string | null>(null);
|
||||||
const { showConfirm = null, simpleAlert = null } = useNotification();
|
const { showConfirm = null, simpleAlert = null } = useNotification();
|
||||||
|
|
||||||
const saveWired = () =>
|
const saveWired = () =>
|
||||||
@@ -84,6 +85,11 @@ const useWiredState = () =>
|
|||||||
return allowedInteractionTypes.some(type => (type && type.toLowerCase() === interactionType));
|
return allowedInteractionTypes.some(type => (type && type.toLowerCase() === interactionType));
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const handleDisallowedInteraction = () =>
|
||||||
|
{
|
||||||
|
if(allowedInteractionErrorKey) simpleAlert(LocalizeText(allowedInteractionErrorKey), null, null, null, LocalizeText('wiredfurni.title'));
|
||||||
|
};
|
||||||
|
|
||||||
if(selectByType && category === RoomObjectCategory.FLOOR)
|
if(selectByType && category === RoomObjectCategory.FLOOR)
|
||||||
{
|
{
|
||||||
const roomId = GetRoomSession().roomId;
|
const roomId = GetRoomSession().roomId;
|
||||||
@@ -97,6 +103,7 @@ const useWiredState = () =>
|
|||||||
if(!sourceFurniData) return;
|
if(!sourceFurniData) return;
|
||||||
if(!isAllowedInteraction(sourceFurniData))
|
if(!isAllowedInteraction(sourceFurniData))
|
||||||
{
|
{
|
||||||
|
handleDisallowedInteraction();
|
||||||
setFurniIds(prevValue =>
|
setFurniIds(prevValue =>
|
||||||
{
|
{
|
||||||
if(!prevValue.includes(objectId)) return prevValue;
|
if(!prevValue.includes(objectId)) return prevValue;
|
||||||
@@ -185,6 +192,7 @@ const useWiredState = () =>
|
|||||||
if(!sourceFurniData) return;
|
if(!sourceFurniData) return;
|
||||||
if(!isAllowedInteraction(sourceFurniData))
|
if(!isAllowedInteraction(sourceFurniData))
|
||||||
{
|
{
|
||||||
|
handleDisallowedInteraction();
|
||||||
setFurniIds(prevValue =>
|
setFurniIds(prevValue =>
|
||||||
{
|
{
|
||||||
if(!prevValue.includes(objectId)) return prevValue;
|
if(!prevValue.includes(objectId)) return prevValue;
|
||||||
@@ -245,7 +253,9 @@ const useWiredState = () =>
|
|||||||
|
|
||||||
if(parser.info && parser.info.length)
|
if(parser.info && parser.info.length)
|
||||||
{
|
{
|
||||||
simpleAlert(parser.info, null, null, null, LocalizeText('wiredfurni.title'));
|
const message = (/^[a-z0-9_.]+$/i.test(parser.info) ? LocalizeText(parser.info) : parser.info);
|
||||||
|
|
||||||
|
simpleAlert(message, null, null, null, LocalizeText('wiredfurni.title'));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -291,10 +301,11 @@ const useWiredState = () =>
|
|||||||
setNeighborhoodTiles(null);
|
setNeighborhoodTiles(null);
|
||||||
setNeighborhoodInvert(false);
|
setNeighborhoodInvert(false);
|
||||||
setAllowedInteractionTypes(null);
|
setAllowedInteractionTypes(null);
|
||||||
|
setAllowedInteractionErrorKey(null);
|
||||||
};
|
};
|
||||||
}, [ trigger ]);
|
}, [ trigger ]);
|
||||||
|
|
||||||
return { trigger, setTrigger, intParams, setIntParams, stringParam, setStringParam, furniIds, setFurniIds, actionDelay, setActionDelay, setAllowsFurni, saveWired, selectObjectForWired, setSelectByType, setNeighborhoodTiles, setNeighborhoodInvert, setAllowedInteractionTypes };
|
return { trigger, setTrigger, intParams, setIntParams, stringParam, setStringParam, furniIds, setFurniIds, actionDelay, setActionDelay, setAllowsFurni, saveWired, selectObjectForWired, setSelectByType, setNeighborhoodTiles, setNeighborhoodInvert, setAllowedInteractionTypes, setAllowedInteractionErrorKey };
|
||||||
};
|
};
|
||||||
|
|
||||||
export const useWired = () => useBetween(useWiredState);
|
export const useWired = () => useBetween(useWiredState);
|
||||||
|
|||||||
Reference in New Issue
Block a user