Skip to content

Commit

Permalink
Small Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Kexanone committed Nov 6, 2016
1 parent 59878e7 commit 1d7d56e
Show file tree
Hide file tree
Showing 11 changed files with 28 additions and 20 deletions.
Binary file modified @AresModAchillesExpansion/addons/functions_f_achilles.pbo
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,17 @@ Achilles_fnc_ambientAnim_terminate =
{_unit enableAI _x} forEach ["ANIM","AUTOTARGET","FSM","MOVE","TARGET"];
_unit playMoveNow "AmovPercMstpSrasWrflDnon";
_unit setUnitPos "UP";
_exception = if (((_unit getVariable ["Achilles_var_animations",[""]]) select 0) == "AmovPercMstpSsurWnonDnon") then {true} else {false};
_unit setVariable ["Achilles_var_animations", nil,true];
_unit setVariable ["Achilles_var_noWeapon", nil,true];
_ehAnimDone = _unit getVariable ["Achilles_EhAnimDone", 0];
_unit removeEventHandler ["AnimDone", _ehAnimDone];
_ehKilled = _unit getVariable ["Achilles_EhKilled",0];
_unit removeEventHandler ["Killed", _ehKilled];
if (_exception) then
{
[_unit,""] remoteExec ["switchMove",0];
};
};

//Terminate previous animation
Expand Down
Binary file modified @AresModAchillesExpansion/addons/functions_f_ares.pbo
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ if (_animIndex == -1) then
//[_unit,""] remoteExec ["switchMove",0];
[_unit,"TERMINATE",false] call Achilles_fnc_ambientAnim;

// remove the action
remoteExec ["",_unit]; // remove from JIP queue
_unit remoteExec ["RemoveAllActions", 0];

if (_termination == 0) then
{
[_unit] join _caller;
Expand Down Expand Up @@ -80,7 +84,7 @@ if (_animIndex == -1) then

// remove the action
remoteExec ["",_unit]; // remove from JIP queue
[_unit,_id] remoteExec ["BIS_fnc_holdActionRemove",0];
_unit remoteExec ["RemoveAllActions", 0];

[_unit,_caller,[-1,-1]] remoteExec ["Ares_fnc_surrenderUnit",_unit];

Expand Down
Binary file modified @AresModAchillesExpansion/addons/language_f.pbo
Binary file not shown.
15 changes: 2 additions & 13 deletions @AresModAchillesExpansion/addons/language_f/stringtable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -337,13 +337,6 @@
</Key>
</Container>
<Container name="Ares Module Categories">
<Key ID="STR_PLAYER">
<Original>Player</Original>
<English>Player</English>
<French>Joueur</French>
<Russian>Игрок</Russian>
<German>Spieler</German>
</Key>
<Key ID="STR_TELEPORT">
<Original>Teleport</Original>
<English>Teleport</English>
Expand Down Expand Up @@ -2363,7 +2356,8 @@
<English>Independent</English>
<French>Indépendant</French>
<Russian>Независимые</Russian>
<German>Unabhängig</German>
<German>Unabhängig</German>
</Key>
</Container>
<Container name="cfg Waypoints">
<Key ID="STR_LOITER_HELI">
Expand Down Expand Up @@ -2470,11 +2464,6 @@
Oben steht jeweis geschrieben, was du auswählen sollst.
</German>
</Key>
<Key ID="STR_PLACING_MODULES_TIP">
<Original>
For modules applied on objects or units it is often the case that you can either place it on one unit or place it elsewhere to apply it to multiple units.
</Original>
</Key>
<Key ID="STR_KEY_ASSIGNMENT">
<Original>Additional Key Assignment</Original>
<Russian>Назначение доп. ключей</Russian>
Expand Down
Binary file modified @AresModAchillesExpansion/addons/modules_f_achilles.pbo
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ _placeholder setPos [0,0,0];

_new_group = createGroup (side _unit);
[_unit] join _new_group;
_new_group setBehaviour "COMBAT";

_unit lookAt _target;

Expand Down Expand Up @@ -165,6 +166,7 @@ _placeholder setPos [0,0,0];
_unit setSkill ["aimingAccuracy", _aiming];
_unit setUnitPos "AUTO";
_units joinSilent _old_group;
_old_group setBehaviour "AWARE";
deleteVehicle _placeholder;
};
} forEach _units;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ if (_dialogCount == 7) then
{
_type = INTEL_OBJECTS select (_dialogResult select 0);
_object = _type createVehicle (position _logic);
_object setPos (position _logic);
[[_object], true] call Ares_fnc_AddUnitsToCurator;

// save parameters
Expand All @@ -59,10 +60,13 @@ if (_dialogCount == 7) then

_marker = createMarker [str _object, _object];

// remove previous action
remoteExec ["", _object];
_object remoteExec ["RemoveAllActions", 0];

_execute =
{
private ["_object","_finder","_arguments","_curator","_title","_text","_marker","_shared","_delete","_target"];
_object = _this select 0;
_finder = _this select 1;
_arguments = _this select 3;
Expand Down Expand Up @@ -94,7 +98,7 @@ _execute =
[player,_title,_text,_marker,_shared,_delete], // Arguments passed to the scripts
_duration, // Action duration
0, // Priority
true, // Remove on completion
false, // Remove on completion
false // Show in unconscious state
] remoteExec ["BIS_fnc_holdActionAdd",0,_object];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ class CfgPatches
"Achilles_Module_Spawn_Effects",
"Achilles_Module_Spawn_Intel",
"Achilles_Module_Spawn_Advanced_Composition",
"Achilles_Module_Spawn_Explosives",
"Achilles_Module_Spawn_Empty_Object"
"Achilles_Module_Spawn_Explosives"
};

requiredAddons[] =
Expand Down
11 changes: 8 additions & 3 deletions @AresModAchillesExpansion/readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,21 @@ V.0.0.4 (Achilles Expansion (alpha version))
* Change: Instant occupation does distribute large group (>8 members) on different buildings (by Grezvany13)
* Change: Revised equipment module category.
* Change: Chatter module now sets mouse cursor on text box automatically.
* Change: Remote control chatter: Acces to zeus chat was not avialabel.
* Change: Sort player and group lists in alphabetic order (Player Module Category).
* Change: Suppressive fire: group lines up perpendicular to target direction (except in combat).
* Feature: A few new Advanced Compositions from Apex Protocol campaign.
* Feature: Updated Russian Translation.
* Feature: Updated Russian Translation (by Igor Nikolaev).
* Feature: Achilles Dialog windows can be moved.
* Feature: Damage vehicle components button is implemented (edit vehicle menu).
* Feature: Behaviour careless and combat modes (from "hold fire" to "fire and engage at will").
* Feature: Set ammunition slider (vehicle and unit edit menu).
* 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.
* 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.
* 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).
Expand All @@ -41,7 +46,7 @@ V.0.0.3 (Achilles Expansion (alpha version))
* 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.
* Change: Russian translation extended (by Igor Nikolaev).
* 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.
Expand Down

0 comments on commit 1d7d56e

Please sign in to comment.