Skip to content
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

Jump to bottom

Sitting #1541

Merged
merged 26 commits into from
Jun 26, 2015
Merged

Sitting #1541

merged 26 commits into from
Jun 26, 2015

Conversation

jonpas
Copy link
Member

@jonpas jonpas commented Jun 7, 2015

This allows players to sit on chairs/seats/toilets.

  • Fix Rattan Chair
  • Interaction Menu icons
  • Exception isNotSitting
  • ^ Allow actions (eg. medical)
  • ACE_Settings and Module option to disable
  • ^ Module icon
  • Handle dying, unconscious
  • ^ Handcuffed
  • Restrict rotation
  • Fix ace_captives_fnc_doApplyHandcuffs not breaking sitting animation

gienkov
gienkov reviewed Jun 7, 2015
View reviewed changes
addons/sitting/stringtable.xml
<Package name="Sitting">
<Key ID="STR_ACE_Sitting_Sit">
<English>Sit Down</English>
</Key>
Copy link
Contributor

Choose a reason for hiding this comment

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

< Polish>Usiądź</Polish>

@gienkov
Copy link
Contributor

gienkov commented Jun 7, 2015

👍 for more immersive briefings.

PabstMirror
PabstMirror reviewed Jun 7, 2015
View reviewed changes
addons/sitting/CfgVehicles.hpp
GVAR(sitPosition[]) = {0.07, 0.17, 1};
};
// Field Toilet
class Land_FieldToilet_F: ThingX {
Copy link
Contributor

Choose a reason for hiding this comment

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

Should we add ACE_ToiletPaper?

Copy link
Member Author

Choose a reason for hiding this comment

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

I am willing to!

@Trigger81
Copy link

Rly? #altislife ...

@gienkov
Copy link
Contributor

gienkov commented Jun 8, 2015

Can you add also support for benches? There are some if I remember correctly, but they have space for at least 3 people, can you also add support for it?
We are talking about immersion functionality only now. In my community, besides coop we also play RealOPs or RPGOps - you name it. This functionality suits this well since we often roleplay civilians that have significant informations. What more better than seeing civilian than just sits on a bench in a city :P.

@jonpas
Copy link
Member Author

jonpas commented Jun 8, 2015

Rly? #altislife ...

Think when you have a debrief, it's nice to sit down and you don't get people doing some funky stuff around, I can't see how this is Altis Life. This module would also be disablable (or even disabled by default if so wished).

thojkooi
thojkooi reviewed Jun 8, 2015
View reviewed changes
addons/sitting/functions/fnc_canSit.sqf
PARAMS_2(_seat,_player);

// If seat object and not occupied
if (getNumber (configFile >> "CfgVehicles" >> typeOf _seat >> QGVAR(canSit)) == 1 &&
Copy link
Contributor

Choose a reason for hiding this comment

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

No need for an if statement here, just do:

(getNumber (configFile >> "CfgVehicles" >> typeOf _seat >> QGVAR(canSit)) == 1 && {isNil{_seat getVariable QGVAR(seatOccupied)}})

@Waffle1434
Copy link

Screenshots?

@jonpas
Copy link
Member Author

jonpas commented Jun 8, 2015

http://imgur.com/D8vJVjo,WHfQENG,0uMDtIU

thojkooi
thojkooi reviewed Jun 9, 2015
View reviewed changes
addons/sitting/functions/fnc_getRandomAnimation.sqf
* Public: No
*/
#include "script_component.hpp"

Copy link
Contributor

Choose a reason for hiding this comment

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

You are missing privates in this function

@thojkooi thojkooi added this to the Backlog milestone Jun 9, 2015
@thojkooi thojkooi added the kind/feature Release Notes: **ADDED:** label Jun 9, 2015
@jonpas
Copy link
Member Author

jonpas commented Jun 10, 2015

Got any ideas? We all know saying "fix that" doesn't work like that. :P

@bux
Copy link
Member

bux commented Jun 10, 2015

Can't really do anything atm. Holidays ...

It's more of a "please fix that" merging prerequisite :P

@jonpas
Copy link
Member Author

jonpas commented Jun 11, 2015

@bux578 got a 🎁 for you!

@esteldunedain there is one bug with handling handcuffing, ace_captives_fnc_doApplyHandcuffs doesn't break the sitting animation for some reason, any ideas if should be fixed here or in captives?

@jonpas jonpas mentioned this pull request Jun 11, 2015
Closed
jonpas added 4 commits June 13, 2015 21:43
@jonpas
Merge branch 'master' into sitting
29ce8f6 
Conflicts:
	addons/kestrel4500/CfgVehicles.hpp
	addons/microdagr/CfgVehicles.hpp
@jonpas
Allowed Kestrel4500 Inside and Sitting
254b386
@jonpas
Enabled DAGR, Kestrel4500, Laser switching, Mag Repack, Markers, Micr…
1eeca28 
…oDAGR, NVG Adjusting and Check Ammo while Sitting
@jonpas
Removed redundant GVAR
083d34b
@Wolfeye78
Copy link

What about a big backpack, like Carryall, on your back? Doesn't it look funny or clipping thru the back of the chair? You might actually have to restrict players from sitting when carrying a backpack...?
This could be useful for entering vehicles too. I'll search the pull requests to see if someone already mentioned this or add one myself.

@alganthe
Copy link
Contributor

that isn't an issue, backpack clipping ALWAYS happens whatever the fuck you do.

@Tenga
Copy link
Contributor

Tenga commented Jun 20, 2015

I was going to make a pull request for what I'm about to suggest when I get some time, but noticed this PR so I figured I'd suggest this here as it might be within scope.

It would be nice to add the ability to sit the captive units on the ground. The animations for that are already in the game ("Acts_AidlPsitMstpSsurWnonDnon_loop", "..._out" and similar).

This is how my little scripted prototype looks like: http://imgur.com/a/ZdkR8

@jonpas
Copy link
Member Author

jonpas commented Jun 20, 2015

@Tenga that would fit into Captives module, this PR is puerly for sitting on chairs (and toilets 😁 ) or anything you should be able to sit on. I like it though.

@Tenga
Copy link
Contributor

Tenga commented Jun 20, 2015

@jonpas My bad, searched for sit, seen changes on a whole load of files and figured the scope of the PR was wider. 😰

I'll do a PR for this when I get a chance, but if anyone else feels like running with the idea, feel free. 😃

@jonpas
Copy link
Member Author

jonpas commented Jun 22, 2015

This is ready for final review.

@jonpas
Copy link
Member Author

jonpas commented Jun 25, 2015

Status on merge?

ulteq
ulteq reviewed Jun 26, 2015
View reviewed changes
addons/sitting/functions/fnc_sit.sqf
_args = _this select 0;
_player = _args select 0;
_sitDirectionVisual = _args select 1;
_sitRotation = _args select 2;
Copy link
Contributor

Choose a reason for hiding this comment

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

You could do: EXPLODE_3_PVT(_this select 0,_player,_sitDirectionVisual,_sitRotation);

@ulteq ulteq modified the milestones: 3.2.0, Backlog Jun 26, 2015
@ulteq ulteq self-assigned this Jun 26, 2015
ulteq added a commit that referenced this pull request Jun 26, 2015
@ulteq
Merge pull request #1541 from jonpas/sitting
241e8ac 
Sitting
@ulteq ulteq merged commit 241e8ac into acemod:master Jun 26, 2015
@jonpas jonpas deleted the sitting branch June 26, 2015 19:35
This was referenced Jul 4, 2015
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@ulteq ulteq

Labels
kind/feature Release Notes: **ADDED:**
Projects
None yet
Milestone
3.2.0
Development

Successfully merging this pull request may close these issues.