Frag - Implement Arma v2.18 changes from #10157 #10313

lambdatiger · 2024-09-12T21:17:43Z

This PR requires #10157 to be merged.
When merged this pull request will:

~~Use _instigator projectile "HitPart" event handler argument instead of retrieving shotParents.~~
Use new syntax of nearEntities to avoid needing to sort/filter the fragment target arrays.

IMPORTANT

If the contribution affects the documentation, please include your changes in this pull request so the documentation will appear on the website.
Development Guidelines are read, understood and applied.
Title of this PR uses our standard template Component - Add|Fix|Improve|Change|Make|Remove {changes}.

…omment)

…haul

…omputations

Co-authored-by: johnb432 <[email protected]>

…ents to an ifdef

Co-authored-by: johnb432 <[email protected]>

…haul

…en it was an init function based on ammunition extended eventhandlers, missed the revert.

…ments array into a define

…igator

PabstMirror · 2024-09-12T21:29:15Z

Readable diff (I think) - lambdatiger/ace_frag-overhaul@lambdatiger:ace_frag-overhaul:Event-hanlder-replacement...eventHandler-replace-2.18

johnb432 · 2024-09-22T20:05:32Z

@lambdatiger Can you handle the merge conflicts?

…ace-2.18

lambdatiger · 2024-09-22T21:17:24Z

There's one more 2.18 change that came from #10247 that isn't present in this PR yet. I'll test it again later this week before I commit it.

johnb432 · 2024-09-23T06:52:42Z

There's one more 2.18 change that came from #10247 that isn't present in this PR yet. I'll test it again later this week before I commit it.

There's no hurry, given that 2.18 won't release until sometime in october (and I doubt we will release a day 1 patch).

johnb432 · 2024-10-12T20:35:53Z

There's no hurry, given that 2.18 won't release until sometime in october (and I doubt we will release a day 1 patch).

That aged like milk...

lambdatiger · 2024-10-13T03:03:24Z

I'll run through it tomorrow and let you know if it's good to go.

…ace-2.18

lambdatiger · 2024-10-13T22:23:04Z

Alright, new feature isn't easily added. I'll address any other changes in #9728.

Testing seems to work like it should, no issues and the new nearEntities syntax does what it took us the command and a loop to do. If anyone has specific testing they want lmk, but I ran through in single player using the new syntax and formatting.

johnb432

Other than that, LGTM

johnb432 · 2024-10-19T10:25:01Z

addons/frag/functions/fnc_frago.sqf

+    // Distribute evenly
+    private _sectorOffset = 360 * (_i - 1) / (_randomCount max 1);
+    private _randomDir = random (_sectorSize);
+    private _vectorDir = [cos (_sectorOffset + _randomDir), sin (_sectorOffset + _randomDir), sin (30 - (random 45))];

        private _fragObjSpeed = _fragVelocity * (1 - random 0.5);


Correct indentation.

johnb432 · 2024-10-19T10:25:24Z

addons/frag/functions/fnc_frago.sqf

 };

 TRACE_1("total created",_fragCount);

 END_COUNTER(frago);
+_fragCount


Suggested change

_fragCount

_fragCount // return

johnb432 · 2024-10-19T10:25:34Z

addons/frag/functions/fnc_frago.sqf

