@hytopia.com/examples 1.0.12 → 1.0.14

package/frontiers-rpg-game/src/items/wearables/LeatherBootsItem.ts

@@ -0,0 +1,14 @@
+import BaseWearableItem, { WearableSlot } from '../BaseWearableItem';
+
+export default class LeatherBootsItem extends BaseWearableItem {
+  static readonly id = 'leather_boots';
+  static readonly name = 'Leather Boots';
+  static readonly iconImageUri = 'icons/items/leather-boots.png';
+  static readonly description = `A sturdy pair of boots made from thick leather.`;
+  static readonly buyPrice = 350;
+  static readonly sellPrice = 35;
+
+  static readonly damageReduction = 2;
+
+  static readonly slot: WearableSlot = 'boots';
+}

package/frontiers-rpg-game/src/items/wearables/LeatherBracersItem.ts

@@ -0,0 +1,14 @@
+import BaseWearableItem, { WearableSlot } from '../BaseWearableItem';
+
+export default class LeatherBracersItem extends BaseWearableItem {
+  static readonly id = 'leather_bracers';
+  static readonly name = 'Leather Bracers';
+  static readonly iconImageUri = 'icons/items/leather-bracers.png';
+  static readonly description = `A pair of supportive bracers made from thick leather.`;
+  static readonly buyPrice = 300;
+  static readonly sellPrice = 30;
+
+  static readonly damageReduction = 2;
+
+  static readonly slot: WearableSlot = 'gloves';
+}

package/frontiers-rpg-game/src/items/wearables/LeatherHelmetItem.ts

@@ -0,0 +1,14 @@
+import BaseWearableItem, { WearableSlot } from '../BaseWearableItem';
+
+export default class LeatherHelmetItem extends BaseWearableItem {
+  static readonly id = 'leather_helmet';
+  static readonly name = 'Leather Helmet';
+  static readonly iconImageUri = 'icons/items/leather-helmet.png';
+  static readonly description = `A protective helmet made from thick leather.`;
+  static readonly buyPrice = 350;
+  static readonly sellPrice = 35;
+
+  static readonly damageReduction = 2;
+
+  static readonly slot: WearableSlot = 'helmet';
+}

package/frontiers-rpg-game/src/items/wearables/LeatherLeggingsItem.ts

@@ -0,0 +1,14 @@
+import BaseWearableItem, { WearableSlot } from '../BaseWearableItem';
+
+export default class LeatherLeggingsItem extends BaseWearableItem {
+  static readonly id = 'leather_leggings';
+  static readonly name = 'Leather Leggings';
+  static readonly iconImageUri = 'icons/items/leather-leggings.png';
+  static readonly description = `A comfortable pair of leggings made from thick leather.`;
+  static readonly buyPrice = 500;
+  static readonly sellPrice = 50;
+
+  static readonly damageReduction = 3;
+
+  static readonly slot: WearableSlot = 'leggings';
+}

package/frontiers-rpg-game/src/items/wearables/LeatherVestItem.ts

@@ -0,0 +1,14 @@
+import BaseWearableItem, { WearableSlot } from '../BaseWearableItem';
+
+export default class LeatherVestItem extends BaseWearableItem {
+  static readonly id = 'leather_vest';
+  static readonly name = 'Leather Vest';
+  static readonly iconImageUri = 'icons/items/leather-vest.png';
+  static readonly description = `A tough multi-layer vest made from thick leather.`;
+  static readonly buyPrice = 700;
+  static readonly sellPrice = 70;
+
+  static readonly damageReduction = 4;
+
+  static readonly slot: WearableSlot = 'armor';
+}

package/frontiers-rpg-game/src/quests/BaseQuest.ts

@@ -67,8 +67,7 @@ export default abstract class BaseQuest {
       }
 
       for (const itemReward of this.reward.items) {
-        const item = itemReward.itemClass.create({ quantity: itemReward.quantity });
-        gamePlayer.hotbar.addItem(item) || gamePlayer.backpack.addItem(item);
+        gamePlayer.addHeldItem(itemReward.itemClass, itemReward.quantity);
       }
     }
 

