Skip to content

Commit 83a1132

Browse files
Xottab-DUTYXottab-DUTY
committed
Refactored gameplay settings tab
Now you can change ui style in the settings
1 parent e5113e2 commit 83a1132

File tree

5 files changed

+176
-73
lines changed

5 files changed

+176
-73
lines changed

‎res/gamedata/configs/text/eng/ui_st_mm.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -504,6 +504,12 @@
504504
<string id="ui_mm_gameplay">
505505
<text>Game</text>
506506
</string>
507+
<string id="ui_mm_ui_style">
508+
<text>Interface style</text>
509+
</string>
510+
<string id="ui_style_default">
511+
<text>Call of Pripyat</text>
512+
</string>
507513
<string id="ui_mm_gamma">
508514
<text>Gamma</text>
509515
</string>

‎res/gamedata/configs/text/rus/ui_st_mm.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -504,6 +504,12 @@
504504
<string id="ui_mm_gameplay">
505505
<text>Èãðà</text>
506506
</string>
507+
<string id="ui_mm_ui_style">
508+
<text>Ñòèëü èíòåðôåéñà</text>
509+
</string>
510+
<string id="ui_style_default">
511+
<text>Çîâ Ïðèïÿòè</text>
512+
</string>
507513
<string id="ui_mm_gamma">
508514
<text>Ãàììà</text>
509515
</string>

‎res/gamedata/configs/ui/ui_mm_opt.xml‎

Lines changed: 54 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -518,11 +518,17 @@
518518
</check_dynamic_music>
519519
</tab_sound>
520520
<tab_gameplay>
521-
<cap_difficulty x="15" y="3" width="135" height="24">
521+
<scroll_v x="-5" y="0" width="450" height="320"
522+
right_ident="0" left_ident="0" top_indent="0" bottom_indent="0"
523+
vert_interval="0" always_show_scroll="0"/>
524+
525+
<templ_item width="430" height="30"/>
526+
527+
<cap_difficulty x="20" y="3" width="135" height="24">
522528
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_difficulty</text>
523529
</cap_difficulty>
524530

525-
<list_difficulty x="175" y="5" width="235" height="20">
531+
<list_difficulty x="180" y="5" width="235" height="20">
526532
<options_item entry="g_game_difficulty" group="mm_opt_gameplay"/>
527533
<list_font r="170" g="170" b="170" font="letterica16"/>
528534
<text_color>
@@ -531,79 +537,101 @@
531537
</text_color>
532538
</list_difficulty>
533539

534-
<cap_check_crosshair x="15" y="33" width="135" height="24">
540+
<cap_ui_style x="20" y="3" width="135" height="24">
541+
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_ui_style</text>
542+
</cap_ui_style>
543+
544+
<list_ui_style x="180" y="5" width="235" height="20">
545+
<options_item entry="ui_style" group="mm_opt_gameplay" depend="restart"/>
546+
<list_font r="170" g="170" b="170" font="letterica16"/>
547+
<text_color>
548+
<e r="170" g="170" b="170"/>
549+
<d r="70" g="70" b="70"/>
550+
</text_color>
551+
</list_ui_style>
552+
553+
<cap_check_crosshair x="20" y="3" width="135" height="24">
535554
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_show_crosshair</text>
536555
</cap_check_crosshair>
537-
<check_crosshair x="162" y="30" width="44" height="29">
556+
557+
<check_crosshair x="167" y="0" width="44" height="29">
538558
<texture>ui_inGame2_checkbox</texture>
539559
<options_item entry="hud_crosshair" group="mm_opt_gameplay"/>
540560
</check_crosshair>
541561

542-
<cap_check_dyn_crosshair x="15" y="63" width="135" height="24">
562+
<cap_check_dyn_crosshair x="20" y="3" width="135" height="24">
543563
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_dyn_crosshair</text>
544564
</cap_check_dyn_crosshair>
545-
<check_dyn_crosshair x="162" y="60" width="44" height="29">
565+
566+
<check_dyn_crosshair x="167" y="0" width="44" height="29">
546567
<texture>ui_inGame2_checkbox</texture>
547568
<options_item entry="cl_dynamiccrosshair" group="mm_opt_gameplay"/>
548569
</check_dyn_crosshair>
549570

