Merge pull request #112 from etapomom/all-in-one-vs2022-wpo

A handful of miscellaneous changes

(cherry picked from commit ecb0294)

Author: themrdemonized

README.md

@@ -184,6 +184,19 @@ How to compile exes:
 6. For successful compilation, **the latest build tools with MFC and ATL libraries is required**
 
 ## Changelog
+**2024.12.10**
+* momopate (https://github.com/themrdemonized/xray-monolith/pull/112):
+  * Added console commands:
+    * `fix_avelocity_spread` -> Bool; Fixes moving the camera not affecting accuracy.
+    * `apply_pdm_to_ads` -> Bool; Makes it so that PDM values from the weapon are properly applied when aiming down sights.
+    * `smooth_ads_transition` -> Bool; Makes it so that going in and out of ADS smoothly changes the accuracy bonus instead of changing only at full ADS.
+    * `allow_silencer_hide_tracer` -> Bool; Optionally disables silencers being able to hide tracers completely. (Defaults to true)
+  * Added `silenced_tracers` (bool) field to weapons sections. If the ammo type can be hidden when using a silenced weapon, setting this field to true makes the tracer visible again.
+  * Added `GetZoomRotateTime()` and `SetZoomRotateTime(float val)`.
+  * Added `senderweapon` to the table used for `level.add_bullet()` to improve compatibility with modding. Defaults to sender.
+  * Added `bkeep_speed` to `SetActorPosition()`.
+  * Added `SetMovementSpeed()`. Exported as `set_movement_speed(vector vel)` for scripting.
+
 **2024.12.09**
 * SSS 22 Update
 

gamedata/configs/text/eng/ui_mm_modded_exes.xml

@@ -77,6 +77,13 @@
 		<text>Particle update rate (1 - 30hz, 0.5 - 60hz, etc) (particle_update_mod)</text>
 	</string>
 
+	<string id="ui_mm_modded_exes_render_short_tracers">
+		<text>Cap and render tracers to their minimum length (render_short_tracers)</text>
+	</string>
+	<string id="ui_mm_modded_exes_allow_silencer_hide_tracer">
+		<text>Allow silencers to hide tracers (allow_silencer_hide_tracer)</text>
+	</string>
+
 	<string id="ui_mm_modded_exes_pda_map_zoom_in_to_mouse">
 		<text>PDA Map Zoom In Relative To Mouse (pda_map_zoom_in_to_mouse)</text>
 	</string>
@@ -146,6 +153,23 @@
 	<string id="ui_mm_modded_exes_keyboard_buffer_size">
 		<text>Keyboard Input Buffer Size (keyboard_buffer_size)</text>
 	</string>
+
+	<string id="ui_mm_modded_exes_allow_outfit_control_inertion_factor">
+		<text>Enable outfits affecting mouse sensitivity (allow_outfit_control_inertion_factor)</text>
+	</string>
+	<string id="ui_mm_modded_exes_allow_weapon_control_inertion_factor">
+		<text>Enable weapons affecting mouse sensitivity (allow_weapon_control_inertion_factor)</text>
+	</string>
+	<string id="ui_mm_modded_exes_fix_avelocity_spread">
+		<text>Fix moving the camera not affecting accuracy (fix_avelocity_spread)</text>
+	</string>
+	<string id="ui_mm_modded_exes_apply_pdm_to_ads">
+		<text>Apply PDM (handling) values when ADS (apply_pdm_to_ads)</text>
+	</string>
+	<string id="ui_mm_modded_exes_smooth_ads_transition">
+		<text>Smoothly apply the ADS accuracy bonus (smooth_ads_transition)</text>
+	</string>
+
 	<!-- HDR10 -->
 	<string id="ui_mm_modded_exes_hdr10_enabled">
 		<text>Enable HDR10 (Requires Restart) (r4_hdr10_on)</text>

gamedata/configs/text/rus/ui_mm_modded_exes.xml

@@ -77,6 +77,13 @@
 		<text>×àñòîòà ïàðòèêëåé (1 - 30ãö, 0.5 - 60ãö è ò.ä.) (particle_update_mod)</text>
 	</string>
 
+	<string id="ui_mm_modded_exes_render_short_tracers">
+		<text>Îãðàíè÷üòå è îòðèñóéòå òðàññåðû äî èõ ìèíèìàëüíîé äëèíû (render_short_tracers)</text>
+	</string>
+	<string id="ui_mm_modded_exes_allow_silencer_hide_tracer">
+		<text>Ïîçâîëÿþò ãëóøèòåëÿì ñêðûâàòü òðàññèðóþùèå ýëåìåíòû (allow_silencer_hide_tracer)</text>
+	</string>
+
 	<string id="ui_mm_modded_exes_pda_map_zoom_in_to_mouse">
 		<text>Çóì íà êàðòó îòíîñèòåëüíî êóðñîðà (pda_map_zoom_in_to_mouse)</text>
 	</string>
@@ -146,6 +153,23 @@
 	<string id="ui_mm_modded_exes_keyboard_buffer_size">
 		<text>Áóôåð ââîäà äëÿ êëàâèàòóðû (keyboard_buffer_size)</text>
 	</string>
+
+	<string id="ui_mm_modded_exes_allow_outfit_control_inertion_factor">
+		<text>Âêëþ÷èòü íàðÿäû, âëèÿþùèå íà ÷óâñòâèòåëüíîñòü ìûøè (allow_outfit_control_inertion_factor)</text>
+	</string>
+	<string id="ui_mm_modded_exes_allow_weapon_control_inertion_factor">
+		<text>Âêëþ÷èòü îðóæèå, âëèÿþùåå íà ÷óâñòâèòåëüíîñòü ìûøè (allow_weapon_control_inertion_factor)</text>
+	</string>
+	<string id="ui_mm_modded_exes_fix_avelocity_spread">
+		<text>Èñïðàâüòå ïåðåìåùåíèå êàìåðû, íå âëèÿþùåå íà òî÷íîñòü (fix_avelocity_spread)</text>
+	</string>
+	<string id="ui_mm_modded_exes_apply_pdm_to_ads">
+		<text>Ïðèìåíÿéòå çíà÷åíèÿ PDM (îáðàáîòêè) ïðè ðàçìåùåíèè ðåêëàìû (apply_pdm_to_ads)</text>
+	</string>
+	<string id="ui_mm_modded_exes_smooth_ads_transition">
+		<text>Ïëàâíî ïðèìåíÿéòå áîíóñ çà òî÷íîñòü ðåêëàìû (smooth_ads_transition)</text>
+	</string>
+
 	<!-- HDR10 -->
 	<string id="ui_mm_modded_exes_hdr10_enabled">
 		<text>Âêëþ÷èòü HDR10 (òðåáóåòñÿ ïåðåçàãðóçêà) (r4_hdr10_on)</text>

gamedata/scripts/ltx_help_ex.script

@@ -16,19 +16,20 @@
         base_hud_offset_pos_16x9 - Editable variables that allow weapon position adjustements that don't require aim tweaks
         base_hud_offset_rot - Editable variables that allow weapon position adjustements that don't require aim tweaks
         base_hud_offset_rot_16x9 - Editable variables that allow weapon position adjustements that don't require aim tweaks
+        silenced_tracers - Option to disable silencers hiding the tracer on a per weapon basis
 
     Grenades
-        frags_ap - Explosive shrapnel (frags) customization
-        frags_air_resistance - Explosive shrapnel (frags) customization
-        frags_tracer - Explosive shrapnel (frags) customization
-        frags_4to1_tracer - Explosive shrapnel (frags) customization
-        frags_magnetic_beam_shot - Explosive shrapnel (frags) customization
-        frags_tracer_color_ID - Explosive shrapnel (frags) customization
+        frags_ap - AP power for shrapnel
+        frags_air_resistance - Air resistance for shrapnel
+        frags_tracer - Tracer flag for shrapnel
+        frags_4to1_tracer - 4 to 1 tracer flag for shrapnel
+        frags_magnetic_beam_shot - Magnetic beam flag for shrapnel
+        frags_tracer_color_ID - Tracer color ID for shrapnel
         ammo_grenade_vel - Specify velocity of underbarrel grenade launcher ammo
         explode_effector_sect_name - customizable explode_effector per grenade section
 
     Ammo
-        tracer_silenced - Silencers can hide bullet tracers
+        tracer_silenced - Silencers can hide bullet tracers on a per ammo type basis
         tracer_length_k - Tracer length modifier
 
     Detectors

gamedata/scripts/lua_help_ex.script

@@ -45,7 +45,11 @@
 
         allow_outfit_control_inertion_factor 
         allow_weapon_control_inertion_factor // Weapon and outfit control_inertion_factor can affect mouse sens
-        render_short_tracers // Tracers will be capped to their minimum length instead of not rendering 
+        render_short_tracers // Tracers will be capped to their minimum length instead of not rendering
+        fix_avelocity_spread // Fixes moving the camera around not worsening accuracy
+        apply_pdm_to_ads // Enables PDM (handling) values to be applied properly during ADS
+        smooth_ads_transition // Smoothly applies the ADS accuracy bonus instead of only being applied when fully ADS
+        allow_silencer_hide_tracer // Controls wether or not silencers can hide tracers at all
 
 		viewport_near [0.0, 1.0] // Adjust the camera near value
 
@@ -201,6 +205,7 @@
         //        power = 1,
         //        impulse = 1,
         //        sender = AC_ID,
+        //        senderweapon = db.actor:active_item():id(),   // Defaults to what's set for sender if not specified
         //        hit_type = 1,
         //        max_dist = 100,
         //        ammo_sect = "ammo_5.56x45_fmj",
@@ -313,6 +318,8 @@
         function update_weight()
         function get_total_weight_force_update()
         function get_talking_npc()
+        function set_actor_position(vector pos, bool bskip_collision_correct, bool bkeep_speed)
+        function set_movement_speed(vector)
 
         // Stalker NPCs
         function get_enable_anomalies_pathfinding()
@@ -460,6 +467,10 @@
         }
         table get_scope_ui() 
         function set_scope_ui(string)
