Skip to content

Commit 78d11f1

Browse files
DecaneDecane
committed
Fixed regression to radiation detector dial overlay
1 parent 27d35e3 commit 78d11f1

File tree

12 files changed

+438
-21
lines changed

12 files changed

+438
-21
lines changed

‎Optional Features/#1. (Choose From This Folder First)/Smaller Inventory Grids/gamedata/configs/ui/actor_menu.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -289,11 +289,11 @@
289289

290290
<main_sensor x="132" y="150" width="100" height="100">
291291
<hint_text delay="800">st_ui_main_sensor</hint_text>
292-
<!--
293-
<icon x="18" y="54" width="66" height="51">
294-
<texture>ui_hud2_rad01_over</texture>
292+
293+
<icon x="-2" y="55" width="66" height="51">
294+
<texture>ui_inGame2_rad01_over</texture>
295295
</icon>
296-
-->
296+
297297
<arrow x="46" y="32" width="9" height="97" heading="1" clockwise="1" begin_angle="0.75" end_angle="-0.75" ang_velocity="0.75">
298298
<texture a="255">ui_hud2_rad01_arrow</texture>
299299
</arrow>

‎Optional Features/#1. (Choose From This Folder First)/Smaller Inventory Grids/gamedata/configs/ui/actor_menu_16.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -297,19 +297,19 @@
297297

298298
<main_sensor x="110" y="150" width="83" height="100">
299299
<hint_text delay="800">st_ui_main_sensor</hint_text>
300-
<!--
301-
<icon x="15" y="54" width="55" height="51" stretch="1">
302-
<texture>ui_hud2_rad01_over</texture>
300+
301+
<icon x="-1.8" y="55" width="89" height="51" stretch="1">
302+
<texture>ui_inGame2_rad01_over</texture>
303303
</icon>
304-
-->
304+
305305
<arrow x="38" y="32" width="9" height="97" heading="1" clockwise="1" begin_angle="0.75" end_angle="-0.75" ang_velocity="0.75">
306306
<texture a="255">ui_hud2_rad01_arrow</texture>
307307
</arrow>
308308
<arrow_shadow x="40" y="34" width="9" height="97" heading="1" clockwise="1" begin_angle="0.75" end_angle="-0.8" ang_velocity="0.75">
309309
<texture a="250">ui_hud2_rad01_arrow_shadow</texture>
310310
</arrow_shadow>
311311

312-
<progress_shape x="3" y="40" width="96" height="96" sector_count="36" clockwise="1" blend="0" begin_angle="0.75" end_angle="-0.75">
312+
<progress_shape x="2" y="40" width="96" height="96" sector_count="36" clockwise="1" blend="0" begin_angle="0.75" end_angle="-0.75">
313313
<front x="0" y="0" width="80" height="96" stretch="1">
314314
<texture>ui_hud2_rad01_progress</texture>
315315
</front>

‎Optional Features/#2. (Choose From This Folder Last)/Transparent Inventory + Smaller Inventory Grids/gamedata/configs/ui/actor_menu_16.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@
325325
<texture a="250">ui_hud2_rad01_arrow_shadow</texture>
326326
</arrow_shadow>
327327

328-
<progress_shape x="3" y="40" width="96" height="96" sector_count="36" clockwise="1" blend="0" begin_angle="0.75" end_angle="-0.75">
328+
<progress_shape x="2" y="40" width="96" height="96" sector_count="36" clockwise="1" blend="0" begin_angle="0.75" end_angle="-0.75">
329329
<front x="0" y="0" width="80" height="96" stretch="1">
330330
<texture>ui_hud2_rad01_progress</texture>
331331
</front>

‎SRP v1.1.4 - Version History.txt

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ v1.1.4
3434
+ Fixed an SRP v1.1.1 regression that caused the game to forget the squad from which the player accepted a 'capture' task via dialogue under certain circumstances. - Decane
3535
+ Fixed an SRP v1.0.4 regression that caused several dialogue options to be erroneously unavailable when speaking to generic mercenary NPCs, including Hog's subordinates at the Army Warehouses and Leshiy's subordinates at the Red Forest. - Decane
3636
+ Fixed an SRP v1.0.3 regression that caused Yoga's walkie-talkie transmissions to the player to sound as if Yoga were speaking to the player in person rather than over walkie-talkie. - Decane
37+
+ Fixed an SRP v1.0.3 regression that caused the radiation detector dial on the HUD and in the inventory to be rendered over the detector's front panel instead of behind it. - Georgiy-Timoshin
3738
+ Worked around an SRP v1.0.3 regression introduced by the Dunin Ammo Aggregation mod that caused ammo unloaded from a weapon to disappear under certain circumstances. - Decane, Alex Rinic
3839
+ Worked around an SRP v1.0.3 regression that caused bullet tracers to be visible through geometry when playing in DX10/10.1 mode with anti-aliasing enabled through the game's graphics settings. Note: This was achieved by reintroducing the bug from the unmodded game of tracers not being visible at all in DX10/10.1 mode.
3940
+ Fixed an SRP v0.5 regression that caused DX9 sun shafts quality to be hard-coded to low.

