Skip to content

Commit

Permalink
Revise tools (#354)
Browse files Browse the repository at this point in the history
* AddonBuilder now binarizes files

* Use *.h extension for module headers

* publish.py (part 1)

* publisher.py (part 2)

* update changelog
  • Loading branch information
Kexanone authored Aug 12, 2018
1 parent f815b3c commit 927de83
Show file tree
Hide file tree
Showing 131 changed files with 504 additions and 252 deletions.
7 changes: 4 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
@AresModAchillesExpansion/keys/private
@Release/*
Tools/AchillesConnectToServer.bat
Tools/AchillesAddonBuilder.bat
Release/*
tools/AchillesConnectToServer.bat
tools/AchillesAddonBuilder.bat
tools/*.yaml
*.bikey
*.biprivatekey
*.pbo
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////


#include "\achilles\modules_f_ares\module_header.hpp"
#include "\achilles\modules_f_ares\module_header.h"

private ["_injury","_selected_units"];

Expand Down Expand Up @@ -56,4 +56,4 @@ if (isClass (configfile >> "CfgPatches" >> "ace_medical")) then
} forEach _selected_units;
};

#include "\achilles\modules_f_ares\module_footer.hpp"
#include "\achilles\modules_f_ares\module_footer.h"
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////


#include "\achilles\modules_f_ares\module_header.hpp"
#include "\achilles\modules_f_ares\module_header.h"

#define INJURY_TYPES ["bullet", "grenade", "explosive", "shell", "stab", "vehiclecrash"]
#define HEARTH_RATES [160, 80, 40, 19]
Expand Down Expand Up @@ -164,4 +164,4 @@ if (isClass (configfile >> "CfgPatches" >> "ace_medical")) then
} forEach _selected_units;
};

#include "\achilles\modules_f_ares\module_footer.hpp"
#include "\achilles\modules_f_ares\module_footer.h"
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
Nothing
*/

#include "\achilles\modules_f_ares\module_header.hpp"
#include "\achilles\modules_f_ares\module_header.h"

private _object = [_logic, false] call Ares_fnc_GetUnitUnderCursor;

Expand Down Expand Up @@ -40,4 +40,4 @@ if (isNil "_objects") exitWith {};
// Show message
[localize "STR_AMAE_ARSENAL_ADDED"] call Ares_fnc_ShowZeusMessage;

#include "\achilles\modules_f_ares\module_footer.hpp"
#include "\achilles\modules_f_ares\module_footer.h"
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
Nothing
*/

#include "\achilles\modules_f_ares\module_header.hpp"
#include "\achilles\modules_f_ares\module_header.h"

private _object = [_logic, false] call Ares_fnc_GetUnitUnderCursor;

Expand All @@ -37,4 +37,4 @@ if (isServer) then
uiNamespace setVariable ["Ares_CopyPaste_Dialog_Text", str _data];
createDialog "Ares_CopyPaste_Dialog";

#include "\achilles\modules_f_ares\module_footer.hpp"
#include "\achilles\modules_f_ares\module_footer.h"
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
Nothing
*/

#include "\achilles\modules_f_ares\module_header.hpp"
#include "\achilles\modules_f_ares\module_header.h"

#include "\achilles\data_f_achilles\Arsenal\arsenalItems.sqf"

Expand Down Expand Up @@ -186,4 +186,4 @@ clearbackpackcargoglobal _object;

[localize "STR_AMAE_ARSENAL_ADDED"] call Ares_fnc_ShowZeusMessage;

#include "\achilles\modules_f_ares\module_footer.hpp"
#include "\achilles\modules_f_ares\module_footer.h"
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
Nothing
*/

#include "\achilles\modules_f_ares\module_header.hpp"
#include "\achilles\modules_f_ares\module_header.h"

private _object = [_logic, false] call Ares_fnc_GetUnitUnderCursor;

Expand Down Expand Up @@ -64,4 +64,4 @@ createDialog "Ares_CopyPaste_Dialog";
[_object, _replace]
] call CBA_fnc_waitUntilAndExecute;

#include "\achilles\modules_f_ares\module_footer.hpp"
#include "\achilles\modules_f_ares\module_footer.h"
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
Nothing
*/

#include "\achilles\modules_f_ares\module_header.hpp"
#include "\achilles\modules_f_ares\module_header.h"

private _object = [_logic, false] call Ares_fnc_GetUnitUnderCursor;

Expand Down Expand Up @@ -43,4 +43,4 @@ if (isNil "_objects") exitWith {};
// Show message
[localize "STR_AMAE_ARSENAL_REMOVED"] call Ares_fnc_ShowZeusMessage;

#include "\achilles\modules_f_ares\module_footer.hpp"
#include "\achilles\modules_f_ares\module_footer.h"
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// DESCRIPTION: Function for the module "change altitude"
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#include "\achilles\modules_f_ares\module_header.hpp"
#include "\achilles\modules_f_ares\module_header.h"

private _objects = [[_logic, false] call Ares_fnc_GetUnitUnderCursor];

Expand Down Expand Up @@ -42,4 +42,4 @@ if (_objects isEqualTo []) exitWith {[localize "STR_AMAE_NO_OBJECT_SELECTED"] ca
} forEach _objects;


