MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some improvements to showmood - show relevant skill, cleanup messages

develop
Quietust 2012-05-25 21:31:47 -05:00
parent ae41ddc04a
commit 800cbca578
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
plugins/showmood.cpp
Unescape Escape View File

@ -100,37 +100,37 @@ command_result df_showmood (color_ostream &out, vector <string> & parameters)
switch (job->job_type) switch (job->job_type)
{ {
case job_type::StrangeMoodCrafter: case job_type::StrangeMoodCrafter:
out.print("become a Craftsdwarf (or Engraver)"); out.print("claim a Craftsdwarf's Workshop");
break; break;
case job_type::StrangeMoodJeweller: case job_type::StrangeMoodJeweller:
out.print("become a Jeweler"); out.print("claim a Jeweler's Workshop");
break; break;
case job_type::StrangeMoodForge: case job_type::StrangeMoodForge:
out.print("become a Metalworker"); out.print("claim a Metalsmith's Forge");
break; break;
case job_type::StrangeMoodMagmaForge: case job_type::StrangeMoodMagmaForge:
out.print("become a Metalworker using a Magma Forge"); out.print("claim a Magma Forge");
break; break;
case job_type::StrangeMoodCarpenter: case job_type::StrangeMoodCarpenter:
out.print("become a Carpenter"); out.print("claim a Carpenter's Workshop");
break; break;
case job_type::StrangeMoodMason: case job_type::StrangeMoodMason:
out.print("become a Mason (or Miner)"); out.print("claim a Mason's Workshop");
break; break;
case job_type::StrangeMoodBowyer: case job_type::StrangeMoodBowyer:
out.print("become a Bowyer"); out.print("claim a Boywer's Workshop");
break; break;
case job_type::StrangeMoodTanner: case job_type::StrangeMoodTanner:
out.print("become a Leatherworker (or Tanner)"); out.print("claim a Leather Works");
break; break;
case job_type::StrangeMoodWeaver: case job_type::StrangeMoodWeaver:
out.print("become a Clothier (or Weaver)"); out.print("claim a Clothier's Shop");
break; break;
case job_type::StrangeMoodGlassmaker: case job_type::StrangeMoodGlassmaker:
out.print("become a Glassmaker"); out.print("claim a Glass Furnace");
break; break;
case job_type::StrangeMoodMechanics: case job_type::StrangeMoodMechanics:
out.print("become a Mechanic"); out.print("claim a Mechanic's Workshop");
break; break;
case job_type::StrangeMoodBrooding: case job_type::StrangeMoodBrooding:
out.print("enter a macabre mood?"); 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..."); out.print("do something else...");
break; 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; break;
default: default:
out.print("insane?"); out.print("insane?");
break; break;
} }
out.print(".\n");
if (unit->sex)
out.print("He has ");
else
out.print("She has ");
if (building) if (building)
{ {
string name; string name;
building->getName(&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 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++) for (size_t i = 0; i < job->job_items.size(); i++)
{ {