Fix species description in encyclopedia

freeorion · Jul 1, 2023 · 276f8d4 · 276f8d4
1 parent 81ed9d0
commit 276f8d4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/parse/EffectPythonParser.cpp b/parse/EffectPythonParser.cpp
@@ -144,9 +144,8 @@ namespace {
     effect_group_wrapper insert_effects_group_(const py::tuple& args, const py::dict& kw) {
         auto scope = py::extract<condition_wrapper>(kw["scope"])();
         int priority = 100;
-        if (kw.has_key("priority")) {
+        if (kw.has_key("priority"))
             priority = py::extract<int>(kw["priority"])();
-        }
 
         std::vector<std::unique_ptr<Effect::Effect>> effects;
         auto effects_args = py::extract<py::list>(kw["effects"]);
@@ -159,9 +158,8 @@ namespace {
         }
 
         std::string stackinggroup;
-        if (kw.has_key("stackinggroup")) {
+        if (kw.has_key("stackinggroup"))
             stackinggroup = py::extract<std::string>(kw["stackinggroup"])();
-        }
 
         std::unique_ptr<Condition::Condition> activation;
         if (kw.has_key("activation")) {
@@ -173,18 +171,20 @@ namespace {
         }
 
         std::string accountinglabel;
-        if (kw.has_key("accountinglabel")) {
+        if (kw.has_key("accountinglabel"))
             accountinglabel = py::extract<std::string>(kw["accountinglabel"])();
-        }
-        // ToDo: implement other arguments later
+
+        std::string description;
+        if (kw.has_key("description"))
+            description = py::extract<std::string>(kw["description"])();
 
         return effect_group_wrapper(std::make_shared<Effect::EffectsGroup>(ValueRef::CloneUnique(scope.condition),
                                                       std::move(activation),
                                                       std::move(effects),
                                                       std::move(accountinglabel),
                                                       std::move(stackinggroup),
                                                       priority,
-                                                      "",
+                                                      std::move(description),
                                                       ""));
     }
 

diff --git a/test/parse/TestPythonParser.cpp b/test/parse/TestPythonParser.cpp
@@ -282,7 +282,7 @@ BOOST_AUTO_TEST_CASE(parse_species) {
         BOOST_TEST_MESSAGE("Dump " << species.Name() << ":");
         BOOST_TEST_MESSAGE(species.Dump(0));
 
-        BOOST_REQUIRE_EQUAL(4486670, species.GetCheckSum());
+        BOOST_REQUIRE_EQUAL(4493747, species.GetCheckSum());
 
         const Species test_species{"SP_ABADDONI",
             "SP_ABADDONI_DESC",

diff --git a/universe/Effects.cpp b/universe/Effects.cpp
@@ -307,6 +307,8 @@ std::string EffectsGroup::Dump(uint8_t ntabs) const {
     if (!m_content_name.empty())
         retval += " // from " + m_content_name;
     retval += "\n";
+    if (!m_description.empty())
+        retval += DumpIndent(ntabs+1) + "description = \"" + m_description + "\"\n";
     retval += DumpIndent(ntabs+1) + "scope =\n";
     retval += m_scope->Dump(ntabs+2);
     if (m_activation) {