#include "\achilles\modules_f_ares\module_footer.hpp"
#include "\achilles\modules_f_ares\module_footer.h"
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////


#include "\achilles\modules_f_ares\module_header.hpp"
#include "\achilles\modules_f_ares\module_header.h"

//Broadcast animation function
if (isNil "Achilles_var_animation_init_done") then
Expand All @@ -20,4 +20,4 @@ private _units = [_logic, false] call Ares_fnc_GetUnitUnderCursor;

[[_units]] call Achilles_fnc_Animation;

#include "\achilles\modules_f_ares\module_footer.hpp"
#include "\achilles\modules_f_ares\module_footer.h"
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////


#include "\achilles\modules_f_ares\module_header.hpp"
#include "\achilles\modules_f_ares\module_header.h"

private _unit = [_logic, false] call Ares_fnc_GetUnitUnderCursor;

[_unit] call Achilles_fnc_changeAbility;

#include "\achilles\modules_f_ares\module_footer.hpp"
#include "\achilles\modules_f_ares\module_footer.h"
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////


#include "\achilles\modules_f_ares\module_header.hpp"
#include "\achilles\modules_f_ares\module_header.h"

private _unit = [_logic, false] call Ares_fnc_GetUnitUnderCursor;
[_unit] call Achilles_fnc_chatter;

#include "\achilles\modules_f_ares\module_footer.hpp"
#include "\achilles\modules_f_ares\module_footer.h"
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// DESCRIPTION: Function for the module "sit on chair"
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#include "\achilles\modules_f_ares\module_header.hpp"
#include "\achilles\modules_f_ares\module_header.h"

private _chair = [_logic, false] call Ares_fnc_GetUnitUnderCursor;

Expand Down Expand Up @@ -53,4 +53,4 @@ if (isNull (_chair getVariable ['occupier', ObjNull])) then
_chair setVariable ['occupier', ObjNull];
};

#include "\achilles\modules_f_ares\module_footer.hpp"
#include "\achilles\modules_f_ares\module_footer.h"
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
Nothing
*/

#include "\achilles\modules_f_ares\module_header.hpp"
#include "\achilles\modules_f_ares\module_header.h"

if(isNil "Achilles_var_ied_init_done") then
{
Expand Down Expand Up @@ -88,4 +88,4 @@ else
[localize "STR_AMAE_ENYO_OBJECTS_NOT_ALLOWED"] call Achilles_fnc_ShowZeusErrorMessage;
};

#include "\achilles\modules_f_ares\module_footer.hpp"
#include "\achilles\modules_f_ares\module_footer.h"
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// DESCRIPTION: Function for destroing buildings
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#include "\achilles\modules_f_ares\module_header.hpp"
#include "\achilles\modules_f_ares\module_header.h"

private _center_pos = position _logic;

Expand Down Expand Up @@ -43,4 +43,4 @@ private _distribution_type = _dialogResult select 2;

[_buildings,_mean_damage_type,_distribution_type] call Achilles_fnc_damageBuildings;

#include "\achilles\modules_f_ares\module_footer.hpp"
#include "\achilles\modules_f_ares\module_footer.h"
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// DESCRIPTION: Function for lock door module
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#include "\achilles\modules_f_ares\module_header.hpp"
#include "\achilles\modules_f_ares\module_header.h"

private ["_buildings","_group_logic"];

Expand Down Expand Up @@ -160,4 +160,4 @@ if (_mode < 2) then

[objNull, format [localize "STR_AMAE_DOOR_STATUS_CHANGED", count _logic_list]] call bis_fnc_showCuratorFeedbackMessage;

#include "\achilles\modules_f_ares\module_footer.hpp"
#include "\achilles\modules_f_ares\module_footer.h"
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////


#include "\achilles\modules_f_ares\module_header.hpp"
#include "\achilles\modules_f_ares\module_header.h"

