Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WC] [1.17] Three New factions to complete WC era. #6239

Merged
merged 14 commits into from
Oct 31, 2021
Merged

[WC] [1.17] Three New factions to complete WC era. #6239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
fd7887d
added the aristocrats faction
knyghtmare Oct 29, 2021
67fdcce
[WC] included the aristocrats faction in WC era
knyghtmare Oct 29, 2021
10a4de1
[WC] adjusted empire faction pairs to reduce its weirdness
knyghtmare Oct 29, 2021
655dead
[WC] run wmlindent on the WC factions directory
knyghtmare Oct 29, 2021
512526b
[WC] renamed aristocrats to artisans
knyghtmare Oct 29, 2021
66c18ec
[wc] adjusted recruit list of artisans
knyghtmare Oct 29, 2021
268308c
[WC] added new faction The Marauders
knyghtmare Oct 29, 2021
098403e
[WC] changed leaders and random leaders for the marauders
knyghtmare Oct 29, 2021
3ee9807
[wc] added missing recruit dune herbalist to marauders faction of wc era
knyghtmare Oct 29, 2021
5ad17db
[wc] added the defiance faction to the WC era
knyghtmare Oct 29, 2021
efb9c43
[wc] ran wmlindent on files inside the era directory
knyghtmare Oct 29, 2021
f1313ff
[WC] added a missing WC2 unit pair in The Empire
knyghtmare Oct 31, 2021
717f8ef
[WC] add some minor adjustments to the new WC factions
knyghtmare Oct 31, 2021
e8d841a
[WC] changed heroes pools for the defiance faction
knyghtmare Oct 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions data/campaigns/World_Conquest/era/era.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,14 @@
{MULTIPLAYER_SIDE_THE_GUILD}
{MULTIPLAYER_SIDE_THE_HAND}
{MULTIPLAYER_SIDE_THE_MILITIA}
{MULTIPLAYER_SIDE_THE_MARAUDERS}
{MULTIPLAYER_SIDE_THE_HORDE}
{MULTIPLAYER_SIDE_THE_CULT}
{MULTIPLAYER_SIDE_THE_GANG}
{MULTIPLAYER_SIDE_THE_SCOURGE}
{MULTIPLAYER_SIDE_THE_ALLIANCE}
{MULTIPLAYER_SIDE_THE_DEFIANCE}
{MULTIPLAYER_SIDE_THE_ARTISANS}
{MULTIPLAYER_SIDE_THE_EMPIRE}
[load_resource]
id = "wc2_era_res"
Expand Down
30 changes: 30 additions & 0 deletions data/campaigns/World_Conquest/era/factions/The_Artisans.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#textdomain wesnoth-wc

# Dunefolk + Dwarves

#define MULTIPLAYER_SIDE_THE_ARTISANS
[multiplayer_side]
id=The_Artisans
name=_"The Artisans"
recruit=Dune Rover,Dwarvish Scout,Dune Burner,Dwarvish Thunderer,Dune Soldier,Dwarvish Fighter,Dune Skirmisher,Dwarvish Ulfserker,Dune Herbalist,Dune Herbalist,Dune Rider,Gryphon Rider,Falcon,Falcon
image={IMG_ARTISANS}
type=random
leader= Dune Explorer,Dune Swordsman,Dune Spearguard,Dune Skirmisher,Dune Apothecary,Dune Scorcher,Dwarvish Steelclad,Dwarvish Thunderguard
random_leader= Dune Explorer,Dune Swordsman,Dune Spearguard,Dune Skirmisher,Dune Apothecary,Dune Scorcher,Dwarvish Steelclad,Dwarvish Thunderguard
[world_conquest_data]
commanders=Dunefolk,Knalgans
heroes=Loyalists,Drakes
deserters=Undead,Northerners
{WC_II_PAIR "Dune Rover" "Dwarvish Scout"}
{WC_II_PAIR "Dune Burner" "Dwarvish Thunderer"}
{WC_II_PAIR "Dune Soldier" "Dwarvish Fighter"}
{WC_II_PAIR "Dune Skirmisher" "Dwarvish Ulfserker"}
{WC_II_PAIR "Dune Herbalist" "Dune Herbalist"}
{WC_II_PAIR "Dune Rider" "Gryphon Rider"}
{WC_II_PAIR "Falcon" "Falcon"}
[/world_conquest_data]
[/multiplayer_side]
#enddef

#define IMG_ARTISANS
"misc/blank-hex.png~BLIT(units/dunefolk/soldier/swordsman.png~RC(magenta>teal)~CROP(0,13,57,59),15,0)~BLIT(units/dwarves/stalwart.png~RC(magenta>teal)~CROP(11,0,61,67),0,5)" #enddef
31 changes: 31 additions & 0 deletions data/campaigns/World_Conquest/era/factions/The_Defiance.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#textdomain wesnoth-wc

# Dunefolk + Undead

