ACEX Field Rations by mharis001 · Pull Request #114 · acemod/ACEX

mharis001 · 2018-03-02T06:27:01Z

When merged this pull request will:

Add a more polished version of the field rations system first introduced in PR Add field rations from CSE #2
Add consumable items such as MREs that restore hunger/thirst values

Noteworthy differences:

Update function is more complete (cleaned up and ace_medical & ace_weather implementation)
Data files have been cleaned up (proper file structure, removed duplicate rvmat files)
Config based refill sources / More config entries to allow for more control over custom consumable items
Changed HUD (colouring and thirst status icon)
Settings use CBA_settings_fnc_init instead of ACE_Settings
Completed translations

@PabstMirror @thojkooi

SyMP2005 · 2018-03-02T18:38:06Z

I don't know who you are, but I love you.

TheMagnetar · 2018-03-28T13:12:00Z

~~It would be cool to integrate it with advanced fatigue module as well. Low recovery if hungry for example.~~ Totally missed it.

jonpas

This looks real good to me overall! 👍

jonpas · 2018-04-14T12:09:31Z

addons/field_rations/$PBOPREFIX$

@@ -0,0 +1 @@
+z\acex\addons\field_rations


Empty newline missing.

I thought $PBOPREFIX$ files did not have newline at end, or at least according to this: https://community.bistudio.com/wiki/PBOPREFIX

That's false. And we don't even use BI's Addon Builder anyways.

BI Addon builder doesn't even use PBOPREFIX file.

jonpas · 2018-04-14T12:11:31Z

addons/field_rations/data/mre.rvmat

@@ -0,0 +1,32 @@
+ambient[]={1,1,1,1};


This file should be cleaned up to conform to same config standards.

Braces on same line

Spaces around =

jonpas · 2018-04-14T12:15:48Z

Can we get some screenshots of the status UI icons @mharis001 ?

mharis001 · 2018-04-14T13:18:00Z

Currently:

Not too happy with the drinking icon, meant to be a canteen. Could also change HUD to be vertical/horizontal bars.

jonpas · 2018-04-14T13:44:11Z

Looks good IMO! Are those icons always up? If so, could they be made so they are hidden until you are actually lower on those supply (maybe a setting)? I am one for minimal UI on those status indicators.

Could also change HUD to be vertical/horizontal bars.

Could also be a setting! 😆

On that note, can you drag it around like other elements? That'd be pretty neat too.

mharis001 · 2018-04-14T13:51:34Z

The HUD shows when below 30% on either status or hovering interaction and I like the idea about moving elements around.

jonpas · 2018-04-14T13:58:16Z

Awesome!

CfgUIGrids, MicroDAGR should be good reference.

TheMagnetar · 2018-04-14T17:46:19Z

I have tested it and it works really well. Awesome!

PabstMirror · 2018-11-04T19:38:54Z

5c769a1
This is all the changes I could think of:

allows adding water source actions to map objects
fix getting more thirsty when drinking water 😆
refill amount on half bottles should be half (I think?)
moved refill items to base water node, should be easier to use, but this is subjective

PabstMirror · 2018-11-15T18:11:36Z

