summaryrefslogtreecommitdiff
path: root/src/squelch
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2016-10-05 18:45:08 +0200
committerBardur Arantsson <bardur@scientician.net>2016-10-05 18:49:37 +0200
commit765e1a3dc7abce3a849b8d1f124ada7a6984154a (patch)
tree0a4530d2091f05b70638f2eb833ae9b7238e4927 /src/squelch
parent5869c5622e4345ffd50e0713d188f2d283b61caa (diff)
Move s_{info,descriptors} to Game/GameEdtiData
Diffstat (limited to 'src/squelch')
-rw-r--r--src/squelch/condition.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/squelch/condition.cc b/src/squelch/condition.cc
index 09535c53..8715b364 100644
--- a/src/squelch/condition.cc
+++ b/src/squelch/condition.cc
@@ -806,6 +806,8 @@ std::shared_ptr<Condition> SkillCondition::from_json(jsoncons::json const &j)
void SkillCondition::write_tree(TreePrinter *p, Cursor *, uint8_t ecol, uint8_t bcol) const
{
+ auto const &s_descriptors = game->edit_data.s_descriptors;
+
p->write(ecol, "Your skill in ");
p->write(bcol, s_descriptors[m_skill_idx].name);
p->write(ecol, " is from ");
@@ -817,6 +819,8 @@ void SkillCondition::write_tree(TreePrinter *p, Cursor *, uint8_t ecol, uint8_t
void SkillCondition::to_json(jsoncons::json &j) const
{
+ auto const &s_descriptors = game->edit_data.s_descriptors;
+
j["name"] = s_descriptors[m_skill_idx].name;
j["min"] = m_min;
j["max"] = m_max;