Merge branch 'james/merchant-percentages' into 'master'

Floor merchant cost percentages and display as whole numbers

See merge request veloren/veloren!3028

CHANGELOG.md

@@ -54,6 +54,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Avoided black hexagons when bloom is enabled by suppressing NaN/Inf pixels during the first bloom blur pass
 - Many know water generation problems
 - Trading over long distances using ghost characters or client-side exploits is no longer possible
+- Merchant cost percentages displayed as floored, whole numbers
 
 ## [0.11.0] - 2021-09-11
 

server/src/sys/agent.rs

@@ -1328,8 +1328,8 @@ impl<'a> AgentData<'a> {
                     } else {
                         if balance1 > 0.0 {
                             let msg = format!(
-                                "That only covers {:.1}% of my costs!",
-                                balance0 / balance1 * 100.0
+                                "That only covers {:.0}% of my costs!",
+                                (balance0 / balance1 * 100.0).floor()
                             );
                             if let Some(tgt_data) = &agent.target {
                                 // If talking with someone in particular, "tell" it only to them