‎gamedata/configs/ui/actor_menu.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -277,11 +277,11 @@
277277

278278
<main_sensor x="132" y="150" width="100" height="100">
279279
<hint_text delay="800">st_ui_main_sensor</hint_text>
280-
<!--
281-
<icon x="18" y="54" width="66" height="51">
282-
<texture>ui_hud2_rad01_over</texture>
280+
281+
<icon x="-2" y="55" width="66" height="51">
282+
<texture>ui_inGame2_rad01_over</texture>
283283
</icon>
284-
-->
284+
285285
<arrow x="46" y="32" width="9" height="97" heading="1" clockwise="1" begin_angle="0.75" end_angle="-0.75" ang_velocity="0.75">
286286
<texture a="255">ui_hud2_rad01_arrow</texture>
287287
</arrow>

‎gamedata/configs/ui/actor_menu_16.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -285,19 +285,19 @@
285285

286286
<main_sensor x="110" y="150" width="83" height="100">
287287
<hint_text delay="800">st_ui_main_sensor</hint_text>
288-
<!--
289-
<icon x="15" y="54" width="55" height="51" stretch="1">
290-
<texture>ui_hud2_rad01_over</texture>
288+
289+
<icon x="-1.8" y="55" width="89" height="51" stretch="1">
290+
<texture>ui_inGame2_rad01_over</texture>
291291
</icon>
292-
-->
292+
293293
<arrow x="38" y="32" width="9" height="97" heading="1" clockwise="1" begin_angle="0.75" end_angle="-0.75" ang_velocity="0.75">
294294
<texture a="255">ui_hud2_rad01_arrow</texture>
295295
</arrow>
296296
<arrow_shadow x="40" y="34" width="9" height="97" heading="1" clockwise="1" begin_angle="0.75" end_angle="-0.8" ang_velocity="0.75">
297297
<texture a="250">ui_hud2_rad01_arrow_shadow</texture>
298298
</arrow_shadow>
299299

300-
<progress_shape x="3" y="40" width="96" height="96" sector_count="36" clockwise="1" blend="0" begin_angle="0.75" end_angle="-0.75">
300+
<progress_shape x="2" y="40" width="96" height="96" sector_count="36" clockwise="1" blend="0" begin_angle="0.75" end_angle="-0.75">
301301
<front x="0" y="0" width="80" height="96" stretch="1">
302302
<texture>ui_hud2_rad01_progress</texture>
303303
</front>

‎gamedata/configs/ui/maingame.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
<!--
9696
<texture>ui_hud2_rad01_over</texture>
9797
-->
98-
<auto_static x="-17" y="14" width="103" height="37">
98+
<auto_static x="-18" y="0" width="103" height="51">
9999
<texture>ui_hud2_stamina_bk</texture>
100100
</auto_static>
101101
</back_over_arrow>

‎gamedata/configs/ui/maingame_16.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
<!--
9595
<texture>ui_hud2_rad01_over</texture>
9696
-->
97-
<auto_static x="-15" y="14" width="86" height="37" stretch="1">
97+
<auto_static x="-15" y="0" width="86" height="51" stretch="1">
9898
<texture>ui_hud2_stamina_bk</texture>
9999
</auto_static>
100100
</back_over_arrow>

‎gamedata/configs/ui/textures_descr/ui_hud.xml

