Skip to content

Commit 4c3512a

Browse files
xrSimpodinxrSimpodin
committed
Апдейт ресурсов
Новые опции в меню и тп
1 parent cd0b402 commit 4c3512a

File tree

6 files changed

+65
-19
lines changed

6 files changed

+65
-19
lines changed

‎Game/Resources_SoC_1.0006/gamedata/config/text/eng/ui_st_mm.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -590,6 +590,19 @@
590590
<string id="ui_mm_crosshair_hard">
591591
<text>Realistic crosshair</text>
592592
</string>
593+
<string id="ui_mm_aim_toggle">
594+
<text>Aiming by pressing/holding</text>
595+
</string>
596+
<string id="ui_mm_switch_slot">
597+
<text>Switching the slot using the mouse wheel</text>
598+
</string>
599+
<string id="ui_mm_font_scale_x">
600+
<text>Fonts width</text>
601+
</string>
602+
<string id="ui_mm_font_scale_y">
603+
<text>Fonts height</text>
604+
</string>
605+
593606
<!-- Controls menu -->
594607
<string id="ui_mm_controls">
595608
<text>Controls</text>

‎Game/Resources_SoC_1.0006/gamedata/config/text/rus/ui_st_mm.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -590,6 +590,19 @@
590590
<string id="ui_mm_crosshair_hard">
591591
<text>Ðåàëèñòè÷íûé ïðèöåë</text>
592592
</string>
593+
<string id="ui_mm_aim_toggle">
594+
<text>Ïðèöåëèâàíèå íàæàòèåì\óäåðæèâàíèåì</text>
595+
</string>
596+
<string id="ui_mm_switch_slot">
597+
<text>Ïåðåêëþ÷åíèå ñëîòà êîëåñèêîì ìûøè</text>
598+
</string>
599+
<string id="ui_mm_font_scale_x">
600+
<text>Øèðèíà øðèôòîâ</text>
601+
</string>
602+
<string id="ui_mm_font_scale_y">
603+
<text>Âûñîòà øðèôòîâ</text>
604+
</string>
605+
593606
<!-- Îêíî "Óïðàâëåíèå" -->
594607
<string id="ui_mm_controls">
595608
<text>Óïðàâëåíèå</text>

‎Game/Resources_SoC_1.0006/gamedata/config/ui/ui_mm_opt.xml

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
<cap_resolution x="20" y="80" width="143" height="21">
104104
<text font="letterica16" r="215" g="195" b="170">ui_mm_resolution</text>
105105
</cap_resolution>
106-
<list_resolution x="194" y="75" width="261" height="21" always_show_scroll="1">
106+
<list_resolution x="194" y="75" width="261" height="21" list_length="13" always_show_scroll="1">
107107
<options_item entry="vid_mode" group="mm_opt_video"/>
108108
<text_color>
109109
<e r="216" g="186" b="140"/>
@@ -699,26 +699,40 @@
699699
<text font="letterica16" r="215" g="195" b="170">ui_mm_ambient</text>
700700
</check_ambient>
701701

702-
<check_ammunition_on_belt x="20" y="230" width="243" height="21">
703-
<options_item entry="g_ammunition_on_belt" group="mm_opt_gameplay"/>
704-
<text font="letterica16" r="215" g="195" b="170">ui_mm_ammunition_on_belt</text>
705-
</check_ammunition_on_belt>
706-
707-
<check_build_crosshair x="20" y="255" width="243" height="21">
702+
<check_build_crosshair x="20" y="230" width="243" height="21">
708703
<options_item entry="hud_crosshair_build" group="mm_opt_gameplay"/>
709704
<text font="letterica16" r="215" g="195" b="170">ui_mm_build_crosshair</text>
710705
</check_build_crosshair>
711706

712-
<check_small_font x="20" y="280" width="243" height="21">
713-
<options_item entry="hud_small_font" group="mm_opt_gameplay"/>
714-
<text font="letterica16" r="215" g="195" b="170">ui_mm_small_font</text>
715-
</check_small_font>
716-
717-
<check_crosshair_hard x="20" y="305" width="243" height="21">
707+
<check_crosshair_hard x="20" y="255" width="243" height="21">
718708
<options_item entry="hud_crosshair_hard" group="mm_opt_gameplay"/>
719709
<text font="letterica16" r="215" g="195" b="170">ui_mm_crosshair_hard</text>
720710
</check_crosshair_hard>
721711

