Skip to content

Commit

Permalink
Merge branch 'mod'
Browse files Browse the repository at this point in the history
Conflicts:
	changelog
	players_changelog
  • Loading branch information
fendrin committed May 9, 2014
2 parents 35e53c5 + b4ea561 commit 3c9ea89
Show file tree
Hide file tree
Showing 21 changed files with 847 additions and 8 deletions.
40 changes: 40 additions & 0 deletions _main.cfg
@@ -0,0 +1,40 @@
[core]
id=default
name= _ "Wesnoth (default)"
rank=5
icon=icons/icon-game.png
image="wesnoth-icon.png"
description= _ "Wesnoth has many different sagas waiting to be played. Fight to regain the throne of Wesnoth, of which you are the legitimate heir... step into the boots of a young officer sent to guard a not-so-sleepy frontier outpost... lead a brutal quest to unite the orcish tribes... vanquish a horde of undead warriors unleashed by a foul necromancer, who also happens to have taken your brother hostage... guide a band of elvish survivors in an epic quest to find a new home... get revenge on the orcs by using the foul art of necromancy...
There are at least two hundred unit types, sixteen races, seven major factions, and hundreds of years of history.
" + _"(17 Single Player Campaigns with 211 Scenarios,
One Multiplayer Campaign with 14 Scenarios,
7 Factions battling on 46 Multiplayer Maps/Scenarios,
500+ Add-ons.)"
path="/"
[/core]

# test cores
[core]
id=broken
name= _ "The Broken One"
rank=10
icon=icons/icon-game.png
#image="wesnoth-icon.png"
description= _ "The Broken One
is a test core for the fallback solution.
" + _"(No gameplay, expected to fail during loading.)"
path="evil/broken/path"
[/core]

[core]
id=working
name= _ "Clone of Default"
rank=15
icon=icons/icon-game.png
#image="wesnoth-icon.png"
description= _ "Test core which should match the default one but not load any add-ons."
path="/"
[/core]
1 change: 1 addition & 0 deletions changelog
Expand Up @@ -132,6 +132,7 @@ Version 1.13.0-dev:
commands can be used to script a scenario and use the same code path
as if a human / ai ordered the command. These are intended to facilitate
making some kinds of noninteractive unit tests.
* Support for total conversions, so called "cores".

Version 1.11.11:
* Add-ons server:
Expand Down
2 changes: 1 addition & 1 deletion data/campaigns/Legend_of_Wesmere/_main.cfg
Expand Up @@ -65,7 +65,7 @@
" + _"(Intermediate level, 18 scenarios.)"
difficulty_descriptions={MENU_IMG_TXT2 "units/elves-wood/fighter.png~RC(magenta>brown)" _"Soldier" _"(Easy)"} +
";*" + {MENU_IMG_TXT2 "units/elves-wood/lord.png~RC(magenta>brown)" _"Lord" _"(Normal)"} +
";" + {MENU_IMG_TXT2 "units/elves-wood/high-lord.png~RC(magenta>brown)" _"High Lord" _"(Hard)"}
";" + {MENU_IMG_TXT2 "units/elves-wood/high-lord.png~RC(magenta>brown)" _"High Lord" _"(Challenging)"}

[about]
title= _ "Creator and Lead Designer"
Expand Down

0 comments on commit 3c9ea89

Please sign in to comment.