Skip to content

Commit

Permalink
Refactored gameplay settings tab
Browse files Browse the repository at this point in the history 
Now you can change ui style in the settings
  • Loading branch information
@Xottab-DUTY
Xottab-DUTY committed Jul 8, 2018
1 parent e5113e2 commit 83a1132
Show file tree
Hide file tree
Showing 5 changed files with 176 additions and 73 deletions.
6 changes: 6 additions & 0 deletions res/gamedata/configs/text/eng/ui_st_mm.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,12 @@
<string id="ui_mm_gameplay">
<text>Game</text>
</string>
<string id="ui_mm_ui_style">
<text>Interface style</text>
</string>
<string id="ui_style_default">
<text>Call of Pripyat</text>
</string>
<string id="ui_mm_gamma">
<text>Gamma</text>
</string>
Expand Down
6 changes: 6 additions & 0 deletions res/gamedata/configs/text/rus/ui_st_mm.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,12 @@
<string id="ui_mm_gameplay">
<text>Èãðà</text>
</string>
<string id="ui_mm_ui_style">
<text>Ñòèëü èíòåðôåéñà</text>
</string>
<string id="ui_style_default">
<text>Çîâ Ïðèïÿòè</text>
</string>
<string id="ui_mm_gamma">
<text>Ãàììà</text>
</string>
Expand Down
80 changes: 54 additions & 26 deletions res/gamedata/configs/ui/ui_mm_opt.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -518,11 +518,17 @@
</check_dynamic_music>
</tab_sound>
<tab_gameplay>
<cap_difficulty x="15" y="3" width="135" height="24">
<scroll_v x="-5" y="0" width="450" height="320"
right_ident="0" left_ident="0" top_indent="0" bottom_indent="0"
vert_interval="0" always_show_scroll="0"/>

<templ_item width="430" height="30"/>

<cap_difficulty x="20" y="3" width="135" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_difficulty</text>
</cap_difficulty>

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

<cap_check_crosshair x="15" y="33" width="135" height="24">
<cap_ui_style x="20" y="3" width="135" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_ui_style</text>
</cap_ui_style>

<list_ui_style x="180" y="5" width="235" height="20">
<options_item entry="ui_style" group="mm_opt_gameplay" depend="restart"/>
<list_font r="170" g="170" b="170" font="letterica16"/>
<text_color>
<e r="170" g="170" b="170"/>
<d r="70" g="70" b="70"/>
</text_color>
</list_ui_style>

<cap_check_crosshair x="20" y="3" width="135" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_show_crosshair</text>
</cap_check_crosshair>
<check_crosshair x="162" y="30" width="44" height="29">

<check_crosshair x="167" y="0" width="44" height="29">
<texture>ui_inGame2_checkbox</texture>
<options_item entry="hud_crosshair" group="mm_opt_gameplay"/>
</check_crosshair>

<cap_check_dyn_crosshair x="15" y="63" width="135" height="24">
<cap_check_dyn_crosshair x="20" y="3" width="135" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_dyn_crosshair</text>
</cap_check_dyn_crosshair>
<check_dyn_crosshair x="162" y="60" width="44" height="29">

<check_dyn_crosshair x="167" y="0" width="44" height="29">
<texture>ui_inGame2_checkbox</texture>
<options_item entry="cl_dynamiccrosshair" group="mm_opt_gameplay"/>
</check_dyn_crosshair>

<cap_check_show_weapon x="15" y="93" width="135" height="24">
<cap_check_show_weapon x="20" y="3" width="135" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_show_weapon</text>
</cap_check_show_weapon>
<check_show_weapon x="162" y="90" width="44" height="29">

<check_show_weapon x="167" y="0" width="44" height="29">
<texture>ui_inGame2_checkbox</texture>
<options_item entry="hud_weapon" group="mm_opt_gameplay"/>
</check_show_weapon>

<cap_check_dist x="15" y="123" width="135" height="24">
<cap_check_dist x="20" y="3" width="135" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_crosshair_distance</text>
</cap_check_dist>
<check_dist x="162" y="120" width="44" height="29">

<check_dist x="167" y="0" width="44" height="29">
<texture>ui_inGame2_checkbox</texture>
<options_item entry="hud_crosshair_dist" group="mm_opt_gameplay"/>
</check_dist>

<cap_check_tips x="15" y="153" width="135" height="24">
<cap_check_tips x="20" y="3" width="135" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_tips</text>
</cap_check_tips>
<check_tips x="162" y="150" width="44" height="29">

