Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Repair - Handle depends = "0" #5283

Merged
merged 2 commits into from
Jun 23, 2017
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 69 additions & 0 deletions addons/repair/dev/draw_showRepairInfo.sqf
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
// PabstMirror
// [] execVM "\z\ace\addons\repair\dev\draw_showRepairInfo.sqf";

#include "\z\ace\addons\repair\script_component.hpp"

addMissionEventHandler ["Draw3D", {
if !((cursorObject isKindOf "Car") || (cursorObject isKindOf "Tank") || (cursorObject isKindOf "Air")) exitWith {};
private _config = configFile >> "CfgVehicles" >> (typeOf cursorObject);

private _hitpointPositions = getArray (_config >> QGVAR(hitpointPositions));
private _hitpointGroups = getArray (_config >> QGVAR(hitpointGroups));

(getAllHitPointsDamage cursorObject) params [["_hitPoints", []], ["_hitSelections", []]];
([cursorObject] call FUNC(getWheelHitPointsWithSelections)) params ["_wheelHitPoints", "_wheelHitSelections"];

private _output = [];

{
private _selection = _x;
private _hitpoint = _hitPoints select _forEachIndex;

if ((_selection != "") && {_hitPoint != ""}) then {
if (((toLower _hitPoint) find "glass") != -1) exitWith {};

private _info = "";
private _color = [1,0,0,1];
if (_selection in _wheelHitSelections) then {
_info = _info + "[Wheel]";
_color = [0,1,0,1];
};
if (!((getText (_config>> "HitPoints" >> _hitpoint >> "depends")) in ["", "0"])) then {
_info = _info + format ["[depends: %1]", getText (_config>> "HitPoints" >> _hitpoint >> "depends")];
_color = [0,0,1,1]
};

private _position = cursorObject selectionPosition [_selection, "HitPoints"];
{
_x params ["_hit", "_pos"];
if (_hitpoint == _hit) exitWith {
_info = _info + format ["[hitPos: %1]", _pos];
if (_pos isEqualType []) exitWith {
_position = _pos;
};
if (_pos isEqualType "") exitWith {
_position = cursorObject selectionPosition [_pos, "HitPoints"];
};
};
} forEach _hitpointPositions;

private _parentHitpoint = "";
{
private _xParent = _x select 0;
{
if (_hitpoint == _x) exitWith {
_info = _info + format ["[Parent: %1]", _xParent];
_parentHitpoint = _xParent;
};
} forEach (_x select 1);
} forEach _hitpointGroups;

if (_parentHitpoint == "") then {
drawIcon3D ["", _color, (cursorObject modelToWorld _position), 0.5, 0.5, 0, format ["%1 [%2]", _hitpoint, _selection], 0.5, 0.025, "TahomaB"];
};
_output pushBack format ["%1: %2[%3] = %4", _forEachIndex, _hitPoint, _selection, cursorObject getHitIndex _forEachIndex];
_output pushBack format ["- %1 -",_info];
};
} forEach _hitPoints;
hintSilent (_output joinString "\n");
}];
3 changes: 2 additions & 1 deletion addons/repair/functions/fnc_addRepairActions.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ _processedHitpoints = [];
if (_selection isEqualTo "") exitWith { TRACE_3("Selection Empty",_hitpoint,_forEachIndex,_selection); };
if (_hitpoint isEqualTo "") exitWith { TRACE_3("Hitpoint Empty",_hitpoint,_forEachIndex,_selection); };
//Depends hitpoints shouldn't be modified directly (will be normalized)
if (isText (configFile >> "CfgVehicles" >> _type >> "HitPoints" >> _hitpoint >> "depends")) exitWith {
// >Clearing 'depends' in case of inheritance cannot be an empty string (rpt warnings), but rather a "0" value.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Stray >?

if (!((getText (configFile >> "CfgVehicles" >> _type >> "HitPoints" >> _hitpoint >> "depends")) in ["", "0"])) exitWith {
TRACE_3("Skip Depends",_hitpoint,_forEachIndex,_selection);
};

Expand Down
2 changes: 1 addition & 1 deletion addons/repair/functions/fnc_normalizeHitPoints.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ private _dependentHitPointScripts = [];
{
if ((_x != "") && {isClass (_config >> _x)} && {!(_x in _realHitPoints)}) then {
_realHitPoints pushBack _x;
if (isText (_config >> _x >> "depends")) then {
if (!((getText (_config >> _x >> "depends")) in ["", "0"])) then {
_dependentHitPoints pushBack _x;
_dependentHitPointScripts pushBack compile getText (_config >> _x >> "depends");
};
Expand Down
2 changes: 1 addition & 1 deletion addons/repair/functions/fnc_setHitPointDamage.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ _hitPointDamageRepaired = 0; //positive for repairs : newSum = (oldSum - repaire
if ((!isNil {_vehicle getHit _selectionName}) && {_x != ""}) then {
_realHitpointCount = _realHitpointCount + 1;

if ((((toLower _x) find "glass") == -1) && {!isText (configFile >> "CfgVehicles" >> typeOf _vehicle >> "HitPoints" >> _x >> "depends")}) then {
if ((((toLower _x) find "glass") == -1) && {(getText (configFile >> "CfgVehicles" >> typeOf _vehicle >> "HitPoints" >> _x >> "depends")) in ["", "0"]}) then {
_hitPointDamageSumOld = _hitPointDamageSumOld + (_allHitPointDamages select _forEachIndex);
if (_forEachIndex == _hitPointIndex) then {
_hitPointDamageRepaired = (_allHitPointDamages select _forEachIndex) - _hitPointDamage;
Expand Down