[wesnoth-commits] [wesnoth/wesnoth] bc6db0: DM S15: Remove duplicate event

Mon Jun 17 03:24:30 UTC 2019

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: bc6db00d9d67488c29dfe17fd0149cbb65c1719a
      https://github.com/wesnoth/wesnoth/commit/bc6db00d9d67488c29dfe17fd0149cbb65c1719a
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2019-06-16 (Sun, 16 Jun 2019)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/15_Save_the_King.cfg

  Log Message:
  -----------
  DM S15: Remove duplicate event

  Commit: 5df17a033c11efe5873d341a29a74bc3b6a6cf85
      https://github.com/wesnoth/wesnoth/commit/5df17a033c11efe5873d341a29a74bc3b6a6cf85
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2019-06-16 (Sun, 16 Jun 2019)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/01_Overture.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/05_Council_in_Weldyn.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/14_Shadows.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/16_Dark_Sky_Over_Weldyn.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/23_Epilogue.cfg

  Log Message:
  -----------
  DM: Remove unnecessary lines and some comment cleanup

  Commit: 3ce65aee9ba1cc9a33a22c5327fe1bb41590febf
      https://github.com/wesnoth/wesnoth/commit/3ce65aee9ba1cc9a33a22c5327fe1bb41590febf
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2019-06-16 (Sun, 16 Jun 2019)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/17_A_New_Ally.cfg

  Log Message:
  -----------
  DM S17: Increase difficulty

  Commit: 6bd89c7d35ef66db959f485a4788340759c36bc0
      https://github.com/wesnoth/wesnoth/commit/6bd89c7d35ef66db959f485a4788340759c36bc0
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2019-06-16 (Sun, 16 Jun 2019)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/21_Clash_at_the_Manor.cfg

  Log Message:
  -----------
  DM S21: Increase difficulty

  Commit: 30741bad330464ca65fd9079c499cdd79ab98fe9
      https://github.com/wesnoth/wesnoth/commit/30741bad330464ca65fd9079c499cdd79ab98fe9
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2019-06-16 (Sun, 16 Jun 2019)

  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/07_Night_in_the_Swamp.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/10_The_Gate_Between_Worlds.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/characters.cfg

  Log Message:
  -----------
  DM: Code cleanup

Reorder some scenario keys.
Reorder side keys, removing unneeded ones, add keys & tags for clarity.
Move some events/macros.
Using [leader] in [side] for all non-player sides.
Change level improvements using [unit] instead of [recall] in a few places.

  Commit: caf4f75eec9782c5dfcc0fb6e685a8b3fc0a1419
      https://github.com/wesnoth/wesnoth/commit/caf4f75eec9782c5dfcc0fb6e685a8b3fc0a1419
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2019-06-16 (Sun, 16 Jun 2019)

  Changed paths:
    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/utils/sides.cfg

  Log Message:
  -----------
  DM: Eliminate use of a macro

ELVISH_NPCS_REAPPEAR was used inconsistently, and at odds with current
handling in DELFADOR_DEPARTS_AGAIN & DELFADOR_JOINS_ELVES.
Also improves change level compatability.

  Commit: 3276311e9c7bff4761ee8f522c0e8c268e6ee09b
      https://github.com/wesnoth/wesnoth/commit/3276311e9c7bff4761ee8f522c0e8c268e6ee09b
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2019-06-16 (Sun, 16 Jun 2019)

  Changed paths:
    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/15_Save_the_King.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/22_Face_of_the_Enemy.cfg
    M data/campaigns/Delfadors_Memoirs/utils/characters.cfg

  Log Message:
  -----------
  DM: Add some character macros

  Commit: efb38008f2e2dcae18b8f7386fe3dc315300542b
      https://github.com/wesnoth/wesnoth/commit/efb38008f2e2dcae18b8f7386fe3dc315300542b
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2019-06-16 (Sun, 16 Jun 2019)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/05_Council_in_Weldyn.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/15_Save_the_King.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/16_Dark_Sky_Over_Weldyn.cfg

  Log Message:
  -----------
  DM: Standardize Garard II's name when he is speaking

  Commit: dd7f7f20f4158a116f86fecedef29ec5c6551bee
      https://github.com/wesnoth/wesnoth/commit/dd7f7f20f4158a116f86fecedef29ec5c6551bee
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2019-06-16 (Sun, 16 Jun 2019)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/02_This_Valley_Belongs_to_Me.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/18_The_Portal_of_Doom.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/20_Prince_of_Wesnoth.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/21_Clash_at_the_Manor.cfg

  Log Message:
  -----------
  DM: Use speaker instead of id in [message]

  Commit: e3429026f8275ff9a65b4d2b6b8384f5349a373f
      https://github.com/wesnoth/wesnoth/commit/e3429026f8275ff9a65b4d2b6b8384f5349a373f
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2019-06-16 (Sun, 16 Jun 2019)

  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/07_Night_in_the_Swamp.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/10_The_Gate_Between_Worlds.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/15_Save_the_King.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

  Log Message:
  -----------
  DM: More code cleanup

