# HG changeset patch # User Wuzzy # Date 1594073825 -7200 # Node ID f681c3f2eeba0ce18704daee0dffcb06018aef35 # Parent 25371cae9fd7374977c4eaf41140739456be284f Remove Vamp/Resurrect ammos in gfInvulnerable mode diff -r 25371cae9fd7 -r f681c3f2eeba ChangeLog.txt --- a/ChangeLog.txt Tue Jul 07 01:15:15 2020 +0300 +++ b/ChangeLog.txt Tue Jul 07 00:17:05 2020 +0200 @@ -15,6 +15,7 @@ + Computer player now takes Strong Wind game modifier into account + Various small computer player improvements + New taunt chat commands: /bubble, /happy + + Remove Vamprism and Resurrector ammos when playing in "Invulnerable" game modifier * Fix many projectiles not being affected by Heavy Wind after turn end * Fix hog getting stuck when opening parachute right after a shoryuken digging through land * Fix game hanging if computer hog has nothing to attack diff -r 25371cae9fd7 -r f681c3f2eeba hedgewars/uAmmos.pas --- a/hedgewars/uAmmos.pas Tue Jul 07 01:15:15 2020 +0300 +++ b/hedgewars/uAmmos.pas Tue Jul 07 00:17:05 2020 +0200 @@ -113,7 +113,7 @@ // avoid things we already have by scheme // merge this into DisableSomeWeapons ? if ((a = amLowGravity) and ((GameFlags and gfLowGravity) <> 0)) - or ((a = amInvulnerable) and ((GameFlags and gfInvulnerable) <> 0)) + or ((a in [amInvulnerable, amResurrector, amVampiric]) and ((GameFlags and gfInvulnerable) <> 0)) or ((a = amLaserSight) and ((GameFlags and gfLaserSight) <> 0)) or ((a = amVampiric) and ((GameFlags and gfVampiric) <> 0)) or ((a = amExtraTime) and (cHedgehogTurnTime >= 1000000))