upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-18 05:15:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

help: link base and overlay terrains in terrain help pages (#9456)

Browse Source
This commit is contained in:
Subhraman Sarkar 2025-02-23 16:21:55 +05:30 committed by Charles Dang
parent 20c1692c8c
commit 55c7b474b4
3 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/dialogs/help_browser.cpp
View File

@ -17,32 +17,19 @@
#include "gui/dialogs/help_browser.hpp"
#include "game_config_manager.hpp"
#include "gui/widgets/button.hpp"
#include "gui/widgets/image.hpp"
#include "gui/widgets/label.hpp"
#include "gui/widgets/rich_label.hpp"
#include "gui/widgets/scroll_label.hpp"
#include "gui/widgets/scrollbar_panel.hpp"
#include "gui/widgets/settings.hpp"
#include "gui/widgets/text_box.hpp"
#include "gui/widgets/toggle_button.hpp"
#include "gui/widgets/tree_view.hpp"
#include "gui/widgets/tree_view_node.hpp"
#include "gui/widgets/window.hpp"
#include "log.hpp"
#include "video.hpp"
#ifdef GUI2_EXPERIMENTAL_LISTBOX
#include "gui/widgets/list.hpp"
#else
#include "gui/widgets/listbox.hpp"
#endif
#include "help/help.hpp"
#include "help/help_impl.hpp"
#include "font/pango/escape.hpp"
#include "font/pango/hyperlink.hpp"
namespace gui2::dialogs
{
@ -137,6 +124,7 @@ tree_view_node& help_browser::add_topic(const std::string& topic_id, const std::
return new_node;
}
void help_browser::show_topic(std::string topic_id, bool add_to_history)
{
if(topic_id.empty()) {

40
src/help/help_topic_generators.cpp
View File

@ -96,11 +96,19 @@ static std::string format_mp_entry(const int cost, const int max_cost) {
typedef t_translation::ter_list::const_iterator ter_iter;
// Gets an english description of a terrain ter_list alias behavior: "Best of cave, hills", "Worst of Swamp, Forest" etc.
static std::string print_behavior_description(const ter_iter& start, const ter_iter& end, const std::shared_ptr<terrain_type_data> & tdata, bool first_level = true, bool begin_best = true)
static std::string print_behavior_description(
const ter_iter& start,
const ter_iter& end,
const std::shared_ptr<terrain_type_data>& tdata,
bool first_level = true,
bool begin_best = true)
{
if (start == end) return "";
if (*start == t_translation::MINUS || *start == t_translation::PLUS) return print_behavior_description(start+1, end, tdata, first_level, *start == t_translation::PLUS); //absorb any leading mode changes by calling again, with a new default value begin_best.
if (*start == t_translation::MINUS || *start == t_translation::PLUS) {
//absorb any leading mode changes by calling again, with a new default value begin_best.
return print_behavior_description(start+1, end, tdata, first_level, *start == t_translation::PLUS);
}
utils::optional<ter_iter> last_change_pos;
@ -176,10 +184,9 @@ std::string terrain_topic_generator::operator()() const {
ss << markup::img(type_.editor_image()) << markup::br;
}
ss << "\n";
if (!type_.help_topic_text().empty()) {
ss << "\n" << type_.help_topic_text().str() << "\n";
} else {
ss << "\n";
ss << type_.help_topic_text().str() << "\n";
}
std::shared_ptr<terrain_type_data> tdata = load_terrain_types_data();
@ -189,6 +196,19 @@ std::string terrain_topic_generator::operator()() const {
return ss.str();
}
if (type_.is_combined()) {
ss << "Base terrain: ";
const auto base_t = tdata->get_terrain_info(
t_translation::terrain_code(type_.number().base, t_translation::NO_LAYER));
ss << markup::make_link(base_t.editor_name(), terrain_prefix + base_t.id());
ss << ", ";
ss << "Overlay terrain: ";
const auto overlay_t = tdata->get_terrain_info(
t_translation::terrain_code(t_translation::NO_LAYER, type_.number().overlay));
ss << markup::make_link(overlay_t.editor_name(), (overlay_t.hide_help() ? "." : "") + terrain_prefix + overlay_t.id());
ss << "\n";
}
// Special notes are generated from the terrain's properties - at the moment there's no way for WML authors
// to add their own via a [special_note] tag.
std::vector<std::string> special_notes;
@ -244,11 +264,8 @@ std::string terrain_topic_generator::operator()() const {
const terrain_type& base = tdata->get_terrain_info(type_.default_base());
symbols.clear();
if (base.is_indivisible()) {
symbols["type"] = markup::make_link(base.editor_name(), ".." + terrain_prefix + base.id());
} else {
symbols["type"] = markup::make_link(base.editor_name(), terrain_prefix + base.id());
}
symbols["type"] = markup::make_link(base.editor_name(),
(base.is_indivisible() ? ".." : "") + terrain_prefix + base.id());
// TRANSLATORS: In the help for a terrain type, for example Dwarven Village is often placed on Cave Floor
ss << "\n" << VGETTEXT("Typical base terrain: $type", symbols);
}
@ -277,6 +294,7 @@ std::string terrain_topic_generator::operator()() const {
ss << "Overlay: " << (type_.is_overlay() ? "Yes" : "No") << "\n";
ss << "Combined: " << (type_.is_combined() ? "Yes" : "No") << "\n";
ss << "Nonnull: " << (type_.is_nonnull() ? "Yes" : "No") << "\n";
ss << "Terrain string: " << type_.number() << "\n";
@ -811,7 +829,7 @@ std::string unit_topic_generator::operator()() const {
}
// Add movement table rows
for(const terrain_movement_info &m : terrain_moves)
for(const terrain_movement_info& m : terrain_moves)
{
std::stringstream().swap(row_ss);
bool high_res = false;

7
src/terrain/terrain.hpp
View File

@ -126,8 +126,11 @@ public:
* \todo unclear what this should mean, so replace it with a clearly-named
* successor.
*/
bool is_nonnull() const { return (number_ != t_translation::NONE_TERRAIN) &&
(number_ != t_translation::VOID_TERRAIN ); }
bool is_nonnull() const {
return (number_ != t_translation::NONE_TERRAIN)
&& (number_ != t_translation::VOID_TERRAIN);
}
/** Returns the light (lawful) bonus for this terrain when the time of day gives a @a base bonus. */
int light_bonus(int base) const
{