<check_tips x="167" y="0" width="44" height="29">
<texture>ui_inGame2_checkbox</texture>
<options_item entry="hud_info" group="mm_opt_gameplay"/>
</check_tips>

<cap_check_crouch_toggle x="15" y="183" width="135" height="24">
<cap_check_crouch_toggle x="20" y="3" width="135" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_crouch_toggle</text>
</cap_check_crouch_toggle>
<check_crouch_toggle x="162" y="180" width="44" height="29">

<check_crouch_toggle x="167" y="0" width="44" height="29">
<texture>ui_inGame2_checkbox</texture>
<options_item entry="g_crouch_toggle" group="mm_opt_gameplay"/>
</check_crouch_toggle>

<cap_check_important_save x="15" y="213" width="135" height="24">
<cap_check_important_save x="20" y="3" width="135" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_important_save</text>
</cap_check_important_save>
<check_important_save x="162" y="210" width="44" height="29">

<check_important_save x="167" y="0" width="44" height="29">
<texture>ui_inGame2_checkbox</texture>
<options_item entry="g_important_save" group="mm_opt_gameplay"/>
</check_important_save>

<cap_check_hud_draw x="15" y="243" width="135" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_st_disable_hud</text>
</cap_check_hud_draw>
<check_hud_draw x="162" y="240" width="44" height="29">
<texture>ui_inGame2_checkbox</texture>
<options_item entry="hud_draw" group="mm_opt_gameplay"/>
</check_hud_draw>
<cap_check_hud_draw x="20" y="3" width="135" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_st_disable_hud</text>
</cap_check_hud_draw>

<cap_check_loadingstages x="15" y="273" width="135" height="24">
<check_hud_draw x="167" y="0" width="44" height="29">
<texture>ui_inGame2_checkbox</texture>
<options_item entry="hud_draw" group="mm_opt_gameplay"/>
</check_hud_draw>

<cap_check_loadingstages x="20" y="3" width="135" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_loadingstages</text>
</cap_check_loadingstages>
<check_loadingstages x="162" y="270" width="44" height="29">

<check_loadingstages x="167" y="0" width="44" height="29">
<texture>ui_inGame2_checkbox</texture>
<options_item entry="rs_loadingstages" group="mm_opt_gameplay" is_integer="1"/>
</check_loadingstages>

<btn_check_updates x="338" y="322" width="108" height="24">
<btn_check_updates x="338" y="322" width="108" height="24">
<text align="c" font="letterica16">ui_mm_check_updates</text>
<texture>ui_inGame2_button</texture>
<text_color>
Expand Down
79 changes: 53 additions & 26 deletions res/gamedata/configs/ui/ui_mm_opt_16.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -521,11 +521,17 @@
</check_dynamic_music>
</tab_sound>
<tab_gameplay>
<cap_difficulty x="12" y="3" width="108" height="24">
<templ_item width="360" height="30"/>

<scroll_v x="-4" y="0" width="360" height="320"
right_ident="0" left_ident="0" top_indent="0" bottom_indent="0"
vert_interval="0" always_show_scroll="0"/>

<cap_difficulty x="16" y="3" width="108" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_difficulty</text>
</cap_difficulty>

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

<cap_check_crosshair x="12" y="33" width="108" height="24">
<cap_ui_style x="16" y="3" width="108" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_ui_style</text>
</cap_ui_style>

<list_ui_style x="144" y="5" width="188" height="20">
<options_item entry="ui_style" group="mm_opt_gameplay" depend="restart"/>
<list_font r="170" g="170" b="170" font="letterica16"/>
<text_color>
<e r="170" g="170" b="170"/>
<d r="70" g="70" b="70"/>
</text_color>
</list_ui_style>

<cap_check_crosshair x="16" y="3" width="108" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_show_crosshair</text>
</cap_check_crosshair>
<check_crosshair x="129" y="30" width="35" stretch="1" height="29">
<check_crosshair x="133" y="0" width="35" stretch="1" height="29">
<texture>ui_inGame2_checkbox</texture>
<options_item entry="hud_crosshair" group="mm_opt_gameplay"/>
</check_crosshair>

<cap_check_dyn_crosshair x="12" y="63" width="108" height="24">
<cap_check_dyn_crosshair x="16" y="3" width="108" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_dyn_crosshair</text>
</cap_check_dyn_crosshair>
<check_dyn_crosshair x="129" y="60" width="35" stretch="1" height="29">

