wesnoth-cvs-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Wesnoth-cvs-commits] wesnoth/data scenarios/Heir_To_The_Throne/Cross...


From: John McNabb
Subject: [Wesnoth-cvs-commits] wesnoth/data scenarios/Heir_To_The_Throne/Cross...
Date: Sun, 31 Jul 2005 16:31:44 -0400

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     John McNabb <address@hidden>    05/07/31 20:31:44

Modified files:
        data/scenarios/Heir_To_The_Throne: Crossroads.cfg 
                                           Elves_Besieged.cfg 
        data/units     : Ancient_Lich.cfg Ancient_Wose.cfg Assassin.cfg 
                         Bandit.cfg Battle_Princess.cfg Blood_Bat.cfg 
                         Cavalier.cfg Cave_Spider.cfg Chocobone.cfg 
                         Cockatrice.cfg Cuttle_Fish.cfg Dark_Queen.cfg 
                         Dark_Sorcerer.cfg Dark_Spirit.cfg 
                         Death_Knight.cfg Deathblade.cfg 
                         Direwolf_Rider.cfg Drake_Blademaster.cfg 
                         Drake_Enforcer.cfg Drake_Flameheart.cfg 
                         Drake_Gladiator.cfg Drake_Hurricane.cfg 
                         Drake_Inferno.cfg Drake_Warden.cfg Draug.cfg 
                         Dread_Lich.cfg Duelist.cfg 
                         Dwarvish_Berserker.cfg Dwarvish_Dragonguard.cfg 
                         Dwarvish_Lord.cfg Dwarvish_Runemaster.cfg 
                         Dwarvish_Sentinel.cfg Elder_Mage.cfg 
                         Elvish_Avenger.cfg Elvish_Champion.cfg 
                         Elvish_High_Lord.cfg Elvish_Lady.cfg 
                         Elvish_Marshal.cfg Elvish_Outrider.cfg 
                         Elvish_Sharpshooter.cfg Elvish_Shyde.cfg 
                         Elvish_Sylph.cfg Fire_Dragon.cfg Fireball.cfg 
                         Galleon.cfg Gate.cfg Giant_Mudcrawler.cfg 
                         Giant_Scorpion.cfg Goblin_Impaler.cfg 
                         Goblin_Pillager.cfg Grand_Knight.cfg 
                         Grand_Marshal.cfg Great_Mage.cfg 
                         Great_Troll.cfg Gryphon.cfg Gryphon_Master.cfg 
                         Halbardier.cfg Iron_Mauler.cfg Javelineer.cfg 
                         Lancer.cfg Lich.cfg Lord.cfg Mage_of_Light.cfg 
                         Master_Bowman.cfg Mermaid_Diviner.cfg 
                         Mermaid_Siren.cfg Merman_Entangler.cfg 
                         Merman_Hoplite.cfg Merman_Javelineer.cfg 
                         Merman_Triton.cfg Naga-Myrmidon.cfg 
                         Necrophage.cfg Nightgaunt.cfg Noble_Lord.cfg 
                         Ogre.cfg Orcish_Shaman.cfg Orcish_Slayer.cfg 
                         Orcish_Slurbow.cfg Orcish_Sovereign.cfg 
                         Orcish_Warlord.cfg Outlaw.cfg Outlaw_Queen.cfg 
                         Paladin.cfg Pirate_Galleon.cfg Royal_Guard.cfg 
                         Saurian_Flanker.cfg Saurian_Icecaster.cfg 
                         Saurian_Soothsayer.cfg Saurian_Warrior.cfg 
                         Sea_Hag.cfg Sea_Orc.cfg Sea_Serpent.cfg 
                         Silver_Mage.cfg Skeletal_Dragon.cfg 
                         Sleeping_Gryphon.cfg Soul_Shooter.cfg 
                         Soulless.cfg Spectre.cfg Tentacle.cfg 
                         Transport_Galleon.cfg Trapper.cfg Triton.cfg 
                         Troll_Rocklobber.cfg Troll_Warrior.cfg 
                         Vampire_Lady.cfg Wall_Guard.cfg 
                         Warrior_King.cfg Watch_Tower.cfg Yeti.cfg 
Added files:
        data           : amla.cfg 

Log message:
        changed AMLA to use macros

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/amla.cfg?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Crossroads.cfg.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Ancient_Lich.cfg.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Ancient_Wose.cfg.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Assassin.cfg.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Bandit.cfg.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Battle_Princess.cfg.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Blood_Bat.cfg.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Cavalier.cfg.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Cave_Spider.cfg.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Chocobone.cfg.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Cockatrice.cfg.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Cuttle_Fish.cfg.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Dark_Queen.cfg.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Dark_Sorcerer.cfg.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Dark_Spirit.cfg.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Death_Knight.cfg.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Deathblade.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Direwolf_Rider.cfg.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Drake_Blademaster.cfg.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Drake_Enforcer.cfg.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Drake_Flameheart.cfg.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Drake_Gladiator.cfg.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Drake_Hurricane.cfg.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Drake_Inferno.cfg.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Drake_Warden.cfg.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Draug.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Dread_Lich.cfg.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Duelist.cfg.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Dwarvish_Berserker.cfg.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Dwarvish_Dragonguard.cfg.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Dwarvish_Lord.cfg.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Dwarvish_Runemaster.cfg.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Dwarvish_Sentinel.cfg.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Elder_Mage.cfg.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Elvish_Avenger.cfg.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Elvish_Champion.cfg.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Elvish_High_Lord.cfg.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Elvish_Lady.cfg.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Elvish_Marshal.cfg.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Elvish_Outrider.cfg.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Elvish_Sharpshooter.cfg.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Elvish_Shyde.cfg.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Elvish_Sylph.cfg.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Fire_Dragon.cfg.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Fireball.cfg.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Galleon.cfg.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Gate.cfg.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Giant_Mudcrawler.cfg.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Giant_Scorpion.cfg.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Goblin_Impaler.cfg.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Goblin_Pillager.cfg.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Grand_Knight.cfg.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Grand_Marshal.cfg.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Great_Mage.cfg.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Great_Troll.cfg.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Gryphon.cfg.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Gryphon_Master.cfg.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Halbardier.cfg.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Iron_Mauler.cfg.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Javelineer.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Lancer.cfg.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Lich.cfg.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Lord.cfg.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Mage_of_Light.cfg.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Master_Bowman.cfg.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Mermaid_Diviner.cfg.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Mermaid_Siren.cfg.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Merman_Entangler.cfg.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Merman_Hoplite.cfg.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Merman_Javelineer.cfg.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Merman_Triton.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Naga-Myrmidon.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Necrophage.cfg.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Nightgaunt.cfg.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Noble_Lord.cfg.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Ogre.cfg.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Orcish_Shaman.cfg.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Orcish_Slayer.cfg.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Orcish_Slurbow.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Orcish_Sovereign.cfg.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Orcish_Warlord.cfg.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Outlaw.cfg.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Outlaw_Queen.cfg.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Paladin.cfg.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Pirate_Galleon.cfg.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Royal_Guard.cfg.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Saurian_Flanker.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Saurian_Icecaster.cfg.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Saurian_Soothsayer.cfg.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Saurian_Warrior.cfg.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Sea_Hag.cfg.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Sea_Orc.cfg.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Sea_Serpent.cfg.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Silver_Mage.cfg.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Skeletal_Dragon.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Sleeping_Gryphon.cfg.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Soul_Shooter.cfg.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Soulless.cfg.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Spectre.cfg.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Tentacle.cfg.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Transport_Galleon.cfg.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Trapper.cfg.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Triton.cfg.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Troll_Rocklobber.cfg.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Troll_Warrior.cfg.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Vampire_Lady.cfg.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Wall_Guard.cfg.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Warrior_King.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Watch_Tower.cfg.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Yeti.cfg.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Crossroads.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Crossroads.cfg:1.37 
wesnoth/data/scenarios/Heir_To_The_Throne/Crossroads.cfg:1.38
--- wesnoth/data/scenarios/Heir_To_The_Throne/Crossroads.cfg:1.37       Mon Jul 
18 19:53:47 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Crossroads.cfg    Sun Jul 31 
20:31:44 2005
@@ -48,7 +48,74 @@
        side=1
        canrecruit=1
        controller=human