550-
<cap_check_show_weapon x="15" y="93" width="135" height="24">
571+
<cap_check_show_weapon x="20" y="3" width="135" height="24">
551572
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_show_weapon</text>
552573
</cap_check_show_weapon>
553-
<check_show_weapon x="162" y="90" width="44" height="29">
574+
575+
<check_show_weapon x="167" y="0" width="44" height="29">
554576
<texture>ui_inGame2_checkbox</texture>
555577
<options_item entry="hud_weapon" group="mm_opt_gameplay"/>
556578
</check_show_weapon>
557579

558-
<cap_check_dist x="15" y="123" width="135" height="24">
580+
<cap_check_dist x="20" y="3" width="135" height="24">
559581
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_crosshair_distance</text>
560582
</cap_check_dist>
561-
<check_dist x="162" y="120" width="44" height="29">
583+
584+
<check_dist x="167" y="0" width="44" height="29">
562585
<texture>ui_inGame2_checkbox</texture>
563586
<options_item entry="hud_crosshair_dist" group="mm_opt_gameplay"/>
564587
</check_dist>
565588

566-
<cap_check_tips x="15" y="153" width="135" height="24">
589+
<cap_check_tips x="20" y="3" width="135" height="24">
567590
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_tips</text>
568591
</cap_check_tips>
569-
<check_tips x="162" y="150" width="44" height="29">
592+
593+
<check_tips x="167" y="0" width="44" height="29">
570594
<texture>ui_inGame2_checkbox</texture>
571595
<options_item entry="hud_info" group="mm_opt_gameplay"/>
572596
</check_tips>
573597

574-
<cap_check_crouch_toggle x="15" y="183" width="135" height="24">
598+
<cap_check_crouch_toggle x="20" y="3" width="135" height="24">
575599
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_crouch_toggle</text>
576600
</cap_check_crouch_toggle>
577-
<check_crouch_toggle x="162" y="180" width="44" height="29">
601+
602+
<check_crouch_toggle x="167" y="0" width="44" height="29">
578603
<texture>ui_inGame2_checkbox</texture>
579604
<options_item entry="g_crouch_toggle" group="mm_opt_gameplay"/>
580605
</check_crouch_toggle>
581606

582-
<cap_check_important_save x="15" y="213" width="135" height="24">
607+
<cap_check_important_save x="20" y="3" width="135" height="24">
583608
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_important_save</text>
584609
</cap_check_important_save>
585-
<check_important_save x="162" y="210" width="44" height="29">
610+
611+
<check_important_save x="167" y="0" width="44" height="29">
586612
<texture>ui_inGame2_checkbox</texture>
587613
<options_item entry="g_important_save" group="mm_opt_gameplay"/>
588614
</check_important_save>
589615

590-
<cap_check_hud_draw x="15" y="243" width="135" height="24">
591-
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_st_disable_hud</text>
592-
</cap_check_hud_draw>
593-
<check_hud_draw x="162" y="240" width="44" height="29">
594-
<texture>ui_inGame2_checkbox</texture>
595-
<options_item entry="hud_draw" group="mm_opt_gameplay"/>
596-
</check_hud_draw>
616+
<cap_check_hud_draw x="20" y="3" width="135" height="24">
617+
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_st_disable_hud</text>
618+
</cap_check_hud_draw>
597619

598-
<cap_check_loadingstages x="15" y="273" width="135" height="24">
620+
<check_hud_draw x="167" y="0" width="44" height="29">
621+
<texture>ui_inGame2_checkbox</texture>
622+
<options_item entry="hud_draw" group="mm_opt_gameplay"/>
623+
</check_hud_draw>
624+
625+
<cap_check_loadingstages x="20" y="3" width="135" height="24">
599626
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_loadingstages</text>
600627
</cap_check_loadingstages>
601-
<check_loadingstages x="162" y="270" width="44" height="29">
628+
629+
<check_loadingstages x="167" y="0" width="44" height="29">
602630
<texture>ui_inGame2_checkbox</texture>
603631
<options_item entry="rs_loadingstages" group="mm_opt_gameplay" is_integer="1"/>
604632
</check_loadingstages>
605633

