diff --git a/assets/common/items/lantern/green_0.ron b/assets/common/items/lantern/green_0.ron index 665b336bfe..2ac96711cd 100644 --- a/assets/common/items/lantern/green_0.ron +++ b/assets/common/items/lantern/green_0.ron @@ -4,7 +4,7 @@ ItemDef( kind: Lantern( ( kind: "Green0", - color: (r: 255, g: 128, b: 26), + color: (r: 50, g: 205, b: 50), strength_thousandths: 6000, flicker_thousandths: 250, ), diff --git a/assets/common/items/lantern/red_0.ron b/assets/common/items/lantern/red_0.ron index 4ca189dd3e..63c683a530 100644 --- a/assets/common/items/lantern/red_0.ron +++ b/assets/common/items/lantern/red_0.ron @@ -4,7 +4,7 @@ ItemDef( kind: Lantern( ( kind: "Red0", - color: (r: 255, g: 128, b: 26), + color: (r: 220, g: 20, b: 60), strength_thousandths: 5000, flicker_thousandths: 250, ), diff --git a/assets/voxygen/element/ui/bag/buttons/inv_slot_sel.png b/assets/voxygen/element/ui/bag/buttons/inv_slot_sel.png index 9bb9665e58..7b27b4e779 100644 --- a/assets/voxygen/element/ui/bag/buttons/inv_slot_sel.png +++ b/assets/voxygen/element/ui/bag/buttons/inv_slot_sel.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce47db8a87a599a03719653a5db86e6811187ccd4d1054a682efe3cebb89f73b -size 158 +oid sha256:df37e3b1d2122be9c5698b4998d1eb08fb4c4fd91a7f097adb1cc00750cde0e4 +size 632 diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 0418b9e6ab..4f0c0f7809 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -1033,25 +1033,29 @@ (0.0, 0.0, 0.0), (-90.0, 90.0, 0.0), 2.4, ), // Lanterns - Lantern("Black0"): Png( - "element.items.lantern_black-0", + Lantern("Black0"): VoxTrans( + "voxel.lantern.black-0", + (0.0, 0.0, 0.0), (-75.0, 20.0, 5.0), 0.9, ), - Lantern("Green0"): Png( - "element.items.lantern_green-0", + Lantern("Green0"): VoxTrans( + "voxel.lantern.green-0", + (0.0, 0.0, 0.0), (-75.0, 20.0, 5.0), 0.9, ), - Lantern("Blue0"): Png( - "element.items.lantern_blue-0", + Lantern("Blue0"): VoxTrans( + "voxel.lantern.blue-0", + (0.0, 0.0, 0.0), (-75.0, 20.0, 5.0), 0.9, ), - Lantern("Red0"): Png( - "element.items.lantern_red-0", + Lantern("Red0"): VoxTrans( + "voxel.lantern.red-0", + (0.0, 0.0, 0.0), (-75.0, 20.0, 5.0), 0.9, ), Lantern("GeodePurp"): VoxTrans( "voxel.lantern.geode_purp", - (0.0, 0.0, 0.0), (-90.0, 120.0, 0.0), 0.9, + (0.0, 0.0, 0.0), (-75.0, 20.0, 5.0), 0.9, ), Lantern("PumpkinLantern"): VoxTrans( "voxel.lantern.pumpkin", - (0.0, 0.0, 0.0), (-90.0, 120.0, 0.0), 0.9, + (0.0, 0.0, 0.0), (-100.0, 205.0, 7.0), 0.9, ), Lantern("PolarisLantern"): VoxTrans( "voxel.lantern.polaris", diff --git a/assets/voxygen/voxel/lantern/black-0.vox b/assets/voxygen/voxel/lantern/black-0.vox index 092a32a4d7..227c84d5e8 100644 --- a/assets/voxygen/voxel/lantern/black-0.vox +++ b/assets/voxygen/voxel/lantern/black-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c26b7302cb1889047d7498a482a5aa10b946d008ecbf699e74b7935a8cccd2b -size 1404 +oid sha256:f47c66ed69228a2a51442d847ace17d9ddbd1c6302e52767895ce67a7ee4097d +size 55887 diff --git a/assets/voxygen/voxel/lantern/blue-0.vox b/assets/voxygen/voxel/lantern/blue-0.vox index 1f9b3f481e..c1a7f024de 100644 --- a/assets/voxygen/voxel/lantern/blue-0.vox +++ b/assets/voxygen/voxel/lantern/blue-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:74dce3eee748abc472024397e98332bb3673123d5e6e0bea2f8bfaea26afef56 -size 1404 +oid sha256:05cd8520f153fcf624ca48b651dbebb41269b6a64317d4e3e617df1e11bb5b2e +size 55887 diff --git a/assets/voxygen/voxel/lantern/geode_purp.vox b/assets/voxygen/voxel/lantern/geode_purp.vox index d580f94c66..9d753830cb 100644 --- a/assets/voxygen/voxel/lantern/geode_purp.vox +++ b/assets/voxygen/voxel/lantern/geode_purp.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a0418a4af05e7d335a746074e725193d8c94dc2e0b41fb594218002e486ce194 -size 1476 +oid sha256:de5c3a564884fe275b1725c4efb9a59dfb742b66a8eb774d4affac44a950edc5 +size 55959 diff --git a/assets/voxygen/voxel/lantern/green-0.vox b/assets/voxygen/voxel/lantern/green-0.vox index 0923c3d2cd..bb3f5cd5b9 100644 --- a/assets/voxygen/voxel/lantern/green-0.vox +++ b/assets/voxygen/voxel/lantern/green-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de5f07bfee3fd6b9d9d387cc679b13a985addcdd2e1d1389019a9b28cde3d378 -size 1404 +oid sha256:a735ee21e6318ca615c029f139d84f8181842b2fc4aa31d155e5649af94f8d38 +size 55887 diff --git a/assets/voxygen/voxel/lantern/red-0.vox b/assets/voxygen/voxel/lantern/red-0.vox index 0110b1a370..b086b021d6 100644 --- a/assets/voxygen/voxel/lantern/red-0.vox +++ b/assets/voxygen/voxel/lantern/red-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:302f82c415f2f6cd2281355734cf4a20eea991b6c8eb179149fe0a6389433840 -size 1404 +oid sha256:c468d8ae2873e436c4846c34ce38df7457bcdac6953b15f317367b8a8fa361dc +size 55887