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

DRY: change mistletoe code 

add some debug logic to intermittent test
This commit is contained in:
Enno Rehling 2018-01-22 19:22:56 +01:00
parent 0b036557c0
commit cc278896f9
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/tests/items.lua
View File

@ -34,6 +34,16 @@ function test_mistletoe_survive()
process_orders() process_orders()
u = get_unit(uno) u = get_unit(uno)
assert_not_nil(u) assert_not_nil(u)
if u:effect('mistletoe') ~= 1 then
print(u2.faction)
for _, m in ipairs(u2.faction.messages) do
print(m)
end
print(u.faction)
for _, m in ipairs(u.faction.messages) do
print(m)
end
end
assert_equal(1, u:effect('mistletoe')) assert_equal(1, u:effect('mistletoe'))
end end

29
src/battle.c
View File

@ -890,7 +890,7 @@ static void rmtroop(troop dt)
{ {
fighter *df = dt.fighter; fighter *df = dt.fighter;
/* troop ist immer eine einzele Person */ /* troop ist immer eine einzelne Person */
rmfighter(df, 1); rmfighter(df, 1);
assert(dt.index >= 0 && dt.index < df->unit->number); assert(dt.index >= 0 && dt.index < df->unit->number);
@ -3356,17 +3356,6 @@ static int join_battle(battle * b, unit * u, bool attack, fighter ** cp)
side *s; side *s;
fighter *fc = NULL; fighter *fc = NULL;
if (!attack && u->attribs) {
if (it_mistletoe) {
int effect = get_effect(u, it_mistletoe);
if (effect >= u->number) {
change_effect(u, it_mistletoe, -u->number);
*cp = NULL;
return false;
}
}
}
for (s = b->sides; s != b->sides + b->nsides; ++s) { for (s = b->sides; s != b->sides + b->nsides; ++s) {
fighter *fig; fighter *fig;
if (s->faction == u->faction) { if (s->faction == u->faction) {
@ -3822,13 +3811,27 @@ static bool start_battle(region * r, battle ** bp)
join_battle(b, u, true, &c1); join_battle(b, u, true, &c1);
join_battle(b, u2, false, &c2); join_battle(b, u2, false, &c2);
if (u2->attribs) {
if (it_mistletoe) {
int effect = get_effect(u2, it_mistletoe);
if (effect >= u->number) {
change_effect(u2, it_mistletoe, -u2->number);
c2->run.hp = u2->hp;
c2->run.number = u2->number;
c2->side->flee += u2->number;
setguard(u2, false);
rmfighter(c2, u2->number);
}
}
}
/* Hat die attackierte Einheit keinen Noaid-Status, /* Hat die attackierte Einheit keinen Noaid-Status,
* wird das Flag von der Faction genommen, andere * wird das Flag von der Faction genommen, andere
* Einheiten greifen ein. */ * Einheiten greifen ein. */
if (!fval(u2, UFL_NOAID)) if (!fval(u2, UFL_NOAID))
freset(u2->faction, FFL_NOAID); freset(u2->faction, FFL_NOAID);
if (c1 != NULL && c2 != NULL) { if (c1 && c2 && c2->run.number < c2->unit->number) {
/* Merken, wer Angreifer ist, f<>r die R<>ckzahlung der /* Merken, wer Angreifer ist, f<>r die R<>ckzahlung der
* Pr<EFBFBD>combataura bei kurzem Kampf. */ * Pr<EFBFBD>combataura bei kurzem Kampf. */
c1->side->bf->attacker = true; c1->side->bf->attacker = true;