+160
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,160 @@
1+
<w>
2+
<file name="ui\ui_hud">
3+
4+
<texture id="ui_sega_healph" x="699" y="198" width="325" height="25"/>
5+
<texture id="ui_sega_healph_progress" x="770" y="185" width="254" height="10"/>
6+
7+
<texture id="ui_hud_shkala_car" x="35" y="192" width="155" height="34"/>
8+
<texture id="ui_hud_shkala_health" x="185" y="38" width="164" height="34"/>
9+
<texture id="ui_hud_frame_patron" x="185" y="72" width="157" height="65"/>
10+
<texture id="ui_hud_frame_clock" x="190" y="137" width="157" height="67"/>
11+
<texture id="ui_hud_frame_rank" x="349" y="0" width="60" height="65"/>
12+
<texture id="ui_hud_frame_money" x="409" y="0" width="99" height="64"/>
13+
<texture id="ui_hud_stamina_full" x="349" y="65" width="125" height="125"/>
14+
<texture id="ui_hud_frame_stamina" x="0" y="226" width="97" height="127"/>
15+
<texture id="ui_hud_stamina" x="347" y="200" width="56" height="7"/>
16+
<texture id="ui_hud_fragBig" x="585" y="137" width="280" height="45"/>
17+
<texture id="ui_hud_shk_car" x="509" y="40" width="110" height="10"/>
18+
<texture id="ui_hud_shk_light" x="474" y="65" width="10" height="71"/>
19+
<texture id="ui_hud_shk_noise" x="484" y="65" width="10" height="71"/>
20+
<texture id="ui_hud_shk_stamina" x="347" y="200" width="57" height="7"/>
21+
<texture id="ui_hud_icon_PDA" x="619" y="40" width="48" height="29"/>
22+
<texture id="ui_hud_soldier_creep" x="0" y="353" width="65" height="75"/>
23+
<texture id="ui_hud_soldier_normal" x="0" y="428" width="65" height="75"/>
24+
<texture id="ui_hud_soldier_sprint" x="0" y="503" width="65" height="75"/>
25+
<texture id="ui_hud_soldier_climb" x="0" y="578" width="65" height="75"/>
26+
<texture id="ui_hud_soldier_run" x="0" y="653" width="65" height="75"/>
27+
<texture id="ui_hud_soldier_crouch" x="65" y="354" width="65" height="75"/>
28+
<texture id="ui_hud_teamF_counter" x="981" y="0" width="36" height="70"/>
29+
<texture id="ui_hud_teamF_line" x="0" y="1020" width="404" height="4"/>
30+
<texture id="ui_hud_teamF_leftS" x="495" y="65" width="38" height="43"/>
31+
<texture id="ui_hud_teamF_rightS" x="533" y="65" width="38" height="43"/>
32+
<texture id="ui_hud_teamF_counterC" x="572" y="65" width="33" height="33"/>
33+
<texture id="ui_hud_map_arrow" x="607" y="65" width="11" height="24"/>
34+
35+
<texture id="ui_hud_grenadetarget_d" x="0" y="928" width="91" height="92"/>
36+
<texture id="ui_hud_grenadetarget_e" x="91" y="928" width="91" height="92"/>
37+
<texture id="ui_hud_icon_car" x="190" y="204" width="19" height="18"/>
38+
<texture id="ui_hud_icon_health" x="209" y="204" width="19" height="18"/>
39+
<texture id="ui_hud_icon_armour" x="228" y="204" width="19" height="18"/>
40+
<texture id="ui_hud_frag" x="641" y="91" width="224" height="45"/>
41+
<texture id="ui_hud_status_blue_01" x="0" y="728" width="46" height="47"/>
42+
<texture id="ui_hud_status_blue_02" x="0" y="775" width="46" height="47"/>
43+
<texture id="ui_hud_status_blue_03" x="0" y="822" width="46" height="47"/>
44+
<texture id="ui_hud_status_blue_04" x="0" y="869" width="46" height="47"/>
45+
<texture id="ui_hud_status_blue_05" x="667" y="40" width="46" height="47"/>
46+
<texture id="ui_hud_status_green_01" x="713" y="40" width="46" height="47"/>
47+
<texture id="ui_hud_status_green_02" x="759" y="40" width="46" height="47"/>
48+
<texture id="ui_hud_status_green_03" x="805" y="40" width="46" height="47"/>
49+
<texture id="ui_hud_status_green_04" x="851" y="40" width="46" height="47"/>
50+
<texture id="ui_hud_status_green_05" x="897" y="40" width="46" height="47"/>
51+
<texture id="ui_hud_icon_sleep" x="97" y="226" width="64" height="64"/>
52+
<texture id="ui_hud_icon_radiation" x="97" y="290" width="64" height="64"/>
53+
<texture id="ui_hud_icon_eat" x="161" y="226" width="64" height="64"/>
54+
<texture id="ui_hud_icon_goodmode" x="161" y="290" width="64" height="64"/>
55+
<texture id="ui_hud_icon_psycho" x="225" y="226" width="64" height="64"/>
56+
<texture id="ui_hud_icon_drop" x="225" y="290" width="64" height="64"/>
57+
<texture id="ui_hud_icon_artefact" x="289" y="226" width="64" height="64"/>
58+
<texture id="ui_hud_icon_weapon" x="289" y="290" width="64" height="64"/>
59+
<texture id="ui_hud_frame_voting" x="424" y="375" width="600" height="371"/>
60+
<texture id="ui_hud_button_voting_01_e" x="65" y="429" width="37" height="25"/>
61+
<texture id="ui_hud_button_voting_01_h" x="65" y="454" width="37" height="25"/>
62+
<texture id="ui_hud_button_voting_01_t" x="65" y="479" width="37" height="25"/>
63+
<texture id="ui_hud_button_voting_01_d" x="65" y="504" width="37" height="25"/>
64+
<texture id="ui_hud_button_voting_02_e" x="65" y="529" width="37" height="25"/>
65+
<texture id="ui_hud_button_voting_02_h" x="65" y="554" width="37" height="25"/>
66+
<texture id="ui_hud_button_voting_02_t" x="65" y="579" width="37" height="25"/>
67+
<texture id="ui_hud_button_voting_02_d" x="65" y="604" width="37" height="25"/>
68+
<texture id="ui_hud_button_voting_03_e" x="65" y="629" width="37" height="25"/>
69+
<texture id="ui_hud_button_voting_03_h" x="65" y="654" width="37" height="25"/>
70+
<texture id="ui_hud_button_voting_03_t" x="65" y="679" width="37" height="25"/>
71+
<texture id="ui_hud_button_voting_03_d" x="65" y="704" width="37" height="25"/>
72+
<texture id="ui_hud_frame_voting_dop" x="451" y="306" width="573" height="69"/>
73+
<texture id="ui_hud_frame_voting_dop2" x="451" y="336" width="573" height="39"/>
74+
<!--
75+
<texture id="ui_hud_frame_moneyNumber" x="905" y="746" width="119" height="46"/>
76+
<texture id="ui_hud_frame_buyM" x="450" y="792" width="574" height="232"/>
77+
-->
78+
<texture id="ui_hud_points_count" x="641" y="91" width="224" height="45"/>
79+
<texture id="ui_hud_timer_games" x="869" y="91" width="155" height="66"/>
80+
81+
<texture id="ui_inv_icon_health_restore_speed" x="498" y="110" width="18" height="18"/>
82+
<texture id="ui_inv_icon_radiation_restore_speed" x="498" y="130" width="18" height="18"/>
83+
<texture id="ui_inv_icon_satiety_restore_speed" x="498" y="150" width="18" height="18"/>
84+
<texture id="ui_inv_icon_bleeding_restore_speed" x="498" y="170" width="18" height="18"/>
85+
<texture id="ui_inv_icon_power_restore_speed" x="498" y="190" width="18" height="18"/>
86+
87+
<texture id="ui_inv_icon_shock_immunity" x="518" y="110" width="18" height="18"/>
88+
<texture id="ui_inv_icon_burn_immunity" x="518" y="130" width="18" height="18"/>
89+
<texture id="ui_inv_icon_strike_immunity" x="518" y="150" width="18" height="18"/>
90+
<texture id="ui_inv_icon_wound_immunity" x="518" y="170" width="18" height="18"/>
91+
<texture id="ui_inv_icon_radiation_immunity" x="518" y="190" width="18" height="18"/>
92+
<texture id="ui_inv_icon_telepatic_immunity" x="538" y="110" width="18" height="18"/>
93+
<texture id="ui_inv_icon_chemical_burn_immunity" x="538" y="130" width="18" height="18"/>
94+
<texture id="ui_inv_icon_explosion_immunity" x="538" y="150" width="18" height="18"/>
95+
<texture id="ui_inv_icon_fire_wound_immunity" x="538" y="170" width="18" height="18"/>
96+
<texture id="ui_inv_icon_additional_weight" x="538" y="190" width="18" height="18"/>
97+
98+
<texture id="ui_mg_progress_efficiency_empty" x="161" y="363" width="120" height="17"/>
99+
<texture id="ui_mg_progress_efficiency_full" x="161" y="381" width="120" height="17"/>
100+
101+
<texture id="ui_patch_back" x="421" y="239" width="603" height="51"/>
102+
<texture id="ui_patch_progress" x="621" y="227" width="403" height="10"/>
103+
104+
<texture id="ui_pda2_small_progress" x="592" y="746" width="432" height="38"/>
105+
<texture id="ui_pda2_big_progress" x="807" y="792" width="217" height="57"/>
106+
107+
<texture id="ui_hud_map" x="0" y="0" width="197" height="191"/>
108+
<texture id="ui_hud_map_counter" x="47" y="191" width="35" height="29"/>
109+
<texture id="ui_hud_compas" x="199" y="2" width="31" height="31"/>
110+
111+
<texture id="ui_hud_shkala_armor" x="196" y="65" width="165" height="28"/>
112+
<texture id="ui_hud_shk_health" x="789" y="879" width="114" height="9"/>
113+
<texture id="ui_hud_shk_armour" x="789" y="891" width="114" height="9"/>
114+
115+
<texture id="ui_hud2_rad01_back" x="758" y="903" width="266" height="121"/>
116+
<texture id="ui_hud2_rad01_back2v" x="602" y="805" width="23" height="219"/>
117+
<texture id="ui_hud2_rad01_over" x="660" y="973" width="66" height="51"/>
118+
<texture id="ui_hud2_stamina_bk" x="477" y="973" width="103" height="51"/>
119+
<texture id="ui_hud2_rad01_arrow" x="727" y="914" width="9" height="97"/>
120+
<texture id="ui_hud2_rad01_arrow_shadow" x="727" y="804" width="9" height="97"/>
121+
<texture id="ui_hud2_rad01_progress" x="630" y="877" width="96" height="96"/>
122+
123+
<texture id="ui_hud2_res_back" x="996" y="875" width="28" height="28"/>
124+
<texture id="ui_hud2_res_rad" x="973" y="878" width="22" height="22"/>
125+
<texture id="ui_hud2_res_psi" x="951" y="878" width="22" height="22"/>
126+
<texture id="ui_hud2_res_fire" x="929" y="878" width="22" height="22"/>
127+
<texture id="ui_hud2_res_acid" x="907" y="878" width="22" height="22"/>
128+
129+
<texture id="ui_btn_shotgun_e" x="198" y="97" width="256" height="100"/>
130+
<texture id="ui_btn_sniper_e" x="198" y="97" width="256" height="100"/>
131+
<texture id="ui_btn_heavy_e" x="198" y="97" width="256" height="100"/>
132+
<texture id="ui_btn_assault_e" x="198" y="97" width="256" height="100"/>
133+
134+
<texture id="pre_novice" x="0" y="728" width="46" height="47"/>
135+
<texture id="novice" x="0" y="775" width="46" height="47"/>
136+
<texture id="experienced" x="0" y="822" width="46" height="47"/>
137+
<texture id="veteran" x="0" y="869" width="46" height="47"/>
138+
<texture id="master" x="667" y="40" width="46" height="47"/>
139+
140+
<texture id="mp_stats_icon_c_frags" x="503" y="746" width="25" height="21"/>
141+
<texture id="mp_stats_icon_c_deaths" x="528" y="746" width="25" height="21"/>
142+
<texture id="mp_stats_icon_c_art" x="553" y="746" width="25" height="21"/>
143+
<texture id="mp_stats_icon_c_assist" x="503" y="767" width="25" height="21"/>
144+
<texture id="mp_stats_icon_c_rank" x="528" y="767" width="25" height="21"/>
145+
<texture id="mp_stats_icon_c_ping" x="553" y="767" width="25" height="21"/>
146+
147+
<texture id="mp_stats_icon_w_frags" x="503" y="788" width="25" height="21"/>
148+
<texture id="mp_stats_icon_w_deaths" x="528" y="788" width="25" height="21"/>
149+
<texture id="mp_stats_icon_w_art" x="553" y="788" width="25" height="21"/>
150+
<texture id="mp_stats_icon_w_assist" x="503" y="809" width="25" height="21"/>
151+
<texture id="mp_stats_icon_w_rank" x="528" y="809" width="25" height="21"/>
152+
<texture id="mp_stats_icon_w_ping" x="553" y="809" width="25" height="21"/>
153+
<!--
154+
<texture id="merc_wide" x="454" y="842" width="125" height="54"/>
155+
<texture id="merc_icon" x="490" y="843" width="56" height="54"/>
156+
-->
157+
<texture id="ui_hud_shk_stamina_new" x="789" y="862" width="68" height="14"/>
158+
159+
</file>
160+
</w>

0 commit comments

Comments
 (0)