-       gold=200
+       {GOLD 300 200 200}
+#ifdef EASY
+       {INCOME 10 0 0}
+       {STARTING_VILLAGES 1 10}
+#endif
+               [ai]
+                       passive_leader="yes"
+                       grouping="offensive"
+                       aggression="0.0"
+                       caution="-0.75"
+                       [protect_location]
+                               x=20
+                               y=28
+                               radius="12"
+                               value="20.0"
+                       [/protect_location]
+                       [protect_location]
+                               x=16
+                               y=17
+                               radius="12"
+                               value="10.0"
+                       [/protect_location]
+                       [protect_location]
+                               x=25
+                               y=10
+                               radius="10"
+                               value="10.0"
+                       [/protect_location]
+                       [target]
+                               description=Delfador
+                               value=3.0
+                       [/target]
+                       [protect_unit]
+                               description=Delfador
+                               radius=6
+                               value=20.0
+                       [/protect_unit]
+                       [protect_unit]
+                               description=Konrad
+                               radius=10
+                               value=20.0
+                       [/protect_unit]
+                       [target]
+                               description=Kalenz
+                               value=3.0
+                       [/target]
+                       [protect_unit]
+                               description=Kalenz
+                               radius=4
+                               value=20.0
+                       [/protect_unit]
+
+                       [avoid]
+                               x="9-23"
+                               y="1-9"
+                       [/avoid]
+                       [avoid]
+                               x="14-19"
+                               y="10-14"
+                       [/avoid]
+                       [avoid]
+                               x="20-40"
+                               y="16-24"
+                       [/avoid]
+                       {ATTACK_DEPTH 5 5 5}    
+               [/ai]
+
+
        [/side]
 
 #define CROSSROADS_AI_PARAMS
@@ -306,6 +373,7 @@
                        {TRAIT_LOYAL}
                [/modifications]
                [/unit]
+#ifdef NORMAL
                [unit]
                description=Orcish Archer
                generate_description=yes
@@ -317,7 +385,20 @@
                        {TRAIT_LOYAL}
                [/modifications]
                [/unit]
+#endif
 #ifdef HARD
+               [unit]
+               description=Orcish Archer
+               generate_description=yes
+               side=3
+               x=$trapx{NUM}
+               y=$trapy{NUM}
+               type=Orcish Archer
+               [modifications]
+                       {TRAIT_LOYAL}
+               [/modifications]
+               [/unit]
+
                [unit]
                description=Troll Whelp
                generate_description=yes
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg:1.36 
wesnoth/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg:1.37
--- wesnoth/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg:1.36   Mon Jul 
18 19:53:47 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg        Sun Jul 
31 20:31:44 2005
@@ -72,25 +72,35 @@
                [/modifications]
                [/unit]
                [ai]
-               village_value=0.0
-               leader_value=0.0
+                       [target]
+                               description=Delfador
+                               value=3.0
+                       [/target]
+                       [protect_unit]
+                               description=Delfador
+                               radius=6
+                               value=20.0
+                       [/protect_unit]
+                       [protect_unit]
+                               description=Konrad
+                               radius=10
+                               value=20.0
+                       [/protect_unit]
+                       [target]
+                               description=Kalenz
+                               value=3.0
+                       [/target]
+                       [protect_unit]
+                               description=Kalenz
+                               radius=4
+                               value=20.0
+                       [/protect_unit]
 
                        [avoid]
                        x=20-31
                        y=1-12
                        [/avoid]
 
-                       [target]
-                       description=Konrad
-                       value=8.0
-                       [/target]
-
-                       [protect_unit]
-                       description=Konrad
-                       radius=12
-                       value=40.0
-                       [/protect_unit]
-                       
                        [leader_goal]
                        x,y=1,1
                        [/leader_goal]
Index: wesnoth/data/units/Ancient_Lich.cfg
diff -u wesnoth/data/units/Ancient_Lich.cfg:1.22 
wesnoth/data/units/Ancient_Lich.cfg:1.23
--- wesnoth/data/units/Ancient_Lich.cfg:1.22    Wed Jul 13 15:07:39 2005
+++ wesnoth/data/units/Ancient_Lich.cfg Sun Jul 31 20:31:44 2005
@@ -11,15 +11,8 @@
 movement_type=undeadfoot
 movement=6
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=4
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Ancient_Wose.cfg
diff -u wesnoth/data/units/Ancient_Wose.cfg:1.17 
wesnoth/data/units/Ancient_Wose.cfg:1.18
--- wesnoth/data/units/Ancient_Wose.cfg:1.17    Wed Jul 13 15:58:07 2005
+++ wesnoth/data/units/Ancient_Wose.cfg Sun Jul 31 20:31:44 2005
@@ -9,15 +9,8 @@
 movement_type=treefolk
 movement=3
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
Index: wesnoth/data/units/Assassin.cfg
diff -u wesnoth/data/units/Assassin.cfg:1.20 
wesnoth/data/units/Assassin.cfg:1.21
--- wesnoth/data/units/Assassin.cfg:1.20        Sun Jul 24 16:04:26 2005
+++ wesnoth/data/units/Assassin.cfg     Sun Jul 31 20:31:44 2005
@@ -9,15 +9,10 @@
 movement_type=elusivefoot
 movement=6
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
@@ -112,15 +107,10 @@
         movement_type=elusivefoot
         movement=6
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
         level=3
         alignment=chaotic
         advanceto=null
Index: wesnoth/data/units/Bandit.cfg
diff -u wesnoth/data/units/Bandit.cfg:1.12 wesnoth/data/units/Bandit.cfg:1.13
--- wesnoth/data/units/Bandit.cfg:1.12  Sun Jul 24 16:04:26 2005
+++ wesnoth/data/units/Bandit.cfg       Sun Jul 31 20:31:44 2005
@@ -9,15 +9,8 @@
 movement_type=smallfoot
 movement=5
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Battle_Princess.cfg
diff -u wesnoth/data/units/Battle_Princess.cfg:1.21 
wesnoth/data/units/Battle_Princess.cfg:1.22
--- wesnoth/data/units/Battle_Princess.cfg:1.21 Sun Jul 31 11:41:09 2005
+++ wesnoth/data/units/Battle_Princess.cfg      Sun Jul 31 20:31:44 2005
@@ -11,15 +11,10 @@
 movement_type=elusivefoot
 movement=6
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=neutral
 advanceto=null
@@ -70,15 +65,10 @@
 movement_type=elusivefoot
 movement=6
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=neutral
 advanceto=null
Index: wesnoth/data/units/Blood_Bat.cfg
diff -u wesnoth/data/units/Blood_Bat.cfg:1.14 
wesnoth/data/units/Blood_Bat.cfg:1.15
--- wesnoth/data/units/Blood_Bat.cfg:1.14       Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Blood_Bat.cfg    Sun Jul 31 20:31:44 2005
@@ -8,15 +8,8 @@
 movement_type=undeadfly
 movement=9
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Cavalier.cfg
diff -u wesnoth/data/units/Cavalier.cfg:1.10 
wesnoth/data/units/Cavalier.cfg:1.11
--- wesnoth/data/units/Cavalier.cfg:1.10        Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Cavalier.cfg     Sun Jul 31 20:31:44 2005
@@ -9,15 +9,8 @@
 movement_type=mounted
 movement=9
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
Index: wesnoth/data/units/Cave_Spider.cfg
diff -u wesnoth/data/units/Cave_Spider.cfg:1.16 
wesnoth/data/units/Cave_Spider.cfg:1.17
--- wesnoth/data/units/Cave_Spider.cfg:1.16     Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Cave_Spider.cfg  Sun Jul 31 20:31:44 2005
@@ -8,15 +8,8 @@
 movement_type=mountainfoot
 movement=6
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Chocobone.cfg
diff -u wesnoth/data/units/Chocobone.cfg:1.11 
wesnoth/data/units/Chocobone.cfg:1.12
--- wesnoth/data/units/Chocobone.cfg:1.11       Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Chocobone.cfg    Sun Jul 31 20:31:44 2005
@@ -9,15 +9,8 @@
 movement_type=undeadfoot
 movement=9
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Cockatrice.cfg
diff -u wesnoth/data/units/Cockatrice.cfg:1.13 
wesnoth/data/units/Cockatrice.cfg:1.14
--- wesnoth/data/units/Cockatrice.cfg:1.13      Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Cockatrice.cfg   Sun Jul 31 20:31:44 2005
@@ -8,15 +8,8 @@
 movement_type=smallfoot
 movement=5
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Cuttle_Fish.cfg
diff -u wesnoth/data/units/Cuttle_Fish.cfg:1.20 
wesnoth/data/units/Cuttle_Fish.cfg:1.21
--- wesnoth/data/units/Cuttle_Fish.cfg:1.20     Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Cuttle_Fish.cfg  Sun Jul 31 20:31:44 2005
@@ -8,15 +8,8 @@
 movement_type=deepsea
 movement=8
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=neutral
 advanceto=null
