Skip to content

A button to request 20-40mm munition by 1000 #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dr-RazdalByte wants to merge 2 commits into
base: dev-revolution
Choose a base branch
from
Open

A button to request 20-40mm munition by 1000 #44

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd32a90
A button to request 20-40mm munition by 1000
ghbuser1 Mar 17, 2026
87a389a
merge fix
ghbuser1 Mar 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 38 additions & 21 deletions content/scripts/screen_inventory.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,10 @@ g_screen_h = 128
g_barge_count = 0
g_barge_max = 1

local ammo_options_1000_txt = { "X", "-1000", "-100", "+100", "+1000" }
local ammo_options_1000 = { 100, 1000 }
local ammo_options_100_txt = { "X", "-100", "-10", "+10", "+100" }
local ammo_options_100 = { 10, 100 }
--------------------------------------------------------------------------------
--
-- BEGIN
Expand Down Expand Up @@ -2447,27 +2451,36 @@ function tab_stock_render(screen_w, screen_h, x, y, w, h, is_tab_active, screen_
local order_amount = screen_vehicle:get_inventory_order(item_data.index)

local is_active = is_tab_active and g_tab_stock.is_confirm_discard == false
local window = ui:begin_window(item_data.name .. "##item", 30, 10, w - 60, h - 28, atlas_icons.column_pending, is_active, 2)
imgui_item_description(ui, screen_vehicle, item_data, true, is_active)
ui:header(update_get_loc(e_loc.upp_order))

local total_modify_amount = g_tab_stock.selected_item_modify_amount + order_amount
total_modify_amount = ui:selector(update_get_loc(e_loc.quantity), total_modify_amount, -99999, 99999, 1, "%+d")
g_tab_stock.selected_item_modify_amount = total_modify_amount - order_amount

local button_action = ui:button_group({ "X", "-100", "-10", "+10", "+100" }, true)

if button_action == 0 then
g_tab_stock.selected_item_modify_amount = -order_amount
elseif button_action == 1 then
g_tab_stock.selected_item_modify_amount = g_tab_stock.selected_item_modify_amount - 100
elseif button_action == 2 then
g_tab_stock.selected_item_modify_amount = g_tab_stock.selected_item_modify_amount - 10
elseif button_action == 3 then
g_tab_stock.selected_item_modify_amount = g_tab_stock.selected_item_modify_amount + 10
elseif button_action == 4 then
g_tab_stock.selected_item_modify_amount = g_tab_stock.selected_item_modify_amount + 100
end
ui:begin_window(item_data.name .. "##item", 30, 10, w - 60, h - 28, atlas_icons.column_pending, is_active, 2)
imgui_item_description(ui, screen_vehicle, item_data, true, is_active)
ui:header(update_get_loc(e_loc.upp_order))

local total_modify_amount = g_tab_stock.selected_item_modify_amount + order_amount
total_modify_amount = ui:selector(update_get_loc(e_loc.quantity), total_modify_amount, -99999, 99999, 1, "%+d")
g_tab_stock.selected_item_modify_amount = total_modify_amount - order_amount
local is_small_caliber = is_small_caliber(g_tab_stock.selected_item)
local ammo_options_txt
local ammo_options
if is_small_caliber then
ammo_options_txt = ammo_options_1000_txt
ammo_options = ammo_options_1000
else
ammo_options_txt = ammo_options_100_txt
ammo_options = ammo_options_100
end
local button_action = ui:button_group(ammo_options_txt, true)

if button_action == 0 then
g_tab_stock.selected_item_modify_amount = -order_amount
elseif button_action == 1 then
g_tab_stock.selected_item_modify_amount = g_tab_stock.selected_item_modify_amount - ammo_options[2]
elseif button_action == 2 then
g_tab_stock.selected_item_modify_amount = g_tab_stock.selected_item_modify_amount - ammo_options[1]
elseif button_action == 3 then
g_tab_stock.selected_item_modify_amount = g_tab_stock.selected_item_modify_amount + ammo_options[1]
elseif button_action == 4 then
g_tab_stock.selected_item_modify_amount = g_tab_stock.selected_item_modify_amount + ammo_options[2]
end
ui:end_window()

if g_tab_stock.is_confirm_discard then
Expand Down Expand Up @@ -2517,6 +2530,10 @@ function tab_stock_render(screen_w, screen_h, x, y, w, h, is_tab_active, screen_
update_ui_pop_offset()
end

function is_small_caliber(selected_ammo_id)
return selected_ammo_id == 0 or selected_ammo_id == 32 or selected_ammo_id == 48
end

function get_ordered_weight(vehicle)
local ordered_weight = 0.0
for _, category in pairs(g_item_categories) do
Expand Down