712+
<check_aim_toggle x="20" y="280" width="243" height="21">
713+
<options_item entry="wpn_aim_toggle" group="mm_opt_gameplay"/>
714+
<text font="letterica16" r="215" g="195" b="170">ui_mm_aim_toggle</text>
715+
</check_aim_toggle>
716+
717+
<check_switch_slot x="20" y="305" width="243" height="21">
718+
<options_item entry="g_mouse_wheel_switch_slot" group="mm_opt_gameplay"/>
719+
<text font="letterica16" r="215" g="195" b="170">ui_mm_switch_slot</text>
720+
</check_switch_slot>
721+
722+
<cap_font_scale_x x="195" y="55" width="143" height="21">
723+
<text font="letterica16" r="215" g="195" b="170">ui_mm_font_scale_x</text>
724+
</cap_font_scale_x>
725+
<track_font_scale_x x="280" y="50" width="175" height="21" invert="0" step="0.01" min="0.5" max="2">
726+
<options_item entry="g_font_scale_x" group="mm_opt_gameplay"/>
727+
</track_font_scale_x>
728+
729+
<cap_font_scale_y x="195" y="80" width="143" height="21">
730+
<text font="letterica16" r="215" g="195" b="170">ui_mm_font_scale_y</text>
731+
</cap_font_scale_y>
732+
<track_font_scale_y x="280" y="75" width="175" height="21" invert="0" step="0.01" min="0.5" max="2">
733+
<options_item entry="g_font_scale_y" group="mm_opt_gameplay"/>
734+
</track_font_scale_y>
735+
722736
</tab_gameplay>
723737
<tab_controls>
724738
<cap_mousesens x="20" y="25" width="150" height="21">

‎Game/Resources_SoC_1.0006/gamedata/scripts/ui_mm_opt_gameplay.script

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,15 @@ function opt_gameplay:InitControls(x, y, xml)
2222
xml:InitCheck("tab_gameplay:check_show_weapon", self)
2323
xml:InitCheck("tab_gameplay:check_dist", self)
2424
xml:InitCheck("tab_gameplay:check_ambient", self)
25-
xml:InitCheck("tab_gameplay:check_ammunition_on_belt", self)
2625
xml:InitCheck("tab_gameplay:check_build_crosshair", self)
27-
xml:InitCheck("tab_gameplay:check_small_font", self)
2826
xml:InitCheck("tab_gameplay:check_crosshair_hard", self)
27+
xml:InitCheck("tab_gameplay:check_aim_toggle", self)
28+
xml:InitCheck("tab_gameplay:check_switch_slot", self)
29+
30+
xml:InitStatic("tab_gameplay:cap_font_scale_x", self)
31+
xml:InitTrackBar("tab_gameplay:track_font_scale_x", self)
32+
xml:InitStatic("tab_gameplay:cap_font_scale_y", self)
33+
xml:InitTrackBar("tab_gameplay:track_font_scale_y", self)
34+
2935
xml:InitComboBox("tab_gameplay:list_difficulty", self)
3036
end

‎Game/Resources_SoC_1.0006/gamedata/scripts/ui_mm_opt_video.script

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ function opt_video:InitControls(x, y, xml, handler)
3535
handler:AddCallback("check_fullscreen", ui_events.CHECK_BUTTON_SET, enable_fullscreen_trackbars, true)
3636
handler:AddCallback("check_fullscreen", ui_events.CHECK_BUTTON_RESET, enable_fullscreen_trackbars, false)
3737

38-
xml:InitStatic("tab_video:cap_resolution", self)
39-
xml:InitComboBox("tab_video:list_resolution", self)
40-
4138
xml:InitStatic("tab_video:cap_always_active", self) --Вот это надо инитить раньше list_fps_lock, чтобы этот статик не перекрывал выпадающий список.
4239
xml:InitCheck("tab_video:check_always_active", self)
4340

4441
xml:InitStatic("tab_video:cap_fps_lock", self)
4542
xml:InitComboBox("tab_video:list_fps_lock", self)
4643

44+
xml:InitStatic("tab_video:cap_resolution", self)
45+
xml:InitComboBox("tab_video:list_resolution", self)
46+
4747
xml:InitStatic("tab_video:cap_preset", self)
4848
local btn = xml:InitComboBox("tab_video:list_presets", self)
4949
handler:Register(btn, "combo_preset")

‎Game/Resources_SoC_1.0006/gamedata/scripts/ui_mm_opt_video_adv.script

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ local adv_vid_opt_params = {
6969
{ "fov", "track", 0, hint_colors.green , "video_settings_name_61", "video_settings_desc_61" },
7070
{ "hud_fov", "track", 0, hint_colors.green , "video_settings_name_62", "video_settings_desc_62" },
7171
{ "cam_inert", "track", 0, hint_colors.green , "video_settings_name_1" , "video_settings_desc_1" },
72-
{ "r2_sun_lumscale", "track", 0, hint_colors.green , "video_settings_name_27", "video_settings_desc_27" },
72+
-- { "r2_sun_lumscale", "track", 0, hint_colors.green , "video_settings_name_27", "video_settings_desc_27" },
7373
-- { "r2_sun_lumscale_amb", "track", 0, hint_colors.green , "video_settings_name_28", "video_settings_desc_28", only_2_and_more_mode },
7474
-- { "r2_sun_lumscale_hemi", "track", 0, hint_colors.green , "video_settings_name_63", "video_settings_desc_63", only_2_and_more_mode }, --Это более не нужно.
7575
-- { "r2_tf_mipbias", "track", 0, hint_colors.green , "video_settings_name_20", "video_settings_desc_20" }, -- Лучше это не менять, а то на DX10+ при значениях выше -0.5f мылится UI.

0 commit comments

Comments
 (0)