Skip to content

Launchers: Cartridge Ammo + Trajectory and Reload Options #322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
themrdemonized merged 9 commits into from
Aug 9, 2025
Merged

Launchers: Cartridge Ammo + Trajectory and Reload Options #322

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d0d35b4
Implement shotgun cartridge support for `CWeaponRG6`
ProfLander Aug 7, 2025
7945c10
Implement shotgun cartridge support for `CWeaponMagazinedWGrenade`
ProfLander Aug 8, 2025
c52ca7e
Implement `g_fire_reloads_ubgl` cvar, add missing `FireEnd` to fire h…
ProfLander Aug 8, 2025
d1d0c40
Reinstate auto-reload function behind `g_auto_reload` cvar
ProfLander Aug 8, 2025
8526e94
Deduplicate grenade launching logic into `CWeaponGrenadeLauncher`
ProfLander Aug 8, 2025
c03a422
Implement dynamic launcher range cvars
ProfLander Aug 8, 2025
f43c12b
Dynamic launcher range naming refactor
ProfLander Aug 8, 2025
8f37f9a
Implement auto-reload / launcher menu options
ProfLander Aug 8, 2025
dd19857
Use relative imports for `xr_collide_defs.h` and `MathUtils.h`
ProfLander Aug 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Implement auto-reload / launcher menu options
  • Loading branch information
@ProfLander
ProfLander committed Aug 8, 2025
commit 8f37f9a4852d4d31408fb54bfd4f0c726b2cf47d
55 changes: 41 additions & 14 deletions gamedata/configs/text/eng/ui_mm_modded_exes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,6 +600,23 @@
<text>Gameplay</text>
</string>

<!-- Gameplay General -->
<string id="ui_mm_menu_gameplay_general">
<text>General</text>
</string>
<string id="ui_mm_gameplay_general_modded_exes">
<text>General</text>
</string>
<string id="ui_mm_modded_exes_gameplay_gameplay_general_g_progressive_stamina_cost">
<text>Progressive stamina cost (g_progressive_stamina_cost)</text>
</string>
<string id="ui_mm_modded_exes_gameplay_gameplay_general_g_progressive_stamina_cost_desc">
<text>Stamina will drain linearly with current weight instead of cutoff point</text>
</string>
<string id="ui_mm_modded_exes_gameplay_gameplay_general_g_auto_reload">
<text>Automatically reload weapon when ammo is depleted (g_auto_reload)</text>
</string>

<!-- Aim -->
<string id="ui_mm_menu_aim">
<text>Aim</text>
Expand Down Expand Up @@ -670,6 +687,30 @@
<text>Item</text>
</string>

<!-- Launchers -->
<string id="ui_mm_menu_launchers">
<text>Launchers</text>
</string>
<string id="ui_mm_launchers_modded_exes">
<text>Launchers</text>
</string>

<string id="ui_mm_modded_exes_gameplay_launchers_g_fire_reloads_ubgl">
<text>Reload under-barrel launchers with fire input (g_fire_reloads_ubgl)</text>
</string>
<string id="ui_mm_modded_exes_gameplay_launchers_g_launcher_dynamic_range">
<text>Apply launcher assist while unaimed (g_launcher_dynamic_range)</text>
</string>
<string id="ui_mm_modded_exes_gameplay_launchers_g_launcher_dynamic_range_zoom">
<text>Apply launcher assist while aimed (g_launcher_dynamic_range_zoom)</text>
</string>
<string id="ui_mm_modded_exes_gameplay_launchers_g_launcher_dynamic_range_mode">
<text>Target dynamic objects with launcher assist (g_launcher_dynamic_range_mode)</text>
</string>
<string id="ui_mm_modded_exes_gameplay_launchers_g_launcher_dynamic_range_max">
<text>Maximum launcher assist range (g_launcher_dynamic_range_max)</text>
</string>

<!-- First Person Death -->
<string id="ui_mm_menu_first_person_death">
<text>First Person Death</text>
Expand All @@ -688,20 +729,6 @@
<text>FPD Camera Direction Change Smoothing (first_person_death_direction_smoothing)</text>
</string>

<!-- Gameplay General -->
<string id="ui_mm_menu_gameplay_general">
<text>General</text>
</string>
<string id="ui_mm_gameplay_general_modded_exes">
<text>General</text>
</string>
<string id="ui_mm_modded_exes_gameplay_gameplay_general_g_progressive_stamina_cost">
<text>Progressive stamina cost (g_progressive_stamina_cost)</text>
</string>
<string id="ui_mm_modded_exes_gameplay_gameplay_general_g_progressive_stamina_cost_desc">
<text>Stamina will drain linearly with current weight instead of cutoff point</text>
</string>

<!-- Stalkers -->
<string id="ui_mm_menu_stalkers">
<text>Stalkers</text>
Expand Down
55 changes: 41 additions & 14 deletions gamedata/configs/text/rus/ui_mm_modded_exes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,6 +578,23 @@
<text>Ãåéìïëåé</text>
</string>

<!-- Gameplay General -->
<string id="ui_mm_menu_gameplay_general">
<text>Îáùèå</text>
</string>
<string id="ui_mm_gameplay_general_modded_exes">
<text>Îáùèå</text>
</string>
<string id="ui_mm_modded_exes_gameplay_gameplay_general_g_progressive_stamina_cost">
<text>Ïðîãðåññèâíàÿ çàòðàòà âûíîñëèâîñòè (g_progressive_stamina_cost)</text>
</string>
<string id="ui_mm_modded_exes_gameplay_gameplay_general_g_progressive_stamina_cost_desc">
<text>Âûíîñëèâîñòü áóäåò óìåíüøàòüñÿ ëèíåéíî â çàâèñèìîñòè îò òåêóùåãî âåñà, à íå ïî ïîðîãîâîìó çíà÷åíèþ</text>
</string>
<string id="ui_mm_modded_exes_gameplay_gameplay_general_g_auto_reload">
<text>Àâòîìàòè÷åñêè ïåðåçàðÿæàòü îðóæèå ïðè èñ÷åðïàíèè áîåïðèïàñîâ (g_auto_reload)</text>
</string>

