metal drill elf + rename mining drill to metal drill

src/data/layers/management.tsx

@@ -863,6 +863,47 @@ const layer = createLayer(id, () => {
             shouldEarn: () => coalDrillElfTraining.level.value >= 5
         }))
     ] as Array<GenericMilestone>;
+    const metalDrillElfMilestones = [
+        createMilestone(() => ({
+            display: {
+                requirement: "Twinkle Level 1",
+                effectDisplay: "Schools multiply metal gain per ore"
+            },
+            shouldEarn: () => metalDrillElfTraining.level.value >= 1
+        })),
+        createMilestone(() => ({
+            display: {
+                requirement: "Twinkle Level 2",
+                effectDisplay: "Each Twinkle level multiplies auto smelting speed by 1.25"
+            },
+            visibility: () => showIf(metalDrillElfMilestones[0].earned.value),
+            shouldEarn: () => metalDrillElfTraining.level.value >= 2
+        })),
+        createMilestone(() => ({
+            display: {
+                requirement: "Twinkle Level 3",
+                effectDisplay: "Auto smelting purity is tripled."
+            },
+            visibility: () => showIf(metalDrillElfMilestones[1].earned.value),
+            shouldEarn: () => metalDrillElfTraining.level.value >= 3
+        })),
+        createMilestone(() => ({
+            display: {
+                requirement: "Twinkle Level 4",
+                effectDisplay: "All metal buyables are cheaper"
+            },
+            visibility: () => showIf(metalDrillElfMilestones[2].earned.value && main.day.value >= 13),
+            shouldEarn: () => metalDrillElfTraining.level.value >= 4
+        })),
+        createMilestone(() => ({
+            display: {
+                requirement: "Twinkle Level 5",
+                effectDisplay: "Unlock another row of metal upgrades"
+            },
+            visibility: () => showIf(metalDrillElfMilestones[3].earned.value && main.day.value >= 13),
+            shouldEarn: () => metalDrillElfTraining.level.value >= 5
+        }))
+    ] as Array<GenericMilestone>;
     // ------------------------------------------------------------------------------- Milestone display
 
     const currentShown = persistent<string>("Holly");
@@ -916,7 +957,8 @@ const layer = createLayer(id, () => {
     const clothElfTraining = createElfTraining(elves.elves.clothElf, clothElfMilestones);
     const plasticElfTraining = [paperElfTraining, boxElfTraining, clothElfTraining];
     const coalDrillElfTraining = createElfTraining(elves.elves.coalDrillElf, coalDrillElfMilestones);
-    const row5Elves = [coalDrillElfTraining]
+    const metalDrillElfTraining = createElfTraining(elves.elves.metalDrillElf, metalDrillElfMilestones);
+    const row5Elves = [coalDrillElfTraining, metalDrillElfTraining]
     const elfTraining = {
         cutterElfTraining,
         planterElfTraining,
@@ -930,7 +972,8 @@ const layer = createLayer(id, () => {
         paperElfTraining,
         boxElfTraining,
         clothElfTraining,
-        coalDrillElfTraining
+        coalDrillElfTraining,
+        metalDrillElfTraining
     };
     const day12Elves = [
         cutterElfTraining,
@@ -959,7 +1002,8 @@ const layer = createLayer(id, () => {
         paperElfTraining,
         boxElfTraining,
         clothElfTraining,
-        coalDrillElfTraining
+        coalDrillElfTraining,
+        metalDrillElfTraining
     ];
 
     // ------------------------------------------------------------------------------- Update

src/data/layers/metal.tsx

@@ -214,7 +214,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
     const oreAmount = createSequentialModifier(() => [
         createAdditiveModifier(() => ({
             addend: () => oreDrill.amount.value,
-            description: "Mining Drills",
+            description: "Metal Drills",
             enabled: () => Decimal.gte(oreDrill.amount.value, 1)
         })),
         createMultiplicativeModifier(() => ({
@@ -247,7 +247,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
         })),
         createMultiplicativeModifier(() => ({
             multiplier: 2.5,
-            description: "Mining Drills",
+            description: "Metal Drills",
             enabled: () => Decimal.gte(oreDrill.amount.value, 1)
         })),
         createMultiplicativeModifier(() => ({
@@ -257,7 +257,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
         })),
         createMultiplicativeModifier(() => ({
             multiplier: 2,
-            description: "Oil the Mining Drills",
+            description: "Oil the Metal Drills",
             enabled: oil.row2Upgrades[1].bought
         }))
     ]);
@@ -331,7 +331,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
         display: {
             title: "Coal Drilling",
             description:
-                "These mining drills are pretty powerful, mining more ore than you can actually smelt. Could be worth making some to mine coal instead"
+                "These metal drills are pretty powerful, mining more ore than you can actually smelt. Could be worth making some to mine coal instead"
         },
         visibility: () =>
             showIf(
@@ -381,7 +381,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
             return Decimal.pow(1.15, this.amount.value).times(10);
         },
         display: {
-            title: "Mining Drill",
+            title: "Metal Drill",
             description: "An automated machine to help you mine more ore, faster",
             effectDisplay: jsx(() => (
                 <>

src/data/layers/oil.tsx

@@ -504,7 +504,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
             cost: 150000,
             display: {
                 title: "Metal Drill Synergy",
-                description: "Increase drill power by +4% per ore Mining Drill owned.",
+                description: "Increase drill power by +4% per Metal Drill owned.",
                 effectDisplay: jsx(() => <>x{format(row1UpgradeEffects[1].value)}</>)
             },
             style: { color: colorText }
@@ -584,7 +584,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
             resource: noPersist(oil),
             cost: 500,
             display: {
-                title: "Oil the Mining Drills",
+                title: "Oil the Metal Drills",
                 description:
                     "Double ore mining speed and square the coal drill amount in its effect."
             },