Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
AI: Don't use vamp/invuln for kamikaze, piano and other weapons
authorWuzzy <Wuzzy2@mail.ru>
Thu, 25 Jun 2020 18:13:20 +0200
changeset 15637 fd1a580a35d6
parent 15636 34c32a11203e
child 15638 1ee7790caa0f
AI: Don't use vamp/invuln for kamikaze, piano and other weapons
hedgewars/uAI.pas file | annotate | diff | comparison | revisions
hedgewars/uAIAmmoTests.pas file | annotate | diff | comparison | revisions 
--- 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);
--- a/hedgewars/uAIAmmoTests.pas	Thu Jun 25 17:44:22 2020 +0200
+++ b/hedgewars/uAIAmmoTests.pas	Thu Jun 25 18:13:20 2020 +0200
@@ -27,6 +27,8 @@
     amtest_MultipleAttacks = $00000004; // test could result in multiple attacks, set AttacksNum
     amtest_NoTrackFall     = $00000008; // skip fall tracing.  
     amtest_LaserSight      = $00000010; // supports laser sighting
+    amtest_NoVampiric      = $00000020; // don't use vampirism with this ammo
+    amtest_NoInvulnerable  = $00000040; // don't use invulnerable with this with ammo
 
 var windSpeed: real;
     aiLaserSighting: boolean;
@@ -91,8 +93,8 @@
             (proc: @TestDesertEagle; flags: amtest_MultipleAttacks or amtest_LaserSight), // amDEagle
             (proc: @TestDynamite;    flags: amtest_NoTarget), // amDynamite
             (proc: @TestFirePunch;   flags: amtest_NoTarget), // amFirePunch
-            (proc: @TestWhip;        flags: amtest_NoTarget), // amWhip
-            (proc: @TestBaseballBat; flags: amtest_NoTarget), // amBaseballBat
+            (proc: @TestWhip;        flags: amtest_NoTarget or amtest_NoInvulnerable), // amWhip
+            (proc: @TestBaseballBat; flags: amtest_NoTarget or amtest_NoInvulnerable), // amBaseballBat
             (proc: nil;              flags: 0), // amParachute
             (proc: @TestAirAttack;   flags: amtest_Rare), // amAirAttack
             (proc: @TestMineStrike;  flags: amtest_Rare), // amMineStrike
@@ -102,7 +104,7 @@
             //(proc: @TestTeleport;    flags: amtest_OnTurn), // amTeleport
             (proc: nil;              flags: 0), // amSwitch
             (proc: @TestMortar;      flags: 0), // amMortar
-            (proc: @TestKamikaze;    flags: amtest_LaserSight), // amKamikaze
+            (proc: @TestKamikaze;    flags: amtest_LaserSight or amtest_NoInvulnerable or amtest_NoVampiric), // amKamikaze
             (proc: @TestCake;        flags: amtest_Rare or amtest_NoTarget), // amCake
             (proc: @TestSeduction;   flags: amtest_NoTarget), // amSeduction
             (proc: @TestWatermelon;  flags: 0), // amWatermelon
@@ -122,12 +124,12 @@
             (proc: @TestMolotov;     flags: 0), // amMolotov
             (proc: nil;              flags: 0), // amBirdy
             (proc: nil;              flags: 0), // amPortalGun
-            (proc: @TestPiano;       flags: amtest_Rare), // amPiano
+            (proc: @TestPiano;       flags: amtest_Rare or amtest_NoInvulnerable or amtest_NoVampiric), // amPiano
             (proc: @TestGrenade;     flags: amtest_NoTrackFall), // amGasBomb
             (proc: @TestShotgun;     flags: 0), // amSineGun
             (proc: nil;              flags: 0), // amFlamethrower
             (proc: @TestSMine;       flags: 0), // amSMine
-            (proc: @TestHammer;      flags: amtest_NoTarget), // amHammer
+            (proc: @TestHammer;      flags: amtest_NoTarget or amtest_NoInvulnerable), // amHammer
             (proc: nil;              flags: 0), // amResurrector
             (proc: @TestDrillStrike; flags: amtest_Rare), // amDrillStrike
             (proc: nil;              flags: 0), // amSnowball
hedgewars