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

backfill missing manacrystal test.

This commit is contained in:
Enno Rehling 2017-12-27 22:26:50 +01:00
parent 198f084f5d
commit bf86c4e043
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/items/xerewards.c
View File

@ -67,15 +67,16 @@ int
use_manacrystal(struct unit *u, const struct item_type *itype, int amount, use_manacrystal(struct unit *u, const struct item_type *itype, int amount,
struct order *ord) struct order *ord)
{ {
int i, sp = 0; int i, sp = 0, msp;
if (!is_mage(u)) { if (!is_mage(u)) {
cmistake(u, u->thisorder, 295, MSG_EVENT); cmistake(u, u->thisorder, 295, MSG_EVENT);
return -1; return -1;
} }
msp = max_spellpoints(u->region, u) / 2;
for (i = 0; i != amount; ++i) { for (i = 0; i != amount; ++i) {
sp += MAX(25, max_spellpoints(u->region, u) / 2); sp += MAX(25, msp);
change_spellpoints(u, sp); change_spellpoints(u, sp);
} }

24
src/items/xerewards.test.c
View File

@ -2,17 +2,39 @@
#include "xerewards.h" #include "xerewards.h"
#include "study.h" #include "study.h"
#include "magic.h"
#include <kernel/unit.h> #include <kernel/faction.h>
#include <kernel/item.h> #include <kernel/item.h>
#include <kernel/pool.h> #include <kernel/pool.h>
#include <kernel/region.h> #include <kernel/region.h>
#include <kernel/unit.h>
#include <tests.h> #include <tests.h>
#include <CuTest.h> #include <CuTest.h>
static void test_manacrystal(CuTest *tc) { static void test_manacrystal(CuTest *tc) {
struct item_type *itype;
unit *u;
test_setup(); test_setup();
u = test_create_unit(test_create_faction(NULL), test_create_region(0, 0, NULL));
itype = test_create_itemtype("manacrystal");
change_resource(u, itype->rtype, 1);
CuAssertIntEquals(tc, -1, use_manacrystal(u, itype, 1, NULL));
CuAssertPtrNotNull(tc, test_find_messagetype(u->faction->msgs, "error295"));
test_clear_messages(u->faction);
create_mage(u, M_GRAY);
set_level(u, SK_MAGIC, 5);
CuAssertIntEquals(tc, 0, get_spellpoints(u));
CuAssertIntEquals(tc, 1, use_manacrystal(u, itype, 1, NULL));
CuAssertIntEquals(tc, 25, get_spellpoints(u));
CuAssertPtrNotNull(tc, test_find_messagetype(u->faction->msgs, "manacrystal_use"));
test_clear_messages(u->faction);
set_level(u, SK_MAGIC, 8);
CuAssertIntEquals(tc, 1, use_manacrystal(u, itype, 1, NULL));
CuAssertPtrNotNull(tc, test_find_messagetype(u->faction->msgs, "manacrystal_use"));
CuAssertIntEquals(tc, 25 + 33, get_spellpoints(u));
test_teardown(); test_teardown();
} }