Skip to content

Commit

Permalink
3.6 Testing Fixes 1 (#3301)
Browse files Browse the repository at this point in the history 
* initial commit (ready)

* Update Stringtable.xml
  • Loading branch information
@Tiny-DM
Tiny-DM authored Jun 22, 2024
1 parent 0701984 commit 4284401
Show file tree
Hide file tree
Showing 7 changed files with 71 additions and 20 deletions.
27 changes: 27 additions & 0 deletions A3A/addons/core/Stringtable.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16452,6 +16452,33 @@
<Key ID="STR_A3A_templates_lore_VDV">
<Original>The Russian Air Forces fill a vital gap in the AFRF's capability of cohesive aerial assaults. They typically use standard issue Russian equipment, but their vehicles and gear are modified to be more lightweight for ease of aerial operations.</Original>
</Key>
<Key ID="STR_A3A_templates_lore_SFP_SAF00">
<Original>The Swedish Defense Force was never focused on any exploratory ventures into surrounding nations, instead opting to maintain its alliances and fortify the Swedish border from any kind of enemy attack. They use a variety of homegrown weapons, often using the AK4, a variant of the G3.</Original>
</Key>
<Key ID="STR_A3A_templates_lore_SFP_SAF15">
<Original>The Swedish Defense Force was never focused on any exploratory ventures into surrounding nations, instead opting to maintain its alliances and fortify the Swedish border from any kind of enemy attack. They use a variety of homegrown weapons, often using the AK5, a variant of the FN FNC.</Original>
</Key>
<Key ID="STR_A3A_templates_lore_IFA_AI_SOV">
<Original>The Soviets during World War II worked with the Allies after Russian territory was invaded during the Wehrmacht's destructive path to power. They most often use the PPSH-41 submachine gun and Mosin-Nagant rifle, with few exceptions.</Original>
</Key>
<Key ID="STR_A3A_templates_lore_IFA_AI_ALLIES">
<Original>The Allies of World War II were a coalition of nations dedicated to fighting the Wehrmacht's ruthless invasion of its neighboring countries. They most often use American-exported weapons, such as the M1 Garand, M1A1 Thompson, and M1 Carbine.</Original>
</Key>
<Key ID="STR_A3A_templates_lore_IFA_AI_UK">
<Original>The United Kingdom was at the forefront of World War II, a final show of force from a once-great empire. They commonly use a variety of home-grown weapons like the Sten and Enfield, mixed with a variety of American export weaponry.</Original>
</Key>
<Key ID="STR_A3A_templates_IFA_Reb_FFI">
<Original>The French Resistance is battling the Wehrmacht invasion of their country, along with the Allied powers who they believe are being far too heavy-handed with civilian casualities and need to be stopped. They use a much older but healthy supply of Walther PPKs.</Original>
</Key>
<Key ID="STR_A3A_templates_IFA_REB_AK">
<Original>The Polish resistance is in an extremely bad spot. Surrounded by the Wehrmacht on one side and the Soviets on the other, the Polish townspeople have no choice but to fight for the safety and freedom of their country. They use a much older but wealthy supply of Walther PPKs.</Original>
</Key>
<Key ID="STR_A3A_templates_IFA_CIV_FR">
<Original>As well as managing a large country in the middle of Europe, France also controls several offshore territories. Throughout all of these provinces, the French civilians simply wish for the war to end in their home country.</Original>
</Key>
<Key ID="STR_A3A_templates_IFA_CIV_PL">
<Original>In World War II, Poland was trapped in a very awkward position between the Soviets and Germans. The people of Poland have suffered through an occupied, and the recent change in relations has opened a window of opportunity for the Polish Resistance.</Original>
</Key>
</Container>
</Package>
</Project>
27 changes: 25 additions & 2 deletions A3A/addons/core/Templates/Templates.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -473,34 +473,39 @@ class Templates
logo = "\sfp_config\data\logos\sfp_logo_ca.paa";
flagTexture = "\sfp_config\data\flag_sweden_co.paa";
priority = 70;
shortName = "SDF";
};
class SFP_SAF00 : SFP_Base
{
side = "Occ";
name = "SFP Early SDF";
file = "SFP_AI_SWE_early";
climate[] = {"temperate","tropical","arid"};
lore = $STR_A3A_templates_lore_SFP_SAF00;
};
class SFP_SAF00_Arctic : SFP_Base
{
side = "Occ";
name = "SFP Early SDF ARTIC";
name = "SFP Early SDF ARCTIC";
file = "SFP_AI_SWE_early_snow";
climate[] = {"arctic"};
lore = $STR_A3A_templates_lore_SFP_SAF00;
};
class SFP_SAF15 : SFP_Base
{
side = "Occ";
name = "SFP Modern SDF";
file = "SFP_AI_SWE";
climate[] = {"temperate","tropical","arid"};
lore = $STR_A3A_templates_lore_SFP_SAF15;
};
class SFP_SAF15_Arctic : SFP_Base
{
side = "Occ";
name = "SFP Modern SDF ARTIC";
name = "SFP Modern SDF ARCTIC";
file = "SFP_AI_SWE_snow";
climate[] = {"arctic"};
lore = $STR_A3A_templates_lore_SFP_SAF15;
};
//************* 3CB Factions ***************************************************