Remove unneeded redraws.
Move things around for better readability.
Use some macros.
Delete a few pieces of unnecessary code.

  Commit: 21c6e4c73426f034f819abfdf7356a33a964cb19
      https://github.com/wesnoth/wesnoth/commit/21c6e4c73426f034f819abfdf7356a33a964cb19
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2019-06-16 (Sun, 16 Jun 2019)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/11_Wasteland.cfg

  Log Message:
  -----------
  DM S11: Fix starting village assignment

  Commit: b1826ca65c95820ee028d9d830f19abc690a64a7
      https://github.com/wesnoth/wesnoth/commit/b1826ca65c95820ee028d9d830f19abc690a64a7
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2019-06-16 (Sun, 16 Jun 2019)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/10_The_Gate_Between_Worlds.cfg

  Log Message:
  -----------
  DM S10: Ensure a unit for the role if none is found

  Commit: 8c01923ffc1487eeeb9ac0f98cb8b79277529621
      https://github.com/wesnoth/wesnoth/commit/8c01923ffc1487eeeb9ac0f98cb8b79277529621
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2019-06-16 (Sun, 16 Jun 2019)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/maps/12_Terror_at_the_Ford_of_Parthyn.map

  Log Message:
  -----------
  DM S12: Remove errant castle overlay

  Commit: 20c0c3fa5a505a83b80c8ffc37373c0a9a3db6d9
      https://github.com/wesnoth/wesnoth/commit/20c0c3fa5a505a83b80c8ffc37373c0a9a3db6d9
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2019-06-16 (Sun, 16 Jun 2019)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/13_The_Return_of_Trouble.cfg

  Log Message:
  -----------
  DM S13: Set elf ally side to elvish flag

  Commit: 48c3fb5114caa8df799e2c743483a073c9ab995f
      https://github.com/wesnoth/wesnoth/commit/48c3fb5114caa8df799e2c743483a073c9ab995f
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2019-06-16 (Sun, 16 Jun 2019)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/08_Ur_Thorodor.cfg

  Log Message:
  -----------
  DM S08: Make it clear there is no carryover to next scenario

  Commit: 17f3e6daa10a9edc4b3efe1d1ddf5aaac69b9f24
      https://github.com/wesnoth/wesnoth/commit/17f3e6daa10a9edc4b3efe1d1ddf5aaac69b9f24
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2019-06-16 (Sun, 16 Jun 2019)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/16_Dark_Sky_Over_Weldyn.cfg

  Log Message:
  -----------
  DM S16: Remove unneeded keys & tags

  Commit: 8820d3f523b72d125f0c4704bc8783fdd81b61dc
      https://github.com/wesnoth/wesnoth/commit/8820d3f523b72d125f0c4704bc8783fdd81b61dc
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2019-06-16 (Sun, 16 Jun 2019)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/utils/characters.cfg

  Log Message:
  -----------
  DM: Give traits to some villians

  Commit: a421d238adac063afd6fad0706e44e722fc18052
      https://github.com/wesnoth/wesnoth/commit/a421d238adac063afd6fad0706e44e722fc18052
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2019-06-16 (Sun, 16 Jun 2019)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/maps/01_Overture.map
    M data/campaigns/Delfadors_Memoirs/scenarios/01_Overture.cfg

  Log Message:
  -----------
  DM S01: Improve feel of cutscene

Change map and unit position so nobody walks on top of anyone during moves
Minor key cleanup

  Commit: ca51077d3162be42126eafe5c53ffc7e8e25ce95
      https://github.com/wesnoth/wesnoth/commit/ca51077d3162be42126eafe5c53ffc7e8e25ce95
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2019-06-16 (Sun, 16 Jun 2019)

  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/04_Leollyn.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/05_Council_in_Weldyn.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/10_The_Gate_Between_Worlds.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/11_Wasteland.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/17_A_New_Ally.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

  Log Message:
  -----------
  DM: Use wmllint who & unwho for characters

Compare: https://github.com/wesnoth/wesnoth/compare/1970165a6199...ca51077d3162