Index: wesnoth/data/units/Dark_Queen.cfg
diff -u wesnoth/data/units/Dark_Queen.cfg:1.9 
wesnoth/data/units/Dark_Queen.cfg:1.10
--- wesnoth/data/units/Dark_Queen.cfg:1.9       Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Dark_Queen.cfg   Sun Jul 31 20:31:44 2005
@@ -9,15 +9,8 @@
 movement_type=smallfoot
 movement=5
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Dark_Sorcerer.cfg
diff -u wesnoth/data/units/Dark_Sorcerer.cfg:1.9 
wesnoth/data/units/Dark_Sorcerer.cfg:1.10
--- wesnoth/data/units/Dark_Sorcerer.cfg:1.9    Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Dark_Sorcerer.cfg        Sun Jul 31 20:31:44 2005
@@ -8,15 +8,8 @@
 movement_type=smallfoot
 movement=5
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Dark_Spirit.cfg
diff -u wesnoth/data/units/Dark_Spirit.cfg:1.10 
wesnoth/data/units/Dark_Spirit.cfg:1.11
--- wesnoth/data/units/Dark_Spirit.cfg:1.10     Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Dark_Spirit.cfg  Sun Jul 31 20:31:44 2005
@@ -8,15 +8,8 @@
 movement_type=undeadfly
 movement=9
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Death_Knight.cfg
diff -u wesnoth/data/units/Death_Knight.cfg:1.18 
wesnoth/data/units/Death_Knight.cfg:1.19
--- wesnoth/data/units/Death_Knight.cfg:1.18    Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Death_Knight.cfg Sun Jul 31 20:31:44 2005
@@ -9,15 +9,8 @@
 movement_type=undeadfoot
 movement=5
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Deathblade.cfg
diff -u wesnoth/data/units/Deathblade.cfg:1.6 
wesnoth/data/units/Deathblade.cfg:1.7
--- wesnoth/data/units/Deathblade.cfg:1.6       Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Deathblade.cfg   Sun Jul 31 20:31:44 2005
@@ -8,15 +8,8 @@
 movement_type=undeadfoot
 movement=6
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Direwolf_Rider.cfg
diff -u wesnoth/data/units/Direwolf_Rider.cfg:1.10 
wesnoth/data/units/Direwolf_Rider.cfg:1.11
--- wesnoth/data/units/Direwolf_Rider.cfg:1.10  Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Direwolf_Rider.cfg       Sun Jul 31 20:31:44 2005
@@ -8,15 +8,8 @@
 movement_type=orcishfoot
 movement=10
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Drake_Blademaster.cfg
diff -u wesnoth/data/units/Drake_Blademaster.cfg:1.3 
wesnoth/data/units/Drake_Blademaster.cfg:1.4
--- wesnoth/data/units/Drake_Blademaster.cfg:1.3        Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Drake_Blademaster.cfg    Sun Jul 31 20:31:44 2005
@@ -10,15 +10,8 @@
 movement_type=drakefly
 movement=6
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
Index: wesnoth/data/units/Drake_Enforcer.cfg
diff -u wesnoth/data/units/Drake_Enforcer.cfg:1.7 
wesnoth/data/units/Drake_Enforcer.cfg:1.8
--- wesnoth/data/units/Drake_Enforcer.cfg:1.7   Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Drake_Enforcer.cfg       Sun Jul 31 20:31:44 2005
@@ -9,15 +9,8 @@
 movement_type=drakefoot
 movement=5
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
Index: wesnoth/data/units/Drake_Flameheart.cfg
diff -u wesnoth/data/units/Drake_Flameheart.cfg:1.22 
wesnoth/data/units/Drake_Flameheart.cfg:1.23
--- wesnoth/data/units/Drake_Flameheart.cfg:1.22        Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Drake_Flameheart.cfg     Sun Jul 31 20:31:44 2005
@@ -10,15 +10,8 @@
 movement_type=drakefly
 movement=5
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 ability=leadership
Index: wesnoth/data/units/Drake_Gladiator.cfg
diff -u wesnoth/data/units/Drake_Gladiator.cfg:1.25 
wesnoth/data/units/Drake_Gladiator.cfg:1.26
--- wesnoth/data/units/Drake_Gladiator.cfg:1.25 Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Drake_Gladiator.cfg      Sun Jul 31 20:31:44 2005
@@ -9,15 +9,8 @@
 movement_type=drakefoot
 movement=5
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=lawful
 #advanceto=Drake Enforcer
Index: wesnoth/data/units/Drake_Hurricane.cfg
diff -u wesnoth/data/units/Drake_Hurricane.cfg:1.4 
wesnoth/data/units/Drake_Hurricane.cfg:1.5
--- wesnoth/data/units/Drake_Hurricane.cfg:1.4  Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Drake_Hurricane.cfg      Sun Jul 31 20:31:44 2005
@@ -9,15 +9,8 @@
 movement_type=fly
 movement=9
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
Index: wesnoth/data/units/Drake_Inferno.cfg
diff -u wesnoth/data/units/Drake_Inferno.cfg:1.19 
wesnoth/data/units/Drake_Inferno.cfg:1.20
--- wesnoth/data/units/Drake_Inferno.cfg:1.19   Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Drake_Inferno.cfg        Sun Jul 31 20:31:44 2005
@@ -9,15 +9,8 @@
 movement_type=drakefly
 movement=5
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
Index: wesnoth/data/units/Drake_Warden.cfg
diff -u wesnoth/data/units/Drake_Warden.cfg:1.8 
wesnoth/data/units/Drake_Warden.cfg:1.9
--- wesnoth/data/units/Drake_Warden.cfg:1.8     Tue Jul 26 15:26:51 2005
+++ wesnoth/data/units/Drake_Warden.cfg Sun Jul 31 20:31:44 2005
@@ -10,15 +10,8 @@
 movement_type=drakefoot
 movement=5
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3 
 alignment=lawful
 advanceto=null 
Index: wesnoth/data/units/Draug.cfg
diff -u wesnoth/data/units/Draug.cfg:1.6 wesnoth/data/units/Draug.cfg:1.7
--- wesnoth/data/units/Draug.cfg:1.6    Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Draug.cfg        Sun Jul 31 20:31:44 2005
@@ -8,15 +8,8 @@
 movement_type=undeadfoot
 movement=5
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Dread_Lich.cfg
diff -u wesnoth/data/units/Dread_Lich.cfg:1.4 
wesnoth/data/units/Dread_Lich.cfg:1.5
--- wesnoth/data/units/Dread_Lich.cfg:1.4       Sat Jul 16 00:51:42 2005
+++ wesnoth/data/units/Dread_Lich.cfg   Sun Jul 31 20:31:44 2005
@@ -9,15 +9,8 @@
 movement_type=undeadfoot
 movement=6
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=4
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Duelist.cfg
diff -u wesnoth/data/units/Duelist.cfg:1.21 wesnoth/data/units/Duelist.cfg:1.22
--- wesnoth/data/units/Duelist.cfg:1.21 Sun Jul 24 16:12:32 2005
+++ wesnoth/data/units/Duelist.cfg      Sun Jul 31 20:31:44 2005
@@ -8,15 +8,8 @@
 movement_type=elusivefoot
 movement=7
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=lawful
 advanceto=null
Index: wesnoth/data/units/Dwarvish_Berserker.cfg
diff -u wesnoth/data/units/Dwarvish_Berserker.cfg:1.28 
wesnoth/data/units/Dwarvish_Berserker.cfg:1.29
--- wesnoth/data/units/Dwarvish_Berserker.cfg:1.28      Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Dwarvish_Berserker.cfg   Sun Jul 31 20:31:44 2005
@@ -8,15 +8,8 @@
 movement_type=dwarvishfoot
 movement=5
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=neutral
 advanceto=null
