0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

revert patch 2642 since it faults on command line startup

Browse source
This commit is contained in:
Jérémy Rosen 2012-04-08 13:40:04 +00:00
parent 5441ada41d
commit 91c9246ff1
8 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog
View file

@ -837,7 +837,6 @@ Version 1.9.7:
* new function wesnoth.get_time_of_day
* new functions os.clock, os.date, os.time and os.difftime
* Multiplayer:
* Random leader is default selection when picking faction
* New "Shuffle sides" option in MP creation list, allowing to randomize
player to side assignment (patch #1937 by Quetzalcoatl)
* User interface:

2
data/multiplayer/factions/drakes-default.cfg
View file

@ -4,7 +4,7 @@
name= _"Drakes"
image="units/drakes/flare.png"
{MAGENTA_IS_THE_TEAM_COLOR}
type=random
type=Drake Flare
leader=Drake Flare,Fire Drake,Drake Arbiter,Drake Thrasher,Drake Warrior,Saurian Oracle,Saurian Soothsayer
random_leader=Drake Flare,Fire Drake,Drake Arbiter,Drake Thrasher,Drake Warrior
recruit=Drake Burner,Drake Clasher,Drake Glider,Drake Fighter,Saurian Skirmisher,Saurian Augur

2
data/multiplayer/factions/knalgans-default.cfg
View file

@ -4,7 +4,7 @@
name=_"Knalgan Alliance"
image="units/dwarves/steelclad.png"
{MAGENTA_IS_THE_TEAM_COLOR}
type=random
type=Dwarvish Steelclad
leader=Dwarvish Steelclad,Dwarvish Thunderguard,Dwarvish Stalwart,Rogue,Trapper
recruit=Dwarvish Guardsman,Dwarvish Fighter,Dwarvish Ulfserker,Dwarvish Thunderer,Thief,Poacher,Footpad,Gryphon Rider
terrain_liked=Hh, Ha, Mm

2
data/multiplayer/factions/loyalists-default.cfg
View file

@ -4,7 +4,7 @@
name= _"Loyalists"
image="units/human-loyalists/lieutenant.png"
{MAGENTA_IS_THE_TEAM_COLOR}
type=random
type=Lieutenant
leader=Lieutenant,Swordsman,Pikeman,Javelineer,Shock Trooper,Longbowman,White Mage,Red Mage
random_leader=Lieutenant,Swordsman,Pikeman,Javelineer,Longbowman,White Mage,Red Mage
recruit=Cavalryman,Horseman,Spearman,Fencer,Heavy Infantryman,Bowman,Mage,Merman Fighter

2
data/multiplayer/factions/northerners-default.cfg
View file

@ -4,7 +4,7 @@
name= _"Northerners"
image="units/orcs/warrior.png"
{MAGENTA_IS_THE_TEAM_COLOR}
type=random
type=Orcish Warrior
leader=Orcish Warrior,Troll,Troll Rocklobber,Orcish Crossbowman,Orcish Slayer
recruit=Orcish Grunt,Troll Whelp,Wolf Rider,Orcish Archer,Orcish Assassin,Naga Fighter,Goblin Spearman
terrain_liked=Hh, Ha, Mm, Ss

2
data/multiplayer/factions/rebels-default.cfg
View file

@ -4,7 +4,7 @@
name= _"Rebels"
image="units/elves-wood/captain.png"
{MAGENTA_IS_THE_TEAM_COLOR}
type=random
type=Elvish Captain
leader=Elvish Captain,Elvish Hero,Elvish Ranger,Elvish Marksman,Elvish Druid,Elvish Sorceress,White Mage,Red Mage,Elder Wose
random_leader=Elvish Captain,Elvish Hero,Elvish Ranger,Elvish Marksman,Elvish Druid,Elvish Sorceress,White Mage,Red Mage
recruit=Elvish Fighter,Elvish Archer,Mage,Elvish Shaman,Elvish Scout,Wose,Merman Hunter

2
data/multiplayer/factions/undead-default.cfg
View file

@ -4,7 +4,7 @@
name= _"Undead"
image="units/undead-necromancers/dark-sorcerer.png"
{MAGENTA_IS_THE_TEAM_COLOR}
type=random
type=Dark Sorcerer
leader=Dark Sorcerer,Revenant,Deathblade,Bone Shooter,Necrophage
random_leader=Dark Sorcerer,Revenant,Deathblade,Bone Shooter
recruit=Skeleton,Skeleton Archer,Walking Corpse,Ghost,Vampire Bat,Dark Adept,Ghoul

6
src/leader_list.cpp
View file

@ -91,7 +91,6 @@ void leader_list_manager::update_leader_list(int side_index)
}
const std::string default_leader = side["type"];
const std::string random_leader = "random";
size_t default_index = 0;
std::vector<std::string>::const_iterator itor;
@ -107,10 +106,7 @@ void leader_list_manager::update_leader_list(int side_index)
leaders_.push_back(default_leader);
}
if (default_leader != random_leader) {
leaders_.push_back(random_leader);
}
leaders_.push_back("random");
populate_leader_combo(default_index);
}