[wesnoth-commits] [wesnoth/wesnoth] ffb76d: Move the Merman Citizen and Brawler units to core
Celtic Minstrel
noreply at github.com
Mon Jun 21 03:02:47 UTC 2021
Branch: refs/heads/move_units_to_core
Home: https://github.com/wesnoth/wesnoth
Commit: ffb76d9aa704df809c7a6194ec6eafa61e5c34d0
https://github.com/wesnoth/wesnoth/commit/ffb76d9aa704df809c7a6194ec6eafa61e5c34d0
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2021-06-20 (Sun, 20 Jun 2021)
Changed paths:
M data/campaigns/Dead_Water/_main.cfg
R data/campaigns/Dead_Water/images/attacks/fist-merman.png
R data/campaigns/Dead_Water/images/attacks/tail-merman.png
R data/campaigns/Dead_Water/images/misc/stunned-status-icon.png
R data/campaigns/Dead_Water/images/portraits/brawler.png
R data/campaigns/Dead_Water/images/units/merfolk/brawler-defend.png
R data/campaigns/Dead_Water/images/units/merfolk/brawler-fist-1.png
R data/campaigns/Dead_Water/images/units/merfolk/brawler-fist-2.png
R data/campaigns/Dead_Water/images/units/merfolk/brawler-fist-3.png
R data/campaigns/Dead_Water/images/units/merfolk/brawler-tail-land-1.png
R data/campaigns/Dead_Water/images/units/merfolk/brawler-tail-land-2.png
R data/campaigns/Dead_Water/images/units/merfolk/brawler-tail-land-3.png
R data/campaigns/Dead_Water/images/units/merfolk/brawler-tail-land-4.png
R data/campaigns/Dead_Water/images/units/merfolk/brawler-tail-land-5.png
R data/campaigns/Dead_Water/images/units/merfolk/brawler.png
R data/campaigns/Dead_Water/images/units/merfolk/citizen-defend.png
R data/campaigns/Dead_Water/images/units/merfolk/citizen-fist-1.png
R data/campaigns/Dead_Water/images/units/merfolk/citizen-fist-2.png
R data/campaigns/Dead_Water/images/units/merfolk/citizen-fist-3.png
R data/campaigns/Dead_Water/images/units/merfolk/citizen.png
R data/campaigns/Dead_Water/units/Brawler.cfg
R data/campaigns/Dead_Water/units/Citizen.cfg
R data/campaigns/Dead_Water/utils/specials.cfg
A data/core/images/attacks/fist-merman.png
A data/core/images/attacks/tail-merman.png
A data/core/images/misc/stunned-status-icon.png
A data/core/images/portraits/merfolk/brawler.png
A data/core/images/units/merfolk/brawler-defend.png
A data/core/images/units/merfolk/brawler-fist-1.png
A data/core/images/units/merfolk/brawler-fist-2.png
A data/core/images/units/merfolk/brawler-fist-3.png
A data/core/images/units/merfolk/brawler-tail-land-1.png
A data/core/images/units/merfolk/brawler-tail-land-2.png
A data/core/images/units/merfolk/brawler-tail-land-3.png
A data/core/images/units/merfolk/brawler-tail-land-4.png
A data/core/images/units/merfolk/brawler-tail-land-5.png
A data/core/images/units/merfolk/brawler.png
A data/core/images/units/merfolk/citizen-defend.png
A data/core/images/units/merfolk/citizen-fist-1.png
A data/core/images/units/merfolk/citizen-fist-2.png
A data/core/images/units/merfolk/citizen-fist-3.png
A data/core/images/units/merfolk/citizen.png
M data/core/macros/abilities.cfg
A data/core/units/merfolk/Brawler.cfg
A data/core/units/merfolk/Citizen.cfg
Log Message:
-----------
Move the Merman Citizen and Brawler units to core
Commit: d3ecec2483baa3f378f6d21a97fb63c78e019109
https://github.com/wesnoth/wesnoth/commit/d3ecec2483baa3f378f6d21a97fb63c78e019109
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2021-06-20 (Sun, 20 Jun 2021)
Changed paths:
R data/campaigns/Eastern_Invasion/images/units/undead-skeletal/boneknight.png
R data/campaigns/Eastern_Invasion/images/units/undead-skeletal/rider-attack.png
R data/campaigns/Eastern_Invasion/images/units/undead-skeletal/rider-defend.png
R data/campaigns/Eastern_Invasion/images/units/undead-skeletal/rider-moving.png
R data/campaigns/Eastern_Invasion/images/units/undead-skeletal/rider.png
R data/campaigns/Eastern_Invasion/units/Bone_Knight.cfg
R data/campaigns/Eastern_Invasion/units/Skeleton_Rider.cfg
R data/campaigns/Liberty/images/units/undead-skeletal/boneknight.png
R data/campaigns/Liberty/images/units/undead-skeletal/rider-attack.png
R data/campaigns/Liberty/images/units/undead-skeletal/rider-defend.png
R data/campaigns/Liberty/images/units/undead-skeletal/rider-moving.png
R data/campaigns/Liberty/images/units/undead-skeletal/rider.png
R data/campaigns/Liberty/units/Bone_Knight.cfg
R data/campaigns/Liberty/units/Skeleton_Rider.cfg
R data/campaigns/Under_the_Burning_Suns/images/units/undead-skeletal/rider-attack.png
R data/campaigns/Under_the_Burning_Suns/images/units/undead-skeletal/rider-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/undead-skeletal/rider-moving.png
R data/campaigns/Under_the_Burning_Suns/images/units/undead-skeletal/rider.png
R data/campaigns/Under_the_Burning_Suns/units/undead/Undead_Horseman.cfg
A data/core/images/units/undead-skeletal/boneknight.png
A data/core/images/units/undead-skeletal/rider-attack.png
A data/core/images/units/undead-skeletal/rider-defend.png
A data/core/images/units/undead-skeletal/rider-moving.png
A data/core/images/units/undead-skeletal/rider.png
A data/core/units/undead/Skele_Bone_Knight.cfg
A data/core/units/undead/Skeleton_Rider.cfg
Log Message:
-----------
Move the Skeleton Rider and Bone Knight units to core
Note: The UtBS version of the skeleton rider was slightly different. Is this okay?
pierce=70
impact=110
experience=50
No advancements
Description substitutes "sands" for "grave"
No submerge ability
Commit: 20f9d7a4f35ad0ed2f02ad00a97578f7338ea5b3
https://github.com/wesnoth/wesnoth/commit/20f9d7a4f35ad0ed2f02ad00a97578f7338ea5b3
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2021-06-20 (Sun, 20 Jun 2021)
Changed paths:
A data/core/images/units/ogres/great-ogre.png
A data/core/units/ogres/Great_Ogre.cfg
M data/core/units/ogres/Ogre.cfg
Log Message:
-----------
Add the Great Ogre to core
This used to be a custom unit in Legend of Wesmere, but it was removed at some point.
This commit makes Ogre advance to Great Ogre. It may instead be desirable to make this an optional advancement.
Commit: 21e02df4e78abac419b53175f0675cf121ecac90
https://github.com/wesnoth/wesnoth/commit/21e02df4e78abac419b53175f0675cf121ecac90
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2021-06-20 (Sun, 20 Jun 2021)
Changed paths:
R data/campaigns/Liberty/images/units/undead-skeletal/deathsquire-attack-1.png
R data/campaigns/Liberty/images/units/undead-skeletal/deathsquire-attack-2.png
R data/campaigns/Liberty/images/units/undead-skeletal/deathsquire-attack-3.png
R data/campaigns/Liberty/images/units/undead-skeletal/deathsquire-defend.png
R data/campaigns/Liberty/images/units/undead-skeletal/deathsquire-leading.png
R data/campaigns/Liberty/images/units/undead-skeletal/deathsquire.png
R data/campaigns/Liberty/units/Death_Squire.cfg
A data/core/images/units/undead-skeletal/deathsquire-attack-1.png
A data/core/images/units/undead-skeletal/deathsquire-attack-2.png
A data/core/images/units/undead-skeletal/deathsquire-attack-3.png
A data/core/images/units/undead-skeletal/deathsquire-defend.png
A data/core/images/units/undead-skeletal/deathsquire-leading.png
A data/core/images/units/undead-skeletal/deathsquire.png
M data/core/macros/optional_unit_advancements.cfg
A data/core/units/undead/Skele_Death_Squire.cfg
Log Message:
-----------
Move Death Squire unit to core
This also adds an optional advancement from Skeleton to Death Squire.
Commit: e9044cb7726c69058535671a688b67976782ac55
https://github.com/wesnoth/wesnoth/commit/e9044cb7726c69058535671a688b67976782ac55
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2021-06-20 (Sun, 20 Jun 2021)
Changed paths:
R data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack-1.png
R data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack-2.png
R data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack-3.png
R data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack-4.png
R data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack-5.png
R data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack-6.png
R data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-defend-1.png
R data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-defend-2.png
R data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-laden.png
R data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner.png
M data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg
R data/campaigns/Sceptre_of_Fire/units/Dwarvish_Miner.cfg
R data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-1.png
R data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-2.png
R data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-3.png
R data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-4.png
R data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-5.png
R data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-6.png
R data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-defend-1.png
R data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-defend-2.png
R data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner.png
R data/campaigns/Secrets_of_the_Ancients/units/Dwarvish_Miner.cfg
A data/core/images/units/dwarves/miner-attack-1.png
A data/core/images/units/dwarves/miner-attack-2.png
A data/core/images/units/dwarves/miner-attack-3.png
A data/core/images/units/dwarves/miner-attack-4.png
A data/core/images/units/dwarves/miner-attack-5.png
A data/core/images/units/dwarves/miner-attack-6.png
A data/core/images/units/dwarves/miner-defend-1.png
A data/core/images/units/dwarves/miner-defend-2.png
A data/core/images/units/dwarves/miner-laden.png
A data/core/images/units/dwarves/miner.png
A data/core/units/dwarves/Miner.cfg
Log Message:
-----------
Move the Dwarvish Miner unit to core
This also changes the tracking of what they're carrying to be a status instead of a role, which should be more portable to other use-cases.
Commit: 13554bb46045efb890bb1a13fa9bf85f6ae3f487
https://github.com/wesnoth/wesnoth/commit/13554bb46045efb890bb1a13fa9bf85f6ae3f487
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2021-06-20 (Sun, 20 Jun 2021)
Changed paths:
R data/campaigns/Secrets_of_the_Ancients/images/portraits/orcish-shaman.png
R data/campaigns/Secrets_of_the_Ancients/images/units/orcish-shaman-defend-1.png
R data/campaigns/Secrets_of_the_Ancients/images/units/orcish-shaman-defend-2.png
R data/campaigns/Secrets_of_the_Ancients/images/units/orcish-shaman-magic.png
R data/campaigns/Secrets_of_the_Ancients/images/units/orcish-shaman.png
M data/campaigns/Secrets_of_the_Ancients/scenarios/14_Entering_the_Northlands.cfg
M data/campaigns/Secrets_of_the_Ancients/units/Orcish_Shaman.cfg
R data/campaigns/Son_Of_The_Black_Eye/images/portraits/old_orcish_shaman.png
R data/campaigns/Son_Of_The_Black_Eye/images/portraits/orcish_shaman.png
R data/campaigns/Son_Of_The_Black_Eye/images/portraits/young_orcish_shaman.png
R data/campaigns/Son_Of_The_Black_Eye/images/units/elder-orcish-shaman-defend-1.png
R data/campaigns/Son_Of_The_Black_Eye/images/units/elder-orcish-shaman-defend-2.png
R data/campaigns/Son_Of_The_Black_Eye/images/units/elder-orcish-shaman-magic.png
R data/campaigns/Son_Of_The_Black_Eye/images/units/elder-orcish-shaman.png
R data/campaigns/Son_Of_The_Black_Eye/images/units/novice-orcish-shaman-defend-1.png
R data/campaigns/Son_Of_The_Black_Eye/images/units/novice-orcish-shaman-defend-2.png
R data/campaigns/Son_Of_The_Black_Eye/images/units/novice-orcish-shaman-magic.png
R data/campaigns/Son_Of_The_Black_Eye/images/units/novice-orcish-shaman.png
R data/campaigns/Son_Of_The_Black_Eye/images/units/orcish-shaman-defend-1.png
R data/campaigns/Son_Of_The_Black_Eye/images/units/orcish-shaman-defend-2.png
R data/campaigns/Son_Of_The_Black_Eye/images/units/orcish-shaman-magic.png
R data/campaigns/Son_Of_The_Black_Eye/images/units/orcish-shaman.png
M data/campaigns/Son_Of_The_Black_Eye/units/Novice_Orcish_Shaman.cfg
M data/campaigns/Son_Of_The_Black_Eye/units/Old_Orcish_Shaman.cfg
M data/campaigns/Son_Of_The_Black_Eye/units/Orcish_Shaman.cfg
M data/campaigns/Son_Of_The_Black_Eye/utils/deaths.cfg
M data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg
A data/core/images/portraits/orcs/adept.png
A data/core/images/portraits/orcs/shaman.png
A data/core/images/portraits/orcs/sorcerer.png
A data/core/images/units/orcs/adept-defend-1.png
A data/core/images/units/orcs/adept-defend-2.png
A data/core/images/units/orcs/adept-magic.png
A data/core/images/units/orcs/adept.png
A data/core/images/units/orcs/shaman-defend-1.png
A data/core/images/units/orcs/shaman-defend-2.png
A data/core/images/units/orcs/shaman-magic.png
A data/core/images/units/orcs/shaman.png
A data/core/images/units/orcs/sorcerer-defend-1.png
A data/core/images/units/orcs/sorcerer-defend-2.png
A data/core/images/units/orcs/sorcerer-magic.png
A data/core/images/units/orcs/sorcerer.png
A data/core/units/orcs/Adept.cfg
A data/core/units/orcs/Shaman.cfg
A data/core/units/orcs/Sorcerer.cfg
Log Message:
-----------
Move the Orcish Shamans to core as a new unit line
Existing uses are now special-cased units based on the new line, rather than directly using the new line.
Commit: 59f9e54d85859388bdcf8ba03d9cfd86ab7f879c
https://github.com/wesnoth/wesnoth/commit/59f9e54d85859388bdcf8ba03d9cfd86ab7f879c
Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
Date: 2021-06-20 (Sun, 20 Jun 2021)
Changed paths:
R data/campaigns/Under_the_Burning_Suns/images/portraits/nagas/naga-hunter.png
R data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-melee-1.png
R data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-melee-2.png
R data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-melee-3.png
R data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-melee-4.png
R data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-1.png
R data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-2.png
R data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-3.png
R data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-4.png
R data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-5.png
R data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-6.png
R data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-melee-defend.png
R data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter.png
R data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Hunter.cfg
A data/core/images/portraits/nagas/naga-hunter.png
A data/core/images/units/nagas/hunter-attack-melee-1.png
A data/core/images/units/nagas/hunter-attack-melee-2.png
A data/core/images/units/nagas/hunter-attack-melee-3.png
A data/core/images/units/nagas/hunter-attack-melee-4.png
A data/core/images/units/nagas/hunter-attack-ranged-1.png
A data/core/images/units/nagas/hunter-attack-ranged-2.png
A data/core/images/units/nagas/hunter-attack-ranged-3.png
A data/core/images/units/nagas/hunter-attack-ranged-4.png
A data/core/images/units/nagas/hunter-attack-ranged-5.png
A data/core/images/units/nagas/hunter-attack-ranged-6.png
A data/core/images/units/nagas/hunter-defend.png
A data/core/images/units/nagas/hunter-melee-defend.png
A data/core/images/units/nagas/hunter.png
A data/core/units/nagas/Hunter.cfg
Log Message:
-----------
Move the Naga Hunter unit to core
Compare: https://github.com/wesnoth/wesnoth/compare/9ac54eb26920...59f9e54d8585
More information about the Commits
mailing list