summaryrefslogtreecommitdiff
path: root/plugins/cursecheck.cpp
diff options
context:
space:
mode:
authorRobert Heinrich2012-03-25 12:11:00 +0200
committerRobert Heinrich2012-03-25 12:11:00 +0200
commit96064da6baa545ef31f586ff4b1c997c04bcb9a9 (patch)
tree35ee92fa88a397cfa53e1c05e5c2155905aaaae3 /plugins/cursecheck.cpp
parentb790909950f3c3f00a19928c964095cbfc41156e (diff)
downloaddfhack-96064da6baa545ef31f586ff4b1c997c04bcb9a9.tar.gz
dfhack-96064da6baa545ef31f586ff4b1c997c04bcb9a9.tar.bz2
dfhack-96064da6baa545ef31f586ff4b1c997c04bcb9a9.tar.xz
remove cursedump, use api instead
Diffstat (limited to 'plugins/cursecheck.cpp')
-rw-r--r--plugins/cursecheck.cpp78
1 files changed, 5 insertions, 73 deletions
diff --git a/plugins/cursecheck.cpp b/plugins/cursecheck.cpp
index 0116521a..7551fc68 100644
--- a/plugins/cursecheck.cpp
+++ b/plugins/cursecheck.cpp
@@ -125,13 +125,13 @@ void setUnitNickname(df::unit *unit, const std::string &nick)
}
}
-void cursedump (color_ostream &out, df::unit * unit);
-
std::string determineCurse(df::unit * unit)
{
string cursetype = "unknown";
// ghosts: ghostly, duh
+ // as of DF 34.05 and higher vampire ghosts and the like should not be possible
+ // if they get reintroduced later it will become necessary to watch 'ghostly' seperately
if(unit->flags3.bits.ghostly)
cursetype = "ghost";
@@ -287,7 +287,9 @@ command_result cursecheck (color_ostream &out, vector <string> & parameters)
// dump all curse flags on demand
if (verbose)
{
- cursedump(out, unit);
+ out << "Curse flags: "
+ << bitfield_to_string(unit->curse.add_tags1) << endl
+ << bitfield_to_string(unit->curse.add_tags2) << endl;
}
}
}
@@ -300,73 +302,3 @@ command_result cursecheck (color_ostream &out, vector <string> & parameters)
return CR_OK;
}
-
-void cursedump (color_ostream &out, df::unit * unit)
-{
- out << "Curse flags: ";
- if(unit->curse.add_tags1.bits.BLOODSUCKER)
- out << "bloodsucker ";
- if(unit->curse.add_tags1.bits.EXTRAVISION)
- out << "extravision ";
- if(unit->curse.add_tags1.bits.OPPOSED_TO_LIFE)
- out << "opposed_to_life ";
- if(unit->curse.add_tags1.bits.NOT_LIVING)
- out << "not_living ";
- if(unit->curse.add_tags1.bits.NOEXERT)
- out << "noexpert ";
- if(unit->curse.add_tags1.bits.NOPAIN)
- out << "nopain ";
- if(unit->curse.add_tags1.bits.NOBREATHE)
- out << "nobreathe ";
- if(unit->curse.add_tags1.bits.HAS_BLOOD)
- out << "has_blood ";
- if(unit->curse.add_tags1.bits.NOSTUN)
- out << "nostun ";
- if(unit->curse.add_tags1.bits.NONAUSEA)
- out << "nonausea ";
- if(unit->curse.add_tags1.bits.NO_DIZZINESS)
- out << "no_dizziness ";
- if(unit->curse.add_tags1.bits.TRANCES)
- out << "trances ";
- if(unit->curse.add_tags1.bits.NOEMOTION)
- out << "noemotion ";
- if(unit->curse.add_tags1.bits.PARALYZEIMMUNE)
- out << "paralyzeimmune ";
- if(unit->curse.add_tags1.bits.NOFEAR)
- out << "nofear ";
- if(unit->curse.add_tags1.bits.NO_EAT)
- out << "no_eat ";
- if(unit->curse.add_tags1.bits.NO_DRINK)
- out << "no_drink ";
- if(unit->curse.add_tags1.bits.MISCHIEVOUS)
- out << "mischievous ";
- if(unit->curse.add_tags1.bits.NO_PHYS_ATT_GAIN)
- out << "no_phys_att_gain ";
- if(unit->curse.add_tags1.bits.NO_PHYS_ATT_RUST)
- out << "no_phys_att_rust ";
- if(unit->curse.add_tags1.bits.NOTHOUGHT)
- out << "nothought ";
- if(unit->curse.add_tags1.bits.NO_THOUGHT_CENTER_FOR_MOVEMENT)
- out << "no_thought_center_for_movement ";
- if(unit->curse.add_tags1.bits.CAN_SPEAK)
- out << "can_speak ";
- if(unit->curse.add_tags1.bits.CAN_LEARN)
- out << "can_learn ";
- if(unit->curse.add_tags1.bits.CRAZED)
- out << "crazed ";
- if(unit->curse.add_tags1.bits.BLOODSUCKER)
- out << "bloodsucker ";
- if(unit->curse.add_tags1.bits.SUPERNATURAL)
- out << "supernatural ";
-
- if(unit->curse.add_tags2.bits.NO_AGING)
- out << "no_aging ";
- if(unit->curse.add_tags2.bits.STERILE)
- out << "sterile ";
- if(unit->curse.add_tags2.bits.FIT_FOR_ANIMATION)
- out << "fit_for_animation ";
- if(unit->curse.add_tags2.bits.FIT_FOR_RESURRECTION)
- out << "fit_for_resurrection ";
-
- out << endl << endl;
-} \ No newline at end of file