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

(shp_mobcost): New.

Browse source 
(use_ammo, eta_calc, torp, fire_torp, perform_mission, retreat_ship1)
(shp_sweep, shp_nav_one_sector, cost_ship): Use it.

(perform_mission): Fix mobility cost of torpedo: charged full sector
cost instead of half.
This commit is contained in:
Markus Armbruster 2006-05-20 19:28:29 +00:00
parent 2cd8e99f49
commit 16b9c41b39
8 changed files with 18 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/lib/commands/mfir.c
View file

@ -958,8 +958,6 @@ use_ammo(struct emp_qelem *list)
struct sctstr sect;
int shell;
short *item;
double mobcost;
struct mchrstr *mcp;
/* use 1 shell from everyone */
for (qp = list->q_forw; qp != list; qp = next) {
@ -975,13 +973,8 @@ use_ammo(struct emp_qelem *list)
shell = 0;
item[I_SHELL] = shell;
putship(ship.shp_uid, &ship);
mcp = &mchr[(int)ship.shp_type];
mobcost = ship.shp_effic * 0.01 * ship.shp_speed;
mobcost = (480.0 / (mobcost +
techfact(ship.shp_tech, mobcost)));
/* mob cost = 1/2 a sect's mob */
mobcost /= 2.0;
ship.shp_mobil -= mobcost;
ship.shp_mobil -= shp_mobcost(&ship) / 2.0;
}
} else if (fp->type == targ_land) {
getsect(fp->x, fp->y, &sect);

3
src/lib/commands/orde.c
View file

@ -330,8 +330,7 @@ eta_calc(struct shpstr *sp, char *path, int *len, int *nupdates)
*len = i;
*nupdates = 1;
mobcost = sp->shp_effic * 0.01 * sp->shp_speed;
mobcost = 480.0 / (mobcost + techfact(sp->shp_tech, mobcost));
mobcost = shp_mobcost(sp);
mobil = sp->shp_mobil;
while (i) {
if (mobil > 0) {

18
src/lib/commands/torp.c
View file

@ -71,8 +71,6 @@ torp(void)
struct shpstr vship;
struct shpstr sub;
char *ptr;
double mobcost;
struct mchrstr *mcp;
struct nstr_item nbst;
char buf[1024];
char *sav;
@ -169,13 +167,8 @@ torp(void)
shells -= SHP_TORP_SHELLS;
sub.shp_item[I_SHELL] = shells;
putship(sub.shp_uid, &sub);
mcp = &mchr[(int)sub.shp_type];
mobcost = sub.shp_effic * 0.01 * sub.shp_speed;
mobcost = (480.0 / (mobcost + techfact(sub.shp_tech, mobcost)));
/* Mob cost for a torp is equal to the cost of 1/2 sector of movement */
mobcost /= 2.0;
sub.shp_mobil -= mobcost;
sub.shp_mobil -= shp_mobcost(&sub) / 2.0;
pr("Whooosh... ");
getship(victno, &vship);
vshipown = vship.shp_own;
@ -389,8 +382,6 @@ fire_torp(struct shpstr *sp, struct shpstr *targ, int range, int ntargets)
int dam;
int shells;
double hitchance;
double mobcost;
struct mchrstr *mcp;
shells = sp->shp_item[I_SHELL];
@ -415,13 +406,8 @@ fire_torp(struct shpstr *sp, struct shpstr *targ, int range, int ntargets)
sp->shp_item[I_SHELL] = shells;
putship(sp->shp_uid, sp);
mcp = &mchr[(int)sp->shp_type];
mobcost = sp->shp_effic * 0.01 * sp->shp_speed;
mobcost = (480.0 / (mobcost + techfact(sp->shp_tech, mobcost)));
/* Mob cost for a torp is equal to the cost of 1/2 sector of movement */
mobcost /= 2.0;
sp->shp_mobil -= mobcost;
sp->shp_mobil -= shp_mobcost(sp) / 2.0;
hitchance = DTORP_HITCHANCE(range, sp->shp_visib);