upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-08 00:36:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Made it so that if several [advancefrom] tags for a certain base unit...

Browse Source 
...are encountered, the lowest experience= keys from these is chosen
(so if there's only one [advancefrom] referencing this base unit the
experience needed can be increased).
This commit is contained in:
Anonymissimus 2010-10-29 22:27:35 +00:00
parent d972ec2432
commit 4173caf1c3
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/unit_types.cpp
View File

@ -578,6 +578,7 @@ unit_type::unit_type(const unit_type& o) :
hide_help_(o.hide_help_),
advances_to_(o.advances_to_),
experience_needed_(o.experience_needed_),
in_advancefrom_(o.in_advancefrom_),
alignment_(o.alignment_),
movementType_(o.movementType_),
possibleTraits_(o.possibleTraits_),
@ -623,6 +624,7 @@ unit_type::unit_type(config &cfg) :
hide_help_(false),
advances_to_(),
experience_needed_(0),
in_advancefrom_(false),
alignment_(),
movementType_(),
possibleTraits_(),
@ -1025,9 +1027,17 @@ void unit_type::add_advancement(const unit_type &to_unit,int xp)
return;
}
if( xp > 0 && experience_needed_ > xp){
DBG_UT << "Lowering experience_needed from " << experience_needed_ << " to " << xp << " due to [advancefrom] of " << to_id << "\n";
experience_needed_ = xp;
if(xp > 0) {
//xp is 0 in case experience= wasn't given.
if(!in_advancefrom_) {
//This function is called for and only for an [advancefrom] tag in a unit_type referencing this unit_type.
in_advancefrom_ = true;
experience_needed_ = xp;
}
else if(experience_needed_ > xp) {
experience_needed_ = xp;
}
DBG_UT << "Changing experience_needed from " << experience_needed_ << " to " << xp << " due to [advancefrom] of " << to_id << "\n";
}
// Add advancements to gendered subtypes, if supported by to_unit

1
src/unit_types.hpp
View File

@ -326,6 +326,7 @@ private:
std::vector<std::string> advances_to_;
int experience_needed_;
bool in_advancefrom_;
ALIGNMENT alignment_;