[wesnoth-commits] [wesnoth/wesnoth] 3772e6: Fix [modify_unit] optimized path producing an erro...

Celtic Minstrel noreply at github.com
Sat Nov 16 03:39:28 UTC 2019 

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 3772e633fae7e87146534eb781b2ab9dfec69486
      https://github.com/wesnoth/wesnoth/commit/3772e633fae7e87146534eb781b2ab9dfec69486
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2019-11-15 (Fri, 15 Nov 2019)

  Changed paths:
    M data/lua/wml/modify_unit.lua
    M src/scripting/game_lua_kernel.cpp

  Log Message:
  -----------
  Fix [modify_unit] optimized path producing an error on a recall list unit

Addresses #4556


  Commit: 4dc986f0280ddde3c3a5ac0466aaa82d54f8fa64
      https://github.com/wesnoth/wesnoth/commit/4dc986f0280ddde3c3a5ac0466aaa82d54f8fa64
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2019-11-15 (Fri, 15 Nov 2019)

  Changed paths:
    M changelog.md
    M data/lua/core.lua
    M src/scripting/game_lua_kernel.cpp
    M src/scripting/lua_unit.cpp

  Log Message:
  -----------
  Lua: Flip functions moved to the units module

This means that they are now added to the units module by default in C++, and only duplicated to the Wesnoth module in Lua.

Some additional functions were moved:
- wesnoth.create_unit -> wesnoth.units.create
- wesnoth.get_units -> wesnoth.units.find
- wesnoth.get_unit -> wesnoth.units.get

Deprecated wesnoth.get_recall_units in favour of wesnoth.get_units, which has gained the ability to match units on the recall list if x="recall" or y="recall" appears in the filter at toplevel.