Index: wesnoth/data/units/Dwarvish_Dragonguard.cfg
diff -u wesnoth/data/units/Dwarvish_Dragonguard.cfg:1.12 
wesnoth/data/units/Dwarvish_Dragonguard.cfg:1.13
--- wesnoth/data/units/Dwarvish_Dragonguard.cfg:1.12    Sun Jul 24 16:40:25 2005
+++ wesnoth/data/units/Dwarvish_Dragonguard.cfg Sun Jul 31 20:31:44 2005
@@ -8,15 +8,8 @@
 movement_type=dwarvishfoot
 movement=4
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=neutral
 advanceto=null
Index: wesnoth/data/units/Dwarvish_Lord.cfg
diff -u wesnoth/data/units/Dwarvish_Lord.cfg:1.30 
wesnoth/data/units/Dwarvish_Lord.cfg:1.31
--- wesnoth/data/units/Dwarvish_Lord.cfg:1.30   Sun Jul 24 16:40:25 2005
+++ wesnoth/data/units/Dwarvish_Lord.cfg        Sun Jul 31 20:31:44 2005
@@ -11,15 +11,8 @@
 movement_type=dwarvishfoot
 movement=4
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=neutral
 advanceto=null
Index: wesnoth/data/units/Dwarvish_Runemaster.cfg
diff -u wesnoth/data/units/Dwarvish_Runemaster.cfg:1.11 
wesnoth/data/units/Dwarvish_Runemaster.cfg:1.12
--- wesnoth/data/units/Dwarvish_Runemaster.cfg:1.11     Sun Jul 24 16:40:25 2005
+++ wesnoth/data/units/Dwarvish_Runemaster.cfg  Sun Jul 31 20:31:44 2005
@@ -8,15 +8,8 @@
 movement_type=dwarvishfoot
 movement=5
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=neutral
 advanceto=null
Index: wesnoth/data/units/Dwarvish_Sentinel.cfg
diff -u wesnoth/data/units/Dwarvish_Sentinel.cfg:1.8 
wesnoth/data/units/Dwarvish_Sentinel.cfg:1.9
--- wesnoth/data/units/Dwarvish_Sentinel.cfg:1.8        Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Dwarvish_Sentinel.cfg    Sun Jul 31 20:31:44 2005
@@ -15,15 +15,8 @@
 movement=4
 num_traits=1
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 ability=steadfast
 level=3
 alignment=neutral
Index: wesnoth/data/units/Elder_Mage.cfg
diff -u wesnoth/data/units/Elder_Mage.cfg:1.31 
wesnoth/data/units/Elder_Mage.cfg:1.32
--- wesnoth/data/units/Elder_Mage.cfg:1.31      Wed Jul 13 15:07:39 2005
+++ wesnoth/data/units/Elder_Mage.cfg   Sun Jul 31 20:31:44 2005
@@ -12,15 +12,8 @@
     [/resistance]
 movement=6
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=5
 alignment=neutral
 advanceto=null
Index: wesnoth/data/units/Elvish_Avenger.cfg
diff -u wesnoth/data/units/Elvish_Avenger.cfg:1.28 
wesnoth/data/units/Elvish_Avenger.cfg:1.29
--- wesnoth/data/units/Elvish_Avenger.cfg:1.28  Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Elvish_Avenger.cfg       Sun Jul 31 20:31:44 2005
@@ -11,15 +11,10 @@
 movement_type=woodland
 movement=6
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=neutral
 advanceto=null
@@ -131,15 +126,10 @@
         movement_type=woodland
         movement=6
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
         level=3
         alignment=neutral
         advanceto=null
Index: wesnoth/data/units/Elvish_Champion.cfg
diff -u wesnoth/data/units/Elvish_Champion.cfg:1.16 
wesnoth/data/units/Elvish_Champion.cfg:1.17
--- wesnoth/data/units/Elvish_Champion.cfg:1.16 Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Elvish_Champion.cfg      Sun Jul 31 20:31:44 2005
@@ -11,15 +11,8 @@
 movement=5
 {LESS_NIMBLE_ELF}
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=neutral
 advanceto=null
Index: wesnoth/data/units/Elvish_High_Lord.cfg
diff -u wesnoth/data/units/Elvish_High_Lord.cfg:1.12 
wesnoth/data/units/Elvish_High_Lord.cfg:1.13
--- wesnoth/data/units/Elvish_High_Lord.cfg:1.12        Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Elvish_High_Lord.cfg     Sun Jul 31 20:31:44 2005
@@ -10,15 +10,8 @@
 movement_type=woodland
 movement=6
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=neutral
 advanceto=null
Index: wesnoth/data/units/Elvish_Lady.cfg
diff -u wesnoth/data/units/Elvish_Lady.cfg:1.8 
wesnoth/data/units/Elvish_Lady.cfg:1.9
--- wesnoth/data/units/Elvish_Lady.cfg:1.8      Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Elvish_Lady.cfg  Sun Jul 31 20:31:44 2005
@@ -9,15 +9,8 @@
 movement_type=fly
 movement=6
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=neutral
 advanceto=null
Index: wesnoth/data/units/Elvish_Marshal.cfg
diff -u wesnoth/data/units/Elvish_Marshal.cfg:1.19 
wesnoth/data/units/Elvish_Marshal.cfg:1.20
--- wesnoth/data/units/Elvish_Marshal.cfg:1.19  Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Elvish_Marshal.cfg       Sun Jul 31 20:31:44 2005
@@ -14,15 +14,8 @@
 movement=5
 {LESS_NIMBLE_ELF}
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=neutral
 advanceto=null
Index: wesnoth/data/units/Elvish_Outrider.cfg
diff -u wesnoth/data/units/Elvish_Outrider.cfg:1.23 
wesnoth/data/units/Elvish_Outrider.cfg:1.24
--- wesnoth/data/units/Elvish_Outrider.cfg:1.23 Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Elvish_Outrider.cfg      Sun Jul 31 20:31:44 2005
@@ -9,15 +9,8 @@
 movement_type=woodland
 movement=10
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=neutral
 advanceto=null
Index: wesnoth/data/units/Elvish_Sharpshooter.cfg
diff -u wesnoth/data/units/Elvish_Sharpshooter.cfg:1.23 
wesnoth/data/units/Elvish_Sharpshooter.cfg:1.24
--- wesnoth/data/units/Elvish_Sharpshooter.cfg:1.23     Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Elvish_Sharpshooter.cfg  Sun Jul 31 20:31:44 2005
@@ -11,15 +11,10 @@
 movement_type=woodland
 movement=6
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=neutral
 advanceto=null
@@ -137,15 +132,10 @@
         movement_type=woodland
         movement=6
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
         level=3
         alignment=neutral
         advanceto=null
Index: wesnoth/data/units/Elvish_Shyde.cfg
diff -u wesnoth/data/units/Elvish_Shyde.cfg:1.30 
wesnoth/data/units/Elvish_Shyde.cfg:1.31
--- wesnoth/data/units/Elvish_Shyde.cfg:1.30    Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Elvish_Shyde.cfg Sun Jul 31 20:31:44 2005
@@ -12,15 +12,8 @@
 movement_type=woodlandfloat
 movement=6
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=neutral
 advanceto=null
Index: wesnoth/data/units/Elvish_Sylph.cfg
diff -u wesnoth/data/units/Elvish_Sylph.cfg:1.8 
wesnoth/data/units/Elvish_Sylph.cfg:1.9
--- wesnoth/data/units/Elvish_Sylph.cfg:1.8     Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Elvish_Sylph.cfg Sun Jul 31 20:31:44 2005
@@ -12,15 +12,8 @@
 [/resistance]
 movement=6
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=4
 alignment=neutral
 advanceto=null
