From fab9fb417f0966160d900cbe19848620492b5528 Mon Sep 17 00:00:00 2001
From: Pfauenauge90 <44173739+Pfauenauge90@users.noreply.github.com>
Date: Sun, 7 Jul 2019 01:04:30 +0200
Subject: [PATCH] crosshair correction

---
 .../voxygen/element/misc_bg/crosshair_inner.vox | Bin 0 -> 1116 bytes
 .../voxygen/element/misc_bg/crosshair_outer.vox | Bin 0 -> 1464 bytes
 voxygen/src/hud/img_ids.rs                      |   4 ++++
 voxygen/src/hud/mod.rs                          |  16 +++++++++++-----
 4 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 assets/voxygen/element/misc_bg/crosshair_inner.vox
 create mode 100644 assets/voxygen/element/misc_bg/crosshair_outer.vox

diff --git a/assets/voxygen/element/misc_bg/crosshair_inner.vox b/assets/voxygen/element/misc_bg/crosshair_inner.vox
new file mode 100644
index 0000000000000000000000000000000000000000..7b274ce73797f122f2f0162baeba7cb227c0ecdd
GIT binary patch
literal 1116
zcmXZa!Hv^E6b9gj1c%LX$pMKYN()oLq9DitkU&Ap7Vug~3#kC<wU8Fl!nEKPa^x17
zZ${Ypo#c-_{xaiV-=9DHiHNUHhi~5E%j<}rhnG)p#~0f>dG-JO`S;7={U~j3WD}de
z53#v#;_?1C-yiNjK7V`)V~lN`TX!r;X`&ugcj)@A@A|GEr<J~ZD1GTmKQ2vu>eH9h
zr+y6A^iALNP0{pTYv@BC`q1NOWb7p=P4s@~4xOj-be_&Lc|4t`^K_ohGs!%ir}K24
z&NKf8Pv_}8ou~7Rzt(v=Pv_}8ori8p%CUHgr+DTR@DxC~SsAztGN;9l<wNllPw~vD
z;whfuDW2k))5lXh#Zx@RGp4k7il=yrr+DTx&zTvTu{Y71pX5oN<Vl|7najbGJPDC*
zm<FFq<f3#!`jR}!Gnb7gd6Fl2l4mSs@+434Bv10p<(;cEW@c!{uIFhyji>Q6p2jmD
z1D?jycp6XRnU4lf<7qq%q`B#QTnyG+*qqc9jmJy$JdLOEG#<5#CuXeDn3<um^8`=u
z1W)h;kIO~R6Fk8aJcblKPw)g!@VJfWd4eZ+0>-UHZ@_SIIPs=j<SG|A%Sn#1mz``S
zZnDT#E^?NW9Az&%*-G4Gk*i$fEGIe2UUsrwZ@1gJEX#VmUf0XzvYyZ9^>jL|$K!F`
Q@AvC&w_CT{t#c#(0i0TEGXMYp

literal 0
HcmV?d00001

diff --git a/assets/voxygen/element/misc_bg/crosshair_outer.vox b/assets/voxygen/element/misc_bg/crosshair_outer.vox
new file mode 100644
index 0000000000000000000000000000000000000000..6b03ba80457db4c43995b1991dd4f25f98dfbf19
GIT binary patch
literal 1464
zcmXZaO|Bw06o%o$@15iVMctl9Y{4t&h$y;)BvM*LomP*%f=FzE6-4qpBeuX6yal$v
z5b2Jbr>s!CRMqF>;}=)``TN%&|A~lSKfnLx6#uRwzPx|?`G@Jo=M!fCpTGX~?fviR
z#^*a0F+7*C|5(NBxr*_*c3wNrWA`zO)pHi>=S$4mEH<vU&yDeA%s)12wyw9%i&&^%
ze(dC<no;d&-e~?_pS`icI)l2MwIVhxVyow_&0}bb*tcbjZ53~AjSaTg$p&M4HKW=$
z^WMyRixt+grLl#Yx!Rd|VP5DH`h=b{z30|gSZis`71r)I*c#iZ8PxC9@6F$vzt?Nf
zbEo$PTdc5_EsZVI&DG7#o0~V+W1-hl&lT3zdckXZ;s1)!^(&WA{>LvreU4?{{%HME
z{T5^-h^MIfsq!kX@+zOoioCce@**$tX=;{dd3KZKSw6K(@+434BuH}K7V?mXJmmIE
zg6Sy8NRS(-ekz~Jr}C+Mx*ng(r}C+MDxa>*r}C+MDxb=y{|!EsPvukjR6f&Rt9&Y-
z%BS+FeAso9;<xZAd<vhw1$+vDVzHue(WGyS!Q!IuDSQf_zEyk*pTei`DSZ0&@hN-?
zpTei`nYOg>DSQf_!l&@*+uV0%vYCzqx&6s}GM~&R^T~Yr<KUC|WD?neS@ZsgOv(zf
zo6INk>5q+1=9BqkKAF$-C^MhTC-cdCGN1l<`%{{BX0n+MIiJKQ@kx9VpTwuX27D5q
z#3%7deEO@wC-F&q5|L!l{<>(EOiYTBAo1~qoKNDD_#{4JOmEEel%}1TY#e-oPw)vo
z!6*2b4mqFT6MTY?mXPxaKEWsWSO#)F!6*0x8B0U1VVE2WAHq9sxZ;8{PB`L#0r9{c
zH(YVS87CZZz<_w*jvKDH;EWTFIACax$D`fv_jbG8+Vy&Em&>J{&*yeJo!aquY=^_4
J4a1-|;y*JB$mRe5

literal 0
HcmV?d00001

diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs
index 3beaca6409..14abc02cae 100644
--- a/voxygen/src/hud/img_ids.rs
+++ b/voxygen/src/hud/img_ids.rs
@@ -55,10 +55,14 @@ image_ids! {
 
         // Crosshair
         crosshair: "voxygen/element/misc_bg/crosshair.vox",
+        //crosshair_outer: "voxygen/element/misc_bg/crosshair_outer.vox",
+        crosshair_inner: "voxygen/element/misc_bg/crosshair_inner.vox",
 
 ////////////////////////////////////////////////////////////////////////
         <VoxelMs9Graphic>
 
+        crosshair_outer: "voxygen/element/misc_bg/crosshair_outer.vox",
+
         // Buttons
         mmap_closed: "voxygen/element/buttons/button_mmap_closed.vox",
         mmap_closed_hover: "voxygen/element/buttons/button_mmap_closed_hover.vox",
diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs
index 6ca538e98f..d5c784ddc6 100644
--- a/voxygen/src/hud/mod.rs
+++ b/voxygen/src/hud/mod.rs
@@ -50,7 +50,8 @@ const MANA_COLOR: Color = Color::Rgba(0.42, 0.41, 0.66, 1.0);
 widget_ids! {
     struct Ids {
         // Crosshair
-        crosshair,
+        crosshair_inner,
+        crosshair_outer,
 
         // Character Names
         name_tags[],
@@ -339,11 +340,16 @@ impl Hud {
             let mut health_back_id_walker = self.ids.health_bar_backs.walk();
 
             // Crosshair
-            Image::new(self.imgs.crosshair)
-                .w_h(21.0 * 2.0, 21.0 * 2.0)
+            Image::new(self.imgs.crosshair_outer)
+                .w_h(21.0 * 1.5, 21.0 * 1.5)
                 .middle_of(ui_widgets.window)
-                .color(Some(Color::Rgba(1.0, 1.0, 1.0, 0.1)))
-                .set(self.ids.crosshair, ui_widgets);
+                .color(Some(Color::Rgba(1.0, 1.0, 1.0, 0.2)))
+                .set(self.ids.crosshair_outer, ui_widgets);
+            Image::new(self.imgs.crosshair_inner)
+                .w_h(21.0 * 2.0, 21.0 * 2.0)
+                .middle_of(self.ids.crosshair_outer)
+                .color(Some(Color::Rgba(1.0, 1.0, 1.0, 0.6)))
+                .set(self.ids.crosshair_inner, ui_widgets);
 
             // Render Name Tags
             for (pos, name) in (&entities, &pos, &stats, player.maybe())