Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactored code for readability

Browse Source
This commit is contained in:
scorpion9979 2019-06-03 12:21:38 +03:00
parent 50acaf0ae1
commit da01e797a3
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/src/npc.rs
View File

@ -1,6 +1,7 @@
use rand::seq::SliceRandom; use rand::seq::SliceRandom;
use serde_json; use serde_json;
use std::fs::File; use std::fs::File;
use std::io::Error;
pub enum NpcKind { pub enum NpcKind {
Wolf, Wolf,
@ -16,11 +17,14 @@ impl NpcKind {
} }
} }
const npc_names_dir: &str = "common/assets/npc_names.json";
pub fn get_npc_name(npc_type: NpcKind) -> String { pub fn get_npc_name(npc_type: NpcKind) -> String {
let file = File::open("common/assets/npc_names.json").expect("file should open read only"); let npc_names_file =
let json: serde_json::Value = File::open(npc_names_dir).expect(&format!("opening {} in read-only mode", npc_names_dir));
serde_json::from_reader(file).expect("file should be proper JSON"); let npc_names_json: serde_json::Value = serde_json::from_reader(npc_names_file)
let npc_names = json .expect(&format!("reading json contents from {}", npc_names_dir));
let npc_names = npc_names_json
.get(npc_type.as_str()) .get(npc_type.as_str())
.expect("accessing json using NPC type provided as key") .expect("accessing json using NPC type provided as key")
.as_array() .as_array()