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

Merge branch 'master' of https://github.com/wesnoth/wesnoth

Browse source
This commit is contained in:
Chris Beck 2014-11-21 22:46:51 -05:00
commit db7643c253
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelog
View file

@ -12,6 +12,7 @@ Version 1.13.0-dev:
[filter_second] and invert_order= [filter_second] and invert_order=
* Coward Micro AI: new optional key attack_if_trapped= * Coward Micro AI: new optional key attack_if_trapped=
* Stationed Guardian Micro AI: make guard_x/y= optional keys * Stationed Guardian Micro AI: make guard_x/y= optional keys
* Stationed Guardian Micro AI: bug fix for unreachable stations
* Messenger Escort Micro AI: bug fix for escort units blocking messenger's * Messenger Escort Micro AI: bug fix for escort units blocking messenger's
progress progress
* Lurkers Micro AI: fix bug in wander terrain selection * Lurkers Micro AI: fix bug in wander terrain selection
@ -410,7 +411,7 @@ Version 1.13.0-dev:
* Image path function ~ADJUST_ALPHA added. Takes either a % or an 8-bit integer, and "multiplies" * Image path function ~ADJUST_ALPHA added. Takes either a % or an 8-bit integer, and "multiplies"
the alpha channel by this. the alpha channel by this.
* Multiplayer server can now handle scenarios with more than 9 sides * Multiplayer server can now handle scenarios with more than 9 sides
* [modify_side] controller= now works in networked mp. If a null-controlled side becomes alive by * [modify_side] controller= now works in networked mp. If a null-controlled side becomes alive by
[modify_side] controller=ai/human then the currently active client will be assiged controll [modify_side] controller=ai/human then the currently active client will be assiged controll
Version 1.11.11: Version 1.11.11:

4
data/ai/micro_ais/cas/ca_stationed_guardian.lua
View file

@ -97,6 +97,10 @@ function ca_stationed_guardian:execution(ai, cfg)
-- If no enemy is within the target zone, move toward station position -- If no enemy is within the target zone, move toward station position
else else
local nh = AH.next_hop(guardian, cfg.station_x, cfg.station_y) local nh = AH.next_hop(guardian, cfg.station_x, cfg.station_y)
if not nh then
nh = { guardian.x, guardian.y }
end
AH.movefull_stopunit(ai, guardian, nh) AH.movefull_stopunit(ai, guardian, nh)
end end