From 3a1577a6b510f299f29a337dd65c2cb152285a73 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sun, 14 Dec 2008 16:04:47 -0500 Subject: [PATCH] Remove econfig key mission_mob_cost Questionable feature, and hasn't been used in a long time. --- include/econfig-spec.h | 2 -- src/lib/commands/miss.c | 13 +------------ src/lib/commands/vers.c | 4 ---- src/lib/global/constants.c | 2 -- 4 files changed, 1 insertion(+), 20 deletions(-) diff --git a/include/econfig-spec.h b/include/econfig-spec.h index e52ecc11..447140a9 100644 --- a/include/econfig-spec.h +++ b/include/econfig-spec.h @@ -316,8 +316,6 @@ EMPCFBOTH("fire_range_factor", fire_range_factor, float, NSC_FLOAT, 0, EMPCFBOTH("sect_mob_neg_factor", sect_mob_neg_factor, int, NSC_INT, 0, "Initial mobility for MOB_ACCESS (-etu_per_update / sect_mob_neg_factor)") EMPCF_COMMENT("# Applies to sector takeover, ship build, plane or land unit build, and trade.") -EMPCFBOTH("mission_mob_cost", mission_mob_cost, double, NSC_DOUBLE, 0, - "Cost to put something on a mission (percentage of max mob)") EMPCF_COMMENT("\n\n### Populace") EMPCFBOTH("uwbrate", uwbrate, double, NSC_DOUBLE, 0, diff --git a/src/lib/commands/miss.c b/src/lib/commands/miss.c index 08d03bdb..ab403878 100644 --- a/src/lib/commands/miss.c +++ b/src/lib/commands/miss.c @@ -57,7 +57,7 @@ mission(void) int radius, range; union empobj_storage item; struct empobj *gp; - int num = 0, mobmax, mobused; + int num = 0; struct nstr_item ni; char buf[1024]; @@ -166,22 +166,12 @@ mission(void) } else radius = 9999; - if ((mobmax = get_empobj_mob_max(type)) == -1) - return RET_FAIL; - - mobused = ldround(mission_mob_cost * (double)mobmax, 1); - while (nxtitem(&ni, &item)) { gp = (struct empobj *)&item; if (!player->owner || gp->own == 0) continue; - if (gp->mobil < mobused && mission_mob_cost) { - pr("%s: not enough mobility! (needs %d)\n", - obj_nameof(gp), mobused); - continue; - } if (mission == MI_RESERVE && !lnd_can_attack((struct lndstr *)gp)) { pr("%s is not designed to fight ground troops\n", obj_nameof(gp)); @@ -254,7 +244,6 @@ mission(void) y = gp->y; } - gp->mobil -= mobused; gp->mission = mission; range = oprange(gp); if (range < mapdist(gp->x, gp->y, x, y)) { diff --git a/src/lib/commands/vers.c b/src/lib/commands/vers.c index 6e618c02..506969be 100644 --- a/src/lib/commands/vers.c +++ b/src/lib/commands/vers.c @@ -139,10 +139,6 @@ vers(void) (int)(ship_mob_scale * (float)etu_per_update), (int)(plane_mob_scale * (float)etu_per_update), (int)(land_mob_scale * (float)etu_per_update)); - pr("Mission mobility cost\t\t--\t%d\t%d\t%d\n", - ldround((mission_mob_cost * (double)ship_mob_max), 1), - ldround((mission_mob_cost * (double)plane_mob_max), 1), - ldround((mission_mob_cost * (double)land_mob_max), 1)); pr("Max eff gain per update\t\t--\t%d\t%d\t%d\n", MIN((int)(ship_grow_scale * (float)etu_per_update), 100), MIN((int)(plane_grow_scale * (float)etu_per_update), 100), diff --git a/src/lib/global/constants.c b/src/lib/global/constants.c index 2611679f..1b54ab44 100644 --- a/src/lib/global/constants.c +++ b/src/lib/global/constants.c @@ -95,8 +95,6 @@ int fort_max_interdiction_range = 8; int ship_max_interdiction_range = 8; int land_max_interdiction_range = 8; -double mission_mob_cost = 0.0; /* Cost is percentage of max mob */ - double unit_damage = 0.30; /* Units take this fraction of normal damage */ double people_damage = 1.00; /* Civs/mil/uw take this fraction of damage */ double collateral_dam = 0.10; /* Side effect damage to sector */