private _dialogResult =
[
Expand Down Expand Up @@ -37,4 +37,4 @@ private _JIP_id = [[_center_pos,_radius,_lightOn],
_logic setName format ["Toggle Lamp: JIP queue %1", _JIP_id];
_deleteModuleOnExit = false;

#include "\achilles\modules_f_ares\module_footer.hpp"
#include "\achilles\modules_f_ares\module_footer.h"
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// DESCRIPTION: Module for binding variables to objects
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#include "\achilles\modules_f_ares\module_header.hpp"
#include "\achilles\modules_f_ares\module_header.h"

private _object = [_logic, false] call Ares_fnc_GetUnitUnderCursor;
if (isNull _object) exitWith {[localize "STR_AMAE_NO_OBJECT_SELECTED"] call Achilles_fnc_ShowZeusErrorMessage};
Expand All @@ -27,4 +27,4 @@ if (count _dialogResult > 0) then
if (_dialogResult select 1 == 0) then {_object call compile format["%1 = _this;",_var]} else {[_object, compile format["%1 = _this;",_var], 0] call Achilles_fnc_spawn};
};

#include "\achilles\modules_f_ares\module_footer.hpp"
#include "\achilles\modules_f_ares\module_footer.h"
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
// DESCRIPTION: Open function viewer
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#include "\achilles\modules_f_ares\module_header.hpp"
#include "\achilles\modules_f_ares\module_header.h"

[] call BIS_fnc_help;

#include "\achilles\modules_f_ares\module_footer.hpp"
#include "\achilles\modules_f_ares\module_footer.h"
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
// DESCRIPTION: Module for showing config of an object
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#include "\achilles\modules_f_ares\module_header.hpp"
#include "\achilles\modules_f_ares\module_header.h"

private _unit = [_logic, false] call Ares_fnc_GetUnitUnderCursor;
if (player isKindOf "VirtualCurator_F") exitWith {[localize "STR_AMAE_CANNOT_BE_USED_BY_VIRTUAL_CURATORS"] call Achilles_fnc_ShowZeusErrorMessage};
if (isNull _unit) exitWith {[localize "STR_AMAE_NO_UNIT_SELECTED"] call Achilles_fnc_ShowZeusErrorMessage};
[[typeOf _unit, animationState _unit]] call BIS_fnc_animViewer;

#include "\achilles\modules_f_ares\module_footer.hpp"
#include "\achilles\modules_f_ares\module_footer.h"
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// DESCRIPTION: Module for showing config of an object
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#include "\achilles\modules_f_ares\module_header.hpp"
#include "\achilles\modules_f_ares\module_header.h"

private _object = [_logic, false] call Ares_fnc_GetUnitUnderCursor;
if (!isNull _object) then
Expand All @@ -15,4 +15,4 @@ if (!isNull _object) then
};
[] call BIS_fnc_configviewer;

#include "\achilles\modules_f_ares\module_footer.hpp"
#include "\achilles\modules_f_ares\module_footer.h"
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// DESCRIPTION: Function for module "advanced composition"
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#include "\achilles\modules_f_ares\module_header.hpp"
#include "\achilles\modules_f_ares\module_header.h"

// load basic advanced compositions
if (isNil "Achilles_var_acs_init_done") then
Expand All @@ -17,4 +17,4 @@ if (isNil "Achilles_var_acs_init_done") then
createDialog "Ares_composition_Dialog";
["LOADED"] call Achilles_fnc_RscDisplayAttributes_manageAdvancedComposition;

#include "\achilles\modules_f_ares\module_footer.hpp"
#include "\achilles\modules_f_ares\module_footer.h"
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "\achilles\modules_f_ares\module_header.hpp"
#include "\achilles\modules_f_ares\module_header.h"

private ['_radius','_dialogResult','_epicenter','_units'];
_epicenter = position _logic;
Expand Down Expand Up @@ -39,4 +39,4 @@ if (_dialogResult select 2 == 0) then
};
};

#include "\achilles\modules_f_ares\module_footer.hpp"
#include "\achilles\modules_f_ares\module_footer.h"
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "\achilles\modules_f_ares\module_header.hpp"
#include "\achilles\modules_f_ares\module_header.h"

createDialog "RscDisplayAttributesModuleSetDate";

#include "\achilles\modules_f_ares\module_footer.hpp"
#include "\achilles\modules_f_ares\module_footer.h"
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "\achilles\modules_f_ares\module_header.hpp"
#include "\achilles\modules_f_ares\module_header.h"
#define SHARP_DECAY_VALUE 1
#define SMOOTH_DECAY_VALUE 0.01

Expand Down Expand Up @@ -68,4 +68,4 @@ if (isNil "Ares_fnc_Weather_Function") then

remoteExec ["Ares_fnc_Change_Weather_Function",0];

#include "\achilles\modules_f_ares\module_footer.hpp"
#include "\achilles\modules_f_ares\module_footer.h"
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

#include "\achilles\modules_f_ares\module_header.hpp"
#include "\achilles\modules_f_ares\module_header.h"

// get the unit
private _unitUnderCursor = [_logic, false] call Ares_fnc_GetUnitUnderCursor;
Expand Down Expand Up @@ -95,4 +95,4 @@ if (isNil "_units") exitWith {};
} forEach _units;

[localize "STR_AMAE_APPLIED_MODULE_TO_X_UNITS", count _units] call Ares_fnc_ShowZeusMessage;
#include "\achilles\modules_f_ares\module_footer.hpp"
#include "\achilles\modules_f_ares\module_footer.h"

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#define LASER_TARGETS ["LaserTargetE", "LaserTargetW"]
#define SIDE_NAMES [localize "STR_AMAE_OPFOR", localize "STR_AMAE_BLUFOR", localize "STR_AMAE_INDEPENDENT"]

#include "\achilles\modules_f_ares\module_header.hpp"
#include "\achilles\modules_f_ares\module_header.h"

if (isNil "Achilles_TargetCount") then { Achilles_TargetCount = 0 };

Expand Down Expand Up @@ -58,4 +58,4 @@ publicVariable "Achilles_TargetCount";

_deleteModuleOnExit = false;

#include "\achilles\modules_f_ares\module_footer.hpp"
#include "\achilles\modules_f_ares\module_footer.h"
Loading

0 comments on commit 927de83

Please sign in to comment.