From 5bc5df842949bfe4ff81d72edb00987fd1bf5b84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Lu=C3=ADs=20Vaz=20Silva?= Date: Sat, 8 Feb 2025 14:52:14 -0300 Subject: [PATCH] fix ammo give/autoaim for incinerator/calamity blade --- wadsrc/static/zscript/actors/doom/id24/id24calamityblade.zs | 3 ++- wadsrc/static/zscript/actors/doom/id24/id24incinerator.zs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/wadsrc/static/zscript/actors/doom/id24/id24calamityblade.zs b/wadsrc/static/zscript/actors/doom/id24/id24calamityblade.zs index 4b51ce78f6..647886e14d 100644 --- a/wadsrc/static/zscript/actors/doom/id24/id24calamityblade.zs +++ b/wadsrc/static/zscript/actors/doom/id24/id24calamityblade.zs @@ -22,8 +22,9 @@ class ID24CalamityBlade : DoomWeapon // Heatwave Generator { Weapon.SelectionOrder 1000; Weapon.AmmoUse 10; - Weapon.AmmoGive 40; + Weapon.AmmoGive 20; Weapon.AmmoType "ID24Fuel"; + +Weapon.NoAutoAim; Inventory.PickupMessage "$ID24_GOTCALAMITYBLADE"; Tag "$TAG_ID24CALAMITYBLADE"; } diff --git a/wadsrc/static/zscript/actors/doom/id24/id24incinerator.zs b/wadsrc/static/zscript/actors/doom/id24/id24incinerator.zs index edae79e522..ebd6da42ec 100644 --- a/wadsrc/static/zscript/actors/doom/id24/id24incinerator.zs +++ b/wadsrc/static/zscript/actors/doom/id24/id24incinerator.zs @@ -22,7 +22,7 @@ class ID24Incinerator : DoomWeapon // Incinerator { Weapon.SelectionOrder 120; Weapon.AmmoUse 1; - Weapon.AmmoGive 40; + Weapon.AmmoGive 20; Weapon.AmmoType "ID24Fuel"; Inventory.PickupMessage "$ID24_GOTINCINERATOR"; Tag "$TAG_ID24INCINERATOR";