package/frontiers-rpg-game/src/quests/QuestClasses.ts

@@ -10,6 +10,7 @@ import BlightedHarvestQuest from './main/BlightedHarvestQuest';
 // Side Quests, Alphabetical
 import DipDuckDodgeQuest from './side/DipDuckDodgeQuest';
 import FungalForagingQuest from './side/FungalForagingQuest';
+import HammersAndCraftingQuest from './side/HammersAndCraftingQuest';
 
 export default [
   // Main, Alphabetical
@@ -24,4 +25,5 @@ export default [
   // Side, Alphabetical
   DipDuckDodgeQuest,
   FungalForagingQuest,
+  HammersAndCraftingQuest,
 ];

package/frontiers-rpg-game/src/quests/side/FungalForagingQuest.ts

@@ -107,32 +107,10 @@ export default class FungalForagingQuest extends BaseQuest {
           ],
         },
         onSelect: (interactor: GamePlayerEntity) => {
-          const totalBackpackMushrooms = interactor.gamePlayer.backpack.getItemQuantityByClass(CommonMushroomItem);
-          const totalHotbarMushrooms = interactor.gamePlayer.hotbar.getItemQuantityByClass(CommonMushroomItem);
-
-          if (totalHotbarMushrooms + totalBackpackMushrooms < 25) {
+          if (!interactor.gamePlayer.removeHeldItem(CommonMushroomItem, 25)) {
             return interactor.showNotification(`Merchant Finn is looking for 25 Common Mushrooms - seems you're a bit short!`, 'error');
           }
 
-          // Remove 25 mushrooms from backpack and hotbar
-          let remaining = 25;
-          
-          // Remove from backpack first
-          for (const item of interactor.gamePlayer.backpack.getItemsByClass(CommonMushroomItem)) {
-            if (remaining <= 0) break;
-            const toRemove = Math.min(item.quantity, remaining);
-            interactor.gamePlayer.backpack.adjustItemQuantityByReference(item, -toRemove);
-            remaining -= toRemove;
-          }
-          
-          // Remove from hotbar if needed
-          for (const item of interactor.gamePlayer.hotbar.getItemsByClass(CommonMushroomItem)) {
-            if (remaining <= 0) break;
-            const toRemove = Math.min(item.quantity, remaining);
-            interactor.gamePlayer.hotbar.adjustItemQuantityByReference(item, -toRemove);
-            remaining -= toRemove;
-          }
-
           interactor.gamePlayer.questLog.adjustObjectiveProgress(this.id, 'give-mushrooms', 1);
           interactor.gamePlayer.questLog.completeQuest(this.id);
         }

package/frontiers-rpg-game/src/quests/side/HammersAndCraftingQuest.ts

@@ -0,0 +1,139 @@
+import BaseQuest, { QuestObjective, QuestNpcDialogueInteraction } from '../BaseQuest';
+import { SkillId } from '../../config';
+import type GamePlayer from '../../GamePlayer';
+import type GamePlayerEntity from '../../GamePlayerEntity';
+
+import { BaseCraftingEntityPlayerEvent } from '../../entities/BaseCraftingEntity';
+import { BaseItemPlayerEvent } from '../../items/BaseItem';
+import type { BaseCraftingEntityPlayerEventPayloads } from '../../entities/BaseCraftingEntity';
+import type { BaseItemPlayerEventPayloads } from '../../items/BaseItem';
+
+import BlacksmithArdenEntity from '../../regions/stalkhaven/npcs/BlacksmithArdenEntity';
+import ExploringStalkhavenQuest from '../main/ExploringStalkhavenQuest';
+import RawHideItem from '../../items/materials/RawHideItem';
+
+export default class HammersAndCraftingQuest extends BaseQuest {
+  static readonly id = 'hammers-and-crafting';
+  static readonly name = 'Hammers and Crafting';
+  static readonly description = `Blacksmith Arden wants to introduce you to crafting. Bring him some materials and craft your first item.`;
+
+  static readonly reward = {
+    items: [
+      { itemClass: RawHideItem, quantity: 10 },
+    ],
+    skillExperience: [
+      { skillId: SkillId.CRAFTING, amount: 300 },
+    ],
+  }
+
+  static readonly objectives: QuestObjective[] = [
+    {
+      id: 'gather-materials',
+      name: 'Gather Materials',
+      description: 'Gather 15 Raw Hides by slaying Ratkin or foraging in Chitter Forest.',
+      target: 15,
+    },
+    {
+      id: 'craft-item',
+      name: 'Craft an Item',
+      description: 'Craft your first item after gathering materials. Blacksmith Arden in Stalkhaven can help you craft!',
+      target: 1,
+    },
+    {
+      id: 'talk-to-arden',
+      name: 'Speak with Blacksmith Arden',
+      description: 'Speak with Blacksmith Arden after gathering materials and crafting an item.',
+      target: 1,
+    }
+  ];
+
+  static readonly dialogueInteractions: QuestNpcDialogueInteraction[] = [
+    // Start Quest
+    {
+      npcClass: BlacksmithArdenEntity,
+      dialogueOption: {
+        text: `Who are you?`,
+        nextDialogue: {
+          text: `Ahh, me? The name's Arden. I'm just a humble blacksmith making weapons and armor for the 7th regiment here in Stalkhaven. I can help you make some if you'd like?`,
+          options: [
+            {
+              text: `Please teach me how to craft!`,
+              nextDialogue: {
+                text: `Absolutely, first you'll need to gather some materials. Raw Hide is the easiest to work with. Go slay those Ratkin beasts or forage in Chitter Forest to find some. 15 Raw Hides should do. I'll wait here.`,
+                options: [
+                  {
+                    text: `That sounds great, I'll go get some Raw Hide.`,
+                    dismiss: true,
+                    pureExit: true,
+                  }
+                ],
+              },
+              onSelect: (interactor: GamePlayerEntity) => {
+                interactor.gamePlayer.questLog.startQuest(this);
+              }
+            },
+            {
+              text: `Maybe later, thanks.`,
+              dismiss: true,
+              pureExit: true,
+            }
+          ],
+        },
+      },
+      enabledForInteractor: (interactor: GamePlayerEntity) => {
+        return interactor.gamePlayer.questLog.isQuestCompleted(ExploringStalkhavenQuest.id) &&
+               !interactor.gamePlayer.questLog.hasQuest(this.id);
+      }
+    },
+
+    // Complete Quest
+    {
+      npcClass: BlacksmithArdenEntity,
+      dialogueOption: {
+        text: `I've crafted my first item, that was fun!`,
+        nextDialogue: {
+          text: `Great work! You can come back to me anytime and I can help you craft more items. Improve your crafting skills and we'll be able to craft even better weapons and armor.`,
+          options: [
+            {
+              text: `Thanks for the help!`,
+              dismiss: true,
+              pureExit: true,
+            }
+          ],
+        },
+        onSelect: (interactor: GamePlayerEntity) => {
+          interactor.gamePlayer.questLog.adjustObjectiveProgress(this.id, 'talk-to-arden', 1);
+          interactor.gamePlayer.questLog.completeQuest(this.id);
+        }
+      },
+      enabledForInteractor: (interactor: GamePlayerEntity) => {
+        return interactor.gamePlayer.questLog.isQuestActive(this.id) &&
+               interactor.gamePlayer.questLog.isQuestObjectiveCompleted(this.id, 'gather-materials') &&
+               interactor.gamePlayer.questLog.isQuestObjectiveCompleted(this.id, 'craft-item');
+      }
+    }
+  ];
+
+  public static setupForPlayer(gamePlayer: GamePlayer): () => void {
+    // Add event listeners
+    const itemPickupListener = (payload: BaseItemPlayerEventPayloads[BaseItemPlayerEvent.PICKED_UP]) => {
+      if (payload.item.id === RawHideItem.id) {
+        gamePlayer.questLog.adjustObjectiveProgress(this.id, 'gather-materials', payload.item.quantity);
+      }
+    };
+
+    const craftListener = (payload: BaseCraftingEntityPlayerEventPayloads[BaseCraftingEntityPlayerEvent.CRAFT_ITEM]) => {
+      gamePlayer.questLog.adjustObjectiveProgress(this.id, 'craft-item', 1);
+    };
+
+    gamePlayer.eventRouter.on(BaseItemPlayerEvent.PICKED_UP, itemPickupListener);
+    gamePlayer.eventRouter.on(BaseCraftingEntityPlayerEvent.CRAFT_ITEM, craftListener);
+
+    const cleanup = () => {
+      gamePlayer.eventRouter.off(BaseItemPlayerEvent.PICKED_UP, itemPickupListener);
+      gamePlayer.eventRouter.off(BaseCraftingEntityPlayerEvent.CRAFT_ITEM, craftListener);
+    };
+
+    return cleanup;
+  }    
+}

package/frontiers-rpg-game/src/regions/stalkhaven/StalkhavenRegion.ts

@@ -1,11 +1,15 @@
 import { Quaternion } from 'hytopia';
 import GameRegion from '../../GameRegion';
+import Spawner from '../../systems/Spawner';
 import PortalEntity from '../../entities/PortalEntity';
+import type { WanderOptions } from '../../entities/BaseEntity';
 
+// NPCs
 import CapfolkVillagerEntity from '../../entities/npcs/CapfolkVillagerEntity';
 import CaptainSpornEntity from './npcs/CaptainSpornEntity';
 import CommanderMarkEntity from './npcs/CommanderMarkEntity';
 import BankerJohnEntity from './npcs/BankerJohnEntity';
+import BlacksmithArdenEntity from './npcs/BlacksmithArdenEntity';
 import HealerMycelisEntity from './npcs/HealerMycelisEntity';
 import MerchantFinnEntity from './npcs/MerchantFinnEntity';
 
@@ -27,40 +31,49 @@ export default class StalkhavenRegion extends GameRegion {
     super.setup();
     
     this._setupNPCs();
+    this._setupNPCSpawners();
     this._setupPortals();
   }
 
   private _setupNPCs(): void {
     (new BankerJohnEntity({ facingAngle: 90 })).spawn(this.world, { x: 12, y: 3, z: 41 });
+    (new BlacksmithArdenEntity({ facingAngle: 250 })).spawn(this.world, { x: -25, y: 3, z: -13 });
     (new CaptainSpornEntity({ facingAngle: 315 })).spawn(this.world, { x: -2, y: 3, z: 43 });
     (new CommanderMarkEntity({ facingAngle: 180 })).spawn(this.world, { x: 3, y: 3, z: 12 });
     (new HealerMycelisEntity({ facingAngle: 180 })).spawn(this.world, { x: -13.5, y: 3, z: -30 });
     (new MerchantFinnEntity({ facingAngle: 90 })).spawn(this.world, { x: 13, y: 3, z: 26.5 });
+  }
 
-    // Wandering Villagers 
-    const villagerStartPositions = [
-      { x: -6, y: 3, z: 13 }, // town center
-      { x: 14, y: 3, z: 4 }, // town center
-      { x: -2, y: 3, z: -15 }, // town center
-      { x: 23, y: 3, z: 41 }, // well
-      { x: 26, y: 3, z: -22 }, // market
-      { x: 15, y: 3, z: -30 }, // market
-    ];
+  private _setupNPCSpawners(): void {
+    const wanderOptions: WanderOptions = {
+      idleMinMs: 5000,
+      idleMaxMs: 15000,
+      maxWanderRadius: 12,
+      moveOptions: {
+        moveCompletesWhenStuck: true,
+        moveStoppingDistance: 1,
+      }
+    }
 
-    for (const position of villagerStartPositions) {
-      const villager = new CapfolkVillagerEntity({ facingAngle: Math.random() * 360 });
-      villager.spawn(this.world, position);
-      villager.wander(villager.moveSpeed, {
-        idleMinMs: 5000,
-        idleMaxMs: 15000,
-        maxWanderRadius: 12,
-        moveOptions: {
-          moveCompletesWhenStuck: true,
-          moveStoppingDistance: 1,
+    const capfolkVillagerSpawner = new Spawner({
+      groundCheckDistance: 10,
+      maxSpawns: 10,
+      spawnables: [
+        { entityConstructor: CapfolkVillagerEntity, weight: 1, wanders: true, wanderOptions },
+      ],
+      spawnRegions: [
+        {
+          min: { x: -24, y: 2, z: -29 },
+          max: { x: 29, y: 12, z: 38 },
+          weight: 1,
         }
-      });
-    }
-  }
+      ],
+      spawnIntervalMs: 60000,
+      world: this.world,
+    });
+
+    capfolkVillagerSpawner.start(true);
+  } 
 
   private _setupPortals(): void {
     const chitterForestPortal = new PortalEntity({

package/frontiers-rpg-game/src/regions/stalkhaven/npcs/BlacksmithArdenEntity.ts

@@ -0,0 +1,114 @@
+import BaseCraftingEntity, { BaseCraftingEntityOptions } from '../../../entities/BaseCraftingEntity';
+
+import GoldItem from '../../../items/general/GoldItem';
+import LeatherBootsItem from '../../../items/wearables/LeatherBootsItem';
+import LeatherBracersItem from '../../../items/wearables/LeatherBracersItem';
+import LeatherHelmetItem from '../../../items/wearables/LeatherHelmetItem';
+import LeatherLeggingsItem from '../../../items/wearables/LeatherLeggingsItem';
+import LeatherVestItem from '../../../items/wearables/LeatherVestItem';
+import RatkinBonesItem from '../../../items/materials/RatkinBonesItem';
+import RatkinToothItem from '../../../items/materials/RatkinToothItem';
+import RawHideItem from '../../../items/materials/RawHideItem';
+import SpikedClubItem from '../../../items/weapons/SpikedClubItem';
+
+export default class BlacksmithArdenEntity extends BaseCraftingEntity {
+  public constructor(options?: Partial<BaseCraftingEntityOptions>) {
+    super({
+      craftingRecipes: [
+        {
+          craftedItemClass: LeatherHelmetItem,
+          requirements: [
+            {
+              itemClass: RawHideItem,
+              quantity: 20,
+            },
+            {
+              itemClass: GoldItem,
+              quantity: 250,
+            },
+          ],
+        },
+        {
+          craftedItemClass: LeatherVestItem,
+          requirements: [
+            {
+              itemClass: RawHideItem,
+              quantity: 35,
+            },
+            {
+              itemClass: GoldItem,
+              quantity: 300,
+            },
+          ],
+        },
+        {
+          craftedItemClass: LeatherBracersItem,
+          requirements: [
+            {
+              itemClass: RawHideItem,
+              quantity: 15,
+            },
+            {
+              itemClass: GoldItem,
+              quantity: 200,
+            },
+          ],
+        },
+        {
+          craftedItemClass: LeatherLeggingsItem,
+          requirements: [
+            {
+              itemClass: RawHideItem,
+              quantity: 25,
+            },
+            {
+              itemClass: GoldItem,
+              quantity: 250,
+            },
+          ],
+        },
+        {
+          craftedItemClass: LeatherBootsItem,
+          requirements: [
+            {
+              itemClass: RawHideItem,
+              quantity: 15,
+            },
+            {
+              itemClass: GoldItem,
+              quantity: 200,
+            },
+          ],
+        },
+        {
+          craftedItemClass: SpikedClubItem,
+          requirements: [
+            {
+              itemClass: RatkinBonesItem,
+              quantity: 30,
+            },
+            {
+              itemClass: RatkinToothItem,
+              quantity: 25,
+            },
+            {
+              itemClass: RawHideItem,
+              quantity: 5,
+            },
+            {
+              itemClass: GoldItem,
+              quantity: 400,
+            },
+          ],
+        },
+      ],
+      dialogueAvatarImageUri: 'avatars/blacksmith.png',
+      dialogueTitle: 'Apprentice Blacksmith',
+      idleAnimations: [ 'idle' ],
+      modelUri: 'models/npcs/blacksmith.gltf',
+      modelScale: 0.75,
+      name: 'Blacksmith Arden',
+      ...options,
+    })
+  }
+}

package/frontiers-rpg-game/src/systems/QuestLog.ts

@@ -3,6 +3,7 @@ import type BaseQuest from '../quests/BaseQuest';
 import type GamePlayer from '../GamePlayer';
 import type BaseEntity from '../entities/BaseEntity';
 import type { PlayerQuestState } from '../quests/BaseQuest';
+import { ItemUIDataHelper } from '../items/ItemUIDataHelper';
 
 export type SerializedQuestLogData = {
   quests: PlayerQuestState[];
@@ -181,11 +182,7 @@ export default class QuestLog {
       description: questClass.description,
       objectives: questClass.objectives,
       reward: {
-        items: questClass.reward.items?.map(item => ({
-          name: item.itemClass.name,
-          iconImageUri: item.itemClass.iconImageUri,
-          quantity: item.quantity,
-        })),
+        items: questClass.reward.items?.map(item => ItemUIDataHelper.getUIData(item.itemClass, { quantity: item.quantity })),
         skillExperience: questClass.reward.skillExperience,
       },
       state: questState

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hytopia.com/examples",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "description": "",
   "license": "ISC",
   "author": "",

package/frontiers-rpg-game/dev/persistence/player-player-2.json

@@ -1,31 +0,0 @@
-{
-  "health": 100,
-  "currentRegionId": "stalkhaven",
-  "currentRegionSpawnFacingAngle": 90,
-  "currentRegionSpawnPoint": {
-    "x": 32,
-    "y": 2,
-    "z": 1
-  },
-  "skillExperience": [],
-  "backpack": {
-    "items": []
-  },
-  "hotbar": {
-    "items": [
-      {
-        "position": 0,
-        "itemId": "toy_sword"
-      }
-    ]
-  },
-  "questLog": {
-    "quests": []
-  },
-  "storage": {
-    "items": []
-  },
-  "wearables": {
-    "items": []
-  }
-}

package/frontiers-rpg-game/dev/persistence/player-player-3.json

@@ -1,25 +0,0 @@
-{
-  "health": 100,
-  "currentRegionId": "stalkhaven-port",
-  "skillExperience": [],
-  "backpack": {
-    "items": []
-  },
-  "hotbar": {
-    "items": [
-      {
-        "position": 0,
-        "itemId": "toy_sword"
-      }
-    ]
-  },
-  "questLog": {
-    "quests": []
-  },
-  "storage": {
-    "items": []
-  },
-  "wearables": {
-    "items": []
-  }
-}

package/frontiers-rpg-game/dev/persistence/player-player-4.json

@@ -1,31 +0,0 @@
-{
-  "health": 100,
-  "currentRegionId": "stalkhaven-port",
-  "currentRegionSpawnFacingAngle": 180,
-  "currentRegionSpawnPoint": {
-    "x": -6,
-    "y": 8,
-    "z": -28
-  },
-  "skillExperience": [],
-  "backpack": {
-    "items": []
-  },
-  "hotbar": {
-    "items": [
-      {
-        "position": 0,
-        "itemId": "toy_sword"
-      }
-    ]
-  },
-  "questLog": {
-    "quests": []
-  },
-  "storage": {
-    "items": []
-  },
-  "wearables": {
-    "items": []
-  }
-}

package/frontiers-rpg-game/src/items/materials/MonsterHideItem.ts

@@ -1,10 +0,0 @@
-import BaseItem from '../BaseItem';
-
-export default class MonsterHideItem extends BaseItem {
-  static readonly id = 'monster_hide';
-  static readonly name = 'Monster Hide';
-  static readonly iconImageUri = 'icons/items/monster-hide.png';
-  static readonly description = 'Thick hide from a Frontier beast. Tough and weathered.';
-  static readonly stackable = true;
-  static readonly sellPrice = 15;
-}