[wesnoth-commits] [wesnoth/wesnoth] 4a3ddf: Refactor handling of allies in UtBS. Resolves #6158.

[Wedge009]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 4a3ddfb1430ce715e0ffbb519aef1c4592db3575
      https://github.com/wesnoth/wesnoth/commit/4a3ddfb1430ce715e0ffbb519aef1c4592db3575
  Author: Wedge009 <wedge009 at wedge009.net>
  Date:   2021-11-17 (Wed, 17 Nov 2021)

  Changed paths:
    M data/campaigns/Under_the_Burning_Suns/scenarios/07a_Dealing_with_Dwarves.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/07b_Talking_with_Trolls.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/10_Speaking_with_the_Fishes.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/11_Battle_for_Zocthanol_Isle.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/12_The_Final_Confrontation.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/13_Epilogue.cfg
    M data/campaigns/Under_the_Burning_Suns/utils/dialog-macros.cfg

  Log Message:
  -----------
  Refactor handling of allies in UtBS. Resolves #6158.

With four potential allies in the campaign, there is a lot of dialogue duplication. This refactoring attempts to consolidate the text.
Additionally, the ally ID was recorded in the variable ally_name which can be confusing, so rename it to ally_id instead.


  Commit: 541f0a1e73c45a8e58237e3a635d8d3bcbe1305a
      https://github.com/wesnoth/wesnoth/commit/541f0a1e73c45a8e58237e3a635d8d3bcbe1305a
  Author: Wedge009 <wedge009 at wedge009.net>
  Date:   2021-11-17 (Wed, 17 Nov 2021)

  Changed paths:
    M data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/10_Speaking_with_the_Fishes.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/11_Battle_for_Zocthanol_Isle.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/12_The_Final_Confrontation.cfg

  Log Message:
  -----------
  Add po hints where self-referential troll names have been replaced with variables.

[ci skip]


Compare: https://github.com/wesnoth/wesnoth/compare/508c9406f1b8...541f0a1e73c4