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

bug 2292: only land regions can be guarded. 

https://bugs.eressea.de/view.php?id=2292
Also adding tests for every other failure reason.
This commit is contained in:
Enno Rehling 2017-03-02 12:39:21 +01:00
parent 912a8b5412
commit 3cb24299fa
4 changed files with 133 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/guard.c
View File

@ -34,6 +34,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
guard_t can_start_guarding(const unit * u)
{
if (!u->region->land) {
return E_GUARD_TERRAIN;
}
if (u->status >= ST_FLEE || fval(u, UFL_FLEEING))
return E_GUARD_FLEEING;
/* Monster der Monsterpartei duerfen immer bewachen */

2
src/guard.h
View File

@ -12,7 +12,7 @@ extern "C" {
struct unit;
struct region;
typedef enum { E_GUARD_OK, E_GUARD_UNARMED, E_GUARD_NEWBIE, E_GUARD_FLEEING } guard_t;
typedef enum { E_GUARD_OK, E_GUARD_UNARMED, E_GUARD_NEWBIE, E_GUARD_FLEEING, E_GUARD_TERRAIN } guard_t;
guard_t can_start_guarding(const struct unit * u);
void update_guards(void);

105
src/guard.test.c
View File

@ -7,7 +7,9 @@
#include <kernel/config.h>
#include <kernel/faction.h>
#include <kernel/unit.h>
#include <kernel/order.h>
#include <kernel/race.h>
#include <kernel/terrain.h>
#include <kernel/item.h>
#include <kernel/region.h>
@ -128,14 +130,117 @@ static void test_guard_monsters(CuTest * tc)
test_cleanup();
}
static void test_update_guard(CuTest * tc)
/* https://bugs.eressea.de/view.php?id=2292 */
{
unit *ug;
region *r;
item_type *itype;
const struct terrain_type *t_ocean, *t_plain;
test_setup();
t_ocean = test_create_terrain("ocean", SEA_REGION);
t_plain = test_create_terrain("plain", LAND_REGION);
itype = it_get_or_create(rt_get_or_create("sword"));
new_weapontype(itype, 0, frac_zero, NULL, 0, 0, 0, SK_MELEE, 2);
r = test_create_region(0, 0, t_ocean);
ug = test_create_unit(test_create_faction(0), r);
i_change(&ug->items, itype, 1);
set_level(ug, SK_MELEE, 2);
setguard(ug, true);
CuAssertIntEquals(tc, 1, armedmen(ug, false));
CuAssertTrue(tc, is_guard(ug));
terraform_region(r, t_ocean);
update_guards();
CuAssertTrue(tc, ! is_guard(ug));
test_cleanup();
}
static void test_guard_on(CuTest * tc)
{
unit *ug;
region *r;
item_type *itype;
terrain_type *t_ocean, *t_plain;
test_setup();
t_ocean = test_create_terrain("ocean", SEA_REGION);
t_plain = test_create_terrain("plain", LAND_REGION);
itype = it_get_or_create(rt_get_or_create("sword"));
new_weapontype(itype, 0, frac_zero, NULL, 0, 0, 0, SK_MELEE, 2);
r = test_create_region(0, 0, t_plain);
ug = test_create_unit(test_create_faction(0), r);
i_change(&ug->items, itype, 1);
set_level(ug, SK_MELEE, 2);
ug->thisorder = create_order(K_GUARD, ug->faction->locale, NULL);
setguard(ug, false);
CuAssertIntEquals(tc, E_GUARD_OK, can_start_guarding(ug));
guard_on_cmd(ug, ug->thisorder);
CuAssertTrue(tc, is_guard(ug));
terraform_region(r, t_ocean);
setguard(ug, false);
CuAssertIntEquals(tc, E_GUARD_TERRAIN, can_start_guarding(ug));
guard_on_cmd(ug, ug->thisorder);
CuAssertTrue(tc, !is_guard(ug));
CuAssertPtrNotNull(tc, test_find_messagetype(ug->faction->msgs, "error2"));
setguard(ug, false);
t_ocean->flags &= ~ SEA_REGION;
CuAssertIntEquals(tc, E_GUARD_TERRAIN, can_start_guarding(ug));
guard_on_cmd(ug, ug->thisorder);
CuAssertTrue(tc, !is_guard(ug));
CuAssertPtrNotNull(tc, test_find_messagetype(ug->faction->msgs, "error_onlandonly"));
terraform_region(r, t_plain);
i_change(&ug->items, itype, -1);
CuAssertIntEquals(tc, E_GUARD_UNARMED, can_start_guarding(ug));
guard_on_cmd(ug, ug->thisorder);
CuAssertTrue(tc, !is_guard(ug));
CuAssertPtrNotNull(tc, test_find_messagetype(ug->faction->msgs, "unit_unarmed"));
i_change(&ug->items, itype, 1);
test_clear_messages(ug->faction);
set_level(ug, SK_MELEE, 0);
CuAssertIntEquals(tc, E_GUARD_UNARMED, can_start_guarding(ug));
guard_on_cmd(ug, ug->thisorder);
CuAssertTrue(tc, !is_guard(ug));
CuAssertPtrNotNull(tc, test_find_messagetype(ug->faction->msgs, "unit_unarmed"));
set_level(ug, SK_MELEE, 2);
ug->status = ST_FLEE;
CuAssertIntEquals(tc, E_GUARD_FLEEING, can_start_guarding(ug));
guard_on_cmd(ug, ug->thisorder);
CuAssertTrue(tc, !is_guard(ug));
CuAssertPtrNotNull(tc, test_find_messagetype(ug->faction->msgs, "error320"));
ug->status = ST_FIGHT;
config_set("NewbieImmunity", "5");
CuAssertIntEquals(tc, E_GUARD_NEWBIE, can_start_guarding(ug));
guard_on_cmd(ug, ug->thisorder);
CuAssertTrue(tc, !is_guard(ug));
CuAssertPtrNotNull(tc, test_find_messagetype(ug->faction->msgs, "error304"));
config_set("NewbieImmunity", NULL);
test_clear_messages(ug->faction);
test_cleanup();
}
CuSuite *get_guard_suite(void)
{
CuSuite *suite = CuSuiteNew();
SUITE_ADD_TEST(suite, test_is_guarded);
SUITE_ADD_TEST(suite, test_is_guard);
SUITE_ADD_TEST(suite, test_guard_unskilled);
SUITE_ADD_TEST(suite, test_guard_on);
SUITE_ADD_TEST(suite, test_guard_armed);
SUITE_ADD_TEST(suite, test_guard_unarmed);
SUITE_ADD_TEST(suite, test_guard_monsters);
SUITE_ADD_TEST(suite, test_update_guard);
return suite;
}

13
src/laws.c
View File

@ -2686,10 +2686,6 @@ int guard_on_cmd(unit * u, struct order *ord)
return 0;
}
if (fval(u->region->terrain, SEA_REGION)) {
cmistake(u, ord, 2, MSG_EVENT);
}
else {
if (fval(u, UFL_MOVED)) {
cmistake(u, ord, 187, MSG_EVENT);
}
@ -2702,6 +2698,14 @@ int guard_on_cmd(unit * u, struct order *ord)
if (err == E_GUARD_OK) {
setguard(u, true);
}
else if (err == E_GUARD_TERRAIN) {
if (fval(u->region->terrain, SEA_REGION)) {
cmistake(u, ord, 2, MSG_EVENT);
}
else {
ADDMSG(&u->faction->msgs, msg_feedback(u, ord, "error_onlandonly", ""));
}
}
else if (err == E_GUARD_UNARMED) {
ADDMSG(&u->faction->msgs, msg_feedback(u, ord, "unit_unarmed", ""));
}
@ -2712,7 +2716,6 @@ int guard_on_cmd(unit * u, struct order *ord)
cmistake(u, ord, 304, MSG_EVENT);
}
}
}
return 0;
}