Skip to content

Forestry - Fix wood collection #294

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.

Sign up for GitHub

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

Merged
Mike-MF merged 1 commit into from
Jul 4, 2026
+31 −3
Merged

Forestry - Fix wood collection #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 15 additions & 1 deletion addons/forestry/functions/fnc_axeAction.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,23 @@ _soundDummy say3D [QCLASS(audio_sound_chopWood), 500];
deleteVehicle _soundDummy;
};

[getPosATL player, [[QCLASS(firewood), selectRandom [1, 2]]], [[QCLASS(woodenlog), 1]], [[QCLASS(woodensticks), selectRandom [1, 2, 3, 4, 5]]]] call EFUNC(common,spawnLoot);
private _markerPos = getPosATL player;
private _playerName = name player;
private _markerName = format ["%1_%2_%3", CBA_missionTime, _playerName, random 100];
private _marker = createMarkerLocal [_markerName, _markerPos];
_marker setMarkerShapeLocal "ELLIPSE";
_marker setMarkerSizeLocal [2.5, 2.5];
_marker setMarkerAlphaLocal 0;

[[_marker, true] call CBA_fnc_randPosArea, [[]], [[]], [[QCLASS(woodensticks), selectRandom [1, 2, 3, 4, 5]]]] call EFUNC(common,spawnLoot);
[[_marker, true] call CBA_fnc_randPosArea, [[]], [[]], [[QCLASS(firewood), selectRandom [1, 2]]]] call EFUNC(common,spawnLoot);
[[_marker, true] call CBA_fnc_randPosArea, [[]], [[]], [[QCLASS(woodenlog), 1]]] call EFUNC(common,spawnLoot);

_tree setDamage 1;

[{
deleteMarkerLocal _this;
}, _marker, 1] call CBA_fnc_waitAndExecute;
},
{
params ["_args"];
Expand Down
2 changes: 1 addition & 1 deletion addons/forestry/functions/fnc_forageTreeAction.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ _soundDummy say3D [QCLASS(audio_sound_gatheringFirewood), 25];
deleteVehicle _soundDummy;
};

[getPosATL player, [[QCLASS(woodensticks), selectRandom [1, 2, 3, 4, 5]]]] call EFUNC(common,spawnLoot);
[getPosATL player, [[]], [[]], [[QCLASS(woodensticks), selectRandom [1, 2, 3, 4, 5]]]] call EFUNC(common,spawnLoot);

private _position = getPosWorld player;

Expand Down
16 changes: 15 additions & 1 deletion addons/forestry/functions/fnc_sawAction.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,25 @@ call FUNC(chainsawFuelDecrement);
deleteVehicle _soundDummy;
};

[getPosATL player, [[QCLASS(firewood), selectRandom [1, 2, 3, 4, 5]]], [[QCLASS(woodenlog), selectRandom [1, 2, 3]]], [[QCLASS(woodensticks), selectRandom [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]]]] call EFUNC(common,spawnLoot);
private _markerPos = getPosATL player;
private _playerName = name player;
private _markerName = format ["%1_%2_%3", CBA_missionTime, _playerName, random 100];
private _marker = createMarkerLocal [_markerName, _markerPos];
_marker setMarkerShapeLocal "ELLIPSE";
_marker setMarkerSizeLocal [2.5, 2.5];
_marker setMarkerAlphaLocal 0;

[[_marker, true] call CBA_fnc_randPosArea, [[]], [[]], [[QCLASS(woodensticks), selectRandom [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]]]] call EFUNC(common,spawnLoot);
[[_marker, true] call CBA_fnc_randPosArea, [[]], [[]], [[QCLASS(firewood), selectRandom [1, 2, 3, 4, 5]]]] call EFUNC(common,spawnLoot);
[[_marker, true] call CBA_fnc_randPosArea, [[]], [[]], [[QCLASS(woodenlog), selectRandom [1, 2, 3]]]] call EFUNC(common,spawnLoot);

_tree setDamage 1;

player setVariable [QGVAR(cuttingWood), nil];

[{
deleteMarkerLocal _this;
}, _marker, 1] call CBA_fnc_waitAndExecute;
},
{
params ["_args"];
Expand Down
Loading