<!-- Aim -->
<string id="ui_mm_menu_aim">
<text>Aim</text>
Expand Down Expand Up @@ -648,6 +665,30 @@
<text>Ïðåäìåò</text>
</string>

<!-- Launchers -->
<string id="ui_mm_menu_launchers">
<text>Ãðàíàòîìåòû</text>
</string>
<string id="ui_mm_launchers_modded_exes">
<text>Ãðàíàòîìåòû</text>
</string>

<string id="ui_mm_modded_exes_gameplay_launchers_g_fire_reloads_ubgl">
<text>Ïåðåçàðÿæàòü ïîäñòâîëüíûå ãðàíàòîìåòû ñ ïîìîùüþ îãíÿ (g_fire_reloads_ubgl)</text>
</string>
<string id="ui_mm_modded_exes_gameplay_launchers_g_launcher_dynamic_range">
<text>Ïðèìåíÿòü ïîìîùü ïðè çàïóñêå, êîãäà íå íàöåëèâàåøüñÿ (g_launcher_dynamic_range)</text>
</string>
<string id="ui_mm_modded_exes_gameplay_launchers_g_launcher_dynamic_range_zoom">
<text>Ïðèìåíÿéòå ïîìîùü ïðèöåëèâàíèÿ ïðè íàâåäåíèè (g_launcher_dynamic_range_zoom)</text>
</string>
<string id="ui_mm_modded_exes_gameplay_launchers_g_launcher_dynamic_range_mode">
<text>Íàöåëèâàéòåñü íà äèíàìè÷åñêèå îáúåêòû ñ ïîìîùüþ ñèñòåìû ïîìîùè ïðè çàïóñêå (g_launcher_dynamic_range_mode)</text>
</string>
<string id="ui_mm_modded_exes_gameplay_launchers_g_launcher_dynamic_range_max">
<text>Ìàêñèìàëüíàÿ äàëüíîñòü äåéñòâèÿ ïóñêîâîé óñòàíîâêè (g_launcher_dynamic_range_max)</text>
</string>

<!-- First Person Death -->
<string id="ui_mm_menu_first_person_death">
<text>Ñìåðòü îò ïåðâîãî ëèöà</text>
Expand All @@ -666,20 +707,6 @@
<text>Ãëàäêîñòü ñìåíû íàïðàâëåíèÿ êàìåðû (first_person_death_direction_smoothing)</text>
</string>

<!-- Gameplay General -->
<string id="ui_mm_menu_gameplay_general">
<text>Îáùèå</text>
</string>
<string id="ui_mm_gameplay_general_modded_exes">
<text>Îáùèå</text>
</string>
<string id="ui_mm_modded_exes_gameplay_gameplay_general_g_progressive_stamina_cost">
<text>Ïðîãðåññèâíàÿ çàòðàòà âûíîñëèâîñòè (g_progressive_stamina_cost)</text>
</string>
<string id="ui_mm_modded_exes_gameplay_gameplay_general_g_progressive_stamina_cost_desc">
<text>Âûíîñëèâîñòü áóäåò óìåíüøàòüñÿ ëèíåéíî â çàâèñèìîñòè îò òåêóùåãî âåñà, à íå ïî ïîðîãîâîìó çíà÷åíèþ</text>
</string>

<!-- Stalkers -->
<string id="ui_mm_menu_stalkers">
<text>Ñòàëêåðû</text>
Expand Down
2 changes: 2 additions & 0 deletions gamedata/scripts/options_modded_exes_gameplay.script
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
local page_gameplay_general = options_modded_exes_gameplay_general.PAGE
local page_aim = options_modded_exes_aim.PAGE
local page_3d_ballistics = options_modded_exes_3d_ballistics.PAGE
local page_launchers = options_modded_exes_launchers.PAGE
local page_first_person_death = options_modded_exes_first_person_death.PAGE
local page_stalkers = options_modded_exes_stalkers.PAGE
local page_monsters = options_modded_exes_monsters.PAGE
Expand All @@ -16,6 +17,7 @@ GROUP = group {
page_gameplay_general,
page_aim,
page_3d_ballistics,
page_launchers,
page_first_person_death,
page_stalkers,
page_monsters,
Expand Down
1 change: 1 addition & 0 deletions gamedata/scripts/options_modded_exes_gameplay_general.script
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ options_builder.import_into(this)
PAGE = page {
{ id = "gameplay_general" },
list_bool { id = "g_progressive_stamina_cost" },
list_bool { id = "g_auto_reload" },
}
17 changes: 17 additions & 0 deletions gamedata/scripts/options_modded_exes_launchers.script
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
--- Launchers options tree

-- Import smart constructors
options_builder.import_into(this)

PAGE = page {
{ id = "launchers" },
list_bool { id = "g_fire_reloads_ubgl" },
list_bool { id = "g_launcher_dynamic_range" },
list_bool { id = "g_launcher_dynamic_range_zoom" },
list_bool { id = "g_launcher_dynamic_range_mode" },
track {
id = "g_launcher_dynamic_range_max",
def = 300,
step = 1,
},
}