[wesnoth-commits] [wesnoth/wesnoth] 5525c3: Simplify the description of leadership (#6117)

Wed Nov 10 02:49:00 UTC 2021

  Branch: refs/heads/1.16
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 5525c39477a7edd693070f2978a388943641a0a8
      https://github.com/wesnoth/wesnoth/commit/5525c39477a7edd693070f2978a388943641a0a8
  Author: Discontinuum <68666085+Discontinuum at users.noreply.github.com>
  Date:   2021-11-10 (Wed, 10 Nov 2021)

  Changed paths:
    M data/core/macros/abilities.cfg

  Log Message:
  -----------
  Simplify the description of leadership (#6117)

(cherry picked from commit 36a610603e5f86abad4e589f1bb352dcf2fd4413)

  Commit: 6c48867062ed181f8c21cc876347291f1ce492e3
      https://github.com/wesnoth/wesnoth/commit/6c48867062ed181f8c21cc876347291f1ce492e3
  Author: Alexander Lacson <41433185+max-torch at users.noreply.github.com>
  Date:   2021-11-10 (Wed, 10 Nov 2021)

  Changed paths:
    M data/campaigns/Secrets_of_the_Ancients/scenarios/10_Merfolk_Revenge.cfg
    M data/campaigns/Secrets_of_the_Ancients/scenarios/11_Battleground.cfg
    M data/campaigns/Secrets_of_the_Ancients/scenarios/13_Together_Again.cfg
    M data/campaigns/Secrets_of_the_Ancients/scenarios/14_Entering_the_Northlands.cfg
    M data/campaigns/Secrets_of_the_Ancients/scenarios/15_Mountain_Pass.cfg
    M data/campaigns/Secrets_of_the_Ancients/scenarios/18_Abandoned_Outpost.cfg
    M data/campaigns/Secrets_of_the_Ancients/scenarios/19_Lava_and_Stone.cfg

  Log Message:
  -----------
  Sota proofread (#6136)

Only proofreading. No major edits to tone, meaning or dialog. The `wmlxgettext` module was used so that no text would be overlooked.

(cherry picked from commit dd3baa488150bfc8d8cd0105da9083009cb29ca0)

  Commit: b0988d3c8b70a6e52f7f3809b9ea8b45b7451693
      https://github.com/wesnoth/wesnoth/commit/b0988d3c8b70a6e52f7f3809b9ea8b45b7451693
  Author: Alexander Lacson <41433185+max-torch at users.noreply.github.com>
  Date:   2021-11-10 (Wed, 10 Nov 2021)

  Changed paths:
    M data/campaigns/Dead_Water/scenarios/01_Invasion.cfg
    M data/campaigns/Dead_Water/scenarios/02_Flight.cfg
    M data/campaigns/Dead_Water/scenarios/04_Slavers.cfg
    M data/campaigns/Dead_Water/scenarios/05_Tirigaz.cfg
    M data/campaigns/Dead_Water/scenarios/08_Talking_to_Tyegea.cfg
    M data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg
    M data/campaigns/Dead_Water/scenarios/12_Revenge.cfg
    M data/campaigns/Dead_Water/utils/items.cfg

  Log Message:
  -----------
  Dead Water Proofread Pass (#6139)

DW: proofread text
(cherry picked from commit c3a852cef88b92f2f13227be85b8cc7988671c08)

  Commit: 36807dd6d66c3b25f61d2ae4562cc6d66f15ea6d
      https://github.com/wesnoth/wesnoth/commit/36807dd6d66c3b25f61d2ae4562cc6d66f15ea6d
  Author: max-torch <lacsonalexanderz at gmail.com>
  Date:   2021-11-10 (Wed, 10 Nov 2021)

  Changed paths:
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/01_A_Summer_of_Storms.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_Swamp_of_Esten.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/06_Temple_in_the_Deep.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/07_Return_to_Oldwood.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/08_Clearwater_Port.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/09_Fallen_Lich_Point.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/11_Southbay_in_Winter.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/16_The_Kalian.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/18_A_Spy_in_the_Woods.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/21_The_Plan.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/23_Epilogue.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Leader.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Outcast.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/utils/trow-nlmsg.cfg

  Log Message:
  -----------
  TRoW Proofread Pass

For the campaign The Rise of Wesnoth. For Approval. Minor edits and proofreads. `wmlxgettext` was used so as to ensure all text was reviewed.

(cherry picked from commit ef932b939f156cd08f9beb7a114ba0780b226304)

  Commit: a2449b833a4c7bf4e2d072ea65fabb24f25e8471
      https://github.com/wesnoth/wesnoth/commit/a2449b833a4c7bf4e2d072ea65fabb24f25e8471
  Author: max-torch <lacsonalexanderz at gmail.com>
  Date:   2021-11-10 (Wed, 10 Nov 2021)

  Changed paths:
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/06_Temple_in_the_Deep.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/08_Clearwater_Port.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/09_Fallen_Lich_Point.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/11_Southbay_in_Winter.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/16_The_Kalian.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Leader.cfg

  Log Message:
  -----------
  TroW Proofread Pass Second Draft

Second Draft of ef932b939f1.

(cherry picked from commit a4cd9d4aa7480d4b4e6284b76f8246b3db197c65)

  Commit: 3784b83c767d01288c31433f28bc1aed4e465e0d
      https://github.com/wesnoth/wesnoth/commit/3784b83c767d01288c31433f28bc1aed4e465e0d
  Author: max-torch <lacsonalexanderz at gmail.com>
  Date:   2021-11-10 (Wed, 10 Nov 2021)

  Changed paths:
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/01_A_Summer_of_Storms.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Leader.cfg

  Log Message:
  -----------
  TRoW Proofread Pass Third Draft

In response to concerns in #6143.

(cherry picked from commit 1ee5b511a1d4977aedd77707315cc14fe5293ade)

  Commit: f1302144cd2ab197ba95b8ebd57cf1cff42f6447
      https://github.com/wesnoth/wesnoth/commit/f1302144cd2ab197ba95b8ebd57cf1cff42f6447
  Author: max-torch <lacsonalexanderz at gmail.com>
  Date:   2021-11-10 (Wed, 10 Nov 2021)

  Changed paths:
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/21_The_Plan.cfg

  Log Message:
  -----------
  Update 21_The_Plan.cfg

Restoring to original without comma. To satisfy requested change in pull request.

(cherry picked from commit e24f1beaaab05c9837e42a8028f83f365c011a33)

  Commit: ed4f6dea7830eec23e714dfaf4285d142e4ad61d
      https://github.com/wesnoth/wesnoth/commit/ed4f6dea7830eec23e714dfaf4285d142e4ad61d
  Author: Alexander Lacson <41433185+max-torch at users.noreply.github.com>
  Date:   2021-11-10 (Wed, 10 Nov 2021)

  Changed paths:
    M data/campaigns/Sceptre_of_Fire/scenarios/2t_In_the_Dwarven_City.cfg

  Log Message:
  -----------
  Reference SotA in SoF, closes #6151 (#6152)

SoF: Add a reference to SotA North Knalga in Sceptre of Fire. (fix #6151)
(cherry picked from commit e49b5c7b0e18944bbcc6e21339e2269ec29dff26)

  Commit: f9a959481c89c1faebb6374939805b6d67432160
      https://github.com/wesnoth/wesnoth/commit/f9a959481c89c1faebb6374939805b6d67432160
  Author: Alexander Lacson <41433185+max-torch at users.noreply.github.com>
  Date:   2021-11-10 (Wed, 10 Nov 2021)

  Changed paths:
    M data/core/terrain.cfg

  Log Message:
  -----------
  Improve help entry of "Mountains" terrain. Resolves #5906 (#6163)

Improve help entry of "Mountains" terrain. (fix #5906)

(cherry picked from commit 8a98519f9d685c8f081422a914f0c2b65a742da0)

  Commit: 0277d7bd7bc54e50ee29474621a9599e20d5a6ee
      https://github.com/wesnoth/wesnoth/commit/0277d7bd7bc54e50ee29474621a9599e20d5a6ee
  Author: Alexander Lacson <41433185+max-torch at users.noreply.github.com>
  Date:   2021-11-10 (Wed, 10 Nov 2021)

  Changed paths:
    M data/campaigns/Secrets_of_the_Ancients/scenarios/02_Dark_Business.cfg
    M data/campaigns/Secrets_of_the_Ancients/scenarios/04_Becalmed.cfg
    M data/campaigns/Secrets_of_the_Ancients/scenarios/06_Following_the_Shadow.cfg

  Log Message:
  -----------
  SotA clarifications and prose edits. (#6168)

* SotA S6 Provide better tomato surprise hint. (fix #6120)

* SotA S2 Add objective note about guardhouse. (fix #6121)

* SotA S4 Add objective note. (fix #6123)

(cherry picked from commit 750d5457e0092757f9c73267243ea163c5a36ac7)

  Commit: 36749ca6fa5c04309647b3d84d904d4798f26c42
      https://github.com/wesnoth/wesnoth/commit/36749ca6fa5c04309647b3d84d904d4798f26c42
  Author: Alexander Lacson <41433185+max-torch at users.noreply.github.com>
  Date:   2021-11-10 (Wed, 10 Nov 2021)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/01_Overture.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/02_This_Valley_Belongs_to_Me.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/03_The_Road_to_Weldyn.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/04_Leollyn.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/05_Council_in_Weldyn.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/06_Swamps_of_Illuven.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/08_Ur_Thorodor.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/09_Houses_of_the_Undead.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/11_Wasteland.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/12_Terror_at_the_Ford_of_Parthyn.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/13_The_Return_of_Trouble.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/14_Shadows.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/15_Save_the_King.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/16_Dark_Sky_Over_Weldyn.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/17_A_New_Ally.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/18_The_Portal_of_Doom.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/19_Showdown_in_the_Northern_Swamp.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/20_Prince_of_Wesnoth.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/21_Clash_at_the_Manor.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/22_Face_of_the_Enemy.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/23_Epilogue.cfg
    M data/campaigns/Delfadors_Memoirs/utils/deaths.cfg
    M data/campaigns/Delfadors_Memoirs/utils/items.cfg

  Log Message:
  -----------
  DM: Proofread Pass (#6178)

(cherry picked from commit b5bda6ca992cc34565c93cc88b8b35bb9c9688fd)

  Commit: d5d518665bb642d085c18e2e8cd9502fcd9fcebe
      https://github.com/wesnoth/wesnoth/commit/d5d518665bb642d085c18e2e8cd9502fcd9fcebe
  Author: Alexander Lacson <41433185+max-torch at users.noreply.github.com>
  Date:   2021-11-10 (Wed, 10 Nov 2021)

  Changed paths:
    M data/campaigns/tutorial/_main.cfg
    M data/campaigns/tutorial/gui/character_selection.cfg
    M data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg
    M data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg

  Log Message:
  -----------
  Tutorial: Suggested Proofread Edits (#6179)

(cherry picked from commit 8ca8bc08b18c6bc2b6040fdd7d27574f8e50d468)

  Commit: 58472b048d41f9d4e512bf5ab031ea987e83139e
      https://github.com/wesnoth/wesnoth/commit/58472b048d41f9d4e512bf5ab031ea987e83139e
  Author: Alexander Lacson <41433185+max-torch at users.noreply.github.com>
  Date:   2021-11-10 (Wed, 10 Nov 2021)

  Changed paths:
    M data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg

  Log Message:
  -----------
  SoF S4: Make mining gold and coal clearer (#6182)

(cherry picked from commit 3a312f3703e5f1be2cc2674ab787498218811b3a)

  Commit: df893a25b4fb8ad84392d21664bf156ac05c42cc
      https://github.com/wesnoth/wesnoth/commit/df893a25b4fb8ad84392d21664bf156ac05c42cc
  Author: Descacharrado <Luis_koopa at hotmail.com>
  Date:   2021-11-10 (Wed, 10 Nov 2021)

  Changed paths:
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg

  Log Message:
  -----------
  TRoW S19:  Automatically collect chest at the end of the scenario (#6192)

(cherry picked from commit 1b905240af31d276e901aefc27de30f65f262710)

  Commit: af068aa6f6ee1872753b795656cd31a51fff428b
      https://github.com/wesnoth/wesnoth/commit/af068aa6f6ee1872753b795656cd31a51fff428b
  Author: Descacharrado <Luis_koopa at hotmail.com>
  Date:   2021-11-10 (Wed, 10 Nov 2021)

  Changed paths:
    M data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg

  Log Message:
  -----------
  UtBS S06b: hermit enhancement and tentacle fix. (#6200)

(cherry picked from commit 4abe584a06e939e9e2224adeb76795461c5737ee)

  Commit: ea654d1de5c31bc68a8f55378312acd3714b1922
      https://github.com/wesnoth/wesnoth/commit/ea654d1de5c31bc68a8f55378312acd3714b1922
  Author: Alexander Lacson <41433185+max-torch at users.noreply.github.com>
  Date:   2021-11-10 (Wed, 10 Nov 2021)

  Changed paths:
    M data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg
    M data/campaigns/Sceptre_of_Fire/utils/utils.cfg

  Log Message:
  -----------
  Add Objective Note for Thursagan's Rune Mechanic (#6207)

(cherry picked from commit b99b089e9055579555e8a677568e47d9e5b26aac)

  Commit: 64c475f8301aecc6d496a8714f735e7bcc6e95f1
      https://github.com/wesnoth/wesnoth/commit/64c475f8301aecc6d496a8714f735e7bcc6e95f1
  Author: Alexander Lacson <41433185+max-torch at users.noreply.github.com>
  Date:   2021-11-10 (Wed, 10 Nov 2021)

  Changed paths:
    M data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg

  Log Message:
  -----------
  SoF Add Rune Chest Objective Notes (#6208)

(cherry picked from commit 732559e8fa919793098edfede48bdc3764adff38)

Compare: https://github.com/wesnoth/wesnoth/compare/0cb5c5bf4532...64c475f8301a