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

Merge pull request #415 from ennorehling/develop 

re-enable monster tests
This commit is contained in:
Enno Rehling 2015-11-25 15:36:19 +01:00
parent 1cf805649e 6c2f4be4af
commit 5cf5a49219
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/monsters.c
View File

@ -827,18 +827,6 @@ void plan_monsters(faction * f)
}
}
if (long_order == NULL && unit_can_study(u)) {
/* Einheiten, die Waffenlosen Kampf lernen könnten, lernen es um
* zu bewachen: */
if (u_race(u)->bonus[SK_WEAPONLESS] != -99) {
if (effskill(u, SK_WEAPONLESS, 0) < 1) {
long_order =
create_order(K_STUDY, f->locale, "'%s'",
skillname(SK_WEAPONLESS, f->locale));
}
}
}
if (long_order == NULL) {
/* Ab hier noch nicht generalisierte Spezialbehandlungen. */
@ -867,6 +855,18 @@ void plan_monsters(faction * f)
break;
}
}
if (long_order == NULL && unit_can_study(u)) {
/* Einheiten, die Waffenlosen Kampf lernen könnten, lernen es um
* zu bewachen: */
if (u_race(u)->bonus[SK_WEAPONLESS] != -99) {
if (effskill(u, SK_WEAPONLESS, 0) < 1) {
long_order =
create_order(K_STUDY, f->locale, "'%s'",
skillname(SK_WEAPONLESS, f->locale));
}
}
}
if (long_order) {
addlist(&u->orders, long_order);
}

8
src/monsters.test.c
View File

@ -263,11 +263,11 @@ CuSuite *get_monsters_suite(void)
CuSuite *suite = CuSuiteNew();
SUITE_ADD_TEST(suite, test_monsters_attack);
SUITE_ADD_TEST(suite, test_monsters_attack_ocean);
DISABLE_TEST(suite, test_seaserpent_piracy);
DISABLE_TEST(suite, test_monsters_waiting);
SUITE_ADD_TEST(suite, test_seaserpent_piracy);
SUITE_ADD_TEST(suite, test_monsters_waiting);
SUITE_ADD_TEST(suite, test_monsters_attack_not);
SUITE_ADD_TEST(suite, test_dragon_attacks_the_rich);
DISABLE_TEST(suite, test_dragon_moves);
DISABLE_TEST(suite, test_monsters_learn_exp);
SUITE_ADD_TEST(suite, test_dragon_moves);
SUITE_ADD_TEST(suite, test_monsters_learn_exp);
return suite;
}