606-
<btn_check_updates x="338" y="322" width="108" height="24">
634+
<btn_check_updates x="338" y="322" width="108" height="24">
607635
<text align="c" font="letterica16">ui_mm_check_updates</text>
608636
<texture>ui_inGame2_button</texture>
609637
<text_color>

‎res/gamedata/configs/ui/ui_mm_opt_16.xml‎

Lines changed: 53 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -521,11 +521,17 @@
521521
</check_dynamic_music>
522522
</tab_sound>
523523
<tab_gameplay>
524-
<cap_difficulty x="12" y="3" width="108" height="24">
524+
<templ_item width="360" height="30"/>
525+
526+
<scroll_v x="-4" y="0" width="360" height="320"
527+
right_ident="0" left_ident="0" top_indent="0" bottom_indent="0"
528+
vert_interval="0" always_show_scroll="0"/>
529+
530+
<cap_difficulty x="16" y="3" width="108" height="24">
525531
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_difficulty</text>
526532
</cap_difficulty>
527533

528-
<list_difficulty x="140" y="5" width="188" height="20">
534+
<list_difficulty x="144" y="5" width="188" height="20">
529535
<options_item entry="g_game_difficulty" group="mm_opt_gameplay"/>
530536
<list_font r="170" g="170" b="170" font="letterica16"/>
531537
<text_color>
@@ -534,79 +540,100 @@
534540
</text_color>
535541
</list_difficulty>
536542

537-
<cap_check_crosshair x="12" y="33" width="108" height="24">
543+
<cap_ui_style x="16" y="3" width="108" height="24">
544+
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_ui_style</text>
545+
</cap_ui_style>
546+
547+
<list_ui_style x="144" y="5" width="188" height="20">
548+
<options_item entry="ui_style" group="mm_opt_gameplay" depend="restart"/>
549+
<list_font r="170" g="170" b="170" font="letterica16"/>
550+
<text_color>
551+
<e r="170" g="170" b="170"/>
552+
<d r="70" g="70" b="70"/>
553+
</text_color>
554+
</list_ui_style>
555+
556+
<cap_check_crosshair x="16" y="3" width="108" height="24">
538557
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_show_crosshair</text>
539558
</cap_check_crosshair>
540-
<check_crosshair x="129" y="30" width="35" stretch="1" height="29">
559+
<check_crosshair x="133" y="0" width="35" stretch="1" height="29">
541560
<texture>ui_inGame2_checkbox</texture>
542561
<options_item entry="hud_crosshair" group="mm_opt_gameplay"/>
543562
</check_crosshair>
544563

545-
<cap_check_dyn_crosshair x="12" y="63" width="108" height="24">
564+
<cap_check_dyn_crosshair x="16" y="3" width="108" height="24">
546565
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_dyn_crosshair</text>
547566
</cap_check_dyn_crosshair>
548-
<check_dyn_crosshair x="129" y="60" width="35" stretch="1" height="29">
567+
568+
<check_dyn_crosshair x="133" y="0" width="35" stretch="1" height="29">
549569
<texture>ui_inGame2_checkbox</texture>
550570
<options_item entry="cl_dynamiccrosshair" group="mm_opt_gameplay"/>
551571
</check_dyn_crosshair>
552572

553-
<cap_check_show_weapon x="12" y="93" width="108" height="24">
573+
<cap_check_show_weapon x="16" y="3" width="108" height="24">
554574
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_show_weapon</text>
555575
</cap_check_show_weapon>
556-
<check_show_weapon x="129" y="90" width="35" stretch="1" height="29">
576+
577+
<check_show_weapon x="133" y="0" width="35" stretch="1" height="29">
557578
<texture>ui_inGame2_checkbox</texture>
558579
<options_item entry="hud_weapon" group="mm_opt_gameplay"/>
559580
</check_show_weapon>
560581

