#include "prototypes.h"
static void lnd_mess(char *, struct llist *);
+static int lnd_hit_mine(struct lndstr *, struct lchrstr *);
int
attack_val(int combat_mode, struct lndstr *lp)
{
int men;
- int value;
+ double value;
struct lchrstr *lcp;
- if (((int)lp->lnd_effic) < LAND_MINEFF) {
- makelost(EF_LAND, lp->lnd_own, lp->lnd_uid, lp->lnd_x, lp->lnd_y);
- lp->lnd_own = 0;
+ if (lp->lnd_effic < LAND_MINEFF) {
putland(lp->lnd_uid, lp);
return 0;
}
if (lcp->l_flags & L_SPY && combat_mode == A_ASSAULT)
return 1;
- men = total_mil(lp);
-
- value = ldround(((double)men * (double)lp->lnd_att), 1);
-
- value = (int)((double)value * ((double)lp->lnd_effic / 100.0));
+ men = lp->lnd_item[I_MILIT];
+ value = men * lp->lnd_att * lp->lnd_effic / 100.0;
switch (combat_mode) {
case A_ATTACK:
- return value;
+ return (int)value;
case A_ASSAULT:
if (!(lcp->l_flags & L_MARINE))
return (int)(assault_penalty * value);
return (int)(assault_penalty * men);
}
- return value;
+ return (int)value;
}
int
double value;
struct lchrstr *lcp;
- if (((int)lp->lnd_effic) < LAND_MINEFF) {
- makelost(EF_LAND, lp->lnd_own, lp->lnd_uid, lp->lnd_x, lp->lnd_y);
- lp->lnd_own = 0;
+ if (lp->lnd_effic < LAND_MINEFF) {
putland(lp->lnd_uid, lp);
return 0;
}
lcp = &lchr[(int)lp->lnd_type];
- men = total_mil(lp);
+ men = lp->lnd_item[I_MILIT];
- if (men < 0)
- men = 0;
if ((lp->lnd_ship >= 0 || lp->lnd_land >= 0) &&
!(lcp->l_flags & L_MARINE))
return men;
- value = men * lp->lnd_def;
-
- value *=
- ((double)land_mob_max + lp->lnd_harden) / (double)land_mob_max;
- value = (int)((double)value * ((double)lp->lnd_effic / 100.0));
- value = (int)ldround(value, 1);
+ value = men * lp->lnd_def * lp->lnd_effic / 100.0;
+ value *= ((double)land_mob_max + lp->lnd_harden) / land_mob_max;
/* If there are military on the unit, you get at least a 1
man defensive unit, except for spies */
return (int)value;
}
-int
-total_mil(struct lndstr *lp)
-{
- struct lchrstr *lcp;
- double men;
-
- lcp = &lchr[(int)lp->lnd_type];
-
- men = lnd_getmil(lp);
-/* men *= ((double)lp->lnd_effic)/100.0;*/
-
- return ldround(men, 1);
-}
-
void
lnd_print(struct llist *llp, char *s)
{
int taken;
int nowhere_to_go = 0;
struct sctstr rsect;
- double mobcost;
+ double mobcost, bmcost;
signed char orig;
int mob;
- taken = lnd_getmil(&llp->land);
+ taken = llp->land.lnd_item[I_MILIT];
/* Spies always die */
if (llp->lcp->l_flags & L_SPY) {
eff_eq = 100;
llp->land.lnd_effic = 0;
} else {
- eff_eq =
- ldround((((double)cas * 100.0) / (double)llp->lcp->l_mil), 1);
+ eff_eq = ldround(cas * 100.0 / llp->lcp->l_mil, 1);
llp->land.lnd_effic -= eff_eq;
lnd_submil(&llp->land, cas);
}
return taken;
} else {
/* Ok, now, how many did we take off? (sould be the diff) */
- taken = taken - lnd_getmil(&llp->land);
+ taken = taken - llp->land.lnd_item[I_MILIT];
}
if (llp->land.lnd_effic >= llp->land.lnd_retreat)
continue;
if (sect.sct_type == SCT_MOUNT)
continue;
+ mobcost = lnd_mobcost(&llp->land, &rsect);
+ if (mobcost < 0)
+ continue;
++nowned;
civs = sect.sct_item[I_CIVIL];
if (civs > biggest) {
biggest = civs;
bx = sect.sct_x;
by = sect.sct_y;
+ bmcost = mobcost;
}
}
if (!nowned)
llp->land.lnd_x = bx;
llp->land.lnd_y = by;
getsect(bx, by, &rsect);
- mobcost = lnd_mobcost(&llp->land, &rsect, MOB_ROAD);
- mob = llp->land.lnd_mobil - (int)mobcost;
+ mob = llp->land.lnd_mobil - (int)bmcost;
if (mob < -127)
mob = -127;
orig = llp->land.lnd_mobil;
llp->land.lnd_mobil = (signed char)new;
}
}
-int
-lnd_getmil(struct lndstr *lp)
-{
- return lp->lnd_item[I_MILIT];
-}
void
lnd_submil(struct lndstr *lp, int num)
memset(buf1, 0, sizeof(buf1));
memset(buf2, 0, sizeof(buf2));
memset(buf3, 0, sizeof(buf3));
- if (chance((double)(spy + lp->lnd_vis) / 10.0)) {
+ if (chance((spy + lp->lnd_vis) / 10.0)) {
if (destination == player->cnum)
pr("%s %s", mess, prland(lp));
else
sprintf(buf1, "%s %s", mess, prland(lp));
- estimate = lnd_getmil(lp);
-
- if (chance((double)(spy + lp->lnd_vis) / 20.0)) {
+ estimate = lp->lnd_item[I_MILIT];
+ if (chance((spy + lp->lnd_vis) / 20.0)) {
if (destination == player->cnum)
- pr(" (eff %d, mil %d", roundintby(lp->lnd_effic, 5),
- roundintby(lnd_getmil(lp), 10));
+ pr(" (eff %d, mil %d",
+ roundintby(lp->lnd_effic, 5),
+ roundintby(lp->lnd_item[I_MILIT], 10));
else
sprintf(buf2, " (eff %d, mil %d",
roundintby(lp->lnd_effic, 5),
- roundintby(lnd_getmil(lp), 10));
- estimate = lnd_getmil(lp) * lp->lnd_effic / 100.0;
+ roundintby(lp->lnd_item[I_MILIT], 10));
+ estimate = lp->lnd_item[I_MILIT] * lp->lnd_effic / 100.0;
- if (chance((double)(spy + lp->lnd_vis) / 20.0)) {
+ if (chance((spy + lp->lnd_vis) / 20.0)) {
int t;
t = lp->lnd_tech - 20 + roll(40);
t = MAX(t, 0);
llp = malloc(sizeof(struct llist));
llp->lcp = lcp;
llp->land = land;
- llp->mobil = (double)land.lnd_mobil;
+ llp->mobil = land.lnd_mobil;
emp_insque(&llp->queue, list);
}
}
}
if (!(lchr[(int)llp->land.lnd_type].l_flags & L_SPY) &&
!(lchr[(int)llp->land.lnd_type].l_flags & L_TRAIN) &&
- lnd_getmil(&llp->land) == 0) {
+ llp->land.lnd_item[I_MILIT] == 0) {
lnd_mess("has no mil on it to guide it", llp);
continue;
}
if (land.lnd_x != allx || land.lnd_y != ally)
*togetherp = 0;
if (land.lnd_mobil + 1 < (int)llp->mobil) {
- llp->mobil = (double)land.lnd_mobil;
+ llp->mobil = land.lnd_mobil;
}
if (llp->mobil < *minmobp)
*minmobp = llp->mobil;
struct llist *llp;
struct sctstr sect;
int mines, m, max, sshells, lshells;
- double mobcost;
for (qp = land_list->q_back; qp != land_list; qp = next) {
next = qp->q_back;
continue;
}
if (takemob) {
-/* mobcost = llp->land.lnd_effic * 0.01 * llp->lcp->l_spd;*/
- mobcost = llp->land.lnd_spd;
- mobcost = 480.0 / (mobcost +
- techfact(llp->land.lnd_tech, mobcost));
- llp->mobil -= mobcost;
+ llp->mobil -= lnd_pathcost(&llp->land, 0.2);
llp->land.lnd_mobil = (int)llp->mobil;
llp->land.lnd_harden = 0;
}
pr("%4d ", lnd->lnd_uid);
pr("%-16.16s ", llp->lcp->l_name);
prxy("%4d,%-4d ", lnd->lnd_x, lnd->lnd_y, llp->land.lnd_own);
- pr("%c", lnd->lnd_army);
+ pr("%1.1s", &lnd->lnd_army);
pr("%4d%%", lnd->lnd_effic);
pr("%4d", lnd->lnd_item[I_SHELL]);
pr("%4d", lnd->lnd_item[I_GUN]);
if (!totdam || !(count = lnd_count(list)))
return 0;
- dam = ldround(((double)totdam / (double)count), 1);
+ dam = ldround((double)totdam / count, 1);
for (qp = list->q_back; qp != list; qp = next) {
next = qp->q_back;
llp = (struct llist *)qp;
{
struct nstr_sect ns;
struct sctstr fsect;
- int trange;
- double range, range2, guneff;
+ int trange, range;
+ double guneff;
int shell, gun;
int dam;
int totdam = 0;
continue;
if (fsect.sct_own == victim)
continue;
- if (fsect.sct_type != SCT_FORTR)
- continue;
if (getrel(getnatp(fsect.sct_own), victim) >= NEUTRAL)
continue;
gun = fsect.sct_item[I_GUN];
if (gun < 1)
continue;
- range = tfactfire(fsect.sct_own, (double)MIN(gun, 7));
- if (fsect.sct_effic > 59)
- range++;
- range2 = roundrange(range);
+ range = roundrange(fortrange(&fsect));
trange = mapdist(newx, newy, fsect.sct_x, fsect.sct_y);
- if (trange > range2)
+ if (trange > range)
continue;
if (fsect.sct_item[I_MILIT] < 5)
continue;
shell = fsect.sct_item[I_SHELL];
if (shell < 1)
- shell += supply_commod(fsect.sct_own,
- fsect.sct_x, fsect.sct_y, I_SHELL, 1);
+ shell += supply_commod(fsect.sct_own, fsect.sct_x, fsect.sct_y,
+ I_SHELL, 1);
if (shell < 1)
continue;
shell--;
struct sctstr sect;
getsect(lp->lnd_x, lp->lnd_y, §);
- return (int)(((double)lp->lnd_effic / 100.0) *
- (10 + dchr[sect.sct_type].d_dstr * 2 +
- (double)lp->lnd_spd / 2.0 - lp->lnd_vis));
+ return (int)((lp->lnd_effic / 100.0) *
+ (10 + dchr[sect.sct_type].d_dstr * 2 + lp->lnd_spd / 2.0
+ - lp->lnd_vis));
}
-int
+static int
lnd_hit_mine(struct lndstr *lp, struct lchrstr *lcp)
{
double m;
}
double
-lnd_mobcost(struct lndstr *lp, struct sctstr *sp, int mobtype)
+lnd_pathcost(struct lndstr *lp, double pathcost)
{
- double mobcost;
- double smobcost;
+ double effspd;
- /* supply unit's speed depends on their eff, since
- that is their purpose */
+ effspd = lp->lnd_spd;
if (lchr[(int)lp->lnd_type].l_flags & L_SUPPLY)
- mobcost = lp->lnd_effic * 0.01 * lp->lnd_spd;
- else
- mobcost = lp->lnd_spd;
- if (mobcost < 0.01)
- mobcost = 0.01;
-
-/* sector_mcost now takes 2 different arguments, a sector pointer, and
- whether or not to figure in the highway bonus, rail bonus or none.
- bridge heads, bridges and highways have built-in highways bonus
- because they are a 1, and this will discount that. */
-
- smobcost = (double)sector_mcost(sp, mobtype);
- if (smobcost < 0.01)
- smobcost = 0.01;
-
-/* marching through 0 mobility conquered sectors takes lots of mobility,
- unless you are a train. Capturing railways is a good thing. */
-
- if (sp->sct_own != sp->sct_oldown && sp->sct_mobil <= 0 &&
- smobcost < LND_MINMOBCOST && mobtype != MOB_RAIL)
- smobcost = LND_MINMOBCOST;
+ effspd *= lp->lnd_effic * 0.01;
+
+ /*
+ * The return value must be PATHCOST times a factor that depends
+ * only on the land unit. Anything else breaks path finding. In
+ * particular, you can't add or enforce a minimum cost here. Do
+ * it in sector_mcost().
+ */
+ return pathcost * 5.0 * speed_factor(effspd, lp->lnd_tech);
+}
- mobcost = smobcost * 5.0 * 480.0 /
- (mobcost + techfact(lp->lnd_tech, mobcost));
+int
+lnd_mobtype(struct lndstr *lp)
+{
+ return (lchr[(int)lp->lnd_type].l_flags & L_TRAIN)
+ ? MOB_RAIL : MOB_MARCH;
+}
- return mobcost;
+double
+lnd_mobcost(struct lndstr *lp, struct sctstr *sp)
+{
+ return lnd_pathcost(lp, sector_mcost(sp, lnd_mobtype(lp)));
}
int
}
llp->land.lnd_x = newx;
llp->land.lnd_y = newy;
- if (lchr[(int)llp->land.lnd_type].l_flags & L_TRAIN) {
- llp->mobil -= lnd_mobcost(&llp->land, §, MOB_RAIL);
- } else {
- llp->mobil -= lnd_mobcost(&llp->land, §, MOB_ROAD);
- }
+ llp->mobil -= lnd_mobcost(&llp->land, §);
llp->land.lnd_mobil = (int)llp->mobil;
llp->land.lnd_harden = 0;
putland(llp->land.lnd_uid, &llp->land);
* find all artillery units belonging
* to the attacker or defender that can fire.
* Each arty unit adds +1%/damage point
- *
*/
int
lnd_support(natid victim, natid attacker, coord x, coord y, int defending)
int dist;
int shell;
int gun;
- double range, range2;
+ int range;
snxtitem_all(&ni, EF_LAND);
while (nxtitem(&ni, &land)) {
continue;
if (land.lnd_land >= 0)
continue;
- if (land.lnd_mission > 0)
- continue;
if (land.lnd_effic < LAND_MINFIREEFF)
continue;
/* Do we have mil? */
/* are we in range? */
dist = mapdist(land.lnd_x, land.lnd_y, x, y);
- range = techfact((int)land.lnd_tech, (double)land.lnd_frg / 2.0);
-
- range2 = roundrange(range);
- if (dist > range2)
+ range = roundrange(effrange(land.lnd_frg, land.lnd_tech));
+ if (dist > range)
continue;
shell = land.lnd_item[I_SHELL];
struct sctstr d_sect, sect;
char *cp;
double dummy;
+ int mtype;
if (!sarg_xy(buf, &destx, &desty))
return 0;
return 0;
}
getsect(lp->lnd_x, lp->lnd_y, §);
- if (lchr[(int)lp->lnd_type].l_flags & L_TRAIN)
- cp = BestLandPath(buf, §, &d_sect, &dummy, MOB_RAIL);
- else
- cp = BestLandPath(buf, §, &d_sect, &dummy, MOB_ROAD);
+ mtype = lnd_mobtype(lp);
+ cp = BestLandPath(buf, §, &d_sect, &dummy, mtype);
if (!cp) {
- pr("No owned path from %s to %s!\n",
+ pr("No owned %s from %s to %s!\n",
+ mtype == MOB_RAIL ? "railway" : "path",
xyas(lp->lnd_x, lp->lnd_y, player->cnum),
xyas(d_sect.sct_x, d_sect.sct_y, player->cnum));
return 0;
eng = has_helpful_engineer(lp->lnd_x, lp->lnd_y, lp->lnd_own);
if (eng)
- hard_amt = ((float)hard_amt * 1.5);
+ hard_amt *= 1.5;
if ((lp->lnd_harden + hard_amt) > land_mob_max)
hard_amt = land_mob_max - lp->lnd_harden;
/* Now, if an engineer helped, it's really only 2/3rds of
that */
if (eng)
- mob_used = (int)((float)mob_used / 1.5);
+ mob_used /= 1.5;
/* If we increased it, but not much, we gotta take at least 1
mob point. */
projects / empserver / blobdiff