Skip to content

Commit

Permalink
Merge pull request #29 from OverlordZorn/insignia-auto-assign
Browse files Browse the repository at this point in the history
New: Insignia - Auto Assign CVO Insignias based on Squadname, Trait, Rank, etc.
  • Loading branch information
OverlordZorn authored Sep 4, 2024
2 parents d3ebd38 + 0e65986 commit 06f41cd
Show file tree
Hide file tree
Showing 36 changed files with 666 additions and 337 deletions.
10 changes: 5 additions & 5 deletions .hemtt/launch.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@


[hemtt.launch.default]
[default]
workshop = [
"450814997", # CBA_A3's Workshop ID
"463939057", # ACE3
Expand All @@ -17,20 +17,20 @@ parameters = [
"-noPauseAudio",
]

[hemtt.launch.Stratis]
[Stratis]
extends = "default"
dlc = ["ws","rf"]
mission = "Stratis.Stratis"


[hemtt.launch.GreenMag]
[GreenMag]
extends = "Stratis"
workshop = ["2352603233"]

[hemtt.launch.exec]
[exec]
extends = "default"
mission = "exec.VR"

[hemtt.launch.airlift]
[airlift]
extends = "default"
mission = "airlift.VR"
7 changes: 7 additions & 0 deletions .hemtt/lint.toml → .hemtt/lints.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,11 @@ lints.sqf.banned_commands = "Warning"

options.ignore = [
"createSoundSource",
"addPublicVariableEventHandler",

]

[lints.sqf.command_case]
options.ignore = [
"rankID",
]
1 change: 1 addition & 0 deletions .hemtt/missions/Stratis.Stratis/initPlayerLocal.sqf
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["InitializePlayer", [player, true]] call BIS_fnc_dynamicGroups;
1 change: 1 addition & 0 deletions .hemtt/missions/Stratis.Stratis/initServer.sqf
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["Initialize", [true]] call BIS_fnc_dynamicGroups;
20 changes: 14 additions & 6 deletions .hemtt/missions/Stratis.Stratis/mission.sqm
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ class EditorData
};
class Camera
{
pos[]={3483.2817,147.82555,2635.5703};
dir[]={-0.52101308,-0.30827615,0.79594111};
up[]={-0.16883896,0.95129669,0.25793207};
aside[]={0.83669001,-7.2759576e-009,0.54768705};
pos[]={2720.408,194.23297,2352.8496};
dir[]={0.94591177,-0.09906961,0.30897394};
up[]={0.094179317,0.99508041,0.030762935};
aside[]={0.31050187,1.0849908e-007,-0.95058888};
};
};
binarizationWanted=0;
Expand All @@ -29,13 +29,14 @@ addons[]=
"ace_rearm",
"ace_cargo",
"A3_Characters_F_Orange",
"RF_Vehicles_Pickup_01"
"RF_Vehicles_Pickup_01",
"CVO_Compat_RF"
};
class AddonsMetaData
{
class List
{
items=8;
items=9;
class Item0
{
className="A3_Characters_F";
Expand Down Expand Up @@ -92,6 +93,13 @@ class AddonsMetaData
author="Rotators Collective";
url="https://reactionforces.rotators.net/";
};
class Item8
{
className="CVO_Compat_RF";
name="CVO_Compat_RF";
author="Overlord Zorn [CVO]";
url="http://chronivoron.net";
};
};
};
dlcs[]=
Expand Down
40 changes: 1 addition & 39 deletions .hemtt/project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,42 +31,4 @@ path = "addons/main/script_version.hpp" # Default
# major = 0 # Overrides path when set
# minor = 1
# patch = 1
# git_hash = 4 # Default: 8




[hemtt.launch.default]
workshop = [
"450814997", # CBA_A3's Workshop ID
"463939057", # ACE3
"2369477168", # Advanced Developer Tools
"1779063631", # ZEN
]

dlc = []
optionals = []

parameters = [
"-window",
"-noPause",
"-noPauseAudio",
]

[hemtt.launch.Stratis]
extends = "default"
dlc = ["ws","rf"]
mission = "Stratis.Stratis"


[hemtt.launch.GreenMag]
extends = "Stratis"
workshop = ["2352603233"]

[hemtt.launch.exec]
extends = "default"
mission = "exec.VR"

[hemtt.launch.airlift]
extends = "default"
mission = "airlift.VR"
# git_hash = 4 # Default: 8
2 changes: 1 addition & 1 deletion addons/arsenal/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class CfgPatches {
url = "http://chronivoron.net";

// Minimum compatible version. When the game's version is lower, pop-up warning will appear when launching the game.
requiredVersion = 2.0;
requiredVersion = 2.02;

// Required addons, used for setting load order.
// When any of the addons is missing, pop-up warning will appear when launching the game.
Expand Down
2 changes: 1 addition & 1 deletion addons/bigboom/functions/fn_bigBoomHMO.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ private _HashMapObject = createHashMapObject [[
_helperObj addEventHandler ["Deleted", {
params ["_helperObj"];
private _varNameHMO = _helperObj getVariable "varNameHMO";
missionNameSpace setVariable [_varNameHMO, nil]; // Will delete the HMO
missionNamespace setVariable [_varNameHMO, nil]; // Will delete the HMO
diag_log format ['[CVO](debug)(fn_bigBoomHMO) isNil _varNameHMO: %1', isNil _varNameHMO];
}];
}]
Expand Down
2 changes: 1 addition & 1 deletion addons/bigboom/functions/fn_bigBoomPrep.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ private _ehCode = {
params ["_object", "_killer", "_instigator", "_useEffects"];
_thisArgs params ["_delay"];

diag_log format ['[CVO](debug)(Killed EH triggered) %1 killed by %2 - instigator: ', _object ,_killer, _instigator];
diag_log format ['[CVO](debug)(Killed EH triggered) %1 killed by %2 - instigator: %3',_object,_killer, _instigator];


// creates helper object which can be deleted by zeus to stop the effects
Expand Down
2 changes: 1 addition & 1 deletion addons/csc/functions/fn_spawnCSC.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ while {_addTracks > 0} do { ["ACE_Track", _box] call ace_cargo_fnc


["cvo_csc_Event_crateSpawnedServer", [_box, _title] ] call CBA_fnc_ServerEvent;
diag_log format ['[CVO](debug)(fn_spawnCSC) %" - Requested by %2', _title , _player];
diag_log format ['[CVO](debug)(fn_spawnCSC) %1 - Requested by %2', _title , _player];



Expand Down
5 changes: 5 additions & 0 deletions addons/insignia/CfgExtendedEventHandlers.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
class Extended_PreInit_EventHandlers {
class CVO_Insignia_CBA_Settings_XHE_PreInit {
init = "call compile preprocessFileLineNumbers 'z\cvo_aux\addons\insignia\XEH_preInit.sqf'";
};
};
17 changes: 17 additions & 0 deletions addons/insignia/CfgFunctions.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
class CfgFunctions {
class CVO_Insignia {
class CVO_Insignia {
file = "z\cvo_aux\addons\insignia\functions";
class postInit { postInit = 1; };
// class preInit { preInit = 1; };

class eh_arsenal {};
class eh_group {};

class autoAssign {};

class identify {};
class apply {};
};
};
};
Loading

0 comments on commit 06f41cd

Please sign in to comment.