@rpg-engine/long-bow 0.3.54 → 0.3.57

package/src/components/Spellbook/Spellbook.tsx

@@ -1,150 +1,144 @@
-import { IRawSpell, IShortcut } from '@rpg-engine/shared';
-import React, { Fragment, useEffect, useMemo, useState } from 'react';
-import styled from 'styled-components';
-import { uiFonts } from '../../constants/uiFonts';
-import { DraggableContainer } from '../DraggableContainer';
-import { Input } from '../Input';
-import { RPGUIContainerTypes } from '../RPGUIContainer';
-import { ShortcutsSetter } from '../Shortcuts/ShortcutsSetter';
-import { Spell } from './Spell';
-
-export interface ISpellbookProps {
-  onClose?: () => void;
-  onInputFocus?: () => void;
-  onInputBlur?: () => void;
-  spells: IRawSpell[];
-  magicLevel: number;
-  mana: number;
-  onSpellClick: (spellKey: string) => void;
-  setSpellShortcut: (key: string, index: number) => void;
-  shortcuts: IShortcut[];
-  removeShortcut: (index: number) => void;
-  atlasIMG: any;
-  atlasJSON: any;
-}
-
-export const Spellbook: React.FC<ISpellbookProps> = ({
-  onClose,
-  onInputFocus,
-  onInputBlur,
-  spells,
-  magicLevel,
-  mana,
-  onSpellClick,
-  setSpellShortcut,
-  shortcuts,
-  removeShortcut,
-  atlasIMG,
-  atlasJSON,
-}) => {
-  const [search, setSearch] = useState('');
-  const [settingShortcutIndex, setSettingShortcutIndex] = useState(-1);
-
-  useEffect(() => {
-    const handleEscapeClose = (e: KeyboardEvent) => {
-      if (e.key === 'Escape') {
-        onClose?.();
-      }
-    };
-
-    document.addEventListener('keydown', handleEscapeClose);
-
-    return () => {
-      document.removeEventListener('keydown', handleEscapeClose);
-    };
-  }, [onClose]);
-
-  const spellsToDisplay = useMemo(() => {
-    return spells
-      .sort((a, b) => {
-        if (a.minMagicLevelRequired > b.minMagicLevelRequired) return 1;
-        if (a.minMagicLevelRequired < b.minMagicLevelRequired) return -1;
-        return 0;
-      })
-      .filter(
-        spell =>
-          spell.name.toLocaleLowerCase().includes(search.toLocaleLowerCase()) ||
-          spell.magicWords
-            .toLocaleLowerCase()
-            .includes(search.toLocaleLowerCase())
-      );
-  }, [search, spells]);
-
-  const setShortcut = (spellKey: string) => {
-    setSpellShortcut?.(spellKey, settingShortcutIndex);
-    setSettingShortcutIndex(-1);
-  };
-
-  return (
-    <DraggableContainer
-      type={RPGUIContainerTypes.Framed}
-      onCloseButton={onClose}
-      width="inherit"
-      height="inherit"
-      cancelDrag="#spellbook-search, #shortcuts_list, .spell"
-    >
-      <Container>
-        <Title>Learned Spells</Title>
-
-        <ShortcutsSetter
-          setSettingShortcutIndex={setSettingShortcutIndex}
-          settingShortcutIndex={settingShortcutIndex}
-          shortcuts={shortcuts}
-          removeShortcut={removeShortcut}
-          atlasIMG={atlasIMG}
-          atlasJSON={atlasJSON}
-        />
-
-        <Input
-          placeholder="Search for spell"
-          value={search}
-          onChange={e => setSearch(e.target.value)}
-          onFocus={onInputFocus}
-          onBlur={onInputBlur}
-          id="spellbook-search"
-        />
-
-        <SpellList>
-          {spellsToDisplay.map(spell => (
-            <Fragment key={spell.key}>
-              <Spell
-                charMana={mana}
-                charMagicLevel={magicLevel}
-                onClick={
-                  settingShortcutIndex !== -1 ? setShortcut : onSpellClick
-                }
-                spellKey={spell.key}
-                isSettingShortcut={settingShortcutIndex !== -1}
-                {...spell}
-              />
-            </Fragment>
-          ))}
-        </SpellList>
-      </Container>
-    </DraggableContainer>
-  );
-};
-
-const Title = styled.h1`
-  font-size: ${uiFonts.size.large} !important;
-  margin-bottom: 0 !important;
-`;
-
-const Container = styled.div`
-  width: 100%;
-  height: 100%;
-  color: white;
-  display: flex;
-  flex-direction: column;
-`;
-
-const SpellList = styled.div`
-  width: 100%;
-  min-height: 0;
-  flex: 1;
-  overflow-y: auto;
-  display: flex;
-  flex-direction: column;
-  gap: 1.5rem;
-  margin-top: 1rem;
-`;
+import { IRawSpell } from '@rpg-engine/shared';
+import React, { Fragment, useEffect, useMemo, useState } from 'react';
+import styled from 'styled-components';
+import { uiFonts } from '../../constants/uiFonts';
+import { DraggableContainer } from '../DraggableContainer';
+import { Input } from '../Input';
+import { RPGUIContainerTypes } from '../RPGUIContainer';
+import { Spell } from './Spell';
+import { SpellbookShortcuts } from './SpellbookShortcuts';
+
+export interface ISpellbookProps {
+  onClose?: () => void;
+  onInputFocus?: () => void;
+  onInputBlur?: () => void;
+  spells: IRawSpell[];
+  magicLevel: number;
+  mana: number;
+  onSpellClick: (spellKey: string) => void;
+  setSpellShortcut: (key: string, index: number) => void;
+  spellShortcuts: IRawSpell[];
+  removeSpellShortcut: (index: number) => void;
+}
+
+export const Spellbook: React.FC<ISpellbookProps> = ({
+  onClose,
+  onInputFocus,
+  onInputBlur,
+  spells,
+  magicLevel,
+  mana,
+  onSpellClick,
+  setSpellShortcut,
+  spellShortcuts,
+  removeSpellShortcut,
+}) => {
+  const [search, setSearch] = useState('');
+  const [settingShortcutIndex, setSettingShortcutIndex] = useState(-1);
+
+  useEffect(() => {
+    const handleEscapeClose = (e: KeyboardEvent) => {
+      if (e.key === 'Escape') {
+        onClose?.();
+      }
+    };
+
+    document.addEventListener('keydown', handleEscapeClose);
+
+    return () => {
+      document.removeEventListener('keydown', handleEscapeClose);
+    };
+  }, [onClose]);
+
+  const spellsToDisplay = useMemo(() => {
+    return spells
+      .sort((a, b) => {
+        if (a.minMagicLevelRequired > b.minMagicLevelRequired) return 1;
+        if (a.minMagicLevelRequired < b.minMagicLevelRequired) return -1;
+        return 0;
+      })
+      .filter(
+        spell =>
+          spell.name.toLocaleLowerCase().includes(search.toLocaleLowerCase()) ||
+          spell.magicWords
+            .toLocaleLowerCase()
+            .includes(search.toLocaleLowerCase())
+      );
+  }, [search, spells]);
+
+  const setShortcut = (spellKey: string) => {
+    setSpellShortcut?.(spellKey, settingShortcutIndex);
+    setSettingShortcutIndex(-1);
+  };
+
+  return (
+    <DraggableContainer
+      type={RPGUIContainerTypes.Framed}
+      onCloseButton={onClose}
+      width="inherit"
+      height="inherit"
+      cancelDrag="#spellbook-search, #shortcuts_list, .spell"
+    >
+      <Container>
+        <Title>Learned Spells</Title>
+
+        <SpellbookShortcuts
+          setSettingShortcutIndex={setSettingShortcutIndex}
+          settingShortcutIndex={settingShortcutIndex}
+          shortcuts={spellShortcuts}
+          removeShortcut={removeSpellShortcut}
+        />
+
+        <Input
+          placeholder="Search for spell"
+          value={search}
+          onChange={e => setSearch(e.target.value)}
+          onFocus={onInputFocus}
+          onBlur={onInputBlur}
+          id="spellbook-search"
+        />
+
+        <SpellList>
+          {spellsToDisplay.map(spell => (
+            <Fragment key={spell.key}>
+              <Spell
+                charMana={mana}
+                charMagicLevel={magicLevel}
+                onPointerDown={
+                  settingShortcutIndex !== -1 ? setShortcut : onSpellClick
+                }
+                spellKey={spell.key}
+                isSettingShortcut={settingShortcutIndex !== -1}
+                {...spell}
+              />
+            </Fragment>
+          ))}
+        </SpellList>
+      </Container>
+    </DraggableContainer>
+  );
+};
+
+const Title = styled.h1`
+  font-size: ${uiFonts.size.large} !important;
+  margin-bottom: 0 !important;
+`;
+
+const Container = styled.div`
+  width: 100%;
+  height: 100%;
+  color: white;
+  display: flex;
+  flex-direction: column;
+`;
+
+const SpellList = styled.div`
+  width: 100%;
+  min-height: 0;
+  flex: 1;
+  overflow-y: auto;
+  display: flex;
+  flex-direction: column;
+  gap: 1.5rem;
+  margin-top: 1rem;
+`;