Expand Down Expand Up @@ -1272,13 +1277,17 @@ class Templates
name = "IFA WEHRMACHT";
priority = 65;
file = "IFA_AI_WEH";
shortName = "WEH";
lore = $STR_A3A_templates_lore_SPE_IFA_AI_WEH;
};
class IFA_SOV : IFA_Base
{
side = "Inv";
flagTexture = "\x\A3A\addons\core\Pictures\Flags\ifa_sov.paa";
name = "IFA SOVIET ARMY";
file = "IFA_AI_SOV";
shortName = "SOV";
lore = $STR_A3A_templates_lore_IFA_AI_SOV.
};
class IFA_ALLIES : IFA_Base
{
Expand All @@ -1287,20 +1296,26 @@ class Templates
name = "IFA ALLIES";
priority = 65;
file = "IFA_AI_ALLIES";
shortName = "ALLIES";
lore = $STR_A3A_templates_lore_IFA_AI_ALLIES;
};
class IFA_US : IFA_Base
{
side = "Occ";
flagTexture = "a3\data_f\flags\flag_us_co.paa";
name = "IFA US ARMY";
file = "IFA_AI_US";
shortName = "US";
lore = $STR_A3A_templates_lore_SPE_IFA_AI_US;
};
class IFA_UK : IFA_Base
{
side = "Occ";
flagTexture = "\A3\Data_F\Flags\flag_uk_co.paa";
name = "IFA UK ARMY";
file = "IFA_AI_UK";
shortName = "UK";
lore = $STR_A3A_templates_lore_IFA_AI_UK;
};
class IFA_FFI : IFA_Base
{
Expand All @@ -1311,6 +1326,8 @@ class Templates
file = "IFA_REB_FFI";
maps[] = {};
climate[] = {};
shortName = "FFI";
lore = $STR_A3A_templates_IFA_Reb_FFI;
};
class IFA_AK : IFA_Base
{
Expand All @@ -1320,6 +1337,8 @@ class Templates
file = "IFA_REB_AK";
maps[] = {"Staszow"};
climate[] = {};
shortName = "AK";
lore = $STR_A3A_templates_IFA_REB_AK;
};
class IFA_CIV_FR : IFA_Base
{
Expand All @@ -1329,6 +1348,8 @@ class Templates
priority = 65;
file = "IFA_CIV_FR";
climate[] = {};
shortName = "CIV";
lore = $STR_A3A_templates_IFA_CIV_FR;
};
class IFA_CIV_PL : IFA_Base
{
Expand All @@ -1338,6 +1359,8 @@ class Templates
file = "IFA_CIV_PL";
maps[] = {"Staszow"};
climate[] = {};
shortName = "CIV";
lore = $STR_A3A_templates_IFA_CIV_PL;
};
// ***************************** SPE with IFA *****************************