+        
+        // Get and set the zoom_rotate_time (time in seconds to fully ADS) field for a given weapon
+        function GetZoomRotateTime()
+        function SetZoomRotateTime(float)
     }
 
     enum rq_target { (sum them up to target multiple types)

gamedata/scripts/ui_options_modded_exes.script

@@ -200,6 +200,22 @@ function init_opt_base()
 				step = 0.01,
 				cmd = "particle_update_mod",
 			},
+			{
+				id = "render_short_tracers",
+				type = "list",
+				val = 0,
+				curr = {function() return get_console_cmd(0, "render_short_tracers") end},
+				content = {function() return {{"1", "ON"}, {"0", "OFF"}} end},
+				cmd = "render_short_tracers",
+			},
+			{
+				id = "allow_silencer_hide_tracer",
+				type = "list",
+				val = 0,
+				curr = {function() return get_console_cmd(0, "allow_silencer_hide_tracer") end},
+				content = {function() return {{"1", "ON"}, {"0", "OFF"}} end},
+				cmd = "allow_silencer_hide_tracer",
+			},
 
 			{ id = "divider", type = "line" },
 
@@ -370,6 +386,46 @@ function init_opt_base()
 				content = {function() return {{"1", "ON"}, {"0", "OFF"}} end},
 				cmd = "telekinetic_objects_include_corpses",
 			},
