Skip to content

Commit 716c1b4

Browse files
authored
actually fixed havoc ammo pickup numbers (#109)
1 parent a60e66e commit 716c1b4

File tree

1 file changed

+16
-1
lines changed

1 file changed

+16
-1
lines changed

NumericUI/scripts/mods/NumericUI/Interactions.lua

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
local mod = get_mod("NumericUI")
55

66
local Pickups = require("scripts/settings/pickup/pickups")
7+
local Havoc = require("scripts/utilities/havoc")
8+
local HavocSettings = require("scripts/settings/havoc_settings")
79

810
local small_clip_data = Pickups.by_name["small_clip"]
911
local large_clip_data = Pickups.by_name["large_clip"]
@@ -25,7 +27,20 @@ mod:hook_safe("HudElementInteraction", "update", function(self)
2527
local unit_data_ext = ScriptUnit.extension(player_unit, "unit_data_system")
2628
local visual_loadout_extension = ScriptUnit.extension(player_unit, "visual_loadout_system")
2729
local weapon_slot_configuration = visual_loadout_extension:slot_configuration_by_type("weapon")
28-
local ammo_modifier = Managers.state.difficulty:get_ammo_modifier()
30+
local ammo_modifier = 1
31+
if Managers.mechanism._mechanism then
32+
local mechanism_data = Managers.mechanism._mechanism._mechanism_data
33+
if mechanism_data.havoc_data then
34+
local parsed = Havoc.parse_data(mechanism_data.havoc_data)
35+
if parsed.modifiers then
36+
for _, modifier in ipairs(parsed.modifiers) do
37+
if modifier.name == "ammo_pickup_modifier" then
38+
ammo_modifier = HavocSettings.modifier_templates.ammo_pickup_modifier[modifier.level].ammo_pickup_modifier or 1
39+
end
40+
end
41+
end
42+
end
43+
end
2944

3045
local max_ammo_reserve = 0
3146
local ammo_reserve = 0

0 commit comments

Comments
 (0)