Expand Down
2 changes: 1 addition & 1 deletion A3A/addons/core/dialogs.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1318,7 +1318,7 @@ class radio_comm {
w = 0.175015 * safezoneW;
h = 0.0560125 * safezoneH;
tooltip = "Experimental Battle Menu. Work in Progress."; // Don't localize, tempory button.
action = "closeDialog 0; if (A3A_GUIDevPreview) then { _nul = createDialog ""A3A_MainDialog""; } else {[localize ""$STR_A3A_Params_GUIDevPreview_title"",""This paraemter must be enabled in params""] call A3A_fnc_customHint; };";
action = "closeDialog 0; if (A3A_GUIDevPreview) then { _nul = createDialog ""A3A_MainDialog""; } else {[localize ""$STR_A3A_Params_GUIDevPreview_title"",""This parameter must be enabled in the Setup menu.""] call A3A_fnc_customHint; };";
};
class 8slots_L3: A3A_core_BattleMenuRedButton
{
Expand Down
2 changes: 1 addition & 1 deletion A3A/addons/core/functions/AI/fn_artySupport.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ if (_typeArty != "BARRAGE") then
waitUntil {!dialog or (!isNil "roundsX")};
};

if ((isNil "roundsX") and (_typeArty != "BARRAGE")) exitWith {deleteMarkerLocal _mrkFinal; deleteMarker _mrkEllipse1};
if ((isNil "roundsX") and (_typeArty != "BARRAGE")) exitWith {deleteMarker _mrkFinal; deleteMarker _mrkEllipse1};