561-
<cap_check_dist x="12" y="123" width="108" height="24">
582+
<cap_check_dist x="16" y="3" width="108" height="24">
562583
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_crosshair_distance</text>
563584
</cap_check_dist>
564-
<check_dist x="129" y="120" width="35" stretch="1" height="29">
585+
586+
<check_dist x="133" y="0" width="35" stretch="1" height="29">
565587
<texture>ui_inGame2_checkbox</texture>
566588
<options_item entry="hud_crosshair_dist" group="mm_opt_gameplay"/>
567589
</check_dist>
568590

569-
<cap_check_tips x="12" y="153" width="108" height="24">
591+
<cap_check_tips x="16" y="3" width="108" height="24">
570592
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_tips</text>
571593
</cap_check_tips>
572-
<check_tips x="129" y="150" width="35" stretch="1" height="29">
594+
595+
<check_tips x="133" y="0" width="35" stretch="1" height="29">
573596
<texture>ui_inGame2_checkbox</texture>
574597
<options_item entry="hud_info" group="mm_opt_gameplay"/>
575598
</check_tips>
576599

577-
<cap_check_crouch_toggle x="12" y="183" width="108" height="24">
600+
<cap_check_crouch_toggle x="16" y="3" width="108" height="24">
578601
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_crouch_toggle</text>
579602
</cap_check_crouch_toggle>
580-
<check_crouch_toggle x="129" y="180" width="35" stretch="1" height="29">
603+
604+
<check_crouch_toggle x="133" y="0" width="35" stretch="1" height="29">
581605
<texture>ui_inGame2_checkbox</texture>
582606
<options_item entry="g_crouch_toggle" group="mm_opt_gameplay"/>
583607
</check_crouch_toggle>
584608

585-
<cap_check_important_save x="12" y="213" width="108" height="24">
609+
<cap_check_important_save x="16" y="3" width="108" height="24">
586610
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_important_save</text>
587611
</cap_check_important_save>
588-
<check_important_save x="129" y="210" width="35" stretch="1" height="29">
612+
613+
<check_important_save x="133" y="0" width="35" stretch="1" height="29">
589614
<texture>ui_inGame2_checkbox</texture>
590615
<options_item entry="g_important_save" group="mm_opt_gameplay"/>
591616
</check_important_save>
592617

593-
<cap_check_hud_draw x="12" y="243" width="108" height="24">
594-
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_st_disable_hud</text>
595-
</cap_check_hud_draw>
596-
<check_hud_draw x="129" y="240" width="35" height="29" stretch="1">
597-
<texture>ui_inGame2_checkbox</texture>
598-
<options_item entry="hud_draw" group="mm_opt_gameplay"/>
599-
</check_hud_draw>
618+
<cap_check_hud_draw x="16" y="3" width="108" height="24">
619+
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_st_disable_hud</text>
620+
</cap_check_hud_draw>
600621

601-
<cap_check_loadingstages x="12" y="273" width="108" height="24">
622+
<check_hud_draw x="133" y="0" width="35" height="29" stretch="1">
623+
<texture>ui_inGame2_checkbox</texture>
624+
<options_item entry="hud_draw" group="mm_opt_gameplay"/>
625+
</check_hud_draw>
626+
627+
<cap_check_loadingstages x="16" y="3" width="108" height="24">
602628
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_loadingstages</text>
603629
</cap_check_loadingstages>
604-
<check_loadingstages x="129" y="270" width="35" stretch="1" height="29">
630+
631+
<check_loadingstages x="133" y="0" width="35" stretch="1" height="29">
605632
<texture>ui_inGame2_checkbox</texture>
606633
<options_item entry="rs_loadingstages" group="mm_opt_gameplay" is_integer="1"/>
607634
</check_loadingstages>
608635

609-
<btn_check_updates x="270" y="322" width="86" height="24" stretch="1">
636+
<btn_check_updates x="270" y="322" width="86" height="24" stretch="1">
610637
<text align="c" font="letterica16">ui_mm_check_updates</text>
611638
<texture>ui_inGame2_button</texture>
612639
<text_color>

0 commit comments

Comments
 (0)