Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of github.com:wesnoth/wesnoth
- Loading branch information
Showing
36 changed files
with
1,213 additions
and
1,348 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,61 +1,92 @@ | ||
| local H = wesnoth.require "lua/helper.lua" | ||
| local AH = wesnoth.require "ai/lua/ai_helper.lua" | ||
| local LS = wesnoth.require "lua/location_set.lua" | ||
|
|
||
| local ca_messenger_escort_move = {} | ||
|
|
||
| local messenger_next_waypoint = wesnoth.require "ai/micro_ais/cas/ca_messenger_f_next_waypoint.lua" | ||
|
|
||
| function ca_messenger_escort_move:evaluation(ai, cfg) | ||
| -- Move escort units close to messenger, and in between messenger and enemies | ||
| -- The messenger has moved at this time, so we don't need to exclude him | ||
| -- But we check that he exist (not for this scenario, but for others) | ||
| local messenger = wesnoth.get_units{ side = wesnoth.current.side, id = cfg.id }[1] | ||
| if (not messenger) then return 0 end | ||
| -- Move escort units close to messengers, and in between messengers and enemies | ||
| -- The messengers have moved at this time, so we don't need to exclude them, | ||
| -- but we check that there are messengers left | ||
|
|
||
| local my_units = wesnoth.get_units{ side = wesnoth.current.side, formula = '$this_unit.moves > 0' } | ||
| local my_units = wesnoth.get_units { | ||
| side = wesnoth.current.side, | ||
| formula = '$this_unit.moves > 0', | ||
| { "and", cfg.filter_second } | ||
| } | ||
| if (not my_units[1]) then return 0 end | ||
|
|
||
| if my_units[1] then | ||
| return cfg.ca_score | ||
| end | ||
| return 0 | ||
| local _, _, _, messengers = messenger_next_waypoint(cfg) | ||
| if (not messengers) or (not messengers[1]) then return 0 end | ||
|
|
||
| return cfg.ca_score | ||
| end | ||
|
|
||
| function ca_messenger_escort_move:execution(ai, cfg) | ||
| local messenger = wesnoth.get_units{ id = cfg.id }[1] | ||
| local my_units = wesnoth.get_units{ side = wesnoth.current.side, formula = '$this_unit.moves > 0' } | ||
|
|
||
| -- Simply move units one at a time | ||
| local next_unit = my_units[1] | ||
| local reach = LS.of_pairs(wesnoth.find_reach(next_unit)) | ||
| local my_units = wesnoth.get_units { | ||
| side = wesnoth.current.side, | ||
| formula = '$this_unit.moves > 0', | ||
| { "and", cfg.filter_second } | ||
| } | ||
|
|
||
| -- Distance from messenger for each hex the unit can reach | ||
| local dist_messenger = AH.distance_map({messenger}, reach) | ||
| local _, _, _, messengers = messenger_next_waypoint(cfg) | ||
|
|
||
| local enemies = wesnoth.get_units { | ||
| { "filter_side", {{"enemy_of", {side = wesnoth.current.side} }} } | ||
| } | ||
|
|
||
| -- Rating (in the end, we pick the _minimum _rating): | ||
| -- 1. Minimize distance from enemies | ||
| local rating = AH.distance_map(enemies, reach) | ||
| -- 2. This one favors hexes in between messenger and enemies | ||
| rating:union_merge(dist_messenger, function(x, y, v1, v2) | ||
| return v1 + v2*#enemies | ||
| end) | ||
| -- 3. Strongly prefer hexes close to the messenger | ||
| rating:union_merge(dist_messenger, function(x, y, v1, v2) | ||
| return v1 + v2^2 | ||
| end) | ||
| --AH.put_labels(rating) | ||
|
|
||
| -- Now find hex with minimum value that is unoccupied | ||
| min_rating, best_hex = 9e99, {} | ||
| rating:iter(function(x, y, r) | ||
| local unit_in_way = wesnoth.get_units{ x = x, y = y, { "not", { id = next_unit.id } } }[1] | ||
| if (not unit_in_way) and (r < min_rating) then | ||
| min_rating, best_hex = r, { x, y } | ||
| end | ||
| end) | ||
| -- and move the unit there | ||
| AH.movefull_stopunit(ai, next_unit, best_hex) | ||
| local base_rating_map = LS.create() | ||
| local max_rating, best_unit, best_hex = -9e99 | ||
| for _,unit in ipairs(my_units) do | ||
| -- Only considering hexes unoccupied by other units is good enough for this | ||
| local reach_map = AH.get_reachable_unocc(unit) | ||
|
|
||
| -- Minor rating for the fastest and strongest unit to go first | ||
| local unit_rating = unit.max_moves / 100. + unit.hitpoints / 1000. | ||
|
|
||
| reach_map:iter( function(x, y, v) | ||
| -- base rating only needs to be calculated once for each hex | ||
| local base_rating = base_rating_map:get(x, y) | ||
|
|
||
| if (not base_rating) then | ||
| base_rating = 0 | ||
|
|
||
| -- Distance from messenger is most important; only closest messenger counts for this | ||
| -- Give somewhat of a bonus for the messenger that has moved the most through the waypoints | ||
| local max_messenger_rating = -9e99 | ||
| for _,m in ipairs(messengers) do | ||
| local messenger_rating = 1. / (H.distance_between(x, y, m.x, m.y) + 2.) | ||
| messenger_rating = messenger_rating * 10. * (1. + m.variables.wp_rating * 2.) | ||
|
|
||
| if (messenger_rating > max_messenger_rating) then | ||
| max_messenger_rating = messenger_rating | ||
| end | ||
| end | ||
| base_rating = base_rating + max_messenger_rating | ||
|
|
||
| -- Distance from (sum of) enemies is important too | ||
| -- This favors placing escort units between the messenger and close enemies | ||
| for _,e in ipairs(enemies) do | ||
| base_rating = base_rating + 1. / (H.distance_between(x, y, e.x, e.y) + 2.) | ||
| end | ||
|
|
||
| base_rating_map:insert(x, y, base_rating) | ||
| end | ||
|
|
||
| local rating = base_rating + unit_rating | ||
|
|
||
| if (rating > max_rating) then | ||
| max_rating = rating | ||
| best_unit, best_hex = unit, { x, y } | ||
| end | ||
| end) | ||
| end | ||
| --AH.put_labels(base_rating_map) | ||
|
|
||
| -- This will always find at least the hex the unit is on -> no check necessary | ||
| AH.movefull_stopunit(ai, best_unit, best_hex) | ||
| end | ||
|
|
||
| return ca_messenger_escort_move |
Oops, something went wrong.