mining now supports essence and gem mining

Author: Promises

README.md

@@ -109,15 +109,16 @@ The server runs on the 435 revision of the game, which was a game update made on
     * Formula for success :heavy_check_mark:
     * Chopping Trees :heavy_check_mark: 
     * Axes :heavy_check_mark:
-    * Birds nests  :x: 
+    * Birds nests  :heavy_check_mark: 
     * Stump ids :yellow_square: 
+    * Canoes :x:
 * Mining 
     * Formula for success :heavy_check_mark:
     * Mining ores :heavy_check_mark: 
     * Pickaxes :heavy_check_mark:
-    * Random gems  :x: 
-    * Gem ores :x:
-    * Essence mining :x:
+    * Random gems  :heavy_check_mark: 
+    * Gem ores :heavy_check_mark:
+    * Essence mining :heavy_check_mark:
     * Empty Rock ids :yellow_square: 
 * Crafting
     * Spinning wheel :heavy_check_mark:

src/world/config/harvestable-object.ts

@@ -106,7 +106,9 @@ export enum Ore {
     GOLD,
     MITHIL,
     ADAMANT,
-    RUNITE
+    RUNITE,
+    RUNE_ESS,
+    GEM
 }
 
 
@@ -223,6 +225,16 @@ const Ores: IHarvestable[] = [
         respawnHigh: 1200,
         baseChance: -10,
         break: 100
+    },
+    {
+        objects: new Map<number, number>([[2111, 450]]), // Gem rocks
+        itemId: 1625,
+        level: 40,
+        experience: 65.0,
+        respawnLow: 200,
+        respawnHigh: 400,
+        baseChance: 30,
+        break: 100
     }
 ];
 

src/world/skill-util/harvest-roll.ts

@@ -36,3 +36,24 @@ export function rollGemType(): Item {
     }
     return {itemId: itemId, amount: 1};
 }
+
+export function rollGemRockResult(): Item  {
+    const roll = randomBetween(0, 127);
+    let itemId;
+    if (roll < 60) {
+        itemId = 1625; // Uncut Opal
+    } else if (roll < 90) {
+        itemId = 1627; // Uncut Jade
+    } else if (roll < 105) {
+        itemId = 1629; // uncut topaz
+    } else if (roll < 114) {
+        itemId = 1623; // uncut sapphire
+    } else if (roll < 119) {
+        itemId = 1621; // uncut emerald
+    } else if (roll < 124) {
+        itemId = 1619; // uncut ruby
+    } else {
+        itemId = 1617; // uncut diamond
+    }
+    return {itemId: itemId, amount: 1};
+}

src/world/skill-util/harvest-skill.ts

@@ -10,7 +10,7 @@ import { ObjectActionDetails } from '@server/world/actor/player/action/object-ac
 import { colors } from '@server/util/colors';
 import { checkForGemBoost } from '@server/world/skill-util/glory-boost';
 import { colorText } from '@server/util/strings';
-import { rollBirdsNestType, rollGemType } from '@server/world/skill-util/harvest-roll';
+import { rollBirdsNestType, rollGemRockResult, rollGemType } from '@server/world/skill-util/harvest-roll';
 
 export function canInitiateHarvest(player: Player, target: IHarvestable, skill: Skill): undefined | HarvestTool {
     if (!target) {
@@ -19,7 +19,7 @@ export function canInitiateHarvest(player: Player, target: IHarvestable, skill:
                 player.sendMessage('There is current no ore available in this rock.');
                 break;
             default:
-                player.sendMessage(colorText("HARVEST SKILL ERROR, PLEASE CONTACT DEVELOPERS", colors.red));
+                player.sendMessage(colorText('HARVEST SKILL ERROR, PLEASE CONTACT DEVELOPERS', colors.red));
                 break;
 
 
@@ -81,7 +81,15 @@ export function canInitiateHarvest(player: Player, target: IHarvestable, skill:
 }
 
 export function handleHarvesting(details: ObjectActionDetails, tool: HarvestTool, target: IHarvestable, skill: Skill): void {
-    let targetName: string = cache.itemDefinitions.get(target.itemId).name.toLowerCase();
+    let itemToAdd = target.itemId;
+    if (itemToAdd === 1436 && details.player.skills.hasLevel(Skill.MINING, 30)) {
+        itemToAdd = 7936;
+    }
+    if (details.object.objectId === 2111 && details.player.skills.hasLevel(Skill.MINING, 30)) {
+        itemToAdd = rollGemRockResult().itemId;
+    }
+    let targetName: string = cache.itemDefinitions.get(itemToAdd).name.toLowerCase();
+
     switch (skill) {
         case Skill.MINING:
             targetName = targetName.replace(' ore', '');
@@ -113,7 +121,6 @@ export function handleHarvesting(details: ObjectActionDetails, tool: HarvestTool
                 toolLevel = 2;
             }
             const percentNeeded = target.baseChance + toolLevel + details.player.skills.values[skill].level;
-            details.player.sendMessage(`roll: ${successChance}, needed: ${percentNeeded}`);
             if (successChance <= percentNeeded) {
                 if (details.player.inventory.hasSpace()) {
                     let randomLoot = false;
@@ -123,15 +130,15 @@ export function handleHarvesting(details: ObjectActionDetails, tool: HarvestTool
                             roll = randomBetween(1, checkForGemBoost(details.player));
                             if (roll === 1) {
                                 randomLoot = true;
-                                details.player.sendMessage(colorText("You found a rare gem.", colors.red));
+                                details.player.sendMessage(colorText('You found a rare gem.', colors.red));
                                 details.player.giveItem(rollGemType());
                             }
                             break;
                         case Skill.WOODCUTTING:
                             roll = randomBetween(1, 256);
                             if (roll === 1) {
                                 randomLoot = true;
-                                details.player.sendMessage(colorText("A bird's nest falls out of the tree.", colors.red));
+                                details.player.sendMessage(colorText('A bird\'s nest falls out of the tree.', colors.red));
                                 world.spawnWorldItem(rollBirdsNestType(), details.player.position, details.player, 300);
                             }
                             break;
@@ -145,7 +152,9 @@ export function handleHarvesting(details: ObjectActionDetails, tool: HarvestTool
                                 details.player.sendMessage(`You manage to chop some ${targetName}.`);
                                 break;
                         }
-                        details.player.giveItem(target.itemId);
+
+                        details.player.giveItem(itemToAdd);
+
                     }
                     details.player.skills.addExp(skill, target.experience);
                     if (randomBetween(0, 100) <= target.break) {