+			{
+				id = "allow_outfit_control_inertion_factor",
+				type = "list",
+				val = 0,
+				curr = {function() return get_console_cmd(0, "allow_outfit_control_inertion_factor") end},
+				content = {function() return {{"1", "ON"}, {"0", "OFF"}} end},
+				cmd = "allow_outfit_control_inertion_factor",
+			},
+			{
+				id = "allow_weapon_control_inertion_factor",
+				type = "list",
+				val = 0,
+				curr = {function() return get_console_cmd(0, "allow_weapon_control_inertion_factor") end},
+				content = {function() return {{"1", "ON"}, {"0", "OFF"}} end},
+				cmd = "allow_weapon_control_inertion_factor",
+			},
+			{
+				id = "fix_avelocity_spread",
+				type = "list",
+				val = 0,
+				curr = {function() return get_console_cmd(0, "fix_avelocity_spread") end},
+				content = {function() return {{"1", "ON"}, {"0", "OFF"}} end},
+				cmd = "fix_avelocity_spread",
+			},
+			{
+				id = "apply_pdm_to_ads",
+				type = "list",
+				val = 0,
+				curr = {function() return get_console_cmd(0, "apply_pdm_to_ads") end},
+				content = {function() return {{"1", "ON"}, {"0", "OFF"}} end},
+				cmd = "apply_pdm_to_ads",
+			},
+			{
+				id = "smooth_ads_transition",
+				type = "list",
+				val = 0,
+				curr = {function() return get_console_cmd(0, "smooth_ads_transition") end},
+				content = {function() return {{"1", "ON"}, {"0", "OFF"}} end},
+				cmd = "smooth_ads_transition",
+			},
 
 			{ id = "divider", type = "line" },
 