<check_dyn_crosshair x="133" y="0" width="35" stretch="1" height="29">
<texture>ui_inGame2_checkbox</texture>
<options_item entry="cl_dynamiccrosshair" group="mm_opt_gameplay"/>
</check_dyn_crosshair>

<cap_check_show_weapon x="12" y="93" width="108" height="24">
<cap_check_show_weapon x="16" y="3" width="108" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_show_weapon</text>
</cap_check_show_weapon>
<check_show_weapon x="129" y="90" width="35" stretch="1" height="29">

<check_show_weapon x="133" y="0" width="35" stretch="1" height="29">
<texture>ui_inGame2_checkbox</texture>
<options_item entry="hud_weapon" group="mm_opt_gameplay"/>
</check_show_weapon>

<cap_check_dist x="12" y="123" width="108" height="24">
<cap_check_dist x="16" y="3" width="108" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_crosshair_distance</text>
</cap_check_dist>
<check_dist x="129" y="120" width="35" stretch="1" height="29">

<check_dist x="133" y="0" width="35" stretch="1" height="29">
<texture>ui_inGame2_checkbox</texture>
<options_item entry="hud_crosshair_dist" group="mm_opt_gameplay"/>
</check_dist>

<cap_check_tips x="12" y="153" width="108" height="24">
<cap_check_tips x="16" y="3" width="108" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_tips</text>
</cap_check_tips>
<check_tips x="129" y="150" width="35" stretch="1" height="29">

<check_tips x="133" y="0" width="35" stretch="1" height="29">
<texture>ui_inGame2_checkbox</texture>
<options_item entry="hud_info" group="mm_opt_gameplay"/>
</check_tips>

<cap_check_crouch_toggle x="12" y="183" width="108" height="24">
<cap_check_crouch_toggle x="16" y="3" width="108" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_crouch_toggle</text>
</cap_check_crouch_toggle>
<check_crouch_toggle x="129" y="180" width="35" stretch="1" height="29">

<check_crouch_toggle x="133" y="0" width="35" stretch="1" height="29">
<texture>ui_inGame2_checkbox</texture>
<options_item entry="g_crouch_toggle" group="mm_opt_gameplay"/>
</check_crouch_toggle>

<cap_check_important_save x="12" y="213" width="108" height="24">
<cap_check_important_save x="16" y="3" width="108" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_important_save</text>
</cap_check_important_save>
<check_important_save x="129" y="210" width="35" stretch="1" height="29">

<check_important_save x="133" y="0" width="35" stretch="1" height="29">
<texture>ui_inGame2_checkbox</texture>
<options_item entry="g_important_save" group="mm_opt_gameplay"/>
</check_important_save>

<cap_check_hud_draw x="12" y="243" width="108" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_st_disable_hud</text>
</cap_check_hud_draw>
<check_hud_draw x="129" y="240" width="35" height="29" stretch="1">
<texture>ui_inGame2_checkbox</texture>
<options_item entry="hud_draw" group="mm_opt_gameplay"/>
</check_hud_draw>
<cap_check_hud_draw x="16" y="3" width="108" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_st_disable_hud</text>
</cap_check_hud_draw>

<cap_check_loadingstages x="12" y="273" width="108" height="24">
<check_hud_draw x="133" y="0" width="35" height="29" stretch="1">
<texture>ui_inGame2_checkbox</texture>
<options_item entry="hud_draw" group="mm_opt_gameplay"/>
</check_hud_draw>

<cap_check_loadingstages x="16" y="3" width="108" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_loadingstages</text>
</cap_check_loadingstages>
<check_loadingstages x="129" y="270" width="35" stretch="1" height="29">

<check_loadingstages x="133" y="0" width="35" stretch="1" height="29">
<texture>ui_inGame2_checkbox</texture>
<options_item entry="rs_loadingstages" group="mm_opt_gameplay" is_integer="1"/>
</check_loadingstages>

<btn_check_updates x="270" y="322" width="86" height="24" stretch="1">
<btn_check_updates x="270" y="322" width="86" height="24" stretch="1">
<text align="c" font="letterica16">ui_mm_check_updates</text>
<texture>ui_inGame2_button</texture>
<text_color>
Expand Down
Loading

0 comments on commit 83a1132

Please sign in to comment.