@rpg-engine/long-bow 0.5.10 → 0.5.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpg-engine/long-bow",
-  "version": "0.5.10",
+  "version": "0.5.12",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -83,7 +83,7 @@
   },
   "dependencies": {
     "@rollup/plugin-image": "^2.1.1",
-    "@rpg-engine/shared": "^0.8.74",
+    "@rpg-engine/shared": "^0.8.81",
     "dayjs": "^1.11.2",
     "font-awesome": "^4.7.0",
     "fs-extra": "^10.1.0",

package/src/components/Item/Inventory/ItemContainer.tsx

@@ -13,7 +13,6 @@ import { ItemQuantitySelector } from './ItemQuantitySelector';
 
 import { IPosition } from '../../../types/eventTypes';
 import ModalPortal from '../../Abstractions/ModalPortal';
-import SelectArrow from '../../Arrow/SelectArrow';
 import { ShortcutsSetter } from '../../Shortcuts/ShortcutsSetter';
 import { ItemSlot } from './ItemSlot';
 
@@ -82,15 +81,12 @@ export const ItemContainer: React.FC<IItemContainerProps> = ({
   onPositionChangeEnd,
   onPositionChangeStart,
 }) => {
-  const MAX_SLOTS_PER_PAGE = 20;
   const [quantitySelect, setQuantitySelect] = useState({
     isOpen: false,
     maxQuantity: 1,
-    callback: (_quantity: number) => { },
+    callback: (_quantity: number) => {},
   });
   const [settingShortcutIndex, setSettingShortcutIndex] = useState(-1);
-  const [currentPage, setCurrentPage] = useState(1);
-  const totalPages = Math.ceil(itemContainer.slotQty / MAX_SLOTS_PER_PAGE);
 
   const handleSetShortcut = (item: IItem, index: number) => {
     if (item.type === ItemType.Consumable || item.type === ItemType.Tool) {
@@ -100,10 +96,8 @@ export const ItemContainer: React.FC<IItemContainerProps> = ({
 
   const onRenderSlots = () => {
     const slots = [];
-    const start = (currentPage - 1) * MAX_SLOTS_PER_PAGE;
-    const end = start + MAX_SLOTS_PER_PAGE;
 
-    for (let i = start; i < end && i < itemContainer.slotQty; i++) {
+    for (let i = 0; i < itemContainer.slotQty; i++) {
       slots.push(
         <ItemSlot
           isContextMenuDisabled={disableContextMenu}
@@ -162,14 +156,6 @@ export const ItemContainer: React.FC<IItemContainerProps> = ({
     return slots;
   };
 
-  const goToNextPage = () => {
-    setCurrentPage(current => Math.min(current + 1, totalPages));
-  };
-
-  const goToPreviousPage = () => {
-    setCurrentPage(current => Math.max(current - 1, 1));
-  };
-
   return (
     <>
       <SlotsContainer
@@ -195,28 +181,6 @@ export const ItemContainer: React.FC<IItemContainerProps> = ({
         <ItemsContainer className="item-container-body">
           {onRenderSlots()}
         </ItemsContainer>
-        {totalPages > 1 && (
-          <ArrowContainer>
-            <SelectArrow
-              className='arrow .arrow-up'
-              direction="left"
-              onPointerDown={() => {
-                if (currentPage > 1) {
-                  goToPreviousPage();
-                }
-              }}
-            />
-            <SelectArrow
-              className='arrow .arrow-down'
-              direction="right"
-              onPointerDown={() => {
-                if (currentPage < totalPages) {
-                  goToNextPage();
-                }
-              }}
-            />
-          </ArrowContainer>
-        )}
       </SlotsContainer>
       {quantitySelect.isOpen && (
         <ModalPortal>
@@ -228,7 +192,7 @@ export const ItemContainer: React.FC<IItemContainerProps> = ({
                 setQuantitySelect({
                   isOpen: false,
                   maxQuantity: 1,
-                  callback: () => { },
+                  callback: () => {},
                 });
               }}
               onClose={() => {
@@ -236,7 +200,7 @@ export const ItemContainer: React.FC<IItemContainerProps> = ({
                 setQuantitySelect({
                   isOpen: false,
                   maxQuantity: 1,
-                  callback: () => { },
+                  callback: () => {},
                 });
               }}
             />
@@ -265,17 +229,3 @@ const QuantitySelectorContainer = styled.div`
   align-items: center;
   background-color: rgba(0, 0, 0, 0.5);
 `;
-
-const ArrowContainer = styled.div`
-  margin-top: 10px;
-  margin-bottom: 30px;
-  /* Aplica a margem ao primeiro span (seta para a esquerda) */
-  span:first-child {
-    margin-left: 20px;
-  }
-
-  /* Aplica a margem ao último span (seta para a direita) */
-  span:last-child {
-    margin-right: 20px;
-  }
-`;

package/src/components/TradingMenu/TradingItemRow.tsx

@@ -2,6 +2,7 @@ import {
   getItemTextureKeyPath,
   IEquipmentSet,
   ITradeResponseItem,
+  UserAccountTypes,
 } from '@rpg-engine/shared';
 import capitalize from 'lodash/capitalize';
 import React from 'react';
@@ -23,6 +24,7 @@ export interface ITradeComponentProps {
   selectedQty: number;
   equipmentSet?: IEquipmentSet | null;
   scale?: number;
+  isBuy?: boolean;
 }
 
 const outerQty = 10;
@@ -35,6 +37,7 @@ export const TradingItemRow: React.FC<ITradeComponentProps> = ({
   selectedQty,
   equipmentSet,
   scale,
+  isBuy,
 }) => {
   const onLeftClick = (qty = 1) => {
     onQuantityChange(traderItem, Math.max(0, selectedQty - qty));
@@ -47,6 +50,40 @@ export const TradingItemRow: React.FC<ITradeComponentProps> = ({
     );
   };
 
+  const renderAccountTypeIndicator = () => {
+    if (isBuy) {
+      switch (traderItem?.accountType) {
+        case UserAccountTypes.PremiumBronze:
+          return (
+            <div>
+              <SmallCircle color="#CD7F32" /> Account
+            </div>
+          );
+        case UserAccountTypes.PremiumSilver:
+          return (
+            <div>
+              <SmallCircle color="#C0C0C0" /> Account
+            </div>
+          );
+        case UserAccountTypes.PremiumGold:
+          return (
+            <div>
+              <SmallCircle color="#FFD700" /> Account
+            </div>
+          );
+        case UserAccountTypes.PremiumUltimate:
+          return (
+            <div>
+              <SmallCircle color="#002E99" /> Account
+            </div>
+          );
+        default:
+          return null;
+      }
+    }
+    return null;
+  };
+
   return (
     <ItemWrapper>
       <ItemIconContainer>
@@ -81,6 +118,7 @@ export const TradingItemRow: React.FC<ITradeComponentProps> = ({
           <p>
             <Ellipsis maxLines={1} maxWidth="250px">
               {capitalize(traderItem.name)}
+              {renderAccountTypeIndicator()}
             </Ellipsis>
           </p>
           <p>${traderItem.price}</p>
@@ -121,6 +159,16 @@ export const TradingItemRow: React.FC<ITradeComponentProps> = ({
   );
 };
 
+// Styled component for the small circle
+const SmallCircle = styled.span<{ color: string }>`
+  display: inline-block;
+  margin-left: 8px;
+  height: 10px;
+  width: 10px;
+  background-color: ${({ color }) => color};
+  border-radius: 50%;
+`;
+
 const StyledArrow = styled(SelectArrow)`
   margin: 40px;
 `;

package/src/components/TradingMenu/TradingMenu.tsx

@@ -110,6 +110,7 @@ export const TradingMenu: React.FC<ITradingMenu> = ({
                 selectedQty={qtyMap.get(tradeItem.key) ?? 0}
                 equipmentSet={equipmentSet}
                 scale={scale}
+                isBuy={isBuy()}
               />
             </ItemWrapper>
           ))}

package/src/mocks/itemContainer.mocks.ts

@@ -577,7 +577,7 @@ export const itemContainerMock: IItemContainer = {
   _id: '629ba0b6fe3f43002f58f23b',
   name: 'Item Container',
   owner: '629ba0b6fe3f43002f58f23b',
-  slotQty: 60,
+  slotQty: 20,
   slots: {
     0: items[0],
     1: items[1],
@@ -595,7 +595,6 @@ export const itemContainerMock: IItemContainer = {
     13: items[13],
     14: items[14],
     15: items[15],
-    21: items[15],
     //remaining slots are considered null by default
   },
   allowedItemTypes: [],