From d3124529417f29396de5a8ea3e922cd39dad7d51 Mon Sep 17 00:00:00 2001
From: DoctorKompot <accessibledood@gmail.com>
Date: Sun, 12 Dec 2021 01:00:06 +0200
Subject: [PATCH] changed Magic Lantern kind: to "Magic"

---
 assets/common/items/boss_drops/lantern.ron         | 2 +-
 assets/voxygen/item_image_manifest.ron             | 4 ++++
 assets/voxygen/voxel/humanoid_lantern_manifest.ron | 4 ++++
 assets/voxygen/voxel/lantern/magic_lantern.vox     | 3 +++
 4 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 assets/voxygen/voxel/lantern/magic_lantern.vox

diff --git a/assets/common/items/boss_drops/lantern.ron b/assets/common/items/boss_drops/lantern.ron
index 82fa2c248d..b98710e474 100644
--- a/assets/common/items/boss_drops/lantern.ron
+++ b/assets/common/items/boss_drops/lantern.ron
@@ -3,7 +3,7 @@ ItemDef(
     description: "Illuminates even the darkest dungeon\nA great monster was slain for this item",
     kind: Lantern(
         (
-            kind: "Green0",
+            kind: "Magic",
             color: (r: 128, g: 26, b: 255),
             strength_thousandths: 8500,
             flicker_thousandths: 300,
diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron
index 57946af19a..7f6724b472 100644
--- a/assets/voxygen/item_image_manifest.ron
+++ b/assets/voxygen/item_image_manifest.ron
@@ -1041,6 +1041,10 @@
         "voxel.lantern.green-0",
         (0.0, 0.0, 0.0), (-75.0, 20.0, 5.0), 0.9,
     ),
+    Lantern("Magic"): VoxTrans(
+        "voxel.lantern.magic_lantern",
+        (0.0, 0.0, 0.0), (-75.0, 20.0, 5.0), 0.9,
+    ),
     Lantern("Blue0"): VoxTrans(
         "voxel.lantern.blue-0",
         (0.0, 0.0, 0.0), (-75.0, 20.0, 5.0), 0.9,
diff --git a/assets/voxygen/voxel/humanoid_lantern_manifest.ron b/assets/voxygen/voxel/humanoid_lantern_manifest.ron
index 5011cacc3d..42750ace3b 100644
--- a/assets/voxygen/voxel/humanoid_lantern_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_lantern_manifest.ron
@@ -8,6 +8,10 @@
           vox_spec: ("lantern.green-0", (-2.0, -2.0, -7.0)),
           color: None
       ),
+      "Magic": (
+          vox_spec: ("lantern.magic_lantern", (-2.0, -2.0, -7.0)),
+          color: None
+      ),
       "Black0": (
           vox_spec: ("lantern.black-0", (-2.0, -2.0, -8.5)),
           color: None
diff --git a/assets/voxygen/voxel/lantern/magic_lantern.vox b/assets/voxygen/voxel/lantern/magic_lantern.vox
new file mode 100644
index 0000000000..b8a4f57add
--- /dev/null
+++ b/assets/voxygen/voxel/lantern/magic_lantern.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d1ef04cd413a5ef6e29872ef439b4bbb21845a1e494264135e203ed46b3a0d89
+size 1392