The wesnoth.units module now acts like a metatable for unit userdata, meaning that any functions (or attributes) added to the module will be visible through any unit.


  Commit: 977f05d77f4b0f94a18118ad6738920d52fc8bed
      https://github.com/wesnoth/wesnoth/commit/977f05d77f4b0f94a18118ad6738920d52fc8bed
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2019-11-15 (Fri, 15 Nov 2019)

  Changed paths:
    M data/ai/lua/ai_helper.lua
    M data/ai/lua/battle_calcs.lua
    M data/ai/lua/ca_castle_switch.lua
    M data/ai/lua/ca_grab_villages.lua
    M data/ai/lua/ca_high_xp_attack.lua
    M data/ai/lua/ca_spread_poison.lua
    M data/ai/lua/generic_recruit_engine.lua
    M data/ai/lua/patrol.lua
    M data/ai/lua/retreat.lua
    M data/ai/micro_ais/cas/ca_assassin_move.lua
    M data/ai/micro_ais/cas/ca_big_animals.lua
    M data/ai/micro_ais/cas/ca_bottleneck_move.lua
    M data/ai/micro_ais/cas/ca_coward.lua
    M data/ai/micro_ais/cas/ca_fast_attack_utils.lua
    M data/ai/micro_ais/cas/ca_fast_combat.lua
    M data/ai/micro_ais/cas/ca_fast_combat_leader.lua
    M data/ai/micro_ais/cas/ca_fast_move.lua
    M data/ai/micro_ais/cas/ca_forest_animals_move.lua
    M data/ai/micro_ais/cas/ca_forest_animals_new_rabbit.lua
    M data/ai/micro_ais/cas/ca_forest_animals_tusker_attack.lua
    M data/ai/micro_ais/cas/ca_forest_animals_tusklet_move.lua
    M data/ai/micro_ais/cas/ca_goto.lua
    M data/ai/micro_ais/cas/ca_hang_out.lua
    M data/ai/micro_ais/cas/ca_healer_move.lua
    M data/ai/micro_ais/cas/ca_herding_attack_close_enemy.lua
    M data/ai/micro_ais/cas/ca_herding_herd_sheep.lua
    M data/ai/micro_ais/cas/ca_herding_sheep_move.lua
    M data/ai/micro_ais/cas/ca_herding_sheep_runs_dog.lua
    M data/ai/micro_ais/cas/ca_hunter.lua
    M data/ai/micro_ais/cas/ca_messenger_attack.lua
    M data/ai/micro_ais/cas/ca_messenger_f_next_waypoint.lua
    M data/ai/micro_ais/cas/ca_messenger_move.lua
    M data/ai/micro_ais/cas/ca_protect_unit_attack.lua
    M data/ai/micro_ais/cas/ca_protect_unit_move.lua
    M data/ai/micro_ais/cas/ca_recruit_random.lua
    M data/ai/micro_ais/cas/ca_simple_attack.lua
    M data/ai/micro_ais/cas/ca_stationed_guardian.lua
    M data/ai/micro_ais/cas/ca_swarm_move.lua
    M data/ai/micro_ais/cas/ca_wolves_multipacks_attack.lua
    M data/ai/micro_ais/cas/ca_wolves_multipacks_functions.lua
    M data/ai/micro_ais/cas/ca_wolves_multipacks_wander.lua
    M data/ai/micro_ais/cas/ca_zone_guardian.lua
    M data/ai/micro_ais/engines/urudin_engine.lua
    M data/ai/micro_ais/mai-defs/animals.lua
    M data/ai/micro_ais/micro_ai_helper.lua
    M data/campaigns/Delfadors_Memoirs/utils/sides.cfg
    M data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg
    M data/campaigns/Eastern_Invasion/ai/ca_ogres_flee.lua
    M data/campaigns/Eastern_Invasion/lua/bandits.lua
    M data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
    M data/campaigns/Legend_of_Wesmere/lua/wml_tags.lua
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg
    M data/campaigns/Northern_Rebirth/scenarios/05b_Compelled.cfg
    M data/campaigns/Northern_Rebirth/scenarios/09b_Judgment.cfg
    M data/campaigns/Secrets_of_the_Ancients/utils/sota-utils.cfg
    M data/campaigns/Son_Of_The_Black_Eye/ai/ca_transport_S6.lua
    M data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg
    M data/campaigns/The_Hammer_of_Thursagan/lua/spawns.lua
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/05_Fear.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/ai/ca_aggressive_attack_no_suicide.lua
    M data/campaigns/Two_Brothers/ai/ca_muff_toras_move.lua
    M data/campaigns/Under_the_Burning_Suns/utils/garak-abilities.cfg
    M data/campaigns/Wings_of_Victory/lua/lua.lua
    M data/campaigns/tutorial/lua/character_selection.lua
    M data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg
    M data/lua/core.lua
    M data/lua/feeding.lua
    M data/lua/wml-tags.lua
    M data/lua/wml/animate_unit.lua
    M data/lua/wml/find_path.lua
    M data/lua/wml/harm_unit.lua
    M data/lua/wml/heal_unit.lua
    M data/lua/wml/kill.lua
    M data/lua/wml/message.lua
    M data/lua/wml/modify_unit.lua
    M data/lua/wml/move_unit.lua
    M data/lua/wml/object.lua
    M data/lua/wml/role.lua
    M data/multiplayer/eras.lua
    M data/multiplayer/scenarios/2p_Dark_Forecast.lua
    M data/scenario-test.cfg
    M src/scripting/game_lua_kernel.cpp
    M src/scripting/game_lua_kernel.hpp

  Log Message:
  -----------
  Lua: Replace uses of deprecated (moved) unit functions

Also backtracked the removal of wesnoth.get_recall_units, which is now available as wesnoth.units.find_on_recall - it's just more convenient than passing x=recall to wesnoth.units.find


  Commit: 6a87f5d48dcee98670c54e47256975d23a79c0db
      https://github.com/wesnoth/wesnoth/commit/6a87f5d48dcee98670c54e47256975d23a79c0db
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2019-11-15 (Fri, 15 Nov 2019)

  Changed paths:
    M data/lua/core.lua
    M src/scripting/game_lua_kernel.cpp

  Log Message:
  -----------
  Remove Lua implementation of wesnoth.units.find_on_recall