if (_typeArty != "BARRAGE") then
{
Expand Down
12 changes: 7 additions & 5 deletions A3A/addons/garage/Core/fn_sellVehGRG.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,25 @@ FIX_LINE_NUMBERS()
params ["_UID", "_player", "_selectedVehicle"];

if (!isServer) exitWith {Error("Not server executed")};
if !(_player call HR_GRG_canSell) exitWith {["STR_HR_GRG_Feedback_sellVehicle_comOnly"] call HR_GRG_fnc_Hint;};
if !(_player call HR_GRG_canSell) exitWith {["STR_HR_GRG_Feedback_sellVehicle_comOnly"] remoteExecCall ["HR_GRG_fnc_hint", _player];};
_selectedVehicle params [["_catIndex", -1], ["_vehUID", -1], ["_class", ""]];
if ( (_catIndex isEqualTo -1) || (_vehUID isEqualTo -1) ) exitWith {};
Trace_2("Attempting to sell vehicle at cat: %1 | Vehicle ID: %2 | Classname: %3", _catIndex, _vehUID, _class);

private _refund = [_class] call HR_GRG_getVehicleSellPrice;
if (_refund == 0) exitWith {["STR_HR_GRG_Feedback_sellVehicle_noPrice"] call HR_GRG_fnc_Hint;};
if (_refund == 0) exitWith {["STR_HR_GRG_Feedback_sellVehicle_noPrice"] remoteExecCall ["HR_GRG_fnc_hint", _player];};

private _cat = HR_GRG_Vehicles#_catIndex;
private _veh = _cat get _vehUID;
private _lock = _veh#2;
if !(_lock isEqualTo "") exitWith {["STR_HR_GRG_Feedback_sellVehicle_locked"] call HR_GRG_fnc_Hint;};
if !(_lock isEqualTo "") exitWith {["STR_HR_GRG_Feedback_sellVehicle_locked"] remoteExecCall ["HR_GRG_fnc_hint", _player];};

[_UID,_player,true] remoteExecCall ["HR_GRG_fnc_removeFromPool",HR_GRG_Users];
private _recipients = +HR_GRG_Users;
_recipients pushBackUnique 2; // to avoid double-calling the function on localhost
[_UID,_player,true] remoteExecCall ["HR_GRG_fnc_removeFromPool", _recipients];
[] remoteExec ["HR_GRG_fnc_sellVehGRGLocal",_player];

[_refund] spawn HR_GRG_addResources;

["STR_HR_GRG_Feedback_sellVehicle_sold",[str _refund]] call HR_GRG_fnc_Hint;
Info_3("Vehicle UID %1 sold by %2 for %3.", _vehUID, name _player, _refund);
Info_4("Vehicle UID %1 sold by %2 for %3. Vehicle classname: %4.", _vehUID, name _player, _refund,_class);
16 changes: 8 additions & 8 deletions A3A/addons/garage/Dialogs.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ class HR_GRG_VehicleSelect
x = SCREEN_RIGHT - 39 * GRID_NOUISCALE_W;
y = SCREEN_TOP + 4 * GRID_NOUISCALE_H;
w = 39 * GRID_NOUISCALE_W;
h = safeZoneH - (63 * GRID_NOUISCALE_H); // Screen height - title and buttons height
h = safeZoneH - (66 * GRID_NOUISCALE_H); // Screen height - title and buttons height
size = TEXT_SIZE_MEDIUM;
rowHeight = 3 * GRID_NOUISCALE_H;
onMouseButtonClick = "_this call HR_GRG_fnc_requestMount;";
Expand All @@ -244,7 +244,7 @@ class HR_GRG_VehicleSelect
x = SCREEN_RIGHT - 39 * GRID_NOUISCALE_W;
y = SCREEN_TOP + 4 * GRID_NOUISCALE_H;
w = 39 * GRID_NOUISCALE_W;
h = safeZoneH - (63 * GRID_NOUISCALE_H); // Screen height - title and buttons height
h = safeZoneH - (66 * GRID_NOUISCALE_H); // Screen height - title and buttons height

class controls
{
Expand All @@ -254,7 +254,7 @@ class HR_GRG_VehicleSelect
x = 0;
y = 0;
w = 39 * GRID_NOUISCALE_W;
h = safeZoneH - (63 * GRID_NOUISCALE_H);
h = safeZoneH - (66 * GRID_NOUISCALE_H);
};

class HR_GRG_MirrorCheckbox: HR_GRG_RscCheckBox
Expand Down Expand Up @@ -292,7 +292,7 @@ class HR_GRG_VehicleSelect
x = 0;
y = 4 * GRID_NOUISCALE_H;
w = 38 * GRID_NOUISCALE_W;
h = safeZoneH - (67 * GRID_NOUISCALE_H); // Screen height - title and buttons height 51
h = safeZoneH - (70 * GRID_NOUISCALE_H); // Screen height - title and buttons height 51
};
};
};
Expand All @@ -301,7 +301,7 @@ class HR_GRG_VehicleSelect
class HR_GRG_SourcePanel: HR_GRG_RscControlsGroup
{
x = SCREEN_RIGHT - 39 * GRID_NOUISCALE_W;
y = SCREEN_BOTTOM - 59 * GRID_NOUISCALE_H;
y = SCREEN_BOTTOM - 62 * GRID_NOUISCALE_H;
w = 39 * GRID_NOUISCALE_W;
h = 7 * GRID_NOUISCALE_H;
size = TEXT_SIZE_MEDIUM;
Expand Down Expand Up @@ -350,9 +350,9 @@ class HR_GRG_VehicleSelect
class HR_GRG_InfoPanelWrapper: HR_GRG_RscControlsGroup
{
x = SCREEN_RIGHT - 39 * GRID_NOUISCALE_W;
y = SCREEN_BOTTOM - 52 * GRID_NOUISCALE_H;
y = SCREEN_BOTTOM - 55 * GRID_NOUISCALE_H;
w = 39 * GRID_NOUISCALE_W;
h = 45 * GRID_NOUISCALE_H;
h = 48 * GRID_NOUISCALE_H;
size = TEXT_SIZE_MEDIUM;

class controls
Expand All @@ -363,7 +363,7 @@ class HR_GRG_VehicleSelect
x = 0;
y = 0;
w = 39 * GRID_NOUISCALE_W;
h = 45 * GRID_NOUISCALE_H;
h = 48 * GRID_NOUISCALE_H;
size = TEXT_SIZE_MEDIUM;
};
};
Expand Down
5 changes: 2 additions & 3 deletions A3A/addons/gui/functions/SetupGUI/fn_setupFactionsTab.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ switch (_mode) do
,["bwa3_common", "BWMod"]
,["ww2_spe_assets_c_characters_germans_c", "Spearhead 1944 CDLC"]
,["IFA3_Core", "IFA3 AIO"]
,["Swedish_Forces_Pack","Swedish Forces Pack"]
];

private _prettyAddons = _requiredAddons apply
Expand All @@ -175,9 +176,7 @@ switch (_mode) do
{
getText(configFile >> "CfgMods" >> _x >> "nameShort");
} else {
private _addon = _prettyAddonHM getOrDefault [_x,"UNKNOWNADDON"];
if (_addon == "UNKNOWNADDON") then {Error_1("Unlisted addon: %1. Please add this faction manually in fn_setupFactionsTab.",_x)};
_addon;
_prettyAddonHM getOrDefault [_x,_x];
};
};

Expand Down

0 comments on commit 4284401

Please sign in to comment.