Skip to content
This repository has been archived by the owner on May 24, 2022. It is now read-only.

Field rations - Add inventory context menu action #229

Merged
merged 13 commits into from
Jun 20, 2020
Merged

Field rations - Add inventory context menu action #229

merged 13 commits into from
Jun 20, 2020

Conversation

shukari
Copy link
Contributor

@shukari shukari commented Apr 19, 2020 •
edited
Loading

When merged this pull request will:

  • ContextMenuOption for field_rations
  • #include above comments
  • replace old ACE_medical_fnc_setDead
  • localize LSTRING -> LLSTRING

@PabstMirror PabstMirror changed the title Field rations context menu Field rations - Add inventory context menu Apr 19, 2020
@PabstMirror PabstMirror added this to the 3.5.2 milestone Apr 19, 2020
mharis001
mharis001 suggested changes Apr 19, 2020
View reviewed changes
Copy link
Member

@mharis001 mharis001 left a comment

Choose a reason for hiding this comment

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

I am unsure about the solution of using ACE_fieldRationsItems as a common base class, this should check if GVAR(thirstQuenched) or GVAR(hungerSatiated) for the item are > 0.

addons/field_rations/XEH_preInit.sqf Outdated Show resolved Hide resolved
addons/field_rations/XEH_preInit.sqf Outdated Show resolved Hide resolved
addons/field_rations/XEH_preInit.sqf Outdated Show resolved Hide resolved
PabstMirror added a commit that referenced this pull request Apr 20, 2020
@PabstMirror @shukari
Field Rations - Fix for changes to ace_medical
fee10d5 
Cherry picked from #229

Co-Authored-By: shukari <[email protected]>
@PabstMirror PabstMirror mentioned this pull request Apr 20, 2020
Merged
@PabstMirror PabstMirror modified the milestones: 3.5.2, 3.6.0 Apr 20, 2020
@PabstMirror
Copy link
Contributor

We are really close to next release, I've cherry picked the medical fix into #230

PabstMirror added a commit that referenced this pull request Apr 20, 2020
@PabstMirror @shukari
Field Rations - Fix for changes to ace_medical (#230)
c9007b4 
Cherry picked from #229

Co-Authored-By: shukari <[email protected]>

Co-authored-by: shukari <[email protected]>
@shukari

This comment has been minimized.

Sign in to view
@mharis001
Copy link
Member

Changing the items to a base class and limiting the action to it is the wrong decision at this point (consider ACE_Banana UBC and other 3rd party items).

@PabstMirror
Copy link
Contributor

Probably fine to add action to ACE_ItemCore and make condition that item is food/drink

@shukari
Copy link
Contributor Author

shukari commented Apr 27, 2020 •
edited
Loading

@mharis001 @PabstMirror
use only ACE_ItemCore
show if enabled and field_rations items
enable if has something left

@shukari
Copy link
Contributor Author

shukari commented May 4, 2020

need review @mharis001 @PabstMirror

mharis001
mharis001 reviewed May 5, 2020
View reviewed changes
addons/field_rations/XEH_postInit.sqf Outdated Show resolved Hide resolved
addons/field_rations/stringtable.xml Outdated Show resolved Hide resolved
@shukari
Copy link
Contributor Author

shukari commented May 8, 2020

@mharis001 changes are made

@mharis001 mharis001 changed the title Field rations - Add inventory context menu Field rations - Add inventory context menu action May 10, 2020
@PabstMirror PabstMirror merged commit d0ed5f3 into acemod:master Jun 20, 2020
@shukari shukari deleted the fieldRationsContextMenu branch June 30, 2020 15:41
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@PabstMirror PabstMirror PabstMirror approved these changes

@mharis001 mharis001 mharis001 approved these changes

Assignees
No one assigned
Labels
enhancement
Projects
None yet
Milestone
3.5.3
Development

Successfully merging this pull request may close these issues.
3 participants
@shukari @PabstMirror @mharis001