Added a delay on consume because progress bar will sometimes be closed by interaction menu closing
(//wait a frame to handle "Do When releasing action menu key" option)

Animations look fantastic, I'm not real familiar with CfgMoves configs but I think they are ok and the system should work well. Did we want the drink anims on the soda cans as well?

mharis001 · 2018-11-16T10:51:35Z

I am working on adding slightly different animations and sounds for the soda cans (changing bottle cap opening to opening a can).

I see you left the action offset commented out due to needing a typeOf. I think for some objects it is somewhat needed, what about adding a second array for corresponding offsets for the p3ds?
Also, do we want to add Item_Base_F objects for the consumable items (like other ACE items)?

PabstMirror · 2018-11-17T04:10:36Z

I wasn't sure if the position offset was necessary, I think [0,0,0] works well enough for all the water sources, but it really does look nice having the point being exactly at the nozzle.

I guess having placeable items might be nice

mharis001 · 2018-11-19T06:46:46Z

Changed thirstRestored and hungerRestored to thirstQuenched and hungerSatiatedon the reccomendation of someone. Apperently, old entries sounded like they were restoring/bringing thirst or hunger back.

Other than that, I think this is finally good to go 👍

PabstMirror · 2018-11-19T06:48:37Z

Merging now for the RC, can still add tweaks if we find anything

dedmen

Very nice in-code documentation 👍

dedmen · 2018-11-29T12:30:21Z

addons/field_rations/data/mre.rvmat

+diffuse[] = {0.5,0.5,0.5,1};
+forcedDiffuse[] = {0.5,0.5,0.5,0};
+emmisive[] = {0,0,0,1};
+specular[] = {0.30000001,0.30000001,0.30000001,0};


Where are these excessive 0's from? I saw them in a ACE rvmat too.

Not sure, this is how the file was from the original PR. Just conformed it to config guidelines.

mharis001 added 14 commits February 9, 2018 00:56

Initial commit

18efeb9

Add settings

750ffd6

Begin postInit work

726693c

Add refill actions

65433e4

Add items and drinking sound

95e7dab

Add update function loop

3fb38e2

Add consume actions

12207f0

More refill action work

730650a

Add HUD and more update function work

5e043ef

Function headers

5a49c61

Handle respawn

d2062c1

Add translations

95b9da7

Various improvements

1491d47

Add README file and refill action always show

b93b968

jonpas added the feature request label Mar 2, 2018

jonpas added this to the 3.4.0 milestone Mar 2, 2018

thojkooi requested review from PabstMirror and jonpas March 28, 2018 17:46

jonpas mentioned this pull request Apr 14, 2018

Add field rations from CSE #2

Closed

jonpas suggested changes Apr 14, 2018

View reviewed changes

RVMAT config guidelines and PBOPREFIX new line

8218100

jonpas approved these changes Apr 14, 2018

View reviewed changes

mharis001 and others added 4 commits October 3, 2018 03:22

Add drink animations

cef69ca

Update CfgWeapons with new entries

792cb28

Update consumable functions for new entries

970a541

Add water actions to map objects

5c769a1

mharis001 and others added 6 commits November 4, 2018 18:10

Merge remote-tracking branch 'upstream/114work2' into fieldRations

c76dc77

Add drinkable soda cans

348a75f

Make drinking animations transition

5e6352e

Add new drinking sounds

54832a0

Animation and sound syncing for consumeItem

7f2507f

delay a frame for progress bar

5a9a232

PabstMirror approved these changes Nov 15, 2018

View reviewed changes

mharis001 added 2 commits November 15, 2018 21:09

Cleanup stringtables and water source actions

9401255

Add fade delay to HUD when hovering on interaction

d850e95

mharis001 and others added 6 commits November 17, 2018 01:19

Add soda can animations and sounds

c7b226c

Add placeable items

6b93969

Clearer config entry names

8c5a1db

Action offset support for p3ds

767c35e

Disable Debug

f3a1938

Merge remote-tracking branch 'origin/fieldRations' into fieldRations

cce250f

PabstMirror approved these changes Nov 19, 2018

View reviewed changes

Show refill actions when source has supply of 0

5974b52

PabstMirror merged commit 4152b39 into acemod:master Nov 19, 2018

mharis001 deleted the fieldRations branch November 19, 2018 08:48

dedmen reviewed Nov 29, 2018

View reviewed changes

		@@ -0,0 +1 @@
		z\acex\addons\field_rations No newline at end of file

Conversation

mharis001 commented Mar 2, 2018

Uh oh!

SyMP2005 commented Mar 2, 2018

Uh oh!

TheMagnetar commented Mar 28, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jonpas left a comment

Choose a reason for hiding this comment

Uh oh!

jonpas Apr 14, 2018

Choose a reason for hiding this comment

Uh oh!

mharis001 Apr 14, 2018

Choose a reason for hiding this comment

Uh oh!

jonpas Apr 14, 2018

Choose a reason for hiding this comment

Uh oh!

dedmen May 11, 2018

Choose a reason for hiding this comment

Uh oh!

jonpas Apr 14, 2018

Choose a reason for hiding this comment

Uh oh!

jonpas commented Apr 14, 2018

Uh oh!

mharis001 commented Apr 14, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jonpas commented Apr 14, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mharis001 commented Apr 14, 2018

Uh oh!

jonpas commented Apr 14, 2018

Uh oh!

TheMagnetar commented Apr 14, 2018

Uh oh!

PabstMirror commented Nov 4, 2018

Uh oh!

PabstMirror commented Nov 15, 2018

Uh oh!

mharis001 commented Nov 16, 2018

Uh oh!

PabstMirror commented Nov 17, 2018

Uh oh!

mharis001 commented Nov 19, 2018

Uh oh!

PabstMirror commented Nov 19, 2018

Uh oh!

dedmen left a comment

Choose a reason for hiding this comment

Uh oh!

dedmen Nov 29, 2018

Choose a reason for hiding this comment

Uh oh!

mharis001 Nov 29, 2018

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

TheMagnetar commented Mar 28, 2018 •

edited

Loading

mharis001 commented Apr 14, 2018 •

edited

Loading

jonpas commented Apr 14, 2018 •

edited

Loading