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

(FLAK_GUN_MAX): New.

Browse source 
(ac_doflak, ac_shipflak, ac_landflak): Use it.
(ac_shipflak, ac_landflak): Tally flak for all ships / units, then
limit to FLAK_GUN_MAX guns of average tech.  Used to limit to
FLAK_GUN_MAX guns *after* ship / land unit tech factor was applied by
exiting the loop early, then reduce *again* for nation tech of whoever
owns the last ship visited.  Makes no sense.  Exiting the loop early
is no good, because it can skip plane spotting.  This change and the
one below make low-tech ship and land unit flak more powerful;
rebalancing might be needed.

(ac_doflak, ac_landflak, ac_shipflak): Round flak randomly instead of
down.  This simplifies things.  In particular, you no longer have to
calculate how many low-tech ships to bunch together to get any flak.
This commit is contained in:
Markus Armbruster 2006-06-10 18:26:57 +00:00
parent 17759f1071
commit 3a4e362de5
1 changed files with 36 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

80
src/lib/subs/aircombat.c
View file

@ -53,6 +53,8 @@
#include "optlist.h" #include "optlist.h"
#include "server.h" #include "server.h"
#define FLAK_GUN_MAX 14
static void ac_intercept(struct emp_qelem *, struct emp_qelem *, static void ac_intercept(struct emp_qelem *, struct emp_qelem *,
struct emp_qelem *, natid, coord, coord); struct emp_qelem *, natid, coord, coord);
static int all_missiles(struct emp_qelem *); static int all_missiles(struct emp_qelem *);
@ -785,10 +787,8 @@ ac_doflak(struct emp_qelem *list, struct sctstr *from)
plp = (struct plist *)list->q_forw; plp = (struct plist *)list->q_forw;
plane_owner = plp->plane.pln_own; plane_owner = plp->plane.pln_own;
gun = from->sct_item[I_GUN]; gun = MIN(FLAK_GUN_MAX, from->sct_item[I_GUN]);
shell = from->sct_item[I_SHELL]; shell = from->sct_item[I_SHELL];
if (gun > 14)
gun = 14;
if (gun > shell * 2) { if (gun > shell * 2) {
shell += supply_commod(from->sct_own, from->sct_x, from->sct_y, shell += supply_commod(from->sct_own, from->sct_x, from->sct_y,
I_SHELL, (gun + 1) / 2 - shell); I_SHELL, (gun + 1) / 2 - shell);
@ -798,7 +798,7 @@ ac_doflak(struct emp_qelem *list, struct sctstr *from)
if (gun > shell * 2) if (gun > shell * 2)
gun = shell * 2; gun = shell * 2;
gun = 2.0 * tfact(from->sct_own, gun); gun = roundavg(tfact(from->sct_own, 2.0 * gun));
if (gun > 0) { if (gun > 0) {
PR(plane_owner, "firing %d flak guns in %s...\n", PR(plane_owner, "firing %d flak guns in %s...\n",
gun, xyas(from->sct_x, from->sct_y, plane_owner)); gun, xyas(from->sct_x, from->sct_y, plane_owner));
@ -815,10 +815,8 @@ ac_shipflak(struct emp_qelem *list, coord x, coord y)
struct nstr_item ni; struct nstr_item ni;
struct shpstr ship; struct shpstr ship;
struct mchrstr *mcp; struct mchrstr *mcp;
int firing; double aaf, total;
int guns; int gun, shell;
int gun;
int shell;
int rel; int rel;
struct plist *plp; struct plist *plp;
natid plane_owner; natid plane_owner;
@ -829,13 +827,11 @@ ac_shipflak(struct emp_qelem *list, coord x, coord y)
plane_owner = plp->plane.pln_own; plane_owner = plp->plane.pln_own;
memset(nats, 0, sizeof(nats)); memset(nats, 0, sizeof(nats));
guns = 0; aaf = total = 0;
snxtitem_xy(&ni, EF_SHIP, x, y); snxtitem_xy(&ni, EF_SHIP, x, y);
while (!QEMPTY(list) && nxtitem(&ni, &ship)) { while (!QEMPTY(list) && nxtitem(&ni, &ship)) {
if (ship.shp_own == 0 || ship.shp_own == plane_owner) if (ship.shp_own == 0 || ship.shp_own == plane_owner)
continue; continue;
if (guns >= 14)
break;
mcp = &mchr[(int)ship.shp_type]; mcp = &mchr[(int)ship.shp_type];
if (mcp->m_flags & M_SUB) if (mcp->m_flags & M_SUB)
continue; continue;
@ -855,8 +851,8 @@ ac_shipflak(struct emp_qelem *list, coord x, coord y)
} }
if (gun == 0 || shell == 0) if (gun == 0 || shell == 0)
continue; continue;
firing = (int)(techfact(ship.shp_tech, gun) * 2.0); total += gun;
guns += firing; aaf += techfact(ship.shp_tech, gun * 2.0);
if (!nats[ship.shp_own]) { if (!nats[ship.shp_own]) {
/* First time here, print the message */ /* First time here, print the message */
@ -866,16 +862,19 @@ ac_shipflak(struct emp_qelem *list, coord x, coord y)
cname(ship.shp_own), xyas(x, y, plane_owner)); cname(ship.shp_own), xyas(x, y, plane_owner));
nats[ship.shp_own] = 1; nats[ship.shp_own] = 1;
} }
PR(ship.shp_own, "firing %d flak guns from %s...\n", PR(ship.shp_own, "firing %.0f flak guns from %s...\n",
firing, prship(&ship)); aaf, prship(&ship));
from = ship.shp_own; from = ship.shp_own;
} }
if (guns > 0) {
if (guns > 14) /* Limit to FLAK_GUN_MAX guns of average tech factor */
guns = 14; if (total > FLAK_GUN_MAX)
guns = 2.0 * tfact(from, guns); aaf *= FLAK_GUN_MAX / total;
PR(plane_owner, "Flak! Ships firing %d flak guns...\n", guns);
ac_fireflak(list, from, guns); gun = roundavg(aaf);
if (gun > 0) {
PR(plane_owner, "Flak! Ships firing %d flak guns...\n", gun);
ac_fireflak(list, from, gun);
} }
} }
@ -885,8 +884,8 @@ ac_landflak(struct emp_qelem *list, coord x, coord y)
struct nstr_item ni; struct nstr_item ni;
struct lndstr land; struct lndstr land;
struct lchrstr *lcp; struct lchrstr *lcp;
int firing; double aaf, total;
int guns; int gun;
int rel; int rel;
natid from; natid from;
struct plist *plp; struct plist *plp;
@ -897,29 +896,21 @@ ac_landflak(struct emp_qelem *list, coord x, coord y)
plane_owner = plp->plane.pln_own; plane_owner = plp->plane.pln_own;
memset(nats, 0, sizeof(nats)); memset(nats, 0, sizeof(nats));
guns = 0; aaf = total = 0;
snxtitem_xy(&ni, EF_LAND, x, y); snxtitem_xy(&ni, EF_LAND, x, y);
while (!QEMPTY(list) && nxtitem(&ni, &land)) { while (!QEMPTY(list) && nxtitem(&ni, &land)) {
if (land.lnd_own == 0 || land.lnd_own == plane_owner) if (land.lnd_own == 0 || land.lnd_own == plane_owner)
continue; continue;
if (guns >= 14)
break;
lcp = &lchr[(int)land.lnd_type]; lcp = &lchr[(int)land.lnd_type];
if ((lcp->l_flags & L_FLAK) == 0 || land.lnd_aaf == 0)
if ((lcp->l_flags & L_FLAK) == 0)
continue; continue;
if (land.lnd_aaf == 0)
continue;
if (land.lnd_ship >= 0 || land.lnd_land >= 0) if (land.lnd_ship >= 0 || land.lnd_land >= 0)
continue; continue;
rel = getrel(getnatp(land.lnd_own), plane_owner); rel = getrel(getnatp(land.lnd_own), plane_owner);
if (rel > HOSTILE) if (rel > HOSTILE)
continue; continue;
firing = (int)(techfact(land.lnd_tech, land.lnd_aaf) * 3.0); total += land.lnd_aaf * 1.5;
guns += firing; aaf += techfact(land.lnd_tech, land.lnd_aaf * 1.5 * 2.0);
if (!nats[land.lnd_own]) { if (!nats[land.lnd_own]) {
/* First time here, print the message */ /* First time here, print the message */
@ -931,16 +922,17 @@ ac_landflak(struct emp_qelem *list, coord x, coord y)
} }
PR(land.lnd_own, "firing flak guns from unit %s (aa rating %d)\n", PR(land.lnd_own, "firing flak guns from unit %s (aa rating %d)\n",
prland(&land), land.lnd_aaf); prland(&land), land.lnd_aaf);
from = land.lnd_own;
from = land.lnd_own; /* We always use the last owner as the from */
} }
if (guns > 0) {
if (guns > 14) /* Limit to FLAK_GUN_MAX guns of average tech factor */
guns = 14; if (total > FLAK_GUN_MAX)
guns = 2.0 * tfact(from, guns); aaf *= FLAK_GUN_MAX / total;
PR(plane_owner, "Flak! Land units firing %d flak guns...\n",
guns); gun = roundavg(aaf);
ac_fireflak(list, from, guns); if (gun > 0) {
PR(plane_owner, "Flak! Land units firing %d flak guns...\n", gun);
ac_fireflak(list, from, gun);
} }
} }