diff --git a/@AresModAchillesExpansion/addons/data_f_achilles.pbo b/@AresModAchillesExpansion/addons/data_f_achilles.pbo index c38673dc..0062f347 100644 Binary files a/@AresModAchillesExpansion/addons/data_f_achilles.pbo and b/@AresModAchillesExpansion/addons/data_f_achilles.pbo differ diff --git a/@AresModAchillesExpansion/addons/data_f_achilles.pbo.Achilles_0.0.4.bisign b/@AresModAchillesExpansion/addons/data_f_achilles.pbo.Achilles_0.0.4.bisign deleted file mode 100644 index b3c2f08a..00000000 Binary files a/@AresModAchillesExpansion/addons/data_f_achilles.pbo.Achilles_0.0.4.bisign and /dev/null differ diff --git a/@AresModAchillesExpansion/addons/data_f_achilles.pbo.Achilles_0.0.4c.bisign b/@AresModAchillesExpansion/addons/data_f_achilles.pbo.Achilles_0.0.4c.bisign new file mode 100644 index 00000000..b674ad12 Binary files /dev/null and b/@AresModAchillesExpansion/addons/data_f_achilles.pbo.Achilles_0.0.4c.bisign differ diff --git a/@AresModAchillesExpansion/addons/data_f_ares.pbo b/@AresModAchillesExpansion/addons/data_f_ares.pbo index f4ae77a9..0ffbe759 100644 Binary files a/@AresModAchillesExpansion/addons/data_f_ares.pbo and b/@AresModAchillesExpansion/addons/data_f_ares.pbo differ diff --git a/@AresModAchillesExpansion/addons/data_f_ares.pbo.Achilles_0.0.4.bisign b/@AresModAchillesExpansion/addons/data_f_ares.pbo.Achilles_0.0.4.bisign deleted file mode 100644 index 7a73c6c7..00000000 Binary files a/@AresModAchillesExpansion/addons/data_f_ares.pbo.Achilles_0.0.4.bisign and /dev/null differ diff --git a/@AresModAchillesExpansion/addons/data_f_ares.pbo.Achilles_0.0.4c.bisign b/@AresModAchillesExpansion/addons/data_f_ares.pbo.Achilles_0.0.4c.bisign new file mode 100644 index 00000000..afe35c7f Binary files /dev/null and b/@AresModAchillesExpansion/addons/data_f_ares.pbo.Achilles_0.0.4c.bisign differ diff --git a/@AresModAchillesExpansion/addons/functions_f_achilles.pbo b/@AresModAchillesExpansion/addons/functions_f_achilles.pbo index ebd93ab3..0fa18faa 100644 Binary files a/@AresModAchillesExpansion/addons/functions_f_achilles.pbo and b/@AresModAchillesExpansion/addons/functions_f_achilles.pbo differ diff --git a/@AresModAchillesExpansion/addons/functions_f_achilles.pbo.Achilles_0.0.4.bisign b/@AresModAchillesExpansion/addons/functions_f_achilles.pbo.Achilles_0.0.4.bisign deleted file mode 100644 index 9dd4341b..00000000 Binary files a/@AresModAchillesExpansion/addons/functions_f_achilles.pbo.Achilles_0.0.4.bisign and /dev/null differ diff --git a/@AresModAchillesExpansion/addons/functions_f_achilles.pbo.Achilles_0.0.4c.bisign b/@AresModAchillesExpansion/addons/functions_f_achilles.pbo.Achilles_0.0.4c.bisign new file mode 100644 index 00000000..a110228e Binary files /dev/null and b/@AresModAchillesExpansion/addons/functions_f_achilles.pbo.Achilles_0.0.4c.bisign differ diff --git a/@AresModAchillesExpansion/addons/functions_f_ares.pbo b/@AresModAchillesExpansion/addons/functions_f_ares.pbo index fe80beb6..cac336a1 100644 Binary files a/@AresModAchillesExpansion/addons/functions_f_ares.pbo and b/@AresModAchillesExpansion/addons/functions_f_ares.pbo differ diff --git a/@AresModAchillesExpansion/addons/functions_f_ares.pbo.Achilles_0.0.4.bisign b/@AresModAchillesExpansion/addons/functions_f_ares.pbo.Achilles_0.0.4.bisign deleted file mode 100644 index 8bd3744c..00000000 Binary files a/@AresModAchillesExpansion/addons/functions_f_ares.pbo.Achilles_0.0.4.bisign and /dev/null differ diff --git a/@AresModAchillesExpansion/addons/functions_f_ares.pbo.Achilles_0.0.4c.bisign b/@AresModAchillesExpansion/addons/functions_f_ares.pbo.Achilles_0.0.4c.bisign new file mode 100644 index 00000000..d5f7b971 Binary files /dev/null and b/@AresModAchillesExpansion/addons/functions_f_ares.pbo.Achilles_0.0.4c.bisign differ diff --git a/@AresModAchillesExpansion/addons/language_f.pbo b/@AresModAchillesExpansion/addons/language_f.pbo index 0f39f437..6397bf2f 100644 Binary files a/@AresModAchillesExpansion/addons/language_f.pbo and b/@AresModAchillesExpansion/addons/language_f.pbo differ diff --git a/@AresModAchillesExpansion/addons/language_f.pbo.Achilles_0.0.4.bisign b/@AresModAchillesExpansion/addons/language_f.pbo.Achilles_0.0.4.bisign deleted file mode 100644 index 649c5848..00000000 Binary files a/@AresModAchillesExpansion/addons/language_f.pbo.Achilles_0.0.4.bisign and /dev/null differ diff --git a/@AresModAchillesExpansion/addons/language_f.pbo.Achilles_0.0.4c.bisign b/@AresModAchillesExpansion/addons/language_f.pbo.Achilles_0.0.4c.bisign new file mode 100644 index 00000000..c1b14409 Binary files /dev/null and b/@AresModAchillesExpansion/addons/language_f.pbo.Achilles_0.0.4c.bisign differ diff --git a/@AresModAchillesExpansion/addons/modules_f_achilles.pbo b/@AresModAchillesExpansion/addons/modules_f_achilles.pbo index 44c3cedd..830a4120 100644 Binary files a/@AresModAchillesExpansion/addons/modules_f_achilles.pbo and b/@AresModAchillesExpansion/addons/modules_f_achilles.pbo differ diff --git a/@AresModAchillesExpansion/addons/modules_f_achilles.pbo.Achilles_0.0.4.bisign b/@AresModAchillesExpansion/addons/modules_f_achilles.pbo.Achilles_0.0.4.bisign deleted file mode 100644 index 04573218..00000000 Binary files a/@AresModAchillesExpansion/addons/modules_f_achilles.pbo.Achilles_0.0.4.bisign and /dev/null differ diff --git a/@AresModAchillesExpansion/addons/modules_f_achilles.pbo.Achilles_0.0.4c.bisign b/@AresModAchillesExpansion/addons/modules_f_achilles.pbo.Achilles_0.0.4c.bisign new file mode 100644 index 00000000..6ce115c8 Binary files /dev/null and b/@AresModAchillesExpansion/addons/modules_f_achilles.pbo.Achilles_0.0.4c.bisign differ diff --git a/@AresModAchillesExpansion/addons/modules_f_ares.pbo b/@AresModAchillesExpansion/addons/modules_f_ares.pbo index 0eaa1320..5a2f1071 100644 Binary files a/@AresModAchillesExpansion/addons/modules_f_ares.pbo and b/@AresModAchillesExpansion/addons/modules_f_ares.pbo differ diff --git a/@AresModAchillesExpansion/addons/modules_f_ares.pbo.Achilles_0.0.4.bisign b/@AresModAchillesExpansion/addons/modules_f_ares.pbo.Achilles_0.0.4.bisign deleted file mode 100644 index d0138a3d..00000000 Binary files a/@AresModAchillesExpansion/addons/modules_f_ares.pbo.Achilles_0.0.4.bisign and /dev/null differ diff --git a/@AresModAchillesExpansion/addons/modules_f_ares.pbo.Achilles_0.0.4c.bisign b/@AresModAchillesExpansion/addons/modules_f_ares.pbo.Achilles_0.0.4c.bisign new file mode 100644 index 00000000..e837138e Binary files /dev/null and b/@AresModAchillesExpansion/addons/modules_f_ares.pbo.Achilles_0.0.4c.bisign differ diff --git a/@AresModAchillesExpansion/addons/ui_f.pbo b/@AresModAchillesExpansion/addons/ui_f.pbo index 1f50f0a3..bae62f94 100644 Binary files a/@AresModAchillesExpansion/addons/ui_f.pbo and b/@AresModAchillesExpansion/addons/ui_f.pbo differ diff --git a/@AresModAchillesExpansion/addons/ui_f.pbo.Achilles_0.0.4.bisign b/@AresModAchillesExpansion/addons/ui_f.pbo.Achilles_0.0.4.bisign deleted file mode 100644 index 81aa796d..00000000 Binary files a/@AresModAchillesExpansion/addons/ui_f.pbo.Achilles_0.0.4.bisign and /dev/null differ diff --git a/@AresModAchillesExpansion/addons/ui_f.pbo.Achilles_0.0.4c.bisign b/@AresModAchillesExpansion/addons/ui_f.pbo.Achilles_0.0.4c.bisign new file mode 100644 index 00000000..a706f7c6 Binary files /dev/null and b/@AresModAchillesExpansion/addons/ui_f.pbo.Achilles_0.0.4c.bisign differ diff --git a/@AresModAchillesExpansion/addons/ui_f/dialogs/Replacement/RscDisplayAttributesVehicle.hpp b/@AresModAchillesExpansion/addons/ui_f/dialogs/Replacement/RscDisplayAttributesVehicle.hpp index 52b68e62..2a6daa33 100644 --- a/@AresModAchillesExpansion/addons/ui_f/dialogs/Replacement/RscDisplayAttributesVehicle.hpp +++ b/@AresModAchillesExpansion/addons/ui_f/dialogs/Replacement/RscDisplayAttributesVehicle.hpp @@ -72,14 +72,12 @@ class RscDisplayAttributesVehicleEmpty : RscDisplayAttributes class Controls: controls { // Trick to get attributes in the right order - delete Skill; delete Lock; delete RespawnVehicle; delete RespawnPosition; delete Exec; class Ammo: RscAttributeAmmo {}; - class Skill2: RscAttributeSkill {}; class Lock2: RscAttributeLock {}; class Headlight: RscAttributeHeadlight {}; class RespawnVehicle2: RscAttributeRespawnVehicle {}; diff --git a/@AresModAchillesExpansion/addons/ui_f/scripts/RscDisplayAttributesMan.sqf b/@AresModAchillesExpansion/addons/ui_f/scripts/RscDisplayAttributesMan.sqf index 1af568c9..7c3367d4 100644 --- a/@AresModAchillesExpansion/addons/ui_f/scripts/RscDisplayAttributesMan.sqf +++ b/@AresModAchillesExpansion/addons/ui_f/scripts/RscDisplayAttributesMan.sqf @@ -1,6 +1,22 @@ +// fix available attributes for players +_show_skill = true; +_available_attributes = missionnamespace getvariable ["BIS_fnc_initCuratorAttributes_attributes",[]]; +if (not ("%ALL" in _available_attributes)) then +{ + _available_attributes = ["Rank2","Damage2","Ammo","RespawnPosition2"]; + missionnamespace setvariable ["BIS_fnc_initCuratorAttributes_attributes",_available_attributes]; + _show_skill = false; +}; + #include "\a3\ui_f_curator\UI\displays\RscDisplayAttributes.sqf" _ctrlButtonCustom = _display displayctrl 30004; +if (not _show_skill) then +{ + _ctrlButtonCustom ctrlSetFade 0.8; + _ctrlButtonCustom ctrlEnable false; + _ctrlButtonCustom ctrlCommit 0; +}; _y_offset = ((ctrlposition _ctrlButtonCustom) select 1) - 16.1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) - (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2); { diff --git a/@AresModAchillesExpansion/addons/ui_f/scripts/RscDisplayAttributesVehicle.sqf b/@AresModAchillesExpansion/addons/ui_f/scripts/RscDisplayAttributesVehicle.sqf index aa38a606..539e5db5 100644 --- a/@AresModAchillesExpansion/addons/ui_f/scripts/RscDisplayAttributesVehicle.sqf +++ b/@AresModAchillesExpansion/addons/ui_f/scripts/RscDisplayAttributesVehicle.sqf @@ -1,6 +1,23 @@ +// fix available attributes for players +_show_skill = true; +_available_attributes = missionnamespace getvariable ["BIS_fnc_initCuratorAttributes_attributes",[]]; +if (not ("%ALL" in _available_attributes)) then +{ + _available_attributes = ["Rank","Damage","Fuel","Ammo","RespawnVehicle2","RespawnPosition2"]; + missionnamespace setvariable ["BIS_fnc_initCuratorAttributes_attributes",_available_attributes]; + _show_skill = false; +}; + #include "\a3\ui_f_curator\UI\displays\RscDisplayAttributes.sqf" _ctrlButtonCustom = _display displayctrl 30004; +if (not _show_skill) then +{ + _ctrlButtonCustom ctrlSetFade 0.8; + _ctrlButtonCustom ctrlEnable false; + _ctrlButtonCustom ctrlCommit 0; +}; + _y_offset = ((ctrlposition _ctrlButtonCustom) select 1) - 16.1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) - (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2); { diff --git a/@AresModAchillesExpansion/keys/Achilles_0.0.4.bikey b/@AresModAchillesExpansion/keys/Achilles_0.0.4.bikey deleted file mode 100644 index 77dfe5d1..00000000 Binary files a/@AresModAchillesExpansion/keys/Achilles_0.0.4.bikey and /dev/null differ diff --git a/@AresModAchillesExpansion/keys/Achilles_0.0.4c.bikey b/@AresModAchillesExpansion/keys/Achilles_0.0.4c.bikey new file mode 100644 index 00000000..3a810b10 Binary files /dev/null and b/@AresModAchillesExpansion/keys/Achilles_0.0.4c.bikey differ diff --git a/@AresModAchillesExpansion/mod.cpp b/@AresModAchillesExpansion/mod.cpp index f6a800fc..fe7307ae 100644 --- a/@AresModAchillesExpansion/mod.cpp +++ b/@AresModAchillesExpansion/mod.cpp @@ -1,7 +1,7 @@ -name = "Ares Mod - Achilles Expansion (0.0.4)"; +name = "Ares Mod - Achilles Expansion (0.0.4c)"; picture = "achilles_Insignia.paa"; actionName = "Website"; action = "https://forums.bistudio.com/topic/191113-ares-mod-achilles-expansion/?p=3031548"; -tooltip = "Ares Mod - Achilles Expansion (0.0.4)"; +tooltip = "Ares Mod - Achilles Expansion (0.0.4c)"; overview = "Ares augments the existing Zeus functionality, expanding the toolset and making it easy to create more compelling missions on the fly.
The Achilles Expansion (AE) includes Ares Mod with even more functionalites. Some functionalities only work with ACE mod, but those mods are not mandatory in order to run Ares (AE) properly."; author = "Ares by Anton Struyk, AE by Kex"; \ No newline at end of file diff --git a/@AresModAchillesExpansion/readme.txt b/@AresModAchillesExpansion/readme.txt index 8da70319..4b78acc9 100644 --- a/@AresModAchillesExpansion/readme.txt +++ b/@AresModAchillesExpansion/readme.txt @@ -11,6 +11,9 @@ You can download the latest version of CBA from the developer website here: http Changelists +V.0.0.4c (Achilles Expansion (alpha version)) +* Fix: Player edit menu was broken. + V.0.0.4 (Achilles Expansion (alpha version)) * Change: Teleport player: Teleport entire vehcile is now optional. * Change: Instant occupation does distribute large group (>8 members) on different buildings (by Grezvany13) @@ -28,9 +31,9 @@ V.0.0.4 (Achilles Expansion (alpha version)) * Feature: Headlight/Searchlight option (vehicle edit menu) * Feature: Unit edit menu: Arsenal and Skill button; set unit name for chatter module * Fix: Suppressive fire: - - Broke down when more than 2 "suppression target modules" were available. - - Unit did not cease fire if group mate is in line of fire. - - Suppressive fire: Units went "crazy" in mechanized and motorized groups. + - Broke down when more than 2 "suppression target modules" were available. + - Unit did not cease fire if group mate is in line of fire. + - Suppressive fire: Units went "crazy" in mechanized and motorized groups. * Fix: Logger for loading achilles modules was not removed. * Fix: Client side script errors reported in RPT log file. * Fix: Wind force of 0 is no longer possible (prevents flares from being stuck in the air). @@ -45,39 +48,39 @@ V.0.0.3 (Achilles Expansion (alpha version)) This might lead to unintented losses of some functionalities (please report!) * Change: Optimized the way the add-on is initialized - No script runs at all when player is not Zeus. - - Loading of modules is now directly coupled with the Zeus Display. + - Loading of modules is now directly coupled with the Zeus Display. * Change: Updated Russian Translation (by Igor Nikolaev). * Change: Warning message in case Ares is loaded too. * Change: Save SQF Module is now based on world positions (not final yet!!!) * Change: Replaced BIS_fnc_destroy City by the Achilles function in the earthquake module. - (Fix: earthquake undid previous destruction) + (Fix: earthquake undid previous destruction) * Feature: Create Advanced Compositions: Now supports turrets * Feature: Options for suppresive fire module (Stance, Fire Mode, time) * Feature: Surrender with Apex Progress Bar Action and more options * Feature: Create Intel now supports Apex Progress Bar Action - => many new options are possible e.g. hacking laptop/get intel from enemy unit/pick up intel or whatever + => many new options are possible e.g. hacking laptop/get intel from enemy unit/pick up intel or whatever * Feature: Option to teleport zeus instant in teleport player module * Feature: toggle destroy buildings for earthquake * Feature: Transfer ownership module (allows transfering units/objects to server) -* Fix: Intels could not be properly edited +* Fix: Intels could not be properly edited * Fix: RHS reinforcements were broken due to renaming of Vehicle Classes in the last RHS update -* Fix: Switch player side was broken +* Fix: Switch player side was broken * Fix: Several functionalities did not work on non-local units (e.g. players): - - "LEFT CTRL + G" - eject - - Ambient Animations - Note: The functionalities should now even work on players. + - "LEFT CTRL + G" - eject + - Ambient Animations + Note: The functionalities should now even work on players. * Fix: Spawn Light Source and Peristent Smoke Pillar did work for clients without Achilles * Fix: Injury Module (Vanilla Version): random option led to death with high probabilty * Fix: Script errors caused by canceling selection option * Fix: Compositions were not accessible in Eden editor (fixed by S. Crowe) * Fix: Custom Modules could not be added in mission init phase (e.g. init.sqf) -* Fix: Units could not properly have a seat on chairs from advanced compositions +* Fix: Units could not properly have a seat on chairs from advanced compositions * Fix: Animal Category is back, although it will be replaced as soon as the new animal spawn module is finished * Fix: ERROR IN FIELD MANUAL: Wrong hotkey for Deep Copy/Paste * Fix: Flagpole teleporter did not account for height. * Fix: There were several bugs in case custom add-ons were not unlocked for Zeus - Could not move and delete target logics - - Ares modules were not avaiable in recent modules + - Ares modules were not avaiable in recent modules * Fix: Error message was missing when fire support modules had a lack of possible targets V.0.0.2 (Achilles Expansion (alpha version))