package/src/components/Spellbook/SpellbookShortcuts.tsx

@@ -0,0 +1,77 @@
+import { IRawSpell } from '@rpg-engine/shared';
+import React from 'react';
+import styled from 'styled-components';
+import { uiColors } from '../../constants/uiColors';
+
+type Props = {
+  setSettingShortcutIndex: (index: number) => void;
+  settingShortcutIndex: number;
+  shortcuts: IRawSpell[];
+  removeShortcut: (index: number) => void;
+};
+
+export const SpellbookShortcuts: React.FC<Props> = ({
+  setSettingShortcutIndex,
+  settingShortcutIndex,
+  shortcuts,
+  removeShortcut,
+}) => (
+  <List id="shortcuts_list">
+    Spells shortcuts:
+    {Array.from({ length: 4 }).map((_, i) => (
+      <SpellShortcut
+        key={i}
+        onPointerDown={() => {
+          removeShortcut(i);
+          if (!shortcuts[i]?.key) setSettingShortcutIndex(i);
+        }}
+        disabled={settingShortcutIndex !== -1 && settingShortcutIndex !== i}
+        isBeingSet={settingShortcutIndex === i}
+      >
+        <span>{shortcuts[i]?.magicWords.split(' ').map(word => word[0])}</span>
+      </SpellShortcut>
+    ))}
+  </List>
+);
+const SpellShortcut = styled.button<{ isBeingSet?: boolean }>`
+  width: 2.6rem;
+  height: 2.6rem;
+  background-color: ${uiColors.lightGray};
+  border: 2px solid
+    ${({ isBeingSet }) => (isBeingSet ? uiColors.yellow : uiColors.darkGray)};
+  border-radius: 50%;
+  text-transform: uppercase;
+  font-size: 0.7rem;
+  font-weight: bold;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  span {
+    margin-top: 4px;
+  }
+
+  &:hover,
+  &:focus {
+    background-color: ${uiColors.darkGray};
+  }
+
+  &:active {
+    background-color: ${uiColors.gray};
+  }
+
+  &:disabled {
+    opacity: 0.5;
+  }
+`;
+
+const List = styled.p`
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  gap: 0.5rem;
+  padding: 0.5rem;
+  box-sizing: border-box;
+  margin: 0 !important;
+`;

