X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=src%2Flib%2Fsubs%2Fshpsub.c;h=51fe707949ef9aa53d1b3d4128025bd3f78d1066;hp=679a119527ddf78055c7b9011bd75eb3359809d2;hb=bd07ee186b0e5c8d21cdf3238b71671ef3226d22;hpb=038cc74d4edf0c3d769fefcd6c115626d6036dae diff --git a/src/lib/subs/shpsub.c b/src/lib/subs/shpsub.c index 679a11952..51fe70794 100644 --- a/src/lib/subs/shpsub.c +++ b/src/lib/subs/shpsub.c @@ -1,6 +1,6 @@ /* * Empire - A multi-player, client/server Internet based war game. - * Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak, + * Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak, * Ken Stevens, Steve McClure * * This program is free software; you can redistribute it and/or modify @@ -26,16 +26,15 @@ * --- * * shpsub.c: Ship subroutine stuff - * + * * Known contributors to this file: * Ken Stevens, 1995 * Steve McClure, 1996-2000 - * Markus Armbruster, 2006 + * Markus Armbruster, 2006-2009 */ #include -#include #include #include "damage.h" #include "file.h" @@ -54,16 +53,11 @@ #include "unit.h" static int shp_check_one_mines(struct ulist *); -static int shp_hit_mine(struct shpstr *, struct mchrstr *); +static int shp_hit_mine(struct shpstr *); static void shp_mess(char *, struct ulist *); void shp_sel(struct nstr_item *ni, struct emp_qelem *list) - - - /* int wantflags; - int nowantflags; - */ { struct shpstr ship; struct mchrstr *mcp; @@ -74,11 +68,6 @@ shp_sel(struct nstr_item *ni, struct emp_qelem *list) if (!player->owner) continue; mcp = &mchr[(int)ship.shp_type]; - /* if (wantflags && (mcp->m_flags & wantflags) != wantflags) - continue; - if (nowantflags && mcp->m_flags & nowantflags) - continue; - */ if (opt_MARKET) { if (ontradingblock(EF_SHIP, &ship)) { pr("ship #%d inelligible - it's for sale.\n", @@ -86,18 +75,6 @@ shp_sel(struct nstr_item *ni, struct emp_qelem *list) continue; } } - /* This abuse is better fixed by building a ship with the normal negative - mobility that everything else is built with */ -/* - if (opt_MOB_ACCESS) { - if (ship.shp_effic < 21 && - ship.shp_mobil < etu_per_update) { - pr("%s needs at least %d mob to navigate.\n", - prship(&ship), etu_per_update); - continue; - } - } -*/ ship.shp_mission = 0; ship.shp_rflags = 0; memset(ship.shp_rpath, 0, sizeof(ship.shp_rpath)); @@ -139,7 +116,7 @@ shp_nav(struct emp_qelem *list, double *minmobp, double *maxmobp, continue; } if (opt_SAIL) { - if (*ship.shp_path && !update_pending) { + if (*ship.shp_path && !update_running) { shp_mess("has a sail path", mlp); mpr(actor, "Use `sail <#> -' to reset\n"); continue; @@ -186,28 +163,6 @@ shp_nav(struct emp_qelem *list, double *minmobp, double *maxmobp, } } -void -shp_put(struct emp_qelem *list, natid actor) -{ - struct emp_qelem *qp; - struct emp_qelem *newqp; - struct ulist *mlp; - - qp = list->q_back; - while (qp != list) { - mlp = (struct ulist *)qp; - mpr(actor, "%s stopped at %s\n", prship(&mlp->unit.ship), - xyas(mlp->unit.ship.shp_x, mlp->unit.ship.shp_y, - mlp->unit.ship.shp_own)); - mlp->unit.ship.shp_mobil = (int)mlp->mobil; - putship(mlp->unit.ship.shp_uid, &mlp->unit.ship); - newqp = qp->q_back; - emp_remque(qp); - free(qp); - qp = newqp; - } -} - int shp_sweep(struct emp_qelem *ship_list, int verbose, int takemob, natid actor) { @@ -260,13 +215,13 @@ shp_sweep(struct emp_qelem *ship_list, int verbose, int takemob, natid actor) } sect.sct_mines = mines; mlp->unit.ship.shp_item[I_SHELL] = shells; + putship(mlp->unit.ship.shp_uid, &mlp->unit.ship); + putsect(§); if (shp_check_one_mines(mlp)) { stopping = 1; emp_remque(qp); free(qp); } - putship(mlp->unit.ship.shp_uid, &mlp->unit.ship); - putsect(§); } if (changed) writemap(actor); @@ -286,7 +241,7 @@ shp_check_one_mines(struct ulist *mlp) return 0; if (chance(DMINE_HITCHANCE(sect.sct_mines))) { actor = mlp->unit.ship.shp_own; - shp_hit_mine(&mlp->unit.ship, ((struct mchrstr *)mlp->chrp)); + shp_hit_mine(&mlp->unit.ship); sect.sct_mines--; if (map_set(actor, sect.sct_x, sect.sct_y, 'X', 0)) writemap(actor); @@ -463,16 +418,18 @@ shp_contains(struct emp_qelem *list, int newx, int newy, int wantflags, } static struct ulist * -most_valuable_ship(struct emp_qelem *list) +most_valuable_ship(struct emp_qelem *list, coord x, coord y) { struct emp_qelem *qp; struct emp_qelem *next; struct ulist *mlp; - struct ulist *mvs = 0; + struct ulist *mvs = NULL; for (qp = list->q_back; qp != list; qp = next) { next = qp->q_back; mlp = (struct ulist *)qp; + if (mlp->unit.ship.shp_x != x || mlp->unit.ship.shp_y != y) + continue; if (((struct mchrstr *)mlp->chrp)->m_flags & M_SUB) continue; if (!((struct mchrstr *)mlp->chrp)->m_nxlight && @@ -523,38 +480,48 @@ static int shp_missile_interdiction(struct emp_qelem *list, coord newx, coord newy, natid victim) { - int dam; - int twotries; + int dam, sublaunch; int stopping = 0; struct emp_qelem msl_list, *qp, *newqp; + struct plist *plp; struct ulist *mvs; - char what[512]; + + mvs = most_valuable_ship(list, newx, newy); + if (!mvs) + return 0; msl_sel(&msl_list, newx, newy, victim, P_T | P_MAR, 0, MI_INTERDICT); - twotries = 0; - while (!QEMPTY(&msl_list) && (mvs = most_valuable_ship(list))) { - sprintf(what, "%s", prship(&mvs->unit.ship)); - dam = msl_launch_mindam(&msl_list, newx, newy, - shp_hardtarget(&mvs->unit.ship), - EF_SHIP, 1, what, victim, MI_INTERDICT); - if (dam) { - mpr(victim, - "missile interdiction mission does %d damage to %s!\n", - dam, what); - shp_damage_one(mvs, dam); - twotries = 0; - stopping |= 1; - } else if (++twotries >= 2) { - break; + for (qp = msl_list.q_back; qp != &msl_list; qp = newqp) { + newqp = qp->q_back; + plp = (struct plist *)qp; + + if (mvs && mission_pln_equip(plp, NULL, 'p') >= 0) { + if (msl_launch(&plp->plane, EF_SHIP, prship(&mvs->unit.ship), + newx, newy, victim, &sublaunch) < 0) + goto use_up_msl; + stopping = 1; + if (msl_hit(&plp->plane, + shp_hardtarget(&mvs->unit.ship), EF_SHIP, + N_SHP_MISS, N_SHP_SMISS, sublaunch, victim)) { + dam = pln_damage(&plp->plane, 'p', 1); + if (dam) { + mpr(victim, + "missile interdiction mission does %d damage to %s!\n", + dam, prship(&mvs->unit.ship)); + shp_damage_one(mvs, dam); + } + } else { + dam = pln_damage(&plp->plane, 'p', 0); + collateral_damage(newx, newy, dam); + } + mvs = most_valuable_ship(list, newx, newy); + use_up_msl: + plp->plane.pln_effic = 0; + putplane(plp->plane.pln_uid, &plp->plane); } - } - qp = msl_list.q_forw; - while (qp != msl_list.q_forw) { - newqp = qp->q_forw; emp_remque(qp); free(qp); - qp = newqp; } return stopping; @@ -610,9 +577,8 @@ shp_fort_interdiction(struct emp_qelem *list, coord newx, coord newy, struct nstr_sect ns; struct sctstr fsect; int trange, range; - double guneff; - int shell, gun; int dam; + int stopping = 0; int totdam = 0; signed char notified[MAXNOC]; int i; @@ -648,35 +614,22 @@ shp_fort_interdiction(struct emp_qelem *list, coord newx, coord newy, while (nxtsct(&ns, &fsect)) { if (!notified[fsect.sct_own]) continue; - gun = fsect.sct_item[I_GUN]; - if (gun < 1) - continue; range = roundrange(fortrange(&fsect)); trange = mapdist(newx, newy, fsect.sct_x, fsect.sct_y); 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); - if (shell < 1) - continue; - shell--; - fsect.sct_item[I_SHELL] = shell; + dam = fort_fire(&fsect); putsect(&fsect); - if (gun > 7) - gun = 7; - guneff = landgun((int)fsect.sct_effic, gun); - dam = (int)guneff; + if (dam < 0) + continue; + stopping = 1; totdam += dam; mpr(victim, "Incoming fire does %d damage!\n", dam); -/* - mpr(victim, "%s fires at you for %d!\n", - xyas(fsect.sct_x,fsect.sct_y,victim), - dam); -*/ +#if 0 + mpr(victim, "%s fires at you for %d!\n", + xyas(fsect.sct_x,fsect.sct_y,victim), + dam); +#endif wu(0, fsect.sct_own, "%s fires at %s ships in %s for %d!\n", xyas(fsect.sct_x, fsect.sct_y, @@ -685,8 +638,26 @@ shp_fort_interdiction(struct emp_qelem *list, coord newx, coord newy, nreport(fsect.sct_own, N_SHP_SHELL, victim, 1); } if (totdam > 0) - return shp_damage(list, totdam, 0, M_SUB, newx, newy); - return 0; + shp_damage(list, totdam, 0, M_SUB, newx, newy); + return stopping; +} + +static int +shp_mission_interdiction(struct emp_qelem *list, coord x, coord y, + natid victim, int subs) +{ + char *what = subs ? "subs" : "ships"; + int wantflags = subs ? M_SUB : 0; + int nowantflags = subs ? 0 : M_SUB; + int mission = subs ? MI_SINTERDICT : MI_INTERDICT; + int dam; + + dam = unit_interdict(x, y, victim, what, + shp_easiest_target(list, wantflags, nowantflags), + mission); + if (dam >= 0) + shp_damage(list, dam, wantflags, nowantflags, x, y); + return dam >= 0; } static int @@ -698,26 +669,12 @@ shp_interdict(struct emp_qelem *list, coord newx, coord newy, natid victim) stopping |= shp_fort_interdiction(list, newx, newy, victim); if (shp_contains(list, newx, newy, 0, M_SUB)) { - stopping |= - shp_damage(list, - unit_interdict(newx, newy, victim, "ships", - shp_easiest_target(list, 0, M_SUB), - MI_INTERDICT), - 0, M_SUB, newx, newy); - if (most_valuable_ship(list)) { - stopping |= - shp_missile_interdiction(list, newx, newy, victim); - } + stopping |= shp_mission_interdiction(list, newx, newy, victim, 0); + stopping |= shp_missile_interdiction(list, newx, newy, victim); } } - if (shp_contains(list, newx, newy, M_SUB, 0)) { - stopping |= - shp_damage(list, - unit_interdict(newx, newy, victim, "subs", - shp_easiest_target(list, M_SUB, 0), - MI_SINTERDICT), - M_SUB, 0, newx, newy); - } + if (shp_contains(list, newx, newy, M_SUB, 0)) + stopping |= shp_mission_interdiction(list, newx, newy, victim, 1); return stopping; } @@ -729,17 +686,17 @@ shp_hardtarget(struct shpstr *sp) int vis, onsea; struct mchrstr *mcp = mchr + sp->shp_type; - vis = sp->shp_visib; + vis = shp_visib(sp); getsect(sp->shp_x, sp->shp_y, §); onsea = sect.sct_type == SCT_WATER; if (mcp->m_flags & M_SUB) vis *= 4; return (int)((sp->shp_effic / 100.0) * - (20 + sp->shp_speed * onsea / 2.0 - vis)); + (20 + shp_speed(sp) * onsea / 2.0 - vis)); } static int -shp_hit_mine(struct shpstr *sp, struct mchrstr *mcp) +shp_hit_mine(struct shpstr *sp) { double m; @@ -749,7 +706,7 @@ shp_hit_mine(struct shpstr *sp, struct mchrstr *mcp) nreport(sp->shp_own, N_HIT_MINE, 0, 1); m = MINE_DAMAGE(); - if (mcp->m_flags & M_SWEEP) + if (mchr[sp->shp_uid].m_flags & M_SWEEP) m /= 2.0; shipdamage(sp, ldround(m, 1)); @@ -757,29 +714,6 @@ shp_hit_mine(struct shpstr *sp, struct mchrstr *mcp) return (int)m; } -void -shp_view(struct emp_qelem *list) -{ - struct sctstr sect; - struct emp_qelem *qp; - struct emp_qelem *next; - struct ulist *mlp; - - for (qp = list->q_back; qp != list; qp = next) { - next = qp->q_back; - mlp = (struct ulist *)qp; - getsect(mlp->unit.ship.shp_x, mlp->unit.ship.shp_y, §); - if (((struct mchrstr *)mlp->chrp)->m_flags & M_FOOD) - mpr(mlp->unit.ship.shp_own, "[fert:%d] ", sect.sct_fertil); - if (((struct mchrstr *)mlp->chrp)->m_flags & M_OIL) - mpr(mlp->unit.ship.shp_own, "[oil:%d] ", sect.sct_oil); - mpr(mlp->unit.ship.shp_own, "%s @ %s %d%% %s\n", - prship(&mlp->unit.ship), - xyas(mlp->unit.ship.shp_x, mlp->unit.ship.shp_y, player->cnum), - sect.sct_effic, dchr[sect.sct_type].d_name); - } -} - int shp_nav_one_sector(struct emp_qelem *list, int dir, natid actor, int together) @@ -801,7 +735,7 @@ shp_nav_one_sector(struct emp_qelem *list, int dir, natid actor, int navigate; if (dir <= DIR_STOP || dir >= DIR_VIEW) { - shp_put(list, actor); + unit_put(list, actor); return 1; } dx = diroff[dir][0]; @@ -894,11 +828,11 @@ shp_nav_one_sector(struct emp_qelem *list, int dir, natid actor, } /* - * shp_miss_defence - * Check for incoming missiles with a P_MAR flag. + * shp_miss_defence + * Check for incoming missiles with a P_MAR flag. * Return True=1 if the missile was shotdown. * Or False=0 - * + * * Chad Zabel, July 95 */ @@ -908,7 +842,6 @@ shp_missile_defense(coord dx, coord dy, natid bombown, int hardtarget) struct nstr_item ni; struct shpstr ship; int hitchance; - int shell; double gun, eff, teff; snxtitem_dist(&ni, EF_SHIP, dx, dy, 1); @@ -926,20 +859,17 @@ shp_missile_defense(coord dx, coord dy, natid bombown, int hardtarget) if (ship.shp_effic < 60) continue; - shell = ship.shp_item[I_SHELL]; if (ship.shp_item[I_MILIT] < 1) /* do we have mil? */ continue; - if (shell < 2) { /* do we need shells */ - shell += supply_commod(ship.shp_own, ship.shp_x, ship.shp_y, - I_SHELL, 2); - if (shell < 2) - continue; - } if (ship.shp_item[I_GUN] < 1) /* we need at least 1 gun */ continue; + if (!shp_supply(&ship, I_SHELL, 2)) + continue; + ship.shp_item[I_SHELL] -= 2; + putship(ship.shp_uid, &ship); /* now calculate the odds */ - gun = MIN(ship.shp_item[I_GUN], ship.shp_glim); + gun = shp_usable_guns(&ship); eff = ship.shp_effic / 100.0; teff = ship.shp_tech / (ship.shp_tech + 200.0); /* raise 4.5 for better interception -KHS */ @@ -954,9 +884,6 @@ shp_missile_defense(coord dx, coord dy, natid bombown, int hardtarget) mpr(ship.shp_own, "Ship #%i anti-missile system activated!\n", ship.shp_uid); mpr(ship.shp_own, "%d%% hitchance...", hitchance); - /* use ammo */ - ship.shp_item[I_SHELL] = shell - 2; - putship(ship.shp_uid, &ship); if (roll(100) <= hitchance) { mpr(bombown, "KABOOOM!! Missile destroyed\n\n"); @@ -972,35 +899,6 @@ shp_missile_defense(coord dx, coord dy, natid bombown, int hardtarget) return 0; /* all attempts failed */ } -char * -shp_path(int together, struct shpstr *shp, char *buf) -{ - coord destx; - coord desty; - struct sctstr d_sect; - char *cp; - - if (!sarg_xy(buf, &destx, &desty)) - return 0; - if (!together) { - mpr(shp->shp_own, - "Cannot go to a destination sector if not all starting in the same sector\n"); - return 0; - } - if (!getsect(destx, desty, &d_sect)) { - mpr(shp->shp_own, "%d,%d is not a sector\n", destx, desty); - return 0; - } - - cp = BestShipPath(buf, shp->shp_x, shp->shp_y, - d_sect.sct_x, d_sect.sct_y, player->cnum); - if (!cp || shp->shp_mobil <= 0) { - mpr(shp->shp_own, "Can't get to '%s' right now.\n", - xyas(d_sect.sct_x, d_sect.sct_y, player->cnum)); - return 0; - } - return cp; -} /* Fire missiles at a ship which has fired shells */ void @@ -1021,20 +919,18 @@ shp_missdef(struct shpstr *sp, natid victim) sprintf(buf, "%s", prship(&mlp->unit.ship)); eff = sp->shp_effic; - if (most_valuable_ship(&list)) { - shp_missile_interdiction(&list, sp->shp_x, sp->shp_y, sp->shp_own); - getship(sp->shp_uid, sp); - - if (!sp->shp_own) { - wu(0, victim, - "missiles launched in defense did 100%% damage to %s\n", - buf); - wu(0, victim, "%s sunk!\n", buf); - } else if (eff > 0 && sp->shp_effic < eff) { - wu(0, victim, - "missiles launched in defense did %d%% damage to %s\n", - 100 * (eff - sp->shp_effic) / eff, buf); - } + shp_missile_interdiction(&list, sp->shp_x, sp->shp_y, sp->shp_own); + getship(sp->shp_uid, sp); + + if (!sp->shp_own) { + wu(0, victim, + "missiles launched in defense did 100%% damage to %s\n", + buf); + wu(0, victim, "%s sunk!\n", buf); + } else if (eff > 0 && sp->shp_effic < eff) { + wu(0, victim, + "missiles launched in defense did %d%% damage to %s\n", + 100 * (eff - sp->shp_effic) / eff, buf); } if (!QEMPTY(&list)) free(mlp); @@ -1043,7 +939,7 @@ shp_missdef(struct shpstr *sp, natid victim) double shp_mobcost(struct shpstr *sp) { - return speed_factor(sp->shp_effic * 0.01 * sp->shp_speed, + return speed_factor(sp->shp_effic * 0.01 * shp_speed(sp), sp->shp_tech); } @@ -1054,17 +950,9 @@ void shp_set_tech(struct shpstr *sp, int tlev) { struct mchrstr *mcp = mchr + sp->shp_type; - int tech_diff = tlev - mcp->m_tech; - if (CANT_HAPPEN(tech_diff < 0)) { - tlev -= tech_diff; - tech_diff = 0; - } + if (CANT_HAPPEN(tlev < mcp->m_tech)) + tlev = mcp->m_tech; sp->shp_tech = tlev; - sp->shp_armor = (short)SHP_DEF(mcp->m_armor, tech_diff); - sp->shp_speed = (short)SHP_SPD(mcp->m_speed, tech_diff); - sp->shp_visib = (short)SHP_VIS(mcp->m_visib, tech_diff); - sp->shp_frnge = (short)SHP_RNG(mcp->m_frnge, tech_diff); - sp->shp_glim = (short)SHP_FIR(mcp->m_glim, tech_diff); }