feat: check for level, existing fires, and fix busy type

feat: check for existing fires etc

fix: check for firemaking level

fix: fix use of `busy` on Player

Author: Jameskmonger

src/plugins/skills/firemaking/chance.ts

@@ -8,6 +8,10 @@
  * @returns `true` if the player successfully lights the fire, `false` otherwise.
  */
 export const canLight = (logLevel: number, playerLevel: number): boolean => {
+    if (playerLevel < logLevel) {
+        return false;
+    }
+
     playerLevel++;
     const hostRatio = Math.random() * logLevel;
     const clientRatio = Math.random() * ((playerLevel - logLevel) * (1 + (logLevel * 0.01)));
@@ -25,6 +29,10 @@ export const canLight = (logLevel: number, playerLevel: number): boolean => {
  * @returns `true` if the player successfully lights the fire, `false` otherwise.
  */
 export const canChain = (logLevel: number, playerLevel: number): boolean => {
+    if (playerLevel < logLevel) {
+        return false;
+    }
+
     playerLevel++;
     const hostRatio = Math.random() * logLevel;
     const clientRatio = Math.random() * ((playerLevel - logLevel) * (1 + (logLevel * 0.01)));

src/plugins/skills/firemaking/firemaking-task.ts

@@ -103,7 +103,7 @@ class FiremakingTask extends ActorWorldItemInteractionTask<Player> {
         // if we can now light the fire, reset the timer so that on the next tick we can begin lighting the fire
         if (this.canLightFire) {
             this.elapsedTicks = 0;
-            this.actor.metadata.busy = true;
+            this.actor.busy = true;
             this.actor.playSound(soundIds.fireLit, 7);
 
             return;

src/plugins/skills/firemaking/index.ts

@@ -2,7 +2,7 @@ import { itemOnItemActionHandler, ItemOnItemActionHook, ItemOnWorldItemActionHoo
 import { itemIds } from '@engine/world/config';
 import { FIREMAKING_LOGS } from './data';
 import { canChain } from './chance';
-import { lightFire } from './light-fire';
+import { canLightFireAtCurrentPosition, lightFire } from './light-fire';
 import { runFiremakingTask } from './firemaking-task';
 
 /**
@@ -11,27 +11,34 @@ import { runFiremakingTask } from './firemaking-task';
 const tinderboxOnLogHandler: itemOnItemActionHandler = (details) => {
     const { player, usedItem, usedWithItem, usedSlot, usedWithSlot } = details;
 
-    if(player.metadata.lastFire && Date.now() - player.metadata.lastFire < 600) {
+    if (player.metadata.lastFire && Date.now() - player.metadata.lastFire < 600) {
         return;
     }
 
     const log = usedItem.itemId !== itemIds.tinderbox ? usedItem : usedWithItem;
     const removeFromSlot = usedItem.itemId !== itemIds.tinderbox ? usedSlot : usedWithSlot;
     const skillInfo = FIREMAKING_LOGS.find(l => l.logItem.gameId === log.itemId);
 
-    if(!skillInfo) {
+    if (!skillInfo) {
         player.sendMessage(`Mishandled firemaking log ${log.itemId}.`);
         return;
     }
 
-    // @TODO check for existing location objects
-    // @TODO check firemaking level
+    if (player.skills.firemaking.level < skillInfo.requiredLevel) {
+        player.sendMessage(`You need a Firemaking level of ${skillInfo.requiredLevel} to light this log.`);
+        return;
+    }
+
+    if (!canLightFireAtCurrentPosition(player)) {
+        player.sendMessage('You cannot light a fire here.');
+        return;
+    }
 
     player.removeItem(removeFromSlot);
     const worldItemLog = player.instance.spawnWorldItem(log, player.position, { owner: player, expires: 300 });
 
     // TODO (jameskmonger) chaining functionality needs documentation, I can't find anything about it online
-    if(player.metadata.lastFire && Date.now() - player.metadata.lastFire < 1200 &&
+    if (player.metadata.lastFire && Date.now() - player.metadata.lastFire < 1200 &&
         canChain(skillInfo.requiredLevel, player.skills.firemaking.level)) {
         lightFire(player, player.position, worldItemLog, skillInfo.experienceGained);
     } else {

src/plugins/skills/firemaking/light-fire.ts

@@ -8,6 +8,29 @@ const fireDurationTicks = (): number => {
     return randomBetween(100, 200); // 1-2 minutes
 };
 
+/**
+ * Whether or not a fire can be lit at the player's position.
+ *
+ * This is `true` if there are no spawned objects at the specified position of type 10.
+ *
+ * Probably should be moved to a more generic location (maybe on WorldInstance)
+ *
+ * @param player The player attempting to light the fire.
+ * @returns `true` if a fire can be lit at the specified position, `false` otherwise.
+ *
+ * @author jameskmonger
+ */
+export const canLightFireAtCurrentPosition = (player: Player): boolean => {
+    const existingFire = player.instance.getTileModifications(player.position).mods.spawnedObjects.find(o => (
+        o.x === player.position.x
+        && o.y === player.position.y
+        && o.level === player.position.level
+        && o.type === 10
+    ))
+
+    return existingFire === undefined;
+}
+
 /**
  * Light a fire at the specified position.
  *
@@ -17,6 +40,11 @@ const fireDurationTicks = (): number => {
  * @param burnExp The experience gained for lighting the fire.
  */
 export const lightFire = (player: Player, position: Position, worldItemLog: WorldItem, burnExp: number): void => {
+    if (!canLightFireAtCurrentPosition(player)) {
+        player.sendMessage('You cannot light a fire here.');
+        return;
+    }
+
     player.instance.despawnWorldItem(worldItemLog);
     const fireObject: LandscapeObject = {
         objectId: objectIds.fire,
@@ -45,5 +73,5 @@ export const lightFire = (player: Player, position: Position, worldItemLog: Worl
 
     player.face(position, false);
     player.metadata.lastFire = Date.now();
-    player.metadata.busy = false;
+    player.busy = false;
 };