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

4.0.2 made land unit mobility costs differ significantly from normal

Browse source 
move costs, but failed to make A* use these costs.  This broke land
unit path finding.  Fix:
(MOB_ROAD, MOB_MOVE, MOB_MARCH): Split MOB_ROAD into MOB_MOVE and
MOB_MARCH.  Users changed.
(lnd_mobcost, sector_mcost): Move minimum mobcost logic to
sector_mcost(), where it is visible to A*.  Also fixes unit reaction
path cost.

(lnd_path): Fix confusing message: don't claim there's no path when
all we really know is that there's no railway.
This commit is contained in:
Markus Armbruster 2006-06-04 17:41:12 +00:00
parent 6ab05ae8a1
commit 5ad86bc7ce
11 changed files with 46 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/lib/subs/attsub.c
View file

@ -793,7 +793,7 @@ get_mob_support(int combat_mode, struct combat *off, struct combat *def)
switch (combat_mode) {
case A_ATTACK:
mob_support = off->mob / sector_mcost(getsectp(def->x, def->y),
MOB_ROAD);
MOB_MOVE);
if (mob_support < 0)
mob_support = 0;
/* mob_support = off->mob / sector_mcost(def->sct_type, def->eff);*/
@ -854,7 +854,7 @@ calc_mobcost(int combat_mode, struct combat *off, struct combat *def,
off->mobcost +=
MAX(1,
(int)(attacking_mil *
sector_mcost(getsectp(def->x, def->y), MOB_ROAD)));
sector_mcost(getsectp(def->x, def->y), MOB_MOVE)));
break;
case A_LBOARD:
off->mobcost += MAX(1, attacking_mil / 5);
@ -1506,7 +1506,7 @@ att_reacting_units(struct combat *def, struct emp_qelem *list, int a_spy,
continue;
getsect(def->x, def->y, &dsect);
if (!BestLandPath(buf, &sect, &dsect, &move_cost, MOB_ROAD))
if (!BestLandPath(buf, &sect, &dsect, &move_cost, MOB_MARCH))
continue;
mobcost = land.lnd_effic * 0.01 * lchr[(int)land.lnd_type].l_spd;
@ -2445,7 +2445,7 @@ ask_move_in_off(struct combat *off, struct combat *def)
return;
if (off->own != player->cnum)
return;
d = sector_mcost(getsectp(def->x, def->y), MOB_ROAD);
d = sector_mcost(getsectp(def->x, def->y), MOB_MOVE);
if ((mob_support = MIN(off->troops, (int)(off->mob / d))) <= 0)
return;
sprintf(prompt, "How many mil to move in from %s (%d max)? ",