Index: wesnoth/data/units/Fire_Dragon.cfg
diff -u wesnoth/data/units/Fire_Dragon.cfg:1.11 
wesnoth/data/units/Fire_Dragon.cfg:1.12
--- wesnoth/data/units/Fire_Dragon.cfg:1.11     Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Fire_Dragon.cfg  Sun Jul 31 20:31:44 2005
@@ -9,15 +9,8 @@
 movement_type=drakefly
 movement=8
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=4
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Fireball.cfg
diff -u wesnoth/data/units/Fireball.cfg:1.8 wesnoth/data/units/Fireball.cfg:1.9
--- wesnoth/data/units/Fireball.cfg:1.8 Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Fireball.cfg     Sun Jul 31 20:31:44 2005
@@ -8,15 +8,8 @@
 movement_type=fly
 movement=5
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=0
 alignment=neutral
 advanceto=null
Index: wesnoth/data/units/Galleon.cfg
diff -u wesnoth/data/units/Galleon.cfg:1.7 wesnoth/data/units/Galleon.cfg:1.8
--- wesnoth/data/units/Galleon.cfg:1.7  Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Galleon.cfg      Sun Jul 31 20:31:44 2005
@@ -8,15 +8,8 @@
 movement_type=fly
 movement=10
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=lawful
 advanceto=null
Index: wesnoth/data/units/Gate.cfg
diff -u wesnoth/data/units/Gate.cfg:1.8 wesnoth/data/units/Gate.cfg:1.9
--- wesnoth/data/units/Gate.cfg:1.8     Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Gate.cfg Sun Jul 31 20:31:44 2005
@@ -10,15 +10,8 @@
        [/resistance]
 movement=1
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=0
 alignment=neutral
 advanceto=null
Index: wesnoth/data/units/Giant_Mudcrawler.cfg
diff -u wesnoth/data/units/Giant_Mudcrawler.cfg:1.11 
wesnoth/data/units/Giant_Mudcrawler.cfg:1.12
--- wesnoth/data/units/Giant_Mudcrawler.cfg:1.11        Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Giant_Mudcrawler.cfg     Sun Jul 31 20:31:44 2005
@@ -9,15 +9,8 @@
 movement_type=scuttlefoot
 movement=4
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=neutral
 advanceto=null
Index: wesnoth/data/units/Giant_Scorpion.cfg
diff -u wesnoth/data/units/Giant_Scorpion.cfg:1.10 
wesnoth/data/units/Giant_Scorpion.cfg:1.11
--- wesnoth/data/units/Giant_Scorpion.cfg:1.10  Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Giant_Scorpion.cfg       Sun Jul 31 20:31:44 2005
@@ -8,15 +8,8 @@
 movement_type=scuttlefoot
 movement=8
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=neutral
 advanceto=null
Index: wesnoth/data/units/Goblin_Impaler.cfg
diff -u wesnoth/data/units/Goblin_Impaler.cfg:1.7 
wesnoth/data/units/Goblin_Impaler.cfg:1.8
--- wesnoth/data/units/Goblin_Impaler.cfg:1.7   Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Goblin_Impaler.cfg       Sun Jul 31 20:31:44 2005
@@ -9,15 +9,8 @@
 movement_type=orcishfoot
 movement=4
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Goblin_Pillager.cfg
diff -u wesnoth/data/units/Goblin_Pillager.cfg:1.20 
wesnoth/data/units/Goblin_Pillager.cfg:1.21
--- wesnoth/data/units/Goblin_Pillager.cfg:1.20 Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Goblin_Pillager.cfg      Sun Jul 31 20:31:44 2005
@@ -9,15 +9,8 @@
 movement_type=orcishfoot
 movement=9
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Grand_Knight.cfg
diff -u wesnoth/data/units/Grand_Knight.cfg:1.13 
wesnoth/data/units/Grand_Knight.cfg:1.14
--- wesnoth/data/units/Grand_Knight.cfg:1.13    Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Grand_Knight.cfg Sun Jul 31 20:31:44 2005
@@ -9,15 +9,8 @@
 movement_type=mounted
 movement=7
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
Index: wesnoth/data/units/Grand_Marshal.cfg
diff -u wesnoth/data/units/Grand_Marshal.cfg:1.8 
wesnoth/data/units/Grand_Marshal.cfg:1.9
--- wesnoth/data/units/Grand_Marshal.cfg:1.8    Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Grand_Marshal.cfg        Sun Jul 31 20:31:44 2005
@@ -12,15 +12,8 @@
 movement_type=armoredfoot
 movement=6
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=4
 alignment=lawful
 advanceto=null
Index: wesnoth/data/units/Great_Mage.cfg
diff -u wesnoth/data/units/Great_Mage.cfg:1.29 
wesnoth/data/units/Great_Mage.cfg:1.30
--- wesnoth/data/units/Great_Mage.cfg:1.29      Wed Jul 13 15:07:39 2005
+++ wesnoth/data/units/Great_Mage.cfg   Sun Jul 31 20:31:44 2005
@@ -12,15 +12,10 @@
     [/resistance]
 movement=5
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=4
 alignment=neutral
 advanceto=null
@@ -118,15 +113,10 @@
            [/resistance]
        movement=5
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
        level=4
        alignment=neutral
        advanceto=null
Index: wesnoth/data/units/Great_Troll.cfg
diff -u wesnoth/data/units/Great_Troll.cfg:1.7 
wesnoth/data/units/Great_Troll.cfg:1.8
--- wesnoth/data/units/Great_Troll.cfg:1.7      Wed Jul 13 15:58:59 2005
+++ wesnoth/data/units/Great_Troll.cfg  Sun Jul 31 20:31:44 2005
@@ -9,15 +9,8 @@
 movement_type=largefoot
 movement=5
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Gryphon.cfg
diff -u wesnoth/data/units/Gryphon.cfg:1.14 wesnoth/data/units/Gryphon.cfg:1.15
--- wesnoth/data/units/Gryphon.cfg:1.14 Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Gryphon.cfg      Sun Jul 31 20:31:44 2005
@@ -8,15 +8,8 @@
 movement_type=fly
 movement=9
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=neutral
 advanceto=null
Index: wesnoth/data/units/Gryphon_Master.cfg
diff -u wesnoth/data/units/Gryphon_Master.cfg:1.8 
wesnoth/data/units/Gryphon_Master.cfg:1.9
--- wesnoth/data/units/Gryphon_Master.cfg:1.8   Wed Jul 13 16:10:04 2005
+++ wesnoth/data/units/Gryphon_Master.cfg       Sun Jul 31 20:31:44 2005
@@ -10,15 +10,8 @@
 movement_type=fly
 movement=10
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=neutral
 advanceto=null
Index: wesnoth/data/units/Halbardier.cfg
diff -u wesnoth/data/units/Halbardier.cfg:1.29 
wesnoth/data/units/Halbardier.cfg:1.30
--- wesnoth/data/units/Halbardier.cfg:1.29      Sun Jul 31 00:35:58 2005
+++ wesnoth/data/units/Halbardier.cfg   Sun Jul 31 20:31:44 2005
@@ -12,15 +12,8 @@
     [/resistance]
 movement=5
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
Index: wesnoth/data/units/Iron_Mauler.cfg
diff -u wesnoth/data/units/Iron_Mauler.cfg:1.10 
wesnoth/data/units/Iron_Mauler.cfg:1.11
--- wesnoth/data/units/Iron_Mauler.cfg:1.10     Sun Jul 24 16:19:15 2005
+++ wesnoth/data/units/Iron_Mauler.cfg  Sun Jul 31 20:31:44 2005
@@ -8,15 +8,8 @@
 movement_type=armoredfoot
 movement=4
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
Index: wesnoth/data/units/Javelineer.cfg
diff -u wesnoth/data/units/Javelineer.cfg:1.6 
wesnoth/data/units/Javelineer.cfg:1.7
--- wesnoth/data/units/Javelineer.cfg:1.6       Sun Jul 24 16:24:16 2005
+++ wesnoth/data/units/Javelineer.cfg   Sun Jul 31 20:31:44 2005
@@ -9,15 +9,8 @@
 movement_type=smallfoot
 movement=5
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=lawful
 advanceto=null
Index: wesnoth/data/units/Lancer.cfg
diff -u wesnoth/data/units/Lancer.cfg:1.10 wesnoth/data/units/Lancer.cfg:1.11
--- wesnoth/data/units/Lancer.cfg:1.10  Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Lancer.cfg       Sun Jul 31 20:31:44 2005
@@ -10,15 +10,8 @@
 movement_type=mounted
 movement=10
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=lawful
 advanceto=null
