[crawl-ref-commits] master branch updated: 0.34-a0-415-ge651354df7

[<gi...@cr...>]

       via  e651354df72fb8b8eaa7a33573c72fa5609f3e87 (commit)
       via  121333a4858df1ce365f23b1bf5226c9d313503d (commit)
       via  be495c2c6edfba6b5aca60a025466e7477332faf (commit)
      from  725f2bf89b83c88494685919e5542142a45bd49e (commit)

-----------------------------------------------------------------------
commit e651354df72fb8b8eaa7a33573c72fa5609f3e87
Author: DracoOmega <dra...@gm...>
Date:   Sun Jul 20 19:05:24 2025 -0230

    Fix outdated description for Sac Drink/Words (Oneirical)

commit 121333a4858df1ce365f23b1bf5226c9d313503d
Author: DracoOmega <dra...@gm...>
Date:   Sun Jul 20 19:04:37 2025 -0230

    Fix broken colour tag on % screen while ostracised (Oneirical)

commit be495c2c6edfba6b5aca60a025466e7477332faf
Author: DracoOmega <dra...@gm...>
Date:   Sun Jul 20 19:03:55 2025 -0230

    Don't prevent dropping unequippable gear (dilly)

-----------------------------------------------------------------------

Summary of changes:
 crawl-ref/source/dat/descript/ability.txt |  4 ++--
 crawl-ref/source/invent.cc                |  2 +-
 crawl-ref/source/output.cc                | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/crawl-ref/source/dat/descript/ability.txt b/crawl-ref/source/dat/descript/ability.txt
index aaeb21e644..053a0d47c5 100644
--- a/crawl-ref/source/dat/descript/ability.txt
+++ b/crawl-ref/source/dat/descript/ability.txt
@@ -817,11 +817,11 @@ Sacrifices purity of body or mind, causing a single mutation.
 %%%%
 Sacrifice Words ability
 
-Sacrifices the ability to use magical scrolls after being injured.
+Sacrifices the ability to use magical scrolls unless badly injured.
 %%%%
 Sacrifice Drink ability
 
-Sacrifices the ability to drink potions after being injured.
+Sacrifices the ability to drink potions unless badly injured.
 %%%%
 Sacrifice Essence ability
 
diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc
index 0b5db0ab03..bcb71c3c9c 100644
--- a/crawl-ref/source/invent.cc
+++ b/crawl-ref/source/invent.cc
@@ -1409,7 +1409,7 @@ bool item_is_selected(const item_def &i, int selector)
         return i.base_type == OBJ_JEWELLERY || i.base_type == OBJ_TALISMANS;
 
     case OSEL_GEAR:
-        return item_is_selected(i, OSEL_EQUIPABLE)
+        return inventory_category_for(i) == INVENT_GEAR
                 || i.base_type == OBJ_MISSILES;
 
     default:
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index 9a6f127cc5..09bb09c692 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -403,7 +403,7 @@ static void _nowrap_eol_cprintf_touchui(const char *format, ...)
 #endif
 
 static string _god_powers();
-static formatted_string _god_asterisks(bool leading_space = false);
+static string _god_asterisks(bool leading_space = false);
 static int _god_status_colour(int default_colour);
 
 // Colour for captions like 'Health:', 'Str:', etc.
@@ -1509,7 +1509,7 @@ static void _redraw_title()
         god += you_worship(GOD_JIYVA) ? god_name_jiyva(true)
                                       : god_name(you.religion);
         NOWRAP_EOL_CPRINTF("%s", god.c_str());
-        formatted_string piety = _god_asterisks(true);
+        formatted_string piety = formatted_string::parse_string(_god_asterisks(true));
         textcolour(_god_status_colour(YELLOW));
         const unsigned int textwidth = (unsigned int)(strwidth(species) + strwidth(god) + strwidth(piety) + 1);
         if (small_layout)
@@ -2249,17 +2249,17 @@ static string _god_powers()
         return colour_string(name, _god_status_colour(god_colour(you.religion)));
 
     return colour_string(chop_string(name, 20, false)
-              + " [" + _god_asterisks().to_colour_string() + "]",
+              + " [" + _god_asterisks() + "]",
               _god_status_colour(god_colour(you.religion)));
 }
 
-static formatted_string _god_asterisks(bool leading_space)
+static string _god_asterisks(bool leading_space)
 {
     if (you_worship(GOD_NO_GOD))
-        return formatted_string("");
+        return "";
 
     if (you_worship(GOD_GOZAG))
-        return formatted_string("");
+        return "";
 
     string str;
     if (you_worship(GOD_XOM))
@@ -2289,7 +2289,7 @@ static formatted_string _god_asterisks(bool leading_space)
             str = string(prank, '*') + string(NUM_PIETY_STARS - prank, '.');
     }
 
-    return formatted_string::parse_string((leading_space ? " " : "") + str);
+    return make_stringf("%s%s", leading_space ? " " : "", str.c_str());
 }
 
 /**


-- 
Dungeon Crawl Stone Soup