From 11ac600300691ad32307b40412712e6210635a19 Mon Sep 17 00:00:00 2001 From: ntr Date: Thu, 8 Aug 2019 21:07:02 +1000 Subject: [PATCH] names' --- WORKLOG.md | 1 + client/src/components/skill.btn.jsx | 2 ++ server/src/names.rs | 11 +++++++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/WORKLOG.md b/WORKLOG.md index 86352437..1d9bca15 100644 --- a/WORKLOG.md +++ b/WORKLOG.md @@ -4,6 +4,7 @@ * serde serialize privatise * stripe prod * mobile styles +* info fix * account page * graphs n shit * acp init diff --git a/client/src/components/skill.btn.jsx b/client/src/components/skill.btn.jsx index 95eeddb6..56a7f654 100644 --- a/client/src/components/skill.btn.jsx +++ b/client/src/components/skill.btn.jsx @@ -35,6 +35,8 @@ function Skill(props) { setActiveSkill, } = props; + if (!game) return false; + const s = construct.skills[i]; const ko = construct.green_life.value === 0 ? 'ko' : ''; diff --git a/server/src/names.rs b/server/src/names.rs index a85cff65..49849d2c 100644 --- a/server/src/names.rs +++ b/server/src/names.rs @@ -1,7 +1,7 @@ use rand::prelude::*; use rand::{thread_rng}; -const FIRSTS: [&'static str; 44] = [ +const FIRSTS: [&'static str; 47] = [ "artificial", "ambient", "borean", @@ -16,8 +16,10 @@ const FIRSTS: [&'static str; 44] = [ "deserted", "emotive", "emotionless", + "elliptical", "fierce", "fossilised", + "frozen", "inverted", "leafy", "lurking", @@ -41,6 +43,7 @@ const FIRSTS: [&'static str; 44] = [ "rogue", "subversive", "subterranean", + "supercooled", "subsonic", "synthetic", "sweet", @@ -48,7 +51,7 @@ const FIRSTS: [&'static str; 44] = [ "weary", ]; -const LASTS: [&'static str; 48] = [ +const LASTS: [&'static str; 52] = [ "artifact", "assembly", "carbon", @@ -61,6 +64,7 @@ const LASTS: [&'static str; 48] = [ "detector", "energy", "entropy", + "exomorph", "foilage", "forest", "form", @@ -78,13 +82,16 @@ const LASTS: [&'static str; 48] = [ "nectar", "oak", "oxide", + "orbit", "pattern", "plant", + "planet", "poseidon", "problem", "receiver", "replicant", "river", + "satellite", "scaffold", "structure", "shape",