Index: wesnoth/data/units/Lich.cfg
diff -u wesnoth/data/units/Lich.cfg:1.25 wesnoth/data/units/Lich.cfg:1.26
--- wesnoth/data/units/Lich.cfg:1.25    Wed Jul 13 15:07:39 2005
+++ wesnoth/data/units/Lich.cfg Sun Jul 31 20:31:44 2005
@@ -8,15 +8,8 @@
 movement_type=undeadfoot
 movement=6
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Lord.cfg
diff -u wesnoth/data/units/Lord.cfg:1.21 wesnoth/data/units/Lord.cfg:1.22
--- wesnoth/data/units/Lord.cfg:1.21    Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Lord.cfg Sun Jul 31 20:31:44 2005
@@ -11,15 +11,10 @@
 movement_type=smallfoot
 movement=6
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
@@ -95,15 +90,10 @@
 movement_type=smallfoot
 movement=6
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
Index: wesnoth/data/units/Mage_of_Light.cfg
diff -u wesnoth/data/units/Mage_of_Light.cfg:1.28 
wesnoth/data/units/Mage_of_Light.cfg:1.29
--- wesnoth/data/units/Mage_of_Light.cfg:1.28   Sun Jul 31 00:31:22 2005
+++ wesnoth/data/units/Mage_of_Light.cfg        Sun Jul 31 20:31:44 2005
@@ -19,15 +19,10 @@
     holy=70
     [/resistance]
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
@@ -104,15 +99,10 @@
            holy=70
            [/resistance]
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
        level=3
        alignment=lawful
        advanceto=null
Index: wesnoth/data/units/Master_Bowman.cfg
diff -u wesnoth/data/units/Master_Bowman.cfg:1.14 
wesnoth/data/units/Master_Bowman.cfg:1.15
--- wesnoth/data/units/Master_Bowman.cfg:1.14   Wed Jul 27 04:16:56 2005
+++ wesnoth/data/units/Master_Bowman.cfg        Sun Jul 31 20:31:44 2005
@@ -9,15 +9,8 @@
 movement_type=smallfoot
 movement=5
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
Index: wesnoth/data/units/Mermaid_Diviner.cfg
diff -u wesnoth/data/units/Mermaid_Diviner.cfg:1.9 
wesnoth/data/units/Mermaid_Diviner.cfg:1.10
--- wesnoth/data/units/Mermaid_Diviner.cfg:1.9  Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Mermaid_Diviner.cfg      Sun Jul 31 20:31:44 2005
@@ -18,15 +18,8 @@
 [/resistance]
 movement=6
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
Index: wesnoth/data/units/Mermaid_Siren.cfg
diff -u wesnoth/data/units/Mermaid_Siren.cfg:1.11 
wesnoth/data/units/Mermaid_Siren.cfg:1.12
--- wesnoth/data/units/Mermaid_Siren.cfg:1.11   Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Mermaid_Siren.cfg        Sun Jul 31 20:31:44 2005
@@ -9,15 +9,8 @@
 movement_type=swimmer
 movement=7
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
Index: wesnoth/data/units/Merman_Entangler.cfg
diff -u wesnoth/data/units/Merman_Entangler.cfg:1.5 
wesnoth/data/units/Merman_Entangler.cfg:1.6
--- wesnoth/data/units/Merman_Entangler.cfg:1.5 Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Merman_Entangler.cfg     Sun Jul 31 20:31:44 2005
@@ -7,15 +7,8 @@
 movement_type=swimmer
 movement=7
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
Index: wesnoth/data/units/Merman_Hoplite.cfg
diff -u wesnoth/data/units/Merman_Hoplite.cfg:1.9 
wesnoth/data/units/Merman_Hoplite.cfg:1.10
--- wesnoth/data/units/Merman_Hoplite.cfg:1.9   Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Merman_Hoplite.cfg       Sun Jul 31 20:31:44 2005
@@ -23,15 +23,8 @@
 [/resistance]
 movement=5
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 ability=steadfast
 level=3
 alignment=lawful
Index: wesnoth/data/units/Merman_Javelineer.cfg
diff -u wesnoth/data/units/Merman_Javelineer.cfg:1.5 
wesnoth/data/units/Merman_Javelineer.cfg:1.6
--- wesnoth/data/units/Merman_Javelineer.cfg:1.5        Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Merman_Javelineer.cfg    Sun Jul 31 20:31:44 2005
@@ -8,15 +8,8 @@
 movement_type=swimmer
 movement=6
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
Index: wesnoth/data/units/Merman_Triton.cfg
diff -u wesnoth/data/units/Merman_Triton.cfg:1.6 
wesnoth/data/units/Merman_Triton.cfg:1.7
--- wesnoth/data/units/Merman_Triton.cfg:1.6    Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Merman_Triton.cfg        Sun Jul 31 20:31:44 2005
@@ -11,15 +11,8 @@
     [/defense]
 movement=6
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
Index: wesnoth/data/units/Naga-Myrmidon.cfg
diff -u wesnoth/data/units/Naga-Myrmidon.cfg:1.6 
wesnoth/data/units/Naga-Myrmidon.cfg:1.7
--- wesnoth/data/units/Naga-Myrmidon.cfg:1.6    Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Naga-Myrmidon.cfg        Sun Jul 31 20:31:44 2005
@@ -13,15 +13,10 @@
 [/defense]
 movement=7
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=neutral
 advanceto=null
@@ -62,15 +57,10 @@
        [/defense]
        movement=7
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
        level=3
        alignment=neutral
        advanceto=null
Index: wesnoth/data/units/Necrophage.cfg
diff -u wesnoth/data/units/Necrophage.cfg:1.11 
wesnoth/data/units/Necrophage.cfg:1.12
--- wesnoth/data/units/Necrophage.cfg:1.11      Sun Jul 31 00:14:44 2005
+++ wesnoth/data/units/Necrophage.cfg   Sun Jul 31 20:31:44 2005
@@ -7,20 +7,12 @@
 hitpoints=42
 movement_type=undeadfoot
 movement=5
-experience=65
+experience=66
+{amla.cfg}
+{AMLA_NECROHEAL}
 level=2
 alignment=chaotic
 advanceto=null
-       [advancement]
-       max_times=100
-       id = Satiated
-       description = _ "satiated"
-               [effect]
-               apply_to=hitpoints
-               increase_total=0%
-               heal_full=yes
-               [/effect]
-       [/advancement]
 cost=36
 usage=fighter
 unit_description= _ "Driven ravenous by an unholy hunger for dead flesh, 
Necrophages attack their hoped-for food with beast-like ferocity. When they are 
sated with the flesh of their victims, they simply shrug off all damage 
sustained as if they had been freshly summoned, to begin their search for flesh 
again.
Index: wesnoth/data/units/Nightgaunt.cfg
diff -u wesnoth/data/units/Nightgaunt.cfg:1.14 
wesnoth/data/units/Nightgaunt.cfg:1.15
--- wesnoth/data/units/Nightgaunt.cfg:1.14      Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Nightgaunt.cfg   Sun Jul 31 20:31:44 2005
@@ -8,15 +8,8 @@
 movement_type=undeadspirit
 movement=7
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Noble_Lord.cfg
diff -u wesnoth/data/units/Noble_Lord.cfg:1.8 
wesnoth/data/units/Noble_Lord.cfg:1.9
--- wesnoth/data/units/Noble_Lord.cfg:1.8       Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Noble_Lord.cfg   Sun Jul 31 20:31:44 2005
@@ -16,15 +16,8 @@
 movement_type=smallfoot
 movement=6
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
Index: wesnoth/data/units/Ogre.cfg
diff -u wesnoth/data/units/Ogre.cfg:1.11 wesnoth/data/units/Ogre.cfg:1.12
--- wesnoth/data/units/Ogre.cfg:1.11    Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Ogre.cfg Sun Jul 31 20:31:44 2005
@@ -8,15 +8,8 @@
 movement_type=largefoot
 movement=5
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=neutral
 advanceto=null
Index: wesnoth/data/units/Orcish_Shaman.cfg
diff -u wesnoth/data/units/Orcish_Shaman.cfg:1.10 
wesnoth/data/units/Orcish_Shaman.cfg:1.11
--- wesnoth/data/units/Orcish_Shaman.cfg:1.10   Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Orcish_Shaman.cfg        Sun Jul 31 20:31:44 2005
@@ -8,15 +8,12 @@
 movement_type=smallfoot
 movement=5
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=chaotic
 advanceto=null
