Hit Reactions - Add weapon dropping on arm hit #9539

SpicyBagpipes · 2023-10-19T22:04:26Z

When merged this pull request will:

~~Gun will be dropped when it is hit by a bullet if probability met.~~
Gun will be dropped when arm is hit by a bullet if separate probability met.
AI will retrieve gun after a couple of seconds.

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}.

Add weaponDropEnabled setting

Forgot a bracket

SpicyBagpipes · 2023-10-19T22:13:07Z

2023-10-19.21-45-08.mp4

Doesn't happen much if at all with vanilla weapons, mostly a modded thing. Vanilla weapons just have bullets pass through

actually make it run postinit

LinkIsGrim · 2023-10-19T22:25:36Z

Do we want to add weapon dropping on hand/arm hits as well? Can just check against selection

SpicyBagpipes · 2023-10-19T22:46:50Z

Do we want to add weapon dropping on hand/arm hits as well? Can just check against selection

Possibly, linked to different slider? Can then move condition for dropping stuff into the events?
Probably worth making a hit reactions settings category

No need, set chance to 0

already comparing against chance, can just set to 0

fix weapon thing too

addons/hitreactions/initSettings.sqf

addons/hitreactions/stringtable.xml

addons/hitreactions/initSettings.sqf

addons/hitreactions/functions/fnc_checkWeaponDrop.sqf

addons/hitreactions/XEH_postInit.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

johnb432 · 2024-04-01T11:29:20Z

Will do seperate % if John hasn't already, haven't checked as still early here

I didn't do it, as I forgot that. I'll let you do it.

Is lifestate not incapacitated whilst in transition to uncon?

Possibly. Can you investigate that?

SpicyBagpipes · 2024-04-01T15:32:31Z

Will do seperate % if John hasn't already, haven't checked as still early here

I didn't do it, as I forgot that. I'll let you do it.

Is lifestate not incapacitated whilst in transition to uncon?

Possibly. Can you investigate that?

Tested with allUnits select {lifeState _x != "HEALTHY"}, unit is picked up the second they start falling once uncon

johnb432 · 2024-05-29T21:02:02Z

