Skip to content

Commit b721a0c

Browse files
committed
Incorporated new update
1 parent 7b8b654 commit b721a0c

File tree

3 files changed

+15
-2
lines changed

3 files changed

+15
-2
lines changed

ui_enhancer/source/scripts/library_ui.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2247,6 +2247,7 @@ function imgui_options_menu(ui, x, y, w, h, is_active, selected_category_index,
22472247
settings.vr_tablet_index = ui:combo(update_get_loc(e_loc.vr_tablet_index), settings.vr_tablet_index, { "1", "2" })
22482248
settings.vr_controller_tooltips = ui:checkbox(update_get_loc(e_loc.vr_controller_tooltips), settings.vr_controller_tooltips)
22492249
settings.vr_screen_tilt = ui:checkbox(update_get_loc(e_loc.vr_screen_tilt), settings.vr_screen_tilt)
2250+
settings.vr_voice_xmit = ui:checkbox(update_get_loc(e_loc.voice), settings.vr_voice_xmit)
22502251
settings.vr_move_mode = ui:combo(update_get_loc(e_loc.vr_move_mode), settings.vr_move_mode, { update_get_loc(e_loc.vr_move_mode_teleport), update_get_loc(e_loc.vr_move_mode_smooth) })
22512252
settings.vr_smooth_move_speed = ui:slider(update_get_loc(e_loc.vr_smooth_move_speed), settings.vr_smooth_move_speed, 0.5, 2, 0.1)
22522253
settings.vr_smooth_rotate_speed = ui:slider(update_get_loc(e_loc.vr_smooth_rotate_speed), settings.vr_smooth_rotate_speed, 0.5, 2, 0.1)

ui_enhancer/source/scripts/library_util.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ atlas_icons = {
233233
map_icon_damage_indicator = 0,
234234
map_icon_low_fuel = 0,
235235
map_icon_low_ammo = 0,
236+
map_icon_hold_fire = 0,
236237
damage_hull = 0,
237238
damage_bg = 0,
238239
damage_fr = 0,

ui_enhancer/source/scripts/screen_vehicle_control.lua

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ function render_selection_vehicle(screen_w, screen_h, vehicle)
395395
local title = vehicle_definition_name .. string.format( " ID %.0f", vehicle:get_id() )
396396
local is_window_active = g_selected_vehicle_ui.confirm_self_destruct == false
397397

398-
ui:begin_window(title, 10, 10, left_w, 101, atlas_icons.column_pending, is_window_active, 2)
398+
ui:begin_window(title, 10, 10, left_w, 113, atlas_icons.column_pending, is_window_active, 2)
399399
ui:stat(update_get_loc(e_loc.hp), hitpoints .. "/" .. hitpoints_total, iff(damage_factor < 0.2, color_low, color_high))
400400

401401
if vehicle_definition_index == e_game_object_type.chassis_land_turret then
@@ -408,6 +408,12 @@ function render_selection_vehicle(screen_w, screen_h, vehicle)
408408

409409
ui:header(update_get_loc(e_loc.upp_actions))
410410

411+
if def_index ~= e_game_object_type.chassis_carrier and def_index ~= e_game_object_type.chassis_sea_barge and def_index ~= e_game_object_type.chassis_land_robot_dog then
412+
local is_vehicle_hold_fire = vehicle:get_is_hold_fire()
413+
is_hold_fire, is_modified = ui:checkbox(update_get_loc(e_loc.hold_fire), is_vehicle_hold_fire)
414+
if is_modified then vehicle:set_is_hold_fire(is_hold_fire) end
415+
end
416+
411417
if ui:list_item(update_get_loc(e_loc.upp_center_to_vehicle), true) then
412418
g_camera_pos_x = vehicle:get_position_xz():x()
413419
g_camera_pos_y = vehicle:get_position_xz():y()
@@ -440,7 +446,7 @@ function render_selection_vehicle(screen_w, screen_h, vehicle)
440446
end
441447
end
442448

443-
if #attachments > 0 and vehicle:get_definition_index() ~= e_game_object_type.chassis_land_turret then
449+
if #attachments > 0 and def_index ~= e_game_object_type.chassis_land_turret then
444450
local window = ui:begin_window(update_get_loc(e_loc.upp_ammo), 10, 116, left_w, { max=130 }, atlas_icons.column_stock, false, 2)
445451
local region_w, region_h = ui:get_region()
446452
local cy = 0
@@ -1939,6 +1945,11 @@ function update(screen_w, screen_h, ticks)
19391945
update_ui_image(cx, cy, atlas_icons.map_icon_low_ammo, icon_color, 0)
19401946
cx = cx + 4
19411947
end
1948+
1949+
if vehicle:get_is_hold_fire() then
1950+
update_ui_image(cx, cy, atlas_icons.map_icon_hold_fire, color8(255, 0, 0, 255), 0)
1951+
cx = cx + 4
1952+
end
19421953
end
19431954

19441955
if vehicle_team == screen_team then

0 commit comments

Comments
 (0)