@@ -76,15 +73,12 @@
 movement_type=smallfoot
 movement=5
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=chaotic
 advanceto=null
@@ -144,15 +138,12 @@
 movement_type=smallfoot
 movement=5
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Orcish_Slayer.cfg
diff -u wesnoth/data/units/Orcish_Slayer.cfg:1.19 
wesnoth/data/units/Orcish_Slayer.cfg:1.20
--- wesnoth/data/units/Orcish_Slayer.cfg:1.19   Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Orcish_Slayer.cfg        Sun Jul 31 20:31:44 2005
@@ -8,15 +8,8 @@
 movement_type=elusivefoot
 movement=6
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Orcish_Slurbow.cfg
diff -u wesnoth/data/units/Orcish_Slurbow.cfg:1.6 
wesnoth/data/units/Orcish_Slurbow.cfg:1.7
--- wesnoth/data/units/Orcish_Slurbow.cfg:1.6   Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Orcish_Slurbow.cfg       Sun Jul 31 20:31:44 2005
@@ -8,15 +8,8 @@
 movement_type=orcishfoot
 movement=5
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Orcish_Sovereign.cfg
diff -u wesnoth/data/units/Orcish_Sovereign.cfg:1.8 
wesnoth/data/units/Orcish_Sovereign.cfg:1.9
--- wesnoth/data/units/Orcish_Sovereign.cfg:1.8 Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Orcish_Sovereign.cfg     Sun Jul 31 20:31:44 2005
@@ -10,15 +10,8 @@
 movement_type=orcishfoot
 movement=6
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Orcish_Warlord.cfg
diff -u wesnoth/data/units/Orcish_Warlord.cfg:1.19 
wesnoth/data/units/Orcish_Warlord.cfg:1.20
--- wesnoth/data/units/Orcish_Warlord.cfg:1.19  Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Orcish_Warlord.cfg       Sun Jul 31 20:31:44 2005
@@ -8,15 +8,8 @@
 movement_type=orcishfoot
 movement=5
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Outlaw.cfg
diff -u wesnoth/data/units/Outlaw.cfg:1.16 wesnoth/data/units/Outlaw.cfg:1.17
--- wesnoth/data/units/Outlaw.cfg:1.16  Sun Jul 24 16:04:26 2005
+++ wesnoth/data/units/Outlaw.cfg       Sun Jul 31 20:31:44 2005
@@ -9,15 +9,10 @@
 movement_type=elusivefoot
 movement=7
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=chaotic
 advanceto=null
@@ -90,15 +85,10 @@
        movement_type=elusivefoot
        movement=7
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
        level=2
        alignment=chaotic
        advanceto=null
Index: wesnoth/data/units/Outlaw_Queen.cfg
diff -u wesnoth/data/units/Outlaw_Queen.cfg:1.10 
wesnoth/data/units/Outlaw_Queen.cfg:1.11
--- wesnoth/data/units/Outlaw_Queen.cfg:1.10    Tue Jul 26 14:37:52 2005
+++ wesnoth/data/units/Outlaw_Queen.cfg Sun Jul 31 20:31:44 2005
@@ -13,15 +13,8 @@
 movement_type=elusivefoot
 movement=7
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Paladin.cfg
diff -u wesnoth/data/units/Paladin.cfg:1.19 wesnoth/data/units/Paladin.cfg:1.20
--- wesnoth/data/units/Paladin.cfg:1.19 Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Paladin.cfg      Sun Jul 31 20:31:44 2005
@@ -13,15 +13,8 @@
     holy=50
     [/resistance]
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
Index: wesnoth/data/units/Pirate_Galleon.cfg
diff -u wesnoth/data/units/Pirate_Galleon.cfg:1.11 
wesnoth/data/units/Pirate_Galleon.cfg:1.12
--- wesnoth/data/units/Pirate_Galleon.cfg:1.11  Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Pirate_Galleon.cfg       Sun Jul 31 20:31:44 2005
@@ -6,15 +6,8 @@
 movement_type=float
 movement=5
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=lawful
 advanceto=null
Index: wesnoth/data/units/Royal_Guard.cfg
diff -u wesnoth/data/units/Royal_Guard.cfg:1.19 
wesnoth/data/units/Royal_Guard.cfg:1.20
--- wesnoth/data/units/Royal_Guard.cfg:1.19     Sun Jul 24 16:24:16 2005
+++ wesnoth/data/units/Royal_Guard.cfg  Sun Jul 31 20:31:44 2005
@@ -13,15 +13,8 @@
     [/resistance]
 movement=6
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
Index: wesnoth/data/units/Saurian_Flanker.cfg
diff -u wesnoth/data/units/Saurian_Flanker.cfg:1.6 
wesnoth/data/units/Saurian_Flanker.cfg:1.7
--- wesnoth/data/units/Saurian_Flanker.cfg:1.6  Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Saurian_Flanker.cfg      Sun Jul 31 20:31:44 2005
@@ -9,15 +9,8 @@
 movement_type=lizard
 movement=7
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Saurian_Icecaster.cfg
diff -u wesnoth/data/units/Saurian_Icecaster.cfg:1.15 
wesnoth/data/units/Saurian_Icecaster.cfg:1.16
--- wesnoth/data/units/Saurian_Icecaster.cfg:1.15       Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Saurian_Icecaster.cfg    Sun Jul 31 20:31:44 2005
@@ -9,15 +9,8 @@
 movement_type=lizard
 movement=6
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Saurian_Soothsayer.cfg
diff -u wesnoth/data/units/Saurian_Soothsayer.cfg:1.15 
wesnoth/data/units/Saurian_Soothsayer.cfg:1.16
--- wesnoth/data/units/Saurian_Soothsayer.cfg:1.15      Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Saurian_Soothsayer.cfg   Sun Jul 31 20:31:44 2005
@@ -10,15 +10,8 @@
 movement_type=lizard
 movement=6
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Saurian_Warrior.cfg
diff -u wesnoth/data/units/Saurian_Warrior.cfg:1.15 
wesnoth/data/units/Saurian_Warrior.cfg:1.16
--- wesnoth/data/units/Saurian_Warrior.cfg:1.15 Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Saurian_Warrior.cfg      Sun Jul 31 20:31:44 2005
@@ -11,15 +11,8 @@
 movement_type=lizard
 movement=7
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=chaotic 
 advanceto=null
Index: wesnoth/data/units/Sea_Hag.cfg
diff -u wesnoth/data/units/Sea_Hag.cfg:1.21 wesnoth/data/units/Sea_Hag.cfg:1.22
--- wesnoth/data/units/Sea_Hag.cfg:1.21 Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Sea_Hag.cfg      Sun Jul 31 20:31:44 2005
@@ -12,15 +12,8 @@
 movement_type=swimmer
 movement=6
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=neutral
 advanceto=null
Index: wesnoth/data/units/Sea_Orc.cfg
diff -u wesnoth/data/units/Sea_Orc.cfg:1.13 wesnoth/data/units/Sea_Orc.cfg:1.14
--- wesnoth/data/units/Sea_Orc.cfg:1.13 Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Sea_Orc.cfg      Sun Jul 31 20:31:44 2005
@@ -8,15 +8,8 @@
 movement_type=swimmer
 movement=5
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Sea_Serpent.cfg
diff -u wesnoth/data/units/Sea_Serpent.cfg:1.10 
wesnoth/data/units/Sea_Serpent.cfg:1.11
--- wesnoth/data/units/Sea_Serpent.cfg:1.10     Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Sea_Serpent.cfg  Sun Jul 31 20:31:44 2005
@@ -8,15 +8,8 @@
 movement_type=deepsea
 movement=8
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Silver_Mage.cfg
diff -u wesnoth/data/units/Silver_Mage.cfg:1.17 
wesnoth/data/units/Silver_Mage.cfg:1.18
--- wesnoth/data/units/Silver_Mage.cfg:1.17     Mon Jul 18 20:07:25 2005
+++ wesnoth/data/units/Silver_Mage.cfg  Sun Jul 31 20:31:44 2005
@@ -13,15 +13,10 @@
     [/resistance]
 movement=6
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=neutral
 advanceto=null