src/xrGame/Actor_Weapon.cpp

@@ -26,15 +26,32 @@ static const float VEL_A_MAX = 10.f;
 
 #define GetWeaponParam(pWeapon, func_name, def_value)	((pWeapon) ? (pWeapon->func_name) : def_value)
 
+BOOL g_fix_avelocity_spread = 0;
+BOOL g_apply_pdm_to_ads = 0;
+BOOL g_smooth_ads_transition = 0;
 //âîçâðàùàåò òåêóøèé ðàçáðîñ ñòðåëüáû (â ðàäèàíàõ)ñ ó÷åòîì äâèæåíèÿ
 float CActor::GetWeaponAccuracy() const
 {
 	CWeapon* W = smart_cast<CWeapon*>(inventory().ActiveItem());
-
-	if (IsZoomAimingMode() && W && !GetWeaponParam(W, IsRotatingToZoom(), false))
+	
+	// momopate: optionally make pdm values affect ads, have a smoother transition in and out of the aiming bonus
+	float disp_aim;
+	bool is_zooming = (W && ((g_smooth_ads_transition && GetWeaponParam(W, GetInertionAimFactor(), 1.0f) < 1.0f) || (!g_smooth_ads_transition && IsZoomAimingMode() && !GetWeaponParam(W, IsRotatingToZoom(), false))));
+	if (is_zooming)
 	{
-		return m_fDispAim;
+		if (!g_apply_pdm_to_ads)
+			return m_fDispAim;
+		else
+		{
+			if (!g_smooth_ads_transition)
+				disp_aim = m_fDispAim;
+			else
+				disp_aim = _lerp(m_fDispAim, 1.0f, GetWeaponParam(W, GetInertionAimFactor(), 1.0f));
+		}
 	}
+	else
+		disp_aim = 1.0;
+
 	float dispersion = m_fDispBase * GetWeaponParam(W, Get_PDM_Base(), 1.0f) *
 		GetWeaponParam(W, Get_Silencer_PDM_Base(), 1.0f) * GetWeaponParam(W, Get_Scope_PDM_Base(), 1.0f) *
 		GetWeaponParam(W, Get_Launcher_PDM_Base(), 1.0f);
@@ -43,8 +60,11 @@ float CActor::GetWeaponAccuracy() const
 	CEntity::SEntityState state;
 	if (g_State(state))
 	{
+		// momopate: fix moving the camera not affecting spread
+		float AVelocity = (g_fix_avelocity_spread) ? fCurAVelocity : state.fAVelocity;
+
 		//fAVelocity = angle velocity
-		dispersion *= (1.0f + (state.fAVelocity / VEL_A_MAX) * m_fDispVelFactor * GetWeaponParam(
+		dispersion *= (1.0f + (AVelocity / VEL_A_MAX) * m_fDispVelFactor * GetWeaponParam(
 				W, Get_PDM_Vel_F(), 1.0f) *
 			GetWeaponParam(W, Get_Silencer_PDM_Vel(), 1.0f) * GetWeaponParam(W, Get_Scope_PDM_Vel(), 1.0f) *
 			GetWeaponParam(W, Get_Launcher_PDM_Vel(), 1.0f));
@@ -77,7 +97,7 @@ float CActor::GetWeaponAccuracy() const
 	if (W && W->m_lastCartridge.param_s.buckShot > 1)
 		dispersion *= GetWeaponParam(W, Get_PDM_BuckShot(), 1.0f);
 
-	return dispersion;
+	return (dispersion * disp_aim);
 }
 
 

src/xrGame/Level_Bullet_Manager.cpp

@@ -43,6 +43,7 @@ SBullet::~SBullet()
 {
 }
 
+BOOL g_allow_silencer_hide_tracer = 1;
 u32 SBullet::bulletCount = 0;
 
 void SBullet::Init(const Fvector& position,
@@ -102,14 +103,14 @@ void SBullet::Init(const Fvector& position,
 	//-Alundaio
 
 	// demonized: hide tracer when weapon has silencer
-	if (!cartridge.param_s.tracer_silenced)		// momopate: Make it optional
+	if (!cartridge.param_s.tracer_silenced && g_allow_silencer_hide_tracer)		// momopate: Make it optional
 	{
 		CObject* g_obj = Level().Objects.net_Find(weapon_id);
 		if (g_obj) 
 		{
 			CWeapon* weapon = smart_cast<CWeapon*>(g_obj);
 			if (weapon && weapon->IsSilencerAttached())
-				flags.allow_tracer = false;
+				flags.allow_tracer = (weapon->GetSilencedTracers());	// momopate: customize per weapon
 		}
 	}
 

src/xrGame/Weapon.cpp

@@ -753,6 +753,9 @@ void CWeapon::Load(LPCSTR section)
 	m_bHasTracers = !!READ_IF_EXISTS(pSettings, r_bool, section, "tracers", true);
 	m_u8TracerColorID = READ_IF_EXISTS(pSettings, r_u8, section, "tracers_color_ID", u8(-1));
 
+	// momopate
+	m_bSilencedTracers = READ_IF_EXISTS(pSettings, r_bool, section, "silenced_tracers", false);
+
 	string256 temp;
 	for (int i = egdNovice; i < egdCount; ++i)
 	{

src/xrGame/Weapon.h

@@ -971,6 +971,11 @@ class CWeapon : public CHudItemObject,
 	{
 		m_first_bullet_controller.set_fire_dispertion(val);
 	};
+
+	// momopate
+	float GetZoomRotateTime() { return m_zoom_params.m_fZoomRotateTime; }
+	virtual void SetZoomRotateTime(float val) { m_zoom_params.m_fZoomRotateTime = val; }
+
 protected:
 	int iAmmoElapsed; // ammo in magazine, currently
 	int iMagazineSize; // size (in bullets) of magazine
@@ -995,6 +1000,7 @@ class CWeapon : public CHudItemObject,
 	CWeaponAmmo* m_pCurrentAmmo;
 	u8 m_ammoType;
 	bool m_bHasTracers;
+	bool m_bSilencedTracers;
 	u8 m_u8TracerColorID;
 	u8 m_set_next_ammoType_on_reload;
 	// Multitype ammo support
@@ -1003,6 +1009,8 @@ class CWeapon : public CHudItemObject,
 	CCartridge m_lastCartridge;
 	float m_fCurrentCartirdgeDisp;
 
+	virtual bool GetSilencedTracers() { return m_bSilencedTracers; }
+
 	bool unlimited_ammo();
 	IC bool can_be_strapped() const
 	{