Since there's already a native C++ version we might as well just use it.


  Commit: aaa2dc4ecebd8bbc4cce55baf8c8eae33e16fa81
      https://github.com/wesnoth/wesnoth/commit/aaa2dc4ecebd8bbc4cce55baf8c8eae33e16fa81
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2019-11-15 (Fri, 15 Nov 2019)

  Changed paths:
    M changelog.md
    M data/ai/lua/ai_helper.lua
    M data/ai/lua/battle_calcs.lua
    M data/ai/lua/ca_castle_switch.lua
    M data/ai/lua/generic_recruit_engine.lua
    M data/ai/lua/patrol.lua
    M data/ai/micro_ais/cas/ca_assassin_move.lua
    M data/ai/micro_ais/cas/ca_bottleneck_move.lua
    M data/ai/micro_ais/cas/ca_fast_attack_utils.lua
    M data/ai/micro_ais/cas/ca_fast_move.lua
    M data/ai/micro_ais/cas/ca_forest_animals_move.lua
    M data/ai/micro_ais/cas/ca_forest_animals_new_rabbit.lua
    M data/ai/micro_ais/cas/ca_forest_animals_tusker_attack.lua
    M data/ai/micro_ais/cas/ca_forest_animals_tusklet_move.lua
    M data/ai/micro_ais/cas/ca_hang_out.lua
    M data/ai/micro_ais/cas/ca_healer_move.lua
    M data/ai/micro_ais/cas/ca_herding_attack_close_enemy.lua
    M data/ai/micro_ais/cas/ca_herding_herd_sheep.lua
    M data/ai/micro_ais/cas/ca_herding_sheep_runs_dog.lua
    M data/ai/micro_ais/cas/ca_messenger_f_next_waypoint.lua
    M data/ai/micro_ais/cas/ca_protect_unit_move.lua
    M data/ai/micro_ais/cas/ca_recruit_random.lua
    M data/ai/micro_ais/cas/ca_swarm_move.lua
    M data/ai/micro_ais/cas/ca_wolves_multipacks_attack.lua
    M data/ai/micro_ais/cas/ca_wolves_multipacks_functions.lua
    M data/ai/micro_ais/engines/urudin_engine.lua
    M data/ai/micro_ais/micro_ai_helper.lua
    M data/campaigns/Delfadors_Memoirs/utils/sides.cfg
    M data/campaigns/Eastern_Invasion/ai/ca_ogres_flee.lua
    M data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg
    M data/campaigns/Northern_Rebirth/scenarios/05b_Compelled.cfg
    M data/campaigns/Northern_Rebirth/scenarios/09b_Judgment.cfg
    M data/campaigns/Secrets_of_the_Ancients/utils/sota-utils.cfg
    M data/campaigns/Son_Of_The_Black_Eye/ai/ca_transport_S6.lua
    M data/campaigns/Two_Brothers/ai/ca_muff_toras_move.lua
    M data/campaigns/Under_the_Burning_Suns/utils/garak-abilities.cfg
    M data/campaigns/Wings_of_Victory/lua/lua.lua
    M data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg
    M data/lua/core.lua
    M data/lua/wml-tags.lua
    M data/lua/wml/animate_unit.lua
    M data/lua/wml/find_path.lua
    M data/lua/wml/harm_unit.lua
    M data/lua/wml/heal_unit.lua
    M data/lua/wml/kill.lua
    M data/lua/wml/message.lua
    M data/lua/wml/modify_unit.lua
    M data/lua/wml/move_unit.lua
    M data/lua/wml/object.lua
    M data/lua/wml/role.lua
    M data/multiplayer/eras.lua
    M data/multiplayer/scenarios/2p_Dark_Forecast.lua
    M data/scenario-test.cfg
    M src/scripting/game_lua_kernel.cpp

  Log Message:
  -----------
  Rollback possibility of wesnoth.get_units matching recall list units

Now it's renamed to wesnoth.units.find_on_map.

wesnoth.units.find implements the case of finding units on either the map or a recall list.


  Commit: 18df2fd91087292914a726f29220aa92411181ec
      https://github.com/wesnoth/wesnoth/commit/18df2fd91087292914a726f29220aa92411181ec
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2019-11-15 (Fri, 15 Nov 2019)

  Changed paths:
    M src/scripting/game_lua_kernel.cpp

  Log Message:
  -----------
  Make the attacker argument to wesnoth.units.resistance optional


Compare: https://github.com/wesnoth/wesnoth/compare/9a34cbb32911...18df2fd91087

More information about the Commits mailing list