empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update/revolt: De-quadruplicate land unit casualty code

Browse source 
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-09-18 17:38:17 +02:00
parent 35ecc008ce
commit 025e9cc258
1 changed files with 32 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

117
src/lib/update/revolt.c
View file

@ -48,6 +48,7 @@
#include "update.h" #include "update.h"
static int take_casualties(struct sctstr *, int); static int take_casualties(struct sctstr *, int);
static int take_casualties_from_lands(struct sctstr *, int, int, int);
static void lnd_dies_fighting_che(struct lndstr *); static void lnd_dies_fighting_che(struct lndstr *);
void void
@ -418,11 +419,9 @@ static int
take_casualties(struct sctstr *sp, int mc) take_casualties(struct sctstr *sp, int mc)
{ {
int orig_mil, taken; int orig_mil, taken;
int cantake; int nunits = 0, each;
int nunits = 0, each, deq;
struct lndstr *lp; struct lndstr *lp;
struct nstr_item ni; struct nstr_item ni;
double eff_per_cas;
/* casualties come out of mil first */ /* casualties come out of mil first */
orig_mil = sp->sct_item[I_MILIT]; orig_mil = sp->sct_item[I_MILIT];
@ -458,116 +457,64 @@ take_casualties(struct sctstr *sp, int mc)
each = (mc - taken) / nunits + 2; each = (mc - taken) / nunits + 2;
/* kill some security troops */ /* kill some security troops */
snxtitem_xy(&ni, EF_LAND, sp->sct_x, sp->sct_y); taken += take_casualties_from_lands(sp, MIN(each, mc - taken), 1, 0);
while (NULL != (lp = nxtitemp(&ni))) {
if (lp->lnd_own != sp->sct_own)
continue;
if (lp->lnd_ship >= 0)
continue;
if (!lp->lnd_item[I_MILIT])
continue;
if (!(lchr[(int)lp->lnd_type].l_flags & L_SECURITY))
continue;
eff_per_cas = 100.0 / lchr[lp->lnd_type].l_item[I_MILIT];
cantake = MIN(lp->lnd_item[I_MILIT],
(int)((lp->lnd_effic - 40) / eff_per_cas));
deq = MIN(cantake, MIN(each, mc - taken));
if (deq <= 0)
continue;
taken += deq;
lp->lnd_effic -= deq * eff_per_cas;
lp->lnd_mobil -= deq * eff_per_cas / 2;
lnd_submil(lp, deq);
if (taken >= mc)
return taken;
}
/* kill some normal troops */ /* kill some normal troops */
snxtitem_xy(&ni, EF_LAND, sp->sct_x, sp->sct_y); taken += take_casualties_from_lands(sp, MIN(each, mc - taken), 0, 0);
while (NULL != (lp = nxtitemp(&ni))) {
if (lp->lnd_own != sp->sct_own)
continue;
if (lp->lnd_ship >= 0)
continue;
if (!lp->lnd_item[I_MILIT])
continue;
if (lchr[(int)lp->lnd_type].l_flags & L_SECURITY)
continue;
eff_per_cas = 100.0 / lchr[lp->lnd_type].l_item[I_MILIT];
cantake = MIN(lp->lnd_item[I_MILIT],
(int)((lp->lnd_effic - 40) / eff_per_cas));
deq = MIN(cantake, MIN(each, mc - taken));
if (deq <= 0)
continue;
taken += deq;
lp->lnd_effic -= deq * eff_per_cas;
lp->lnd_mobil -= deq * eff_per_cas / 2;
lnd_submil(lp, deq);
if (taken >= mc)
return taken;
}
/* Hmm.. still some left.. kill off units now */ /* Hmm.. still some left.. kill off units now */
/* kill some normal troops */ /* kill some normal troops */
snxtitem_xy(&ni, EF_LAND, sp->sct_x, sp->sct_y); taken += take_casualties_from_lands(sp, MIN(each, mc - taken), 0, 1);
while (NULL != (lp = nxtitemp(&ni))) {
if (lp->lnd_own != sp->sct_own)
continue;
if (lp->lnd_ship >= 0)
continue;
if (!lp->lnd_item[I_MILIT])
continue;
if (lchr[(int)lp->lnd_type].l_flags & L_SECURITY)
continue;
eff_per_cas = 100.0 / lchr[lp->lnd_type].l_item[I_MILIT];
deq = MIN(lp->lnd_item[I_MILIT], mc - taken);
taken += deq;
lp->lnd_effic -= deq * eff_per_cas;
lp->lnd_mobil -= deq * eff_per_cas / 2;
lnd_submil(lp, deq);
if (lp->lnd_effic < LAND_MINEFF) {
taken += lp->lnd_item[I_MILIT];
lnd_dies_fighting_che(lp);
}
if (taken >= mc)
return taken;
}
/* Hmm.. still some left.. kill off units now */ /* Hmm.. still some left.. kill off units now */
/* kill some security troops */ /* kill some security troops */
taken += take_casualties_from_lands(sp, MIN(each, mc - taken), 1, 1);
CANT_HAPPEN(taken < mc);
return taken;
}
int
take_casualties_from_lands(struct sctstr *sp, int cas,
int security, int may_kill)
{
struct nstr_item ni;
struct lndstr *lp;
double eff_per_cas;
int cantake, deq, taken;
taken = 0;
snxtitem_xy(&ni, EF_LAND, sp->sct_x, sp->sct_y); snxtitem_xy(&ni, EF_LAND, sp->sct_x, sp->sct_y);
while (NULL != (lp = nxtitemp(&ni))) { while (taken < cas && (lp = nxtitemp(&ni))) {
if (lp->lnd_own != sp->sct_own) if (lp->lnd_own != sp->sct_own)
continue; continue;
if (lp->lnd_ship >= 0) if (lp->lnd_ship >= 0)
continue; continue;
if (!lp->lnd_item[I_MILIT]) if (!lp->lnd_item[I_MILIT])
continue; continue;
if (!(lchr[(int)lp->lnd_type].l_flags & L_SECURITY)) if (!(lchr[(int)lp->lnd_type].l_flags & L_SECURITY) == !!security)
continue; continue;
eff_per_cas = 100.0 / lchr[lp->lnd_type].l_item[I_MILIT]; eff_per_cas = 100.0 / lchr[lp->lnd_type].l_item[I_MILIT];
deq = MIN(lp->lnd_item[I_MILIT], mc - taken); cantake = lp->lnd_item[I_MILIT];
if (!may_kill)
cantake = MIN(cantake,
(int)((lp->lnd_effic - 40) / eff_per_cas));
deq = MIN(cantake, cas - taken);
if (deq <= 0)
continue;
taken += lp->lnd_item[I_MILIT]; taken += deq;
lp->lnd_effic -= deq * eff_per_cas; lp->lnd_effic -= deq * eff_per_cas;
lp->lnd_mobil -= deq * eff_per_cas / 2; lp->lnd_mobil -= deq * eff_per_cas / 2;
lnd_submil(lp, deq); lnd_submil(lp, deq);
if (lp->lnd_effic < LAND_MINEFF) { if (lp->lnd_effic < LAND_MINEFF) {
CANT_HAPPEN(!may_kill);
taken += lp->lnd_item[I_MILIT]; taken += lp->lnd_item[I_MILIT];
lnd_dies_fighting_che(lp); lnd_dies_fighting_che(lp);
} }
if (taken >= mc)
return taken;
} }
CANT_REACH();
return taken; return taken;
} }