From 99fc82b94de51e23a91057c4fefdce8bb91ceba0 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 8 Jul 2006 07:21:47 +0000 Subject: [PATCH] (LND_AMM): Became weird in 4.2.3: ammo use depends on l_dam if l_ammo is non-zero; actual value of non-zero l_ammo was unimportant. Side effect: it substantially increased ammunition consumption at high tech, because the change made the value increase with tech. Back out 4.2.3's change, just use l_ammo. This lets deities customize ammunition consumption independent of damage. Remove second parameter. Callers changed. --- include/land.h | 2 +- src/lib/subs/lndsub.c | 2 +- src/lib/subs/show.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/land.h b/include/land.h index 93b93059..95b16104 100644 --- a/include/land.h +++ b/include/land.h @@ -160,7 +160,7 @@ struct lchrstr { logx((t), 60.0))) : (b)) #define LND_ACC(b, t) ((b * (1.0 - ((sqrt(t) / 100.0) * 1.1))) < 0 \ ? 0 : (b * (1.0 - ((sqrt(t) / 100.0) * 1.1)))) -#define LND_AMM(b, d, t) ((b) ? ((LND_DAM((d), (t)) / 2) + 1) : 0) +#define LND_AMM(b, t) (b) #define LND_AAF(b, t) ((b * (1.0 + ((sqrt(t) / 100.0) * 3.0))) > 127 \ ? 127 : (b * (1.0 + ((sqrt(t) / 100.0) * 3.0)))) #define LND_FC(b, t) (b) diff --git a/src/lib/subs/lndsub.c b/src/lib/subs/lndsub.c index 727ac8da..6eaabbd7 100644 --- a/src/lib/subs/lndsub.c +++ b/src/lib/subs/lndsub.c @@ -1364,7 +1364,7 @@ lnd_set_tech(struct lndstr *lp, int tlev) lp->lnd_frg = (int)LND_FRG(lcp->l_frg, tech_diff); lp->lnd_acc = (int)LND_ACC(lcp->l_acc, tech_diff); lp->lnd_dam = (int)LND_DAM(lcp->l_dam, tech_diff); - lp->lnd_ammo = (int)LND_AMM(lcp->l_ammo, lcp->l_dam, tech_diff); + lp->lnd_ammo = (int)LND_AMM(lcp->l_ammo, tech_diff); lp->lnd_aaf = (int)LND_AAF(lcp->l_aaf, tech_diff); lp->lnd_fuelc = (int)LND_FC(lcp->l_fuelc, tech_diff); lp->lnd_fuelu = (int)LND_FU(lcp->l_fuelu, tech_diff); diff --git a/src/lib/subs/show.c b/src/lib/subs/show.c index f79536d0..09a76fd8 100644 --- a/src/lib/subs/show.c +++ b/src/lib/subs/show.c @@ -482,7 +482,7 @@ show_land_stats(int tlev) (int)LND_FRG(lcp->l_frg, ourtlev), (int)LND_ACC(lcp->l_acc, ourtlev), (int)LND_DAM(lcp->l_dam, ourtlev), - (int)LND_AMM(lcp->l_ammo, lcp->l_dam, ourtlev), + (int)LND_AMM(lcp->l_ammo, ourtlev), (int)LND_AAF(lcp->l_aaf, ourtlev)); pr("%2d %2d %2d %2d ", (int)LND_FC(lcp->l_fuelc, ourtlev),