summaryrefslogtreecommitdiff
path: root/plugins/showmood.cpp
diff options
context:
space:
mode:
authorQuietust2012-05-25 21:31:47 -0500
committerQuietust2012-05-25 21:31:47 -0500
commit800cbca578a08dd7bc70441ecd5a01a380bd7118 (patch)
tree76a244414c452949b7b2144674930f58cfd1bc79 /plugins/showmood.cpp
parentae41ddc04a2b3a076bd18af984f163e46c74b65f (diff)
downloaddfhack-800cbca578a08dd7bc70441ecd5a01a380bd7118.tar.gz
dfhack-800cbca578a08dd7bc70441ecd5a01a380bd7118.tar.bz2
dfhack-800cbca578a08dd7bc70441ecd5a01a380bd7118.tar.xz
Some improvements to showmood - show relevant skill, cleanup messages
Diffstat (limited to 'plugins/showmood.cpp')
-rw-r--r--plugins/showmood.cpp36
1 files changed, 22 insertions, 14 deletions
diff --git a/plugins/showmood.cpp b/plugins/showmood.cpp
index 7407e6af..7926e2ac 100644
--- a/plugins/showmood.cpp
+++ b/plugins/showmood.cpp
@@ -100,37 +100,37 @@ command_result df_showmood (color_ostream &out, vector <string> & parameters)
switch (job->job_type)
{
case job_type::StrangeMoodCrafter:
- out.print("become a Craftsdwarf (or Engraver)");
+ out.print("claim a Craftsdwarf's Workshop");
break;
case job_type::StrangeMoodJeweller:
- out.print("become a Jeweler");
+ out.print("claim a Jeweler's Workshop");
break;
case job_type::StrangeMoodForge:
- out.print("become a Metalworker");
+ out.print("claim a Metalsmith's Forge");
break;
case job_type::StrangeMoodMagmaForge:
- out.print("become a Metalworker using a Magma Forge");
+ out.print("claim a Magma Forge");
break;
case job_type::StrangeMoodCarpenter:
- out.print("become a Carpenter");
+ out.print("claim a Carpenter's Workshop");
break;
case job_type::StrangeMoodMason:
- out.print("become a Mason (or Miner)");
+ out.print("claim a Mason's Workshop");
break;
case job_type::StrangeMoodBowyer:
- out.print("become a Bowyer");
+ out.print("claim a Boywer's Workshop");
break;
case job_type::StrangeMoodTanner:
- out.print("become a Leatherworker (or Tanner)");
+ out.print("claim a Leather Works");
break;
case job_type::StrangeMoodWeaver:
- out.print("become a Clothier (or Weaver)");
+ out.print("claim a Clothier's Shop");
break;
case job_type::StrangeMoodGlassmaker:
- out.print("become a Glassmaker");
+ out.print("claim a Glass Furnace");
break;
case job_type::StrangeMoodMechanics:
- out.print("become a Mechanic");
+ out.print("claim a Mechanic's Workshop");
break;
case job_type::StrangeMoodBrooding:
out.print("enter a macabre mood?");
@@ -142,20 +142,28 @@ command_result df_showmood (color_ostream &out, vector <string> & parameters)
out.print("do something else...");
break;
}
+ out.print(" and become a legendary %s", ENUM_ATTR_STR(job_skill, caption_noun, unit->job.mood_skill));
+ if (unit->mood == mood_type::Possessed)
+ out.print(" (but not really)");
break;
-
default:
out.print("insane?");
break;
}
+ out.print(".\n");
+ if (unit->sex)
+ out.print("He has ");
+ else
+ out.print("She has ");
if (building)
{
string name;
building->getName(&name);
- out.print(" and has claimed a %s\n", name.c_str());
+ out.print("claimed a %s and wants", name.c_str());
}
else
- out.print(" and has not yet claimed a workshop\n");
+ out.print("not yet claimed a workshop but will want");
+ out.print(" the following items:\n");
for (size_t i = 0; i < job->job_items.size(); i++)
{