(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.
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

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)