Mercurial Mercurial > hedgewars / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hedgewars/uAI.pas
changeset 15637 fd1a580a35d6
parent 15636 34c32a11203e
child 15681 a92220611821 
--- a/hedgewars/uAI.pas	Thu Jun 25 17:44:22 2020 +0200
+++ b/hedgewars/uAI.pas	Thu Jun 25 18:13:20 2020 +0200
@@ -151,7 +151,8 @@
                             AddAction(BestActions, aia_attack, aim_push, 10, 0, 0);
                             AddAction(BestActions, aia_attack, aim_release, 10, 0, 0);
                             end;
-                        if (HHHasAmmo(Me^.Hedgehog^, amInvulnerable) > 0) and (Me^.Hedgehog^.Effects[heInvulnerable] = 0) then
+                        if ((AmmoTests[a].flags and amtest_NoInvulnerable) = 0) and
+                            (HHHasAmmo(Me^.Hedgehog^, amInvulnerable) > 0) and (Me^.Hedgehog^.Effects[heInvulnerable] = 0) then
                             begin
                             AddAction(BestActions, aia_Weapon, Longword(amInvulnerable), 80, 0, 0);
                             AddAction(BestActions, aia_attack, aim_push, 10, 0, 0);
@@ -163,7 +164,8 @@
                             AddAction(BestActions, aia_attack, aim_push, 10, 0, 0);
                             AddAction(BestActions, aia_attack, aim_release, 10, 0, 0);
                             end;
-                        if (HHHasAmmo(Me^.Hedgehog^, amVampiric) > 0) and (not cVampiric) then
+                        if (not cVampiric) and ((AmmoTests[a].flags and amtest_NoVampiric) = 0) and
+                            (HHHasAmmo(Me^.Hedgehog^, amVampiric) > 0) then
                             begin
                             AddAction(BestActions, aia_Weapon, Longword(amVampiric), 80, 0, 0);
                             AddAction(BestActions, aia_attack, aim_push, 10, 0, 0);
hedgewars