Remove Vamp/Resurrect ammos in gfInvulnerable mode
authorWuzzy <Wuzzy2@mail.ru>
Tue, 07 Jul 2020 00:17:05 +0200
changeset 15720 f681c3f2eeba
parent 15719 25371cae9fd7
child 15721 27eb5abd5058
Remove Vamp/Resurrect ammos in gfInvulnerable mode
ChangeLog.txt
hedgewars/uAmmos.pas
--- 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
--- 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))