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

Made defense_weight work again for values > 0

Browse source 
Here how it works when we choose a defensive weapon :

- find the maximum defense weight for this range

- find the minimum simple rating = weight * cth * number of blows *
damage per blow (takes in account the bonuses and resistances)
Eligible weapons for defense have simple rating >= this minimum.

This can be optimized...
This commit is contained in:
Benoît Timbert 2007-06-02 22:18:47 +00:00
parent e1461968e9
commit a3f9b965b8
2 changed files with 36 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog
View file

@ -14,6 +14,7 @@ Version 1.3.3+svn:
* empty user_description now remains empty unless generate_description set (bug 8522).
* set_variable has the key time=stamp now, to get a timestamp in milliseconds
* move some terrain masks definition in [game_config]
* made defense_weight work again for values > 0
* user interface:
* fixed a lag in the path rendering when there is a lot of units
* maps smaller than the screen are now shown centered on the screen

36
src/actions.cpp
View file

@ -309,6 +309,35 @@ int battle_context::choose_defender_weapon(const unit &attacker, const unit &def
return -1;
if (choices.size() == 1)
return choices[0];
// Multiple options: first pass : get the best weight and the minimum simple rating for this weight
// simple rating = number of blows * damage per blows (resistance taken in account) * cth * weight
// elligible attacks for defense should have a simple rating greater or equal to this weight
double max_weight = 0.0;
int min_rating = 0;
for (i = 0; i < choices.size(); i++) {
const attack_type &def = defender.attacks()[choices[i]];
if (def.defense_weight() > max_weight) {
max_weight = def.defense_weight();
unit_stats *def_stats = new unit_stats(defender, defender_loc, choices[i], false,
attacker, attacker_loc, &att,
units, teams, status, map, gamedata);
min_rating = (int) (def_stats->num_blows * def_stats->damage * def_stats->chance_to_hit * def.defense_weight());
delete def_stats;
}
else if (def.defense_weight() == max_weight) {
unit_stats *def_stats = new unit_stats(defender, defender_loc, choices[i], false,
attacker, attacker_loc, &att,
units, teams, status, map, gamedata);
int simple_rating = (int) (def_stats->num_blows * def_stats->damage *
def_stats->chance_to_hit * def.defense_weight());
if (simple_rating < min_rating )
min_rating = simple_rating;
delete def_stats;
}
}
// Multiple options: simulate them, save best.
for (i = 0; i < choices.size(); i++) {
@ -324,7 +353,12 @@ int battle_context::choose_defender_weapon(const unit &attacker, const unit &def
combatant *def_comb = new combatant(*def_stats, prev_def);
att_comb->fight(*def_comb);
if (!attacker_combatant_ || better_combat(*def_comb, *att_comb, *defender_combatant_, *attacker_combatant_, 1.0)) {
int simple_rating = (int) (def_stats->num_blows * def_stats->damage *
def_stats->chance_to_hit * def.defense_weight());
if (simple_rating >= min_rating &&
( !attacker_combatant_ || better_combat(*def_comb, *att_comb, *defender_combatant_, *attacker_combatant_, 1.0) )
) {
delete attacker_combatant_;
delete defender_combatant_;
delete attacker_stats_;