]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
If the bot has unlimited ammo, always prefer primary attack on the Vaporizer, fixes...
authorMario <mario.mario@y7mail.com>
Wed, 29 Apr 2020 18:45:25 +0000 (04:45 +1000)
committerMario <mario.mario@y7mail.com>
Wed, 29 Apr 2020 18:45:25 +0000 (04:45 +1000)
qcsrc/common/weapons/weapon/vaporizer.qc

index cfdbe7b7e933461e0566c9a053255fe9f418da22..e71ed7478a327227a021e91491aaf352bec50784 100644 (file)
@@ -280,7 +280,7 @@ void W_RocketMinsta_Attack3 (entity actor, .entity weaponentity)
 
 METHOD(Vaporizer, wr_aim, void(entity thiswep, entity actor, .entity weaponentity))
 {
-    if(GetResource(actor, thiswep.ammo_type) > 0)
+    if((actor.items & IT_UNLIMITED_AMMO) || GetResource(actor, thiswep.ammo_type) > 0)
         PHYS_INPUT_BUTTON_ATCK(actor) = bot_aim(actor, weaponentity, 1000000, 0, 1, false);
     else
         PHYS_INPUT_BUTTON_ATCK2(actor) = bot_aim(actor, weaponentity, WEP_CVAR_SEC(vaporizer, speed), 0, WEP_CVAR_SEC(vaporizer, lifetime), false); // WEAPONTODO: replace with proper vaporizer cvars