From ec759b6798895cdc5f39b8400081dd99d59084a9 Mon Sep 17 00:00:00 2001 From: Monty Marz Date: Mon, 24 Aug 2020 01:16:53 +0200 Subject: [PATCH] various fixes Balanced crafted weapon power Adjusted tooltip color Added tooltip showing account name to the social window --- .../items/weapons/bow/wood_shortbow-0.ron | 2 +- .../common/items/weapons/sword/wood_sword.ron | 2 +- .../element/frames/tt_test_corner_tr.png | Bin 134 -> 1428 bytes assets/voxygen/element/frames/tt_test_edge.png | Bin 117 -> 1421 bytes assets/voxygen/i18n/de_DE.ron | 1 + assets/voxygen/i18n/en.ron | 1 + voxygen/src/hud/crafting.rs | 1 + voxygen/src/hud/social.rs | 6 ++++++ world/src/layer/mod.rs | 6 +++--- 9 files changed, 14 insertions(+), 5 deletions(-) diff --git a/assets/common/items/weapons/bow/wood_shortbow-0.ron b/assets/common/items/weapons/bow/wood_shortbow-0.ron index c655669510..31bc5aa46c 100644 --- a/assets/common/items/weapons/bow/wood_shortbow-0.ron +++ b/assets/common/items/weapons/bow/wood_shortbow-0.ron @@ -6,7 +6,7 @@ Item( kind: Bow("WoodShortbow0"), stats: ( equip_time_millis: 400, - power: 1.0, + power: 0.8, ), ) ), diff --git a/assets/common/items/weapons/sword/wood_sword.ron b/assets/common/items/weapons/sword/wood_sword.ron index 59b674ee19..c7a047b01a 100644 --- a/assets/common/items/weapons/sword/wood_sword.ron +++ b/assets/common/items/weapons/sword/wood_sword.ron @@ -6,7 +6,7 @@ Item( kind: Sword("WoodTraining"), stats: ( equip_time_millis: 400, - power: 1.0, + power: 0.8, ), ) ), diff --git a/assets/voxygen/element/frames/tt_test_corner_tr.png b/assets/voxygen/element/frames/tt_test_corner_tr.png index 5e94fb95ddc03950c6105e701f9ad8ec647e3235..3eb2ccc0637c2b51fe21450d2434da117c6c854d 100644 GIT binary patch literal 1428 zcmbVMO>5LZ7>=N&Rs=zi>S>4`{AiNN>^9pB#?tQAcEPlzF1CUPXOr38*i9xT)9$t& z6v0FN_yZyyyb9u7MEnK*1wDK4Dqi%>euP%kVgs4aXP)=_-C16oKR$M5Oi`5M)rHCm z%-MQubOgp{Zc&Q$;y;GW!oH&tHry%8^q+ZB4GZ*Qh5#o%y29^==pgT2U@f zcVp(QbBXG_8AOiy?cE0z1-_%MPP*8Q%e)mVY$yEs_F~Q3UiWNYoxXxDcPS8rTr$)R z+fhopj@sj;u+EMR74;x;-BD*UfoRQLMrDz3Wa(J*Fea#E>!wvKT6h8xOt66`4U=f5 zMRAduB{cX{ke2ujx>C71kOezOZAlqZ!{~H6dZ(a^q-mJ8Z5x;vglK@!(yd6ct`?d}1+1B49 z(H02^2JH&F&#UF~av~Z*8!pn7`B_w*D_f>*SsKyJp1Q6}t5GUhk(If4*Nz0w_V&J}^&Km|5=7 zg&>8fZVgK3I=?$uwFA^k7s|Y>3>?+V;?I3`a2y=i1AW>~iv#ID@}dt*MMHL2!e^S` zt$p*(0OgIWVEc9$znj>*+g02{ICP9`nYSv~($lZxy-8q?;3=9koo-U3d5>u0>2tE3B-hsiU`g`xh)?WXf307>H zZQ=hTkNmjtL96QPOL1lpIDK`uf1%c;uxV|ZXL8)KmJwxQSh;}5eP@>ObD&uap00i_ I>zopr0EK!f6951J diff --git a/assets/voxygen/element/frames/tt_test_edge.png b/assets/voxygen/element/frames/tt_test_edge.png index 358e7e1477652d7f3c72adb8b4c3a439ff79a795..ccdea7cefb08980dbc0528cadd77102f7726f2da 100644 GIT binary patch literal 1421 zcmbVMO>fgM7!C*!4DB?8CIrIDE+9zacx|#;3u9}?T13XQRob}Kv)wjY6NkiI+no?M z4)6mIS0qk|3nzp)a7E(458=uUoPI;zCnl@dlRyNg| z?WfM4Q{U(4>qoU*h^voMO}jXgy{EL7uVyvv?B$@oBX|4A9a}mWLgb#OFJ}tDj=urQBH_R>p+O-;z%7}!Qz$s_Hb4+T3l=RK8McFA z0oyJZKf2PEuqNKD+#Bmsf1ci!GRBtG>-EguyeX2FWtU1N3nB|4Lm`ZG5J}QEqI7P; zP~j;}f>;J30vRLO6YwVVu)O={QU(U{;^RmTkh!r6G{f92a+!&QLj{7Vq$o zM>17dJIBUtAw}92f1%E=k0?-~_5EDOA8iT4TtzBZ_mvytfcz1i)(0`SHhC(#3FWK% z%FMaUn;4f9PNYccLUbmH+L)LOkZmGxV>^hL=%qIg3GfP$+|#qH8PGM5Q%5#NC5+r# z5Mc;MP+zd1IXDbmFi@cmA)dGKeDMfWl?)@291CU?H$@T>Ciptf3e?2_Xc$h3#%`aZ5jsU#8QwTh>!;Fv+cFkuD8 zTu2R9qEKY5GMC%Y|%U)>hXmZ&w;me*vkXwDbS~ delta 87 zcmV-d0I2_s3w4krQ2}#OM?wIu&K&6g001vZL_t&-m1E@Q=Kjw>1YjaY(NIyy$iTor tl&@LL^wfwlk>%B=U&JXC<6|RAApoWY1;X#vYrp^i002ovPDHLkV1h+qB=Z0O diff --git a/assets/voxygen/i18n/de_DE.ron b/assets/voxygen/i18n/de_DE.ron index f5ce2fa8f8..756e30360c 100644 --- a/assets/voxygen/i18n/de_DE.ron +++ b/assets/voxygen/i18n/de_DE.ron @@ -329,6 +329,7 @@ magischen Gegenstände ergattern?"#, "hud.social.not_yet_available": "Noch nicht verfügbar", "hud.social.faction": "Fraktion", "hud.social.play_online_fmt": "{nb_player} Spieler online", + "hud.social.account": "Account", "hud.spell": "Zauber", diff --git a/assets/voxygen/i18n/en.ron b/assets/voxygen/i18n/en.ron index 8e95b9df7d..9d53f77dd8 100644 --- a/assets/voxygen/i18n/en.ron +++ b/assets/voxygen/i18n/en.ron @@ -335,6 +335,7 @@ magically infused items?"#, "hud.social.name": "Name", "hud.social.level": "Level", "hud.social.zone": "Zone", + "hud.social.account": "Account", "hud.crafting": "Crafting", diff --git a/voxygen/src/hud/crafting.rs b/voxygen/src/hud/crafting.rs index 226dbec811..6bf0a59f70 100644 --- a/voxygen/src/hud/crafting.rs +++ b/voxygen/src/hud/crafting.rs @@ -183,6 +183,7 @@ impl<'a> Widget for Crafting<'a> { .set(ids.align_ing, ui); let client = &self.client; // First available recipes, then unavailable ones + // TODO Sort these alphabetically by using "sort_by_key(|x| x.to_lowercase())" let recipe_iter = self .client .recipe_book() diff --git a/voxygen/src/hud/social.rs b/voxygen/src/hud/social.rs index 82d570a15b..130b4c7494 100644 --- a/voxygen/src/hud/social.rs +++ b/voxygen/src/hud/social.rs @@ -417,6 +417,11 @@ impl<'a> Widget for Social<'a> { } else { button.down_from(state.ids.player_names[i - 1], 1.0) }; + let acc_name_txt = format!( + "{}: {}", + &self.localized_strings.get("hud.social.account"), + alias + ); button .w_h(133.0, 20.0) .hover_image(if selected { @@ -434,6 +439,7 @@ impl<'a> Widget for Social<'a> { .label_y(conrod_core::position::Relative::Scalar(1.0)) .label_font_id(self.fonts.cyri.conrod_id) .label_color(TEXT_COLOR) + .with_tooltip(self.tooltip_manager, &acc_name_txt, "", &button_tooltip) .set(state.ids.player_names[i], ui); // Player Levels Button::image(if !selected { diff --git a/world/src/layer/mod.rs b/world/src/layer/mod.rs index c9947b1bbd..c6e689a22c 100644 --- a/world/src/layer/mod.rs +++ b/world/src/layer/mod.rs @@ -29,7 +29,7 @@ pub struct Colors { fn close(x: f32, tgt: f32, falloff: f32) -> f32 { (1.0 - (x - tgt).abs() / falloff).max(0.0).powf(0.5) } -const MUSH_FACT: f32 = 0.0001; // To balance everything around the mushroom spawning rate +const MUSH_FACT: f32 = 1.0e-4; // To balance everything around the mushroom spawning rate pub fn apply_scatter_to<'a>( wpos2d: Vec2, mut get_column: impl FnMut(Vec2) -> Option<&'a ColumnSample<'a>>, @@ -130,10 +130,10 @@ pub fn apply_scatter_to<'a>( // Collecable Objects // Only spawn twigs in temperate forests (Twigs, false, |c| { - ((c.tree_density - 0.5).max(0.0) * 0.001, None) + ((c.tree_density - 0.5).max(0.0) * 1.0e-3, None) }), (Stones, false, |c| { - ((c.rockiness - 0.5).max(0.0) * 0.05, None) + ((c.rockiness - 0.5).max(0.0) * 1.0e-3, None) }), // Don't spawn Mushrooms in snowy regions (Mushroom, false, |c| {