Beta

package.json

@@ -2,7 +2,7 @@
   "name": "stt-data-core",
   "description": "STT DataCore",
   "author": "ussjohnjay/ironyWrit",
-  "version": "3.3.1",
+  "version": "3.4.0",
   "license": "MIT",
   "scripts": {
     "check": "tsc --noEmit",

src/components/dataset_presenters/datapicker.tsx

@@ -18,6 +18,7 @@ import { DataGrid } from './datagrid';
 import { IDataGridSetup } from './model';
 import { DataTable } from './datatable';
 import { IDataTableSetup } from './model';
+import { OptionsPanelFlexRow } from '../stats/utils';
 
 type DataPickerProps = {
 	id: string;
@@ -47,16 +48,17 @@ export const DataPicker = (props: DataPickerProps) => {
 	// Reset search query and close options on each reload
 	const [searchQuery, setSearchQuery] = React.useState<string>('');
 	const [showOptions, setShowOptions] = React.useState<boolean>(false);
+	const [multiSearch, setMultiSearch] = useStateWithStorage<boolean>(`${props.id}/multiSearch`, false, { rememberForever: true });
 
 	// Persist layout preference
 	const [layout, setLayout] = useStateWithStorage<'grid' | 'table'>(`${props.id}/layout`, props.tableSetup ? 'table' : 'grid');
 
 	const data = React.useMemo<IEssentialData[]>(() => {
-		return props.data.slice().filter(datum =>
+		return props.data.filter(datum =>
 			(!props.preFilteredIds || !props.preFilteredIds.has(datum.id))
 				&& (searchQuery === '' || textMatch(datum.name, searchQuery))
 		);
-	}, [props.data, props.preFilteredIds, searchQuery]);
+	}, [props.data, props.preFilteredIds, searchQuery, multiSearch]);
 
 	// Update selected ids on external changes
 	React.useEffect(() => {
@@ -100,15 +102,27 @@ export const DataPicker = (props: DataPickerProps) => {
 	);
 
 	function textMatch(fieldValue: string, userQuery: string): boolean {
+		if (multiSearch) {
+			const uqparts = userQuery.split(",").map(p => p.trim()).filter(s => !!s);
+			if (uqparts.length > 1) {
+				return uqparts.some(part => fieldValue.toLowerCase().replace(/[^a-z0-9]/g, '')
+					.indexOf(part.toLowerCase().replace(/[^a-z0-9]/g, '')) >= 0)
+			}
+		}
 		return fieldValue.toLowerCase().replace(/[^a-z0-9]/g, '')
 			.indexOf(userQuery.toLowerCase().replace(/[^a-z0-9]/g, '')) >= 0;
 	}
 
+
 	function renderModalHeader(): JSX.Element {
 		if (!props.search) return <>{props.title}</>;
-		return (
+		return (<div style={{display: 'flex', width: '100%'}}>
+			<Button active={multiSearch} icon onClick={() => setMultiSearch(!multiSearch)}>
+				<Icon name="list" />
+			</Button>
 			<Input	/* Search by name */
 				ref={inputRef}
+				style={{flexGrow:1}}
 				fluid size='mini'
 				iconPosition='left'
 				placeholder={props.searchPlaceholder ?? t('global.search_by_name')}
@@ -126,7 +140,7 @@ export const DataPicker = (props: DataPickerProps) => {
 					<Icon name='delete' />
 				</Button>
 			</Input>
-		);
+		</div>);
 	}
 
 	function renderModalContent(): JSX.Element {

src/components/item_presenters/avatarview.tsx

@@ -243,6 +243,10 @@ export const AvatarView = (props: AvatarViewProps) => {
                     gen_item = { ...gen_item };
                     gen_item.rarity = showMaxRarity ? gen_item.max_rarity : 0;
                 }
+                else if (props.item) {
+                    gen_item = { ...props.item};
+                    gen_item.rarity = showMaxRarity ? gen_item.max_rarity : 0;
+                }
             }
         }
         if (gen_item) {

src/components/item_presenters/shipskill.tsx

@@ -426,34 +426,41 @@ export const TinyShipSkill = (props: TinyShipSkillProps) => {
 
                 {!!action.charge_phases?.length && <i style={{fontSize:"0.8em"}}>(+{action.charge_phases.length} charge phases)</i>}
                 {!!crew && <p style={{fontSize:"0.75em"}}>
-                    {crew.ship_battle.crit_bonus && (
+                    {!!crew.ship_battle.crit_bonus && (
                         <span>
                             <b>CB:</b> +
                             {crew.ship_battle.crit_bonus}
                             {` `}
                         </span>
                     )}
-                    {crew.ship_battle.crit_chance && (
+                    {!!crew.ship_battle.crit_chance && (
                         <span>
                             <b>CR:</b> +
                             {crew.ship_battle.crit_chance}
                             {` `}
                         </span>
                     )}<br/>
-                    {crew.ship_battle.accuracy &&
+                    {!!crew.ship_battle.accuracy &&
                         <span>
                         <b>AC:</b> +
                         {crew.ship_battle.accuracy}
                         {` `}
                         </span>
                     }
-                    {crew.ship_battle.evasion &&
+                    {!!crew.ship_battle.evasion &&
                         <span>
                         <b>EV:</b> +
                         {crew.ship_battle.evasion}
                         {` `}
                         </span>
-                    }
+                    }<br/>
+                    <span>
+                        <b>I:</b> {crew.action.initial_cooldown}s
+                        {`, `}
+                        <b>D:</b> {crew.action.duration}s
+                        {`, `}
+                        <b>C:</b> {crew.action.cooldown}s
+                    </span>
                 </p>}
             </div>
     )