Skip to content
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

For new modlist - Fix PVT, NDS #625

Merged
merged 4 commits into from
Jan 17, 2025
Merged

For new modlist - Fix PVT, NDS #625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
48cb828
PTV - Fix UBC from recent update
PabstMirror Jan 15, 2025
73fa714
Update bw.html and fiix XEH for NDS
PabstMirror Jan 16, 2025
32d7dd5
also update `vn_m1carbine_shorty` ubc
PabstMirror Jan 16, 2025
9f43933
Update lints.toml
PabstMirror Jan 16, 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
2 changes: 2 additions & 0 deletions .hemtt/lints.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
[config.file_type]
options.allow_no_extension = true

[sqf]
enabled = true
Expand Down
131 changes: 88 additions & 43 deletions .hemtt/presets/bw.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<html>
<!--Created by Arma 3 Launcher: https://arma3.com-->
<head>
<meta name="arma:Type" content="preset" />
<meta name="arma:PresetName" content="2024_11_29_BourbonMods" />
<meta name="arma:PresetName" content="2025_01_15_BourbonMods" />
<meta name="generator" content="Arma 3 Launcher - https://arma3.com" />
<title>Arma 3</title>
<link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet" type="text/css" />
Expand Down Expand Up @@ -80,7 +80,7 @@
</style>
</head>
<body>
<h1>Arma 3 - Preset <strong>2024_11_29_BourbonMods</strong></h1>
<h1>Arma 3 - Preset <strong>2025_01_15_BourbonMods</strong></h1>
<p class="before-list">
<em>To import this preset, drag this file onto the Launcher window. Or click the MODS tab, then PRESET in the top right, then IMPORT at the bottom, and finally select this file.</em>
</p>
Expand Down Expand Up @@ -194,6 +194,15 @@ <h1>Arma 3 - Preset <strong>2024_11_29_BourbonMods</strong></h1>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=1713801249" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=1713801249</a>
</td>
</tr>
<tr data-type="ModContainer">
<td data-type="DisplayName">W28</td>
<td>
<span class="from-steam">Steam</span>
</td>
<td>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=3205870510" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=3205870510</a>
</td>
</tr>
<tr data-type="ModContainer">
<td data-type="DisplayName">Lingor/Dingor Island</td>
<td>
Expand Down Expand Up @@ -663,183 +672,219 @@ <h1>Arma 3 - Preset <strong>2024_11_29_BourbonMods</strong></h1>
</td>
</tr>
<tr data-type="ModContainer">
<td data-type="DisplayName">Summa</td>
<td data-type="DisplayName">MTK - Faster Pistol Swap</td>
<td>
<span class="from-steam">Steam</span>
</td>
<td>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=1598087521" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=1598087521</a>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=3289651152" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=3289651152</a>
</td>
</tr>
<tr data-type="ModContainer">
<td data-type="DisplayName">Thirsk Island Reloaded - Signed for MP</td>
<td data-type="DisplayName">Global Mobilization Extra - Altis Armed Forces</td>
<td>
<span class="from-steam">Steam</span>
</td>
<td>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=3237942199" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=3237942199</a>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=1816026173" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=1816026173</a>
</td>
</tr>
<tr data-type="ModContainer">
<td data-type="DisplayName">W28</td>
<td data-type="DisplayName">Global Mobilization Extra - Chernarussian Defence Forces 2022</td>
<td>
<span class="from-steam">Steam</span>
</td>
<td>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=3205870510" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=3205870510</a>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=2801189887" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=2801189887</a>
</td>
</tr>
<tr data-type="ModContainer">
<td data-type="DisplayName">PSZ: Polish Armed Forces</td>
<td data-type="DisplayName">Global Mobilization Extra - Chernarussian Movement of the Red Star</td>
<td>
<span class="from-steam">Steam</span>
</td>
<td>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=2098564124" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=2098564124</a>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=2443033998" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=2443033998</a>
</td>
</tr>
<tr data-type="ModContainer">
<td data-type="DisplayName">MTK - Faster Pistol Swap</td>
<td data-type="DisplayName">Hellenic Armed Forces Mod (HAFM) - Helicopters (discontinued)</td>
<td>
<span class="from-steam">Steam</span>
</td>
<td>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=3289651152" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=3289651152</a>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=909320014" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=909320014</a>
</td>
</tr>
<tr data-type="ModContainer">
<td data-type="DisplayName">Global Mobilization Extra - Altis Armed Forces</td>
<td data-type="DisplayName">Embraer EMB 312 Tucano</td>
<td>
<span class="from-steam">Steam</span>
</td>
<td>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=1816026173" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=1816026173</a>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=3342284397" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=3342284397</a>
</td>
</tr>
<tr data-type="ModContainer">
<td data-type="DisplayName">Global Mobilization Extra - Chernarussian Defence Forces 2022</td>
<td data-type="DisplayName">dzn MG Tripod (CUP)</td>
<td>
<span class="from-steam">Steam</span>
</td>
<td>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=2801189887" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=2801189887</a>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=1947834796" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=1947834796</a>
</td>
</tr>
<tr data-type="ModContainer">
<td data-type="DisplayName">Global Mobilization Extra - Chernarussian Movement of the Red Star</td>
<td data-type="DisplayName">Deploy Parachute with ACE</td>
<td>
<span class="from-steam">Steam</span>
</td>
<td>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=2443033998" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=2443033998</a>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=3333853985" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=3333853985</a>
</td>
</tr>
<tr data-type="ModContainer">
<td data-type="DisplayName">Hellenic Armed Forces Mod (HAFM) - Helicopters (discontinued)</td>
<td data-type="DisplayName">Really Useless Objects Pack</td>
<td>
<span class="from-steam">Steam</span>
</td>
<td>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=909320014" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=909320014</a>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=2954960408" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=2954960408</a>
</td>
</tr>
<tr data-type="ModContainer">
<td data-type="DisplayName">Embraer EMB 312 Tucano</td>
<td data-type="DisplayName">Mehland</td>
<td>
<span class="from-steam">Steam</span>
</td>
<td>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=3342284397" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=3342284397</a>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=3317364155" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=3317364155</a>
</td>
</tr>
<tr data-type="ModContainer">
<td data-type="DisplayName">dzn MG Tripod (CUP)</td>
<td data-type="DisplayName">Cham</td>
<td>
<span class="from-steam">Steam</span>
</td>
<td>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=1947834796" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=1947834796</a>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=1789554117" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=1789554117</a>
</td>
</tr>
<tr data-type="ModContainer">
<td data-type="DisplayName">Deploy Parachute with ACE</td>
<td data-type="DisplayName">FDF Podagorsk</td>
<td>
<span class="from-steam">Steam</span>
</td>
<td>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=3333853985" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=3333853985</a>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=3293017688" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=3293017688</a>
</td>
</tr>
<tr data-type="ModContainer">
<td data-type="DisplayName">Really Useless Objects Pack</td>
<td data-type="DisplayName">Pulau</td>
<td>
<span class="from-steam">Steam</span>
</td>
<td>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=2954960408" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=2954960408</a>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=1423583812" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=1423583812</a>
</td>
</tr>
<tr data-type="ModContainer">
<td data-type="DisplayName">Mehland</td>
<td data-type="DisplayName">County Fermanagh, Northern Ireland - Signed</td>
<td>
<span class="from-steam">Steam</span>
</td>
<td>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=3317364155" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=3317364155</a>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=3374033200" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=3374033200</a>
</td>
</tr>
<tr data-type="ModContainer">
<td data-type="DisplayName">Cham</td>
<td data-type="DisplayName">Global Mobilization Extra - Takistan Armed Forces</td>
<td>
<span class="from-steam">Steam</span>
</td>
<td>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=1789554117" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=1789554117</a>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=1737435871" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=1737435871</a>
</td>
</tr>
<tr data-type="ModContainer">
<td data-type="DisplayName">FDF Podagorsk</td>
<td data-type="DisplayName">Kujari</td>
<td>
<span class="from-steam">Steam</span>
</td>
<td>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=3293017688" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=3293017688</a>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=1726494027" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=1726494027</a>
</td>
</tr>
<tr data-type="ModContainer">
<td data-type="DisplayName">Pulau</td>
<td data-type="DisplayName">Fallujah 2.0</td>
<td>
<span class="from-steam">Steam</span>
</td>
<td>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=1423583812" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=1423583812</a>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=2926828901" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=2926828901</a>
</td>
</tr>
<tr data-type="ModContainer">
<td data-type="DisplayName">Santa Claus</td>
<td data-type="DisplayName">M224 60mm Mortar (ACE)</td>
<td>
<span class="from-steam">Steam</span>
</td>
<td>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=567871211" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=567871211</a>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=2472780935" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=2472780935</a>
</td>
</tr>
<tr data-type="ModContainer">
<td data-type="DisplayName">Zimma Santaland Special</td>
<td data-type="DisplayName">RPG-29 'Vampir'</td>
<td>
<span class="from-steam">Steam</span>
</td>
<td>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=2344371609" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=2344371609</a>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=3371118618" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=3371118618</a>
</td>
</tr>
<tr data-type="ModContainer">
<td data-type="DisplayName">County Fermanagh, Northern Ireland - Signed</td>
<td data-type="DisplayName">Rhodesys Royal Australian Regiment</td>
<td>
<span class="from-steam">Steam</span>
</td>
<td>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=3374033200" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=3374033200</a>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=3231074387" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=3231074387</a>
</td>
</tr>
<tr data-type="ModContainer">
<td data-type="DisplayName">Diwako's STALKER-like anomalies rework</td>
<td>
<span class="from-steam">Steam</span>
</td>
<td>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=3351980695" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=3351980695</a>
</td>
</tr>
<tr data-type="ModContainer">
<td data-type="DisplayName">W35</td>
<td>
<span class="from-steam">Steam</span>
</td>
<td>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=3274341538" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=3274341538</a>
</td>
</tr>
<tr data-type="ModContainer">
<td data-type="DisplayName">UMB Colombia</td>
<td>
<span class="from-steam">Steam</span>
</td>
<td>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=2266710560" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=2266710560</a>
</td>
</tr>
<tr data-type="ModContainer">
<td data-type="DisplayName">Archipelago</td>
<td>
<span class="from-steam">Steam</span>
</td>
<td>
<a href="https://steamcommunity.com/sharedfiles/filedetails/?id=1726184748" data-type="Link">https://steamcommunity.com/sharedfiles/filedetails/?id=1726184748</a>
</td>
</tr>
</table>
Expand Down
2 changes: 1 addition & 1 deletion addons/aiCfgFixes/rhs_hlc/CfgWeapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5024,7 +5024,7 @@ class CfgWeapons {

};
};
class vn_m1carbine_shorty: vn_m1carbine {
class vn_m1carbine_shorty: vn_rifle762 {
modes[] = {"Single","AICQB","AIClose","AIMedium","AIFar","AIOpticmode1","AIOpticmode2"};
class Single: Single {
showToPlayer = 1;
Expand Down
2 changes: 1 addition & 1 deletion addons/massCompat/magwells_762x51.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
};
}; // M14 drum mag (X-Products 50 round)

class CBA_762x51_MG3 {
class CBA_762x51_MG3 { // Causes known UBC
GVAR(mags)[] = {
MAGAZINE_WELL_BOX(762x51,50),
MAGAZINE_WELL_BOX(762x51,100),
Expand Down
25 changes: 25 additions & 0 deletions addons/miscFixes/patchNDS/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#include "\z\potato\addons\miscFixes\script_component.hpp"
#undef COMPONENT
#define COMPONENT miscFixes_patchNDS

class CfgPatches {
class ADDON {
units[] = {};
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = { "potato_core", "NDS_M224_mortar" };
skipWhenMissingDependencies = 1;
author = "Bourbon Warfare";
authorUrl = "https://github.com/BourbonWarfare/POTATO";
VERSION_CONFIG;
};
};

// fix broken XEH
class CBA_Extended_EventHandlers;
class CfgVehicles {
class Mortar_01_base_F;
class NDS_M224_mortar_base: Mortar_01_base_F { XEH_ENABLED; }; // "M224 Mortar base" 2472780935
class NDS_M224_mortar;
class NDS_M224_mortar_AI: NDS_M224_mortar { XEH_ENABLED; }; // "M224 60mm Mortar - AI" 2472780935
};
4 changes: 3 additions & 1 deletion addons/miscFixes/patchPTV/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ class CfgWeapons {
};
};
class ptv_rs556s: ptv_rs556 {
// Updating base class Mode_SemiAuto->Single, by z\potato\addons\miscFixes\patchptv\config.cpp/CfgWeapons/ptv_rs556s/Single/ (original (ptv_weapons_cfg\config.bin - no unload))
// due to ptv_sounds, as it has different inheritance from ptv_weapons_cfg
class Single : Single {
sounds[] = {"StandardSound","SilencedSound"};
class BaseSoundModeType;
Expand Down Expand Up @@ -179,7 +181,7 @@ class CfgWeapons {
};
};
};
class ptv_hk433s: ptv_hk433 {
class ptv_hk433s: ptv_rs556 {
class Single: Single {
sounds[] = {"StandardSound","SilencedSound"};
class BaseSoundModeType;
Expand Down