From 981b55837a7685589731c5566b2e6ea405f73531 Mon Sep 17 00:00:00 2001
From: Monty Marz <m.marzouq@gmx.de>
Date: Sun, 26 Jan 2020 22:57:06 +0000
Subject: [PATCH] fix typo in en.ron, fixed unfinished weapons dropping from
 chests

---
 assets/voxygen/i18n/en.ron        |  2 +-
 common/src/comp/inventory/item.rs | 32 +++++++++++++++++--------------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/assets/voxygen/i18n/en.ron b/assets/voxygen/i18n/en.ron
index 72761acbbe..ad38894438 100644
--- a/assets/voxygen/i18n/en.ron
+++ b/assets/voxygen/i18n/en.ron
@@ -281,7 +281,7 @@ Chat commands:
         "hud.social.online": "Online",
         "hud.social.friends": "Friends",
         "hud.social.not_yet_available": "Not yet available",
-        "hud.social.Faction": "Faction",
+        "hud.social.faction": "Faction",
         "hud.social.play_online_fmt": "{nb_player} player(s) online",
 
         "hud.spell": "Spell",
diff --git a/common/src/comp/inventory/item.rs b/common/src/comp/inventory/item.rs
index ead09e314a..1ec6f4508b 100644
--- a/common/src/comp/inventory/item.rs
+++ b/common/src/comp/inventory/item.rs
@@ -3,7 +3,8 @@ use crate::{
     effect::Effect,
     terrain::{Block, BlockKind},
 };
-use rand::prelude::*;
+//use rand::prelude::*;
+use rand::seq::SliceRandom;
 use specs::{Component, FlaggedStorage};
 use specs_idvs::IDVStorage;
 use std::fs::File;
@@ -157,19 +158,22 @@ impl Item {
                 Some(assets::load_expect_cloned("common.items.grasses.medium"))
             }
             BlockKind::ShortGrass => Some(assets::load_expect_cloned("common.items.grasses.short")),
-            BlockKind::Chest => Some(match rand::random::<usize>() % 6 {
-                0 => assets::load_expect_cloned("common.items.apple"),
-                1 => assets::load_expect_cloned("common.items.velorite"),
-                2 => (**assets::load_glob::<Item>("common.items.weapons.*")
-                    .expect("Error getting glob")
-                    .choose(&mut rand::thread_rng())
-                    .expect("Empty glob"))
-                .clone(),
-                3 => assets::load_expect_cloned("common.items.veloritefrag"),
-                4 => assets::load_expect_cloned("common.items.cheese"),
-                5 => assets::load_expect_cloned("common.items.potion_minor"),
-                _ => unreachable!(),
-            }),
+            BlockKind::Chest => Some(assets::load_expect_cloned(
+                [
+                    "common.items.apple",
+                    "common.items.velorite",
+                    "common.items.veloritefrag",
+                    "common.items.cheese",
+                    "common.items.potion_minor",
+                    "common.items.weapons.starter_sword",
+                    "common.items.weapons.starter_axe",
+                    "common.items.weapons.starter_hammer",
+                    "common.items.weapons.starter_bow",
+                    "common.items.weapons.starter_staff",
+                ]
+                .choose(&mut rand::thread_rng())
+                .unwrap(), // Can't fail
+            )),
             _ => None,
         }
     }