package/src/components/Spellbook/constants.ts

@@ -1,8 +1,12 @@
-import { IShortcut, ShortcutType } from '@rpg-engine/shared';
-
-export const SHORTCUTS_STORAGE_KEY = 'shortcuts';
-
-export const defaultShortcut: IShortcut = {
-  type: ShortcutType.None,
-  payload: null,
-};
+import { IRawSpell } from '@rpg-engine/shared';
+
+export const SPELL_SHORTCUTS_STORAGE_KEY = 'spellShortcuts';
+
+export const defaultSpellShortcut: IRawSpell = {
+  key: '',
+  manaCost: 0,
+  magicWords: '',
+  name: '',
+  description: '',
+  minMagicLevelRequired: 0,
+};

package/src/components/Spellbook/mockSpells.ts

@@ -1,60 +1,60 @@
-import { IRawSpell } from '@rpg-engine/shared';
-
-enum SpellsBlueprint {
-  SelfHealingSpell = 'self-healing-spell',
-  FoodCreationSpell = 'food-creation-spell',
-  ArrowCreationSpell = 'arrow-creation-spell',
-  BoltCreationSpell = 'bolt-creation-spell',
-  BlankRuneCreationSpell = 'blank-rune-creation-spell',
-  SelfHasteSpell = 'self-haste-spell',
-  FireRuneCreationSpell = 'fire-rune-creation-spell',
-  HealRuneCreationSpell = 'healing-rune-creation-spell',
-  PoisonRuneCreationSpell = 'poison-rune-creation-spell',
-  DarkRuneCreationSpell = 'dark-rune-creation-spell',
-  GreaterHealingSpell = 'greater-healing-spell',
-  EnergyBoltCreationSpell = 'energy-bolt-creation-spell',
-  FireBoltCreationSpell = 'fire-bolt-creation-spell',
-}
-
-export const mockSpells: IRawSpell[] = [
-  {
-    key: SpellsBlueprint.ArrowCreationSpell,
-    name: 'Arrow Creation Spell',
-    description: 'A spell that creates arrow in your inventory.',
-    magicWords: 'iquar elandi',
-    manaCost: 10,
-    minMagicLevelRequired: 3,
-  },
-  {
-    key: SpellsBlueprint.BlankRuneCreationSpell,
-    name: 'Blank Rune Creation Spell',
-    description: 'A spell that creates a blank rune in your inventory.',
-    magicWords: 'iquar ansr ki',
-    manaCost: 5,
-    minMagicLevelRequired: 3,
-  },
-  {
-    key: SpellsBlueprint.BoltCreationSpell,
-    name: 'Bolt Creation Spell',
-    description: 'A spell that creates bolt in your inventory.',
-    magicWords: 'iquar lyn',
-    manaCost: 15,
-    minMagicLevelRequired: 3,
-  },
-  {
-    key: SpellsBlueprint.SelfHasteSpell,
-    name: 'Self Haste Spell',
-    description: 'A self haste spell.',
-    magicWords: 'talas hiz',
-    manaCost: 40,
-    minMagicLevelRequired: 5,
-  },
-  {
-    key: SpellsBlueprint.SelfHealingSpell,
-    name: 'Self Healing Spell',
-    description: 'A self healing spell.',
-    magicWords: 'talas faenya',
-    manaCost: 10,
-    minMagicLevelRequired: 1,
-  },
-];
+import { IRawSpell } from '@rpg-engine/shared';
+
+enum SpellsBlueprint {
+  SelfHealingSpell = 'self-healing-spell',
+  FoodCreationSpell = 'food-creation-spell',
+  ArrowCreationSpell = 'arrow-creation-spell',
+  BoltCreationSpell = 'bolt-creation-spell',
+  BlankRuneCreationSpell = 'blank-rune-creation-spell',
+  SelfHasteSpell = 'self-haste-spell',
+  FireRuneCreationSpell = 'fire-rune-creation-spell',
+  HealRuneCreationSpell = 'healing-rune-creation-spell',
+  PoisonRuneCreationSpell = 'poison-rune-creation-spell',
+  DarkRuneCreationSpell = 'dark-rune-creation-spell',
+  GreaterHealingSpell = 'greater-healing-spell',
+  EnergyBoltCreationSpell = 'energy-bolt-creation-spell',
+  FireBoltCreationSpell = 'fire-bolt-creation-spell',
+}
+
+export const mockSpells: IRawSpell[] = [
+  {
+    key: SpellsBlueprint.ArrowCreationSpell,
+    name: 'Arrow Creation Spell',
+    description: 'A spell that creates arrow in your inventory.',
+    magicWords: 'iquar elandi',
+    manaCost: 10,
+    minMagicLevelRequired: 3,
+  },
+  {
+    key: SpellsBlueprint.BlankRuneCreationSpell,
+    name: 'Blank Rune Creation Spell',
+    description: 'A spell that creates a blank rune in your inventory.',
+    magicWords: 'iquar ansr ki',
+    manaCost: 5,
+    minMagicLevelRequired: 3,
+  },
+  {
+    key: SpellsBlueprint.BoltCreationSpell,
+    name: 'Bolt Creation Spell',
+    description: 'A spell that creates bolt in your inventory.',
+    magicWords: 'iquar lyn',
+    manaCost: 15,
+    minMagicLevelRequired: 3,
+  },
+  {
+    key: SpellsBlueprint.SelfHasteSpell,
+    name: 'Self Haste Spell',
+    description: 'A self haste spell.',
+    magicWords: 'talas hiz',
+    manaCost: 40,
+    minMagicLevelRequired: 5,
+  },
+  {
+    key: SpellsBlueprint.SelfHealingSpell,
+    name: 'Self Healing Spell',
+    description: 'A self healing spell.',
+    magicWords: 'talas faenya',
+    manaCost: 10,
+    minMagicLevelRequired: 1,
+  },
+];