#define MULTIPLAYER_SIDE_THE_DEFIANCE
[multiplayer_side]
id=The_Defiance
name=_"The Defiance"
recruit=Dune Rover,Skeleton Archer,Dune Burner,Dark Adept,Dune Soldier,Skeleton,Dune Rider,Ghost,Dune Skirmisher,Ghoul,Walking Corpse,Walking Corpse,Dune Herbalist,Dune Herbalist,Falcon,Vampire Bat
image={IMG_DEFIANCE}
type=random
leader= Dune Explorer,Dune Swordsman,Dune Spearguard,Dune Skirmisher,Dune Apothecary,Dune Scorcher,Dark Sorcerer,Bone Shooter,Revenant,Necrophage
random_leader= Dune Explorer,Dune Swordsman,Dune Spearguard,Dune Skirmisher,Dune Apothecary,Dune Scorcher,Dark Sorcerer,Bone Shooter,Revenant,Necrophage
[world_conquest_data]
commanders=Dunefolk,Undead
heroes=Dunefolk,Northerners
deserters=Rebels,Loyalists
{WC_II_PAIR "Dune Rover" "Skeleton Archer"}
{WC_II_PAIR "Dune Burner" "Dark Adept"}
{WC_II_PAIR "Dune Soldier" "Skeleton"}
{WC_II_PAIR "Dune Rider" "Ghost"}
{WC_II_PAIR "Dune Skirmisher" "Ghoul"}
{WC_II_PAIR "Walking Corpse" "Walking Corpse"}
{WC_II_PAIR "Dune Herbalist" "Dune Herbalist"}
{WC_II_PAIR "Falcon" "Vampire Bat"}
[/world_conquest_data]
[/multiplayer_side]
#enddef

#define IMG_DEFIANCE
"misc/blank-hex.png~BLIT(units/dunefolk/soldier/spearguard.png~RC(magenta>teal)~CROP(0,13,57,59),15,0)~BLIT(units/undead-skeletal/deathblade.png~RC(magenta>teal)~CROP(11,0,61,67),0,5)" #enddef
5 changes: 3 additions & 2 deletions data/campaigns/World_Conquest/era/factions/The_Empire.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@
deserters=Empire_deserters,Young Ogre
{WC_II_PAIR "Dune Rover" "Elvish Fighter"}
{WC_II_PAIR "Dune Burner" "Drake Burner"}
{WC_II_PAIR "Dune Soldier" "Spearman"}
{WC_II_PAIR "Dune Skirmisher" "Dwarvish Fighter"}
{WC_II_PAIR "Dune Soldier" "Dwarvish Fighter"}
{WC_II_PAIR "Dune Skirmisher" "Fencer"}
{WC_II_PAIR "Dune Herbalist" "Dune Herbalist"}
{WC_II_PAIR "Dune Rider" "Orcish Archer"}
{WC_II_PAIR "Falcon" "Vampire Bat"}
[/world_conquest_data]
[/multiplayer_side]
#enddef
Expand Down
30 changes: 30 additions & 0 deletions data/campaigns/World_Conquest/era/factions/The_Marauders.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#textdomain wesnoth-wc

# Dunefolk + Northerners

#define MULTIPLAYER_SIDE_THE_MARAUDERS
[multiplayer_side]
id=The_Marauders
name=_"The Marauders"
recruit=Dune Rover,Orcish Assassin,Dune Burner,Orcish Archer,Dune Soldier,Orcish Grunt,Dune Rider,Wolf Rider,Dune Skirmisher,Troll Whelp,Dune Herbalist,Dune Herbalist,Naga Dirkfang,Naga Fighter
image={IMG_MARAUDERS}
type=random
leader= Dune Explorer,Dune Swordsman,Dune Spearguard,Dune Skirmisher,Dune Apothecary,Dune Scorcher,Orcish Warrior,Orcish Crossbowman,Troll
random_leader= Dune Explorer,Dune Swordsman,Dune Spearguard,Dune Skirmisher,Dune Apothecary,Dune Scorcher,Orcish Warrior,Orcish Crossbowman,Troll
[world_conquest_data]
commanders=Dunefolk,Northerners
heroes=Dunefolk,Undead
deserters=Rebels,Loyalists
{WC_II_PAIR "Dune Rover" "Orcish Assassin"}
{WC_II_PAIR "Dune Burner" "Orcish Archer"}
{WC_II_PAIR "Dune Soldier" "Orcish Grunt"}
{WC_II_PAIR "Dune Skirmisher" "Troll Whelp"}
{WC_II_PAIR "Naga Dirkfang" "Naga Fighter"}
{WC_II_PAIR "Dune Herbalist" "Dune Herbalist"}
{WC_II_PAIR "Dune Rider" "Wolf Rider"}
[/world_conquest_data]
[/multiplayer_side]
#enddef

#define IMG_MARAUDERS
"misc/blank-hex.png~BLIT(units/dunefolk/soldier/swordsman.png~RC(magenta>teal)~CROP(0,13,57,59),15,0)~BLIT(units/orcs/warrior.png~RC(magenta>teal)~CROP(11,0,61,67),0,5)" #enddef