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

(LND_AMM): Became weird in 4.2.3: ammo use depends on l_dam if l_ammo

Browse source 
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.
This commit is contained in:
Markus Armbruster 2006-07-08 07:21:47 +00:00
parent 35758fe053
commit 99fc82b94d
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/land.h
View file

@ -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)

2
src/lib/subs/lndsub.c
View file

@ -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);

2
src/lib/subs/show.c
View file

@ -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),