+
+// compile possible targets including units, vehicles, and crews
+private _targets = [_fragPosAGL, _fragRange, _fragRange, 0, false, _fragRange] nearEntities [["Car", "Motorcycle", "Tank", "StaticWeapon", "CAManBase", "Air", "Ship"], false, true, true];
+if (_targets isEqualTo []) exitWith {
    TRACE_2("No nearby targets",_fragPosAGL,_fragRange);
    0


Suggested change

0

0 // return

johnb432 · 2024-10-19T10:25:39Z

addons/frag/functions/fnc_frago.sqf

-private _objects = _fragPosAGL nearEntities [["Car", "Motorcycle", "Tank", "StaticWeapon", "CAManBase", "Air", "Ship"], _fragRange];
-if (_objects isEqualTo []) exitWith {
+
+// compile possible targets including units, vehicles, and crews


Suggested change

// compile possible targets including units, vehicles, and crews

// Compile possible targets including units, vehicles, and crews

lambdatiger and others added 30 commits January 15, 2024 18:44

Implemented changes discussed here acemod#9728 (comment)

c4a93c7

Config lookup optimization mentioned by johnb432 here: acemod#9728 (c…

b2666fc

…omment)

white space/formatting changes

b780704

Merge branch 'master' of https://github.com/lambdatiger/ace_frag-over…

67e125c

…haul

removed old parameter changed in acemod@f28d5d2

85b566a

compacted text a bit

67ede76

formatting whitespace

572f909

Grammatical erros

7aa17aa

Changes as discussed here acemod#9728 (comment)

8dd76d1

Few quick optimizations of == to isEqualTo

6dacd38

Debug updated to be easier to control

9178611

Changed how spall hold off is calculated to avoid repeated unneeded c…

769bb29

…omputations

clarified a hold off variable

63cba6b

Better approach to ACE_FRAG_RM_EH macro

4be8c82

Git rid of superfulous stringtable entries

4727386

Co-authored-by: johnb432 <[email protected]>

unneeded parens

16e699e

Co-authored-by: johnb432 <[email protected]>

Clarified arguments

cdf1b4d

Co-authored-by: johnb432 <[email protected]>

getposATL to getPosATL

1b03ef7

Co-authored-by: johnb432 <[email protected]>

Update addons/frag/functions/fnc_dev_addRound.sqf

0958d6a

Co-authored-by: johnb432 <[email protected]>

Function header changes

1612872

Co-authored-by: johnb432 <[email protected]>

another great isNotEqualTo opportunity

3cc300a

Co-authored-by: johnb432 <[email protected]>

formatting changes

b6891b7

Co-authored-by: johnb432 <[email protected]>

unneeded parens

e5f62c7

Co-authored-by: johnb432 <[email protected]>

Declared _ammoInfo twice

c0c423b

optimized around checking if systems are active and moved debug argum…

5160361

…ents to an ifdef

Removed white space from removing an if statement in a previous commit

73d0064

Removed superfulous parenthese

ea15eea

Co-authored-by: johnb432 <[email protected]>

clarified function description and removed unneeded comments

a1c498d

Moved "isServer" check to initRound function

0321b78

Merge branch 'master' of https://github.com/lambdatiger/ace_frag-over…

1f294f5

…haul

lambdatiger and others added 12 commits September 4, 2024 14:28

Fixed authors line on fired function. Used to make sense different wh…

c0ea806

…en it was an init function based on ammunition extended eventhandlers, missed the revert.

switch all hash fallbacks to getOrDefaultCall and turned default frag…

bdf0854

…ments array into a define

Merge branch 'acemod:master' into Event-hanlder-replacement

f512fab

Transitioned frag system from fired to ace explode event system

f918816

decreased chance to hit / fragment inaccuracy.

65c0304

fixing setShotParents only sometimes setting first argument, not inst…

18816cf

…igator

cleanup

6808b81

Slight optimization of "_vecVar" calculation

1568dde

removed dev_addRound function

4ec7dfd

Command changes for Arma 2.18

6c49525

Fixed debug setting changes

d70686e

missed exit condition

64e44d3

lambdatiger marked this pull request as ready for review September 12, 2024 21:23

removed shot parents due to local creation of spall

ee7c28d

Merge remote-tracking branch 'upstream/master' into eventHandler-repl…

487b987

…ace-2.18

johnb432 added the kind/optimization Release Notes: **IMPROVED:** label Sep 22, 2024

johnb432 added this to the Ongoing milestone Sep 22, 2024

johnb432 added the 2.18 label Sep 22, 2024

lambdatiger added 3 commits October 13, 2024 16:28

Merge remote-tracking branch 'upstream/master' into eventHandler-repl…

5f6bd5b

…ace-2.18

Merge remote-tracking branch 'upstream/master' into eventHandler-repl…

af575dc

…ace-2.18

simplified comment

93892cb

Adjusted whitespace for readability

7c2ded5

johnb432 requested changes Oct 19, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Frag - Implement Arma v2.18 changes from #10157 #10313

Frag - Implement Arma v2.18 changes from #10157 #10313

lambdatiger commented Sep 12, 2024 •

edited

Loading

PabstMirror commented Sep 12, 2024

johnb432 commented Sep 22, 2024

lambdatiger commented Sep 22, 2024

johnb432 commented Sep 23, 2024

johnb432 commented Oct 12, 2024

lambdatiger commented Oct 13, 2024

lambdatiger commented Oct 13, 2024 •

edited

Loading

johnb432 left a comment

johnb432 Oct 19, 2024

johnb432 Oct 19, 2024

johnb432 Oct 19, 2024

johnb432 Oct 19, 2024

	// compile possible targets including units, vehicles, and crews
	// Compile possible targets including units, vehicles, and crews

Frag - Implement Arma v2.18 changes from #10157 #10313

Are you sure you want to change the base?

Frag - Implement Arma v2.18 changes from #10157 #10313

Conversation

lambdatiger commented Sep 12, 2024 • edited Loading

IMPORTANT

PabstMirror commented Sep 12, 2024

johnb432 commented Sep 22, 2024

lambdatiger commented Sep 22, 2024

johnb432 commented Sep 23, 2024

johnb432 commented Oct 12, 2024

lambdatiger commented Oct 13, 2024

lambdatiger commented Oct 13, 2024 • edited Loading

johnb432 left a comment

Choose a reason for hiding this comment

johnb432 Oct 19, 2024

Choose a reason for hiding this comment

johnb432 Oct 19, 2024

Choose a reason for hiding this comment

johnb432 Oct 19, 2024

Choose a reason for hiding this comment

johnb432 Oct 19, 2024

Choose a reason for hiding this comment

lambdatiger commented Sep 12, 2024 •

edited

Loading

lambdatiger commented Oct 13, 2024 •

edited

Loading