Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re-enable sea serpent piracy

This commit is contained in:
Steffen Mecke 2015-12-01 22:01:28 +01:00
parent 9c076ba6b9
commit e3d7d23d00
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/monsters.c
View File

@ -836,7 +836,7 @@ void plan_monsters(faction * f)
switch (old_race(u_race(u))) { switch (old_race(u_race(u))) {
case RC_SEASERPENT: case RC_SEASERPENT:
// long_order = create_order(K_PIRACY, f->locale, NULL); long_order = create_order(K_PIRACY, f->locale, NULL);
break; break;
#ifdef TODO_ALP #ifdef TODO_ALP
case RC_ALP: case RC_ALP:

2
src/monsters.test.c
View File

@ -263,7 +263,7 @@ CuSuite *get_monsters_suite(void)
CuSuite *suite = CuSuiteNew(); CuSuite *suite = CuSuiteNew();
SUITE_ADD_TEST(suite, test_monsters_attack); SUITE_ADD_TEST(suite, test_monsters_attack);
SUITE_ADD_TEST(suite, test_monsters_attack_ocean); SUITE_ADD_TEST(suite, test_monsters_attack_ocean);
DISABLE_TEST(suite, test_seaserpent_piracy); SUITE_ADD_TEST(suite, test_seaserpent_piracy);
SUITE_ADD_TEST(suite, test_monsters_waiting); SUITE_ADD_TEST(suite, test_monsters_waiting);
SUITE_ADD_TEST(suite, test_monsters_attack_not); SUITE_ADD_TEST(suite, test_monsters_attack_not);
SUITE_ADD_TEST(suite, test_dragon_attacks_the_rich); SUITE_ADD_TEST(suite, test_dragon_attacks_the_rich);

2
src/piracy.test.c
View File

@ -188,7 +188,7 @@ static void test_piracy_cmd_land_to_land(CuTest * tc) {
piracy_cmd(pirate, ord); piracy_cmd(pirate, ord);
CuAssertPtrEquals(tc, 0, pirate->thisorder); CuAssertPtrEquals(tc, 0, pirate->thisorder);
CuAssertTrue(tc, "no piracy from land to adjacent land region", pirate->region == r); CuAssertTrue(tc, pirate->region == r);
/* TODO check message /* TODO check message
CuAssertPtrNotNullMsg(tc, "successful PIRACY movement", test_find_messagetype(pirate->faction->msgs, "travel")); CuAssertPtrNotNullMsg(tc, "successful PIRACY movement", test_find_messagetype(pirate->faction->msgs, "travel"));
*/ */