In a future PR (potentially): Look at adding this to all projectiles (I'm thinking mostly about fragmentation).

addons/hitreactions/XEH_postInit.sqf

johnb432

I'm going to make another PR that needs to be merged before this one, for the changes in ace_common_fnc_addWeapon.

* Create fnc_checkWeaponDrop.sqf * Update fnc_checkWeaponDrop.sqf * Create XEH_postInit.sqf * Update XEH_postInit.sqf * Update XEH_postInit.sqf * Update fnc_checkWeaponDrop.sqf * fix spelling issue * Update initSettings.sqf Add weaponDropEnabled setting * Update stringtable.xml * Update fnc_checkWeaponDrop.sqf * Update initSettings.sqf Forgot a bracket * Add weapon drop chance setting * Update XEH_postInit.sqf * Update CfgEventHandlers.hpp actually make it run postinit * Update XEH_PREP.hpp * Update stringtable.xml * Update initSettings.sqf No need, set chance to 0 * Update XEH_postInit.sqf already comparing against chance, can just set to 0 * Update initSettings.sqf * Update stringtable.xml * Update XEH_postInit.sqf * add arm hit chance fix weapon thing too * Update stringtable.xml * Update addons/hitreactions/functions/fnc_checkWeaponDrop.sqf Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com> * Update addons/hitreactions/functions/fnc_checkWeaponDrop.sqf Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com> * appearance stuff * Update addons/hitreactions/initSettings.sqf Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com> * Update addons/hitreactions/functions/fnc_checkWeaponDrop.sqf Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com> * kjw's poor arithmetic * Update fnc_checkWeaponDrop.sqf wrong check * remove systemchat debug whoops * Update fnc_checkWeaponDrop.sqf * Update XEH_postInit.sqf * Update fnc_checkWeaponDrop.sqf * Early exit, wait for clear * Make default setting 0 * Update script_component.hpp * Update XEH_postInit.sqf * Update script_component.hpp * Update XEH_postInit.sqf * Update XEH_postInit.sqf * Update addons/hitreactions/functions/fnc_checkWeaponDrop.sqf * Update XEH_postInit.sqf Unsure if exitWith in postInit is proper? Seems better than nesting all of that in another scope imo * Update XEH_preInit.sqf * Update fnc_checkWeaponDrop.sqf * Update addons/hitreactions/XEH_preInit.sqf Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com> * Update hitreactions.md * Update hitreactions.md * Update addons/hitreactions/functions/fnc_checkWeaponDrop.sqf Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com> * Update addons/hitreactions/functions/fnc_checkWeaponDrop.sqf Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com> * Update addons/hitreactions/initSettings.sqf * Update XEH_postInit.sqf * Update addons/hitreactions/XEH_postInit.sqf Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com> * Update addons/hitreactions/XEH_postInit.sqf Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com> * Update addons/hitreactions/functions/fnc_checkWeaponDrop.sqf Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com> * Update addons/hitreactions/functions/fnc_checkWeaponDrop.sqf Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com> * Update XEH_postInit.sqf * Update XEH_postInit.sqf * Update fnc_checkWeaponDrop.sqf * Spacing fixes * Update addons/hitreactions/XEH_postInit.sqf Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com> * Take _hitEntity into account if exists * Update fnc_checkWeaponDrop.sqf _didHitGun will no longer ever be true * Minor component cleanup * Removed gun hits, added double hit detection * Decouple AI and player probabilities * Tweaks and fixes * Update XEH_PREP.hpp * Add missing param * Fixed bugged state AI are in after using TakeWeapon * Fixes and cleanup * Made API clear, moved undroppable to config entry * Update fnc_checkWeaponDrop.sqf * Check for Zeus RC and avoid `setUnitLoadout` * Expand `addWeapon`'s capabilities * Cleaned up `addWeapon` * Removed weapon replacement as it's apparently not necessary * Defined undefined variable --------- Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com> Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com> Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

SpicyBagpipes added 13 commits October 19, 2023 22:35

Create fnc_checkWeaponDrop.sqf

e956401

Update fnc_checkWeaponDrop.sqf

3e82dbe

Create XEH_postInit.sqf

ff791e8

Update XEH_postInit.sqf

bbd0425

Update XEH_postInit.sqf

d17fbab

Update fnc_checkWeaponDrop.sqf

6672cae

fix spelling issue

25d7efc

Update initSettings.sqf

6eef8de

Add weaponDropEnabled setting

Update stringtable.xml

23aaef0

Update fnc_checkWeaponDrop.sqf

94862e5

Update initSettings.sqf

cfed434

Forgot a bracket

Add weapon drop chance setting

5b8549b

Update XEH_postInit.sqf

ae7dafc

SpicyBagpipes added 2 commits October 19, 2023 23:16

Update CfgEventHandlers.hpp

e52e3da

actually make it run postinit

Update XEH_PREP.hpp

816ca8b

SpicyBagpipes and others added 8 commits October 19, 2023 23:49

Update stringtable.xml

adbe1e4

Update initSettings.sqf

5e144fb

No need, set chance to 0

Update XEH_postInit.sqf

523ca8f

already comparing against chance, can just set to 0

Update initSettings.sqf

bdb061c

Update stringtable.xml

d65d102

Update XEH_postInit.sqf

bb451d5

add arm hit chance

375a6ca

fix weapon thing too

Update stringtable.xml

98dae26

LinkIsGrim requested changes Oct 19, 2023

View reviewed changes

SpicyBagpipes and others added 3 commits October 20, 2023 00:32

Update addons/hitreactions/functions/fnc_checkWeaponDrop.sqf

d625edf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

Update addons/hitreactions/functions/fnc_checkWeaponDrop.sqf

7a9a857

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

appearance stuff

21a1dc2

Decouple AI and player probabilities

acba3d7

johnb432 mentioned this pull request Apr 1, 2024

Common - Use lifeState check in FUNC(isAwake) #9646

Merged

johnb432 added 2 commits April 1, 2024 19:13

Tweaks and fixes

0e5de88

Update XEH_PREP.hpp

2c81ee7

johnb432 added this to the 3.18.0 milestone Apr 20, 2024

johnb432 approved these changes Apr 20, 2024

View reviewed changes

LinkIsGrim approved these changes May 29, 2024

View reviewed changes

johnb432 added 2 commits May 29, 2024 22:52

Add missing param

c7b5299

Merge branch 'master' into pr/9539

8e0e0c6

johnb432 changed the title ~~Hit Reactions - Add weapon dropping on gun hit~~ Hit Reactions - Add weapon dropping on arm hit May 29, 2024

johnb432 added 4 commits May 30, 2024 00:13

Fixed bugged state AI are in after using TakeWeapon

0209029

Fixes and cleanup

f23c3b1

Made API clear, moved undroppable to config entry

039e061

Update fnc_checkWeaponDrop.sqf

6617010

johnb432 requested a review from LinkIsGrim May 29, 2024 22:52

LinkIsGrim reviewed May 30, 2024

View reviewed changes

addons/hitreactions/XEH_postInit.sqf Outdated Show resolved Hide resolved

johnb432 added 2 commits June 1, 2024 10:05

Check for Zeus RC and avoid setUnitLoadout

fa8b707

Expand addWeapon's capabilities

768a84e

johnb432 requested changes Jun 1, 2024

View reviewed changes

johnb432 mentioned this pull request Jun 1, 2024

Common - Improve addWeapon #10051

Merged

johnb432 added 3 commits June 1, 2024 12:38

Cleaned up addWeapon

de8b7f0

Removed weapon replacement as it's apparently not necessary

55c468a

Defined undefined variable

7670840

johnb432 approved these changes Jun 1, 2024

View reviewed changes

Merge branch 'master' into pr/9539

0a4c56b

johnb432 merged commit 33dc7e3 into acemod:master Jun 6, 2024
5 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Hit Reactions - Add weapon dropping on arm hit #9539

Hit Reactions - Add weapon dropping on arm hit #9539

SpicyBagpipes commented Oct 19, 2023 •

edited by johnb432

Loading

SpicyBagpipes commented Oct 19, 2023

LinkIsGrim commented Oct 19, 2023

SpicyBagpipes commented Oct 19, 2023 •

edited

Loading

johnb432 commented Apr 1, 2024

SpicyBagpipes commented Apr 1, 2024

johnb432 commented May 29, 2024

johnb432 left a comment

Hit Reactions - Add weapon dropping on arm hit #9539

Hit Reactions - Add weapon dropping on arm hit #9539

Conversation

SpicyBagpipes commented Oct 19, 2023 • edited by johnb432 Loading

IMPORTANT

SpicyBagpipes commented Oct 19, 2023

LinkIsGrim commented Oct 19, 2023

SpicyBagpipes commented Oct 19, 2023 • edited Loading

johnb432 commented Apr 1, 2024

SpicyBagpipes commented Apr 1, 2024

johnb432 commented May 29, 2024

johnb432 left a comment

Choose a reason for hiding this comment

SpicyBagpipes commented Oct 19, 2023 •

edited by johnb432

Loading

SpicyBagpipes commented Oct 19, 2023 •

edited

Loading