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

Merge pull request #843 from ennorehling/master 

Bug 2569: Rostregen macht zu viele Waffen kaputt.
This commit is contained in:
Enno Rehling 2019-03-31 21:30:01 +02:00 committed by GitHub
parent 8868855837 29a9d8d30b
commit f7b4ff3c4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 2840 additions and 2838 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5601
src/battle.c
View File

File diff suppressed because it is too large Load Diff

1
src/battle.h
View File

@ -121,7 +121,6 @@ extern "C" {
} battle;
typedef struct weapon {
int count, used;
const struct weapon_type *type;
int attackskill;
int defenseskill;

20
src/battle.test.c
View File

@ -96,6 +96,7 @@ static void test_make_fighter(CuTest * tc)
static void test_select_weapon_restricted(CuTest *tc) {
item_type *itype;
weapon_type * wtype;
unit *au;
fighter *af;
battle *b;
@ -104,7 +105,7 @@ static void test_select_weapon_restricted(CuTest *tc) {
test_setup();
au = test_create_unit(test_create_faction(NULL), test_create_plain(0, 0));
itype = test_create_itemtype("halberd");
new_weapontype(itype, 0, frac_zero, NULL, 0, 0, 0, SK_MELEE);
wtype = new_weapontype(itype, 0, frac_zero, NULL, 0, 0, 0, SK_MELEE);
i_change(&au->items, itype, 1);
rc = test_create_race("smurf");
CuAssertIntEquals(tc, 0, rc->mask_item & au->_race->mask_item);
@ -112,15 +113,15 @@ static void test_select_weapon_restricted(CuTest *tc) {
b = make_battle(au->region);
af = make_fighter(b, au, make_side(b, au->faction, 0, 0, 0), false);
CuAssertPtrNotNull(tc, af->weapons);
CuAssertIntEquals(tc, 1, af->weapons[0].count);
CuAssertIntEquals(tc, 0, af->weapons[1].count);
CuAssertPtrEquals(tc, wtype, (void *)af->weapons[0].type);
CuAssertPtrEquals(tc, NULL, (void *)af->weapons[1].type);
free_battle(b);
itype->mask_deny = rc_mask(au->_race);
b = make_battle(au->region);
af = make_fighter(b, au, make_side(b, au->faction, 0, 0, 0), false);
CuAssertPtrNotNull(tc, af->weapons);
CuAssertIntEquals(tc, 0, af->weapons[0].count);
CuAssertPtrEquals(tc, NULL, (void *)af->weapons[0].type);
free_battle(b);
itype->mask_deny = 0;
@ -128,9 +129,8 @@ static void test_select_weapon_restricted(CuTest *tc) {
b = make_battle(au->region);
af = make_fighter(b, au, make_side(b, au->faction, 0, 0, 0), false);
CuAssertPtrNotNull(tc, af->weapons);
CuAssertIntEquals(tc, 1, af->weapons[0].count);
CuAssertPtrEquals(tc, itype->rtype->wtype, (void *)af->weapons[0].type);
CuAssertIntEquals(tc, 0, af->weapons[1].count);
CuAssertPtrEquals(tc, wtype, (void *)af->weapons[0].type);
CuAssertPtrEquals(tc, NULL, (void *)af->weapons[1].type);
free_battle(b);
itype->mask_deny = 0;
@ -138,7 +138,7 @@ static void test_select_weapon_restricted(CuTest *tc) {
b = make_battle(au->region);
af = make_fighter(b, au, make_side(b, au->faction, 0, 0, 0), false);
CuAssertPtrNotNull(tc, af->weapons);
CuAssertIntEquals(tc, 0, af->weapons[0].count);
CuAssertPtrEquals(tc, NULL, (void *)af->weapons[0].type);
free_battle(b);
itype->mask_deny = 0;
@ -146,8 +146,8 @@ static void test_select_weapon_restricted(CuTest *tc) {
b = make_battle(au->region);
af = make_fighter(b, au, make_side(b, au->faction, 0, 0, 0), false);
CuAssertPtrNotNull(tc, af->weapons);
CuAssertIntEquals(tc, 1, af->weapons[0].count);
CuAssertIntEquals(tc, 0, af->weapons[1].count);
CuAssertPtrEquals(tc, wtype, (void *)af->weapons[0].type);
CuAssertPtrEquals(tc, NULL, (void *)af->weapons[1].type);
free_battle(b);
test_teardown();

56
src/spells/combatspells.c
View File

@ -298,35 +298,35 @@ int sp_combatrosthauch(struct castorder * co)
for (w = 0; df->weapons[w].type != NULL; ++w) {
weapon *wp = df->weapons;
int n = force;
if (n > wp->used) n = wp->used;
if (n) {
requirement *mat = wp->type->itype->construction->materials;
bool iron = false;
while (mat && mat->number > 0) {
if (mat->rtype == get_resourcetype(R_IRON)) {
iron = true;
break;
}
mat++;
}
if (iron) {
int p;
force -= n;
wp->used -= n;
k += n;
i_change(&df->unit->items, wp->type->itype, -n);
for (p = 0; n && p != df->unit->number; ++p) {
if (df->person[p].missile == wp) {
df->person[p].missile = NULL;
--n;
}
}
for (p = 0; n && p != df->unit->number; ++p) {
if (df->person[p].melee == wp) {
df->person[p].melee = NULL;
--n;
if (df->unit->items && force > 0) {
item ** itp = i_find(&df->unit->items, wp->type->itype);
if (*itp) {
item *it = *itp;
requirement *mat = wp->type->itype->construction->materials;
int n = force;
if (it->number < n) n = it->number;
while (mat && mat->number > 0) {
if (mat->rtype == get_resourcetype(R_IRON)) {
int p;
force -= n;
k += n;
i_change(itp, wp->type->itype, -n);
for (p = 0; n && p != df->unit->number; ++p) {
if (df->person[p].melee == wp) {
df->person[p].melee = NULL;
--n;
}
}
for (p = 0; n && p != df->unit->number; ++p) {
if (df->person[p].missile == wp) {
df->person[p].missile = NULL;
--n;
}
}
break;
}
mat++;
}
}
}