0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix hitpoints and leadership bugs

Browse source
This commit is contained in:
Dominic Bolin 2006-04-09 17:57:28 +00:00
parent dc5ac4ed52
commit 707a814d96
2 changed files with 33 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/unit.cpp
View file

@ -816,11 +816,6 @@ const std::vector<std::string>& unit::overlays() const
void unit::read(const config& cfg)
{
cfg_ = cfg;
if(cfg["id"]=="") {
id_ = cfg["type"];
} else {
id_ = cfg["id"];
}
side_ = lexical_cast_default<int>(cfg["side"]);
if(side_ <= 0) {
side_ = 1;
@ -917,6 +912,7 @@ void unit::read(const config& cfg)
cfg_.remove_child("modifications",0);
}
id_ = "";
if(cfg["type"] != "") {
wassert(gamedata_ != NULL);
std::map<std::string,unit_type>::const_iterator i = gamedata_->unit_types.find(cfg["type"]);
@ -935,9 +931,28 @@ void unit::read(const config& cfg)
movement_ = 0;
}
}
if(cfg["id"]=="") {
id_ = cfg["type"];
} else {
id_ = cfg["id"];
}
if(cfg["max_hitpoints"] != "") {
max_hit_points_ = lexical_cast_default<int>(cfg["max_hitpoints"]);
}
if(cfg["max_moves"] != "") {
max_movement_ = lexical_cast_default<int>(cfg["max_moves"]);
}
if(cfg["max_experience"] != "") {
max_experience_ = lexical_cast_default<int>(cfg["max_experience"]);
}
for(config::const_child_itors range = cfg.child_range("attack");
range.first != range.second; ++range.first) {
attacks_.push_back(attack_type(**range.first,id(),image_fighting((**range.first)["range"] == "ranged" ? attack_type::LONG_RANGE : attack_type::SHORT_RANGE)));
}
if(cfg_["type"] == "") {
backup_state();
apply_modifications();
}
if(cfg["hitpoints"] != "") {
hit_points_ = lexical_cast_default<int>(cfg["hitpoints"]);
} else {
@ -952,13 +967,7 @@ void unit::read(const config& cfg)
movement_ = 0;
}
}
if(cfg["max_moves"] != "") {
max_movement_ = lexical_cast_default<int>(cfg["max_moves"]);
}
experience_ = lexical_cast_default<int>(cfg["experience"]);
if(cfg["max_experience"] != "") {
max_experience_ = lexical_cast_default<int>(cfg["max_experience"]);
}
resting_ = (cfg["resting"] == "yes");
unrenamable_ = (cfg["unrenamable"] == "yes");
if(cfg["alignment"]=="lawful") {
@ -970,10 +979,6 @@ void unit::read(const config& cfg)
} else if(cfg["type"]=="") {
alignment_ = unit_type::NEUTRAL;
}
for(config::const_child_itors range = cfg.child_range("attack");
range.first != range.second; ++range.first) {
attacks_.push_back(attack_type(**range.first,id(),image_fighting((**range.first)["range"] == "ranged" ? attack_type::LONG_RANGE : attack_type::SHORT_RANGE)));
}
const config::child_list& defends = cfg_.get_children("defend");
for(config::child_list::const_iterator d = defends.begin(); d != defends.end(); ++d) {
defensive_animations_.push_back(defensive_animation(**d));
@ -1012,10 +1017,6 @@ void unit::read(const config& cfg)
movement_animations_.push_back(movement_animation(absolute_image()));
// always have a movement animation
}
if(cfg_["type"] == "") {
backup_state();
}
apply_modifications();
traits_description_ = cfg["traits_description"];
if(cfg["random_traits"] == "yes") {
generate_traits();

33
src/unit_abilities.cpp
View file

@ -117,9 +117,9 @@ bool unit::get_ability_bool(const std::string& ability, const gamemap::location&
if(adj_abilities) {
const config::child_list& list = adj_abilities->get_children(ability);
for(config::child_list::const_iterator j = list.begin(); j != list.end(); ++j) {
if(((**j)["affect_allies"]=="yes" && !(*teams_)[side()-1].is_enemy(it->second.side()))
|| ((**j)["affect_enemies"]=="yes" && (*teams_)[side()-1].is_enemy(it->second.side())) &&
ability_active(ability,**j,loc) && ability_affects_adjacent(ability,**j,i,loc)) {
if((((**j)["affect_allies"]=="yes" && !(*teams_)[side()-1].is_enemy(it->second.side()))
|| ((**j)["affect_enemies"]=="yes" && (*teams_)[side()-1].is_enemy(it->second.side()))) &&
it->second.ability_active(ability,**j,adjacent[i]) && ability_affects_adjacent(ability,**j,i,loc)) {
return true;
}
}
@ -140,6 +140,7 @@ unit_ability_list unit::get_abilities(const std::string& ability, const gamemap:
for(config::child_list::const_iterator i = list.begin(); i != list.end(); ++i) {
if(ability_active(ability,**i,loc) && ability_affects_self(ability,**i,loc)) {
res.cfgs.push_back(std::pair<config*,gamemap::location>(*i,loc));
std::cerr << id() << " has " << ability << "\n";
}
}
}
@ -155,9 +156,9 @@ unit_ability_list unit::get_abilities(const std::string& ability, const gamemap:
if(adj_abilities) {
const config::child_list& list = adj_abilities->get_children(ability);
for(config::child_list::const_iterator j = list.begin(); j != list.end(); ++j) {
if(((**j)["affect_allies"]=="yes" && !(*teams_)[side()-1].is_enemy(it->second.side()))
|| ((**j)["affect_enemies"]=="yes" && (*teams_)[side()-1].is_enemy(it->second.side())) &&
ability_active(ability,**j,loc) && ability_affects_adjacent(ability,**j,i,loc)) {
if((((**j)["affect_allies"]=="yes" && !(*teams_)[side()-1].is_enemy(it->second.side()))
|| ((**j)["affect_enemies"]=="yes" && (*teams_)[side()-1].is_enemy(it->second.side()))) &&
it->second.ability_active(ability,**j,adjacent[i]) && ability_affects_adjacent(ability,**j,i,loc)) {
res.cfgs.push_back(std::pair<config*,gamemap::location>(*j,adjacent[i]));
}
}
@ -227,9 +228,9 @@ std::vector<std::string> unit::ability_tooltips(const gamemap::location& loc) co
if(((**j)["affect_allies"]=="yes" && !(*teams_)[side()-1].is_enemy(it->second.side()))
|| ((**j)["affect_enemies"]=="yes" && (*teams_)[side()-1].is_enemy(it->second.side()))) {
const config* adj_desc = (*j)->child("adjacent_description");
if(ability_affects_adjacent(k->first,**j,i,loc)) {
if(ability_affects_adjacent(k->first,**j,i,adjacent[i])) {
if(!adj_desc) {
if(ability_active(k->first,**j,loc)) {
if(it->second.ability_active(k->first,**j,loc)) {
if((**j)["name"] != "") {
res.push_back((**j)["name"].str());
res.push_back((**j)["description"].str());
@ -241,7 +242,7 @@ std::vector<std::string> unit::ability_tooltips(const gamemap::location& loc) co
}
}
} else {
if(ability_active(k->first,**j,loc)) {
if(it->second.ability_active(k->first,**j,loc)) {
if((*adj_desc)["name"] != "") {
res.push_back((*adj_desc)["name"].str());
res.push_back((*adj_desc)["description"].str());
@ -357,26 +358,18 @@ bool unit::ability_active(const std::string& ability,const config& cfg,const gam
*/
bool unit::ability_affects_adjacent(const std::string& ability,const config& cfg,int dir,const gamemap::location& loc) const
{
// wassert("not done" == "done");
wassert(dir >=0 && dir <= 5);
static const std::string adjacent_names[6] = {"n","ne","se","s","sw","nw"};
const config::child_list& affect_adj = cfg.get_children("affect_adjacent");
bool passed = false;
for(config::child_list::const_iterator i = affect_adj.begin(); i != affect_adj.end(); ++i) {
std::vector<std::string> dirs = utils::split((**i)["adjacent"]);
if(std::find(dirs.begin(),dirs.end(),adjacent_names[dir]) != dirs.end()) {
if((*i)->child("filter") != NULL) {
if(matches_filter(*(*i)->child("filter"),loc,ability=="illuminates")) {
passed = true;
} else {
return false;
}
} else {
passed = true;
if((*i)->child("filter") != NULL && !matches_filter(*(*i)->child("filter"),loc,ability=="illuminates")) {
return false;
}
}
}
return passed;
return true;
}
/*
*