@@ -157,15 +152,10 @@
            [/resistance]
        movement=6
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
        level=3
        alignment=neutral
        advanceto=null
Index: wesnoth/data/units/Skeletal_Dragon.cfg
diff -u wesnoth/data/units/Skeletal_Dragon.cfg:1.6 
wesnoth/data/units/Skeletal_Dragon.cfg:1.7
--- wesnoth/data/units/Skeletal_Dragon.cfg:1.6  Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Skeletal_Dragon.cfg      Sun Jul 31 20:31:44 2005
@@ -9,15 +9,8 @@
 movement_type=undeadfly
 movement=5
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=4
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Sleeping_Gryphon.cfg
diff -u wesnoth/data/units/Sleeping_Gryphon.cfg:1.10 
wesnoth/data/units/Sleeping_Gryphon.cfg:1.11
--- wesnoth/data/units/Sleeping_Gryphon.cfg:1.10        Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Sleeping_Gryphon.cfg     Sun Jul 31 20:31:44 2005
@@ -7,15 +7,8 @@
 movement_type=mounted
 movement=1
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=neutral
 advanceto=null
Index: wesnoth/data/units/Soul_Shooter.cfg
diff -u wesnoth/data/units/Soul_Shooter.cfg:1.10 
wesnoth/data/units/Soul_Shooter.cfg:1.11
--- wesnoth/data/units/Soul_Shooter.cfg:1.10    Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Soul_Shooter.cfg Sun Jul 31 20:31:44 2005
@@ -10,15 +10,8 @@
 movement_type=undeadfoot
 movement=5
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Soulless.cfg
diff -u wesnoth/data/units/Soulless.cfg:1.12 
wesnoth/data/units/Soulless.cfg:1.13
--- wesnoth/data/units/Soulless.cfg:1.12        Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Soulless.cfg     Sun Jul 31 20:31:44 2005
@@ -8,15 +8,20 @@
 movement_type=undeadfoot
 movement=4
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=chaotic
 advanceto=null
@@ -89,15 +94,20 @@
 movement_type=undeadfoot
 movement=4
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=chaotic
 advanceto=null
@@ -173,15 +183,20 @@
 movement_type=undeadfoot
 movement=4
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=chaotic
 advanceto=null
@@ -258,15 +273,20 @@
 movement_type=undeadfoot
 movement=4
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=chaotic
 advanceto=null
@@ -342,15 +362,20 @@
 movement_type=undeadfoot
 movement=4
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=chaotic
 advanceto=null
@@ -426,15 +451,20 @@
 movement_type=undeadfoot
 movement=4
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=chaotic
 advanceto=null
@@ -510,15 +540,20 @@
 movement_type=undeadfoot
 movement=4
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Spectre.cfg
diff -u wesnoth/data/units/Spectre.cfg:1.15 wesnoth/data/units/Spectre.cfg:1.16
--- wesnoth/data/units/Spectre.cfg:1.15 Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Spectre.cfg      Sun Jul 31 20:31:44 2005
@@ -13,15 +13,8 @@
        impact=60
 [/resistance]
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Tentacle.cfg
diff -u wesnoth/data/units/Tentacle.cfg:1.5 wesnoth/data/units/Tentacle.cfg:1.6
--- wesnoth/data/units/Tentacle.cfg:1.5 Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Tentacle.cfg     Sun Jul 31 20:31:44 2005
@@ -9,15 +9,8 @@
 movement_type=float
 movement=2
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Transport_Galleon.cfg
diff -u wesnoth/data/units/Transport_Galleon.cfg:1.9 
wesnoth/data/units/Transport_Galleon.cfg:1.10
--- wesnoth/data/units/Transport_Galleon.cfg:1.9        Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Transport_Galleon.cfg    Sun Jul 31 20:31:44 2005
@@ -6,15 +6,8 @@
 movement_type=float
 movement=6
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=lawful
 advanceto=null
Index: wesnoth/data/units/Trapper.cfg
diff -u wesnoth/data/units/Trapper.cfg:1.11 wesnoth/data/units/Trapper.cfg:1.12
--- wesnoth/data/units/Trapper.cfg:1.11 Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Trapper.cfg      Sun Jul 31 20:31:44 2005
@@ -8,15 +8,8 @@
 movement_type=smallfoot
 movement=5
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Triton.cfg
diff -u wesnoth/data/units/Triton.cfg:1.10 wesnoth/data/units/Triton.cfg:1.11
--- wesnoth/data/units/Triton.cfg:1.10  Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Triton.cfg       Sun Jul 31 20:31:44 2005
@@ -14,15 +14,8 @@
 movement_type=swimmer
 movement=7
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=lawful
 advanceto=null
Index: wesnoth/data/units/Troll_Rocklobber.cfg
diff -u wesnoth/data/units/Troll_Rocklobber.cfg:1.10 
wesnoth/data/units/Troll_Rocklobber.cfg:1.11
--- wesnoth/data/units/Troll_Rocklobber.cfg:1.10        Wed Jul 13 15:58:59 2005
+++ wesnoth/data/units/Troll_Rocklobber.cfg     Sun Jul 31 20:31:44 2005
@@ -9,15 +9,8 @@
 movement_type=largefoot
 movement=4
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Troll_Warrior.cfg
diff -u wesnoth/data/units/Troll_Warrior.cfg:1.19 
wesnoth/data/units/Troll_Warrior.cfg:1.20
--- wesnoth/data/units/Troll_Warrior.cfg:1.19   Wed Jul 13 15:58:59 2005
+++ wesnoth/data/units/Troll_Warrior.cfg        Sun Jul 31 20:31:44 2005
@@ -9,15 +9,8 @@
 movement_type=largefoot
 movement=5
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Vampire_Lady.cfg
diff -u wesnoth/data/units/Vampire_Lady.cfg:1.10 
wesnoth/data/units/Vampire_Lady.cfg:1.11
--- wesnoth/data/units/Vampire_Lady.cfg:1.10    Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Vampire_Lady.cfg Sun Jul 31 20:31:44 2005
@@ -9,15 +9,8 @@
 movement_type=undeadfly
 movement=8
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
Index: wesnoth/data/units/Wall_Guard.cfg
diff -u wesnoth/data/units/Wall_Guard.cfg:1.7 
wesnoth/data/units/Wall_Guard.cfg:1.8
--- wesnoth/data/units/Wall_Guard.cfg:1.7       Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Wall_Guard.cfg   Sun Jul 31 20:31:44 2005
@@ -23,15 +23,8 @@
        [/resistance]
 movement=4
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=lawful
 advanceto=null
Index: wesnoth/data/units/Warrior_King.cfg
diff -u wesnoth/data/units/Warrior_King.cfg:1.6 
wesnoth/data/units/Warrior_King.cfg:1.7
--- wesnoth/data/units/Warrior_King.cfg:1.6     Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Warrior_King.cfg Sun Jul 31 20:31:44 2005
@@ -13,15 +13,8 @@
 movement_type=armoredfoot
 movement=6
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
Index: wesnoth/data/units/Watch_Tower.cfg
diff -u wesnoth/data/units/Watch_Tower.cfg:1.10 
wesnoth/data/units/Watch_Tower.cfg:1.11
--- wesnoth/data/units/Watch_Tower.cfg:1.10     Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Watch_Tower.cfg  Sun Jul 31 20:31:44 2005
@@ -6,15 +6,8 @@
 movement_type=none
 movement=1
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=neutral
 advanceto=null
Index: wesnoth/data/units/Yeti.cfg
diff -u wesnoth/data/units/Yeti.cfg:1.7 wesnoth/data/units/Yeti.cfg:1.8
--- wesnoth/data/units/Yeti.cfg:1.7     Tue Jul  5 13:42:04 2005
+++ wesnoth/data/units/Yeti.cfg Sun Jul 31 20:31:44 2005
@@ -22,15 +22,8 @@
        [/resistance]
 
 experience=100
-       [advancement]
-       max_times=100
-       id = tough
-       description = _ "tough"
-               [effect]
-               apply_to=hitpoints
-               increase_total=3
-               [/effect]
-       [/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=4
 alignment=neutral
 advanceto=null




reply via email to

[Prev in Thread] Current Thread [Next in Thread]