disable entry point to zaroth's project for the stable release
This commit is meant to be reverted once that this project continues. Removes test_campaign from data/campaigns, commented out --new-syntax commandline parameter and disabled boost test for said parameter.
This commit is contained in:
Anonymissimus
parent
b0c86d5be7
commit
e8ac12f375
6 changed files with 7 additions and 222 deletions
|
|
@ -1,57 +0,0 @@
|
|||
#textdomain wesnoth
|
||||
|
||||
# Test campaign made in order to test new multiplayer campaigns syntax changes.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
|
||||
#ifdef CAMPAIGN_TEST_NEW_SYNTAX
|
||||
[binary_path]
|
||||
path=data/campaigns/test_campaign/
|
||||
[/binary_path]
|
||||
|
||||
{campaigns/test_campaign/utils}
|
||||
{campaigns/test_campaign/scenarios}
|
||||
[+units]
|
||||
{campaigns/test_campaign/units}
|
||||
[/units]
|
||||
|
||||
#endif
|
||||
|
||||
[campaign_metadata]
|
||||
extra_defines=CAMPAIGN_TEST_EXTRA_DEFINE
|
||||
id=TEST_CAMPAIGN_NEW_SYNTAX
|
||||
define=CAMPAIGN_TEST_NEW_SYNTAX
|
||||
#rank=125 # to be implemented later
|
||||
difficulties=EASY,NORMAL,HARD
|
||||
|
||||
#icon="images/misc/missing-image.png"
|
||||
#image="data/campaigns/Legend_of_Wesmere/images/campaign_image.png"
|
||||
first_scenario="01_Grass"
|
||||
|
||||
abbrev=_"TestCamp"
|
||||
name="Test campaign - new syntax"
|
||||
description=_"Test campaign used to check if new campaign syntax is working."
|
||||
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)"}
|
||||
|
||||
# wmllint: local spelling [about]
|
||||
[about]
|
||||
title=_"Test campaign test [about] entry"
|
||||
[entry]
|
||||
name= "If you see this, [about] tag is working correctly."
|
||||
[/entry]
|
||||
[/about]
|
||||
[/campaign_metadata]
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
border_size=1
|
||||
usage=map
|
||||
|
||||
Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg
|
||||
Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg
|
||||
Gg , Gg , Ce , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg
|
||||
Gg , Ce , 1 Ke , Ce , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg
|
||||
Gg , Ce , Ce , Ce , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Ce , Gg , Gg , Gg
|
||||
Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Ce , 3 Ke , Ce , Gg , Gg
|
||||
Gg , Gg , Ce , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Ce , Ce , Ce , Gg , Gg
|
||||
Gg , Ce , 2 Ke , Ce , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg
|
||||
Gg , Ce , Ce , Ce , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg
|
||||
Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg
|
||||
Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg
|
||||
Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg
|
||||
|
|
@ -1,137 +0,0 @@
|
|||
#textdomain wesnoth
|
||||
[scenario]
|
||||
name= "01 Grass"
|
||||
description=_"Test campaign - first scenario (grass)"
|
||||
id=01_Grass
|
||||
#next_scenario=02_Something
|
||||
experience_modifier=100
|
||||
map_data="{campaigns/test_campaign/maps/01_Grass.map}"
|
||||
|
||||
{TURNS 10 40 90}
|
||||
|
||||
{DEFAULT_SCHEDULE}
|
||||
|
||||
[side]
|
||||
side=1
|
||||
id=Alpha
|
||||
name="Alpha leader"
|
||||
type=Elvish Fighter
|
||||
fog=no
|
||||
shroud=no
|
||||
save_id=Alpha
|
||||
controller=human
|
||||
team_name=players
|
||||
user_team_name=_"Players"
|
||||
recruit=Elvish Fighter, Elvish Archer
|
||||
x=2
|
||||
y=3
|
||||
{GOLD 100 400 900}
|
||||
[/side]
|
||||
|
||||
[side]
|
||||
side=2
|
||||
id=Bravo
|
||||
name="Bravo leader"
|
||||
type=Elvish Archer
|
||||
fog=no
|
||||
shroud=no
|
||||
save_id=Bravo
|
||||
controller=human
|
||||
team_name=players
|
||||
user_team_name=_"Players"
|
||||
recruit=Elvish Fighter, Elvish Archer
|
||||
x=2
|
||||
y=7
|
||||
{GOLD 100 400 900}
|
||||
[/side]
|
||||
|
||||
[side]
|
||||
side=3
|
||||
id=Charlie
|
||||
name= "Charlie leader"
|
||||
team_name=enemies
|
||||
user_team_name=_"Enemies"
|
||||
allow_player=no
|
||||
controller=ai
|
||||
type=Orcish Grunt
|
||||
canrecruit=yes
|
||||
x=18
|
||||
y=5
|
||||
recruit=Orcish Archer, Orcish Assassin, Orcish Grunt
|
||||
|
||||
{GOLD 100 100 100}
|
||||
{INCOME 10 30 50}
|
||||
[/side]
|
||||
|
||||
[event]
|
||||
name=prestart
|
||||
[label]
|
||||
x=8
|
||||
y=1
|
||||
immutable=yes
|
||||
{COLOR_SUCCESS}
|
||||
text =_"Passed test color"
|
||||
[/label]
|
||||
[label]
|
||||
x=12
|
||||
y=1
|
||||
immutable=yes
|
||||
{COLOR_FAIL}
|
||||
text =_"Failed test color"
|
||||
[/label]
|
||||
[label]
|
||||
x=5
|
||||
y=3
|
||||
immutable=yes
|
||||
#ifdef EASY
|
||||
text =_"Difficulty: Easy"
|
||||
#endif
|
||||
#ifdef NORMAL
|
||||
text =_"Difficulty: Normal"
|
||||
#endif
|
||||
#ifdef HARD
|
||||
text =_"Difficulty: Hard"
|
||||
#endif
|
||||
[/label]
|
||||
[label]
|
||||
x=5
|
||||
y=4
|
||||
immutable=yes
|
||||
text =_"Main campaign define"
|
||||
#ifdef CAMPAIGN_TEST_NEW_SYNTAX
|
||||
{COLOR_SUCCESS}
|
||||
#else
|
||||
{COLOR_FAIL}
|
||||
#endif
|
||||
[/label]
|
||||
[label]
|
||||
x=5
|
||||
y=5
|
||||
immutable=yes
|
||||
text =_"Extra campaign define"
|
||||
#ifdef CAMPAIGN_TEST_EXTRA_DEFINE
|
||||
{COLOR_SUCCESS}
|
||||
#else
|
||||
{COLOR_FAIL}
|
||||
#endif
|
||||
[/label]
|
||||
[label]
|
||||
x=5
|
||||
y=6
|
||||
immutable=yes
|
||||
text =_"Multiplayer define"
|
||||
#ifdef MULTIPLAYER
|
||||
{COLOR_SUCCESS}
|
||||
#else
|
||||
{COLOR_FAIL}
|
||||
#endif
|
||||
[/label]
|
||||
[objectives]
|
||||
side=0
|
||||
[objective]
|
||||
description=_"Defeat enemy leader"
|
||||
condition=win
|
||||
[/objective]
|
||||
[/objectives]
|
||||
[/event]
|
||||
[/scenario]
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
#textdomain wesnoth
|
||||
#define COLOR_SUCCESS
|
||||
color = 150,240,70
|
||||
#enddef
|
||||
#define COLOR_FAIL
|
||||
color = 255,20,40
|
||||
#enddef
|
||||
|
|
@ -135,7 +135,8 @@ commandline_options::commandline_options ( int argc, char** argv ) :
|
|||
("help,h", "prints this message and exits.")
|
||||
("language,L", po::value<std::string>(), "uses language <arg> (symbol) this session. Example: --language ang_GB@latin")
|
||||
("load,l", po::value<std::string>(), "loads the save <arg> from the standard save game directory. When launching the map editor via -e, the map <arg> is loaded, relative to the current directory. If it is a directory, the editor will start with a load map dialog opened there.")
|
||||
("new-syntax", "enables the new campaign syntax parsing.")
|
||||
//disabled until this project continues
|
||||
//("new-syntax", "enables the new campaign syntax parsing.")
|
||||
("nocache", "disables caching of game data.")
|
||||
("nodelay", "runs the game without any delays.")
|
||||
("nomusic", "runs the game without music.")
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ BOOST_AUTO_TEST_CASE (test_empty_options)
|
|||
BOOST_CHECK(!co.nomusic);
|
||||
BOOST_CHECK(!co.nosound);
|
||||
BOOST_CHECK(!co.new_storyscreens);
|
||||
BOOST_CHECK(!co.new_syntax);
|
||||
//BOOST_CHECK(!co.new_syntax);
|
||||
BOOST_CHECK(!co.new_widgets);
|
||||
BOOST_CHECK(!co.path);
|
||||
BOOST_CHECK(!co.preprocess);
|
||||
|
|
@ -149,7 +149,7 @@ BOOST_AUTO_TEST_CASE (test_default_options)
|
|||
BOOST_CHECK(!co.nomusic);
|
||||
BOOST_CHECK(!co.nosound);
|
||||
BOOST_CHECK(!co.new_storyscreens);
|
||||
BOOST_CHECK(!co.new_syntax);
|
||||
//BOOST_CHECK(!co.new_syntax);
|
||||
BOOST_CHECK(!co.new_widgets);
|
||||
BOOST_CHECK(!co.path);
|
||||
BOOST_CHECK(!co.preprocess);
|
||||
|
|
@ -219,7 +219,7 @@ BOOST_AUTO_TEST_CASE (test_full_options)
|
|||
"--max-fps=100",
|
||||
"--multiplayer",
|
||||
"--new-storyscreens",
|
||||
"--new-syntax",
|
||||
//"--new-syntax",
|
||||
"--new-widgets",
|
||||
"--nocache",
|
||||
"--nodelay",
|
||||
|
|
@ -317,7 +317,7 @@ BOOST_AUTO_TEST_CASE (test_full_options)
|
|||
BOOST_CHECK(co.nomusic);
|
||||
BOOST_CHECK(co.nosound);
|
||||
BOOST_CHECK(co.new_storyscreens);
|
||||
BOOST_CHECK(co.new_syntax);
|
||||
//BOOST_CHECK(co.new_syntax);
|
||||
BOOST_CHECK(co.new_widgets);
|
||||
BOOST_CHECK(co.path);
|
||||
BOOST_CHECK(co.preprocess && co.preprocess_path && co.preprocess_target);
|
||||
|
|
@ -395,7 +395,7 @@ BOOST_AUTO_TEST_CASE (test_positional_options)
|
|||
BOOST_CHECK(!co.nomusic);
|
||||
BOOST_CHECK(!co.nosound);
|
||||
BOOST_CHECK(!co.new_storyscreens);
|
||||
BOOST_CHECK(!co.new_syntax);
|
||||
//BOOST_CHECK(!co.new_syntax);
|
||||
BOOST_CHECK(!co.new_widgets);
|
||||
BOOST_CHECK(!co.path);
|
||||
BOOST_CHECK(!co.preprocess);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue